Author: chaoflow Date: Tue Feb 28 00:07:42 2012 New Revision: 32659 URL: https://nixos.org/websvn/nix/?rev=32659&sc=1
Log: Revert "prevent distutils during module install from downloading and load pth files" This reverts commit 2a151d9df99f68c555a9f1fd2c80b8889561e9e3. Deleted: nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/offline-distutils/ Modified: nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/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:39 2012 (r32658) +++ nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/generic/default.nix Tue Feb 28 00:07:42 2012 (r32659) @@ -3,7 +3,7 @@ (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, wrapPython, lib, site, offlineDistutils }: +{ python, setuptools, wrapPython, lib, site }: { name, namePrefix ? "python-" @@ -69,15 +69,6 @@ buildInputs = [ python wrapPython setuptools ] ++ buildInputs ++ pythonPath; - configurePhase = '' - # do not allow distutils to make downloads, whatever install command is used - export PYTHONPATH="${setuptools}/lib/${python.libPrefix}:$PYTHONPATH" - export PYTHONPATH="${offlineDistutils}/lib/${python.libPrefix}:$PYTHONPATH" - - # enable pth files for dependencies - export PYTHONPATH="${site}/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - ''; - # XXX: I think setuptools is not needed here pythonPath = [ setuptools site ] ++ pythonPath; 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:39 2012 (r32658) +++ nixpkgs/branches/stdenv-updates/pkgs/top-level/python-packages.nix Tue Feb 28 00:07:42 2012 (r32659) @@ -9,7 +9,7 @@ buildPythonPackage = import ../development/python-modules/generic { inherit (pkgs) lib; - inherit python wrapPython setuptools site offlineDistutils; + inherit python wrapPython setuptools site; }; @@ -24,10 +24,6 @@ inherit python; }; - offlineDistutils = import ../development/python-modules/offline-distutils { - inherit (pkgs) stdenv; - inherit python; - }; ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits