diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
commit | a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e (patch) | |
tree | 47950e79183035018882419c4eff5047d1537b99 /nixpkgs/pkgs/tools/text/diffr | |
parent | 5b00523fb58512232b819a301c4309f579c7f09c (diff) | |
parent | 22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff) | |
download | nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.gz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.bz2 nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.lz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.xz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.zst nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.zip |
Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'
Diffstat (limited to 'nixpkgs/pkgs/tools/text/diffr')
-rw-r--r-- | nixpkgs/pkgs/tools/text/diffr/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/tools/text/diffr/default.nix b/nixpkgs/pkgs/tools/text/diffr/default.nix index 9ddaa3468ff3..016cc40977b2 100644 --- a/nixpkgs/pkgs/tools/text/diffr/default.nix +++ b/nixpkgs/pkgs/tools/text/diffr/default.nix @@ -2,26 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "diffr"; - version = "v0.1.2"; - - # diffr's tests expect the diffr binary to be at `$CARGO_MANIFEST_DIR/target/debug/diffr`. - doCheck = false; + version = "v0.1.4"; src = fetchFromGitHub { owner = "mookid"; repo = pname; rev = version; - sha256 = "1fpcyl4kc4djfl6a2jlj56xqra42334vygz8n7614zgjpyxz3zx2"; + sha256 = "18ks5g4bx6iz9hdjxmi6a41ncxpb1hnsscdlddp2gr40k3vgd0pa"; }; - cargoSha256 = "17xgjk8li29b8q8p2bi56klqg0v2q0j6ich438c4p06jrszccx1f"; + cargoSha256 = "09yn02985yv40n9y0ipz0jmj7iqhz7l8hd3ry9ib3fyw9pyklnfa"; - nativeBuildInputs = []; buildInputs = (stdenv.lib.optional stdenv.isDarwin Security); + preCheck = '' + export DIFFR_TESTS_BINARY_PATH=$releaseDir/diffr + ''; + meta = with stdenv.lib; { description = "Yet another diff highlighting tool"; - homepage = https://github.com/mookid/diffr; + homepage = "https://github.com/mookid/diffr"; license = with licenses; [ mit ]; maintainers = with maintainers; [ davidtwco ]; platforms = platforms.all; |