diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-08-12 09:40:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-12 09:40:30 +0200 |
| commit | 0e7076ecc7ef739ef8dcfc69b502726409fba1b3 (patch) | |
| tree | 92f2a037a0a6da3c43bfe72721b3b38c241a8725 /pkgs | |
| parent | bb3f7d14a17e88e4341872c55d8b32127c6f8101 (diff) | |
| parent | bf2d73ca8471b8b1406ed8701422494963679ba4 (diff) | |
| download | nixlib-0e7076ecc7ef739ef8dcfc69b502726409fba1b3.tar nixlib-0e7076ecc7ef739ef8dcfc69b502726409fba1b3.tar.gz nixlib-0e7076ecc7ef739ef8dcfc69b502726409fba1b3.tar.bz2 nixlib-0e7076ecc7ef739ef8dcfc69b502726409fba1b3.tar.lz nixlib-0e7076ecc7ef739ef8dcfc69b502726409fba1b3.tar.xz nixlib-0e7076ecc7ef739ef8dcfc69b502726409fba1b3.tar.zst nixlib-0e7076ecc7ef739ef8dcfc69b502726409fba1b3.zip | |
Merge pull request #44898 from LnL7/vault-0.10.4
vault: 0.10.3 -> 0.10.4
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/security/vault/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 2c422d516046..a9e8d8fca351 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -9,28 +9,26 @@ let }; in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "16sndzbfciw4bccxm7sc83y2pma2bgsmc1kqyb2hp0jsdy4rl3k4"; + sha256 = "1f11arvj7zp8wwkvv3nn7kyga0ci8psdif6djrnzwjksskdgdbx5"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; - buildPhase = '' + preBuild = '' patchShebangs ./ substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}' sed -i s/'^GIT_DIRTY=.*'/'GIT_DIRTY="+NixOS"'/ scripts/build.sh - mkdir -p src/github.com/hashicorp + mkdir -p .git/hooks src/github.com/hashicorp ln -s $(pwd) src/github.com/hashicorp/vault - mkdir -p .git/hooks - - GOPATH=$(pwd) make + export GOPATH=$(pwd) ''; installPhase = '' @@ -47,6 +45,6 @@ in stdenv.mkDerivation rec { description = "A tool for managing secrets"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem offline pradeepchhetri ]; + maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri ]; }; } |