Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0895fcf266ac
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6e6c3f24f623
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Feb 20, 2021

  1. python37: 3.7.9 -> 3.7.10, fixup patches

    @mweinelt @FRidh
    mweinelt authored and FRidh committed Feb 20, 2021
    Copy the full SHA
    6e6c3f2 View commit details
0 ...ers/python/cpython/3.7/find_library.patch → ...ers/python/cpython/3.6/find_library.patch
View file
File renamed without changes.
30 changes: 19 additions & 11 deletions pkgs/development/interpreters/python/cpython/3.7/no-ldconfig.patch
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
From ba458f33f335b217d078fdce56e9c6f9f93adb49 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 28 Aug 2017 09:24:06 +0200
Subject: [PATCH] Don't use ldconfig

---
Lib/ctypes/util.py | 70 ++----------------------------------------------------
1 file changed, 2 insertions(+), 68 deletions(-)
Lib/ctypes/util.py | 78 ++--------------------------------------------
1 file changed, 2 insertions(+), 76 deletions(-)

diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 5e8b31a854..7b45ce6c15 100644
index 0c2510e..79635a8 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -94,46 +94,7 @@ elif os.name == "posix":
import re, tempfile
@@ -100,54 +100,7 @@ elif os.name == "posix":
return thefile.read(4) == elf_header

def _findLib_gcc(name):
- # Run GCC's linker with the -t (aka --trace) option and examine the
@@ -51,15 +51,23 @@ index 5e8b31a854..7b45ce6c15 100644
- # Raised if the file was already removed, which is the normal
- # behaviour of GCC if linking fails
- pass
- res = re.search(expr, trace)
- res = re.findall(expr, trace)
- if not res:
- 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


if sys.platform == "sunos5":
@@ -255,34 +216,7 @@ elif os.name == "posix":
# use /usr/ccs/bin/dump on solaris
@@ -268,34 +221,7 @@ elif os.name == "posix":
else:

def _findSoname_ldconfig(name):
@@ -96,5 +104,5 @@ index 5e8b31a854..7b45ce6c15 100644
def _findLib_ld(name):
# See issue #9998 for why this is needed
--
2.15.0
2.30.0

4 changes: 2 additions & 2 deletions pkgs/development/interpreters/python/cpython/default.nix
View file
Original file line number Diff line number Diff line change
@@ -222,9 +222,9 @@ in with passthru; stdenv.mkDerivation {
else
./3.7/fix-finding-headers-when-cross-compiling.patch
)
] ++ optionals (isPy36 || isPy37) [
] ++ optionals (isPy36) [
# Backport a fix for ctypes.util.find_library.
./3.7/find_library.patch
./3.6/find_library.patch
];

postPatch = ''