Merge pull request #117601 from LeSuisse/vault-1.7.0

vault: 1.6.3 -> 1.7.0
This commit is contained in:
Maximilian Bosch 2021-03-27 12:03:57 +01:00 committed by GitHub
commit 591e97bbd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions

View File

@ -2,13 +2,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "vault"; pname = "vault";
version = "1.6.3"; version = "1.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
repo = "vault"; repo = "vault";
rev = "v${version}"; rev = "v${version}";
sha256 = "0ffynqk16bnc4nqnffbid4v72mxafzi0fy4cbrzfs9qfi56vcbm9"; sha256 = "1lsz8fyjcxamvs9n3m974q2jxhv828fb5p6qx8wlqdaahqgrc8qg";
}; };
goPackagePath = "github.com/hashicorp/vault"; goPackagePath = "github.com/hashicorp/vault";

View File

@ -1,26 +1,26 @@
{ lib, stdenv, fetchurl, unzip }: { lib, stdenv, fetchurl, unzip }:
let let
version = "1.6.3"; version = "1.7.0";
sources = let sources = let
base = "https://releases.hashicorp.com/vault/${version}"; base = "https://releases.hashicorp.com/vault/${version}";
in { in {
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "${base}/vault_${version}_linux_amd64.zip"; url = "${base}/vault_${version}_linux_amd64.zip";
sha256 = "0ijc80r9rbbbblmf5s3j5b2kk6zsriyxwhsijhgy86rr6bvdljl4"; sha256 = "0d8wqxqilv1jdf4dl7w2jp3lfh0w0rawidmhjlj3ykpg6l3gblma";
}; };
i686-linux = fetchurl { i686-linux = fetchurl {
url = "${base}/vault_${version}_linux_386.zip"; url = "${base}/vault_${version}_linux_386.zip";
sha256 = "1blma0ywkmv8ykqc4sgcbk1g9jb9rjxqk2b6kmp5z31lilg4a7my"; sha256 = "128r0phm5i1cpayz0ia8qsmnk1ia3qylidy9f8iwk3l8r834s4yd";
}; };
x86_64-darwin = fetchurl { x86_64-darwin = fetchurl {
url = "${base}/vault_${version}_darwin_amd64.zip"; url = "${base}/vault_${version}_darwin_amd64.zip";
sha256 = "1mzkj7ixpzfhn9i4092qw8g38dx4lh3kzp6g4fr5x84sbs6anl3j"; sha256 = "01vxjv95his8jqin2cwcw691wdwn6p876rp021bmvr6diw6clkrp";
}; };
aarch64-linux = fetchurl { aarch64-linux = fetchurl {
url = "${base}/vault_${version}_linux_arm64.zip"; url = "${base}/vault_${version}_linux_arm64.zip";
sha256 = "14l8ic5hgsbq4q1b6832ss1wyrgqwyvgkrvcxbw5nqy5la95fl8i"; sha256 = "0ahdv14fz7ybl11b61z7j13nbjd6hp6fcpc5bk6y8lh4qj8x0pzg";
}; };
}; };
@ -35,9 +35,13 @@ in stdenv.mkDerivation {
sourceRoot = "."; sourceRoot = ".";
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/bin $out/share/bash-completion/completions mkdir -p $out/bin $out/share/bash-completion/completions
mv vault $out/bin mv vault $out/bin
echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault
runHook postInstall
''; '';
meta = with lib; { meta = with lib; {