Merge pull request #51417 from jvassev/vault

vault: 0.11.2 -> 0.11.5
This commit is contained in:
Jörg Thalheim 2018-12-04 10:58:34 +00:00 committed by GitHub
commit bf90c317ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,23 +1,14 @@
{ stdenv, fetchFromGitHub, go, gox, removeReferencesTo }:
let
# Deprecated since vault 0.8.2: use `vault -autocomplete-install` instead
# to install auto-complete for bash, zsh and fish
vaultBashCompletions = fetchFromGitHub {
owner = "iljaweis";
repo = "vault-bash-completion";
rev = "e2f59b64be1fa5430fa05c91b6274284de4ea77c";
sha256 = "10m75rp3hy71wlmnd88grmpjhqy0pwb9m8wm19l0f463xla54frd";
};
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "vault-${version}";
version = "0.11.2";
version = "0.11.5";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "vault";
rev = "v${version}";
sha256 = "0lckpfp1yw6rfq2cardsp2qjiajg706qjk98cycrlsa5nr2csafa";
sha256 = "1skf9l3a4gwag9gp2vwmniajk8rb05g93s15q5xfwqb6sg6zplfw";
};
nativeBuildInputs = [ go gox removeReferencesTo ];
@ -39,7 +30,7 @@ in stdenv.mkDerivation rec {
cp pkg/*/* $out/bin/
find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
cp ${vaultBashCompletions}/vault-bash-completion.sh $out/share/bash-completion/completions/vault
echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
'';
meta = with stdenv.lib; {