Loading pkgs/by-name/op/opencode/hashes.json +4 −4 Original line number Diff line number Diff line { "node_modules": { "aarch64-linux": "sha256-nNzDvqsFLJdZYDjvuYAcohnGnqNiGiS1mI9zAeKPr/U=", "x86_64-linux": "sha256-rrW97K4eNtW3gGxu49BdzL6p8/goHBi3IT6z0IcQY0A=", "aarch64-darwin": "sha256-joKBnXYVtDiJeq7sdDZwseXdNIjXM6BO3RqLTvq8kTQ=", "x86_64-darwin": "sha256-6hLqaOP6qxnkUPHsWvlD96SjXRrbqWLeExWwlRgrUdg=" "aarch64-linux": "3yXOsptDRUoyL/FBQu8esD4ipudOA9jyLenNt1WChMU=", "x86_64-linux": "sha256-ocgmxMx+V6uBMLZTrHfYAqO4l38WQVCrQ2AbUWagaoM=", "aarch64-darwin": "sha256-xNU+ucIy84iqmyoWKwwLBIV34TTmH/OGmIbIiNOPM/w=", "x86_64-darwin": "sha256-9kplc7tpWgYnB+4471EBkE2xYF3RkpgKqpg26M6bUPs=" } } pkgs/by-name/op/opencode/package.nix +2 −2 Original line number Diff line number Diff line Loading @@ -14,12 +14,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; version = "1.0.35"; version = "1.0.45"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; hash = "sha256-0IFlFWMPu9ynrpu/bYJK2xOgZc+lCSQOSV2WfD0KY3w="; hash = "sha256-59nsauILNEvQ4Q8ATHKtgTViIWMaFnUyBf7CN6qrtdk="; }; node_modules = stdenvNoCC.mkDerivation { Loading pkgs/by-name/op/opencode/skip-npm-pack.patch +5 −7 Original line number Diff line number Diff line diff --git i/packages/opencode/script/build.ts w/packages/opencode/script/build.ts index 4ce8bfba..5b3da591 100755 index 29706c09..584b00d4 100755 --- i/packages/opencode/script/build.ts +++ w/packages/opencode/script/build.ts @@ -39,17 +39,9 @@ for (const [os, arch] of targets) { @@ -39,15 +39,9 @@ for (const [os, arch] of targets) { const name = `${pkg.name}-${os}-${arch}` await $`mkdir -p dist/${name}/bin` - const opentui = `@opentui/core-${os === "windows" ? "win32" : os}-${arch.replace("-baseline", "")}` - await $`mkdir -p ../../node_modules/${opentui}` - await $`npm pack ${opentui}@${pkg.dependencies["@opentui/core"]}`.cwd( - path.join(dir, "../../node_modules"), - ) - await $`npm pack ${opentui}@${pkg.dependencies["@opentui/core"]}`.cwd(path.join(dir, "../../node_modules")) - await $`tar -xf ../../node_modules/${opentui.replace("@opentui/", "opentui-")}-*.tgz -C ../../node_modules/${opentui} --strip-components=1` + // Skip npm pack - packages already installed in node_modules by Nix Loading @@ -20,5 +18,5 @@ index 4ce8bfba..5b3da591 100755 - await $`tar -xf ../../node_modules/${watcher.replace("@parcel/", "parcel-")}-*.tgz -C ../../node_modules/${watcher} --strip-components=1` + // Skip npm pack - packages already installed in node_modules by Nix const parserWorker = fs.realpathSync( path.resolve(dir, "./node_modules/@opentui/core/parser.worker.js"), const parserWorker = fs.realpathSync(path.resolve(dir, "./node_modules/@opentui/core/parser.worker.js")) const workerPath = "./src/cli/cmd/tui/worker.ts" Loading
pkgs/by-name/op/opencode/hashes.json +4 −4 Original line number Diff line number Diff line { "node_modules": { "aarch64-linux": "sha256-nNzDvqsFLJdZYDjvuYAcohnGnqNiGiS1mI9zAeKPr/U=", "x86_64-linux": "sha256-rrW97K4eNtW3gGxu49BdzL6p8/goHBi3IT6z0IcQY0A=", "aarch64-darwin": "sha256-joKBnXYVtDiJeq7sdDZwseXdNIjXM6BO3RqLTvq8kTQ=", "x86_64-darwin": "sha256-6hLqaOP6qxnkUPHsWvlD96SjXRrbqWLeExWwlRgrUdg=" "aarch64-linux": "3yXOsptDRUoyL/FBQu8esD4ipudOA9jyLenNt1WChMU=", "x86_64-linux": "sha256-ocgmxMx+V6uBMLZTrHfYAqO4l38WQVCrQ2AbUWagaoM=", "aarch64-darwin": "sha256-xNU+ucIy84iqmyoWKwwLBIV34TTmH/OGmIbIiNOPM/w=", "x86_64-darwin": "sha256-9kplc7tpWgYnB+4471EBkE2xYF3RkpgKqpg26M6bUPs=" } }
pkgs/by-name/op/opencode/package.nix +2 −2 Original line number Diff line number Diff line Loading @@ -14,12 +14,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; version = "1.0.35"; version = "1.0.45"; src = fetchFromGitHub { owner = "sst"; repo = "opencode"; tag = "v${finalAttrs.version}"; hash = "sha256-0IFlFWMPu9ynrpu/bYJK2xOgZc+lCSQOSV2WfD0KY3w="; hash = "sha256-59nsauILNEvQ4Q8ATHKtgTViIWMaFnUyBf7CN6qrtdk="; }; node_modules = stdenvNoCC.mkDerivation { Loading
pkgs/by-name/op/opencode/skip-npm-pack.patch +5 −7 Original line number Diff line number Diff line diff --git i/packages/opencode/script/build.ts w/packages/opencode/script/build.ts index 4ce8bfba..5b3da591 100755 index 29706c09..584b00d4 100755 --- i/packages/opencode/script/build.ts +++ w/packages/opencode/script/build.ts @@ -39,17 +39,9 @@ for (const [os, arch] of targets) { @@ -39,15 +39,9 @@ for (const [os, arch] of targets) { const name = `${pkg.name}-${os}-${arch}` await $`mkdir -p dist/${name}/bin` - const opentui = `@opentui/core-${os === "windows" ? "win32" : os}-${arch.replace("-baseline", "")}` - await $`mkdir -p ../../node_modules/${opentui}` - await $`npm pack ${opentui}@${pkg.dependencies["@opentui/core"]}`.cwd( - path.join(dir, "../../node_modules"), - ) - await $`npm pack ${opentui}@${pkg.dependencies["@opentui/core"]}`.cwd(path.join(dir, "../../node_modules")) - await $`tar -xf ../../node_modules/${opentui.replace("@opentui/", "opentui-")}-*.tgz -C ../../node_modules/${opentui} --strip-components=1` + // Skip npm pack - packages already installed in node_modules by Nix Loading @@ -20,5 +18,5 @@ index 4ce8bfba..5b3da591 100755 - await $`tar -xf ../../node_modules/${watcher.replace("@parcel/", "parcel-")}-*.tgz -C ../../node_modules/${watcher} --strip-components=1` + // Skip npm pack - packages already installed in node_modules by Nix const parserWorker = fs.realpathSync( path.resolve(dir, "./node_modules/@opentui/core/parser.worker.js"), const parserWorker = fs.realpathSync(path.resolve(dir, "./node_modules/@opentui/core/parser.worker.js")) const workerPath = "./src/cli/cmd/tui/worker.ts"