Skip to content

Commit 3a7985c

Browse files
committed
fix(nix): repair three packaging defects on the v2 branch
`nix/opencode.nix` generates completions through `opencode completion`, which v2 removed: the Effect CLI parses it as the optional `directory` argument, so the TUI opens instead and `installShellCompletion` gets a zero-size file. It now uses the global `--completions <shell>` flag, and renames the opencode2 copies because the command name is a build-time define. Fish ships now; `sh` is a synonym for `bash`, so --bash already covers it. `nix/electron.nix` carries the electron 42.10.1 hashes while `packages/desktop/package.json` has moved on twice, to 44.4.5, so the desktop's electron fetchzip cannot resolve. Refreshed from the 44.4.5 SHASUMS256.txt. The headers entry is unchanged: the 44.4.5 and 44.4.3 archives differ but unpack to the same tree, so the recursive hash holds. It was computed the same way the committed 42.10.1 one was, reproducing that value first as a control. `nix/desktop.nix` stages the CLI executable but not the manifest that `packages/desktop/scripts/utils.ts` reads the version from, so `scripts/prebuild.ts` aborts on a missing package.json. Fixes anomalyco#50408
2 parents efbe07b + 7ef4a1a commit 3a7985c

184 files changed

Lines changed: 2374 additions & 531 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bun.lock‎

Lines changed: 42 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎nix/electron.nix‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ let
33
version = (builtins.fromJSON (builtins.readFile ../packages/desktop/package.json)).devDependencies.electron;
44
in
55
(callPackage (path + "/pkgs/development/tools/electron/binary/generic.nix") { }) version {
6-
# Electron 44.4.3 SHASUMS256.txt; update with the desktop package version.
7-
aarch64-linux = "61f084a5ac0f1835efc12b9db17042d92c8c617b03578f96a888acd4a05a0b10";
8-
x86_64-linux = "fe880a7e37160cfd4e00193bc4c713ead7a778abfe74860a2d36d86fd0be48a8";
9-
aarch64-darwin = "6b728f5dcfae74f3f936f2bca5b3cd9b9659ffea464f67939f004acb55425a85";
10-
x86_64-darwin = "015b52631d92187b552ff4e047255f596a7af4707e388a5890951f0b2645764e";
6+
# Electron 44.4.5 SHASUMS256.txt; update with the desktop package version.
7+
aarch64-linux = "3bf0acab49c4ea3c9283cdb86bf3dd7204bd52a6fba6c8ae51101bdba2adae0e";
8+
x86_64-linux = "04586a0ec46c3283fbdaef85530f561f71f0b5e136ad0cb9ef63683615609780";
9+
aarch64-darwin = "a212eee63ba2f45fd83bd28f77a3e3313a336ad17a4c25adf617942eef5e0e2c";
10+
x86_64-darwin = "778350cc572c36484dd56c130cae96ad1a9a5b695ba22dd06abd23ba0a46c9de";
1111
# fetchzip hashes the unpacked headers, not the release tarball.
1212
headers = "sha256-QPkX+99kArlQhhbgOZe+Hsk28G5cadkUy0G0cIDtEh8=";
1313
}

0 commit comments

Comments
 (0)