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

Merge master into stdenv-updates (contains new X stuff)

Browse Source
This commit is contained in:
Vladimír Čunát
2013-06-27 15:17:05 +02:00
parent 7f1e09c35d 842420c3e1
commit 4251b70c7e
222 changed files with 4706 additions and 2345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,11 +9,11 @@ with stdenv.lib;
let
majorVersion = "2.7";
version = "${majorVersion}.4";
version = "${majorVersion}.5";
src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.bz2";
sha256 = "0nd3x4j2w8pi9ac3pawrzb5i3s88hw0aasr08dprdv7q81fp0pq3";
sha256 = "0nc091f19sllibvxm6n3qw5pflcphkwwxmz43q26lqafhra7airv";
};
patches =

2
pkgs/development/interpreters/python/3.3/default.nix
View File

@@ -58,7 +58,7 @@ stdenv.mkDerivation {
readlineSupport = readline != null;
opensslSupport = openssl != null;
tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
libPrefix = "python${majorVersion}";
libPrefix = "python${majorVersion}m";
};
enableParallelBuilding = true;