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

Conflicts: pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
parent f77abc8b7a 7491fccfe6
commit 7f410ef923
179 changed files with 2646 additions and 601 deletions
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -70,6 +70,6 @@ EOF
    license = "MIT-like";
    homePage = "http://www.zsh.org/";
    maintainers = with stdenv.lib.maintainers; [ chaoflow ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.unix;
  };
 }