ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 22:03:54 +03:00
Code Issues Projects Releases Wiki Activity

python27: 2.7.13 -> 2.7.14

Browse Source 
The enosys patch is not needed anymore since the patch is included in
this maintenance release.
This commit is contained in:
Frederik Rietdijk 2017-09-17 09:57:33 +02:00
parent afc0218ecd
commit 90059701a8
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ with stdenv.lib;
let
majorVersion = "2.7";
minorVersion = "13";
minorVersion = "14";
minorVersionSuffix = "";
pythonVersion = majorVersion;
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@ -38,7 +38,7 @@ let
src = fetchurl {
url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
sha256 = "0cgpk3zk0fgpji59pb4zy9nzljr70qzgv1vpz5hq5xw2d2c47m9m";
sha256 = "0rka541ys16jwzcnnvjp2v12m4cwgd2jp6wj4kj511p715pb5zvi";
};
hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
@ -67,8 +67,6 @@ let
# libuuid, slowing down program startup a lot).
./no-ldconfig.patch
./glibc-2.25-enosys.patch
] ++ optionals hostPlatform.isCygwin [
./2.5.2-ctypes-util-find_library.patch
./2.5.2-tkinter-x11.patch

15
pkgs/development/interpreters/python/cpython/2.7/glibc-2.25-enosys.patch
View File

@ -1,15 +0,0 @@
https://bugs.python.org/issue29157
https://github.com/python/cpython/commit/01bdbad3e951
diff --git a/Python/random.c b/Python/random.c
index 2f83b5d..0b775ec 100644
--- a/Python/random.c
+++ b/Python/random.c
@@ -98,7 +98,7 @@ win32_urandom(unsigned char *buffer, Py_ssize_t size, int raise)
/* Issue #25003: Don't use getentropy() on Solaris (available since
* Solaris 11.3), it is blocking whereas os.urandom() should not block. */
-#elif defined(HAVE_GETENTROPY) && !defined(sun)
+#elif defined(HAVE_GETENTROPY) && !defined(sun) && !defined(linux)
#define PY_GETENTROPY 1
/* Fill buffer with size pseudo-random bytes generated by getentropy().