nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-22 03:53:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "include site for python wrappers to enable deps via pth files"

Browse Source 
This reverts commit dca280ab0b668553c50506ab7b31284e8477a803.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32660
This commit is contained in:
Florian Friesdorf 2012-02-28 00:07:48 +00:00
parent 43e16d04b9
commit 3b39dff906
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/python-modules/generic/default.nix
View File

@ -3,7 +3,7 @@
(http://pypi.python.org/pypi/setuptools/), which represents a large (http://pypi.python.org/pypi/setuptools/), which represents a large
number of Python packages nowadays. */ number of Python packages nowadays. */
{ python, setuptools, wrapPython, lib, site }: { python, setuptools, wrapPython, lib }:
{ name, namePrefix ? "python-" { name, namePrefix ? "python-"
@ -69,8 +69,7 @@ python.stdenv.mkDerivation (attrs // {
buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath;
# XXX: I think setuptools is not needed here pythonPath = [ setuptools] ++ pythonPath;
pythonPath = [ setuptools site ] ++ pythonPath;
# XXX: Should we run `easy_install --always-unzip'? It doesn't seem # XXX: Should we run `easy_install --always-unzip'? It doesn't seem
# to have a noticeable impact on small scripts. # to have a noticeable impact on small scripts.

6
pkgs/development/python-modules/setuptools/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, wrapPython, site }: { stdenv, fetchurl, python, wrapPython }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "setuptools-0.6c11"; name = "setuptools-0.6c11";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1lx1hwxkhipyh206bgl90ddnfcnb68bzcvyawczbf833fadyl3v3"; sha256 = "1lx1hwxkhipyh206bgl90ddnfcnb68bzcvyawczbf833fadyl3v3";
}; };
buildInputs = [ python wrapPython site ]; buildInputs = [ python wrapPython ];
buildPhase = "python setup.py build --build-base $out"; buildPhase = "python setup.py build --build-base $out";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
# remove generic files, leave setuptools.pth # remove generic files, leave setuptools.pth
rm $dst/site.py* rm $dst/site.py*
rm $dst/easy-install.pth rm $dst/easy-install.pth
pythonPath=${site} wrapPythonPrograms wrapPythonPrograms
''; '';
doCheck = false; # doesn't work with Python 2.7 doCheck = false; # doesn't work with Python 2.7

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

@ -9,13 +9,13 @@ let pythonPackages = python.modules // rec {
buildPythonPackage = import ../development/python-modules/generic { buildPythonPackage = import ../development/python-modules/generic {
inherit (pkgs) lib; inherit (pkgs) lib;
inherit python wrapPython setuptools site; inherit python wrapPython setuptools;
}; };
setuptools = import ../development/python-modules/setuptools { setuptools = import ../development/python-modules/setuptools {
inherit (pkgs) stdenv fetchurl; inherit (pkgs) stdenv fetchurl;
inherit python wrapPython site; inherit python wrapPython;
}; };