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

Merge pull request #1976 from madjar/python

Browse Source 
Update to python 3.4.0
This commit is contained in:
Peter Simons 2014-03-18 11:52:21 +01:00
commit 869fb5298d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ with stdenv.lib;
let let
majorVersion = "3.4"; majorVersion = "3.4";
version = "${majorVersion}.0"; version = "${majorVersion}.0";
fullVersion = "${version}rc2"; fullVersion = "${version}";
buildInputs = filter (p: p != null) [ buildInputs = filter (p: p != null) [
zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto
@ -30,7 +30,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
sha256 = "0v37mlkwzbc8m54h3nb04x6xm2yx5fmd7flq2shn37ixf9d0ih6z"; sha256 = "1gjcn5c3zqg161vwzh43ciha15w0plf5v7cyfm372pnllb08cdpi";
}; };
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

4
pkgs/top-level/all-packages.nix
View File

@ -6115,10 +6115,10 @@ let
python = python33; python = python33;
}); });
python34Packages = import ./python-packages.nix { python34Packages = recurseIntoAttrs (import ./python-packages.nix {
inherit pkgs; inherit pkgs;
python = python34; python = python34;
}; });
python32Packages = import ./python-packages.nix { python32Packages = import ./python-packages.nix {
inherit pkgs; inherit pkgs;