diff --git a/docs/WORKAROUNDS.md b/docs/WORKAROUNDS.md index d3f6f8f1..02f066bd 100644 --- a/docs/WORKAROUNDS.md +++ b/docs/WORKAROUNDS.md @@ -22,7 +22,6 @@ A version or revision pinned for a reason that can go away. | WA-006 | `nixpkgs-blender` — `flake.nix` | Blender 5.2 LTS + CUDA/OptiX pin; keeps `just up` from triggering a full source rebuild | Bump deliberately when needed; drop the pin if the current nixpkgs build is acceptable | 2026-07-24 | deliberate | active | | WA-020 | `fcitx5-vinput` pinned to release tag `v2.4.2` — `flake.nix`; consumer `home/linux/gui/base/vinput/default.nix` | Tracks a release tag instead of a branch, so `just up` stays on that release | Bump to a newer release tag when its changes are wanted | 2026-10-04 | on vinput release | active | | WA-021 | `nix-x86-on-aarch64` input — our fork of rowanG077's patched FEX + muvm runtime — `flake.nix`; `hosts/12kingdoms-shoukei/game/` | FEX does not support 16K pages, so x86/x86_64 apps and games on shoukei need this pinned flake's 4K-page microVM runtime; our fork lets upstream changes be reviewed before use | Drop once FEX supports 16K pages directly, or nixpkgs/nixos-apple-silicon ships an equivalent runtime | 2026-10-07 | on FEX/nixpkgs/muvm update | active | -| WA-023 | `nix.package = pkgs.nixVersions.latest` — `modules/nixos/base/nix.nix` | NixOS is opted into Nix 2.35 (2.35.3), which nixpkgs ships as `nixVersions.latest`, while `nixVersions.stable` is still 2.34 (2.34.9) | Drop the override and fall back to the default `pkgs.nix` once `nixVersions.stable` is 2.35 or newer | 2026-10-07 | eval warning | active | ## Workarounds diff --git a/docs/nixos-modernization-options.md b/docs/nixos-modernization-options.md index cc4b905b..8d3b827c 100644 --- a/docs/nixos-modernization-options.md +++ b/docs/nixos-modernization-options.md @@ -222,9 +222,9 @@ cannot go to a public cache. **Current:** static `nix.buildMachines` (`modules/nixos/base/remote-builders.nix`); the plain user is deliberately not a trusted user on the clients, though the builder host trusts its builder login; -Nix 2.35 via `nixVersions.latest` (WA-023). `auto-allocate-uids` (with `cgroups`) is already enabled -in `modules/nixos/base/nix.nix` for nixpkgs' nspawn-based tests, and the locked nixpkgs has no -`nix-servd` module or package. +Nix 2.35 from nixpkgs' default `nixVersions.stable`. `auto-allocate-uids` (with `cgroups`) is +already enabled in `modules/nixos/base/nix.nix` for nixpkgs' nspawn-based tests, and the locked +nixpkgs has no `nix-servd` module or package. **Proposed:** `nix-servd` for scheduling, plus the `local-overlay-store` experimental feature (`auto-allocate-uids` is already on, see Current). @@ -548,6 +548,6 @@ header) should then be trimmed to **adopt** items only. `services/monitoring/prometheus/exporters.nix`. - NixOS 26.05 release notes; Nix manual, Experimental Features. - Repo context: `docs/SECURITY.md` (trust zones and control limits), `docs/WORKAROUNDS.md` (WA-001, - WA-008, WA-009, WA-023), `modules/nixos/base/networking/mdns.nix`, + WA-008, WA-009), `modules/nixos/base/networking/mdns.nix`, `hosts/12kingdoms-youko/homelab-services/caddy.nix`, `hosts/12kingdoms-youko/homelab-services/README.md`. diff --git a/modules/nixos/base/nix.nix b/modules/nixos/base/nix.nix index d6a51779..99b0f4aa 100644 --- a/modules/nixos/base/nix.nix +++ b/modules/nixos/base/nix.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, nixpkgsConfig, ... }: @@ -13,12 +12,6 @@ let GiB = 1024 * 1024 * 1024; in { - # Nix 2.35 is newer than nixpkgs' nixVersions.stable (still 2.34), so opt into - # the latest released version until stable catches up. - # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/tools/package-management/nix/default.nix - nix.package = pkgs.nixVersions.latest; - warnings = lib.optional (lib.versionAtLeast pkgs.nixVersions.stable.version "2.35") "nixVersions.stable is 2.35+: drop the nixVersions.latest override (WA-023)"; - # https://lix.systems/add-to-config/ # nix.package = pkgs.lix;