mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 07:31:20 +00:00
Merge pull request #131874 from maxeaubrey/vault_1.8.0
vault{,-bin}: 1.7.3 -> 1.8.0
This commit is contained in:
commit
5416a5bb13
|
@ -1,27 +1,34 @@
|
||||||
{ stdenv, lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests
|
{ stdenv, lib, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, gawk
|
, gawk
|
||||||
, glibc
|
, glibc
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoModule rec {
|
||||||
pname = "vault";
|
pname = "vault";
|
||||||
version = "1.7.3";
|
version = "1.8.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "hashicorp";
|
owner = "hashicorp";
|
||||||
repo = "vault";
|
repo = "vault";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-BO4xzZrX9eVETQWjBDBfP7TlD7sO+gLgbB330A11KAI=";
|
sha256 = "sha256-jyGymAplSe8vaSwbONtpRoAondxNBcRbFZ+YyOtr7qo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
goPackagePath = "github.com/hashicorp/vault";
|
vendorSha256 = "11mrdf7pwf8v7bb7wamv2yhixw4x06rd0qym942kk9bwif2balfp";
|
||||||
|
|
||||||
subPackages = [ "." ];
|
subPackages = [ "." ];
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||||
|
|
||||||
buildFlagsArray = [ "-tags=vault" "-ldflags=-s -w -X ${goPackagePath}/sdk/version.GitCommit=${src.rev}" ];
|
buildFlagsArray = [ "-tags=vault" ];
|
||||||
|
|
||||||
|
ldflags = [
|
||||||
|
"-s" "-w"
|
||||||
|
"-X github.com/hashicorp/vault/sdk/version.GitCommit=${src.rev}"
|
||||||
|
"-X github.com/hashicorp/vault/sdk/version.Version=${version}"
|
||||||
|
"-X github.com/hashicorp/vault/sdk/version.VersionPrerelease="
|
||||||
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
echo "complete -C $out/bin/vault vault" > vault.bash
|
echo "complete -C $out/bin/vault vault" > vault.bash
|
||||||
|
|
|
@ -1,26 +1,26 @@
|
||||||
{ lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }:
|
{ lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "1.7.3";
|
version = "1.8.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 = "sha256-hFMTKpO3VcCondSy8amb1K8G+BZ7gZF/EXCAg5Ax4D8=";
|
sha256 = "sha256-H+kPDE8xuu2lgENf4t+vCb+Tni+ChkB8K5ZEgIY3Jyo=";
|
||||||
};
|
};
|
||||||
i686-linux = fetchurl {
|
i686-linux = fetchurl {
|
||||||
url = "${base}/vault_${version}_linux_386.zip";
|
url = "${base}/vault_${version}_linux_386.zip";
|
||||||
sha256 = "02wbbzffb2m7y3476l5qa5dhi0v30f3sfif0svqhhzh927kg4s5w";
|
sha256 = "19c7d7yr5nm1xgrkh46pcgwwxa6iic6is06n343qaxcj0dfg43kn";
|
||||||
};
|
};
|
||||||
x86_64-darwin = fetchurl {
|
x86_64-darwin = fetchurl {
|
||||||
url = "${base}/vault_${version}_darwin_amd64.zip";
|
url = "${base}/vault_${version}_darwin_amd64.zip";
|
||||||
sha256 = "0sw56dhjbasdnlwg668swhyxrn5gy7h9gysdg96za4dhq3iimkrn";
|
sha256 = "0zql0r6gmq0yqb1cbpjgwsg6cky9y43n5gsvijp6snhnp86bicdr";
|
||||||
};
|
};
|
||||||
aarch64-linux = fetchurl {
|
aarch64-linux = fetchurl {
|
||||||
url = "${base}/vault_${version}_linux_arm64.zip";
|
url = "${base}/vault_${version}_linux_arm64.zip";
|
||||||
sha256 = "0c2w0684adaqildwviajp6pi8vp76g4zwwgc1k2bb5mwv1h2y293";
|
sha256 = "1ajkgkanq8ijcxbb5zbn9z25r0v7qcq13ivjqr0x7ql5bxm3xfmc";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue