From 0140ba7ec11cc4db4e7dcdfacdb4ef9d0c7c5c64 Mon Sep 17 00:00:00 2001 From: David Wood Date: Thu, 26 Sep 2019 11:46:13 +0100 Subject: [PATCH] diffr: init at 0.1.2 Signed-off-by: David Wood --- pkgs/tools/text/diffr/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/text/diffr/default.nix diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix new file mode 100644 index 000000000000..c032d2e8b361 --- /dev/null +++ b/pkgs/tools/text/diffr/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, rustPlatform, Security }: + +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; + + src = fetchFromGitHub { + owner = "mookid"; + repo = pname; + rev = version; + sha256 = "1fpcyl4kc4djfl6a2jlj56xqra42334vygz8n7614zgjpyxz3zx2"; + }; + + cargoSha256 = "1dddb3a547qnpm1vvrgffb3v9m8sh19hmhy0fg6xjqpm032lqx3v"; + + nativeBuildInputs = []; + buildInputs = (stdenv.lib.optional stdenv.isDarwin Security); + + meta = with stdenv.lib; { + description = "Yet another diff highlighting tool"; + homepage = https://github.com/mookid/diffr; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ davidtwco ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9aabb3a0b8fd..f32a817376a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2630,6 +2630,10 @@ in jdk = jdk8; }; + diffr = callPackage ../tools/text/diffr { + inherit (darwin.apple_sdk.frameworks) Security; + }; + diffstat = callPackage ../tools/text/diffstat { }; diffutils = callPackage ../tools/text/diffutils { };