lol

Python: 3.9.21 -> 3.9.22; 3.10.16 -> 3.10.17; 3.11.11 -> 3.11.12; 3.12.9 -> 3.12.10; 3.13.2 -> 3.13.3; 3.14.0a6 -> 3.14.0a7 (#397356)

authored by

Martin Weinelt and committed by
GitHub
0407bf87 e20577f1

+19 -56
-28
pkgs/development/interpreters/python/cpython/3.10/raise-OSError-for-ERR_LIB_SYS.patch
··· 1 - diff --git a/Modules/_ssl.c b/Modules/_ssl.c 2 - index e637830..80728d2 100644 3 - --- a/Modules/_ssl.c 4 - +++ b/Modules/_ssl.c 5 - @@ -656,6 +656,11 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno) 6 - errstr = "Some I/O error occurred"; 7 - } 8 - } else { 9 - + if (ERR_GET_LIB(e) == ERR_LIB_SYS) { 10 - + // A system error is being reported; reason is set to errno 11 - + errno = ERR_GET_REASON(e); 12 - + return PyErr_SetFromErrno(PyExc_OSError); 13 - + } 14 - p = PY_SSL_ERROR_SYSCALL; 15 - } 16 - break; 17 - @@ -681,6 +686,11 @@ PySSL_SetError(PySSLSocket *sslsock, int ret, const char *filename, int lineno) 18 - errstr = "EOF occurred in violation of protocol"; 19 - } 20 - #endif 21 - + if (ERR_GET_LIB(e) == ERR_LIB_SYS) { 22 - + // A system error is being reported; reason is set to errno 23 - + errno = ERR_GET_REASON(e); 24 - + return PyErr_SetFromErrno(PyExc_OSError); 25 - + } 26 - break; 27 - } 28 - default:
-13
pkgs/development/interpreters/python/cpython/default.nix
··· 327 327 # libuuid, slowing down program startup a lot). 328 328 noldconfigPatch 329 329 ] 330 - ++ optionals (pythonOlder "3.12") [ 331 - # https://www.cve.org/CVERecord?id=CVE-2025-0938 332 - ./CVE-2025-0938.patch 333 - ] 334 330 ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [ 335 331 # Cross compilation only supports a limited number of "known good" 336 332 # configurations. If you're reading this and it's been a long time ··· 382 378 ./loongarch-support.patch 383 379 # fix failing tests with openssl >= 3.4 384 380 # https://github.com/python/cpython/pull/127361 385 - ] 386 - ++ optionals (pythonAtLeast "3.10" && pythonOlder "3.11") [ 387 - ./3.10/raise-OSError-for-ERR_LIB_SYS.patch 388 - ] 389 - ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.12") [ 390 - (fetchpatch { 391 - url = "https://github.com/python/cpython/commit/f4b31edf2d9d72878dab1f66a36913b5bcc848ec.patch"; 392 - sha256 = "sha256-w7zZMp0yqyi4h5oG8sK4z9BwNEkqg4Ar+en3nlWcxh0="; 393 - }) 394 381 ] 395 382 ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [ 396 383 # backport fix for https://github.com/python/cpython/issues/95855
+12 -12
pkgs/development/interpreters/python/default.nix
··· 22 22 sourceVersion = { 23 23 major = "3"; 24 24 minor = "12"; 25 - patch = "9"; 25 + patch = "10"; 26 26 suffix = ""; 27 27 }; 28 - hash = "sha256-ciCDXZ+Qs3wAbphCqN/0WAqspDGGdPlHMCuNKPP4ERI="; 28 + hash = "sha256-B6tpdHRZXgbwZkdBfTx/qX3tB6/Bp+RFTFY5kZtG6uo="; 29 29 }; 30 30 }; 31 31 ··· 49 49 sourceVersion = { 50 50 major = "3"; 51 51 minor = "9"; 52 - patch = "21"; 52 + patch = "22"; 53 53 suffix = ""; 54 54 }; 55 - hash = "sha256-MSb1lZLJsNeYWEdV8r97CB+hyjXOem/qmAEI11KgW7E="; 55 + hash = "sha256-jBNtGZ02N6H86YoWrcgJwdg8ki0C1B82FLNPi259OOw="; 56 56 inherit passthruFun; 57 57 }; 58 58 ··· 61 61 sourceVersion = { 62 62 major = "3"; 63 63 minor = "10"; 64 - patch = "16"; 64 + patch = "17"; 65 65 suffix = ""; 66 66 }; 67 - hash = "sha256-v7JJYJmQIgSRobkoUKBxNe0IMeQXOM9oHWPPAbKo+9E="; 67 + hash = "sha256-TGgFDwSdG0rFqt0N9fJ5QcA1DSqeerCQfuXrUiXZ1rA="; 68 68 inherit passthruFun; 69 69 }; 70 70 ··· 73 73 sourceVersion = { 74 74 major = "3"; 75 75 minor = "11"; 76 - patch = "11"; 76 + patch = "12"; 77 77 suffix = ""; 78 78 }; 79 - hash = "sha256-Kpkgx6DNI23jNkTtmAoTy7whBYv9xSj+u2CBV17XO+M="; 79 + hash = "sha256-hJ2oevTfE3cQwXluJ2qVX3qFyflxCBBnyPVl0Vw1Kgk="; 80 80 inherit passthruFun; 81 81 }; 82 82 ··· 93 93 sourceVersion = { 94 94 major = "3"; 95 95 minor = "13"; 96 - patch = "2"; 96 + patch = "3"; 97 97 suffix = ""; 98 98 }; 99 - hash = "sha256-2YS8xXzWfKqyb33vQuUjscAVu8XcB4Ns9PC2P6FZ61Y="; 99 + hash = "sha256-QPhovL3rgUmjFJWAu5v9QHszIc1I8L5jGvlVrJLA4EE="; 100 100 inherit passthruFun; 101 101 }; 102 102 ··· 106 106 major = "3"; 107 107 minor = "14"; 108 108 patch = "0"; 109 - suffix = "a6"; 109 + suffix = "a7"; 110 110 }; 111 - hash = "sha256-jWGB5TMdmizWykBa4SMOiFiaBD9HaOu0Q9OInUXBw1w="; 111 + hash = "sha256-ca287DrJ7fkzCOVc+0GE8utLFv2iuwpaOCkp7SnIOG0="; 112 112 inherit passthruFun; 113 113 }; 114 114 # Minimal versions of Python (built without optional dependencies)
+7 -3
pkgs/development/python-modules/hypothesis/default.nix
··· 24 24 25 25 buildPythonPackage rec { 26 26 pname = "hypothesis"; 27 - version = "6.130.5"; 27 + version = "6.130.12"; 28 28 pyproject = true; 29 29 30 30 disabled = pythonOlder "3.7"; ··· 33 33 owner = "HypothesisWorks"; 34 34 repo = "hypothesis"; 35 35 rev = "hypothesis-python-${version}"; 36 - hash = "sha256-PJx8Mf+OUmZ6GgLBKesKdFs09avxtGtU96ejAVznFNQ="; 36 + hash = "sha256-6p7OCjeZKZJ+3MDfdi+9XffET95pXGC6nzhTiMiEVQA="; 37 37 }; 38 38 39 39 # I tried to package sphinx-selective-exclude, but it throws ··· 80 80 "test_uses_cached_charmap" 81 81 # fails if builder is too slow 82 82 "test_can_run_with_no_db" 83 + # calls script with the naked interpreter 84 + "test_constants_from_running_file" 83 85 ] 84 86 ++ lib.optionals (pythonOlder "3.10") [ 85 87 # not sure why these tests fail with only 3.9 ··· 88 90 "test_assume_has_status_reason" 89 91 "test_observability_captures_stateful_reprs" 90 92 ] 91 - ++ lib.optionals (pythonAtLeast "3.13") [ 93 + ++ lib.optionals (pythonAtLeast "3.12") [ 94 + # AssertionError: assert [b'def \... f(): pass'] == [b'def\\', b' f(): pass'] 95 + # https://github.com/HypothesisWorks/hypothesis/issues/4355 92 96 "test_clean_source" 93 97 ]; 94 98