From ee270fe647e2dd5f21028dbf5a1f9213a627a149 Mon Sep 17 00:00:00 2001 From: Brandon Elam Barker Date: Fri, 4 May 2018 22:02:55 +0000 Subject: confirmed git-secrets is now working --- .../version-management/git-and-tools/default.nix | 2 ++ .../git-and-tools/git-secrets/default.nix | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 2bd8697c8ec1..13b861d0a9ed 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -89,6 +89,8 @@ rec { git-secret = callPackage ./git-secret { }; + git-secrets = callPackage ./git-secrets { }; + git-stree = callPackage ./git-stree { }; git2cl = callPackage ./git2cl { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix index ac4d2e474b2f..14026df81853 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -10,20 +10,25 @@ in stdenv.mkDerivation { src = fetchFromGitHub { inherit repo; owner = "awslabs"; - rev = "v${version}"; + rev = "${version}"; sha256 = "14jsm4ks3k5d9iq3jr23829izw040pqpmv7dz8fhmvx6qz8fybzg"; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper git]; + # buildPhase = '' + # make man # TODO: need rst2man.py + # ''; + installPhase = '' install -D git-secrets $out/bin/git-secrets wrapProgram $out/bin/git-secrets \ --prefix PATH : "${lib.makeBinPath [ git ]}" - mkdir $out/share - cp -r man $out/share + # TODO: see above note on rst2man.py + # mkdir $out/share + # cp -r man $out/share ''; meta = { -- cgit 1.4.1