Skip to content
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

stdenvAdapters.extendMkDerivationArgs: move from let-in #350350

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

SomeoneSerge
Copy link
Contributor

@SomeoneSerge SomeoneSerge commented Oct 21, 2024

Addresses #306953 but also I needed this to play with ccache

CC @Ericson2314 who I think authored the piece?

Things done

  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

Expose the previously internal extendMkDerivationArgs as a stdenv
adapter for out-of-tree use
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Oct 21, 2024
@nix-owners nix-owners bot requested a review from philiptaron October 21, 2024 21:29
@SomeoneSerge SomeoneSerge force-pushed the feat/extendMkDerivationArgsAdapter branch from 439bb1d to 3a78ad6 Compare October 21, 2024 21:30
requestCcache = extendMkDerivationArgs
(oldAttrs: { requiredSysteFeatures = oldAttrs.requiredSysteFeatures or [ ] ++ [ "ccache" ]; });
*/
extendMkDerivationArgs =
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fwiw overrideMkDerivationArgs would have been a more honest name

Copy link
Contributor

Choose a reason for hiding this comment

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

Hmmm, I think you're right. Internally since extension is passed to overrideAttrs, it's a more descriptive name which hopefully indicates extension can be of the form final: prev: blarg.

@ofborg ofborg 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 Oct 22, 2024
Copy link
Contributor

@ConnorBaker ConnorBaker left a comment

Choose a reason for hiding this comment

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

Looks good to me, but the merge conflict needs to be fixed... and I'm curious about what your thoughts are on renaming the exposed function?



/* Use the trace output to report all processed derivations with their
license name.
licen:se name.
Copy link
Contributor

Choose a reason for hiding this comment

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

Bad find/replace?

requestCcache = extendMkDerivationArgs
(oldAttrs: { requiredSysteFeatures = oldAttrs.requiredSysteFeatures or [ ] ++ [ "ccache" ]; });
*/
extendMkDerivationArgs =
Copy link
Contributor

Choose a reason for hiding this comment

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

Hmmm, I think you're right. Internally since extension is passed to overrideAttrs, it's a more descriptive name which hopefully indicates extension can be of the form final: prev: blarg.

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 1, 2024
@philiptaron philiptaron marked this pull request as draft December 2, 2024 15:40
@philiptaron
Copy link
Contributor

Marking as draft until merge conflicts are resolved. Please ping me when ready again!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: stdenv Standard environment 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants