diff options
| author | Brandon Elam Barker <beb82@cornell.edu> | 2018-05-04 22:02:55 +0000 |
|---|---|---|
| committer | Brandon Elam Barker <beb82@cornell.edu> | 2018-05-04 22:02:55 +0000 |
| commit | ee270fe647e2dd5f21028dbf5a1f9213a627a149 (patch) | |
| tree | 496d25130b6ccbe16ca2877a1c5e6b2242de8db0 | |
| parent | 77a54ea59fede09c7acb413add8c4f1f75b1dd95 (diff) | |
| download | nixlib-ee270fe647e2dd5f21028dbf5a1f9213a627a149.tar nixlib-ee270fe647e2dd5f21028dbf5a1f9213a627a149.tar.gz nixlib-ee270fe647e2dd5f21028dbf5a1f9213a627a149.tar.bz2 nixlib-ee270fe647e2dd5f21028dbf5a1f9213a627a149.tar.lz nixlib-ee270fe647e2dd5f21028dbf5a1f9213a627a149.tar.xz nixlib-ee270fe647e2dd5f21028dbf5a1f9213a627a149.tar.zst nixlib-ee270fe647e2dd5f21028dbf5a1f9213a627a149.zip | |
confirmed git-secrets is now working
3 files changed, 12 insertions, 5 deletions
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 = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a37de17c6969..9811f33c310c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15969,7 +15969,7 @@ with pkgs; gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); - inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret transcrypt git-crypt; + inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret git-secrets transcrypt git-crypt; gitMinimal = git.override { withManual = false; |