Commit Graph

37 Commits

Author SHA1 Message Date
Florian Friesdorf
833023d85a Revert "pth file with deps, only current package's scripts, no colliding files"
This reverts commit 3a37caa6a278fb244eac4a6bb1452d1914159be8.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32662
2012-02-28 00:07:56 +00:00
Florian Friesdorf
3b39dff906 Revert "include site for python wrappers to enable deps via pth files"
This reverts commit dca280ab0b668553c50506ab7b31284e8477a803.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32660
2012-02-28 00:07:48 +00:00
Florian Friesdorf
43e16d04b9 Revert "prevent distutils during module install from downloading and load pth files"
This reverts commit 2a151d9df99f68c555a9f1fd2c80b8889561e9e3.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32659
2012-02-28 00:07:42 +00:00
Florian Friesdorf
4b4f6ece3e Revert "removal of deps' scripts only if easy-install.pth exists"
This reverts commit a74507f63e2af67cf64dc3e67bfbf2771120f67e.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32655
2012-02-28 00:07:30 +00:00
Florian Friesdorf
2d2c8b3e59 Revert "include site in pythonpath of wrapped scripts, if python-site is installed"
This reverts commit 1ac12b0d4b64936104cb6031b02c92c3d1845ae5.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32654
2012-02-28 00:07:27 +00:00
Florian Friesdorf
2ea5e2b576 Revert "suffix pythonpath"
This reverts commit a9a2b1e0dd8cdbb1dff3253d303b35d41f29b0f9.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32652
2012-02-28 00:07:19 +00:00
Florian Friesdorf
92da3fd865 Revert "PYTHONPATH in preConfigure instead of configurePhase"
This reverts commit a9873e9412d5ffb333baaf33502c8dff62548fa6.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32651
2012-02-28 00:07:16 +00:00
Florian Friesdorf
e545a9944a Revert "added unzip to buildPythonPackage's buildInputs - used quite often"
This reverts commit f067ecb4911f154fe2c64434abdc5a8b79625f5a.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32644
2012-02-28 00:06:52 +00:00
Florian Friesdorf
178b5b9c5b Revert "move checkPhase after fixupPhase for python packages"
This reverts commit 413c44da228754018a2920cb556303e803a9d488.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32643
2012-02-28 00:06:49 +00:00
Florian Friesdorf
013c915777 Revert "enable preConfigure for python packages again"
This reverts commit a513314290ba0d78400ea4902301f421e0fecdd2.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32642
2012-02-28 00:06:46 +00:00
Florian Friesdorf
3c51235920 enable preConfigure for python packages again
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32626
2012-02-27 17:34:08 +00:00
Florian Friesdorf
d16a15c0a5 move checkPhase after fixupPhase for python packages
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32625
2012-02-27 17:34:02 +00:00
Florian Friesdorf
9e646d4689 added unzip to buildPythonPackage's buildInputs - used quite often
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32624
2012-02-27 17:33:55 +00:00
Florian Friesdorf
6d7dfd1415 PYTHONPATH in preConfigure instead of configurePhase
enables a normal configurePhase also for python packages (e.g. libxml2
python bindings)

authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32595
2012-02-26 17:23:47 +00:00
Florian Friesdorf
eb35e3bd13 suffix pythonpath
this is already the case for the pythonXYFull

svn path=/nixpkgs/branches/stdenv-updates/; revision=32594
2012-02-26 17:23:44 +00:00
Florian Friesdorf
d670c0e45c include site in pythonpath of wrapped scripts, if python-site is installed
svn path=/nixpkgs/branches/stdenv-updates/; revision=32592
2012-02-26 17:23:38 +00:00
Florian Friesdorf
c6893a14df removal of deps' scripts only if easy-install.pth exists
solves duplicate installation for packages that do not use setuptools

svn path=/nixpkgs/branches/stdenv-updates/; revision=32591
2012-02-26 17:23:35 +00:00
Florian Friesdorf
d52e2c7c41 prevent distutils during module install from downloading and load pth files
based on a patch by Cillian de Róiste

svn path=/nixpkgs/branches/stdenv-updates/; revision=32583
2012-02-26 17:23:09 +00:00
Florian Friesdorf
ccb34b093f include site for python wrappers to enable deps via pth files
svn path=/nixpkgs/branches/stdenv-updates/; revision=32582
2012-02-26 17:23:05 +00:00
Florian Friesdorf
6ccd671e5b pth file with deps, only current package's scripts, no colliding files
svn path=/nixpkgs/branches/stdenv-updates/; revision=32580
2012-02-26 17:22:59 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra
69b974bda6 * Generic Python builder: support preCheck and postCheck.
svn path=/nixpkgs/branches/modular-python/; revision=26602
2011-03-30 12:27:04 +00:00
Eelco Dolstra
353d450867 * wrapPythonPrograms: don't hard-code the Python library prefix.
svn path=/nixpkgs/branches/modular-python/; revision=26594
2011-03-29 15:19:59 +00:00
Eelco Dolstra
968496e69b * wrapPythonPrograms: rewrite the common "#! .../env python" idiom to
"#! .../python".

svn path=/nixpkgs/branches/modular-python/; revision=26583
2011-03-28 17:19:27 +00:00
Eelco Dolstra
47adaa80e3 * Move the wrapPythonPrograms function into a separate setup hook
(wrapPython).

svn path=/nixpkgs/branches/modular-python/; revision=26580
2011-03-28 16:33:33 +00:00
Eelco Dolstra
120d1757fe * buildPythonPackage: added an argument `pythonPath' to specify Python
dependencies that are *not* propagated to the user environment
  (as opposed to `propagatedBuildInputs').  For instance, if you
  install `iotop', you typically don't want its Python dependencies
  polluting the user environment.
  
* buildPythonPackage: some cleanup (e.g. use function argument
  defaults instead of `if attrs ? foo then attrs.foo else []').

svn path=/nixpkgs/branches/modular-python/; revision=26571
2011-03-28 15:30:48 +00:00
Peter Simons
93b18ceb30 pkgs/development/python-modules/generic: parameterize build/install command
The generic 'buildPythonPackage' function used to use the build/install command
"easy_install" unconditionally. That didn't work for python-numpy, for
instance, because the package wants "setup.py" run with additional parameters
to determine the fortran compiler of choice. The newly introduced function
argument 'installCommand' allows to implement this. By passing that parameter,
the default build command can be overridden.

svn path=/nixpkgs/trunk/; revision=22786
2010-07-28 13:05:04 +00:00
Eelco Dolstra
e2a374799f * Reverted most of the recent Python refactorings, as discussed. It's
a worthy goal to move the Python packages that are currently in
  all-packages.nix into a single attribute set, but this doesn't
  require moving python-packages.nix or the other changes made to that
  file.  The Python packages in all-packages.nix should simply be
  moved to python-packages.nix, and ideally changed to use
  buildPythonPackage.

svn path=/nixpkgs/trunk/; revision=21196
2010-04-21 10:51:15 +00:00
Marc Weber
8c0b7e4ad2 - adding experimental python31 build
- cleanup python libraries:
 * moving all python libraries into a attr set into a directory
   so that expressions can be used for both: python 2.5 and 2.6 easily
 * disabling packages which don't build

svn path=/nixpkgs/trunk/; revision=21142
2010-04-17 18:28:25 +00:00
Ludovic Courtès
72d59e3920 buildPythonPackage: Adapt to the cross-build-aware `stdenv'.
svn path=/nixpkgs/trunk/; revision=20306
2010-03-01 13:12:56 +00:00
Ludovic Courtès
4a4f864c6f buildPythonPackage: Allow checkPhase' and postInstall' to be customized.
svn path=/nixpkgs/trunk/; revision=16675
2009-08-11 16:25:41 +00:00
Ludovic Courtès
42161470ae buildPythonPackage: Wrap binaries with an appropriate $PATH.
svn path=/nixpkgs/trunk/; revision=16081
2009-06-28 21:00:36 +00:00
Ludovic Courtès
a84297a6e3 buildPythonPackage: Inherit extra attributes from its argument.
svn path=/nixpkgs/trunk/; revision=16080
2009-06-28 14:05:41 +00:00
Ludovic Courtès
705205340b buildPythonPackage: Allow callers to get rid of the `python-' name prefix.
svn path=/nixpkgs/trunk/; revision=16079
2009-06-28 13:44:21 +00:00
Ludovic Courtès
010edd3739 buildPythonPackage: Simplify attribute inheritance.
Suggested by Eelco Dolstra.

svn path=/nixpkgs/trunk/; revision=15731
2009-05-26 10:03:33 +00:00
Ludovic Courtès
4fc80e9497 buildPythonPackage: Handle patches.
svn path=/nixpkgs/trunk/; revision=15708
2009-05-24 21:14:32 +00:00
Ludovic Courtès
7c34f5744b Add a `buildPythonPackage' function.
svn path=/nixpkgs/trunk/; revision=15706
2009-05-24 21:02:59 +00:00