Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix

6 files changed, 106 insertions, 9 deletions

diff --git a/nixpkgs/pkgs/tools/text/clima/default.nix b/nixpkgs/pkgs/tools/text/clima/default.nix
new file mode 100644
index 000000000000..cfa39590a714
--- /dev/null
+++ b/nixpkgs/pkgs/tools/text/clima/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, stdenv
+, darwin
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "clima";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "Canop";
+    repo = "clima";
+    rev = "v${version}";
+    hash = "sha256-CRnAxhkuCTyHR4uQofA51Dm3+YKqm3iwBkFNkbLTv1A=";
+  };
+
+  cargoHash = "sha256-jKY+Ta6lqMBUlqSViKk3W0CiO8oU+ucmleKDYRA54HQ=";
+
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  meta = with lib; {
+    description = "A minimal viewer for Termimad";
+    homepage = "https://github.com/Canop/clima";
+    changelog = "https://github.com/Canop/clima/releases/tag/${src.rev}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "clima";
+  };
+}
diff --git a/nixpkgs/pkgs/tools/text/markdownlint-cli2/default.nix b/nixpkgs/pkgs/tools/text/markdownlint-cli2/default.nix
new file mode 100644
index 000000000000..86e1338a09ef
--- /dev/null
+++ b/nixpkgs/pkgs/tools/text/markdownlint-cli2/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "markdownlint-cli2";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "DavidAnson";
+    repo = "markdownlint-cli2";
+    rev = "v${version}";
+    hash = "sha256-qtdR7Rhz+HLZJX82OrN+twOsvFOv99e4BBDVV1UayPI=";
+  };
+
+  npmDepsHash = "sha256-Fx0lDcvzLRVSAX0apKmu1CBfnGmGQR9FQEdhHUtue/c=";
+
+  postPatch = ''
+    ln -s npm-shrinkwrap.json package-lock.json
+  '';
+
+  dontNpmBuild = true;
+
+  meta = {
+    changelog = "https://github.com/DavidAnson/markdownlint-cli2/blob/${src.rev}/CHANGELOG.md";
+    description = "A fast, flexible, configuration-based command-line interface for linting Markdown/CommonMark files with the markdownlint library";
+    homepage = "https://github.com/DavidAnson/markdownlint-cli2";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ natsukium ];
+  };
+}
diff --git a/nixpkgs/pkgs/tools/text/txr/default.nix b/nixpkgs/pkgs/tools/text/txr/default.nix
index 2b9c306406a8..dceedbdc5101 100644
--- a/nixpkgs/pkgs/tools/text/txr/default.nix
+++ b/nixpkgs/pkgs/tools/text/txr/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "txr";
-  version = "289";
+  version = "291";
 
   src = fetchurl {
     url = "https://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-1m3QXY1qlVMFpehAYifHkDNQ4hAlO45/6+bbpbMAo3M=";
+    hash = "sha256-Btk3PanJa6hyoM+hfQq+EhIMaL2edyhfxx96Kpy+aaA=";
   };
 
   buildInputs = [ libffi ];
diff --git a/nixpkgs/pkgs/tools/text/ugrep/default.nix b/nixpkgs/pkgs/tools/text/ugrep/default.nix
index 354cdc350833..afc986e9c597 100644
--- a/nixpkgs/pkgs/tools/text/ugrep/default.nix
+++ b/nixpkgs/pkgs/tools/text/ugrep/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ugrep";
-  version = "4.0.0";
+  version = "4.0.2";
 
   src = fetchFromGitHub {
     owner = "Genivia";
     repo = "ugrep";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-kRpHJl/ouYgvwFMk6uO4XobyT2kTCH9kLfeF70IqMuc=";
+    hash = "sha256-g+COkAdXc1Z3yrObbeBU1wtu9Tr3mEhxrf6Qmy3JywY=";
   };
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/tools/text/wrap/default.nix b/nixpkgs/pkgs/tools/text/wrap/default.nix
index 728cad2c3fee..4eebcf60437b 100644
--- a/nixpkgs/pkgs/tools/text/wrap/default.nix
+++ b/nixpkgs/pkgs/tools/text/wrap/default.nix
@@ -8,18 +8,23 @@ buildGoModule rec {
     owner = "Wraparound";
     repo = "wrap";
     rev = "v${version}";
-    sha256 = "0scf7v83p40r9k7k5v41rwiy9yyanfv3jm6jxs9bspxpywgjrk77";
+    hash = "sha256-58wsH/e3X72S7tJUObazyvvkI8+B7DLPTBmQO9A+jmk=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  vendorHash = "sha256-vg61Vypd+mSF9FyLFVpnS5UCTJDoobkDE1Cneg8O0RM=";
 
-  vendorSha256 = null; #vendorSha256 = "";
+  nativeBuildInputs = [ makeWrapper ];
 
   patches = [
     (fetchpatch {
       name = "courier-prime-variants.patch";
       url = "https://github.com/Wraparound/wrap/commit/b72c280b6eddba9ec7b3507c1f143eb28a85c9c1.patch";
-      sha256 = "1d9v0agfd7mgd17k4a8l6vr2kyswyfsyq3933dz56pgs5d3jric5";
+      hash = "sha256-hcUsRyv6XVN+GyMN7LXzXPsp8jYUKTJPaK+e5p4CO7U=";
+    })
+    # Fix build on Go 1.17+
+    (fetchpatch {
+      url = "https://github.com/Wraparound/wrap/commit/a222c18a7e0810486741684781ff6158a359a8ba.patch";
+      hash = "sha256-eIKvA91olfbNJhOhIUu3GOL/rbgX3m6unmU8nRdKbtc=";
     })
   ];
 
@@ -32,6 +37,5 @@ buildGoModule rec {
     homepage = "https://github.com/Wraparound/wrap";
     license = licenses.gpl3Only;
     maintainers = [ maintainers.austinbutler ];
-    broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check
   };
 }
diff --git a/nixpkgs/pkgs/tools/text/write-good/default.nix b/nixpkgs/pkgs/tools/text/write-good/default.nix
new file mode 100644
index 000000000000..db3e16c23deb
--- /dev/null
+++ b/nixpkgs/pkgs/tools/text/write-good/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "write-good";
+  version = "1.0.8";
+
+  src = fetchFromGitHub {
+    owner = "btford";
+    repo = "write-good";
+    rev = "v${version}";
+    hash = "sha256-cq3cj2BwoQMKqo3iU2l+PR/2bJIFMSTRsDGQJ06GWXk=";
+  };
+
+  npmDepsHash = "sha256-0M9RzyeINmUPYcLy654iI+/ehElKrhIAibpiSqlXD2A=";
+
+  dontNpmBuild = true;
+
+  meta = {
+    description = "Naive linter for English prose";
+    homepage = "https://github.com/btford/write-good";
+    license = lib.licenses.mit;
+    mainProgram = "write-good";
+    maintainers = with lib.maintainers; [ ];
+  };
+}