From 21a09f0493401fe64922f79b1f4708e9967abd4d Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 14 Jul 2026 21:46:46 +0200
Subject: [PATCH] openbao: 2.5.5 -> 2.6.0

https://github.com/openbao/openbao/releases/tag/v2.6.0

diff: https://github.com/openbao/openbao/compare/v2.5.5...v2.6.0
---
 pkgs/by-name/op/openbao/package.nix |  6 ++--
 pkgs/by-name/op/openbao/ui.nix      | 50 +++++++++++++----------------
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index 2ca7c101dd8b..68348dc22ae7 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openbao";
-  version = "2.5.5";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "openbao";
     repo = "openbao";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-75Rm9EGkvUKJ05d55bboPAE+Nm/GLLgH1TqDrExkJO0=";
+    hash = "sha256-FJ+34HeRT025EFwFXY8ewfnJbQirqFb3j+kPNxpGOA4=";
   };
 
-  vendorHash = "sha256-3d3g6f0O7X+aedYCfLbqLNuITKNQuxZkApWTTKSk7lA=";
+  vendorHash = "sha256-O0xx61S0KEk5QB/NsV+kBlErvVuKBfI/81o29rDye1w=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/op/openbao/ui.nix b/pkgs/by-name/op/openbao/ui.nix
index 0a6e634e2b5e..44b2c4e1a377 100644
--- a/pkgs/by-name/op/openbao/ui.nix
+++ b/pkgs/by-name/op/openbao/ui.nix
@@ -1,50 +1,46 @@
 {
   stdenvNoCC,
   openbao,
-  yarn-berry_3,
-  nodejs_22,
+  fetchPnpmDeps,
+  pnpmConfigHook,
+  pnpmBuildHook,
+  pnpm_10,
+  # https://github.com/openbao/openbao/issues/731
+  nodejs-slim_22,
 }:
 let
-
-  yarn = yarn-berry_3.override { nodejs = nodejs_22; };
-
+  nodejs-slim = nodejs-slim_22;
+  pnpm = pnpm_10.override { inherit nodejs-slim; };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = openbao.pname + "-ui";
   inherit (openbao) version src;
   sourceRoot = "${finalAttrs.src.name}/ui";
 
-  offlineCache = yarn.fetchYarnBerryDeps {
-    inherit (finalAttrs) src sourceRoot;
-    hash = "sha256-XK3ZVnzOTbFzrpPgaz1cx7okTycLhrvBHk9P2Nwv1cg=";
-  };
-
   nativeBuildInputs = [
-    yarn.yarnBerryConfigHook
-    nodejs_22
-    yarn
+    pnpmConfigHook
+    pnpmBuildHook
+    pnpm
+    nodejs-slim
   ];
 
-  env.YARN_ENABLE_SCRIPTS = 0;
-
-  preConfigure = ''
-    printYarnErrors() {
-      cat /build/*.log
-    }
-    failureHooks+=(printYarnErrors)
-  '';
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      sourceRoot
+      ;
+    inherit pnpm;
+    fetcherVersion = 4;
+    hash = "sha256-9Q5celZSwMgSS8qcj8sDH/JLv48lgDMOylANvXSnhsU=";
+  };
 
   postConfigure = ''
     substituteInPlace .ember-cli \
       --replace-fail "../http/web_ui" "$out"
   '';
 
-  buildPhase = ''
-    runHook preBuild
-    yarn run ember build --environment=production
-    runHook postBuild
-  '';
-
   dontInstall = true;
 
   meta = (builtins.removeAttrs openbao.meta [ "mainProgram" ]) // {