public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'py/offline-distutils' into python-merge

Browse Source 
Conflicts:
	pkgs/development/python-modules/generic/default.nix
This commit is contained in:
Florian Friesdorf
2012-11-23 17:28:51 +01:00
parent dce76a387d ad8a4c73fa
commit ddbd5c2eba
4 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/python-packages.nix
View File

@@ -9,7 +9,7 @@ let pythonPackages = python.modules // rec {
buildPythonPackage = import ../development/python-modules/generic {
inherit (pkgs) lib;
inherit python wrapPython setuptools;
inherit python wrapPython setuptools offlineDistutils;
};
@@ -24,6 +24,10 @@ let pythonPackages = python.modules // rec {
inherit python wrapPython;
};
offlineDistutils = import ../development/python-modules/offline-distutils {
inherit (pkgs) stdenv;
inherit python;
};
ipython = import ../shells/ipython {
inherit (pkgs) stdenv fetchurl;