diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-13 16:32:16 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-13 16:32:16 +0200 |
| commit | 68052b56195715185efed7ccb91733cb4ae5d5f2 (patch) | |
| tree | fbab87afe7291e00e37a44e420a66cd5927b42f5 /pkgs/development/interpreters/python | |
| parent | d6023f0456de758c8a5c07e65d10e9990a7825b4 (diff) | |
| download | nixlib-68052b56195715185efed7ccb91733cb4ae5d5f2.tar nixlib-68052b56195715185efed7ccb91733cb4ae5d5f2.tar.gz nixlib-68052b56195715185efed7ccb91733cb4ae5d5f2.tar.bz2 nixlib-68052b56195715185efed7ccb91733cb4ae5d5f2.tar.lz nixlib-68052b56195715185efed7ccb91733cb4ae5d5f2.tar.xz nixlib-68052b56195715185efed7ccb91733cb4ae5d5f2.tar.zst nixlib-68052b56195715185efed7ccb91733cb4ae5d5f2.zip | |
python: Pull ensureNewerSourcesHook call to all-packages.nix
Documents the reason why it's needed and also prevents the ensureNewerSourcesHook call being evaluated again and again for every single Python package.
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/build-python-package.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/mk-python-derivation.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index 12d17b2e8322..6a07a006c6b5 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -6,7 +6,7 @@ , wrapPython , setuptools , unzip -, ensureNewerSourcesHook +, ensureNewerSourcesForZipFilesHook , toPythonModule , namePrefix , bootstrapped-pip @@ -19,7 +19,7 @@ let wheel-specific = import ./build-python-package-wheel.nix { }; common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; }; mkPythonDerivation = import ./mk-python-derivation.nix { - inherit lib python wrapPython setuptools unzip ensureNewerSourcesHook toPythonModule namePrefix; + inherit lib python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix; }; in diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index d9cff16f448f..96a9cdf0c615 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -5,7 +5,7 @@ , wrapPython , setuptools , unzip -, ensureNewerSourcesHook +, ensureNewerSourcesForZipFilesHook # Whether the derivation provides a Python module or not. , toPythonModule , namePrefix @@ -69,7 +69,7 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ name = namePrefix + name; - nativeBuildInputs = [ (ensureNewerSourcesHook { year = "1980"; }) ] + nativeBuildInputs = [ ensureNewerSourcesForZipFilesHook ] ++ nativeBuildInputs; buildInputs = [ wrapPython ] |