nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-06-13 08:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
912,273 Commits 385 Branches 81 Tags
1100ff65ad783a94de661f77d3d1bee92402a657
Commit Graph

2001 Commits

Author SHA1 Message Date
Matt Sturgeon
1860be66fd [Backport release-25.11] buildPython*: support fixed-point arguments (#476950) 2026-05-04 16:44:35 +00:00
Yueh-Shun Li
c2b21fb07e python2Packages.buildPythonPackage: format expression after lib.extendMkDerivation restructuring 
(cherry picked from commit 397f1ecdb0)
 2026-05-02 02:26:46 +01:00
Yueh-Shun Li
79580f83ee python2Packages.buildPytonPackage: restructure with lib.extendMkDerivation 
Port to python2/mk-python-derivation.nix commit 0969c66247
(buildPython*: support fixed-point arguments via lib.extendMkDerivation")

Postpone formatting to minimize diff.

(cherry picked from commit ea28d03e33)
 2026-05-02 02:22:26 +01:00
Yueh-Shun Li
96986958c7 python2Packages.buildPythonPackage: remove ineffective outputs cleanAttrs 
Port to python2/mk-python-derivation.nix commit bc122a602a
("python3Packages.buildPythonPackage:
remove ineffective outputs cleanAttrs").

(cherry picked from commit 66e4524989)
 2026-05-02 02:22:25 +01:00
Yueh-Shun Li
30a2aa18dd python2Packages.buildPythonPackage: preserve disabled after <pkg>.overrideAttrs 
Port to python2/mk-python-derivation.nix commit bb3a41f312
("buildPython*: fix the disabled functionality for overrideAttrs-")

(cherry picked from commit e05bc0af96)
 2026-05-02 02:22:25 +01:00
Yueh-Shun Li
93b2914ce9 python2Packages.buildPythonPackage: passthru disabled 
Port to python2/mk-python-derivation.nix commit 8fd082ed7f
("mk-python-derivation: passthru disabled").

Co-authored-by: Peder Bergebakken Sundt <pbsds@hotmail.com>
(cherry picked from commit bd2285a8a5)
 2026-05-02 02:22:25 +01:00
Yueh-Shun Li
ffc3127237 python2Packages.buildPythonPackage: port respect user-specified passthru attrs 
Port to python2/mk-python-derivation.nix commit d6a757bb01
("buildPython*: prioritize user-specified passthru attrs").

(cherry picked from commit f2efb32a79)
 2026-05-02 02:22:25 +01:00
Yueh-Shun Li
6cd4114682 python2Packages.buildPythonPackage: handle passthru with mkDerivation 
Port to python2/mk-python-derivation.nix commit 21a1cf9686
("mkPythonPackage, mkPythonApplication:
handle passthru with mkDerivation").

(cherry picked from commit 57c0190caf)
 2026-05-02 02:22:24 +01:00
Vladimír Čunát
65bfb9329c [Backport release-25.11] Python: 3.11.14 -> 3.11.15; 3.12.12 -> 3.12.13 (#497214) 2026-03-23 09:55:14 +00:00
Martin Weinelt
60e4f99f7d python315: 3.15.0a6 -> 3.15.0a7 
https://docs.python.org/3.15/whatsnew/changelog.html#python-3-15-0-alpha-7
(cherry picked from commit eb50eb4678)
 2026-03-11 13:25:18 +00:00
Martin Weinelt
b96b24b501 python311: 3.11.14 -> 3.11.15 
https://docs.python.org/release/3.11.15/whatsnew/changelog.html
(cherry picked from commit f751ae3d25)
 2026-03-06 13:08:45 +00:00
Martin Weinelt
04037997ce python312: 3.12.12 -> 3.12.13 
https://docs.python.org/release/3.12.13/whatsnew/changelog.html
(cherry picked from commit 5c994fe2b1)
 2026-03-06 13:08:45 +00:00
nixpkgs-ci[bot]
08550a9530 Merge staging-next-25.11 into staging-25.11 2026-02-12 00:26:28 +00:00
Martin Weinelt
5542407146 python315: 3.15.0a5 -> 3.15.0a6 
https://docs.python.org/3.15/whatsnew/changelog.html#python-3-15-0-alpha-6
(cherry picked from commit ca2468533b)
 2026-02-11 17:56:23 +00:00
Martin Weinelt
2f37758ae2 python313: 3.13.11 -> 3.13.12 
https://docs.python.org/release/3.13.12/whatsnew/changelog.html

Fixes: CVE-2026-1299, CVE-2025-11468, CVE-2025-15282, CVE-2026-0672,
       CVE-2026-0865
(cherry picked from commit b428db0f48)
 2026-02-05 18:06:00 +00:00
Martin Weinelt
5820801546 python314: 3.14.2 -> 3.14.3 
https://docs.python.org/release/3.14.3/whatsnew/changelog.html

Fixes: CVE-2026-1299, CVE-2025-11468, CVE-2025-15282, CVE-2026-0672,
       CVE-2026-0865
(cherry picked from commit 08371b96c3)
 2026-02-05 18:06:00 +00:00
Martin Weinelt
20f324d700 python315: 3.15.0a4 -> 3.15.0a5 
https://docs.python.org/3.15/whatsnew/changelog.html#python-3-15-0-alpha-5
(cherry picked from commit 6a2319f8af)
 2026-01-15 00:02:11 +00:00
Martin Weinelt
b820275cab python315: 3.15.0a3 -> 3.15.0a4 
https://docs.python.org/3.15/whatsnew/changelog.html#python-3-15-0-alpha-4
(cherry picked from commit c06e838d65)
 2026-01-14 00:54:28 +00:00
Yueh-Shun Li
c43339fdaf buildPython*: format expressions 
(cherry picked from commit 7e1f654883)
 2026-01-04 20:57:27 +00:00
Yueh-Shun Li
d995f90af1 buildPython*: support fixed-point arguments via lib.extendMkDerivation 
Postpone formatting to minimize diff and to ease merging.

(cherry picked from commit 0969c66247)
 2026-01-04 20:57:27 +00:00
Yueh-Shun Li
80a316f3fb makeOverridablePythonPackage: allow buildPython* to take fixed-point arguments 
(cherry picked from commit fb9727a198)
 2026-01-04 20:57:27 +00:00
nixpkgs-ci[bot]
0d1aac6551 Merge staging-next-25.11 into staging-25.11 2025-12-22 00:23:44 +00:00
Martin Weinelt
9f60dbe63b python315: 3.15.0a2 -> 3.15.0a3 
https://docs.python.org/3.15/whatsnew/changelog.html#python-3-15-0-alpha-3
(cherry picked from commit db88301a81)
 2025-12-18 17:04:31 +00:00
nixpkgs-ci[bot]
108d0a2e36 Merge staging-next-25.11 into staging-25.11 2025-12-18 00:19:45 +00:00
Yueh-Shun Li
b19c570201 buildPythonPackage: chore: remove unnecessary set update 
(cherry picked from commit 353eec600b)
 2025-12-17 22:08:22 +00:00
nixpkgs-ci[bot]
4a7c34e955 Merge staging-next-25.11 into staging-25.11 2025-12-14 00:24:39 +00:00
nixpkgs-ci[bot]
a768006f22 Merge release-25.11 into staging-next-25.11 2025-12-14 00:24:01 +00:00
nixpkgs-ci[bot]
8f04906edc Merge staging-next-25.11 into staging-25.11 2025-12-13 00:21:57 +00:00
nixpkgs-ci[bot]
79cba5ffe2 Merge release-25.11 into staging-next-25.11 2025-12-13 00:21:14 +00:00
Matt Sturgeon
d56c0d1775 buildPython*: preserve overrideStdenvCompat on subsequent overrides 
This is needed to support the deprecated method of overriding `stdenv`
via `overridePythonAttrs`.

(cherry picked from commit 553a6c3d3a)
 2025-12-12 17:09:46 +00:00
Matt Sturgeon
a46c1c26a7 buildPython*: remove stdenv arg in overrideStdenvCompat 
Avoid passing `stdenv` to the underlying function when it is already
handled in overrideStdenvCompat.

(cherry picked from commit 32ecc2256b)
 2025-12-12 17:09:46 +00:00
Matt Sturgeon
92c74c8724 buildPython*: switch overrideStdenvCompat to mirrorFunctionArgs 
The underlying `mk-python-derivation.nix` functions do not have `stdenv`
in their functionArgs, so it was redundant to explicitly remove it.

(cherry picked from commit 9d87f178ed)
 2025-12-12 17:09:46 +00:00
Matt Sturgeon
a4c361c471 buildPython*: rename override param in makeOverridablePythonPackage 
`fdrv` → `newArgs`; the parameter is not a derivation, so fdrv is
confusing.

(cherry picked from commit 37655d3b36)
 2025-12-12 17:09:46 +00:00
Yueh-Shun Li
8cbb7d8eb1 makeOverridablePythonPackage: take care of overrideAttrs 
Make it possible to mix overridePythonAttrs and overrideAttrs, i.e.
((<pkg>.overrideAttrs (_: { foo = "a"; })).overridePythonAttrs (_: { })).foo now works

Co-authored-by: Matt Sturgeon <matt@sturgeon.me.uk>
(cherry picked from commit ca6c090082)
 2025-12-12 08:29:11 +00:00
Yueh-Shun Li
ac8f3230d5 makeOverridablePythonPackage: simplify implementation 
Attach overridePythonAttrs by attribute set update
instead of `stdenv.mkDerivation`'s `passthru`.

Co-authored-by: Matt Sturgeon <matt@sturgeon.me.uk>
(cherry picked from commit e8302431ef)
 2025-12-12 08:29:11 +00:00
Wolfgang Walther
d7f1a2acc1 Merge branch 'staging-next-25.11' into staging-25.11 2025-12-10 19:27:32 +01:00
Wolfgang Walther
f1a8b001f0 Merge branch 'release-25.11' into staging-next-25.11 2025-12-10 19:19:48 +01:00
Ihar Hrachyshka
cca3b04b44 treewide: clean up 'meta = with' pattern 
This commit was created by a combination of scripts and tools:
- an ast-grep script to prefix things in meta with `lib.`,
- a modified nixf-diagnose / nixf combination to remove unused `with lib;`, and
- regular nixfmt.

Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
 2025-12-10 19:01:23 +01:00
Martin Weinelt
04d146865c Revert "cpython: fix gh-142214 on 3.14.1" 
This reverts commit 27dcfd3e04.

This was fixed in 3.14.2 and as such this patch application has become
obsolete.

(cherry picked from commit 7b9787935a)
 2025-12-06 13:20:20 +00:00
Martin Weinelt
fab0107268 Revert "cpython: fix gh-142218 on 3.13.10 and 3.14.1" 
This reverts commit ae4f7fd1e9.

Fixed in 3.13.11 and 3.14.2 and as such obsoleted.

(cherry picked from commit d7040cdaee)
 2025-12-06 13:20:20 +00:00
Martin Weinelt
25d2c625bc python314: 3.14.1 -> 3.14.2 
https://docs.python.org/release/3.14.2/whatsnew/changelog.html
(cherry picked from commit 9dde8c194a)
 2025-12-06 13:20:19 +00:00
Martin Weinelt
88f82adb5b python313: 3.13.10 -> 3.13.11 
https://docs.python.org/release/3.13.11/whatsnew/changelog.html
(cherry picked from commit c83a2227bb)
 2025-12-06 13:20:19 +00:00
Martin Weinelt
9bc8c09feb cpython: fix gh-142214 on 3.14.1 
Fixes two regressions in dataclasses.

(cherry picked from commit 27dcfd3e04)
 2025-12-05 18:33:57 +00:00
Martin Weinelt
3da9b787fa cpython: fix gh-142218 on 3.13.10 and 3.14.1 
Fixes split table dictionary crash regression.

(cherry picked from commit ae4f7fd1e9)
 2025-12-05 18:33:56 +00:00
Martin Weinelt
5b0ae94e00 python314: 3.14.0 -> 3.14.1 
https://docs.python.org/release/3.14.1/whatsnew/changelog.html
(cherry picked from commit a2ccc79edb)
 2025-12-05 18:33:56 +00:00
Martin Weinelt
a696d052b9 python313: 3.13.9 -> 3.13.10 
https://docs.python.org/release/3.13.10/whatsnew/changelog.html
(cherry picked from commit 367dac5dcf)
 2025-12-05 18:33:56 +00:00
nixpkgs-ci[bot]
ec5940b5c1 Merge staging-next-25.11 into staging-25.11 2025-11-27 00:21:43 +00:00
Martin Weinelt
c3cccda61a python315: 3.15.0a1 -> 3.15.0a2 
https://docs.python.org/3.15/whatsnew/changelog.html#python-3-15-0-alpha-2
(cherry picked from commit 3f07d3c307)
 2025-11-26 05:11:48 +00:00
qbisi
ba25286d13 python-env: wrap python executable with --resolve-argv0 
This commit, together with https://github.com/NixOS/nixpkgs/pull/442540,
changes the way python environments are built:

  * When generating wrappers for python executables, we inherit argv[0]
    from the wrapper. This causes python to initialize its configuration
    in the environment with all the correct paths.
  * We also resolve argv[0] to absolute path when invoking python from
    PATH. This helps set python's prefix correctly on Darwin.

The end result is that python environments no longer appear to be venvs,
and behave more like a vanilla python installation. In addition it's
possible to create a venv using an environment and use packages from
both the environment and the venv.

(cherry picked from commit abe61db737)
 2025-11-16 15:31:41 +01:00
Martin Weinelt
9e9a4bea72 python: fix nixenv test (#457133) 2025-11-03 22:04:37 +00:00