diff options
| author | Peter Simons <simons@cryp.to> | 2013-01-11 15:46:10 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-01-11 15:46:10 +0100 |
| commit | b33ad366a17ceb66f73e15c614041a8094f50a1e (patch) | |
| tree | e728a9e93a13cfc165da4053f7285f27869d01dc /pkgs/development/interpreters | |
| parent | 56c7b9684409248df7c023c097e7f22c7ce9b787 (diff) | |
| parent | abd6be85e1254905406fbe97ed070271a101ce85 (diff) | |
| download | nixlib-b33ad366a17ceb66f73e15c614041a8094f50a1e.tar nixlib-b33ad366a17ceb66f73e15c614041a8094f50a1e.tar.gz nixlib-b33ad366a17ceb66f73e15c614041a8094f50a1e.tar.bz2 nixlib-b33ad366a17ceb66f73e15c614041a8094f50a1e.tar.lz nixlib-b33ad366a17ceb66f73e15c614041a8094f50a1e.tar.xz nixlib-b33ad366a17ceb66f73e15c614041a8094f50a1e.tar.zst nixlib-b33ad366a17ceb66f73e15c614041a8094f50a1e.zip | |
Merge branch 'master' into stdenv-updates.
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/python/2.6/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 6fa27c23525c..3fe753a5a6fe 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -9,11 +9,13 @@ with stdenv.lib; let majorVersion = "2.6"; - version = "${majorVersion}.7"; + version = "${majorVersion}.8"; + # http://www.python.org/download/releases/2.6.8/ + # md5 taken from webpage, python 2.6 will receive security fixes until Oct 2013 src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2"; - sha256 = "0p0fd8i533zsdm6gc0jmhmdifccx4v064mh0i1hl2s6fcjhc20j5"; + md5 = "c6e0420a21d8b23dee8b0195c9b9a125"; }; patches = @@ -51,6 +53,10 @@ let for i in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace $i /no-such-path done + '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' + for i in Lib/plat-*/regen; do + substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ + done ''; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; |