Skip to content

chore(deps): bump nixpkgs + home-manager to 26.05-darwin#864

Open
JacobPEvans-personal wants to merge 2 commits into
mainfrom
fix/nixpkgs-26.05
Open

chore(deps): bump nixpkgs + home-manager to 26.05-darwin#864
JacobPEvans-personal wants to merge 2 commits into
mainfrom
fix/nixpkgs-26.05

Conversation

@JacobPEvans-personal
Copy link
Copy Markdown
Member

@JacobPEvans-personal JacobPEvans-personal commented May 31, 2026

Summary

Bumps the NixOS channel from 25.11 to 26.05 across the flake, keeping nixpkgs and home-manager in lockstep, and resolves a home-manager 26.05 breaking change that collided with this repo's legacy skills option aliases.

Both channels now on 26.05:

  • nixpkgsnixpkgs-26.05-darwin (top-level flake.nix + modules/mcp/flake.nix)
  • home-managerrelease-26.05 (release branch must match the nixpkgs channel)
  • lib/versions.nix stableVersion26.05 (informational, consumed by nixos-release-check.yml / ci-eol-check.yml)

home-manager 26.05 breaking change + migration

home-manager 26.05 introduced a native programs.codex.skills leaf option (modules/programs/codex.nix), typed either (attrsOf (either lines path)) path, that manages codex-only skills under ~/.codex/skills. A leaf of that type "does not support nested options."

This repo's modules/agent-skills/default.nix carried legacy mkRenamedOptionModule aliases redirecting programs.codex.skills.{fromFlakeInputs,local}programs.agentSkills.*. Those aliases declare child options under the new leaf, so the module system now throws:

error: The option `programs.codex.skills' ... would be a parent of the following
options, but its type ... does not support nested options.
 - option(s) with prefix `programs.codex.skills.fromFlakeInputs' in module `.../modules/agent-skills'
 - option(s) with prefix `programs.codex.skills.local'          in module `.../modules/agent-skills'

This failed the checks.x86_64-linux.module-eval CI check (and every other home-manager-driven regression check) on the Linux runner. Confirmed introduced by the home-manager bump: the same eval succeeds on origin/main (home-manager 25.11).

Migration chosen — drop the colliding codex aliases. nix-ai's real feature is programs.agentSkills.*, a cross-tool skill deployer targeting ~/.agents/skills — distinct from home-manager's codex-only programs.codex.skills. The aliases were pure backward-compat redirects; nothing in this repo (or in nix-darwin) sets the legacy programs.codex.skills.* paths, so removing them loses no configuration. The programs.gemini.skills.* aliases are kept — home-manager exposes gemini skills at programs.gemini-cli.skills, not programs.gemini.skills, so those do not collide (verified empirically). stateVersion test fixtures are intentionally left at 25.11 (plain state-compat markers, no channel-coupling guard — lagging is supported).

Verification

  • nix eval .#checks.x86_64-linux.module-eval.drvPath → returns a valid .drv (previously threw).
  • All home-manager-driven regression checks evaluate: defaults-regression, options-regression, and the {agent-skills,codex,gemini,mlx,fabric}-defaults-regression checks.
  • nix flake check clean (native; cross-system check builds are skipped on darwin as designed — CI runs them on Linux).
  • pre-commit (nixfmt, statix, deadnix) passes; no hooks bypassed.

FYI (not addressed here, out of scope)

home-manager 26.05 also renamed programs.codex.custom-instructionsprograms.codex.context. modules/codex/default.nix:31 still uses the old name; home-manager emits a soft deprecation warning but evaluation succeeds via its own rename alias. Behavior preserved. Worth a follow-up to adopt programs.codex.context.

🤖 Generated with Claude Code

…dex.skills off new leaf option

home-manager 26.05 introduced a native programs.codex.skills leaf option
(type: attrset of str-or-path, or path; deploys to ~/.codex/skills). The
legacy mkRenamedOptionModule aliases at programs.codex.skills.{fromFlakeInputs,
local} tried to declare child options under that leaf, which the module
system rejects ("does not support nested options"), breaking the
check.x86_64-linux.module-eval CI check.

nix-ai is cross-tool via programs.agentSkills.* (deploys to ~/.agents/skills),
distinct from home-manager codex-only skills. Nothing in this repo set the
legacy codex paths, so the aliases are dropped with no behavior change. The
gemini aliases target programs.gemini.skills (home-manager uses
programs.gemini-cli.skills) and do not collide, so they remain.

Bumps home-manager release-25.11 to release-26.05 to match the nixpkgs
channel, and stableVersion to 26.05.
@JacobPEvans-personal JacobPEvans-personal changed the title chore(deps): bump nixpkgs 25.11-darwin → 26.05-darwin chore(deps): bump nixpkgs + home-manager to 26.05-darwin May 31, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant