Merge pull request #1976 from madjar/python

Update to python 3.4.0

+4 -4
+2 -2
pkgs/development/interpreters/python/3.4/default.nix
··· 18 let 19 majorVersion = "3.4"; 20 version = "${majorVersion}.0"; 21 - fullVersion = "${version}rc2"; 22 23 buildInputs = filter (p: p != null) [ 24 zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto ··· 30 31 src = fetchurl { 32 url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; 33 - sha256 = "0v37mlkwzbc8m54h3nb04x6xm2yx5fmd7flq2shn37ixf9d0ih6z"; 34 }; 35 36 NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
··· 18 let 19 majorVersion = "3.4"; 20 version = "${majorVersion}.0"; 21 + fullVersion = "${version}"; 22 23 buildInputs = filter (p: p != null) [ 24 zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto ··· 30 31 src = fetchurl { 32 url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; 33 + sha256 = "1gjcn5c3zqg161vwzh43ciha15w0plf5v7cyfm372pnllb08cdpi"; 34 }; 35 36 NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+2 -2
pkgs/top-level/all-packages.nix
··· 6115 python = python33; 6116 }); 6117 6118 - python34Packages = import ./python-packages.nix { 6119 inherit pkgs; 6120 python = python34; 6121 - }; 6122 6123 python32Packages = import ./python-packages.nix { 6124 inherit pkgs;
··· 6115 python = python33; 6116 }); 6117 6118 + python34Packages = recurseIntoAttrs (import ./python-packages.nix { 6119 inherit pkgs; 6120 python = python34; 6121 + }); 6122 6123 python32Packages = import ./python-packages.nix { 6124 inherit pkgs;