summary refs log tree commit diff
path: root/pkgs/tools/text
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-11-29 00:01:22 +0000
committerGitHub <noreply@github.com>2021-11-29 00:01:22 +0000
commita0e9d6e2c6ae8b2b210a89bdd9ccee94068e1d5b (patch)
tree122300feab7b678ba6d03b99631883ded0007ee3 /pkgs/tools/text
parent017d32f216c32e06bb4fd36fdaeaf77455548bb6 (diff)
parentf4a5fb66058a6b5a1efa57f78b039b7bd9c44215 (diff)
downloadnixpkgs-a0e9d6e2c6ae8b2b210a89bdd9ccee94068e1d5b.tar
nixpkgs-a0e9d6e2c6ae8b2b210a89bdd9ccee94068e1d5b.tar.gz
nixpkgs-a0e9d6e2c6ae8b2b210a89bdd9ccee94068e1d5b.tar.bz2
nixpkgs-a0e9d6e2c6ae8b2b210a89bdd9ccee94068e1d5b.tar.lz
nixpkgs-a0e9d6e2c6ae8b2b210a89bdd9ccee94068e1d5b.tar.xz
nixpkgs-a0e9d6e2c6ae8b2b210a89bdd9ccee94068e1d5b.tar.zst
nixpkgs-a0e9d6e2c6ae8b2b210a89bdd9ccee94068e1d5b.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r--pkgs/tools/text/difftastic/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix
index f8ceec253a6..ee86bcd635e 100644
--- a/pkgs/tools/text/difftastic/default.nix
+++ b/pkgs/tools/text/difftastic/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "difftastic";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "wilfred";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Arg1n5WFCNGHZay56BvLrPDAvvUKVurVNEKgTzHgIzI=";
+    sha256 = "sha256-A6Z3g6fbYBynyN4OhRrZNO0ZghvT3XnIahdUQ8SE8tU=";
   };
 
-  cargoSha256 = "sha256-ArIyIAxVgGmI+MdkVBo0xihDdw3RlRiPLJOhPcC1KLw=";
+  cargoSha256 = "sha256-6/JwrPymtpj/CXqx3Pe43v+MJTNONArU2WEo/zgJhT4=";
 
   postPatch = ''
     pushd vendor
@@ -30,5 +30,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/Wilfred/difftastic/raw/${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ ethancedwards8 figsoda ];
+    mainProgram = "difft";
   };
 }