diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-08 08:55:05 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-08 08:55:05 +0200 |
| commit | c3a0c3c9f1bd6a6f60016dc947446f22abb1e52d (patch) | |
| tree | d326c1bb237b4ead0ae58590500af5be9c9a329f /pkgs/development | |
| parent | dce314e55bbe2e035c257b5bc1aa2eabd9ffb9ef (diff) | |
| download | nixpkgs-c3a0c3c9f1bd6a6f60016dc947446f22abb1e52d.tar nixpkgs-c3a0c3c9f1bd6a6f60016dc947446f22abb1e52d.tar.gz nixpkgs-c3a0c3c9f1bd6a6f60016dc947446f22abb1e52d.tar.bz2 nixpkgs-c3a0c3c9f1bd6a6f60016dc947446f22abb1e52d.tar.lz nixpkgs-c3a0c3c9f1bd6a6f60016dc947446f22abb1e52d.tar.xz nixpkgs-c3a0c3c9f1bd6a6f60016dc947446f22abb1e52d.tar.zst nixpkgs-c3a0c3c9f1bd6a6f60016dc947446f22abb1e52d.zip | |
Revert "python.pkgs.buildPythonPackage: use distutils-cfg to block downloads, fixes #25428"
This reverts commit b73e3bfafd42dbc9caca2eae918ce936c9471c23. See https://github.com/NixOS/nixpkgs/issues/29103
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/interpreters/python/mk-python-derivation.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index dae465edc0d..bc586e0b3ce 100644 --- 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; |