Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2025-10-15 18:06:33 +00:00
committed by GitHub
43 changed files with 580 additions and 730 deletions

View File

@@ -0,0 +1,40 @@
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 378f12167c6..21710702e69 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -374,34 +374,7 @@ def find_library(name, is64 = False):
else:
def _findSoname_ldconfig(name):
- import struct
- if struct.calcsize('l') == 4:
- machine = os.uname().machine + '-32'
- else:
- machine = os.uname().machine + '-64'
- mach_map = {
- 'x86_64-64': 'libc6,x86-64',
- 'ppc64-64': 'libc6,64bit',
- 'sparc64-64': 'libc6,64bit',
- 's390x-64': 'libc6,64bit',
- 'ia64-64': 'libc6,IA-64',
- }
- abi_type = mach_map.get(machine, 'libc6')
-
- # XXX assuming GLIBC's ldconfig (with option -p)
- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
- regex = os.fsencode(regex % (re.escape(name), abi_type))
- try:
- with subprocess.Popen(['/sbin/ldconfig', '-p'],
- stdin=subprocess.DEVNULL,
- stderr=subprocess.DEVNULL,
- stdout=subprocess.PIPE,
- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
- res = re.search(regex, p.stdout.read())
- if res:
- return os.fsdecode(res.group(1))
- except OSError:
- pass
+ return None
def _findLib_ld(name):
# See issue #9998 for why this is needed

View File

@@ -97,6 +97,19 @@
hash = "sha256-Ipna5ULTlc44g6ygDTyRAwfNaOCy9zNgmMjnt+7p8+k=";
inherit passthruFun;
};
python315 = callPackage ./cpython {
self = __splicedPackages.python315;
sourceVersion = {
major = "3";
minor = "15";
patch = "0";
suffix = "a1";
};
hash = "sha256-MZSTnUiO6u79z5kNNVQtmtHOeIeJxOIwWiBg63BY5aQ=";
inherit passthruFun;
};
# Minimal versions of Python (built without optional dependencies)
python3Minimal =
(callPackage ./cpython (