bundlerEnv: Fix passthru not being passed-through #317076
Merged
Conversation
This file contains 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
E.g. `pkgs.bundlerEnv { passthru = { ... }; ... }` previously would not
result in the `passthru` attrs not being concatenated onto the returned
derivation. Now it will be.
amarshall
force-pushed
the
bundlerenv-passthru
branch
from
0db7fe5
to
f299deb
Compare
Artturin
reviewed
Jun 17, 2024
| @@ -182,7 +183,7 @@ let | |||
| exit 1 | |||
| ''; | |||
| }; | |||
| }); | |||
| } // passthru); | |||
There was a problem hiding this comment.
This wouldn't add passthru to basicEnvArgs, instead it would add the contents of passthru to it, inherit passthru would add passthru
There's already a passthru defined above so do // to it
There was a problem hiding this comment.
This is appended to the assignment to passthru; passthru = (lib.optionalAttrs … { … } // rec { … } // passthru);.
There was a problem hiding this comment.
OK, I was misled by the env above.
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.
E.g.
pkgs.bundlerEnv { passthru = { ... }; ... }previously would not result in thepassthruattrs not being concatenated onto the returned derivation. Now it will be.(maintainership of this code is unclear, will request reviews from recent contributors)
Description of changes
Things done
Tested by using
bundlerEnvas described above.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.