diff --git a/flake.nix b/flake.nix index 96f89870d8..01efbe7205 100644 --- a/flake.nix +++ b/flake.nix @@ -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. + # # 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"; }; }; @@ -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; }; diff --git a/infra/nix-darwin/README.md b/infra/nix-darwin/README.md index 926b4db5bb..ad8d39636b 100644 --- a/infra/nix-darwin/README.md +++ b/infra/nix-darwin/README.md @@ -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 ``` @@ -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 ``` diff --git a/infra/nix-darwin/configuration.nix b/infra/nix-darwin/configuration.nix index 923d320969..57ff38686d 100644 --- a/infra/nix-darwin/configuration.nix +++ b/infra/nix-darwin/configuration.nix @@ -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