From 8878d8afcd31cfdcd363d323cf3dabaed6929845 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Aug 2024 15:36:12 +0200
Subject: [PATCH] python312: 3.12.4 -> 3.12.5

https://docs.python.org/release/3.12.5/whatsnew/changelog.html
---
 ...ix-build-with-_PY_SHORT_FLOAT_REPR-0.patch | 53 -------------------
 .../interpreters/python/cpython/default.nix   |  6 +--
 .../interpreters/python/default.nix           |  4 +-
 3 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/cpython/3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch

diff --git a/pkgs/development/interpreters/python/cpython/3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch b/pkgs/development/interpreters/python/cpython/3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch
deleted file mode 100644
index a978413a676a..000000000000
--- a/pkgs/development/interpreters/python/cpython/3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 04bfb877c8ccbd431dcae429abb487c1e3390801 Mon Sep 17 00:00:00 2001
-From: Yureka <yuka@yuka.dev>
-Date: Sun, 30 Jun 2024 09:37:49 +0200
-Subject: [PATCH] Fix build with _PY_SHORT_FLOAT_REPR == 0
-
----
- Include/internal/pycore_dtoa.h | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/Include/internal/pycore_dtoa.h b/Include/internal/pycore_dtoa.h
-index 4d9681d59a..899d413b05 100644
---- a/Include/internal/pycore_dtoa.h
-+++ b/Include/internal/pycore_dtoa.h
-@@ -11,8 +11,6 @@ extern "C" {
- #include "pycore_pymath.h"        // _PY_SHORT_FLOAT_REPR
- 
- 
--#if _PY_SHORT_FLOAT_REPR == 1
--
- typedef uint32_t ULong;
- 
- struct
-@@ -22,15 +20,15 @@ Bigint {
-     ULong x[1];
- };
- 
--#ifdef Py_USING_MEMORY_DEBUGGER
-+#if defined(Py_USING_MEMORY_DEBUGGER) || _PY_SHORT_FLOAT_REPR == 0
- 
- struct _dtoa_state {
-     int _not_used;
- };
--#define _dtoa_interp_state_INIT(INTERP) \
-+#define _dtoa_state_INIT(INTERP) \
-     {0}
- 
--#else  // !Py_USING_MEMORY_DEBUGGER
-+#else  // !Py_USING_MEMORY_DEBUGGER && _PY_SHORT_FLOAT_REPR != 0
- 
- /* The size of the Bigint freelist */
- #define Bigint_Kmax 7
-@@ -65,8 +63,6 @@ PyAPI_FUNC(char *) _Py_dg_dtoa(double d, int mode, int ndigits,
-                         int *decpt, int *sign, char **rve);
- PyAPI_FUNC(void) _Py_dg_freedtoa(char *s);
- 
--#endif // _PY_SHORT_FLOAT_REPR == 1
--
- #ifdef __cplusplus
- }
- #endif
--- 
-2.45.1
-
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index dd569db15358..4128edeaa532 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -366,11 +366,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     };
   in [
     "${mingw-patch}/*.patch"
-  ]) ++ optionals isPy312 [
-    # backport fix for various platforms; armv7l, riscv64, s390
-    # https://github.com/python/cpython/pull/121178
-    ./3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch
-  ];
+  ]);
 
   postPatch = optionalString (!stdenv.hostPlatform.isWindows) ''
     substituteInPlace Lib/subprocess.py \
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index eb859dcb958c..63e0c3914aad 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -20,10 +20,10 @@
       sourceVersion = {
         major = "3";
         minor = "12";
-        patch = "4";
+        patch = "5";
         suffix = "";
       };
-      hash = "sha256-9tQZpth0OrJnAIAbSQjSbZfouYbhT5XeMbMt4rDnlVQ=";
+      hash = "sha256-+oouEsXmILCfU+ZbzYdVDS5aHi4Ev4upkdzFUROHY5c=";
     };
   };