Fish: source NixOS environment on non-login shells + source shell init on NixOS even when parent shell has done so #25835
+19
−12
Conversation
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
therealpxc
changed the title
|
I'll be back in a few hours to check on this, please let me know if there are any problems. |
|
I have just tested this: the problem with mosh and git-annex seems fixed but I'm not sure about environment.shellAliases because I have never used it. They are only loaded in a interactive shell, is that the intended behavior? |
|
Is it just that preventing this from being merged? |
|
Ok, aliases have always worked this way. Yes, I think this is ready to be merged. |
added 2 commits
May 19, 2017 21:00
sourced (this fixes issue NixOS#25789: NixOS#25789 (comment) and the issue with git-annex mentioned here NixOS#24314 (comment) )
…ells this fixes issue NixOS#25800: NixOS#25800
|
Rebased to master. Can we merge this? (Should we then cherry-pick it back to nixos-17.03 since it fixes the outstanding issues named?) |
|
@therealpxc Yes please on both accounts from me. |
|
also backported. |
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.
Motivation for this change
This fixes two new issues (#25800 and #25789) related to fish initialization (they are mentioned in the commit names)
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)This will need to be cherry-picked ahead to the master branch; I am on vacation and with shoddy/expensive/intermittent internet access, so I can't rebase and test on master right now because I'm running nixos-17.03 on this laptop and my connection is too slow for me to rebuild everything and test.