Revert "python.pkgs.buildPythonPackage: use distutils-cfg to block do…

…wnloads, fixes #25428" This reverts commit b73e3bf. See #29103 (cherry picked from commit c3a0c3c)
NixOS · Sep 8, 2017 · 85a1d86 · 85a1d86
1 parent 399b610
commit 85a1d86
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -6,8 +6,6 @@
 , setuptools
 , unzip
 , ensureNewerSourcesHook
-# Prevent impurities by blocking setuptools/easy-install from downloading sdists
-, distutils-cfg
 }:
 
 { name
@@ -62,7 +60,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "checkInputs"
 
   inherit pythonPath;
 
-  buildInputs = [ distutils-cfg wrapPython ] ++ buildInputs ++ pythonPath
+  buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath
     ++ [ (ensureNewerSourcesHook { year = "1980"; }) ]
     ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip)
     ++ lib.optionals doCheck checkInputs;

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -34,7 +34,6 @@ let
   bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { };
 
   mkPythonDerivation = makeOverridable( callPackage ../development/interpreters/python/mk-python-derivation.nix {
-    distutils-cfg = callPackage ../development/python-modules/distutils-cfg { };
   });
 
   # Derivations built with `buildPythonPackage` can already be overriden with `override`, `overrideAttrs`, and `overrideDerivation`.