chore(deps): bump nixpkgs + home-manager to 26.05-darwin#864
Open
JacobPEvans-personal wants to merge 2 commits into
Open
chore(deps): bump nixpkgs + home-manager to 26.05-darwin#864JacobPEvans-personal wants to merge 2 commits into
JacobPEvans-personal wants to merge 2 commits into
Conversation
…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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:
nixpkgs→nixpkgs-26.05-darwin(top-levelflake.nix+modules/mcp/flake.nix)home-manager→release-26.05(release branch must match the nixpkgs channel)lib/versions.nixstableVersion→26.05(informational, consumed bynixos-release-check.yml/ci-eol-check.yml)home-manager 26.05 breaking change + migration
home-manager 26.05 introduced a native
programs.codex.skillsleaf option (modules/programs/codex.nix), typedeither (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.nixcarried legacymkRenamedOptionModulealiases redirectingprograms.codex.skills.{fromFlakeInputs,local}→programs.agentSkills.*. Those aliases declare child options under the new leaf, so the module system now throws:This failed the
checks.x86_64-linux.module-evalCI check (and every other home-manager-driven regression check) on the Linux runner. Confirmed introduced by the home-manager bump: the same eval succeeds onorigin/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-onlyprograms.codex.skills. The aliases were pure backward-compat redirects; nothing in this repo (or innix-darwin) sets the legacyprograms.codex.skills.*paths, so removing them loses no configuration. Theprograms.gemini.skills.*aliases are kept — home-manager exposes gemini skills atprograms.gemini-cli.skills, notprograms.gemini.skills, so those do not collide (verified empirically).stateVersiontest 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).defaults-regression,options-regression, and the{agent-skills,codex,gemini,mlx,fabric}-defaults-regressionchecks.nix flake checkclean (native; cross-system check builds are skipped on darwin as designed — CI runs them on Linux).FYI (not addressed here, out of scope)
home-manager 26.05 also renamed
programs.codex.custom-instructions→programs.codex.context.modules/codex/default.nix:31still 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 adoptprograms.codex.context.🤖 Generated with Claude Code