From b4f84e3b1eed301a1bf9ce4f53b33a08bd67f05e Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 11 Jan 2013 15:14:53 +0100 Subject: [PATCH] pythonPackages: introduce sections, no functional change --- pkgs/top-level/python-packages.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6827337dde4..5e93f22ed64 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3,22 +3,28 @@ let pythonPackages = python.modules // rec { inherit python; - inherit (pkgs) fetchurl fetchsvn fetchgit stdenv; + # helpers buildPythonPackage = import ../development/python-modules/generic { inherit (pkgs) lib; inherit python wrapPython setuptools recursivePthLoader offlineDistutils; }; + wrapPython = pkgs.makeSetupHook + { deps = pkgs.makeWrapper; + substitutions.libPrefix = python.libPrefix; + } + ../development/python-modules/generic/wrap.sh; + + # specials recursivePthLoader = import ../development/python-modules/recursive-pth-loader { inherit (pkgs) stdenv; inherit python; }; - setuptools = import ../development/python-modules/setuptools { inherit (pkgs) stdenv fetchurl; inherit python wrapPython; @@ -34,6 +40,8 @@ let pythonPackages = python.modules // rec { inherit python; }; + # packages defined elsewhere + ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl; inherit buildPythonPackage pythonPackages; @@ -49,12 +57,8 @@ let pythonPackages = python.modules // rec { inherit python buildPythonPackage; }; - wrapPython = pkgs.makeSetupHook - { deps = pkgs.makeWrapper; - substitutions.libPrefix = python.libPrefix; - } - ../development/python-modules/generic/wrap.sh; + # packages defined here afew = buildPythonPackage rec { rev = "6bb3915636aaf86f046a017ffffd9a4ef395e199";