diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2021-12-15 20:34:04 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-15 20:34:04 -0300 |
| commit | 432864f33c84af53192d4b23ee5871697e57f094 (patch) | |
| tree | f2ff6d0a2db0d97ecbdbdb1756a9856088b216e3 | |
| parent | Merge pull request #150892 from NixOS/backport-150874-to-release-21.11 (diff) | |
| parent | [21.11] vault{,bin}: 1.8.4 -> 1.8.6 (diff) | |
| download | nixpkgs-432864f33c84af53192d4b23ee5871697e57f094.tar.gz | |
Merge pull request #150865 from LeSuisse/21.11-vault-1.8.6
[21.11] vault{,bin}: 1.8.4 -> 1.8.6
| -rw-r--r-- | nixos/tests/vault-postgresql.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/vault/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/security/vault/vault-bin.nix | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/nixos/tests/vault-postgresql.nix b/nixos/tests/vault-postgresql.nix index 071cfd106ffb..2847af13cbf0 100644 --- a/nixos/tests/vault-postgresql.nix +++ b/nixos/tests/vault-postgresql.nix @@ -64,6 +64,6 @@ import ./make-test-python.nix ({ pkgs, ... }: machine.wait_for_unit("vault.service") machine.wait_for_open_port(8200) machine.succeed("vault operator init") - machine.succeed("vault status | grep Sealed | grep true") + machine.succeed("vault status || test $? -eq 2") ''; }) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 1c8682e93bc0..e1926177a04a 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.8.4"; + version = "1.8.6"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-t/BQu6nq0FcmqTc/vo3bTUbVNDqzePqlOMFkl4pD598="; + sha256 = "sha256-IiABP2CZJ7PzllTnln4l++2ShslIhWDkUXdDzMlj3UM="; }; - vendorSha256 = "sha256-9eXDcuVm+N4nenotUtCvyp2qB5uPDwzGHk43Y4uTT14="; + vendorSha256 = "sha256-FMVE2fecmnXIJH2j1UrbUa1S+4hAMUhiRioda/Zbjzs="; subPackages = [ "." ]; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index b67d63938c95..d737fb207b63 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }: let - version = "1.8.4"; + version = "1.8.6"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "sha256-zrCRnIScIWJ8ocrgYPNhtvuX3PBLF9HX0dyZU/zY4yk="; + sha256 = "sha256-HKcUAjL17p24xL+lsWTMASj0sCxDV7H+i1us8415LLE="; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "0sh9q29b0bi5ap6nvll0ykxd5vf4wliksj31cmm4gw5vp90irvl3"; + sha256 = "sha256-MIRgtJAOB3NxaGgBrMkuSdfmr9NRHdwDPcA5wu3OiUU="; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "09nhfdw20g46fnrn82my7a59pfa81dxncxhiswmha3cdy8n0p6wb"; + sha256 = "sha256-Wwz30hVn3KLsAE4tyKn7MGsvsBzvL7IAazj9ML2/wOg="; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "01ra0xrgivf01ff87p0gqmi1flnac9y02x7jpv5j6a9czr1sqw1j"; + sha256 = "sha256-36MXUWZsDRWGGj7D9qnCEPdFXKhAaAbcRFscbRPGrHo="; }; }; |