From acfc6f675f5a9d6d530c6a3ccfceb30a010a4edf Mon Sep 17 00:00:00 2001
From: dbeley <6568955+dbeley@users.noreply.github.com>
Date: Thu, 22 Jan 2026 00:20:03 +0100
Subject: [PATCH] opencode: 1.1.25 -> 1.1.30

---
 pkgs/by-name/op/opencode/package.nix          | 15 ++++++----
 .../op/opencode/relax-bun-version-check.patch | 28 -------------------
 2 files changed, 10 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/by-name/op/opencode/relax-bun-version-check.patch

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index b62877f6a9ad..70c18efc5ec3 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -14,12 +14,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.1.25";
+  version = "1.1.30";
   src = fetchFromGitHub {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cvz4HO5vNwA3zWx7zdVfs59Z7vD/00+MMCDbLU5WKpM=";
+    hash = "sha256-RTj64yrVLTFNpVc8MvPAJISOlBo/j2MnuL5jo4VtKWM=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -66,7 +66,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-ojbTZBWM353NLMMHckMjFf+k6TpeOoF/yeQR9dq0nNo=";
+    outputHash = "sha256-5U8lpx3sy6XXgR99IfUqDffIZ8FQ1nxXq5dVwpS+d00=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
@@ -80,12 +80,17 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   ];
 
   patches = [
-    # NOTE: Relax Bun version check to be a warning instead of an error
-    ./relax-bun-version-check.patch
     # NOTE: Remove special and windows build targes
     ./remove-special-and-windows-build-targets.patch
   ];
 
+  postPatch = ''
+    # NOTE: Relax Bun version check to be a warning instead of an error
+    substituteInPlace packages/script/src/index.ts \
+      --replace-fail 'throw new Error(`This script requires bun@''${expectedBunVersionRange}' \
+                     'console.warn(`Warning: This script requires bun@''${expectedBunVersionRange}'
+  '';
+
   configurePhase = ''
     runHook preConfigure
 
diff --git a/pkgs/by-name/op/opencode/relax-bun-version-check.patch b/pkgs/by-name/op/opencode/relax-bun-version-check.patch
deleted file mode 100644
index 5d14f166a15c..000000000000
--- a/pkgs/by-name/op/opencode/relax-bun-version-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0e07ea8225f5667e39c6aa59eea726266f0afab0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
-Date: Thu, 13 Nov 2025 10:16:31 +0100
-Subject: [PATCH] Change Bun version check from error to warning
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
----
- packages/script/src/index.ts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/packages/script/src/index.ts b/packages/script/src/index.ts
-index 141d2b75..de06d0dc 100644
---- a/packages/script/src/index.ts
-+++ b/packages/script/src/index.ts
-@@ -10,7 +10,7 @@ if (!expectedBunVersion) {
- }
- 
- if (process.versions.bun !== expectedBunVersion) {
--  throw new Error(`This script requires bun@${expectedBunVersion}, but you are using bun@${process.versions.bun}`)
-+  console.warn(`Warning: This script expects bun@${expectedBunVersion}, but you are using bun@${process.versions.bun}`)
- }
- 
- const CHANNEL = process.env["OPENCODE_CHANNEL"] ?? (await $`git branch --show-current`.text().then((x) => x.trim()))
--- 
-2.51.0