Skip to content

fix(infra): pin nix-darwin to nix-darwin-24.11 release branch #4907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AceHack merged 2 commits into from
May 25, 2026
Merged

fix(infra): pin nix-darwin to nix-darwin-24.11 release branch #4907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7a22e5
fix(infra): pin nix-darwin to nix-darwin-24.11 release branch (match …
May 25, 2026
f5fff74
fix(docs): chase nix-darwin/master refs to match the new pin
May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,16 @@
flake-utils.url = "github:numtide/flake-utils";

# nix-darwin — module system for maintainer macOS workstations.
# Pinned at master (matches the nix-darwin team's recommendation;
# the project has no stable release channel as of 2026-05).
# MUST be pinned to a release branch matching the nixpkgs release
# we use (nixos-24.11 above → nix-darwin-24.11). nix-darwin
# asserts the branches match at eval time:
# "nix-darwin and Nixpkgs branches in use must match"
# Bump this branch in lockstep with the nixpkgs.url release above.
Comment thread
AceHack marked this conversation as resolved.
#
# Powers `darwinConfigurations.zeta-mac` which activates the
# linux-builder VM for local x86_64-linux ISO builds.
nix-darwin = {
url = "github:nix-darwin/nix-darwin/master";
url = "github:nix-darwin/nix-darwin/nix-darwin-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
};
Expand Down Expand Up @@ -145,7 +149,7 @@
# Parallels / Lima / remote builders.
#
# Apply with:
# nix run nix-darwin/master#darwin-rebuild -- switch --flake .#zeta-mac
# nix run nix-darwin/nix-darwin-24.11#darwin-rebuild -- switch --flake .#zeta-mac
darwinConfigurations.zeta-mac = nix-darwin.lib.darwinSystem {
system = "aarch64-darwin";
specialArgs = { inherit inputs; };
Expand Down
4 changes: 2 additions & 2 deletions infra/nix-darwin/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ remote builder.
## One-command setup

```bash
nix run nix-darwin/master#darwin-rebuild -- switch \
nix run nix-darwin/nix-darwin-24.11#darwin-rebuild -- switch \
--flake /path/to/Zeta#zeta-mac
```

Expand Down Expand Up @@ -55,7 +55,7 @@ reuse the warm VM and the /nix/store cache — typically 1-3 min.
Bump `nix-darwin` master periodically:

```bash
nix run nix-darwin/master#darwin-rebuild -- switch \
nix run nix-darwin/nix-darwin-24.11#darwin-rebuild -- switch \
--flake /path/to/Zeta#zeta-mac --recreate-lock-file
```

Expand Down
2 changes: 1 addition & 1 deletion infra/nix-darwin/configuration.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# walkthrough including prerequisites in
# infra/nix-darwin/README.md (this directory).
#
# nix run nix-darwin/master#darwin-rebuild -- switch \
# nix run nix-darwin/nix-darwin-24.11#darwin-rebuild -- switch \
# --flake /path/to/Zeta#zeta-mac
#
# After the first switch, `nix build .#installer-iso` from the Zeta
Expand Down
Loading