diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-29 07:47:04 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-29 07:47:04 +0200 |
commit | 3afa2460386b1472128e302d1db13dba54e68e12 (patch) | |
tree | 1bc0a79319449f29cbd5a1715c0135db1bed9337 /pkgs/development/interpreters | |
parent | d9036a02b5c5ef31e18e913ce7e2eb56999d311e (diff) | |
parent | f4792cdc0cffc0d1843f5d8bb3e458546646f67c (diff) | |
download | nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.gz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.bz2 nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.lz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.xz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.zst nixlib-3afa2460386b1472128e302d1db13dba54e68e12.zip |
Merge branch 'staging'
This includes a security update of expat.
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/pypy/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index 708c251e4aff..f07e53e592f5 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -21,6 +21,17 @@ let sha256 = "1dmckvffanmh0b50pq34shnw05r55gjxn43kgvnkz5kkvvsbxdg1"; }; + # http://bugs.python.org/issue27369 + postPatch = let + expatch = fetchurl { + name = "tests-expat-2.2.0.patch"; + url = "http://bugs.python.org/file43514/0001-Fix-Python-2.7.11-tests-for-Expat-2.2.0.patch"; + sha256 = "1j3pa7ly9xrhp8jjwg5l77z7i3y68gx8f8jchqk6zc39d9glq3il"; + }; + in '' + patch lib-python/2.7/test/test_pyexpat.py < '${expatch}' + ''; + buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional zlibSupport zlib; |