dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

python27: 2.7.12 -> 2.7.13

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-12-24 16:00:31 +01:00
parent c98f3ffea8
commit 591eda8310
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/interpreters/python/cpython/2.7/default.nix
View File

@ -28,7 +28,7 @@ with stdenv.lib;
let let
majorVersion = "2.7"; majorVersion = "2.7";
minorVersion = "12"; minorVersion = "13";
minorVersionSuffix = ""; minorVersionSuffix = "";
pythonVersion = majorVersion; pythonVersion = majorVersion;
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@ -37,7 +37,7 @@ let
src = fetchurl { src = fetchurl {
url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
sha256 = "0y7rl603vmwlxm6ilkhc51rx2mfj14ckcz40xxgs0ljnvlhp30yp"; sha256 = "0cgpk3zk0fgpji59pb4zy9nzljr70qzgv1vpz5hq5xw2d2c47m9m";
}; };
hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
@ -57,13 +57,6 @@ let
./properly-detect-curses.patch ./properly-detect-curses.patch
# FIXME: get rid of this after the next release, when the commit referenced here makes
# it in. We need it until then because it breaks compilation of programs that use
# locale with clang 3.8 and higher.
(fetchpatch {
url = "https://hg.python.org/cpython/raw-rev/e0ec3471cb09";
sha256 = "1jdgb70jw942r4kmr01qll7mk1di8jx0qiabmp20jhnmha246ivq";
})
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
# Disable the use of ldconfig in ctypes.util.find_library (since # Disable the use of ldconfig in ctypes.util.find_library (since

44
pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch
View File

@ -1,8 +1,18 @@
From 6b0f329a9f37110020ca02b35c8125391ef282b7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 24 Dec 2016 15:56:10 +0100
Subject: [PATCH] no ldconfig
---
Lib/ctypes/util.py | 35 +----------------------------------
Lib/uuid.py | 47 -----------------------------------------------
2 files changed, 1 insertion(+), 81 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 b2c514d..a6eca81 100644 index ab10ec5..f253e34 100644
--- a/Lib/ctypes/util.py --- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py
@@ -207,31 +207,7 @@ elif os.name == "posix": @@ -235,40 +235,7 @@ elif os.name == "posix":
else: else:
def _findSoname_ldconfig(name): def _findSoname_ldconfig(name):
@ -22,11 +32,20 @@ index b2c514d..a6eca81 100644
- -
- # XXX assuming GLIBC's ldconfig (with option -p) - # XXX assuming GLIBC's ldconfig (with option -p)
- expr = r'\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type) - expr = r'\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type)
- f = os.popen('LC_ALL=C LANG=C /sbin/ldconfig -p 2>/dev/null') -
- env = dict(os.environ)
- env['LC_ALL'] = 'C'
- env['LANG'] = 'C'
- null = open(os.devnull, 'wb')
- try: - try:
- data = f.read() - with null:
- finally: - p = subprocess.Popen(['/sbin/ldconfig', '-p'],
- f.close() - stderr=null,
- stdout=subprocess.PIPE,
- env=env)
- except OSError: # E.g. command not found
- return None
- [data, _] = p.communicate()
- res = re.search(expr, data) - res = re.search(expr, data)
- if not res: - if not res:
- return None - return None
@ -36,16 +55,12 @@ index b2c514d..a6eca81 100644
def find_library(name): def find_library(name):
return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name)) return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))
diff --git a/Lib/uuid.py b/Lib/uuid.py diff --git a/Lib/uuid.py b/Lib/uuid.py
index 7432032..9829d18 100644 index 7432032..05eeee5 100644
--- a/Lib/uuid.py --- a/Lib/uuid.py
+++ b/Lib/uuid.py +++ b/Lib/uuid.py
@@ -437,57 +437,7 @@ def _netbios_getnode(): @@ -441,53 +441,6 @@ def _netbios_getnode():
return ((bytes[0]<<40L) + (bytes[1]<<32L) + (bytes[2]<<24L) +
(bytes[3]<<16L) + (bytes[4]<<8L) + bytes[5])
-# Thanks to Thomas Heller for ctypes and for his help with its use here. # If ctypes is available, use it to find system routines for UUID generation.
-
-# If ctypes is available, use it to find system routines for UUID generation.
_uuid_generate_time = _UuidCreate = None _uuid_generate_time = _UuidCreate = None
-try: -try:
- import ctypes, ctypes.util - import ctypes, ctypes.util
@ -97,3 +112,6 @@ index 7432032..9829d18 100644
def _unixdll_getnode(): def _unixdll_getnode():
"""Get the hardware address on Unix using ctypes.""" """Get the hardware address on Unix using ctypes."""
--
2.11.0