Skip to content

staging: make wrapProgram<Type> create the right type of wrapper#229154

Merged
vcunat merged 2 commits intoNixOS:stagingfrom
K900:make-correct-wrappers
May 1, 2023
Merged

staging: make wrapProgram<Type> create the right type of wrapper#229154
vcunat merged 2 commits intoNixOS:stagingfrom
K900:make-correct-wrappers

Conversation

@K900
Copy link
Contributor

@K900 K900 commented Apr 30, 2023 •
edited
Loading

Description of changes

This is important when both makeWrapper variants are in the environment and we need to pick a specific one.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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.

@K900 K900 requested a review from Ericson2314 as a code owner April 30, 2023 17:37
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. labels Apr 30, 2023
@ofborg ofborg bot requested a review from lovek323 April 30, 2023 19:10
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Apr 30, 2023
vcunat
vcunat approved these changes May 1, 2023
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

I like this. No deep thoughts, but seems safe enough to stage already.

@vcunat vcunat merged commit 50983f1 into NixOS:staging May 1, 2023
@K900 K900 mentioned this pull request May 4, 2023
Merged
12 tasks
This was referenced May 4, 2023
Closed
Closed
@K900 K900 deleted the make-correct-wrappers branch July 27, 2025 10:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vcunat vcunat vcunat approved these changes

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@lovek323 lovek323 Awaiting requested review from lovek323

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@K900 @vcunat