summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorfigsoda <figsoda@pm.me>2023-06-21 23:44:14 -0400
committerGitHub <noreply@github.com>2023-06-21 23:44:14 -0400
commitaf27820b14e8368c45667849d3f3c4dac11d6f14 (patch)
tree527dc225e61115980c171e72df96bbfaf1c9c703 /pkgs
parente6825f0b5bbe3207138bf8a449b3b8db1077ce6c (diff)
parent3113ac359f3bf16957ed02b5bd04f408fd18d082 (diff)
downloadnixpkgs-af27820b14e8368c45667849d3f3c4dac11d6f14.tar
nixpkgs-af27820b14e8368c45667849d3f3c4dac11d6f14.tar.gz
nixpkgs-af27820b14e8368c45667849d3f3c4dac11d6f14.tar.bz2
nixpkgs-af27820b14e8368c45667849d3f3c4dac11d6f14.tar.lz
nixpkgs-af27820b14e8368c45667849d3f3c4dac11d6f14.tar.xz
nixpkgs-af27820b14e8368c45667849d3f3c4dac11d6f14.tar.zst
nixpkgs-af27820b14e8368c45667849d3f3c4dac11d6f14.zip
Merge pull request #238696 from johnpyp/init-riffdiff
riffdiff: init at 2.23.3
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/text/riffdiff/default.nix23
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/tools/text/riffdiff/default.nix
new file mode 100644
index 00000000000..7511f69c70c
--- /dev/null
+++ b/pkgs/tools/text/riffdiff/default.nix
@@ -0,0 +1,23 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "riffdiff";
+  version = "2.23.3";
+
+  src = fetchFromGitHub {
+    owner = "walles";
+    repo = "riff";
+    rev = version;
+    hash = "sha256-5C2Q9moFo39zeLK0PkY6S74I/MI8TVpD3tRAaX4TMT4=";
+  };
+
+  cargoHash = "sha256-xHdlU9YXvEvfspDntLLgWr/knAfjMmiWK9JCV9wtIIE=";
+
+  meta = with lib; {
+    description = "A diff filter highlighting which line parts have changed";
+    homepage = "https://github.com/walles/riff";
+    license = licenses.mit;
+    maintainers = with maintainers; [ johnpyp ];
+    mainProgram = "riff";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd093a813e8..21cd109844f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19358,6 +19358,8 @@ with pkgs;
 
   riff = callPackage ../development/tools/misc/riff { };
 
+  riffdiff = callPackage ../tools/text/riffdiff {};
+
   rman = callPackage ../development/tools/misc/rman { };
 
   rnginline = with python3Packages; toPythonApplication rnginline;