diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 09:50:38 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 09:50:38 +0200 |
| commit | fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4 (patch) | |
| tree | 982675c7719f2060a550e80747dfa49c1a9d6b06 /pkgs/tools/security/vault | |
| parent | 98640fd48212f8e6552517f667bba1901f5936d4 (diff) | |
| parent | 81760f32353fa7f309a49fda17d90f43ac1e9a42 (diff) | |
| download | nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.gz nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.bz2 nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.lz nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.xz nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.zst nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security/vault')
| -rw-r--r-- | pkgs/tools/security/vault/default.nix | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 45879ce1f30..c0fa221c969 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,36 +1,25 @@ -{ stdenv, fetchFromGitHub, go, gox, removeReferencesTo }: +{ stdenv, fetchFromGitHub, buildGoModule }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "vault"; - version = "1.1.3"; + version = "1.2.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "0dylwvs95crvn1p7pbyzib979rxzp4ivzvi5k4f5ivp4ygnp597s"; + sha256 = "1xljm7xmb4ldg3wx8s9kw1spffg4ywk4r1jqfa743czd2xxmqavl"; }; - nativeBuildInputs = [ go gox removeReferencesTo ]; + modSha256 = "13pr3piv6hrsc562qagpn1h5wckiziyfqraj13172hdglz3n2i7q"; - 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 .git/hooks src/github.com/hashicorp - ln -s $(pwd) src/github.com/hashicorp/vault - - export GOPATH=$(pwd) - export GOCACHE="$TMPDIR/go-cache" - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/bash-completion/completions - - cp pkg/*/* $out/bin/ - find $out/bin -type f -exec remove-references-to -t ${go} '{}' + + buildFlagsArray = [ + "-tags='vault'" + "-ldflags=\"-X github.com/hashicorp/vault/sdk/version.GitCommit='v${version}'\"" + ]; + postInstall = '' + mkdir -p $out/share/bash-completion/completions echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault ''; |