From 37abd1e353269dad5be191458c92700027019695 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 10:35:55 +0100 Subject: [PATCH] fix python26Full expression --- pkgs/top-level/all-packages.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7c97b21da0..06707363b36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2828,22 +2828,19 @@ let pure = callPackage ../development/interpreters/pure {}; - python = python27; python3 = python32; - - python26 = callPackage ../development/interpreters/python/2.6 { }; - - python27 = callPackage ../development/interpreters/python/2.7 { }; - python32 = callPackage ../development/interpreters/python/3.2 { }; - pythonFull = python27Full; + python = python27; + python26 = callPackage ../development/interpreters/python/2.6 { }; + python27 = callPackage ../development/interpreters/python/2.7 { }; + pythonFull = python27Full; python26Full = callPackage ../development/interpreters/python/wrapper.nix { extraLibs = lib.attrValues python26.modules; python = python26; + inherit (python26Packages) recursivePthLoader; }; - python27Full = callPackage ../development/interpreters/python/wrapper.nix { extraLibs = lib.attrValues python27.modules; python = python27;