2131 Commits
Author SHA1 Message Date
github-actions[bot]andGitHub 74a066ab3f Merge staging-next into staging 2022-12-13 18:02:08 +00:00
github-actions[bot]andGitHub 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]andGitHub 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 HensingandGitHub 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 WeineltandGitHub b818d8a9b3 Merge pull request #204903 from mweinelt/cpython-changelog 2022-12-08 01:14:19 +01:00
Martin WeineltandGitHub 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]andGitHub 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 WeineltandGitHub a5ab2a3fe1 Merge pull request #203468 from mweinelt/python312 2022-12-02 00:27:07 +01:00
github-actions[bot]andGitHub 5dcaefe5c4 Merge staging-next into staging 2022-12-01 18:02:04 +00:00
github-actions[bot]andGitHub 237453e7f7 Merge master into staging-next 2022-12-01 18:01:25 +00:00
Martin WeineltandFrederik Rietdijk bcb6dbbe30 manylinux: use libxcrypt for libcrypt.so.1 2022-12-01 14:09:42 +01:00
Martin Weinelt adae7334e4 python312: init at 3.12.0a2
https://blog.python.org/2022/10/python-3120-alpha-1-released.html
https://blog.python.org/2022/11/python-3120-alpha-2-released.html
2022-11-29 01:55:35 +01:00
Martin Weinelt b5a4d7760d cpython: drop leftover 3.5/3.6 logic and patches 2022-11-29 01:34:59 +01:00
Thiago Kenji Okada d345fb2500 python27: fix CVE-2021-3733 2022-11-28 11:45:40 +00:00
Thiago Kenji Okada b3d02fb8b5 python27: add thiagokokada as maintainer 2022-11-28 09:41:57 +00:00
Thiago Kenji Okada 14334cb683 python27: switch to ActiveState's fork for Python 2
ActiveState is a company that is maintaining a fork of Python 2 to fixes
its security issues. Their support is paid, however the code is
open-source. See the details here:
https://www.activestate.com/products/python/python-2-end-of-life-security-updates/

This enable us to drop a bunch of CVE's patches for Python 2.7 and also
it should be easier to maintain, since we can just bump the version once
ActiveState tags a new version.
2022-11-28 09:41:57 +00:00
Martin WeineltandGitHub acb119aeac Merge pull request #203362 from thiagokokada/add-patches-to-python27-cves 2022-11-28 01:56:07 +01:00
Thiago Kenji Okada e7d9b0b19d python27: add patches for known security issues
Add patches from Arch Linux package (that itself source its patches from
Gentoo) to the following known security issues in Python 2.7:

- CVE-2020-26116
- CVE-2020-27619
- CVE-2020-8492

This should cover all security issues currently listed in
https://www.activestate.com/products/python/python-2-end-of-life-security-updates/.
2022-11-27 22:46:20 +00:00
ajs124 2b3c729654 python3: use openssl_legacy 2022-11-21 13:46:00 +01:00
ajs124 f06f950183 Revert "Revert "python3: pin to openssl_1_1""
This reverts commit 017fd89527.
2022-11-21 13:46:00 +01:00
LassulusandGitHub 15a42961b6 Merge pull request #196906 from helsinki-systems/feat/less-openssl_1_1 2022-11-11 00:21:52 +01:00
Jörg ThalheimandGitHub 7eccc4973c Merge pull request #195055 from Mic92/buildPythonPackage
buildPythonPackage: fix regression if no setuptools is used
2022-11-06 20:37:18 +01:00
Sergei TrofimovichandGitHub 3c65029d0d Merge pull request #198672 from trofi/pythonFull-without-xlibsWrapper
pythonFull: drop unused xlibsWrapper input
2022-11-05 10:18:25 +00:00
Pierre BourdonandGitHub 4fe74d5257 Merge pull request #198802 from delroth/relax-deps-hook-regexp
pythonRelaxDepsHook: improve Requires-Dist parsing
2022-11-01 15:10:07 +01:00
Pierre Bourdon 1f197e240e pythonRelaxDepsHook: improve Requires-Dist parsing
Prior to this commit, pythonRelaxDeps would only support removing
version constraints from "Requires-Dist" lines formatted in a particular
way ("foo (>= 1.2.3)"). This way is deprecated as per PyPA Core Metadata
Specs v2.1 [1]:

> Tools parsing the format should accept optional parentheses around
> this, but tools generating it should not use parentheses.

Additionally, a "Requires-Dist" dependency specification can contain
other metadata than just package name and version (extra names,
environment marker). These were being silently dropped by the prior
version of pythonRelaxDeps, or the version could not be relaxed.

The actual grammar is defined in PEP 508 [2]. Our tool of choice here is
sed extended regexps, so there's only so much we can do to be correct
with this parser. The regexp implemented in this commit makes an attempt
at supporting [extra] names, ; env_markers, as well as version specs
without parentheses. There are still unsupported features (URL specs) as
well as unhandled edge cases, but at some point trying to make the
regexp better is bound to awake ZALGO [3].

[1] https://packaging.python.org/en/latest/specifications/core-metadata/#requires-dist-multiple-use
[2] https://peps.python.org/pep-0508/#grammar
[3] https://stackoverflow.com/a/1732454/179806
2022-10-31 17:05:12 +01:00
Sergei Trofimovich 845c39bab5 pythonFull: drop unused xlibsWrapper input
Tested as no material change in `out` output with `diffoscope`.
2022-10-30 16:47:30 +00:00
github-actions[bot]andGitHub 6e5f43a5bd Merge master into staging-next 2022-10-28 18:01:29 +00:00
Frederik RietdijkandFrederik Rietdijk cb445d527b python3Packages: stdenv does not have to be a Python module
stdenv is included in the package set. It does not provide a Python
module however and was therefore catched by the test. Because we do need
it we provide an exception for it.
2022-10-28 19:11:31 +02:00
ajs124 017fd89527 Revert "python3: pin to openssl_1_1"
This reverts commit 8dfc998207.
2022-10-28 14:15:18 +02:00
Frederik Rietdijk d3ca664b6a Merge staging-next into staging 2022-10-27 10:06:54 +02:00
Frederik RietdijkandFrederik Rietdijk 33d12e5f0b pythonPackages: ensure all derivations provide python modules
This adds a test to ensure no new uses of `buildPythonApplication` can
be added to `python-packages.nix`.

Python packages can be grouped into two groups: 1) applications and 2)
packages providing importable modules. In `python-packages.nix` we only
want to have 2). 1) should be in the top-level package set.

To achieve this, all setup hooks need to be marked as being a setup hook.
For the setup hooks in the Python packages set this is done by creating
a new builder, `makePythonHook`.

Because there were issues with splicing, the file importing all the hooks
is converted to an extension. All non-packages were moved out of `python-packages.nix`
into `python-packages-base.nix`. The `keep` argument to `makeScopeWithSplicing
was cleaned up as well; there is no need to keep this one manually in sync
reducing the risk of breaking cross-compilation.
2022-10-27 10:03:16 +02:00
github-actions[bot]andGitHub 81a6c5a54c Merge staging-next into staging 2022-10-25 18:16:24 +00:00
Martin Weinelt 4932ed92a4 python311: 3.11.0-rc2 -> 3.11.0
https://www.python.org/downloads/release/python-3110/
https://discuss.python.org/t/python-3-11-0-final-is-now-available/20291
2022-10-25 00:30:25 +02:00
github-actions[bot]andGitHub 70da3334cf Merge staging-next into staging 2022-10-17 18:16:14 +00:00
github-actions[bot]andGitHub 3834216ec6 Merge master into staging-next 2022-10-17 18:10:17 +00:00