From 2083a2307300a3e9a487f5d8c4ff237c8610809c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 13 May 2014 16:33:05 +0200 Subject: [PATCH] all-packages.nix: switch 'python3' to python 3.4.x --- pkgs/top-level/all-packages.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7584f46688db..413f3c34115a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3454,18 +3454,13 @@ let llvm = llvm_33 ; }; - python3 = hiPrio (callPackage ../development/interpreters/python/3.3 { }); + python26 = callPackage ../development/interpreters/python/2.6 { db = db47; }; + python27 = callPackage ../development/interpreters/python/2.7 { libX11 = xlibs.libX11; }; python32 = callPackage ../development/interpreters/python/3.2 { }; python33 = callPackage ../development/interpreters/python/3.3 { }; - python34 = callPackage ../development/interpreters/python/3.4 { }; - + python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { }); python = python27; - python26 = callPackage ../development/interpreters/python/2.6 { - db = db47; - }; - python27 = callPackage ../development/interpreters/python/2.7 { - libX11 = xlibs.libX11; - }; + python3 = python34; pypy = callPackage ../development/interpreters/pypy/2.2 { };