public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Revert "python: 3.8.6 -> 3.8.7.""

Browse Source 
This was originally reverted because of an invalid patch.
This has been fixed and now we want this update again.

This reverts commit e1ed9b3b0851b95d3e82fb1085a121531c32a42a.
This commit is contained in:
Frederik Rietdijk 2021-01-09 08:52:29 +01:00
parent 9a4e098cc4
commit 7c61ecbefd
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch
View File

@ -1,18 +1,18 @@
From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001 From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl> From: Greg Roodt <greg@canva.com>
Date: Mon, 28 Aug 2017 09:24:06 +0200 Date: Wed, 9 Dec 2020 17:59:24 +1100
Subject: [PATCH] Don't use ldconfig Subject: [PATCH] Don't use ldconfig
--- ---
Lib/ctypes/util.py | 70 ++---------------------------------------------------- Lib/ctypes/util.py | 77 ++--------------------------------------------
1 file changed, 2 insertions(+), 68 deletions(-) 1 file changed, 2 insertions(+), 75 deletions(-)
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 5e8b31a854..7b45ce6c15 100644 index 0c2510e161..7fb98af308 100644
--- a/Lib/ctypes/util.py --- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py
@@ -94,46 +94,7 @@ elif os.name == "posix": @@ -100,53 +100,7 @@ elif os.name == "posix":
import re, tempfile return thefile.read(4) == elf_header
def _findLib_gcc(name): def _findLib_gcc(name):
- # Run GCC's linker with the -t (aka --trace) option and examine the - # Run GCC's linker with the -t (aka --trace) option and examine the
@ -51,15 +51,22 @@ index 5e8b31a854..7b45ce6c15 100644
- # Raised if the file was already removed, which is the normal - # Raised if the file was already removed, which is the normal
- # behaviour of GCC if linking fails - # behaviour of GCC if linking fails
- pass - pass
- res = re.search(expr, trace) - res = re.findall(expr, trace)
- if not res: - if not res:
- return None - return None
- return os.fsdecode(res.group(0)) -
- for file in res:
- # Check if the given file is an elf file: gcc can report
- # some files that are linker scripts and not actual
- # shared objects. See bpo-41976 for more details
- if not _is_elf(file):
- continue
- return os.fsdecode(file)
+ return None + return None
if sys.platform == "sunos5": if sys.platform == "sunos5":
@@ -255,34 +216,7 @@ elif os.name == "posix": @@ -268,34 +222,7 @@ elif os.name == "posix":
else: else:
def _findSoname_ldconfig(name): def _findSoname_ldconfig(name):
@ -96,5 +103,4 @@ index 5e8b31a854..7b45ce6c15 100644
def _findLib_ld(name): def _findLib_ld(name):
# See issue #9998 for why this is needed # See issue #9998 for why this is needed
-- --
2.15.0 2.24.3 (Apple Git-128)

4
pkgs/development/interpreters/python/default.nix
View File

@ -154,10 +154,10 @@ in {
sourceVersion = { sourceVersion = {
major = "3"; major = "3";
minor = "8"; minor = "8";
patch = "6"; patch = "7";
suffix = ""; suffix = "";
}; };
sha256 = "qeC3nSeqBW65zOjWOkJ7X5urFGXe4/lC3P2yWoL0q4o="; sha256 = "sha256-3cwd8Wu1uHqkLsXSCluQLy0IjKommyjgFZD5enmOxQo=";
inherit (darwin) configd; inherit (darwin) configd;
inherit passthruFun; inherit passthruFun;
}; };