From 3952f1a06eb6ef8c46b6e5ed84a918ec9cd7917c Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Sat, 26 Apr 2025 18:23:13 +0300
Subject: [PATCH 1/2] openbao: Install bash shell completions

---
 pkgs/by-name/op/openbao/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index ab59f23068a4..a66e487207dd 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   buildGoModule,
   go_1_24,
+  installShellFiles,
   versionCheckHook,
   nix-update-script,
   nixosTests,
@@ -43,8 +44,15 @@ buildGoModule.override { go = go_1_24; } (finalAttrs: {
     cp -r --no-preserve=mode ${finalAttrs.passthru.ui} http/web_ui
   '';
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
   postInstall = ''
     mv $out/bin/openbao $out/bin/bao
+
+    # https://github.com/posener/complete/blob/9a4745ac49b29530e07dc2581745a218b646b7a3/cmd/install/bash.go#L8
+    installShellCompletion --bash --name bao <(echo complete -C "$out/bin/bao" bao)
   '';
 
   nativeInstallCheckInputs = [

From f503fd25a09a87925ae34f04c7a4e66098fc245f Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Sun, 27 Apr 2025 00:00:57 +0300
Subject: [PATCH 2/2] openbao: Don't use explicit Go version

---
 pkgs/by-name/op/openbao/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index a66e487207dd..6d0f3262cf10 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildGoModule,
-  go_1_24,
   installShellFiles,
   versionCheckHook,
   nix-update-script,
@@ -13,7 +12,7 @@
   withHsm ? stdenvNoCC.hostPlatform.isLinux,
 }:
 
-buildGoModule.override { go = go_1_24; } (finalAttrs: {
+buildGoModule (finalAttrs: {
   pname = "openbao";
   version = "2.2.1";