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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bd6a3b2160e9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 94afddcdb99e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 19, 2018

  1. Revert "zsh: move setEnvironment stuff to zprofile" 

    This reverts commit 77a6cbb.
    Gregor Kleen committed May 19, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    tilpner Till Höppner
    GPG key ID: 6A13327225BE51F6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    effb021 View commit details

  2. Merge pull request #40759 from pngwjpgh/fix/zshenv 

    Revert "zsh: move setEnvironment stuff to zprofile" (#40223)
    @xeji
    xeji authored May 19, 2018
    Copy the full SHA
    94afddc View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/programs/zsh/zsh.nix
4 changes: 2 additions & 2 deletions nixos/modules/programs/zsh/zsh.nix
View file
Original file line number Diff line number Diff line change
@@ -108,6 +108,8 @@ in
if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
export __ETC_ZSHENV_SOURCED=1
${config.system.build.setEnvironment.text}
${cfge.shellInit}
${cfg.shellInit}
@@ -127,8 +129,6 @@ in
if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi
__ETC_ZPROFILE_SOURCED=1
${config.system.build.setEnvironment.text}
${cfge.loginShellInit}
${cfg.loginShellInit}