Skip to content

build: bump pinned nixpkgs channel from nixos-25.11 to nixos-26.05 - #1108

Merged
jbw976 merged 1 commit into
crossplane:mainfrom
jbw976:nixos-bump
Aug 6, 2026
Merged

build: bump pinned nixpkgs channel from nixos-25.11 to nixos-26.05#1108
jbw976 merged 1 commit into
crossplane:mainfrom
jbw976:nixos-bump

Conversation

@jbw976

@jbw976 jbw976 commented Aug 5, 2026

Copy link
Copy Markdown
Member

Description of your changes

This PR makes the same bump to nixos-26.05 that crossplane/crossplane#7715 does and then follows the same conventions to make updates and handle the fall out from tool bumps that come along with the nixos bump, e.g. updated linters.

The details in crossplane/crossplane#7715 apply here too 🤓

I have:

Need help with this checklist? See the cheat sheet.

@jbw976
jbw976 requested a review from a team as a code owner August 5, 2026 23:42
@jbw976
jbw976 requested a review from negz August 5, 2026 23:42
@coderabbitai

coderabbitai Bot commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: dd3bb897-ad95-40fd-a49c-57c7190dbdaf

📥 Commits

Reviewing files that changed from the base of the PR and between c4f6622 and 973456b.

⛔ Files ignored due to path filters (8)
  • apis/changelogs/proto/v1alpha1/changelog.pb.go is excluded by !**/*.pb.go, !**/*.pb.go and included by **/*.go
  • apis/changelogs/proto/v1alpha1/changelog_grpc.pb.go is excluded by !**/*.pb.go, !**/*.pb.go and included by **/*.go
  • apis/pipelineinspector/proto/v1alpha1/pipeline_inspector.pb.go is excluded by !**/*.pb.go, !**/*.pb.go and included by **/*.go
  • apis/pipelineinspector/proto/v1alpha1/pipeline_inspector_grpc.pb.go is excluded by !**/*.pb.go, !**/*.pb.go and included by **/*.go
  • apis/proto/v1alpha1/ess.pb.go is excluded by !**/*.pb.go, !**/*.pb.go and included by **/*.go
  • apis/proto/v1alpha1/ess_grpc.pb.go is excluded by !**/*.pb.go, !**/*.pb.go and included by **/*.go
  • flake.lock is excluded by !**/*.lock and included by none
  • nix/checks.nix is excluded by none and included by none
📒 Files selected for processing (5)
  • .golangci.yml
  • flake.nix
  • pkg/fieldpath/fieldpath.go
  • pkg/fieldpath/merge.go
  • pkg/reconciler/managed/metrics.go
🚧 Files skipped from review as they are similar to previous changes (5)
  • pkg/fieldpath/merge.go
  • flake.nix
  • pkg/reconciler/managed/metrics.go
  • pkg/fieldpath/fieldpath.go
  • .golangci.yml

📝 Walkthrough

Walkthrough

The changes update lint and Nix tooling configuration, simplify field path formatting, modernize reflection checks, and centralize the managed-resource metric label constant.

Changes

Runtime consistency updates

Layer / File(s) Summary
Lint and Nix tooling configuration
.golangci.yml, flake.nix
Updates lint exclusions, the nixpkgs channel, and the development shell formatter.
Field path and reflection implementation updates
pkg/fieldpath/fieldpath.go, pkg/fieldpath/merge.go
Writes field path segments directly to the builder and uses reflect.Pointer for pointer checks.
Managed-resource metric label consistency
pkg/reconciler/managed/metrics.go
Centralizes the gvk label name for histogram definitions and label generation.

Estimated code review effort: 2 (Simple) | ~10 minutes

Possibly related PRs

Suggested reviewers: negz

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title is 66 characters, clearly describes the nixpkgs channel update, and stays below the 72-character limit.
Description check ✅ Passed The description explains the nixpkgs bump and related tooling updates, which directly match the pull request changes.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Breaking Changes ✅ Passed No exported declarations changed. Non-generated Go changes preserve behavior; changed .pb.go files are generated and excluded by this check.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

The nixos-25.11 channel reached end of life on 2026-06-30 and its branch has not
moved since, so every tool pinned through it is frozen. Renovate fails to make
this change itself, possibly because of renovatebot/renovate#45000.

This commit points the nixpkgs input at nixos-26.05 and refreshes only that
input, leaving nixpkgs-unstable and gomod2nix alone.

Moving the channel moves the whole toolchain, which accounts for the rest of the
diff. protoc-gen-go 1.36.10 to 1.36.11 and protoc-gen-go-grpc 1.5.1 to 1.6.2
regenerate the protobuf output. golangci-lint 2.6.2 to 2.12.2 reports new
findings from goconst. It now ignores tests, which stops occurrences there
inflating its counts, and pkg/xcrd is excluded because its OpenAPI schema
literals read better inline than behind constants. The remaining finding is
addressed in place.

The new toolchain also prints two deprecation warnings, both cleared here.
nixpkgs 26.05 aliases nixfmt-rfc-style to nixfmt, so now we just use nixfmt
directly. golangci-lint deprecates gomodguard in favour of gomodguard_v2, which
default: all already enables, so the deprecated linter joins the disable list.

Signed-off-by: Jared Watts <jbw976@gmail.com>
@coderabbitai

coderabbitai Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

Note

GitHub couldn't provide a complete incremental comparison for this pull request, so CodeRabbit is performing a full review instead. This review may take a little longer.

@adamwg adamwg left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@jbw976
jbw976 merged commit 1280e79 into crossplane:main Aug 6, 2026
9 checks passed
@github-actions

github-actions Bot commented Aug 6, 2026

Copy link
Copy Markdown

Backport failed for release-2.2, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-2.2
git worktree add -d .worktree/backport-1108-to-release-2.2 origin/release-2.2
cd .worktree/backport-1108-to-release-2.2
git switch --create backport-1108-to-release-2.2
git cherry-pick -x 973456b6c2cb63460ca70e9796ac6093669cb9c5

@github-actions

github-actions Bot commented Aug 6, 2026

Copy link
Copy Markdown

Backport failed for release-2.3, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-2.3
git worktree add -d .worktree/backport-1108-to-release-2.3 origin/release-2.3
cd .worktree/backport-1108-to-release-2.3
git switch --create backport-1108-to-release-2.3
git cherry-pick -x 973456b6c2cb63460ca70e9796ac6093669cb9c5

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants