Commit Graph

1433 Commits

Author SHA1 Message Date
Pavol Rusnak
b608fc233c
Merge pull request #269255 from prusnak/rustpython-darwin
rustpython: mark broken on x86_64-darwin
2023-11-26 18:46:09 +01:00
Alexandre Macabies
fc235bb0fc python/hooks: use python.pythonVersion to support PyPy
f292ef4 introduced a check for the Python version but uses `.version`,
which isn't friendly to other Pythons like PyPy which use versions
strings like 7.3, failing the >=3.10 check.

Using `.pythonVersion` fixes this check.

Co-authored-by: Pierre Bourdon <delroth@gmail.com>
2023-11-25 13:38:39 +01:00
Martin Weinelt
0818809eae
python313: 3.13.0a1 -> 3.13.0a2
https://www.python.org/downloads/release/python-3130a2/
2023-11-23 13:27:19 +01:00
Pavol Rusnak
b27c3af657
rustpython: mark broken on x86_64-darwin 2023-11-22 19:20:39 +01:00
Gaetan Lepage
f99f9ced56 rustpython: 0.2.0 -> 0.3.0 2023-11-22 17:08:07 +01:00
Martin Weinelt
d9327a53de Revert "python2/mk-python-derivation: disable catchConflictsHook"
This reverts commit 397a8fd06b.

The hook now uses the old implementation based on the deprecated
pkg_resources library provided by setuptools again.
2023-11-18 12:58:15 +01:00
Martin Weinelt
f292ef4958
python/hooks: restore catchConflictHook for python<3.10
By restoring and diverting to the old version.

Previously the newer language features and use of more modern stdlib
imports broke the hook on Python<3.10.
2023-11-18 12:57:18 +01:00
K900
397a8fd06b python2/mk-python-derivation: disable catchConflictsHook
It's broken on Py2. Hopefully people still using 2 know what they're doing?
2023-11-17 07:48:13 +03:00
github-actions[bot]
6a7c026ba7
Merge master into staging-next 2023-11-14 06:01:03 +00:00
Silvan Mosberger
7eddbf5690
Merge pull request #265710 from ShamrockLee/lib-copy-function-args
lib.mirrorFunctionArgs: init
2023-11-14 05:33:40 +01:00
github-actions[bot]
5725d489f3
Merge staging-next into staging 2023-11-09 12:01:36 +00:00
Alyssa Ross
e3e57b8f18 lib.systems: elaborate Rust metadata
We need this stuff to be available in lib so make-derivation.nix can
access it to construct the Meson cross file.

This has a couple of other advantages:

 - It makes Rust less special.  Now figuring out what Rust calls a
   platform is the same as figuring out what Linux or QEMU call it.

 - We can unify the schema used to define Rust targets, and the schema
   used to access those values later.  Just like you can set "config"
   or "system" in a platform definition, and then access those same
   keys on the elaborated platform, you can now set "rustcTarget" in
   your crossSystem, and then access "stdenv.hostPlatform.rustcTarget"
   in your code.

"rustcTarget", "rustcTargetSpec", "cargoShortTarget", and
"cargoEnvVarTarget" have the "rustc" and "cargo" prefixes because
these are not exposed to code by the compiler, and are not
standardized.  The arch/os/etc. variables are all named to match the
forms in the Rust target spec JSON.

The new rust.target-family only takes a list, since we don't need to
worry about backwards compatibility when that name is used.

The old APIs are all still functional with no warning for now, so that
it's possible for external code to use a single API on both 23.05 and
23.11.  We can introduce the warnings once 23.05 is EOL, and make them
hard errors when 23.11 is EOL.
2023-11-09 10:02:24 +01:00
Randy Eckenrode
34b48d4af6
python2: fix build with clang 16 on x86_64-darwin
Apply the patch to fix using libutil.h instead of util.h on Darwin for
`forkpty` and `openpty`.
2023-11-08 19:08:48 -05:00
github-actions[bot]
d49b3ff9e3
Merge staging-next into staging 2023-11-08 12:02:19 +00:00
Fabián Heredia Montiel
2188896a57 python3Packages.sphinxHook: fix eval after merge of bc2d598878 2023-11-08 01:51:41 -06:00
Adam Joseph
ba2ed469c2
Merge branch 'master' into staging-next 2023-11-08 06:15:46 +00:00
Weijia Wang
8012034692 Merge branch 'staging-next' into staging 2023-11-07 03:41:49 +01:00
Yueh-Shun Li
b3e2c15000 makeOverridablePythonPackage: preserve function arguments 2023-11-07 01:58:48 +00:00
Adam Joseph
f0011fd103 python: deprecate pythonForBuild in favor of pythonOnBuildForHost 2023-11-07 02:28:58 +02:00
Weijia Wang
32da89a1a1 Merge branch 'master' into staging-next 2023-11-06 14:33:18 +01:00
Adam Joseph
bc2d598878 treewide: change pythonForBuild to pythonOnBuildForHost 2023-11-05 17:42:12 -08:00
Adam Joseph
563a66dc31 python: add python.pythonOnBuildForHost 2023-11-04 21:29:33 -07:00
Weijia Wang
9627659c22 Merge branch 'master' into staging-next 2023-11-04 17:27:09 +01:00
natsukium
56b570d6af
python311Packages.python-docs-theme: rename from python_docs_theme 2023-11-04 12:34:41 +09:00
Martin Weinelt
646c23a2f7
buildPythonPackage: port catch-conflicts to importlib.metadata
To escape the pkg_resources API deprecation:

> catch-conflicts.py:1: DeprecationWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html

Also remove exceptions for the previus bootstrap packages.
2023-10-30 12:42:36 +01:00
Frederik Rietdijk
7a0d080298 python3.pkgs.buildPython*: allow overriding of the stdenv
With this change it is possible to pass in `stdenv` directly to
`buildPython*` or override it using e.g.

```
numpy.overridePythonAttrs(_: {
  stdenv = clangStdenv;
})
```
2023-10-19 18:56:47 +02:00
github-actions[bot]
3c8c81154a
Merge staging-next into staging 2023-10-18 12:02:01 +00:00
github-actions[bot]
8e8fc73296
Merge master into staging-next 2023-10-18 12:01:25 +00:00
Martin Weinelt
13c8e4299a
python313: init at 3.13.0a1
https://docs.python.org/3.13/whatsnew/changelog.html#python-3-13-0-alpha-1
2023-10-17 23:06:20 +02:00
github-actions[bot]
ba519bf3b1
Merge staging-next into staging 2023-10-17 00:02:46 +00:00
github-actions[bot]
8c62479810
Merge master into staging-next 2023-10-17 00:02:14 +00:00
Meet Barot
a76390f69c python3*: Add meta.pkgConfigModules and test 2023-10-16 00:36:25 -04:00
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