Merge branch 'master' into staging

Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
parent 5ad9db0473 961ed7c8b4
commit b4af993c3f
151 changed files with 6654 additions and 1254 deletions
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -183,6 +183,7 @@ let
      isArm = system == "armv5tel-linux"
           || system == "armv6l-linux"
           || system == "armv7l-linux";
+      isBigEndian = system == "powerpc-linux";

      # Whether we should run paxctl to pax-mark binaries.
      needsPax = isLinux;