Merge remote-tracking branch 'upstream/master' into staging

2016-04-28 00:13:53 +03:00
parent 7ac1ef05fa 49d1acb50f
commit 4ff8f377af
167 changed files with 48315 additions and 22496 deletions
--- a/pkgs/shells/fish/default.nix
+++ b/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"