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

Python 2.7.11 -> 2.7.12

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-07-19 11:46:11 +02:00
parent 1c39145bc2
commit b49bedd75b
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,11 +23,11 @@ with stdenv.lib;
let let
majorVersion = "2.7"; majorVersion = "2.7";
version = "${majorVersion}.11"; version = "${majorVersion}.12";
src = fetchurl { src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
sha256 = "0iiz844riiznsyhhyy962710pz228gmhv8qi3yk4w4jhmx2lqawn"; sha256 = "0y7rl603vmwlxm6ilkhc51rx2mfj14ckcz40xxgs0ljnvlhp30yp";
}; };
patches = patches =

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

@ -1,7 +1,8 @@
diff -ru -x '*~' Python-2.7.11-orig/Lib/ctypes/util.py Python-2.7.11/Lib/ctypes/util.py diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
--- Python-2.7.11-orig/Lib/ctypes/util.py 2015-12-05 20:46:56.000000000 +0100 index b2c514d..a6eca81 100644
+++ Python-2.7.11/Lib/ctypes/util.py 2016-07-01 14:24:50.714223450 +0200 --- a/Lib/ctypes/util.py
@@ -212,31 +212,7 @@ +++ b/Lib/ctypes/util.py
@@ -207,31 +207,7 @@ elif os.name == "posix":
else: else:
def _findSoname_ldconfig(name): def _findSoname_ldconfig(name):
@ -21,7 +22,7 @@ diff -ru -x '*~' Python-2.7.11-orig/Lib/ctypes/util.py Python-2.7.11/Lib/ctypes/
- -
- # 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('/sbin/ldconfig -p 2>/dev/null') - f = os.popen('LC_ALL=C LANG=C /sbin/ldconfig -p 2>/dev/null')
- try: - try:
- data = f.read() - data = f.read()
- finally: - finally:
@ -34,10 +35,11 @@ diff -ru -x '*~' Python-2.7.11-orig/Lib/ctypes/util.py Python-2.7.11/Lib/ctypes/
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 -ru -x '*~' Python-2.7.11-orig/Lib/uuid.py Python-2.7.11/Lib/uuid.py diff --git a/Lib/uuid.py b/Lib/uuid.py
--- Python-2.7.11-orig/Lib/uuid.py 2015-12-05 20:47:09.000000000 +0100 index 7432032..9829d18 100644
+++ Python-2.7.11/Lib/uuid.py 2016-07-01 14:33:14.360446897 +0200 --- a/Lib/uuid.py
@@ -437,57 +437,7 @@ +++ b/Lib/uuid.py
@@ -437,57 +437,7 @@ def _netbios_getnode():
return ((bytes[0]<<40L) + (bytes[1]<<32L) + (bytes[2]<<24L) + return ((bytes[0]<<40L) + (bytes[1]<<32L) + (bytes[2]<<24L) +
(bytes[3]<<16L) + (bytes[4]<<8L) + bytes[5]) (bytes[3]<<16L) + (bytes[4]<<8L) + bytes[5])