stdenv/check-meta: getEnv if the attribute is unset #72376
Merged
+16
−8
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
There were two issues: * builtins.getEnv was called deep into the nixpkgs tree making it hard to discover. This is solved by moving the call into pkgs/top-level/impure.nix * when the config was explicitly set by the user to false, it would still try and load the environment variable. This meant that it was not possible to guarantee the same outcome on two different systems.
ofborg
bot
added
6.topic: stdenv
matthewbauer
approved these changes
Nov 3, 2019
dtzWill
pushed a commit
to dtzWill/nixpkgs
that referenced
this pull request
Nov 3, 2019
There were two issues: * builtins.getEnv was called deep into the nixpkgs tree making it hard to discover. This is solved by moving the call into pkgs/top-level/impure.nix * when the config was explicitly set by the user to false, it would still try and load the environment variable. This meant that it was not possible to guarantee the same outcome on two different systems. (cherry picked from commit 71184f8)
veprbl
reviewed
Nov 4, 2019
| inherit config overlays crossSystem crossOverlays; | ||
| inherit overlays crossSystem crossOverlays; | ||
|
|
||
| config = defaultConfig // config; |
There was a problem hiding this comment.
config can be a function:
nixpkgs/pkgs/top-level/default.nix
Lines 50 to 56 in 71184f8
This broke nix-review.
https://github.com/Mic92/nix-review/blob/33c31f06b4e8e74e1b48e8df8cb8083041ec14ea/nix_review/buildenv.py#L40
There was a problem hiding this comment.
thanks for debugging this and sorry about the breakage!
This was referenced Nov 4, 2019
veprbl
added a commit
that referenced
this pull request
Nov 4, 2019
dtzWill
pushed a commit
to dtzWill/nixpkgs
that referenced
this pull request
Nov 4, 2019
)" (NixOS#72752) This reverts commit 71184f8. (cherry picked from commit cf8a2d0)
zimbatm
added a commit
to zimbatm/nix-review
that referenced
this pull request
Nov 4, 2019
It's not necessary to use a function since we don't use the pkgs attribute. The config can just be an attribute set. Related to NixOS/nixpkgs#72376 (comment)
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.
There were two issues:
to discover. This is solved by moving the call into
pkgs/top-level/impure.nix
still try and load the environment variable. This meant that it was
not possible to guarantee the same outcome on two different systems.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @