diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-02 20:09:44 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-04 10:45:22 +0100 |
commit | f665828fa374580f4b2fd725761d23e18f55e526 (patch) | |
tree | 3bae5444b8a2fdec44f7cf41656c6b2e9a9c9b32 /pkgs/top-level | |
parent | 613498af978d65a7497cdd0dfd4f15c834348c61 (diff) | |
download | nixlib-f665828fa374580f4b2fd725761d23e18f55e526.tar nixlib-f665828fa374580f4b2fd725761d23e18f55e526.tar.gz nixlib-f665828fa374580f4b2fd725761d23e18f55e526.tar.bz2 nixlib-f665828fa374580f4b2fd725761d23e18f55e526.tar.lz nixlib-f665828fa374580f4b2fd725761d23e18f55e526.tar.xz nixlib-f665828fa374580f4b2fd725761d23e18f55e526.tar.zst nixlib-f665828fa374580f4b2fd725761d23e18f55e526.zip |
Python: improve cross-compilation
This changeset allows for cross-compilation of Python packages. Packages built with buildPythonPackage are not allowed to refer to the build machine. Executables that have shebangs will refer to the host.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b49b4f45e4f..142173d4725d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7937,6 +7937,7 @@ in python3 = python37; pypy = pypy2; pypy2 = pypy27; + pypy3 = pypy35; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -7954,7 +7955,7 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python {}; - inherit (pythonInterpreters) python27 python35 python36 python37 pypy27 pypy3; + inherit (pythonInterpreters) python27 python35 python36 python37 pypy27 pypy35; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e0e45ea9ecd9..d3aa62faadd2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -43,7 +43,6 @@ let else ff; buildPythonPackage = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix { - inherit bootstrapped-pip; flit = self.flit; # We want Python libraries to be named like e.g. "python3.6-${name}" inherit namePrefix; @@ -51,7 +50,6 @@ let })); buildPythonApplication = makeOverridablePythonPackage ( makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix { - inherit bootstrapped-pip; flit = self.flit; namePrefix = ""; toPythonModule = x: x; # Application does not provide modules. |