diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-26 11:23:18 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-26 11:23:18 -0400 |
commit | e2a20730115c0d36b4b56cdd03cff60f1cfdb369 (patch) | |
tree | dcf0e44daf37f45680199e1d6256cd989ef118e8 /pkgs/development/interpreters/python | |
parent | ab925bf66284c9b81499b75c451592ef66452a76 (diff) | |
parent | 30d24a2e3f82e83cc19234e16c155382fc4b1e1d (diff) | |
download | nixlib-e2a20730115c0d36b4b56cdd03cff60f1cfdb369.tar nixlib-e2a20730115c0d36b4b56cdd03cff60f1cfdb369.tar.gz nixlib-e2a20730115c0d36b4b56cdd03cff60f1cfdb369.tar.bz2 nixlib-e2a20730115c0d36b4b56cdd03cff60f1cfdb369.tar.lz nixlib-e2a20730115c0d36b4b56cdd03cff60f1cfdb369.tar.xz nixlib-e2a20730115c0d36b4b56cdd03cff60f1cfdb369.tar.zst nixlib-e2a20730115c0d36b4b56cdd03cff60f1cfdb369.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/interpreters/python')
5 files changed, 20 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index df8e6ebf89ff..2609c053d95b 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -240,7 +240,10 @@ in stdenv.mkDerivation { ''; passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + pythonPackages = callPackage ../../../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch ucsEncoding; executable = libPrefix; diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index c8a544c601af..18b90cd1da46 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -175,7 +175,10 @@ in stdenv.mkDerivation { ''; passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + pythonPackages = callPackage ../../../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 2de337a83955..92c277aacd4f 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -175,7 +175,10 @@ in stdenv.mkDerivation { ''; passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + pythonPackages = callPackage ../../../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 6b9e26e99fcd..5b5041f5bcd3 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -196,7 +196,10 @@ in stdenv.mkDerivation { ''; passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + pythonPackages = callPackage ../../../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; diff --git a/pkgs/development/interpreters/python/cpython/3.7/default.nix b/pkgs/development/interpreters/python/cpython/3.7/default.nix index adee8d594f18..be503d29b3a7 100644 --- a/pkgs/development/interpreters/python/cpython/3.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.7/default.nix @@ -159,7 +159,10 @@ in stdenv.mkDerivation { ''; passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; + pythonPackages = callPackage ../../../../../top-level/python-packages.nix { + python = self; + overrides = packageOverrides; + }; in rec { inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch; executable = "${libPrefix}m"; |