Commit Graph

551 Commits

Author SHA1 Message Date
Frederik Rietdijk
c2eac6741b Merge master into staging-next 2019-02-24 09:19:12 +01:00
Frederik Rietdijk
1fccd25595 buildPythonPackage: always export LANG=C.UTF-8 2019-02-23 20:08:26 +01:00
Frederik Rietdijk
e7b4608d02 buildPythonPackage: initial support for PEP 517 2019-02-23 20:05:19 +01:00
Florian Friesdorf
fbef5ab82f Remove myself as maintainer from packages
I'm currently not maintaining any packages.
2019-02-22 16:14:13 +01:00
Frederik Rietdijk
b4acd97729 buildPython*: enable strictDeps 2019-02-17 14:40:48 +01:00
Averell Dalton
91aeda1432 python: sysconfig: fix paths 2019-02-07 18:52:08 +01:00
Frederik Rietdijk
9cfae76fc5 Merge staging-next into staging 2019-01-17 09:21:29 +01:00
Anders Kaseorg
004b908ae6 pypy, pypy3: Remove wrapper
The wrapper is not needed because the runpath is already set correctly,
and LD_LIBRARY_PATH was breaking child processes linked against
different libc versions.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2019-01-16 08:36:47 +01:00
Anders Kaseorg
6282071229 pypy: Correct Python version in meta description
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2019-01-16 08:15:50 +01:00
Frederik Rietdijk
c5d99308de buildPython*: fix nativeBuildInputs 2019-01-15 10:16:11 +01:00
Lengyel Balazs
f4a53ff3bc treewide/xorg: replace *proto with xorgproto 2019-01-04 14:38:57 +01:00
Frederik Rietdijk
63bcd07888 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 12:31:42 +01:00
Frederik Rietdijk
d91b496eac 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-04 10:45:22 +01:00
Frederik Rietdijk
0a2caa41fe Python: drop python.majorVersion
Drop `python.majorVersion`. For Python language version, use `python.pythonVersion`.
For implementation version, use `python.sourceVersion`.

Some expressions were broken. Those that were identified were fixed.

fixup major
2019-01-04 10:45:22 +01:00
Frederik Rietdijk
f665828fa3 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-04 10:45:22 +01:00
Frederik Rietdijk
613498af97 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-04 10:45:22 +01:00
Frederik Rietdijk
efbe87f3ef 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
2019-01-04 10:45:22 +01:00
Franz Pletz
47587f5d31
python37: fix cross build 2019-01-01 23:00:56 +01:00
Frederik Rietdijk
10afccf145 Merge staging-next into staging 2018-12-27 18:11:34 +01:00
Mario Rodas
1764870813 python37: fix darwin build
Remove issue24658 patch because is already fixed and backported to
Python 3.7 178d1c0777
2018-12-27 09:27:59 +01:00
Mario Rodas
31680c54e1 python36: fix darwin build
Remove issue24658 patch because is already fixed and backported to
Python 3.6 a5ebc205be
2018-12-27 09:27:59 +01:00
Frederik Rietdijk
2526f9f157 python37: remove references to openssl.dev 2018-12-26 10:37:55 +01:00
Frederik Rietdijk
e45ca47f14 Merge staging-next into staging 2018-12-26 09:30:32 +01:00
Frederik Rietdijk
552d8a70d4 python37: 3.7.1 -> 3.7.2 2018-12-25 10:05:49 +01:00
Frederik Rietdijk
741e00fd10 python36: 3.6.7 -> 3.6.8 2018-12-25 10:05:38 +01:00
Jan Tojnar
ef935fa101
Merge branch 'master' into staging 2018-12-24 15:02:29 +01:00
Frederik Rietdijk
3d5025ba79 buildPython*: don't override custom updateScript 2018-12-23 09:59:56 +01:00
Jörg Thalheim
1b146a8c6f
treewide: remove paxutils from stdenv
More then one year ago we removed grsecurity kernels from nixpkgs:
https://github.com/NixOS/nixpkgs/pull/25277

This removes now also paxutils from stdenv.
2018-12-22 12:55:05 +01:00
Jörg Thalheim
855777ad22 wrap-python: fix pypy site-packages path 2018-12-20 14:18:25 +00:00
Jörg Thalheim
cc30e48624
Merge pull request #52481 from Mic92/python37-cross
python37: fix cross-compilation
2018-12-20 15:06:22 +01:00
Jan Tojnar
e69ee9b53e
buildPython*: simplify updateScript
updateScript accepts a list, in which case, it will execute the head with the
tail as arguments. Switching to this style will allow us to get rid of the need
to create extra script doing just that.
2018-12-20 00:28:49 +01:00
Anders Kaseorg
85379a29ec pypy3: init at 6.0.0
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-12-19 09:53:31 +01:00
Jörg Thalheim
ab9c602fd4
Merge pull request #40459 from andersk/pypy
pypy: 5.10.0 -> 6.0.0
2018-12-18 20:35:38 +00:00
Jörg Thalheim
14b2dcea8f python37: fix cross-compilation 2018-12-18 12:39:24 +00:00
Frederik Rietdijk
74d0b82f29 buildPython*: add updateScript to passthru
All Python packages now have an updateScript. The script calls
`update-python-libraries` and passes it the position of the derivation
expression obtained using `meta.position`. This works fine in case a Nix
expression represents only a single derivation. If there are more in it,
`update-python-libraries` will fail.
2018-12-07 15:48:54 +01:00
Anders Kaseorg
6d80927a43 pypy: Set isPy2, isPy27
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-11-20 01:59:08 -08:00
Anders Kaseorg
8b80dec522 pypy: Reenable tests fixed upstream
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-11-20 01:59:08 -08:00
Anders Kaseorg
91333c1740 pypy: Remove redundant --withmod-* flags
--allworkingmodules is already the default.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-11-20 01:59:08 -08:00
Anders Kaseorg
f96349c456 pypy: Change libPrefix from pypy5.10 to pypy2.7
To avoid conflicting with pypy3, as per
https://github.com/NixOS/nixpkgs/pull/34066#issuecomment-359155484.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2018-11-20 01:59:08 -08:00
Frederik Rietdijk
63c6875f26 Merge master into staging-next 2018-11-18 10:32:12 +01:00
Travis Athougies
d0eb502327 Enable cross compilation for cpython 2.7 (#50245) 2018-11-15 19:36:03 +01:00
Frederik Rietdijk
917400bcff Revert "Python: reduce amount of warnings when building with buildPython*"
Turns out that many packages' testsuites rely on the default warnings setup.

This reverts commit c1e003ff2f.
2018-11-12 18:55:50 +01:00
Franz Pletz
ae3e9b5a27 python27: add patch to fix CVE-2018-1000802 2018-11-11 09:00:31 +01:00
Frederik Rietdijk
53d00c3351 Merge master into staging-next 2018-11-10 11:08:54 +01:00
Frederik Rietdijk
b1bdce0793 python34: remove
Python 3.4 will receive it's final patch release in March 2019 and there won't
be any releases anymore after that, so also not during NixOS 2019.03.

Python 3.4 is not used anymore in Nixpkgs. In any case, migrating code from
3.4 to 3.4+ is trivial.
2018-11-04 18:48:24 +01:00
Frederik Rietdijk
c1e003ff2f Python: reduce amount of warnings when building with buildPython*
By default all warnings were printed. This occasionally resulted in
a lot of warnings leading to builds being killed.

This commit reduces the amount of warnings printed.
2018-11-04 10:19:48 +01:00
Frederik Rietdijk
e4d84434a7 python37: 3.7.0 -> 3.7.1 2018-10-20 20:58:51 +02:00
Frederik Rietdijk
241bab3a5e python36: 3.6.6 -> 3.6.7 2018-10-20 20:58:40 +02:00
Frederik Rietdijk
548ced628d python.buildEnv: new argument makeWrapperArgs
`python.buildEnv` would already wrap executables exporting `PYTHONHOME`.
With this change, it is possible to pass in additional arguments to the
underlying `makeWrapper`.
2018-10-13 12:31:52 +02:00
John Ericson
e2a2073011 Merge remote-tracking branch 'upstream/master' into staging 2018-09-26 11:23:18 -04:00