Skip to content

rke2: use finalAttrs to avoid let and rec bindings#393720

Merged
wolfgangwalther merged 1 commit intoNixOS:masterfrom
rorosen:rke2-use-final-attrs
Apr 7, 2025
Merged

rke2: use finalAttrs to avoid let and rec bindings#393720
wolfgangwalther merged 1 commit intoNixOS:masterfrom
rorosen:rke2-use-final-attrs

Conversation

@rorosen
Copy link
Contributor

@rorosen rorosen commented Mar 27, 2025

Things done

Use finalAttrs to avoid let and rec bindings. This was proposed in #379844 (comment), but wasn't supported at that time. However, with #390220 this is possible now.

@zimbatm @stefan-bordei

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Mar 27, 2025
Copy link
Member

@zimbatm zimbatm left a comment

Choose a reason for hiding this comment

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

nice, buildGoModule didn't s use to support this

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Mar 28, 2025
@wolfgangwalther
Copy link
Contributor

Needs a rebase to resolve conflict.

@rorosen rorosen force-pushed the rke2-use-final-attrs branch from 62fac51 to f26dc46 Compare April 6, 2025 22:15
@rorosen rorosen force-pushed the rke2-use-final-attrs branch from f26dc46 to cd10b44 Compare April 6, 2025 22:20
@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Apr 6, 2025
@rorosen
Copy link
Contributor Author

rorosen commented Apr 6, 2025

Thanks, conflicts are resolved

@wolfgangwalther
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 393720


x86_64-linux

✅ 1 package built:
  • gclient2nix

aarch64-linux

✅ 1 package built:
  • gclient2nix

x86_64-darwin

✅ 1 package built:
  • gclient2nix

aarch64-darwin

✅ 1 package built:
  • gclient2nix

@wolfgangwalther wolfgangwalther merged commit f5ac72a into NixOS:master Apr 7, 2025
25 of 27 checks passed
@rorosen rorosen deleted the rke2-use-final-attrs branch April 7, 2025 14:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants