JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5638dd55e3
nixpkgs/pkgs/development/interpreters/python/default.nix

171 lines
4.3 KiB
Nix
Raw Normal View History

CPython: merge expressions of interpreters Each time a new major/minor version of CPython was released, a new expression would be written, typically copied from the previous release. Often fixes are only made in the current/latest release. By merging the expressions it's more likely that modifications end up in all versions, as is likely intended. This commit introduces one expression for Python 3, and another for 2.7. These two may also be merged, but it will result in a lot of extra conditionals making the expression harder to follow. A common passthru is introduced for CPython and PyPy. python 2.7: use common passthru
2018-12-31 12:59:20 +00:00
{ pkgs, lib }:
with pkgs;
(let
# Common passthru for all Python interpreters.
passthruFun =
{ implementation
, libPrefix
, executable
, sourceVersion
, pythonVersion
, packageOverrides
, sitePackages
python: provide hasCxxDistutils attribute for pythonPackages.numpy Patching numpy.distutils used to be required for pythonPackages.cython to build on darwin. It was later accidentally disabled during one of the refactorings, but that did not break cython. This change reinstantiates the patch. It still applies, so it should be low maintenance and it can still be useful.
2019-04-18 03:57:20 +01:00
, hasDistutilsCxxPatch
CPython: merge expressions of interpreters Each time a new major/minor version of CPython was released, a new expression would be written, typically copied from the previous release. Often fixes are only made in the current/latest release. By merging the expressions it's more likely that modifications end up in all versions, as is likely intended. This commit introduces one expression for Python 3, and another for 2.7. These two may also be merged, but it will result in a lot of extra conditionals making the expression harder to follow. A common passthru is introduced for CPython and PyPy. python 2.7: use common passthru
2018-12-31 12:59:20 +00:00
, pythonForBuild
, self
}: let
pythonPackages = callPackage ../../../top-level/python-packages.nix {
python = self;
overrides = packageOverrides;
};
in rec {
isPy27 = pythonVersion == "2.7";
isPy33 = pythonVersion == "3.3"; # TODO: remove
isPy34 = pythonVersion == "3.4"; # TODO: remove
isPy35 = pythonVersion == "3.5";
isPy36 = pythonVersion == "3.6";
isPy37 = pythonVersion == "3.7";
python: add isPy2 attribute to passthru Some packages relied on it. For consistency, also introduce isPy3 (which is the same as isPy3k).
2019-01-04 11:31:42 +00:00
isPy2 = lib.strings.substring 0 1 pythonVersion == "2";
isPy3 = lib.strings.substring 0 1 pythonVersion == "3";
isPy3k = isPy3;
python: Make .isPyPy flag more accurate. nix-repl> map (s: s.isPyPy) [ python python3 pypy pypy3 ] [ false false true true ]
2019-02-04 08:09:38 +00:00
isPyPy = lib.hasInfix "pypy" interpreter;
CPython: merge expressions of interpreters Each time a new major/minor version of CPython was released, a new expression would be written, typically copied from the previous release. Often fixes are only made in the current/latest release. By merging the expressions it's more likely that modifications end up in all versions, as is likely intended. This commit introduces one expression for Python 3, and another for 2.7. These two may also be merged, but it will result in a lot of extra conditionals making the expression harder to follow. A common passthru is introduced for CPython and PyPy. python 2.7: use common passthru
2018-12-31 12:59:20 +00:00
buildEnv = callPackage ./wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
withPackages = import ./with-packages.nix { inherit buildEnv pythonPackages;};
pkgs = pythonPackages;
interpreter = "${self}/bin/${executable}";
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.
2019-01-02 19:09:44 +00:00
inherit executable implementation libPrefix pythonVersion sitePackages;
CPython: merge expressions of interpreters Each time a new major/minor version of CPython was released, a new expression would be written, typically copied from the previous release. Often fixes are only made in the current/latest release. By merging the expressions it's more likely that modifications end up in all versions, as is likely intended. This commit introduces one expression for Python 3, and another for 2.7. These two may also be merged, but it will result in a lot of extra conditionals making the expression harder to follow. A common passthru is introduced for CPython and PyPy. python 2.7: use common passthru
2018-12-31 12:59:20 +00:00
inherit sourceVersion;
pythonAtLeast = lib.versionAtLeast pythonVersion;
pythonOlder = lib.versionOlder pythonVersion;
python: provide hasCxxDistutils attribute for pythonPackages.numpy Patching numpy.distutils used to be required for pythonPackages.cython to build on darwin. It was later accidentally disabled during one of the refactorings, but that did not break cython. This change reinstantiates the patch. It still applies, so it should be low maintenance and it can still be useful.
2019-04-18 03:57:20 +01:00
inherit hasDistutilsCxxPatch pythonForBuild;
CPython: merge expressions of interpreters Each time a new major/minor version of CPython was released, a new expression would be written, typically copied from the previous release. Often fixes are only made in the current/latest release. By merging the expressions it's more likely that modifications end up in all versions, as is likely intended. This commit introduces one expression for Python 3, and another for 2.7. These two may also be merged, but it will result in a lot of extra conditionals making the expression harder to follow. A common passthru is introduced for CPython and PyPy. python 2.7: use common passthru
2018-12-31 12:59:20 +00:00
};
in {
python27 = callPackage ./cpython/2.7 {
self = python27;
sourceVersion = {
major = "2";
minor = "7";
python: 2.7.15 -> 2.7.16
2019-03-04 07:56:15 +00:00
patch = "16";
CPython: merge expressions of interpreters Each time a new major/minor version of CPython was released, a new expression would be written, typically copied from the previous release. Often fixes are only made in the current/latest release. By merging the expressions it's more likely that modifications end up in all versions, as is likely intended. This commit introduces one expression for Python 3, and another for 2.7. These two may also be merged, but it will result in a lot of extra conditionals making the expression harder to follow. A common passthru is introduced for CPython and PyPy. python 2.7: use common passthru
2018-12-31 12:59:20 +00:00
suffix = "";
};
python: 2.7.15 -> 2.7.16
2019-03-04 07:56:15 +00:00
sha256 = "1mqfcqp5y8r0bfyr7ppl74n0lig45p9mc4b8adlcpvj74rhfy8pj";
CPython: merge expressions of interpreters Each time a new major/minor version of CPython was released, a new expression would be written, typically copied from the previous release. Often fixes are only made in the current/latest release. By merging the expressions it's more likely that modifications end up in all versions, as is likely intended. This commit introduces one expression for Python 3, and another for 2.7. These two may also be merged, but it will result in a lot of extra conditionals making the expression harder to follow. A common passthru is introduced for CPython and PyPy. python 2.7: use common passthru
2018-12-31 12:59:20 +00:00
inherit (darwin) CF configd;
inherit passthruFun;
};
python35 = callPackage ./cpython {
self = python35;
sourceVersion = {
major = "3";
minor = "5";
python35 -> 3.5.6 -> 3.5.7
2019-03-23 07:42:38 +00:00
patch = "7";
CPython: merge expressions of interpreters Each time a new major/minor version of CPython was released, a new expression would be written, typically copied from the previous release. Often fixes are only made in the current/latest release. By merging the expressions it's more likely that modifications end up in all versions, as is likely intended. This commit introduces one expression for Python 3, and another for 2.7. These two may also be merged, but it will result in a lot of extra conditionals making the expression harder to follow. A common passthru is introduced for CPython and PyPy. python 2.7: use common passthru
2018-12-31 12:59:20 +00:00
suffix = "";
};
python35 -> 3.5.6 -> 3.5.7
2019-03-23 07:42:38 +00:00
sha256 = "1p67pnp2ca5przx2s45r8m55dcn6f5hsm0l4s1zp7mglkf4r4n18";
CPython: merge expressions of interpreters Each time a new major/minor version of CPython was released, a new expression would be written, typically copied from the previous release. Often fixes are only made in the current/latest release. By merging the expressions it's more likely that modifications end up in all versions, as is likely intended. This commit introduces one expression for Python 3, and another for 2.7. These two may also be merged, but it will result in a lot of extra conditionals making the expression harder to follow. A common passthru is introduced for CPython and PyPy. python 2.7: use common passthru
2018-12-31 12:59:20 +00:00
inherit (darwin) CF configd;
inherit passthruFun;
};
python36 = callPackage ./cpython {
self = python36;
sourceVersion = {
major = "3";
minor = "6";
python36: 3.6.8 -> 3.6.9
2019-07-09 09:02:26 +01:00
patch = "9";
CPython: merge expressions of interpreters Each time a new major/minor version of CPython was released, a new expression would be written, typically copied from the previous release. Often fixes are only made in the current/latest release. By merging the expressions it's more likely that modifications end up in all versions, as is likely intended. This commit introduces one expression for Python 3, and another for 2.7. These two may also be merged, but it will result in a lot of extra conditionals making the expression harder to follow. A common passthru is introduced for CPython and PyPy. python 2.7: use common passthru
2018-12-31 12:59:20 +00:00
suffix = "";
};
python36: 3.6.8 -> 3.6.9
2019-07-09 09:02:26 +01:00
sha256 = "1nkh70azbv866aw5a9bbxsxarsf40233vrzpjq17z3rz9ramybsy";
CPython: merge expressions of interpreters Each time a new major/minor version of CPython was released, a new expression would be written, typically copied from the previous release. Often fixes are only made in the current/latest release. By merging the expressions it's more likely that modifications end up in all versions, as is likely intended. This commit introduces one expression for Python 3, and another for 2.7. These two may also be merged, but it will result in a lot of extra conditionals making the expression harder to follow. A common passthru is introduced for CPython and PyPy. python 2.7: use common passthru
2018-12-31 12:59:20 +00:00
inherit (darwin) CF configd;
inherit passthruFun;
};
python37 = callPackage ./cpython {
self = python37;
sourceVersion = {
major = "3";
minor = "7";
python37: 3.7.3 -> 3.7.4
2019-07-09 09:02:38 +01:00
patch = "4";
CPython: merge expressions of interpreters Each time a new major/minor version of CPython was released, a new expression would be written, typically copied from the previous release. Often fixes are only made in the current/latest release. By merging the expressions it's more likely that modifications end up in all versions, as is likely intended. This commit introduces one expression for Python 3, and another for 2.7. These two may also be merged, but it will result in a lot of extra conditionals making the expression harder to follow. A common passthru is introduced for CPython and PyPy. python 2.7: use common passthru
2018-12-31 12:59:20 +00:00
suffix = "";
};
python37: 3.7.3 -> 3.7.4
2019-07-09 09:02:38 +01:00
sha256 = "0gxiv5617zd7dnqm5k9r4q2188lk327nf9jznwq9j6b8p0s92ygv";
CPython: merge expressions of interpreters Each time a new major/minor version of CPython was released, a new expression would be written, typically copied from the previous release. Often fixes are only made in the current/latest release. By merging the expressions it's more likely that modifications end up in all versions, as is likely intended. This commit introduces one expression for Python 3, and another for 2.7. These two may also be merged, but it will result in a lot of extra conditionals making the expression harder to follow. A common passthru is introduced for CPython and PyPy. python 2.7: use common passthru
2018-12-31 12:59:20 +00:00
inherit (darwin) CF configd;
inherit passthruFun;
};
python38: init at 3.8.0b2
2019-07-09 14:19:19 +01:00
python38 = callPackage ./cpython {
self = python38;
sourceVersion = {
major = "3";
minor = "8";
patch = "0";
python38: 3.8.0b2 -> 3.8.0b3
2019-08-03 07:13:38 +01:00
suffix = "b3";
python38: init at 3.8.0b2
2019-07-09 14:19:19 +01:00
};
python38: 3.8.0b2 -> 3.8.0b3
2019-08-03 07:13:38 +01:00
sha256 = "03wq85pkpr9j56k3zg6whahc5park1pzshbakl7y50lzrkpq2ynd";
python38: init at 3.8.0b2
2019-07-09 14:19:19 +01:00
inherit (darwin) CF configd;
inherit passthruFun;
};
pypy: merge 2.7 and 3.5 into a single expression This commit merges the two expressions in a single one, using the passthru function that is shared with CPython.
2019-01-01 10:34:44 +00:00
pypy27 = callPackage ./pypy {
self = pypy27;
sourceVersion = {
pypy: 6.0.0 -> 7.0.0 Note that this bumps both the 2.7 and 3.5 flavors of PyPy.
2019-02-12 01:52:26 +00:00
major = "7";
pypy: merge 2.7 and 3.5 into a single expression This commit merges the two expressions in a single one, using the passthru function that is shared with CPython.
2019-01-01 10:34:44 +00:00
minor = "0";
patch = "0";
};
pypy: 6.0.0 -> 7.0.0 Note that this bumps both the 2.7 and 3.5 flavors of PyPy.
2019-02-12 01:52:26 +00:00
sha256 = "1m6ja79sbkl38p1hs7c0n4kq5xzn01wp7wl5456hsw9q6cwg6894";
pypy: merge 2.7 and 3.5 into a single expression This commit merges the two expressions in a single one, using the passthru function that is shared with CPython.
2019-01-01 10:34:44 +00:00
pythonVersion = "2.7";
db = db.override { dbmSupport = true; };
python = python27;
inherit passthruFun;
};
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.
2019-01-02 19:09:44 +00:00
pypy35 = callPackage ./pypy {
self = pypy35;
pypy: merge 2.7 and 3.5 into a single expression This commit merges the two expressions in a single one, using the passthru function that is shared with CPython.
2019-01-01 10:34:44 +00:00
sourceVersion = {
pypy: 6.0.0 -> 7.0.0 Note that this bumps both the 2.7 and 3.5 flavors of PyPy.
2019-02-12 01:52:26 +00:00
major = "7";
pypy: merge 2.7 and 3.5 into a single expression This commit merges the two expressions in a single one, using the passthru function that is shared with CPython.
2019-01-01 10:34:44 +00:00
minor = "0";
patch = "0";
};
pypy: 6.0.0 -> 7.0.0 Note that this bumps both the 2.7 and 3.5 flavors of PyPy.
2019-02-12 01:52:26 +00:00
sha256 = "0hbv9ziv8n9lqnr6cndrw70p6g40c00w1ds7lmzgrr153myxkp7w";
pypy: merge 2.7 and 3.5 into a single expression This commit merges the two expressions in a single one, using the passthru function that is shared with CPython.
2019-01-01 10:34:44 +00:00
pythonVersion = "3.5";
db = db.override { dbmSupport = true; };
python = python27;
inherit passthruFun;
};
CPython: merge expressions of interpreters Each time a new major/minor version of CPython was released, a new expression would be written, typically copied from the previous release. Often fixes are only made in the current/latest release. By merging the expressions it's more likely that modifications end up in all versions, as is likely intended. This commit introduces one expression for Python 3, and another for 2.7. These two may also be merged, but it will result in a lot of extra conditionals making the expression harder to follow. A common passthru is introduced for CPython and PyPy. python 2.7: use common passthru
2018-12-31 12:59:20 +00:00
pythonInterpreters.pypy{27,35}_prebuilt: init at 6.0.0 These interpreters are prebuilt by upstream and patched using patchelf. They are primarily added for testing purposes and development on the non-prebuilt PyPy interpreters as it can speed up translation significantly.
2019-01-03 11:00:44 +00:00
pypy27_prebuilt = callPackage ./pypy/prebuilt.nix {
# Not included at top-level
self = pythonInterpreters.pypy27_prebuilt;
sourceVersion = {
pythonInterpreters.pypy{27,35 -> 36}_prebuilt: 6.0.0 -> 7.1.1
2019-08-12 12:52:14 +01:00
major = "7";
minor = "1";
patch = "1";
pythonInterpreters.pypy{27,35}_prebuilt: init at 6.0.0 These interpreters are prebuilt by upstream and patched using patchelf. They are primarily added for testing purposes and development on the non-prebuilt PyPy interpreters as it can speed up translation significantly.
2019-01-03 11:00:44 +00:00
};
pythonInterpreters.pypy{27,35 -> 36}_prebuilt: 6.0.0 -> 7.1.1
2019-08-12 12:52:14 +01:00
sha256 = "0rlx4x9xy9h989w6sy4h7lknm00956r30c5gjxwsvf8fhvq9xc3k"; # linux64
pythonInterpreters.pypy{27,35}_prebuilt: init at 6.0.0 These interpreters are prebuilt by upstream and patched using patchelf. They are primarily added for testing purposes and development on the non-prebuilt PyPy interpreters as it can speed up translation significantly.
2019-01-03 11:00:44 +00:00
pythonVersion = "2.7";
inherit passthruFun;
ncurses = ncurses5;
};
pythonInterpreters.pypy{27,35 -> 36}_prebuilt: 6.0.0 -> 7.1.1
2019-08-12 12:52:14 +01:00
pypy36_prebuilt = callPackage ./pypy/prebuilt.nix {
# Not included at top-level
self = pythonInterpreters.pypy36_prebuilt;
pythonInterpreters.pypy{27,35}_prebuilt: init at 6.0.0 These interpreters are prebuilt by upstream and patched using patchelf. They are primarily added for testing purposes and development on the non-prebuilt PyPy interpreters as it can speed up translation significantly.
2019-01-03 11:00:44 +00:00
sourceVersion = {
pythonInterpreters.pypy{27,35 -> 36}_prebuilt: 6.0.0 -> 7.1.1
2019-08-12 12:52:14 +01:00
major = "7";
minor = "1";
patch = "1";
pythonInterpreters.pypy{27,35}_prebuilt: init at 6.0.0 These interpreters are prebuilt by upstream and patched using patchelf. They are primarily added for testing purposes and development on the non-prebuilt PyPy interpreters as it can speed up translation significantly.
2019-01-03 11:00:44 +00:00
};
pythonInterpreters.pypy{27,35 -> 36}_prebuilt: 6.0.0 -> 7.1.1
2019-08-12 12:52:14 +01:00
sha256 = "1c1xx6dm1n4xvh1vd3rcvyyixm5jm9rvzisji1a5bc9l38xzc540"; # linux64
pythonVersion = "3.6";
pythonInterpreters.pypy{27,35}_prebuilt: init at 6.0.0 These interpreters are prebuilt by upstream and patched using patchelf. They are primarily added for testing purposes and development on the non-prebuilt PyPy interpreters as it can speed up translation significantly.
2019-01-03 11:00:44 +00:00
inherit passthruFun;
ncurses = ncurses5;
};
python: 2.7.15 -> 2.7.16
2019-03-04 07:56:15 +00:00
})
Reference in New Issue Copy Permalink