Merge branch 'master' into staging-next

2018-10-01 19:41:36 +02:00
parent 9c4b11e9a0 83fd9785f6
commit 1383c08f2c
385 changed files with 12348 additions and 6335 deletions
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -240,7 +240,10 @@ in stdenv.mkDerivation {
      '';

    passthru = let
-      pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
+      pythonPackages = callPackage ../../../../../top-level/python-packages.nix {
+        python = self;
+        overrides = packageOverrides;
+      };
    in rec {
      inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch ucsEncoding;
      executable = libPrefix;