From c3a0c3c9f1bd6a6f60016dc947446f22abb1e52d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 8 Sep 2017 08:55:05 +0200 Subject: [PATCH] Revert "python.pkgs.buildPythonPackage: use distutils-cfg to block downloads, fixes #25428" This reverts commit b73e3bfafd42dbc9caca2eae918ce936c9471c23. See https://github.com/NixOS/nixpkgs/issues/29103 --- pkgs/development/interpreters/python/mk-python-derivation.nix | 4 +--- pkgs/top-level/python-packages.nix | 1 - 2 files changed, 1 insertion(+), 4 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; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53f3cd82c3d..aebb8e2be77 100644 --- 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`.