From 8fad939374e1d67a24251667f0a091c02290caec Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Aug 2026 04:50:10 +0000 Subject: [PATCH 1/2] omp: 17.2.15 -> 17.3.3 https://github.com/can1357/oh-my-pi/releases/tag/v17.3.3 Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- packages/omp/bun.nix | 12 ++++++------ packages/omp/hashes.json | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/omp/bun.nix b/packages/omp/bun.nix index 9fa90c2070..578e90323a 100644 --- a/packages/omp/bun.nix +++ b/packages/omp/bun.nix @@ -1643,9 +1643,9 @@ url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; hash = "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; }; - "lucide-react@1.30.0" = fetchurl { - url = "https://registry.npmjs.org/lucide-react/-/lucide-react-1.30.0.tgz"; - hash = "sha512-tUIr2jXLbWpCkdtH8XP7P7YppM9ueWgTky99lpWDY6z5REs6B+O6ZQ3U5tHkUUY59ANyOv/PBcs8E4Fe3KO3eA=="; + "lucide-react@1.31.0" = fetchurl { + url = "https://registry.npmjs.org/lucide-react/-/lucide-react-1.31.0.tgz"; + hash = "sha512-G8u2eEtoHUnUa9f8lbvqDhCiORMnYLdUEo06EEG9MQvHQrInKcX3Pa2TH39MM5qyzRcWETxB0+aOwAPI1g1kEg=="; }; "magic-string@0.30.21" = fetchurl { url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz"; @@ -2067,9 +2067,9 @@ url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz"; hash = "sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A=="; }; - "update-browserslist-db@1.3.0" = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.0.tgz"; - hash = "sha512-x/M6q3w4Ybp91CNaS4S69UnliqR3BzRpOT6LWbksjth0S/+jhfaPJsWjt/TewpT8j9eLIojUf5jr29WextHroA=="; + "update-browserslist-db@1.3.1" = fetchurl { + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.1.tgz"; + hash = "sha512-ZZ61DsRsOnakl74HAmp3oSN4aXUmEWXf+i/yv0h7tIBfICc3VdrFErQKUUKPgu3AMsTUMbcongALEN4l6GSUrQ=="; }; "util-deprecate@1.0.2" = fetchurl { url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; diff --git a/packages/omp/hashes.json b/packages/omp/hashes.json index 7a6024119e..3467c05f42 100644 --- a/packages/omp/hashes.json +++ b/packages/omp/hashes.json @@ -1,5 +1,5 @@ { - "version": "17.2.15", - "hash": "sha256-awBMMm7YDaoO9PrypRTDLUfKUBIDR7xFvv/kWBiV2Q8=", - "cargoHash": "sha256-NJlKB1CEvdjMvQ14XRCJ6IvfAkPsIwXx5vzeQwxtWkk=" + "version": "17.3.3", + "hash": "sha256-2oUmZzf5FTLAxaBhbwCmvJkbIUAz0wv740myNDTtG+0=", + "cargoHash": "sha256-C4PCcRQONfCUWX+6An6G5BCFNEavtdLoTaOtL5NyMbI=" } From efc2361e8a0231076625ac95489619da235aa5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 14 Aug 2026 14:06:16 +0200 Subject: [PATCH 2/2] omp: drop obsolete patches use-bun-executable-template.patch was upstreamed in 17.3.3 (the compile script now takes executablePath natively), which is why it stopped applying. expose-worker-entrypoints.patch has been unreferenced since 0fc3524c2. The Bun template workaround itself stays until nixpkgs ships Bun >= 1.4.0 (#7841). --- packages/omp/expose-worker-entrypoints.patch | 19 --------------- packages/omp/package.nix | 1 - .../omp/use-bun-executable-template.patch | 24 ------------------- 3 files changed, 44 deletions(-) delete mode 100644 packages/omp/expose-worker-entrypoints.patch delete mode 100644 packages/omp/use-bun-executable-template.patch diff --git a/packages/omp/expose-worker-entrypoints.patch b/packages/omp/expose-worker-entrypoints.patch deleted file mode 100644 index 0ba114981b..0000000000 --- a/packages/omp/expose-worker-entrypoints.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/scripts/ci-release-build-binaries.ts b/scripts/ci-release-build-binaries.ts -index fad13b13a..d5ff14d57 100644 ---- a/scripts/ci-release-build-binaries.ts -+++ b/scripts/ci-release-build-binaries.ts -@@ -23,7 +23,7 @@ const entrypoint = "./packages/coding-agent/src/cli.ts"; - // literals at the spawn sites resolve to. Keep this in sync with the dev - // script at `packages/coding-agent/scripts/build-binary.ts`; the - // `issue-1150-repro` test pins both halves of the contract. --const workerEntrypoints = [ -+export const workerEntrypoints = [ - "./packages/stats/src/sync-worker.ts", - "./packages/coding-agent/src/tools/browser/tab-worker-entry.ts", - "./packages/coding-agent/src/eval/js/worker-entry.ts", -@@ -209,4 +209,4 @@ async function main(): Promise { - } - } - --await main(); -+if (import.meta.main) await main(); diff --git a/packages/omp/package.nix b/packages/omp/package.nix index 7e6ec8a3d3..290e6db40b 100644 --- a/packages/omp/package.nix +++ b/packages/omp/package.nix @@ -92,7 +92,6 @@ in stdenv.mkDerivation { pname = "omp"; inherit version src; - patches = [ ./use-bun-executable-template.patch ]; cargoDeps = rustPlatform.fetchCargoVendor { name = "omp-${version}-cargo-vendor"; diff --git a/packages/omp/use-bun-executable-template.patch b/packages/omp/use-bun-executable-template.patch deleted file mode 100644 index d3186438f5..0000000000 --- a/packages/omp/use-bun-executable-template.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/packages/coding-agent/scripts/compile-binary.ts b/packages/coding-agent/scripts/compile-binary.ts -index 36e08ab..fbd7f32 100644 ---- a/packages/coding-agent/scripts/compile-binary.ts -+++ b/packages/coding-agent/scripts/compile-binary.ts -@@ -17,6 +17,8 @@ export interface CodingAgentCompileOptions { - readonly transformersVersion: string; - /** Optional cross-compilation runtime target. */ - readonly target?: Bun.Build.CompileTarget; -+ /** Optional Bun executable used as the standalone runtime template. */ -+ readonly executablePath?: string; - /** Match release builds that minify identifiers while retaining names. */ - readonly minifyIdentifiers?: boolean; - /** Disable Bun's built-in Darwin signing before the caller re-signs. */ -@@ -42,7 +44,9 @@ export async function compileCodingAgent(options: CodingAgentCompileOptions): Pr - }, - plugins: [await createLegacyPiVirtualModulePlugin()], - compile: { -- ...(options.target ? { target: options.target } : {}), -+ ...(options.executablePath -+ ? { executablePath: options.executablePath } -+ : options.target ? { target: options.target } : {}), - outfile: options.outfile, - autoloadBunfig: false, - autoloadDotenv: false,