Nix integration improvements #4193
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
|
Does this not require some changes in documentation? |
|
It does, but I need it to build first! 😃 For some reason Travis won't run on my personal branch anymore... |
cabal2nix recently changed its generated expressions to read the IN_NIX_SHELL environment variable. Now we need to set this variable when calling nix-instantiate to produce the same result as calling nix-shell.
cabal only cares if it is running in a Nix shell that was started by another cabal process, so we should not read IN_NIX_SHELL; rather, we read a cabal-specific variable for that purpose.
Mention that we allow `shell.nix` or `default.nix`, the same as `nix-shell`.
I think it is the branch whitelist: Lines 7 to 15 in 19d9738 |
|
Branches with corresponding PRs shouldn't be affected by the whitelist... |
|
Travis does run on the PR, it just doesn't run on my personal clone anymore (unless I open a PR). That's why I opened this PR before it was really ready. It would be nice if the Travis web interface would indicate that the whitelist is blocking a branch... The branch still appeared in the web interface, so I was very confused why Travis would not build it. |
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 Nix expressions for Cabal and cabal-install are updated. Nix expressions are instantiated in a "fake" Nix shell to cope with environment impurities introduced by newer versions of cabal2nix. cabal looks at the
CABAL_IN_NIX_SHELLenvironment variable instead ofIN_NIX_SHELL; it was pointed out that cabal need not care if it is running insidenix-shellbecause we only care if we are running in a shell created by cabal.