Commit Graph

1106 Commits

Author SHA1 Message Date
Artturin
843b988680 python3: fix wrong platform libs when cross-compiling
see https://github.com/NixOS/nixpkgs/pull/169475#issuecomment-1129517328

patch by adisbladis

Co-authored-by: adisbladis <adisbladis@gmail.com>
2022-06-16 16:49:18 +03:00
Thiago Kenji Okada
5f51c12a38
Merge pull request #176721 from thiagokokada/pythonRelaxDepsHook-fix
pythonRelaxDepsHook: fix usage in packages with `-` in pname
2022-06-16 10:43:58 +01:00
github-actions[bot]
8c2f449ebc
Merge staging-next into staging 2022-06-15 00:02:51 +00:00
github-actions[bot]
4e74812c3a
Merge master into staging-next 2022-06-15 00:02:12 +00:00
Martin Weinelt
0b63d22aab
Merge pull request #173998 from mweinelt/cpython311 2022-06-15 01:28:11 +02:00
Martin Weinelt
a5c5302ddd
python311: 3.11.0b1 -> 3.11.0b3
https://www.python.org/downloads/release/python-3110b2/
https://pythoninsider.blogspot.com/2022/05/python-3110b2-is-now-available.html

With updated darwin-libutil.patch provided by Randy Eckenrode.

Co-Authored-By: Randy Eckenrode <randy@largeandhighquality.com>
2022-06-15 01:18:26 +02:00
Martin Weinelt
08615ec689
python310: 3.10.4 -> 3.10.5
https://docs.python.org/release/3.10.5/whatsnew/changelog.html#python-3-10-5-final
2022-06-14 15:39:54 +02:00
Thiago Kenji Okada
15491e727d pythonRelaxDepsHook: correct handles multiple wheels 2022-06-12 11:48:52 +01:00
Thiago Kenji Okada
61223d51de pythonRelaxDepsHook: fix usage in packages with - in pname 2022-06-07 21:24:48 +01:00
Martin Weinelt
f1ac3fa330
python3Minimal: 3.9 -> 3.10 2022-06-06 11:46:06 -07:00
Sandro Jäckel
cca70b7324 python-minimal: don't clean meta.maintainer
Every package should have a maintainer and we should not throw it away if we arleady have one.
Also in reality the maintainer of python3 is also the one of python3-minimal
2022-06-06 09:00:59 +02:00
github-actions[bot]
ebcaa0d01c
Merge master into staging-next 2022-06-01 12:01:27 +00:00
Martin Weinelt
a9377b6919
Merge pull request #164174 from ReplayCoding/fix/python-llvm-pgo 2022-06-01 11:07:54 +02:00
github-actions[bot]
f82caaee74
Merge staging-next into staging 2022-05-26 00:02:58 +00:00
Tobias Mayer
1e447d7898 pkgsStatic.python3: fix build
GCC does not come with a `libgcc_eh.a` for the target platform if
it was built without `--enable-shared`. That flag was removed with
c6dd11ca39, meaning we should no longer
attempt to link against that lib.
2022-05-24 18:03:33 +02:00
Martin Weinelt
736fdef658
Merge pull request #174005 from mweinelt/cpython 2022-05-23 16:44:37 +02:00
Martin Weinelt
85dfb11907
python311: 3.11.0a7 -> 3.11.0b1
https://www.python.org/downloads/release/python-3110b1/
https://blog.python.org/2022/05/python-3110b1-is-now-available.html
2022-05-22 16:14:33 +02:00
Martin Weinelt
761ecd1061
python39: 3.9.12 -> 3.9.13
https://www.python.org/downloads/release/python-3913/
https://blog.python.org/2022/05/python-3913-is-now-available.html
2022-05-22 15:42:31 +02:00
Artturin
6b46fa896e python3Minimal: enable strictDeps
remove unused let binding from the main expr

verified that cross-compiling still works
2022-05-22 16:40:36 +03:00
Artturin
f002ffed9a treewide: enable strictDeps in bootstrap packages 2022-05-22 16:40:26 +03:00
Malo Bourgon
44d5d31d98 Revert "pythonPackages: set mainProgram to pname by default"
It's now the case that `nix run` checks `pname` as well as `name`, so
this is no longer needed. See:
a2473823d7

This reverts commit baf91ea7d9.
2022-05-10 11:51:54 -07:00
github-actions[bot]
ee7e3f30f3
Merge staging-next into staging 2022-05-04 00:02:57 +00:00
Frederik Rietdijk
ab62fad9d5
Merge pull request #136100 from KAction/sphinx-hook
New hook: sphinxHook to build documentation into different formats/outputs
2022-05-03 20:07:37 +02:00
Thiago Kenji Okada
e19019fe32 pythonRelaxDepsHook: init
We have a common pattern here in nixpkgs for Python applications: when a
Python package ships with either a requirements.txt or setup.py file, we
generally end up having to modify its version restriction, otherwise we have
build failures since we package only one specific version of each package
normally.

However, this end up being done in a completely ad-hoc way: some people
use substituteInPlace, some others use sed, others uses patches, etc.
In many cases, the code ends up being buggy, so it may work in one
version and breaks on the next one. We can instead implement one
standard way of doing this, and trying to be a correct as possible.

So this is what this commit does: it implements a new build hook, that
when called will automatically patch the wheel file. This is one of the
most generic ways to patch Python dependencies, and should work in
multiple cases.
2022-04-30 13:19:30 +01:00
Dmitry Bogatov
6b8b02cef7
python3.pkgs.sphinxHook: new package
This hook takes care of building and installing html documentation from Sphinx
sources.
2022-04-29 08:45:38 -04:00
github-actions[bot]
413490ab0d
Merge staging-next into staging 2022-04-26 06:01:45 +00:00
github-actions[bot]
f8c265f433
Merge master into staging-next 2022-04-26 06:01:08 +00:00
Thiago Kenji Okada
d6d8c43d11 pythonInterpreters.graalpython37: remove 2022-04-25 17:53:06 +01:00
Sergei Trofimovich
a649d4f038 python: use whitespace to split possible existing options
Noticed option globbing when tried to enable parallelism by default
locally for most packages by default. python3Packages.yt-dlp failed as:

    python3.9-yt-dlp> /nix/store/5mywvxdjkk1q6srwwwgdkzc37ibla801-python3.9-setuptools-61.2.0/lib/python3.9/site-packages/setuptools/dist.py:516: UserWarning: Normalizing '2022.04.08' to '2022.4.8'
    python3.9-yt-dlp>   warnings.warn(tmpl.format(**locals()))
    python3.9-yt-dlp> invalid command name 'build_lazy_extractors--parallel'

The change adds leading whitespace everywhere where options might
already be present.
2022-04-24 14:28:26 +02:00
Phillip Cloud
52248e4466 python: enable opt-in parallel build_ext builds for setuptools 2022-04-22 18:25:12 +02:00
github-actions[bot]
cbc56d5cc3
Merge staging-next into staging 2022-04-21 18:02:06 +00:00
adisbladis
881ea516cf python3: Whitelist config options when overriding interpreter
In the case of cross compilation we don't want pass through build
inputs from the cross platform, but we do want to pass on config options.
2022-04-21 14:50:28 +02:00
Frederik Rietdijk
ba02fd0434 python3: fix overriding of interpreters, closes #163639
Overriding the interpreters did not work correctly. When overriding
packages would end up twice in the build time closure: one corresponding
to the overridden interpreter and one corresponding to the original
interpreter. The reason is that the override was not applied to the
interpreters in the spliced package sets.
2022-04-21 14:50:28 +02:00
Atemu
7f802c7046 python-wrapper: use makeBinaryWrapper
A "python" made with the wrapper is likely to be used as a shebang. On macOS,
this requires a binary rather than another shebang'd script.
2022-04-20 21:59:47 +02:00
Vladimír Čunát
d5d94127fd
Merge branch 'staging-next' into staging
Minor conflicts; I hope I didn't mess up:
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/games/openjk/default.nix
2022-04-14 09:53:21 +02:00
Martin Weinelt
66beaa9225
cpython: update patches for 3.11a7 on darwin 2022-04-14 01:33:33 +02:00
Martin Weinelt
52843aefea python39: 3.10.3 -> 3.10.4
https://www.python.org/downloads/release/python-3104/
https://docs.python.org/release/3.10.4/whatsnew/changelog.html
2022-04-12 18:27:46 +02:00
Martin Weinelt
0c57648722 python39: 3.9.11 -> 3.9.12
https://www.python.org/downloads/release/python-3912/
https://docs.python.org/release/3.9.12/whatsnew/changelog.html
2022-04-12 18:27:46 +02:00
Martin Weinelt
24ce3fcf7c
python311: 3.11.0a6 -> 3.11.0a7
https://www.python.org/downloads/release/python-3110a7/

https://pythoninsider.blogspot.com/2022/04/the-last-python-311-alpha-3110a7-is.html
2022-04-12 05:14:23 +02:00
Martin Weinelt
bf1914e12a Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-05 04:05:02 +02:00
github-actions[bot]
120925b5cb
Merge master into staging-next 2022-04-05 00:02:06 +00:00
Robert Hensing
200175a701 config.allowAliases: Define as option
This simplifies usages and makes the default value consistent.

In a few cases, the default value was interpreted to be `false`,
but this is useless, because virtually nobody will explicitly
set `allowAliases = true;`.
2022-04-01 11:33:10 +02:00
Nicolas Benes
2f027dff0b python: remove ncurses flag
It seems the additional linker flags were added in 9d3b0a2 (May 2008) as
a workaround for readline support. They were kept since then, but it
also means that `python3-config` outputs these flags

```console
$ python3-config --libs
 -lpthread -ldl -lcrypt -lncurses -lutil -lm -lm
```

while other GNU/Linux distros do not. For example, Debian 11:

```console
$ sudo apt install python3-dev
$ python3-config --libs
 -lcrypt -lpthread -ldl  -lutil -lm -lm
```

This change removes the `-lncurses` flag and aligns Nix/NixOS with other
distros.
2022-03-29 13:39:33 +02:00
github-actions[bot]
838f421cf3
Merge staging-next into staging 2022-03-17 12:02:05 +00:00
Martin Weinelt
5117b2ee8c python310: 3.10.2 -> 3.10.3
https://www.python.org/downloads/release/python-3103/
2022-03-17 07:40:52 +01:00
Martin Weinelt
88deb06a96 python39: 3.9.10 -> 3.9.11
https://www.python.org/downloads/release/python-3911/
2022-03-17 07:40:52 +01:00
Martin Weinelt
c91c73a714 python37: 3.7.12 -> 3.7.13
https://www.python.org/downloads/release/python-3713/
2022-03-17 07:39:01 +01:00
Martin Weinelt
d56ccde39a python38: 3.8.12 -> 3.8.13
https://www.python.org/downloads/release/python-3813/
2022-03-17 07:39:01 +01:00
github-actions[bot]
2eac3106df
Merge staging-next into staging 2022-03-17 00:02:45 +00:00
Martin Weinelt
37a035335c
Merge pull request #163916 from mweinelt/python311 2022-03-16 21:05:37 +01:00
zowoq
6431086967 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/symengine/default.nix
2022-03-16 16:03:43 +10:00
Vladimír Čunát
f48c1fda6b
Merge branch 'master' into staging-next
Conflict in pkgs/development/libraries/libvirt/default.nix
required manual adjustments.  The fetched patch is already in src.
I checked that libvirt builds.
2022-03-15 09:52:04 +01:00
ReplayCoding
42f6c2c7ed python: fix enableOptimizations with clang 2022-03-14 15:57:16 -07:00
Jonathan Ringer
7f5915b048 update-python-libraries.py: Always use ref/tags/ for specifying rev
Avoids situations where a branch and tag share the same
label. Github will silently return a non-valid artifact and
will fail the build.

Since all github releases correspond to an annotated tag, it's
safe to assume that if we found a release for a tag, that the
tag will exist.
2022-03-14 00:29:09 +01:00
Martin Weinelt
69b06bceab
python311: 3.11.0a4 -> 3.11.0a6
https://pythoninsider.blogspot.com/2022/03/python-3110a6-is-available.html
https://pythoninsider.blogspot.com/2022/02/python-3110a5-is-available.html
2022-03-13 00:04:29 +01:00
ajs124
fd9c3674b9 pypy27_prebuilt: remove unneeded openssl_1_0_2 dependency
they ship their own openssl

as of this commit, that is actually openssl 1.1.1m, the same version we have in openssl_1_1
maybe the package should still be marked as vulnerable, because they ship their own openssl
2022-02-22 03:55:37 +01:00
ajs124
04a1e43685 pypy27_prebuilt: 7.3.6 -> 7.3.8 2022-02-22 03:52:09 +01:00
Frederik Rietdijk
e3ae569a2c
Merge pull request #157775 from veprbl/pr/darwin_python310_fix
python3: revert some old darwin hacks
2022-02-06 13:33:59 +01:00
Dmitry Kalinkin
68d828f64c
python3: don't hardcode -msse2 on darwin
The -msse2 flag was hardcoded back when python32 was added in
47d86a83 ('Adding Python 3.2').
2022-02-02 18:22:09 -05:00
Dmitry Kalinkin
c7c3187d98
python3: don't patch out -Wl,-stack_size,1000000
The original motivation behind removing that was to appease a consumer
of python-config's output. That issue was probably resolved by now, so
let's bring the build in sync with what python is doing by default.

This reverts b7819e38 ('python3.x: Patch extra stack size on darwin')
2022-02-02 18:21:55 -05:00
Dmitry Kalinkin
49a0059a59
python3: unset MACOSX_DEPLOYMENT_TARGET
Setting an old target conflicts with the -stack_size,1000000 linker
flag. This fixes build of python310.

This reverts ce59dec5 ('python34: as a workaround, explicitly set MACOSX_DEPLOYMENT_TARGET')
2022-02-02 18:21:30 -05:00
Jonathan Ringer
69382d41d5 python311: 3.11a2 -> 3.11a4 2022-01-31 06:47:51 -08:00
github-actions[bot]
189be4ddc1
Merge staging-next into staging 2022-01-29 00:02:04 +00:00
Martin Weinelt
323d8534da
Merge pull request #156804 from jonringer/python-update-sri-hash 2022-01-28 21:54:35 +01:00
Jonathan Ringer
47c82c04ae
update-python-libraries: use sri-hash 2022-01-26 15:10:22 -08:00
Sandro Jäckel
be1fef9258 cpython: mime-types -> mailcap 2022-01-26 14:30:10 -08:00
github-actions[bot]
9c32e7cb2a
Merge staging-next into staging 2022-01-15 18:01:47 +00:00
github-actions[bot]
ed9751296d
Merge master into staging-next 2022-01-15 18:01:07 +00:00
Frederik Rietdijk
2ced686d5b pythonInterpreters.pypy38_prebuilt: 7.3.6 -> 7.3.7
Change python language version and attribute.
2022-01-15 17:40:54 +01:00
Frederik Rietdijk
731db1820d pythonInterpreters.pypy27_prebuilt: 7.3.3 -> 7.3.6 2022-01-15 17:40:54 +01:00
Frederik Rietdijk
8dabcce399 python310: 3.10.1 -> 3.10.2 2022-01-15 12:31:14 +01:00
Frederik Rietdijk
0ffdadc271 python39: 3.9.9 -> 3.9.10 2022-01-15 12:31:14 +01:00
github-actions[bot]
a08e4e2a8a
Merge master into staging-next 2022-01-14 06:01:24 +00:00
Jonathan Ringer
b316efff4b update-python-libraries: skip replacing 'rev' when set to variable
It's common for fetchFromGitHub to have `rev = version;`, in which
it will inherit the version. So no replacement is required.
2022-01-13 18:55:44 -08:00
Jonathan Ringer
ce0a907730 update-python-libraries: support pyproject and flit formats
Generally, this is determined by the fetcher. The
notable exception would be the "wheel" format.
2022-01-13 18:55:44 -08:00
Robert Scott
4aaf4c256b
Merge pull request #151066 from zhaofengli/libffi-testsuite
libffi: Run test suite
2021-12-28 01:07:58 +00:00
Martin Weinelt
76488857ab python310: 3.10.0 -> 3.10.1 2021-12-26 19:31:43 -08:00
Emily
cafbe8171c
python: conditionalize redundant Darwin patch (#137858) 2021-12-25 17:11:35 -05:00
Jonathan Ringer
6635f5b208
Merge remote-tracking branch 'origin/master' into staging-next
- Fix which python interpreters are exposed

Conflicts:
	pkgs/top-level/all-packages.nix
2021-12-22 00:31:14 -08:00
Michael Raskin
d2204261a3 pypy37: reinit 2021-12-22 00:51:45 +01:00
Dmitry Kalinkin
da8f155b2a
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/sphinxext-opengraph/default.nix
2021-12-18 10:18:14 -05:00
Frederik Rietdijk
4853c2d375 python2.tests.nixenv-virtualenv: fix test
by using a python env that ignores collisions in the backports packages.
2021-12-18 14:43:50 +01:00
Zhaofeng Li
cb955555df libffi: Run test suite 2021-12-16 20:44:56 -08:00
sternenseemann
d860ba7f09 Merge remote-tracking branch 'origin/master' into staging-next 2021-12-15 11:30:31 +01:00
Pavol Rusnak
dbf7134d29
rustpython: init at unstable-2021-12-09 2021-12-14 18:53:25 +01:00
github-actions[bot]
41895efeb5
Merge master into staging-next 2021-12-06 12:01:16 +00:00
Jonathan Ringer
a230ca83f2 python/update-python-libraries: Allow usage of hash 2021-12-05 22:34:16 -08:00
Jonathan Ringer
8746627039 python/update-python-libraries: enable updates when file contains many pnames 2021-12-05 22:34:16 -08:00
Jonathan Ringer
5263fb820e
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/django-rq/default.nix
	pkgs/top-level/all-packages.nix
2021-12-05 22:02:00 -08:00
Sumner Evans
eec28b8cfd
pypy3: 7.3.5 -> 7.3.7 (#147875)
This adds support for Python 3.8.
https://www.pypy.org/posts/2021/10/pypy-v737-release.html
2021-12-05 14:21:35 -05:00
Ryan Burns
925bbece2f cpython: remove upstreamed patch
This patch has been merged in python 3.9.7.

4b55837e7c
2021-12-03 13:18:38 -08:00
Martin Weinelt
59cd736ec2 python39: backport patch to accomodate system library changes in Big Sur
(cherry picked from commit 9738723b2486cfe9988abbff0c873cce5cba1849)
2021-12-02 18:00:12 -08:00
Jonathan Ringer
ae418d54d3 python.pkgs.pythonNamespacesHook: check parent directory exists before removing child 2021-12-02 17:38:40 -08:00
Jörg Thalheim
96956d7682
Merge pull request #145265 from Stunkymonkey/development-pname-version-3
pkgs/development: rename name to pname&version part 3
2021-12-02 14:56:34 +00:00
Felix Buehler
7678aa30b4 pkgs/development: rename name to pname&version 2021-11-30 21:32:28 +01:00
Martin Weinelt
9512291195
python39: 3.9.8 -> 3.9.9 2021-11-30 14:33:10 +01:00
Martin Weinelt
6dd0b1b8fc python311: init at 3.11.0a2 2021-11-30 14:19:52 +01:00
Martin Weinelt
abb6f3efe8 python39: 3.9.6 -> 3.9.8 2021-11-30 14:19:52 +01:00
Jonathan Ringer
a06fe88f75 python/pythonNamespacesSetupHook: add to addtional files to remove 2021-11-29 22:50:15 -08:00
Martin Weinelt
ad1968a455 Revert "python39: 3.9.6 -> 3.9.7"
This reverts commit d003f75d78.

Causes an unnecessary amount of breakages due to a DeprecationWarning
regarding the loop argument in asyncio, that is going to be deprecrated
in Python 3.10.

> 'The loop argument is deprecated since Python 3.8, and scheduled for removal in Python 3.10.'

The ecosystem needs more time to catch up here. Broken packages are for
example aiohttp, argh and by extension alot of other packages.
2021-10-09 15:21:09 +02:00