summary refs log tree commit diff
path: root/pkgs/tools/text
diff options
context:
space:
mode:
authorBernardo Meurer <bernardo@meurer.org>2022-02-09 17:04:58 -0800
committerJonathan Ringer <jonringer@users.noreply.github.com>2022-02-09 19:52:12 -0800
commit4fc58aa24cd526658a1b4c95f4f247f28532d2cc (patch)
treecfde03333e04728966c2775b88d4a6049030faf0 /pkgs/tools/text
parent2770c2f25ae2e8f6ab6204a1ac3f050fbe093642 (diff)
downloadnixpkgs-4fc58aa24cd526658a1b4c95f4f247f28532d2cc.tar
nixpkgs-4fc58aa24cd526658a1b4c95f4f247f28532d2cc.tar.gz
nixpkgs-4fc58aa24cd526658a1b4c95f4f247f28532d2cc.tar.bz2
nixpkgs-4fc58aa24cd526658a1b4c95f4f247f28532d2cc.tar.lz
nixpkgs-4fc58aa24cd526658a1b4c95f4f247f28532d2cc.tar.xz
nixpkgs-4fc58aa24cd526658a1b4c95f4f247f28532d2cc.tar.zst
nixpkgs-4fc58aa24cd526658a1b4c95f4f247f28532d2cc.zip
difftastic: 0.12.0 -> 0.19.0
This also removes our fiddling with the vendored tree-sitter grammars.
It seems like difftastic is _really_ peculiar about the exact version of
the grammar it must use, so let's just leave it to use its vendored
ones.
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r--pkgs/tools/text/difftastic/default.nix17
1 files changed, 3 insertions, 14 deletions
diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix
index ee86bcd635e..729a0900f85 100644
--- a/pkgs/tools/text/difftastic/default.nix
+++ b/pkgs/tools/text/difftastic/default.nix
@@ -2,27 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "difftastic";
-  version = "0.12.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "wilfred";
     repo = pname;
     rev = version;
-    sha256 = "sha256-A6Z3g6fbYBynyN4OhRrZNO0ZghvT3XnIahdUQ8SE8tU=";
+    sha256 = "sha256-pZyQnPIdyS8XkzP9KwGKRjF21YWGgCVNeQSie9g5NcE=";
   };
 
-  cargoSha256 = "sha256-6/JwrPymtpj/CXqx3Pe43v+MJTNONArU2WEo/zgJhT4=";
-
-  postPatch = ''
-    pushd vendor
-    for grammar in */; do
-      if [ -d "${tree-sitter.grammars}/$grammar" ]; then
-        rm -r "$grammar"
-        ln -s "${tree-sitter.grammars}/$grammar"
-      fi
-    done
-    popd
-  '';
+  cargoSha256 = "sha256-VXbCrhoGF6bCzQ02Y1LQkbEVrmIfDIKFWF9vx43tt94=";
 
   meta = with lib; {
     description = "A syntax-aware diff";