Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: c2846eeac5fb
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 676101456e9c
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 19, 2020

  1. Revert "zsh: don't clobber the environment of non-login shells" 

    This reverts commit 6a756af.

Currently zshenv by default only set fpath and HELPDIR without exporting them.
A parent shell would also not set those variables usually as they are shell local.

It also sources a file called set-environment but this is protected by an
environment variable called __NIXOS_SET_ENVIRONMENT_DONE. Hence any modification
done by the parent shell should persist as long as __NIXOS_SET_ENVIRONMENT_DONE
is not unset.

This behavior deviates from what we do in bashrc and breaks common setups such
as tmux/mosh or screen.

Fixes #80437

(cherry picked from commit 55819e6)
    @Mic92
    Mic92 committed Feb 19, 2020
    Copy the full SHA
    6761014 View commit details
    Browse the repository at this point in the history