Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/shells/fish/default.nix

@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
     sed -e "s|expr|${coreutils}/bin/expr|" \
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
         -e "s|if which unicode_start|if true|" \
+    '' + stdenv.lib.optionalString stdenv.isLinux ''
         -e "s|unicode_start|${kbd}/bin/unicode_start|" \
   '' + ''
         -i "$out/etc/fish/config.fish"
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
       --replace "| ul" "| ${utillinux}/bin/ul" 
 
     for cur in $out/share/fish/functions/*.fish; do
-      substituteInPlace "$cur" --replace "/usr/bin/getent" "${glibc}/bin/getent" 
+      substituteInPlace "$cur" --replace "/usr/bin/getent" "${glibc.bin}/bin/getent"
     done
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     sed -i "s|(hostname\||(${nettools}/bin/hostname\||" "$out/share/fish/functions/fish_prompt.fish"

pkgs/shells/oh-my-zsh/default.nix

@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   name = "oh-my-zsh-git-${version}";
-  version = "2016-04-06";
+  version = "2016-04-20";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "d310fac7f65d31f7494532201e02ebf67c9d9555";
-    sha256 = "0kx552b0jf5j8qkk1kixdr1z49ly79cvzhdh27848rj3kwb0z8vq";
+    rev = "1b1315a777328095cd8b5f364fd4345eeae7c4bf";
+    sha256 = "0q3w96a9rjxmqknycxjqjs5mi0q2mark8yrfim7snxrf9ajv0ypk";
   };
 
   phases = "installPhase";