pythonPackages: introduce sections, no functional change

This commit is contained in:
Florian Friesdorf 2013-01-11 15:14:53 +01:00
parent a59164e931
commit b4f84e3b1e

View File

@ -3,22 +3,28 @@
let pythonPackages = python.modules // rec { let pythonPackages = python.modules // rec {
inherit python; inherit python;
inherit (pkgs) fetchurl fetchsvn fetchgit stdenv; inherit (pkgs) fetchurl fetchsvn fetchgit stdenv;
# helpers
buildPythonPackage = import ../development/python-modules/generic { buildPythonPackage = import ../development/python-modules/generic {
inherit (pkgs) lib; inherit (pkgs) lib;
inherit python wrapPython setuptools recursivePthLoader offlineDistutils; 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 { recursivePthLoader = import ../development/python-modules/recursive-pth-loader {
inherit (pkgs) stdenv; inherit (pkgs) stdenv;
inherit python; inherit python;
}; };
setuptools = import ../development/python-modules/setuptools { setuptools = import ../development/python-modules/setuptools {
inherit (pkgs) stdenv fetchurl; inherit (pkgs) stdenv fetchurl;
inherit python wrapPython; inherit python wrapPython;
@ -34,6 +40,8 @@ let pythonPackages = python.modules // rec {
inherit python; inherit python;
}; };
# packages defined elsewhere
ipython = import ../shells/ipython { ipython = import ../shells/ipython {
inherit (pkgs) stdenv fetchurl; inherit (pkgs) stdenv fetchurl;
inherit buildPythonPackage pythonPackages; inherit buildPythonPackage pythonPackages;
@ -49,12 +57,8 @@ let pythonPackages = python.modules // rec {
inherit python buildPythonPackage; 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 { afew = buildPythonPackage rec {
rev = "6bb3915636aaf86f046a017ffffd9a4ef395e199"; rev = "6bb3915636aaf86f046a017ffffd9a4ef395e199";