-
-
Notifications
You must be signed in to change notification settings - Fork 14.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Backport release-24.05] go: Backport go 1.23 to nixos-24.05 #339654
base: release-24.05
Are you sure you want to change the base?
[Backport release-24.05] go: Backport go 1.23 to nixos-24.05 #339654
Conversation
Please follow the guidelines here for backporting: particularly cherry-picking, the branch to target, and ensuring that stable doesn't have breakage before backporting |
Thanks. Missed a few details there. One thing, there is no single commit that I can pick to cherry pick. I'm backporting the entire package definition. |
4eaaed9
to
be9706f
Compare
Please cherry-pick "properly," instead of adding your own commit message/comments/etc. |
Then you may need to cherry-pick multiple commits. That's fine, but creating an entirely new commit on the release-* branch isn't. |
(cherry picked from commit 2dbd8d8)
Changelog: https://go.dev/doc/devel/release#go1.23 (cherry picked from commit 5a7e12c)
be9706f
to
ae86bdd
Compare
OK, backported everything except for the merge commits. There was a single merge conflict with: d82203f which I resolved the best I could. |
(cherry picked from commit 8a6b616)
Changelog: https://go.dev/doc/devel/release#go1.23 (cherry picked from commit cf4f89e)
ae86bdd
to
ae08f10
Compare
Is this the right way? It just seemed questionable to backport changes which bring in other unrelated changes. |
homepage = "https://go.dev/"; | ||
license = licenses.bsd3; | ||
maintainers = teams.golang.members; | ||
platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi ++ platforms.freebsd; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The reason this is failing the cherrypick, is platforms.wasi
was added here:
which is before go1.23 existed. I opted to not add additional functionality that wasn't part of the strict set of cherrypicks when resolving the merge conflict. Happy to add platforms.wasi to go1.22 if that's desired.
Do we have a chance to get this backported without rebuilding so many packages? #344149 needs a backport for a critical vulnerability where upstream already updated to Go 1.23. |
Ideally we will not backport the whole version bump, but just the patch for traefik. |
Description of changes
go 1.23 is the latest go version.
1.21 has already lost support: https://go.dev/doc/devel/release, this at least gives us some level of ability to take 1.23 and ensure our containers are built with the same go version.
Cherry-picked from: cf4f89e
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.