Skip to content

Commit b878f97

Browse files
author
Test User
committed
fix(nix): drop x86_64-darwin target
nixpkgs 26.11 removed x86_64-darwin support, so the platform can no longer be built. Advertising it broke the compute-hash matrix leg and skipped the update-hashes job, leaving nix/hashes.json stale (anomalyco#49063). The devShell also pins nodejs_20, which nixpkgs 26.11 turned into a throw stub after its upstream EOL, failing nix flake check on every remaining system. Use the unversioned nodejs so the pin follows nixpkgs instead of having to be bumped again. The electron hash table is indexed by the host system, so its x86_64-darwin entry was unreachable and is removed as well. The update-hashes loop keeps its bootstrap guard so the step still works if nix/hashes.json is absent on the built ref.
1 parent c14a1f5 commit b878f97

6 files changed

Lines changed: 4 additions & 10 deletions

File tree

‎.github/workflows/nix-eval.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
echo "=== Flake structure ==="
3838
nix flake show --all-systems
3939
40-
SYSTEMS="x86_64-linux aarch64-linux x86_64-darwin aarch64-darwin"
40+
SYSTEMS="x86_64-linux aarch64-linux aarch64-darwin"
4141
PACKAGES="opencode"
4242
# TODO: move 'desktop' to PACKAGES when #11755 is fixed
4343
OPTIONAL_PACKAGES="desktop"

‎.github/workflows/nix-hashes.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ jobs:
3434
runner: blacksmith-4vcpu-ubuntu-2404
3535
- system: aarch64-linux
3636
runner: blacksmith-4vcpu-ubuntu-2404-arm
37-
- system: x86_64-darwin
38-
runner: macos-15-intel
3937
- system: aarch64-darwin
4038
runner: macos-latest
4139
runs-on: ${{ matrix.runner }}
@@ -126,7 +124,7 @@ jobs:
126124
127125
[ -f "$HASH_FILE" ] || echo '{"nodeModules":{}}' > "$HASH_FILE"
128126
129-
for SYSTEM in x86_64-linux aarch64-linux x86_64-darwin aarch64-darwin; do
127+
for SYSTEM in x86_64-linux aarch64-linux aarch64-darwin; do
130128
FILE="hashes/hash-${SYSTEM}/hash.txt"
131129
if [ -f "$FILE" ]; then
132130
HASH="$(tr -d '[:space:]' < "$FILE")"

‎flake.nix‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"aarch64-linux"
1313
"x86_64-linux"
1414
"aarch64-darwin"
15-
"x86_64-darwin"
1615
];
1716
forEachSystem = f: nixpkgs.lib.genAttrs systems (system: f nixpkgs.legacyPackages.${system});
1817
rev = self.shortRev or self.dirtyShortRev or "dirty";
@@ -22,7 +21,7 @@
2221
default = pkgs.mkShell {
2322
packages = with pkgs; [
2423
bun
25-
nodejs_20
24+
nodejs
2625
pkg-config
2726
openssl
2827
git

‎nix/electron.nix‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ in
77
aarch64-linux = "20e68d6c4e47f3ebf59de7c6b1f8b8bec6a6ebda6a451132f9b465f3f13ce467";
88
x86_64-linux = "2452b27112d92387471fa2488aafac85d79ea3f2ee1216c0abd5150d6c12362b";
99
aarch64-darwin = "ac7194a3dfd81930ba35355c01620262c1254752859b42dcb8f4b9e4d174a871";
10-
x86_64-darwin = "4489aba55477a0082266cb690db1c829503ba3338048599d8fd243953df37dab";
1110
# fetchzip hashes the unpacked headers, not the release tarball.
1211
headers = "sha256-4eUy3BZVvxTl7KUOsxio7769lL6ag/ecbeK+qLURWMI=";
1312
}

‎nix/hashes.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"nodeModules": {
33
"x86_64-linux": "sha256-7DgxTpKv6ITKTom0mhlJNPQfdEjtEHK5P8uyCr26HZw=",
44
"aarch64-linux": "sha256-PJxW1Ibfx6oS1neWPSHqzP1Pm1HT9my1TrrHmOb6/no=",
5-
"aarch64-darwin": "sha256-VIme5VHfM8JxNiDSOykkr5FytghDLI0FxkhiOXUSyQw=",
6-
"x86_64-darwin": "sha256-rQ/j0QkR1vxAq4jgUbr0nY4RDyiLTJqN8q1AfoiEqVQ="
5+
"aarch64-darwin": "sha256-VIme5VHfM8JxNiDSOykkr5FytghDLI0FxkhiOXUSyQw="
76
}
87
}

‎nix/node_modules.nix‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,5 @@ stdenvNoCC.mkDerivation {
8181
"aarch64-linux"
8282
"x86_64-linux"
8383
"aarch64-darwin"
84-
"x86_64-darwin"
8584
];
8685
}

0 commit comments

Comments
 (0)