This repository has been archived by the owner on Oct 15, 2022. It is now read-only.
Fix #23: Call setup hooks (WIP) #75
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
Profpatsch
suggested changes
Jun 5, 2019
|
|
||
| # effectfully accept the new variable's contents | ||
| export "$@"; | ||
| export "${@?}"; |
There was a problem hiding this comment.
Is ${var?} the same as ${var:?}?
Hmm... not sure :) maybe until it is annoying?
Yep! that is why I marked which commit they should be squashed in to. A few more commits are push ed for you to review, once I get a +1 I'll squash |
Profpatsch
approved these changes
Jun 5, 2019
To match what upstream does: https://github.com/NixOS/nixpkgs/blob/e13808f6dee2d4538cfecb15636256d6703b9fc1/pkgs/stdenv/generic/setup.sh#L176-L189 via https://github.com/NixOS/nixpkgs/blob/e13808f6dee2d4538cfecb15636256d6703b9fc1/pkgs/development/compilers/go/setup-hook.sh#L1-L3 It is possible we have a hint here: adding some magic to addToSearchPath might be an effective way to detect and handle these scenarios.
…tead of in the output directly.
…t Go and other tooling uses to append tools to the environment variables
… parameters so we can reconstruct it in the envrc.bash
…sn't have that scoping anyway
…y at the name, vs. a subdirectory
…ypes with shared code
Variable values can contain essentially anything *but* a null byte. This means a delimeter could also use anything but a null byte, and that our format is invalid. Switching to null bytes makes the format safe for even the wackiest of delimeted values.
This was referenced Jun 5, 2019
Merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR adds support for the logged evaluation runner to call setup hooks, and preserve their environment. It is a bit weird as it makes some assumptions about how Nixpkgs works -- but it does work. There is cleanup, documentation, and testing to be done, but give it a go. But maybe don't review the code yet.
The key insight which drove the authoring of this PR was that setupHooks often call
addToSearchPathWithCustomDelimiterwhich very closely mirrors what the direnv hook was doing anyway. This PR overrides that function inside the environment build and captures the parameters, so the direnv hook can append the variable.