Commit Graph

2158 Commits

Author SHA1 Message Date
Thiago Kenji Okada
c89380b0c4 pythonInterpreters.pypy27_prebuilt: use autoPatchelfHook 2023-01-07 21:11:48 +00:00
Thiago Kenji Okada
a49d01ce3f pythonInterpreters.pypy27_prebuilt: add support for aarch64-linux 2023-01-07 21:11:48 +00:00
Thiago Kenji Okada
be456598db pypy38: 7.3.9 -> 7.3.11 2023-01-07 21:11:48 +00:00
Thiago Kenji Okada
797e62d503 pypy39: 7.3.9 -> 7.3.11
Also build it with pypy27 instead of python27.
2023-01-07 21:11:48 +00:00
Thiago Kenji Okada
284d9a1067 pypy27: 7.3.9 -> 7.3.11
Also build it with pythonInterpreters.pypy27_prebuilt instead of
python27, to avoid it being broken after #201859 is merged.

Keep in mind that the above change will make this derivation only work
with x86_64-linux for now (since pypy27_prebuilt is only packaged for
that platform). However support for newer platforms can be added later,
and a working package for one platform is better than a broken package
in 4 platforms.
2023-01-07 21:11:48 +00:00
Thiago Kenji Okada
6339c29710 pypy37: remove 2023-01-07 21:11:48 +00:00
Thiago Kenji Okada
5dbf9ca20c pythonInterpreters.pypy39_prebuilt: 7.3.9 -> 7.3.11 2023-01-07 21:11:48 +00:00
Thiago Kenji Okada
525588440a pythonInterpreters.pypy27_prebuilt: 7.3.9 -> 7.3.11 2023-01-07 21:11:48 +00:00
github-actions[bot]
3b3114f45d Merge master into staging-next 2023-01-07 18:01:08 +00:00
Artturi
f56de234bb Merge pull request #207652 from Artturin/splicenixfmt 2023-01-07 17:42:25 +02:00
Martin Weinelt
afd962b51c Merge remote-tracking branch 'origin/master' into staging-next 2023-01-05 17:16:26 +01:00
Martin Weinelt
e75f5e8efa python37: drop
The package set hasn't been working for a long time now, due to infinite
recursions, that nobody was going to fix.

The release is going to go EOL in 2023/06 and we don't want to ship it
in NixOS 23.05 anyway.
2023-01-05 13:20:49 +01:00
Thiago Kenji Okada
b0ac530007 python27: 2.7.18.5 -> 2.7.18.6 2023-01-04 21:12:03 +00:00
github-actions[bot]
789ae2c93d Merge staging-next into staging 2023-01-04 18:01:36 +00:00
Thiago Kenji Okada
0992faa347 Merge pull request #206642 from thiagokokada/python27-use-system-libs
python27: use ffi/expat as system libraries
2023-01-04 16:34:21 +00:00
Martin Weinelt
e464bde9ba Merge pull request #208962 from KAction/patch/v1/python3.pkgs.sphinxHook 2023-01-04 02:38:53 +01:00
Dmitry Bogatov
82ae2e8f06 python3.pkgs.sphinxHook: fix co-installability of generated documentation
Include full $name of the derivation into docdir, so documentation for
python package "foo" is installed into $out/share/doc/python3.10-foo-1.2.3
instead of just $out/share/doc/foo, where it may conflict with some
other package named "foo" and not-coinstallable with different
versions of the same python package.

Change from $name to $pname was introduced in [1ee5fca], probably as
unindented side-effect of adding support for formats other than html.
2023-01-03 20:28:48 -05:00
Weijia Wang
f6fd1b9a53 python312: fix build on darwin 2023-01-02 13:07:46 +01:00
Weijia Wang
a440e955e0 python3: allow enabling framework on darwin 2023-01-01 16:05:48 +01:00
Robert Schütz
fa3feb9f65 python3Packages.pythonImportsCheck: set $PYTHONPATH
Don't rely on the installPhase doing so.
2022-12-29 04:11:02 -08:00
Artturin
58fa78077c treewide: use splicing convenience functions 2022-12-25 14:05:03 +02:00
github-actions[bot]
dc7ebb0163 Merge staging-next into staging 2022-12-18 18:01:41 +00:00
Thiago Kenji Okada
47f904bad1 python27: use ffi/expat as system libraries
Without `--with-system-{ffi,expat}` flags, Python will use its own
embedded libraries that are out-of-date. Thanks to it, they can be a
security issue. So let's use our own libraries instead.

This is already what Python 3.x does, so should be safe.
2022-12-18 12:32:51 +00:00
figsoda
ec8cb34358 treewide: fix typos 2022-12-17 19:39:44 -05:00
github-actions[bot]
61a0176830 Merge staging-next into staging 2022-12-17 00:02:50 +00:00
github-actions[bot]
30b97b0e83 Merge master into staging-next 2022-12-17 00:02:17 +00:00
Thiago Kenji Okada
283ecac082 resholve: strip unused libraries from python27
Strip unused libraries from resholve's own python27 derivation, further
reducing its size and reducing its attack surface.
2022-12-15 00:07:02 +00:00
github-actions[bot]
74a066ab3f Merge staging-next into staging 2022-12-13 18:02:08 +00:00
github-actions[bot]
d07c2d73fd Merge master into staging-next 2022-12-13 18:01:30 +00:00
Thiago Kenji Okada
2e943fc060 resholve: use stripped-down python27
This PR strips down the modified `python27` derivation used by `resholve`. The
idea is to reduce the possible security issues, and also to make it easier to
bootstrap.
2022-12-13 14:37:00 +00:00
github-actions[bot]
cfbecb45cc Merge staging-next into staging 2022-12-12 18:01:51 +00:00
Vladimír Čunát
1a5af95367 python311: revert asyncio changes done in 3.11.1
Almost same as in the parent commit.
2022-12-12 14:33:17 +01:00
Vladimír Čunát
9ee1d16c36 python310: revert asyncio changes done in 3.10.9
They brought significant regressions.  Upstream is now discussing
what to do, but we still want the security fixes from 3.10.9.
2022-12-12 14:23:49 +01:00
Robert Hensing
16f5747575 Merge pull request #175649 from Artturin/opt-in-structured-attrs
stdenv: support opt-in __structuredAttrs
2022-12-10 21:12:43 +01:00
Vladimír Čunát
9c497bb8d6 Merge branch 'staging-next' into staging 2022-12-09 10:27:46 +01:00
Artturin
adc8900df1 treewide: fix some core package structuredAttrs 2022-12-08 21:05:28 +02:00
Martin Weinelt
b818d8a9b3 Merge pull request #204903 from mweinelt/cpython-changelog 2022-12-08 01:14:19 +01:00
Martin Weinelt
bdb82dffc0 Merge pull request #204902 from mweinelt/cpython-39-310-312 2022-12-07 17:55:35 +01:00
Martin Weinelt
e824b21ba7 python310: 3.10.8 -> 3.10.9
https://docs.python.org/release/3.10.9/whatsnew/changelog.html
https://pythoninsider.blogspot.com/2022/12/python-3111-3109-3916-3816-3716-and.html

Fixes: CVE-2022-37454, CVE-2022-45061, CVE-2022-42919
2022-12-07 16:41:58 +01:00
Martin Weinelt
2fce48831c python39: 3.9.15 -> 3.9.16
https://docs.python.org/release/3.9.16/whatsnew/changelog.html
https://pythoninsider.blogspot.com/2022/12/python-3111-3109-3916-3816-3716-and.html

Fixes: CVE-2022-37454, CVE-2022-42919, CVE-2022-45061, CVE-2015-20107
2022-12-07 16:40:42 +01:00
Martin Weinelt
6dcc133aae cpython: Update meta and add changelog url 2022-12-07 16:31:39 +01:00
Martin Weinelt
1328f79d81 python312: 3.12.0a2 -> 3.12.0a3
https://docs.python.org/3.12/whatsnew/changelog.html#python-3-12-0-alpha3
https://pythoninsider.blogspot.com/2022/12/python-3111-3109-3916-3816-3716-and.html

Fixes: CVE-2022-45061
2022-12-07 02:37:58 +01:00
Martin Weinelt
f1433e66f9 python38: 3.11.0 -> 3.11.1
https://www.python.org/downloads/release/python-3111/
https://docs.python.org/release/3.11.1/whatsnew/changelog.html#python-3-11-1
https://pythoninsider.blogspot.com/2022/12/python-3111-3109-3916-3816-3716-and.html

Fixes: CVE-2022-45061
2022-12-07 01:26:55 +01:00
Martin Weinelt
71c4a3a0b1 python38: 3.8.15 -> 3.8.16
https://www.python.org/downloads/release/python-3816/
https://pythoninsider.blogspot.com/2022/12/python-3111-3109-3916-3816-3716-and.html

Fixes: CVE-2022-37454, CVE-2022-45061, CVE-2015-20107
2022-12-07 01:25:30 +01:00
Martin Weinelt
10bab2150c python37: 3.7.15 -> 3.7.16
https://www.python.org/downloads/release/python-3716/
https://pythoninsider.blogspot.com/2022/12/python-3111-3109-3916-3816-3716-and.html

Fixes: CVE-2022-37454, CVE-2022-45061, CVE-2015-20107
2022-12-07 01:23:29 +01:00
Martin Weinelt
e3da5a807b Merge remote-tracking branch 'origin/staging-next' into staging 2022-12-03 01:28:01 +01:00
github-actions[bot]
a83c4dd193 Merge master into staging-next 2022-12-03 00:02:19 +00:00
Martin Weinelt
72231c9177 cpython: Restore libxcrypt CFLAGS and LIBS in configureFlags 2022-12-02 22:50:55 +01:00
Sergei Trofimovich
d968c6eded pypy2, pypy3: drop unused xlibsWrapper 2022-12-02 18:18:05 +00:00
Martin Weinelt
a5ab2a3fe1 Merge pull request #203468 from mweinelt/python312 2022-12-02 00:27:07 +01:00