diff --git a/full-ai-cluster/README.md b/full-ai-cluster/README.md index 5f3a94e638..d37583849a 100644 --- a/full-ai-cluster/README.md +++ b/full-ai-cluster/README.md @@ -107,7 +107,7 @@ If you're on Apple Silicon and don't yet have the linux-builder running, apply the nix-darwin config first: ```bash -nix run nix-darwin/nix-darwin-24.11#darwin-rebuild -- switch --flake .#zeta-mac +nix run nix-darwin/nix-darwin-25.11#darwin-rebuild -- switch --flake .#zeta-mac ``` ### 2. Write to USB stick diff --git a/full-ai-cluster/flake.lock b/full-ai-cluster/flake.lock new file mode 100644 index 0000000000..1629067fdc --- /dev/null +++ b/full-ai-cluster/flake.lock @@ -0,0 +1,121 @@ +{ + "nodes": { + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1779699611, + "narHash": "sha256-EcCaSTKnmg2o4wLKaN1aqQFomwyhO7ik0bX9COdyCas=", + "owner": "nix-community", + "repo": "disko", + "rev": "5ba0c9555c28685e57fa54c7a25e42c7efdbfc8d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772129556, + "narHash": "sha256-Utk0zd8STPsUJPyjabhzPc5BpPodLTXrwkpXBHYnpeg=", + "owner": "nix-darwin", + "repo": "nix-darwin", + "rev": "ebec37af18215214173c98cf6356d0aca24a2585", + "type": "github" + }, + "original": { + "owner": "nix-darwin", + "ref": "nix-darwin-25.11", + "repo": "nix-darwin", + "type": "github" + } + }, + "nixos-hardware": { + "locked": { + "lastModified": 1779258371, + "narHash": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1779467186, + "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b77b3de8775677f84492abe84635f87b0e153f0f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "disko": "disko", + "flake-utils": "flake-utils", + "nix-darwin": "nix-darwin", + "nixos-hardware": "nixos-hardware", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/full-ai-cluster/flake.nix b/full-ai-cluster/flake.nix index 17cbb13169..cb1cb0376a 100644 --- a/full-ai-cluster/flake.nix +++ b/full-ai-cluster/flake.nix @@ -19,15 +19,22 @@ description = "Zeta full AI cluster — declarative from USB to running workloads"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + # iter-6.0 (B-0800; the maintainer 2026-05-26 "24.11 is a 2 year old + # version you found a 25.11 when you searched latest we need to make + # sure we are on latest too"): bumped from nixos-24.11 (EOL'd + # 2025-06-30) to nixos-25.11 "Xantusia" (current stable; EOL + # 2026-06-30). Per WebSearch + # https://nixos.org/blog/announcements/2025/nixos-2511/ + # validated per `.claude/rules/dep-pin-search-first-authority.md`. + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; flake-utils.url = "github:numtide/flake-utils"; # nix-darwin pinned to matching release branch so Apple Silicon # maintainers can build the x86_64-linux ISO via the linux-builder - # VM (Virtualization.framework + Rosetta 2). + # VM (Virtualization.framework + Rosetta 2). Same bump as nixpkgs. nix-darwin = { - url = "github:nix-darwin/nix-darwin/nix-darwin-24.11"; + url = "github:nix-darwin/nix-darwin/nix-darwin-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -44,7 +51,13 @@ outputs = { self, nixpkgs, nixos-hardware, flake-utils, nix-darwin, disko, ... }@inputs: let - stateVersion = "24.11"; + # iter-6.0 stateVersion bump (B-0800; PC1 + future cluster nodes + # are fresh-install scope per the maintainer 2026-05-26; no + # persistent K8s workloads yet → safe to bump for new hosts. + # Already-installed hosts should NOT bump stateVersion in their + # per-host nixos/hosts//configuration.nix without explicit + # migration handling per the NixOS upgrade guidance). + stateVersion = "25.11"; supportedSystems = [ "x86_64-linux" diff --git a/full-ai-cluster/nixos/hosts/worker-template/default.nix b/full-ai-cluster/nixos/hosts/worker-template/default.nix index 547fe82463..910956870d 100644 --- a/full-ai-cluster/nixos/hosts/worker-template/default.nix +++ b/full-ai-cluster/nixos/hosts/worker-template/default.nix @@ -97,5 +97,5 @@ ]; # ───────────────────────────────────────────────────────────── - system.stateVersion = "24.11"; + system.stateVersion = "25.11"; } diff --git a/full-ai-cluster/nixos/modules/common.nix b/full-ai-cluster/nixos/modules/common.nix index 33319eec18..94feeb8c7a 100644 --- a/full-ai-cluster/nixos/modules/common.nix +++ b/full-ai-cluster/nixos/modules/common.nix @@ -2,7 +2,7 @@ # # Shared baseline every cluster host imports. -{ config, pkgs, lib, stateVersion ? "24.11", ... }: +{ config, pkgs, lib, stateVersion ? "25.11", ... }: { # iter-5.2 (B-0792): per-node hostname injection lives in its own diff --git a/full-ai-cluster/tools/zflash.ts b/full-ai-cluster/tools/zflash.ts index cf1a56f5f8..86201cdee1 100755 --- a/full-ai-cluster/tools/zflash.ts +++ b/full-ai-cluster/tools/zflash.ts @@ -19,7 +19,7 @@ // End-to-end keystrokes after first-time setup: // // $ bun full-ai-cluster/tools/zflash.ts -// ISO: ~/Downloads/zeta-installer-24.11.iso (1.70 GiB) +// ISO: ~/Downloads/zeta-installer-25.11.iso (1.70 GiB) // USB: /dev/disk6 (115 GiB, USB 3.2.1 FD) // *** ALL DATA ON /dev/disk6 WILL BE DESTROYED *** // type: yes a3f9 @@ -408,7 +408,7 @@ function autoDownloadFreshIsoIfNeeded(localIso: string): string { dlDest = join( homedir(), "Downloads", - `zeta-installer-24.11-ci${latest.id}-${latest.updated_at.slice(0, 10)}.iso`, + `zeta-installer-25.11-ci${latest.id}-${latest.updated_at.slice(0, 10)}.iso`, ); if (!existsSync(dlDest)) { execFileSync("cp", [ciIsoSrc, dlDest], { stdio: "inherit" }); diff --git a/full-ai-cluster/usb-nixos-installer/flake.lock b/full-ai-cluster/usb-nixos-installer/flake.lock new file mode 100644 index 0000000000..2420c4f4f3 --- /dev/null +++ b/full-ai-cluster/usb-nixos-installer/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1779467186, + "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b77b3de8775677f84492abe84635f87b0e153f0f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/full-ai-cluster/usb-nixos-installer/flake.nix b/full-ai-cluster/usb-nixos-installer/flake.nix index 715791f2a9..d90243bf3a 100644 --- a/full-ai-cluster/usb-nixos-installer/flake.nix +++ b/full-ai-cluster/usb-nixos-installer/flake.nix @@ -9,13 +9,16 @@ description = "Zeta USB installer — NixOS bootable image for AI-cluster bootstrap"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + # iter-6.0 (B-0800): nixos-25.11 "Xantusia" current stable (bumped + # 2026-05-26 from EOL'd 24.11; matches sibling full-ai-cluster/ + # flake.nix). + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; flake-utils.url = "github:numtide/flake-utils"; }; outputs = { self, nixpkgs, flake-utils, ... }@inputs: let - stateVersion = "24.11"; + stateVersion = "25.11"; in { nixosConfigurations.installer = nixpkgs.lib.nixosSystem { diff --git a/full-ai-cluster/usb-nixos-installer/nixos/installer/configuration.nix b/full-ai-cluster/usb-nixos-installer/nixos/installer/configuration.nix index bb3c1ee0b1..98bb5fc907 100644 --- a/full-ai-cluster/usb-nixos-installer/nixos/installer/configuration.nix +++ b/full-ai-cluster/usb-nixos-installer/nixos/installer/configuration.nix @@ -323,5 +323,5 @@ Reboot when done. ''; - system.stateVersion = "24.11"; + system.stateVersion = "25.11"; }