Commit Graph

1401 Commits

Author SHA1 Message Date
github-actions[bot]
c68d98e9d4
Merge staging-next into staging 2023-10-13 18:01:31 +00:00
Yureka
ef60280d57
python311: fix cross to/from musl (#260641)
The situation:

Python <3.11: under Linux the abi string is always -gnu*

Python 3.11-3.12: musl is treated as its own abi in the python build system, but when cross-compiling the build host's libc is used for the target abi string. Cross compiling from glibc to musl gives a -gnu* target abi string and vice versa.

Python >=3.13: musl is treated as its own abi, and when cross-compiling the target libc is used for the target abi string

We backport the fix for python 3.11-3.12, since the intermediate state is almost impossible to model in the nix expression
2023-10-13 17:47:11 +02:00
Artturi
183df628da
Merge pull request #258223 from OroraTech/fix/propagated-sphinx 2023-10-13 07:18:12 +03:00
github-actions[bot]
e1565d6a86
Merge staging-next into staging 2023-10-09 18:01:36 +00:00
github-actions[bot]
75d4639be3
Merge master into staging-next 2023-10-09 18:00:59 +00:00
Yureka
1d3c3d4f5b python: simplify ABI name detection 2023-10-09 15:12:20 +00:00
Martin Weinelt
edd561abce
python311: 3.11.5 -> 3.11.6
https://docs.python.org/release/3.11.6/whatsnew/changelog.html
2023-10-03 10:31:23 +02:00
github-actions[bot]
23a7292114
Merge master into staging-next 2023-10-02 18:01:04 +00:00
Martin Weinelt
1fcb41f796
python312: 3.12.0-rc3 -> 3.12.0
https://docs.python.org/dev/whatsnew/3.12.html
https://docs.python.org/release/3.12.0/whatsnew/changelog.html
2023-10-02 17:47:17 +02:00
Leandro Reina
48f25989c3 python3Packages.sphinxHook: Avoid propagating sphinx
Fixes some side effects of #249157 (see #255810)
2023-09-30 18:21:18 +02:00
natsukium
836da00391 python311: 3.11.4 -> 3.11.5
https://docs.python.org/release/3.11.5/whatsnew/changelog.html

Fixes: CVE-2023-40217
2023-09-27 15:32:44 +02:00
natsukium
6086908c98 python310: 3.10.12 -> 3.10.13
https://docs.python.org/release/3.10.13/whatsnew/changelog.html

Fixes: CVE-2023-40217
2023-09-27 15:32:44 +02:00
Martin Weinelt
d77e13848d python3: 3.10 -> 3.11
Updates the default python version to 3.11, while keeping 3.10 around
until after the NixOS 23.11 release.
2023-09-27 15:32:44 +02:00
github-actions[bot]
cc5ae613ff
Merge master into staging-next 2023-09-26 00:02:17 +00:00
Thiago Kenji Okada
d72b2ed9ac python27: disable tests that expect Python 3+ 2023-09-25 14:51:43 +01:00
github-actions[bot]
3e52e5929d
Merge master into staging-next 2023-09-25 12:01:02 +00:00
Thiago Kenji Okada
795e0c0851 pypy310: init at 3.7.12 2023-09-25 12:21:36 +01:00
Thiago Kenji Okada
2b0c3f0001 pypy39: 3.7.11 -> 3.7.12 2023-09-25 12:07:50 +01:00
Thiago Kenji Okada
e0874acbdd pypy27: 7.3.11 -> 7.3.12 2023-09-25 12:03:58 +01:00
Thiago Kenji Okada
9b15be3aa9 pythonInterpreters.pypy39_prebuilt: 7.3.11 -> 7.3.12 2023-09-25 12:03:19 +01:00
Thiago Kenji Okada
6ae570f76b pythonInterpreters.pypy27_prebuilt: 3.7.11 -> 3.7.12 2023-09-25 11:50:03 +01:00
Peder Bergebakken Sundt
bdda7b0a53 python3Packages.flitBuildHook: remove 2023-09-22 21:11:24 +02:00
github-actions[bot]
2b20c287ac
Merge master into staging-next 2023-09-21 00:02:13 +00:00
Martin Weinelt
eaf1374d93
Merge pull request #256132 from SuperSandro2000/python2
python2: 2.7.18.6 -> 2.7.18.7
2023-09-21 00:51:12 +02:00
Fabián Heredia Montiel
b2f85dbf28 Merge remote-tracking branch 'origin/master' into staging-next 2023-09-20 15:08:16 -06:00
Martin Weinelt
f74c16f4fc
python312: 3.12.0rc2 -> 3.12.0rc3
https://docs.python.org/3.12/whatsnew/changelog.html#python-3-12-0rc3
2023-09-20 03:10:36 +02:00
Sandro Jäckel
63f0a174a0
python2: 2.7.18.6 -> 2.7.18.7 2023-09-19 16:18:58 +02:00
Lassulus
67b2f14549
Merge pull request #254547 from DavHau/fix-pyproject-build
python3.pkgs.pypaBuildHook: fix conflicts via propagated inputs
2023-09-15 21:40:45 +02:00
Frederik Rietdijk
53dd1a6edb
Merge pull request #254136 from figsoda/python
python310Packages.buildPythonPackage: introduce pyproject option
2023-09-14 18:33:49 +02:00
figsoda
6893201945 python310Packages.buildPythonPackage: introduce pyproject option 2023-09-12 19:54:03 -04:00
DavHau
c57e6b692a python3.pkgs.pypaBuildHook: fix conflicts
This modifies the pypaBuildHook to not propagate its own python dependencies into the build environment. This prevents package conflicts.

- modify pypa-build-hook.sh to call pyproject-build via an absolute path. This removes the need of putting the dependencies inside the hook's propagatedBuildInputs
- remove the hook's dependencies from propagatedBuildInputs
- add a passthru test to the hook testing for the fix
2023-09-12 21:04:26 +02:00
Anderson Torres
3fc613c5ba
Merge branch 'master' into staging-next 2023-09-11 23:25:38 +00:00
Martin Weinelt
1faf0ef118
Merge pull request #254221 from natsukium/cpython312/update
python312: 3.12.0b4 -> 3.12.0rc2; python38: 3.8.17 -> 3.7.18; python39: 3.9.17 -> 3.9.18
2023-09-11 16:47:20 +02:00
github-actions[bot]
b6eb350562
Merge master into staging-next 2023-09-10 00:02:16 +00:00
Leandro Reina
a391639845 python3Packages.sphinxHook: Fix cross compilation
Failed due to using host sphinx instead of build one.
2023-09-09 21:34:33 +02:00
natsukium
0a6f3b5857
python39: 3.9.17 -> 3.9.18
https://docs.python.org/release/3.9.18/whatsnew/changelog.html

Fixes: CVE-2023-40217
2023-09-09 19:42:16 +09:00
natsukium
ab5b8e656a
python38: 3.8.17 -> 3.8.18
https://docs.python.org/release/3.8.18/whatsnew/changelog.html

Fixes: CVE-2023-40217
2023-09-09 19:42:16 +09:00
natsukium
bc9bf8621c
python312: 3.12.0b4 -> 3.12.0rc2
https://docs.python.org/3.12/whatsnew/changelog.html#python-3-12-0rc2

Fixes: CVE-2023-40217
2023-09-09 19:42:07 +09:00
github-actions[bot]
d987b47512
Merge master into staging-next 2023-09-08 06:00:58 +00:00
marius david
a02761d722 python311: enable cross-compilation to windows 2023-09-07 02:16:21 +03:00
Sandro Jäckel
28c0cd5b17 cpython: remove broken include/python3.X/python3.Xm symlink
The m flag was removed in Python 3.8:
https://docs.python.org/3/whatsnew/3.8.html#build-and-c-api-changes

Co-authored-by: Anders Kaseorg <26471+andersk@users.noreply.github.com>
2023-09-01 02:52:50 +03:00
Theodore Ni
130e063a3d
pypaInstallHook: enter "dist" directory before installing (#250464) 2023-08-21 08:45:47 +02:00
Theodore Ni
d494084017
Merge branch 'staging-next' into staging
Merging https://github.com/NixOS/nixpkgs/pull/245957 with https://github.com/NixOS/nixpkgs/pull/246022.
2023-08-20 20:09:45 -07:00
Theodore Ni
dab839357e
Merge branch 'master' into staging-next
Had to merge https://github.com/NixOS/nixpkgs/pull/245957 and
https://github.com/NixOS/nixpkgs/pull/247245.
2023-08-20 12:01:22 -07:00
Artturi
bde196dde9
Merge pull request #245957 from amjoseph-nixpkgs/pr/lib/customization/makeScopeWithSplicing2 2023-08-20 18:57:05 +03:00
Theodore Ni
dd1256d2ca python3.pkgs.pythonRelaxDepsHook: don't propagate wheel
The usage of wheel should be restricted to the hook. I discovered this
when trying to remove wheel from the Python bootstrap. Some packages
that needed wheel did not need it added explicitly because they use this
hook. This implicit change to the dependency tree shouldn't happen (even
though it is mostly harmless).
2023-08-20 11:00:51 +02:00
Theodore Ni
4e7188c39a python3.pkgs.buildPythonPackage: disable conflict check for setuptools and wheel
We can do this automatically for packages we know cannot use the
conflict check hook when it would lead to infinite recursion.
2023-08-20 10:59:47 +02:00
Theodore Ni
6c85fff302 python3.pkgs.buildPythonPackage: switch to PyPA build and installer 2023-08-20 10:59:47 +02:00
Theodore Ni
e8cca499a8 python2.{buildPythonPackage,buildPythonApplication}: extract into its own file
As we continue iterating on Python infrastructure for Python 3, some
code is starting to diverge for Python 2. If we copy the current state
of mk-python-derivation.nix and freeze it for Python 2, we can iterate
on it for Python 3 with more freedom.
2023-08-20 10:59:46 +02:00
Theodore Ni
93d25dda84 python3.pkgs.pypaBuildHook: switch to pyproject-build
Upstream's recommended "python -m build" way of invoking build fails
when the working directory contains a file named "build.py". This is
common for poetry projects that build C extensions.
2023-08-20 10:59:46 +02:00