Author: chaoflow Date: Tue Feb 28 00:07:48 2012 New Revision: 32660 URL: https://nixos.org/websvn/nix/?rev=32660&sc=1
Log: Revert "include site for python wrappers to enable deps via pth files" This reverts commit dca280ab0b668553c50506ab7b31284e8477a803. Modified: nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/setuptools/default.nix nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix Modified: nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix ============================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix Tue Feb 28 00:07:42 2012 (r32659) +++ nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix Tue Feb 28 00:07:48 2012 (r32660) @@ -3,7 +3,7 @@ (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, wrapPython, lib, site }: +{ python, setuptools, wrapPython, lib }: { name, namePrefix ? "python-" @@ -69,8 +69,7 @@ buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - # XXX: I think setuptools is not needed here - pythonPath = [ setuptools site ] ++ pythonPath; + pythonPath = [ setuptools] ++ pythonPath; # XXX: Should we run `easy_install --always-unzip'? It doesn't seem # to have a noticeable impact on small scripts. Modified: nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/setuptools/default.nix ============================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/setuptools/default.nix Tue Feb 28 00:07:42 2012 (r32659) +++ nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/setuptools/default.nix Tue Feb 28 00:07:48 2012 (r32660) @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, wrapPython, site }: +{ stdenv, fetchurl, python, wrapPython }: stdenv.mkDerivation rec { name = "setuptools-0.6c11"; @@ -8,7 +8,7 @@ sha256 = "1lx1hwxkhipyh206bgl90ddnfcnb68bzcvyawczbf833fadyl3v3"; }; - buildInputs = [ python wrapPython site ]; + buildInputs = [ python wrapPython ]; buildPhase = "python setup.py build --build-base $out"; @@ -21,7 +21,7 @@ # remove generic files, leave setuptools.pth rm $dst/site.py* rm $dst/easy-install.pth - pythonPath=${site} wrapPythonPrograms + wrapPythonPrograms ''; doCheck = false; # doesn't work with Python 2.7 Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix ============================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix Tue Feb 28 00:07:42 2012 (r32659) +++ nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix Tue Feb 28 00:07:48 2012 (r32660) @@ -9,13 +9,13 @@ buildPythonPackage = import ../development/python-modules/generic { inherit (pkgs) lib; - inherit python wrapPython setuptools site; + inherit python wrapPython setuptools; }; setuptools = import ../development/python-modules/setuptools { inherit (pkgs) stdenv fetchurl; - inherit python wrapPython site; + inherit python wrapPython; }; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits