JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "python.pkgs.buildPythonPackage: use distutils-cfg to block downloads, fixes #25428"

Browse Source 
This reverts commit b73e3bfafd.

See https://github.com/NixOS/nixpkgs/issues/29103
This commit is contained in:
Frederik Rietdijk 2017-09-08 08:55:05 +02:00
parent dce314e55b
commit c3a0c3c9f1
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/python/mk-python-derivation.nix
View File

@ -6,8 +6,6 @@
, setuptools , setuptools
, unzip , unzip
, ensureNewerSourcesHook , ensureNewerSourcesHook
# Prevent impurities by blocking setuptools/easy-install from downloading sdists
, distutils-cfg
}: }:
{ name { name
@ -62,7 +60,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "checkInputs"
inherit pythonPath; inherit pythonPath;
buildInputs = [ distutils-cfg wrapPython ] ++ buildInputs ++ pythonPath buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath
++ [ (ensureNewerSourcesHook { year = "1980"; }) ] ++ [ (ensureNewerSourcesHook { year = "1980"; }) ]
++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip) ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip)
++ lib.optionals doCheck checkInputs; ++ lib.optionals doCheck checkInputs;

1
pkgs/top-level/python-packages.nix
View File

@ -34,7 +34,6 @@ let
bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { }; bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { };
mkPythonDerivation = makeOverridable( callPackage ../development/interpreters/python/mk-python-derivation.nix { 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`. # Derivations built with `buildPythonPackage` can already be overriden with `override`, `overrideAttrs`, and `overrideDerivation`.