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

Commits on Mar 21, 2019

  1. zsh: don't export HISTFILE and friends 

    Just set them normally.
Exporting them will propagate them to all executed programs
such as bash (as used by nix-shell or nix run),
and badness ensues when different formats are used.
    @dtzWill
    dtzWill committed Mar 21, 2019
    Copy the full SHA
    173f79f View commit details

Commits on Mar 22, 2019

  1. Merge pull request #58055 from dtzWill/fix/zsh-history-dont-export-vars 

    zsh: don't export HISTFILE and friends
    @Mic92
    Mic92 authored Mar 22, 2019
    Copy the full SHA
    e6ad7ee View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 nixos/modules/programs/zsh/zsh.nix
7 changes: 4 additions & 3 deletions nixos/modules/programs/zsh/zsh.nix
View file
Original file line number Diff line number Diff line change
@@ -189,9 +189,10 @@ in
. /etc/zinputrc
export SAVEHIST=${toString cfg.histSize}
export HISTSIZE=${toString cfg.histSize}
export HISTFILE=${cfg.histFile}
# Don't export these, otherwise other shells (bash) will try to use same histfile
SAVEHIST=${toString cfg.histSize}
HISTSIZE=${toString cfg.histSize}
HISTFILE=${cfg.histFile}
${optionalString (cfg.setOptions != []) "setopt ${concatStringsSep " " cfg.setOptions}"}