zsh: don't clobber the environment of non-login shells
Merge branch 'zsh' of git://github.com/ttuegel/nixpkgs

zsh: don't clobber the environment of non-login shells