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

2016-09-20 17:46:09 +02:00
parent 5f8a330d40 ea1afcd9f4
commit 7a4209c356
216 changed files with 9926 additions and 4020 deletions
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -8,7 +8,7 @@ let
  recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; };
  env = (
  let
-    paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ];
+    paths = stdenv.lib.closePropagation (extraLibs ++ [ python recursivePthLoader ] ) ;
  in buildEnv {
    name = "${python.name}-env";