diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-17 09:57:33 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-17 09:57:55 +0200 |
| commit | 90059701a836b0d0dbc676e2d1ce417cc5a25bd2 (patch) | |
| tree | ea57b3799b39479251891c231b1f73bbb664d057 /pkgs/development/interpreters/python | |
| parent | afc0218ecdefc905cd034c5bdfd369739fa5bc80 (diff) | |
| download | nixpkgs-90059701a836b0d0dbc676e2d1ce417cc5a25bd2.tar nixpkgs-90059701a836b0d0dbc676e2d1ce417cc5a25bd2.tar.gz nixpkgs-90059701a836b0d0dbc676e2d1ce417cc5a25bd2.tar.bz2 nixpkgs-90059701a836b0d0dbc676e2d1ce417cc5a25bd2.tar.lz nixpkgs-90059701a836b0d0dbc676e2d1ce417cc5a25bd2.tar.xz nixpkgs-90059701a836b0d0dbc676e2d1ce417cc5a25bd2.tar.zst nixpkgs-90059701a836b0d0dbc676e2d1ce417cc5a25bd2.zip | |
python27: 2.7.13 -> 2.7.14
The enosys patch is not needed anymore since the patch is included in this maintenance release.
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/glibc-2.25-enosys.patch | 15 |
2 files changed, 2 insertions, 19 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 5f0d8d0655c..0d5f1e7e4ca 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -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 diff --git a/pkgs/development/interpreters/python/cpython/2.7/glibc-2.25-enosys.patch b/pkgs/development/interpreters/python/cpython/2.7/glibc-2.25-enosys.patch deleted file mode 100644 index 31da78e35f1..00000000000 --- a/pkgs/development/interpreters/python/cpython/2.7/glibc-2.25-enosys.patch +++ /dev/null @@ -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(). |