diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix index 836848227e49..821a758a25f7 100644 --- a/pkgs/by-name/op/openbao/package.nix +++ b/pkgs/by-name/op/openbao/package.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch2, buildGoModule, installShellFiles, versionCheckHook, @@ -15,30 +14,19 @@ buildGoModule (finalAttrs: { pname = "openbao"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "openbao"; repo = "openbao"; tag = "v${finalAttrs.version}"; - hash = "sha256-r3ZopogeRqsgaM/HEKlS6B0ipaDG/5mKUyzGET3P1e0="; + hash = "sha256-VJCKZYBuw6fenTqRDxvLVNMXlPuDEq43WB7TI2RNWvc="; }; - vendorHash = "sha256-D4uZmQKe4VuSpuW8JD5NOOq7Nvx8HRXzyvgzkBhsKLQ="; + vendorHash = "sha256-4SWpWGWoesUCgSpgOpblkxOpPbBC/grC2S1m7R9qasY="; proxyVendor = true; - patches = [ - (fetchpatch2 { - # Temporarily revert upstream raising the min go version to 1.24.6 - # until that go version lands from staging in master. - name = "revert-Bump-to-Go-1.24.6.patch"; - url = "https://github.com/openbao/openbao/commit/85504045ecf2d343b74be2c1cda6c2c0b0d6acff.patch?full_index=1"; - revert = true; - hash = "sha256-tXSnnqrNxgnJ2ya4HjLSh4e+6hdyPgKRsFsmkMNfNRU="; - }) - ]; - subPackages = [ "." ]; tags = lib.optional withHsm "hsm" ++ lib.optional withUi "ui"; diff --git a/pkgs/by-name/op/openbao/ui.nix b/pkgs/by-name/op/openbao/ui.nix index d104c8b979f1..31e229ae1eba 100644 --- a/pkgs/by-name/op/openbao/ui.nix +++ b/pkgs/by-name/op/openbao/ui.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { offlineCache = yarn-berry_3.fetchYarnBerryDeps { inherit (finalAttrs) src sourceRoot; - hash = "sha256-/SKQC+i8tgpYNVJIem8XDp+v7olGbRRgW25UhhLpIu8="; + hash = "sha256-ZG/br4r2YzPPgsysx7MBy1WtUBkar1U84nkKecZ5bvU="; }; nativeBuildInputs = [