summary refs log tree commit diff
path: root/pkgs/tools/security
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-12-04 10:58:34 +0000
committerGitHub <noreply@github.com>2018-12-04 10:58:34 +0000
commitbf90c317ec4b26dc669b783799c9842e3392087c (patch)
tree192a45b5ef4d5fee0e924b72ccbb675e7969fbdb /pkgs/tools/security
parent7dbb64aca4d1ba8879d90acf4090cdc014fda03d (diff)
parent15383e8403c311567ad516fe0f17a3dc4d0c1378 (diff)
downloadnixpkgs-bf90c317ec4b26dc669b783799c9842e3392087c.tar
nixpkgs-bf90c317ec4b26dc669b783799c9842e3392087c.tar.gz
nixpkgs-bf90c317ec4b26dc669b783799c9842e3392087c.tar.bz2
nixpkgs-bf90c317ec4b26dc669b783799c9842e3392087c.tar.lz
nixpkgs-bf90c317ec4b26dc669b783799c9842e3392087c.tar.xz
nixpkgs-bf90c317ec4b26dc669b783799c9842e3392087c.tar.zst
nixpkgs-bf90c317ec4b26dc669b783799c9842e3392087c.zip
Merge pull request #51417 from jvassev/vault
vault: 0.11.2 -> 0.11.5
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r--pkgs/tools/security/vault/default.nix17
1 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 597047a679b..84c35bd36a6 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -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; {