Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

python312: 3.12.4 -> 3.12.5

https://docs.python.org/release/3.12.5/whatsnew/changelog.html

+3 -60
-53
pkgs/development/interpreters/python/cpython/3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch
··· 1 - From 04bfb877c8ccbd431dcae429abb487c1e3390801 Mon Sep 17 00:00:00 2001 2 - From: Yureka <yuka@yuka.dev> 3 - Date: Sun, 30 Jun 2024 09:37:49 +0200 4 - Subject: [PATCH] Fix build with _PY_SHORT_FLOAT_REPR == 0 5 - 6 - --- 7 - Include/internal/pycore_dtoa.h | 10 +++------- 8 - 1 file changed, 3 insertions(+), 7 deletions(-) 9 - 10 - diff --git a/Include/internal/pycore_dtoa.h b/Include/internal/pycore_dtoa.h 11 - index 4d9681d59a..899d413b05 100644 12 - --- a/Include/internal/pycore_dtoa.h 13 - +++ b/Include/internal/pycore_dtoa.h 14 - @@ -11,8 +11,6 @@ extern "C" { 15 - #include "pycore_pymath.h" // _PY_SHORT_FLOAT_REPR 16 - 17 - 18 - -#if _PY_SHORT_FLOAT_REPR == 1 19 - - 20 - typedef uint32_t ULong; 21 - 22 - struct 23 - @@ -22,15 +20,15 @@ Bigint { 24 - ULong x[1]; 25 - }; 26 - 27 - -#ifdef Py_USING_MEMORY_DEBUGGER 28 - +#if defined(Py_USING_MEMORY_DEBUGGER) || _PY_SHORT_FLOAT_REPR == 0 29 - 30 - struct _dtoa_state { 31 - int _not_used; 32 - }; 33 - -#define _dtoa_interp_state_INIT(INTERP) \ 34 - +#define _dtoa_state_INIT(INTERP) \ 35 - {0} 36 - 37 - -#else // !Py_USING_MEMORY_DEBUGGER 38 - +#else // !Py_USING_MEMORY_DEBUGGER && _PY_SHORT_FLOAT_REPR != 0 39 - 40 - /* The size of the Bigint freelist */ 41 - #define Bigint_Kmax 7 42 - @@ -65,8 +63,6 @@ PyAPI_FUNC(char *) _Py_dg_dtoa(double d, int mode, int ndigits, 43 - int *decpt, int *sign, char **rve); 44 - PyAPI_FUNC(void) _Py_dg_freedtoa(char *s); 45 - 46 - -#endif // _PY_SHORT_FLOAT_REPR == 1 47 - - 48 - #ifdef __cplusplus 49 - } 50 - #endif 51 - -- 52 - 2.45.1 53 -
+1 -5
pkgs/development/interpreters/python/cpython/default.nix
··· 366 366 }; 367 367 in [ 368 368 "${mingw-patch}/*.patch" 369 - ]) ++ optionals isPy312 [ 370 - # backport fix for various platforms; armv7l, riscv64, s390 371 - # https://github.com/python/cpython/pull/121178 372 - ./3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch 373 - ]; 369 + ]); 374 370 375 371 postPatch = optionalString (!stdenv.hostPlatform.isWindows) '' 376 372 substituteInPlace Lib/subprocess.py \
+2 -2
pkgs/development/interpreters/python/default.nix
··· 20 20 sourceVersion = { 21 21 major = "3"; 22 22 minor = "12"; 23 - patch = "4"; 23 + patch = "5"; 24 24 suffix = ""; 25 25 }; 26 - hash = "sha256-9tQZpth0OrJnAIAbSQjSbZfouYbhT5XeMbMt4rDnlVQ="; 26 + hash = "sha256-+oouEsXmILCfU+ZbzYdVDS5aHi4Ev4upkdzFUROHY5c="; 27 27 }; 28 28 }; 29 29