From 3cd1e89abe362d1a82b115c3417911ed87d794a4 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 2 Mar 2024 19:37:34 +0100 Subject: [PATCH 1/2] vault-bin: 1.15.5 -> 1.15.6 One security fix: https://github.com/hashicorp/vault/pull/25649 Changes: https://github.com/hashicorp/vault/releases/tag/v1.15.6 (cherry picked from commit db88484093a36833df9b48c1bd06f29487e38468) --- pkgs/tools/security/vault/vault-bin.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 88430d8428410..8644949bf68bd 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.15.5"; + version = "1.15.6"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-WchJdMn8PkCu3MydY6ssbXpMCaQBlDbyTQ1kF69KQ+0="; - aarch64-linux = "sha256-tjLyPC156q8y4RKB0+QVIxiXbkW6/qTytCC0WhOo8xU="; - i686-linux = "sha256-TSAhomxTIKSHE0BE1jiL9a15hpGRmF7clFbTwsrDxuk="; - x86_64-darwin = "sha256-vG3S84P7+zvQnIjohPHN3JefN4wM9uDdPqindnwlXpE="; - aarch64-darwin = "sha256-nQsKXD+1gGclUoZLlUpA6k9QuNv/NQ+roRa6kvXCIXQ="; + x86_64-linux = "sha256-qZXR0bqsU0BcM4hWbCZ6vqnjh5pnddl7WTKKBGt1ioU="; + aarch64-linux = "sha256-4f0D+D+rL28mzCN8ku/FWrRFFUevY5yWIgifvZrDbuw="; + i686-linux = "sha256-YoG2NC6cBCunIql7kIRIOs0hU0dIQKIHN/Z27IGj1io="; + x86_64-darwin = "sha256-sdbwnoWZKbq0l86ikfHAR+LYI285IGRiZBB7woD/s/8="; + aarch64-darwin = "sha256-JcTt67eWgORgEmuiBpY5fSGJr8vvCOwKbnOTYZh2fIM="; }; in fetchzip { From fe0aea9310a4aad111089dd2876d0cf8147e4941 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 3 Mar 2024 17:27:59 +0100 Subject: [PATCH 2/2] vault: 1.14.8 -> 1.14.10 One security fix: https://github.com/hashicorp/vault/pull/25649 Changes: https://github.com/hashicorp/vault/releases/tag/v1.14.10 https://github.com/hashicorp/vault/releases/tag/v1.14.9 --- pkgs/tools/security/vault/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index e86c160dbd4bb..bb7fdfa0fc276 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.14.8"; + version = "1.14.10"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-sGCODCBgsxyr96zu9ntPmMM/gHVBBO+oo5+XsdbCK4E="; + hash = "sha256-o3uJwUtSBOS0yQ047R23yupAN1n+VWeaLBhw3Sr5CMc="; }; - vendorHash = "sha256-zpHjZjgCgf4b2FAJQ22eVgq0YGoVvxGYJ3h/3ZRiyrQ="; + vendorHash = "sha256-yp+kSRifg4+Jk7HSG7i9By2LdbSSsYuFAY4S6D74xUI="; proxyVendor = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67108d65c4393..4fd8948ed56d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41365,7 +41365,9 @@ with pkgs; valent = callPackage ../applications/misc/valent { }; - vault = callPackage ../tools/security/vault { }; + vault = callPackage ../tools/security/vault { + buildGoModule = buildGo120Module; + }; vault-medusa = callPackage ../tools/security/vault-medusa { };