python3: 3.11.9 -> 3.12.4

As per our documented update schedule, we'll default to Python 3.12 in
the 24.11 release cycle, while recursing into both 3.11 and 3.12.
This commit is contained in:
Martin Weinelt 2024-06-19 04:03:40 +02:00
parent 1766c845a8
commit 737b5cd4f2
2 changed files with 17 additions and 17 deletions

View File

@ -16,14 +16,14 @@
passthruFun = import ./passthrufun.nix args;
sources = {
python311 = {
python312 = {
sourceVersion = {
major = "3";
minor = "11";
patch = "9";
minor = "12";
patch = "4";
suffix = "";
};
hash = "sha256-mx6JZSP8UQaREmyGRAbZNgo9Hphqy9pZzaV7Wr2kW4c=";
hash = "sha256-9tQZpth0OrJnAIAbSQjSbZfouYbhT5XeMbMt4rDnlVQ=";
};
};
@ -68,25 +68,25 @@ in {
inherit passthruFun;
};
python311 = callPackage ./cpython ({
python311 = callPackage ./cpython {
self = __splicedPackages.python311;
inherit (darwin) configd;
inherit passthruFun;
} // sources.python311);
python312 = callPackage ./cpython {
self = __splicedPackages.python312;
sourceVersion = {
major = "3";
minor = "12";
patch = "4";
minor = "11";
patch = "9";
suffix = "";
};
hash = "sha256-9tQZpth0OrJnAIAbSQjSbZfouYbhT5XeMbMt4rDnlVQ=";
hash = "sha256-mx6JZSP8UQaREmyGRAbZNgo9Hphqy9pZzaV7Wr2kW4c=";
inherit (darwin) configd;
inherit passthruFun;
};
python312 = callPackage ./cpython ({
self = __splicedPackages.python312;
inherit (darwin) configd;
inherit passthruFun;
} // sources.python312);
python313 = callPackage ./cpython {
self = __splicedPackages.python313;
sourceVersion = {
@ -123,7 +123,7 @@ in {
enableOptimizations = false;
enableLTO = false;
mimetypesSupport = false;
} // sources.python311)).overrideAttrs(old: {
} // sources.python312)).overrideAttrs(old: {
# TODO(@Artturin): Add this to the main cpython expr
strictDeps = true;
pname = "python3-minimal";

View File

@ -17294,11 +17294,11 @@ with pkgs;
# available as `pythonPackages.tkinter` and can be used as any other Python package.
# When switching these sets, please update docs at ../../doc/languages-frameworks/python.md
python2 = python27;
python3 = python311;
python3 = python312;
# pythonPackages further below, but assigned here because they need to be in sync
python2Packages = dontRecurseIntoAttrs python27Packages;
python3Packages = dontRecurseIntoAttrs python311Packages;
python3Packages = dontRecurseIntoAttrs python312Packages;
pypy = pypy2;
pypy2 = pypy27;