Merge pull request #289190 from mweinelt/python-3.13.0a4

python313: 3.13.0a3 -> 3.13.0a5
This commit is contained in:
Martin Weinelt 2024-03-22 03:40:42 +01:00 committed by GitHub
commit ebde006977
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 21 additions and 2 deletions

View file

@ -0,0 +1,12 @@
diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py
index 4856594755..6769ab8026 100644
--- a/Lib/venv/__init__.py
+++ b/Lib/venv/__init__.py
@@ -522,6 +522,7 @@ def skip_file(f):
with open(dstfile, 'wb') as f:
f.write(new_data)
shutil.copymode(srcfile, dstfile)
+ os.chmod(dstfile, 0o644)
def upgrade_dependencies(self, context):
logger.debug(

View file

@ -60,6 +60,7 @@
, static ? stdenv.hostPlatform.isStatic
, enableFramework ? false
, noldconfigPatch ? ./. + "/${sourceVersion.major}.${sourceVersion.minor}/no-ldconfig.patch"
, enableGIL ? true
# pgo (not reproducible) + -fno-semantic-interposition
# https://docs.python.org/3/using/configure.html#cmdoption-enable-optimizations
@ -111,6 +112,7 @@ let
inherit (lib)
concatMapStringsSep
concatStringsSep
enableFeature
getDev
getLib
optionals
@ -304,7 +306,10 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
# Make sure that the virtualenv activation scripts are
# owner-writable, so venvs can be recreated without permission
# errors.
] ++ optionals (pythonOlder "3.13") [
./virtualenv-permissions.patch
] ++ optionals (pythonAtLeast "3.13") [
./3.13/virtualenv-permissions.patch
] ++ optionals mimetypesSupport [
# Make the mimetypes module refer to the right file
./mimetypes.patch
@ -399,6 +404,8 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
"--enable-shared"
] ++ optionals enableFramework [
"--enable-framework=${placeholder "out"}/Library/Frameworks"
] ++ optionals (pythonAtLeast "3.13") [
(enableFeature enableGIL "gil")
] ++ optionals enableOptimizations [
"--enable-optimizations"
] ++ optionals (sqlite != null) [

View file

@ -93,9 +93,9 @@ in {
major = "3";
minor = "13";
patch = "0";
suffix = "a3";
suffix = "a5";
};
hash = "sha256-IHhMgwTrHGnID5ZuvfB3W+LjfiPfO2JGHuwSqF3Pfq0=";
hash = "sha256-Hom1NVGD58iYpaAbL2AXKP5J/bidnJeB8TNghHqu+mI=";
inherit (darwin) configd;
inherit passthruFun;
};