Skip to content

Commit 973456b

Browse files
committed
build: bump pinned nixpkgs channel from nixos-25.11 to nixos-26.05
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>
1 parent c4f6622 commit 973456b

13 files changed

Lines changed: 48 additions & 34 deletions

File tree

.golangci.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ linters:
9595
# against idiomatic Go programming, which encourages this approach - e.g.
9696
# to scope errors.
9797
- noinlineerr
98+
99+
# Deprecated in favour of gomodguard_v2, which is enabled by default: all
100+
- gomodguard
98101
settings:
99102
depguard:
100103
rules:
@@ -117,6 +120,7 @@ linters:
117120
goconst:
118121
min-len: 3
119122
min-occurrences: 5
123+
ignore-tests: true
120124
gocritic:
121125
enabled-tags:
122126
- performance
@@ -159,7 +163,6 @@ linters:
159163
- gochecknoglobals
160164
- gochecknoinits
161165
- gocognit
162-
- goconst
163166
- gosec
164167
- scopelint
165168
- unparam
@@ -178,6 +181,14 @@ linters:
178181
- gochecknoinits
179182
path: apis/
180183

184+
# The xcrd package builds OpenAPI schemas, so it repeats schema
185+
# vocabulary like "string", "object", and "apiVersion". Each literal
186+
# mirrors the schema field it emits, which reads better than a named
187+
# constant standing in for it.
188+
- linters:
189+
- goconst
190+
path: pkg/xcrd/
191+
181192
# These are performance optimisations rather than style issues per se.
182193
# They warn when function arguments or range values copy a lot of memory
183194
# rather than using a pointer.

apis/changelogs/proto/v1alpha1/changelog.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/changelogs/proto/v1alpha1/changelog_grpc.pb.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/pipelineinspector/proto/v1alpha1/pipeline_inspector.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/pipelineinspector/proto/v1alpha1/pipeline_inspector_grpc.pb.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/proto/v1alpha1/ess.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/proto/v1alpha1/ess_grpc.pb.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
description = "Crossplane Runtime - Go library for building Crossplane providers and controllers";
66

77
inputs = {
8-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
8+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
99
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
1010

1111
# TODO(negz): Unpin once https://github.com/nix-community/gomod2nix/pull/231 is released.
@@ -99,7 +99,7 @@
9999
pkgs.kubernetes-controller-tools
100100

101101
# Nix
102-
pkgs.nixfmt-rfc-style
102+
pkgs.nixfmt
103103
];
104104

105105
shellHook = ''

nix/checks.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
nativeBuildInputs = [
121121
pkgs.statix
122122
pkgs.deadnix
123-
pkgs.nixfmt-rfc-style
123+
pkgs.nixfmt
124124
];
125125
}
126126
''

0 commit comments

Comments
 (0)