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

2016-07-05 13:34:36 +03:00
parent de1b4e71c1 aea9c778be
commit 2cf8cb7f46
248 changed files with 15277 additions and 9752 deletions
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -202,6 +202,9 @@ let

      buildInputs = [ python ] ++ deps;

+      # We need to set this for python.buildEnv
+      pythonPath = [];
+
      inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;

      # non-python gdbm has a libintl dependency on i686-cygwin, not on x86_64-cygwin