stdenv.mkDerivation: support structuredAttrs in inputDerivation#361233
Merged
wolfgangwalther merged 1 commit intoNixOS:masterfrom Dec 3, 2024
Merged
Conversation
4 tasks
roberth
reviewed
Dec 3, 2024
Member
roberth
left a comment
There was a problem hiding this comment.
Looks better than my attempt.
Have a suggestion to ease the transition, but otherwise LGTM!
The goal is to print all store references into $out. First, $out itself is not defined with structuredAttrs, but we can work around that with placeholder. Alternatively we could source $stdenv/setup after sourcing the attrs.sh file, but that feels like overkill. To support structuredAttrs we source the attrs.sh file. export will not be enough anymore, because the attrs file sets bash variables, not environment variables. Thus we resort to declare -p. Resolves NixOS#321005
9c6292f to
6648c58
Compare
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The goal is to print all store references into $out.
First, $out itself is not defined with structuredAttrs, but we can work around that with placeholder. Alternatively we could source $stdenv/setup after sourcing the attrs.sh file, but that feels like overkill.
To support structuredAttrs we source the attrs.sh file. export will not be enough anymore, because the attrs file sets bash variables, not environment variables. Thus we resort to declare -p.
Resolves #321005
Supersedes #215173 @roberth
Part of #205690
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-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.