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

7 files changed, 42 insertions, 68 deletions

diff --git a/nixpkgs/pkgs/tools/text/dt/default.nix b/nixpkgs/pkgs/tools/text/dt/default.nix
index be5a00f3613f..bc4c0dd9938e 100644
--- a/nixpkgs/pkgs/tools/text/dt/default.nix
+++ b/nixpkgs/pkgs/tools/text/dt/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dt";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchFromGitHub {
     owner = "so-dang-cool";
     repo = "dt";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-C6sG8iqXs64x2AWCxKGFPyoXC1Fn4p2eSLWwJAQ8CSc=";
+    hash = "sha256-u9MI6mrP+QXr3VDgmXW7GRkHKCiDoA9HlznTEGNsck4=";
   };
 
   nativeBuildInputs = [ zig_0_11.hook ];
@@ -36,8 +36,10 @@ stdenv.mkDerivation (finalAttrs: {
       In short, dt is intended to be generally useful, with zero pretense of
       elegance.
     '';
+    changelog = "https://github.com/so-dang-cool/dt/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ booniepepper ];
+    platforms = lib.platforms.unix;
     mainProgram = "dt";
   };
 })
diff --git a/nixpkgs/pkgs/tools/text/frangipanni/default.nix b/nixpkgs/pkgs/tools/text/frangipanni/default.nix
index 58da1a4be4df..bb144b8f43e1 100644
--- a/nixpkgs/pkgs/tools/text/frangipanni/default.nix
+++ b/nixpkgs/pkgs/tools/text/frangipanni/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "sha256-jIXyqwZWfCBSDTTodHTct4V5rjYv7h4Vcw7cXOFk17w=";
   };
 
-  vendorSha256 = "sha256-TSN5M/UCTtfoTf1hDCfrJMCFdSwL/NVXssgt4aefom8=";
+  vendorHash = "sha256-TSN5M/UCTtfoTf1hDCfrJMCFdSwL/NVXssgt4aefom8=";
 
   meta = with lib; {
     description = "Convert lines of text into a tree structure";
diff --git a/nixpkgs/pkgs/tools/text/gjo/default.nix b/nixpkgs/pkgs/tools/text/gjo/default.nix
index da8fa212940a..99d988797bfc 100644
--- a/nixpkgs/pkgs/tools/text/gjo/default.nix
+++ b/nixpkgs/pkgs/tools/text/gjo/default.nix
@@ -11,10 +11,10 @@ buildGoModule rec {
     owner = "skanehira";
     repo = "gjo";
     rev = version;
-    sha256 = "07halr0jzds4rya6hlvp45bjf7vg4yf49w5q60mch05hk8qkjjdw";
+    hash = "sha256-vEk5MZqwAMgqMLjwRJwnbx8nVyF3U2iUz0S3L0GmCh4=";
   };
 
-  vendorSha256 = null;
+  vendorHash = null;
 
   meta = with lib; {
     description = "Small utility to create JSON objects";
diff --git a/nixpkgs/pkgs/tools/text/math-review/default.nix b/nixpkgs/pkgs/tools/text/math-review/default.nix
new file mode 100644
index 000000000000..3592aad8bec7
--- /dev/null
+++ b/nixpkgs/pkgs/tools/text/math-review/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, nix-update-script
+, fetchFromGitLab
+, buildNpmPackage
+, nodejs
+}:
+
+buildNpmPackage rec {
+  pname = "math-preview";
+  version = "5.1.1";
+
+  src = fetchFromGitLab {
+    owner = "matsievskiysv";
+    repo = "math-preview";
+    rev = "v${version}";
+    hash = "sha256-P3TZ/D6D2PvwPV6alSrDEQujzgI8DhK4VOuCC0BCIFo=";
+  };
+
+  npmDepsHash = "sha256-GAPhG3haM9UNdj6tCz8I4j7v6rvNbatdu7NjCeENj3s=";
+  dontNpmBuild = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = with lib; {
+    description = "Emacs preview math inline";
+    license = licenses.gpl3Plus;
+    homepage = "https://gitlab.com/matsievskiysv/math-preview";
+    maintainers = with maintainers; [ renesat ];
+    inherit (nodejs.meta) platforms;
+  };
+}
diff --git a/nixpkgs/pkgs/tools/text/pbgopy/default.nix b/nixpkgs/pkgs/tools/text/pbgopy/default.nix
index d4ed4eb0f03a..dad688f1dfb5 100644
--- a/nixpkgs/pkgs/tools/text/pbgopy/default.nix
+++ b/nixpkgs/pkgs/tools/text/pbgopy/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "sha256-P/MFDFMsqSTVErTM9izJJSMIbiOcbQ9Ya10/w6NRcYw=";
   };
 
-  vendorSha256 = "sha256-S2X74My6wyDZOsEYTDilCFaYgV2vQzU0jOAY9cEkJ6A=";
+  vendorHash = "sha256-S2X74My6wyDZOsEYTDilCFaYgV2vQzU0jOAY9cEkJ6A=";
 
   meta = with lib; {
     description = "Copy and paste between devices";
diff --git a/nixpkgs/pkgs/tools/text/shfmt/default.nix b/nixpkgs/pkgs/tools/text/shfmt/default.nix
index eeeae662efc5..0b1457f43b27 100644
--- a/nixpkgs/pkgs/tools/text/shfmt/default.nix
+++ b/nixpkgs/pkgs/tools/text/shfmt/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "sha256-5/WGYsmZAFFdONpViRaqjL/KXyOu618A8S/SqcgZoEU=";
   };
 
-  vendorSha256 = "sha256-V/6wiC0oanytzMGW/lP+t+uz6cMgXRuviDEj7ErQh5k=";
+  vendorHash = "sha256-V/6wiC0oanytzMGW/lP+t+uz6cMgXRuviDEj7ErQh5k=";
 
   subPackages = [ "cmd/shfmt" ];
 
diff --git a/nixpkgs/pkgs/tools/text/ucg/default.nix b/nixpkgs/pkgs/tools/text/ucg/default.nix
deleted file mode 100644
index e546a604252a..000000000000
--- a/nixpkgs/pkgs/tools/text/ucg/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, pkg-config
-, pcre
-}:
-
-stdenv.mkDerivation {
-  pname = "ucg";
-  version = "unstable-2022-09-03";
-
-  src = fetchFromGitHub {
-    owner = "gvansickle";
-    repo = "ucg";
-    rev = "cbb185e8adad6546b7e1c5e9ca59a81f98dca49f";
-    hash = "sha256-Osdyxp8DoEjcr2wQLCPqOQ2zQf/0JWYxaDpZB02ACWo=";
-  };
-
-  outputs = [ "out" "man" ];
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-  ];
-
-  buildInputs = [
-    pcre
-  ];
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    testFile=$(mktemp /tmp/ucg-test.XXXX)
-    echo -ne 'Lorem ipsum dolor sit amet\n2.7182818284590' > $testFile
-    $out/bin/ucg 'dolor' $testFile || { rm $testFile; exit -1; }
-    $out/bin/ucg --ignore-case 'lorem' $testFile || { rm $testFile; exit -1; }
-    $out/bin/ucg --word-regexp '2718' $testFile && { rm $testFile; exit -1; }
-    $out/bin/ucg 'pisum' $testFile && { rm $testFile; exit -1; }
-    rm $testFile
-
-    runHook postInstallCheck
-  '';
-
-  meta =  {
-    homepage = "https://gvansickle.github.io/ucg/";
-    description = "Grep-like tool for searching large bodies of source code";
-    longDescription = ''
-      UniversalCodeGrep (ucg) is an extremely fast grep-like tool specialized
-      for searching large bodies of source code. It is intended to be largely
-      command-line compatible with Ack, to some extent with ag, and where
-      appropriate with grep. Search patterns are specified as PCRE regexes.
-    '';
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
-    platforms = lib.platforms.unix;
-    broken = stdenv.isAarch64 || stdenv.isDarwin;
-  };
-}
-# TODO: report upstream