Merge pull request #44898 from LnL7/vault-0.10.4

vault: 0.10.3 -> 0.10.4
This commit is contained in:
Sarah Brofeldt 2018-08-12 09:40:30 +02:00 committed by GitHub
commit 0e7076ecc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -9,28 +9,26 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "vault-${version}"; name = "vault-${version}";
version = "0.10.3"; version = "0.10.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
repo = "vault"; repo = "vault";
rev = "v${version}"; rev = "v${version}";
sha256 = "16sndzbfciw4bccxm7sc83y2pma2bgsmc1kqyb2hp0jsdy4rl3k4"; sha256 = "1f11arvj7zp8wwkvv3nn7kyga0ci8psdif6djrnzwjksskdgdbx5";
}; };
nativeBuildInputs = [ go gox removeReferencesTo ]; nativeBuildInputs = [ go gox removeReferencesTo ];
buildPhase = '' preBuild = ''
patchShebangs ./ patchShebangs ./
substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}' substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}'
sed -i s/'^GIT_DIRTY=.*'/'GIT_DIRTY="+NixOS"'/ scripts/build.sh 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 ln -s $(pwd) src/github.com/hashicorp/vault
mkdir -p .git/hooks export GOPATH=$(pwd)
GOPATH=$(pwd) make
''; '';
installPhase = '' installPhase = ''
@ -47,6 +45,6 @@ in stdenv.mkDerivation rec {
description = "A tool for managing secrets"; description = "A tool for managing secrets";
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
license = licenses.mpl20; license = licenses.mpl20;
maintainers = with maintainers; [ rushmorem offline pradeepchhetri ]; maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri ];
}; };
} }