Florian Friesdorf
e50571e29d
setuptoolsSite - only setuptools' site.py
2012-12-03 05:20:04 +01:00
Florian Friesdorf
d4d76a8443
make diff to master look nicer
2012-12-03 04:41:19 +01:00
Florian Friesdorf
3438681d80
Merge branch 'channel-nixos' into python-merge
2012-11-29 21:40:33 +01:00
Florian Friesdorf
a4ded47776
include offlineDistutils in preConfigure instead of configurePhase
2012-11-29 15:29:41 +01:00
Eelco Dolstra
5553546c21
Remove a bunch of unreferenced files
...
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Florian Friesdorf
92a833604c
Merge branch 'py/offline-distutils' into python-merge
...
Conflicts:
pkgs/development/python-modules/generic/builder.sh
pkgs/development/python-modules/generic/default.nix
2012-11-24 22:49:19 +01:00
Florian Friesdorf
74d963c69a
offlineDistutils in PYTHONPATH in configurePhase instead of builder.sh
...
Conflicts:
pkgs/development/python-modules/generic/default.nix
2012-11-24 22:34:09 +01:00
Florian Friesdorf
bdccb5417b
fix python module builder
2012-11-23 18:33:33 +01:00
Florian Friesdorf
ccb5d0fc19
fix python module builder
2012-11-23 18:33:25 +01:00
Florian Friesdorf
1171166518
Merge branch 'py/offline-distutils' into python-merge
2012-11-23 17:39:23 +01:00
Florian Friesdorf
337d16368a
fix builder in python-module
2012-11-23 17:38:31 +01:00
Florian Friesdorf
ddbd5c2eba
Merge branch 'py/offline-distutils' into python-merge
...
Conflicts:
pkgs/development/python-modules/generic/default.nix
2012-11-23 17:28:51 +01:00
Florian Friesdorf
ad8a4c73fa
use offline-disutils in buildPythonPackage
2012-11-23 17:27:55 +01:00
Florian Friesdorf
224251d104
python-offline-distutils
2012-11-23 17:27:12 +01:00
Florian Friesdorf
dce76a387d
Merge branch 'py/pth-create' into python-merge
...
Conflicts:
pkgs/development/python-modules/generic/default.nix
2012-11-23 15:57:09 +01:00
Florian Friesdorf
fa1c8fef2f
move pth rename and site.py removal to buildPhase
...
This leaves the installCommand to be only easy_install and makes it
easy again to overwrite this.
2012-11-23 15:54:55 +01:00
Florian Friesdorf
24fd592d64
Merge branch 'py/always-unzip' into python-merge
...
Conflicts:
pkgs/development/python-modules/generic/default.nix
2012-11-22 13:39:05 +01:00
Florian Friesdorf
bd443d69c9
Merge branch 'py/pth-recursive' into python-merge
2012-11-22 13:37:51 +01:00
Florian Friesdorf
9a6b4e5621
Merge branch 'py/pth-create' into python-merge
2012-11-22 13:37:46 +01:00
Michael Raskin
8b7d12d0f5
Gajim: make OpenSSL code work
2012-09-13 18:03:50 +04:00
Florian Friesdorf
30ffafb47d
recursive pth loader
2012-07-23 09:10:57 +02:00
Florian Friesdorf
f8d3671629
fix pth files
2012-07-22 02:08:00 +02:00
Florian Friesdorf
a40da09b44
python: create pth files for python build inputs (propagate/native or not)
2012-07-21 01:55:50 +02:00
Florian Friesdorf
5c564f26f0
python: always unzip eggs installed into the store
...
grepping and tagging are two use cases coming to mind
2012-07-21 00:20:21 +02:00
Florian Friesdorf
2c3ffeb79c
python: remove colliding site.py* files
2012-07-21 00:14:03 +02:00
Florian Friesdorf
e7c1aa52cc
python: rename eventually created easy_install.pth to pkg-specific file
2012-07-21 00:11:02 +02:00
Lluís Batlle i Rossell
95072d1485
pyqt: Adding a new url; the old does not work anymore.
2012-07-02 21:00:09 +02:00
Yury G. Kudryashov
eef17e625f
pyqt-4.9.1
...
svn path=/nixpkgs/trunk/; revision=34396
2012-06-09 13:09:13 +00:00
Yury G. Kudryashov
888a6507e6
sip-4.13.2
...
svn path=/nixpkgs/trunk/; revision=34395
2012-06-09 13:09:07 +00:00
Joachim Schiele
1181658cb8
this won't compile yet as there is a python problem, probably related to what marc weber already fixed. will fix that later
...
svn path=/nixpkgs/trunk/; revision=34388
2012-06-08 15:57:53 +00:00
Eelco Dolstra
eed22970cd
* Updated to pycrypto to 2.6.
...
svn path=/nixpkgs/trunk/; revision=34291
2012-05-30 21:12:04 +00:00
Cillian de Roiste
531b63a389
Patching python-virtualenv so that it doesn't fail if the python version is specified, e.g. --python=python2.7, and now iff the python version is specified it successfully also installs additional libs such as readline into the virtualenv
...
svn path=/nixpkgs/trunk/; revision=34184
2012-05-19 23:15:50 +00:00
Peter Simons
1cdbd5add0
numpy: reverted build fix that committed earlier on behalf of Konrad Hinsen
...
The patch broke the build of matplotlib.
svn path=/nixpkgs/trunk/; revision=34023
2012-05-09 07:22:18 +00:00
Peter Simons
6c37520d2a
numpy: fixed build (patch by Konrad Hinsen)
...
svn path=/nixpkgs/trunk/; revision=33941
2012-04-28 14:14:16 +00:00
Lluís Batlle i Rossell
32d84a2338
Adding a mirror for the pyqt version we use; the usual upstream channel does not
...
have the file anymore.
svn path=/nixpkgs/trunk/; revision=33917
2012-04-25 13:56:08 +00:00
Florian Friesdorf
962e6fb704
Revert "python site.py that loads pth files anywhere on PYTHONPATH"
...
This reverts commit fac80449abd57c271dfb98d392e49e4135dfc50c.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32663
2012-02-28 00:08:00 +00:00
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
363579bc09
Revert "clean setuptools from colliding files - it is not using buildPythonPkg"
...
This reverts commit 9bc390eb7b9bcbe8b4951797010efd27afbe7afd.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32661
2012-02-28 00:07:53 +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
9159a78807
Revert "insert pth eggs at index of site-packages they come from"
...
This reverts commit daa626efe76d8602c7892aaa338d526ea88bfe1b.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32658
2012-02-28 00:07:39 +00:00
Florian Friesdorf
e20d04408e
Revert "meta for offline-distutils"
...
This reverts commit 8fcf025e5f80519a6f06c0b36aee007fe16a6e31.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32657
2012-02-28 00:07:36 +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
0f81888e09
meta for offline-distutils
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32586
2012-02-26 17:23:20 +00:00
Florian Friesdorf
59d4678e83
insert pth eggs at index of site-packages they come from
...
thx Rok Garbas!
svn path=/nixpkgs/branches/stdenv-updates/; revision=32584
2012-02-26 17:23:13 +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
8adcbec448
clean setuptools from colliding files - it is not using buildPythonPkg
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=32581
2012-02-26 17:23:02 +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
Florian Friesdorf
cb1009a3fb
python site.py that loads pth files anywhere on PYTHONPATH
...
This file is normally created by easy_install / distutils, but removed
and packaged separately to avoid collisions and allow for more use cases.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32579
2012-02-26 17:22:55 +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
633a194994
* PIL updated to 1.1.7.
...
svn path=/nixpkgs/trunk/; revision=31142
2011-12-29 16:53:14 +00:00
Florian Friesdorf
d8e5cb01b5
pyside-1.0.9
...
svn path=/nixpkgs/trunk/; revision=30950
2011-12-17 20:16:45 +00:00
Eelco Dolstra
cac34d2be5
* Applied a patch to get Euca2ools / Boto to work on Python 2.7.
...
svn path=/nixpkgs/trunk/; revision=29956
2011-10-21 15:01:40 +00:00
Yury G. Kudryashov
2ed828052e
Remove wxPython26 since it is not used
...
svn path=/nixpkgs/trunk/; revision=29773
2011-10-11 19:46:31 +00:00
Eelco Dolstra
a3a15545f6
* wxPython updated to 2.8.12.0.
...
svn path=/nixpkgs/trunk/; revision=29395
2011-09-20 11:19:55 +00:00
David Guibert
c716ac66e0
add jbrout, a photo manager using IPTC keywords/EXIF
...
svn path=/nixpkgs/trunk/; revision=28759
2011-08-22 20:26:11 +00:00
David Guibert
f58ae30dfd
update python modules: sip and pyqt
...
svn path=/nixpkgs/trunk/; revision=28444
2011-08-09 20:39:19 +00:00
Eelco Dolstra
9379248ef3
* Update kdeadmin and kdegames.
...
svn path=/nixpkgs/branches/kde-4.7/; revision=27898
2011-07-22 01:28:09 +00:00
Eelco Dolstra
5a03576cb4
* Update kdegames.
...
svn path=/nixpkgs/branches/kde-4.7/; revision=27894
2011-07-21 21:54:40 +00:00
Eelco Dolstra
8b4730bdbd
* Update pycups, PyQt and SIP.
...
svn path=/nixpkgs/branches/kde-4.7/; revision=27889
2011-07-21 20:14:17 +00:00
Eelco Dolstra
23831b76e3
* dbus-python updated to 0.84.0.
...
svn path=/nixpkgs/branches/kde-4.7/; revision=27882
2011-07-21 17:31:57 +00:00
Eelco Dolstra
345b9a75d5
* Move wxPython into python-packages.nix so that you can get wxPython
...
built for the appropriate Python version
(e.g. python26Packages.wxPython).
svn path=/nixpkgs/trunk/; revision=27127
2011-05-04 08:41:50 +00:00
Eelco Dolstra
a7d4f19ab3
* wxPython updated to 2.8.12.0.
...
* wxPython builder: wrap the Python programs (such as pyshell) so that
they actually work.
svn path=/nixpkgs/trunk/; revision=27122
2011-05-03 16:57:18 +00:00
Eelco Dolstra
4407e6464f
* Remove the hard-coded reference to Python 2.6.
...
svn path=/nixpkgs/branches/modular-python/; revision=26676
2011-04-04 13:28:13 +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
11b67ccee5
* Move buildPythonPackage and setuptools into python-packages.nix.
...
This ensures that they're built with the same "python" argument.
svn path=/nixpkgs/branches/modular-python/; revision=26593
2011-03-29 15:02:15 +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
Eelco Dolstra
bf8e36dd4f
* Revert PyQt and sip because the upgrade breaks KDE, but use
...
tarballs on nixos.org.
svn path=/nixpkgs/trunk/; revision=26164
2011-03-04 19:57:52 +00:00
Lluís Batlle i Rossell
31c38d7dd2
Updating pyqt and sip because the 'src' there mentioned is not at the urls anymore.
...
svn path=/nixpkgs/trunk/; revision=26152
2011-03-04 09:48:29 +00:00
Yury G. Kudryashov
8f07ddbdbb
PyQt-4.8.1
...
svn path=/nixpkgs/trunk/; revision=24837
2010-11-24 10:48:25 +00:00
Yury G. Kudryashov
e02f6ba5f3
Update python-sip
...
svn path=/nixpkgs/trunk/; revision=24836
2010-11-24 10:47:48 +00:00
Russell O'Connor
63321806b4
Updating pygobject to latest version
...
svn path=/nixpkgs/trunk/; revision=24763
2010-11-19 04:09:22 +00:00
Eelco Dolstra
f2c1219979
* Updated pygobject and pygtk.
...
svn path=/nixpkgs/trunk/; revision=24354
2010-10-18 22:55:20 +00:00
Peter Simons
600b4b7ee7
Moved "flup" from all-packages.nix into python-packages.nix.
...
svn path=/nixpkgs/trunk/; revision=24044
2010-10-04 09:49:09 +00:00
Michael Raskin
8479512626
Step back PyGTK from the update requiring a lot of too-new code
...
svn path=/nixpkgs/trunk/; revision=23652
2010-09-05 18:57:43 +00:00
Michael Raskin
4926bd7256
Update PyGTK
...
svn path=/nixpkgs/trunk/; revision=23651
2010-09-05 18:10:16 +00:00
Peter Simons
4be79671b4
pkgs/development/python-modules/pygobject: ensure that python code can be found
...
svn path=/nixpkgs/trunk/; revision=23616
2010-09-03 13:18:38 +00:00
Yury G. Kudryashov
0a28239504
Make pyqt-dbus work
...
svn path=/nixpkgs/trunk/; revision=23519
2010-08-29 19:36:54 +00:00
Peter Simons
7b00a8c39f
pkgs/development/python-modules/pygtk: move installed python code down one directory hierarchy so that $PYTHONPATH can be guessed
...
svn path=/nixpkgs/trunk/; revision=23201
2010-08-17 10:18:17 +00:00
Peter Simons
65eb1a248f
pkgs/development/python-modules/zope: updated to version 3.4.0
...
svn path=/nixpkgs/trunk/; revision=23145
2010-08-12 12:53:45 +00:00
Peter Simons
27fe0c57f3
pkgs/development/python-modules/pycrypto: enable building of this package on all GNU platforms
...
svn path=/nixpkgs/trunk/; revision=22794
2010-07-28 13:10:18 +00:00
Peter Simons
12943b6a3e
pkgs/development/python-modules/pycrypto: downgrade to 2.0.1
...
The download sites for 2.1.0 all appear to be offline.
svn path=/nixpkgs/trunk/; revision=22793
2010-07-28 13:09:44 +00:00
Peter Simons
66b8ff8e0c
pkgs/development/python-modules/pycrypto: updated homepage and download URL to use http://www.pycrypto.org/
...
svn path=/nixpkgs/trunk/; revision=22789
2010-07-28 13:07:48 +00:00