summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-07-30 13:02:21 +0000
committerGitHub <noreply@github.com>2021-07-30 13:02:21 +0000
commitb71a0d62f7d2965bea3a90525c2bcecbc1e6d45f (patch)
tree3cc903309172db2e2f9f422429b51ff6072f089d /pkgs
parent540377bc134ef1975ac56d6ad7565bd3e362a1ef (diff)
parent7a979a3325733db07f4d91d9dd77b2035d06bfb0 (diff)
downloadnixpkgs-b71a0d62f7d2965bea3a90525c2bcecbc1e6d45f.tar
nixpkgs-b71a0d62f7d2965bea3a90525c2bcecbc1e6d45f.tar.gz
nixpkgs-b71a0d62f7d2965bea3a90525c2bcecbc1e6d45f.tar.bz2
nixpkgs-b71a0d62f7d2965bea3a90525c2bcecbc1e6d45f.tar.lz
nixpkgs-b71a0d62f7d2965bea3a90525c2bcecbc1e6d45f.tar.xz
nixpkgs-b71a0d62f7d2965bea3a90525c2bcecbc1e6d45f.tar.zst
nixpkgs-b71a0d62f7d2965bea3a90525c2bcecbc1e6d45f.zip
Merge pull request #129815 from ethancedwards8/difftastic
difftastic: init at unstable-2021-07-09
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/text/difftastic/default.nix23
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix
new file mode 100644
index 00000000000..3a32f855c0c
--- /dev/null
+++ b/pkgs/tools/text/difftastic/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "difftastic";
+  version = "0.6";
+
+  src = fetchFromGitHub {
+    owner = "wilfred";
+    repo = pname;
+    rev = version;
+    sha256 = "WFvxdRCbTBW1RGn2SvAo2iXn82OO/Z06cZQkIu4eiew=";
+  };
+
+  cargoSha256 = "2hRUfIxNVs4uSrEESas3wvvVsZHVocP8aiO7K0NZ+mY=";
+
+  meta = with lib; {
+    description = "A syntax-aware diff";
+    homepage = "https://github.com/Wilfred/difftastic";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ethancedwards8 ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5623f73b6c..1d8cb59cd9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4235,6 +4235,8 @@ in
 
   diffstat = callPackage ../tools/text/diffstat { };
 
+  difftastic = callPackage ../tools/text/difftastic { };
+
   diffutils = callPackage ../tools/text/diffutils { };
 
   dir2opus = callPackage ../tools/audio/dir2opus {