JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
172,815 Commits 2 Branches 0 Tags 13 GiB
01a7acf382
Commit Graph

9272 Commits

Author SHA1 Message Date
Rob Vermaas
cfdf35d6f9 Add preInstall ot buildPythonPackage (postInstall already existed) to allow selenium to work properly again. 2013-01-09 15:46:14 +01:00
Florian Friesdorf
6654cb8a10 comment 2013-01-09 05:21:01 +01:00
Lluís Batlle i Rossell
b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
 2012-12-28 23:28:16 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Florian Friesdorf
edd160452e don't propagate recursivePthLoader, it is needed to process it already 2012-12-22 02:41:10 +01:00
Florian Friesdorf
aab93e8479 do not create e.g pth file for build inputs 
if they are really needed they will be in pth file created by
easy_install. If that does not work, they need to be put into
propagatedBuildInputs or the setup.py fixed.

see #210
 2012-12-22 02:35:04 +01:00
Florian Friesdorf
aeef72fa85 python-modules: remove long non-functional propagated-user-env-packages 
we use recursive processing of pth files instead
 2012-12-22 02:18:29 +01:00
Florian Friesdorf
27a73428cc remove site.py files 
setuptools site.py can't resolve recursively which is needed for nix,
as each package has its own directory. A different solution than
putting the loader into every package output needs to be found.

see also #209
 2012-12-22 02:15:08 +01:00
Florian Friesdorf
ad55bb39ba prefix setuptools -> python-setuptools 2012-12-22 01:15:16 +01:00
Florian Friesdorf
886742d91a use recursivePthLoader instead of setuptoolsSite 2012-12-22 01:13:23 +01:00
Florian Friesdorf
0fb9688235 python prefix for recursive pth loader and fix typo 2012-12-14 19:47:51 +01:00
Florian Friesdorf
6278dabe5d python: do not delete site.py for now as it breaks existing use cases 
see #209, thx shlevy for reporting this
 2012-12-07 11:44:46 +01:00
Florian Friesdorf
78be948175 change order of phases for python modules: checkPhase after installPhase 
at least pycrypto it helps
 2012-12-05 11:31:28 +01:00
Florian Friesdorf
3cf96816b0 pycrypto for python26 and 27 2012-12-05 11:31:28 +01:00
Florian Friesdorf
cd905b16af pil uses buildPythonPackage and is now actually also built for 2.6 2012-12-05 11:31:27 +01:00
Florian Friesdorf
17597e8350 propagate setuptoolsSite to load pth files 2012-12-03 05:20:50 +01:00
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
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
Peter Simons
4e872b84ee pyOpenSSL: updated to version 0.10 
svn path=/nixpkgs/trunk/; revision=22773
 2010-07-27 23:52:14 +00:00
Eelco Dolstra
ee182f843f * Urgh, riverbankcomputing.co.uk constantly removed old releases. We 
should mirror them.

svn path=/nixpkgs/branches/x-updates/; revision=22656
 2010-07-19 08:25:09 +00:00
Eelco Dolstra
94e5cdd437 * Updated dbus-python. 
svn path=/nixpkgs/trunk/; revision=22470
 2010-07-05 06:33:45 +00:00
Eelco Dolstra
9db799acd5 * pycrypto updated to 2.1.0. 
svn path=/nixpkgs/trunk/; revision=21910
 2010-05-20 10:41:10 +00:00
Michael Raskin
ad1684ae13 Replace codegen script which was failing with EACCESS. Test Gajim build worked fine 
svn path=/nixpkgs/trunk/; revision=21849
 2010-05-18 20:13:39 +00:00
Sander van der Burg
0de19dec3b - Upgraded SIP to 4.10.2 
- Upgraded PyQt to 4.7.3


svn path=/nixpkgs/trunk/; revision=21203
 2010-04-21 12:06:28 +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
Yury G. Kudryashov
8ff59ce09c Remove old sip and pyqt 
svn path=/nixpkgs/trunk/; revision=21017
 2010-04-11 21:03:51 +00:00
Lluís Batlle i Rossell
788e40bd5a Updating some py-gtk things. 
With a newer glib, I could have used a newer pyobject.

svn path=/nixpkgs/trunk/; revision=20962
 2010-04-06 19:39:25 +00:00
Sander van der Burg
cc7a6e0b1d Upgraded PyQt to version 4.7.2 
svn path=/nixpkgs/trunk/; revision=20889
 2010-03-31 11:45:33 +00:00
Lluís Batlle i Rossell
a838f24608 Updating and trying to fix the build for pycups 
svn path=/nixpkgs/trunk/; revision=20823
 2010-03-25 13:36:42 +00:00
Eelco Dolstra
9dd466d123 * Updated pyqt and sip because the old versions have disappeared. 
* Removed some unused versions of those packages.
* Don't pass `lib' to packages (because we already have `stdenv.lib').
* Removed some `*_python26' variants because Python 2.6 is the default
  now.

svn path=/nixpkgs/trunk/; revision=20782
 2010-03-23 14:04:47 +00:00
Ludovic Courtès
a86e0ad8aa pyopengl: Move to `python-packages.nix'. 
svn path=/nixpkgs/trunk/; revision=20317
 2010-03-01 17:08: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
67b7a89daf Move zope.interface' to python-packages.nix'. 
svn path=/nixpkgs/trunk/; revision=20305
 2010-03-01 13:12:52 +00:00
Michael Raskin
1966b6bde5 Remove erroneous mkDerivation 
svn path=/nixpkgs/trunk/; revision=20145
 2010-02-21 07:34:50 +00:00
Sander van der Burg
61980ddf12 Fixed rhpl which also fixes printer support in kdeadmin 
svn path=/nixpkgs/trunk/; revision=20031
 2010-02-15 21:53:31 +00:00
Sander van der Burg
6bcf488584 Upgraded pycups to 1.9.48 
svn path=/nixpkgs/trunk/; revision=19999
 2010-02-14 23:02:22 +00:00
Sander van der Burg
e7739553e6 Added PyQt 4.7 expression required by KDE 4.4.x 
svn path=/nixpkgs/trunk/; revision=19911
 2010-02-10 16:09:12 +00:00
Sander van der Burg
31cbd149d2 - Completed all dependencies for kdelibs-4.4.0 
- Added SIP 4.10 required for pyqt-4.7.x
- Removed kde libs experimental, which does not exists anymore in 4.4.0


svn path=/nixpkgs/trunk/; revision=19910
 2010-02-10 16:01:55 +00:00
Eelco Dolstra
3687f56e7a * Drop the rhpl dependency in kdeadmin and kdeutils because it doesn't 
build.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19779
 2010-02-03 12:56:57 +00:00
Michael Raskin
62c0c25b2a Update flup 
svn path=/nixpkgs/trunk/; revision=19460
 2010-01-15 09:50:27 +00:00
Lluís Batlle i Rossell
a4473b8205 Adding calibre. This involved also: 
- Adding podofo
- Adding some new python packages
- Making new pkgs attributes for python packages to build with python 2.6
- Updating some python packages expressions to allow python 2.6, and not only 2.5.


svn path=/nixpkgs/trunk/; revision=19303
 2010-01-07 22:47:30 +00:00
Armijn Hemel
d2e97d4983 update to 0.6c11 
svn path=/nixpkgs/trunk/; revision=19110
 2009-12-25 14:17:57 +00:00
Michael Raskin
bbd6e56d69 Fix the cleanup-induced problems 
svn path=/nixpkgs/trunk/; revision=18554
 2009-11-23 12:21:34 +00:00
Eelco Dolstra
7f5b839524 * Removed selectVersion. There's no good reason to write 
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
 2009-11-18 09:39:59 +00:00
Sander van der Burg
d68835524d Upgraded pycups to 1.9.46 
svn path=/nixpkgs/trunk/; revision=17593
 2009-10-02 11:13:03 +00:00
Sander van der Burg
d8d1aa8685 Downgraded SIP to 4.8.2 and changed download location 
svn path=/nixpkgs/trunk/; revision=17569
 2009-10-01 12:06:35 +00:00
Sander van der Burg
23f787900f Changed PyQt version to 4.5.4 
svn path=/nixpkgs/trunk/; revision=17568
 2009-10-01 11:58:20 +00:00
Sander van der Burg
78f31f1e30 Downgraded PyQt 4.5.4, since it breaks KDE. Changed download location 
svn path=/nixpkgs/trunk/; revision=17567
 2009-10-01 11:43:38 +00:00
Sander van der Burg
acce623d3f Upgraded SIP to 4.9 
svn path=/nixpkgs/trunk/; revision=17538
 2009-09-30 09:54:14 +00:00
Sander van der Burg
7d808c4229 Upgraded PyQt to 4.6 
svn path=/nixpkgs/trunk/; revision=17537
 2009-09-30 09:43:49 +00:00
Michael Raskin
a9dc68b1ea Specify some obvious platform sets 
svn path=/nixpkgs/trunk/; revision=17205
 2009-09-16 15:12:24 +00:00
Sander van der Burg
bb4a7c5299 Upgraded PyQt and dependencies to 4.5.4 
svn path=/nixpkgs/trunk/; revision=17031
 2009-09-10 17:00:30 +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
3997cb99fd pysqlite: Move to `python-packages.nix'. 
svn path=/nixpkgs/trunk/; revision=16229
 2009-07-07 22:30:29 +00:00
Ludovic Courtès
09fbef5e2b pysqlite 2.5.5. 
svn path=/nixpkgs/trunk/; revision=16228
 2009-07-07 22:20:53 +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
Eelco Dolstra
c69010d6eb * Fix that annoying deprecated getAttr warning. 
svn path=/nixpkgs/trunk/; revision=16049
 2009-06-26 11:03:14 +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
5b7525c631 Move Twisted to `buildPythonPackage'. 
svn path=/nixpkgs/trunk/; revision=15709
 2009-05-24 21:25:29 +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
bede9c4d50 Change Nevow, SimpleJSON, and Foolscap to use `buildPythonPackage'. 
svn path=/nixpkgs/trunk/; revision=15707
 2009-05-24 21:08:39 +00:00
Ludovic Courtès
7c34f5744b Add a `buildPythonPackage' function. 
svn path=/nixpkgs/trunk/; revision=15706
 2009-05-24 21:02:59 +00:00
Michael Raskin
f4e6e80bcf Restoring builderDefs functionality in setuptools 
svn path=/nixpkgs/trunk/; revision=15697
 2009-05-24 12:20:08 +00:00
Marc Weber
f7f938a1d1 big breaking change: renaming lib.getAttr to lib.attrByPath 
getAttr was ambiguous. It's also a builtin function

fix

svn path=/nixpkgs/trunk/; revision=15692
 2009-05-24 10:57:41 +00:00
Ludovic Courtès
a50f278386 setuptools: Update to 0.6c9; fix the `easy_install' command line tool. 
svn path=/nixpkgs/trunk/; revision=15690
 2009-05-23 22:54:11 +00:00
Marc Weber
52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry 
svn path=/nixpkgs/trunk/; revision=15662
 2009-05-19 23:25:58 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in 
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
 2009-04-23 13:31:10 +00:00
Ludovic Courtès
5bed8bd9e1 Add simplejson, a JSON encoded/decoded for Python. 
svn path=/nixpkgs/trunk/; revision=15110
 2009-04-17 09:06:42 +00:00
Ludovic Courtès
0d067c287b Add Foolscap, a distributed capability RPC protocol. 
svn path=/nixpkgs/trunk/; revision=15109
 2009-04-16 22:59:14 +00:00
Ludovic Courtès
59db4694f2 Add Nevow, a webby Python thingie. 
svn path=/nixpkgs/trunk/; revision=15104
 2009-04-16 21:48:36 +00:00
Michael Raskin
9619e184cf Added xmpppy - python XMPP library and pyIRCt - python IRC transport 
svn path=/nixpkgs/trunk/; revision=15005
 2009-04-12 23:27:55 +00:00
Michael Raskin
3d5d738895 Added Gajim XMPP client in nearly full-feature configuration with all dependencies 
svn path=/nixpkgs/trunk/; revision=15001
 2009-04-12 19:34:20 +00:00
Peter Simons
610aac30c3 Fixed Python StringTemplate library. 
Most importantly, this change required updating the ANTLR 2.x expression to
install the Python run-time library. While we're at it, we're building the
run-time library for C++ and Java, too. There is still work to be done: the
stringtemplate library doesn't find antlr.py without help yet.

svn path=/nixpkgs/trunk/; revision=14489
 2009-03-10 12:01:22 +00:00
Sander van der Burg
2c11f47c8c Added CUPS administration tools in kdeadmin 
svn path=/nixpkgs/trunk/; revision=14457
 2009-03-09 13:29:37 +00:00
Peter Simons
f8c360148e Moved python stringtemplate library from tools/text/py-string-template 
to development/python-modules/stringtemplate.

svn path=/nixpkgs/trunk/; revision=14455
 2009-03-09 10:46:42 +00:00
Eelco Dolstra
fcad0b0a5a * Cleaned up a lot of description fields that contained newlines. 
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
 2009-03-03 13:27:40 +00:00
Sander van der Burg
3a1c208a69 Added pycups,desktop_file_utils,system_config_printer packages and added python kdebindings closure 
svn path=/nixpkgs/trunk/; revision=14246
 2009-02-25 16:05:13 +00:00
Ludovic Courtès
b7ba44dff3 PyGame: Use SDL_mixer. 
svn path=/nixpkgs/trunk/; revision=12977
 2008-10-06 22:47:20 +00:00
Ludovic Courtès
c82c0b17f1 PyGame: Use Numeric. 
svn path=/nixpkgs/trunk/; revision=12976
 2008-10-06 22:07:53 +00:00
Ludovic Courtès
d77f3177fe Add Python Numeric. 
svn path=/nixpkgs/trunk/; revision=12975
 2008-10-06 18:56:47 +00:00
Marc Weber
38c5e4fc67 moved pysqlite into PYTHON MODULES section 
svn path=/nixpkgs/trunk/; revision=12964
 2008-10-05 18:37:09 +00:00
Peter Simons
05d7c131d1 Re-apply Eelco's "installCommand --> installPhase" patch. 
svn path=/nixpkgs/trunk/; revision=12892
 2008-09-19 10:07:57 +00:00
Peter Simons
f3ae22fa5f Install wrappers for Twisted binaries to ensure a correct ${PYTHONPATH}. 
svn path=/nixpkgs/trunk/; revision=12891
 2008-09-19 10:07:36 +00:00
Eelco Dolstra
5d9dfc1e60 * Removed $installCommand, it's no longer needed since we split the 
install and fixup phases.  You can just override installPhase.

svn path=/nixpkgs/trunk/; revision=12787
 2008-09-02 13:51:32 +00:00
Peter Simons
85546a8e31 Updated scons and twisted; added buildbot. 
* Updated scons to version 1.0.0. Also added appropriate makeWrapper calls to
   ensure that the python binary finds its library files.

 * Updated Twisted from 2.5 to 8.1.

 * Added an expression for buildbot.

svn path=/nixpkgs/trunk/; revision=12782
 2008-09-01 15:11:09 +00:00
Pjotr Prins
73d2e4f49d - Some Ruby interpreter bumped version 
- Kernel headers 2.6.18 added (XEN virtual images)
- unifdef package added for kernel headers 2.6.18
- Python Zope and 4suite added
- Trying bioconductor packages with R-lang (still failing)
- Bumped gmp version
- Added rq cluster runner - still requires extra gems (installs, but does not run)


svn path=/nixpkgs/trunk/; revision=12766
 2008-08-29 13:53:28 +00:00
Ludovic Courtès
25e77977b9 PyOpenGL: Propagate build inputs that need it. 
svn path=/nixpkgs/trunk/; revision=12609
 2008-08-13 09:10:11 +00:00
Ludovic Courtès
cf56d20b0d Remove duplicate expression for PIL (Python Imaging Library). 
svn path=/nixpkgs/trunk/; revision=12599
 2008-08-12 15:42:21 +00:00
Ludovic Courtès
61c0f30155 Add PyOpenGL. 
svn path=/nixpkgs/trunk/; revision=12598
 2008-08-12 15:40:01 +00:00
Ludovic Courtès
9c161c21e7 Add PIL, the Python Imaging Library. 
svn path=/nixpkgs/trunk/; revision=12597
 2008-08-12 15:10:53 +00:00
Michael Raskin
0784550c35 Added ViewMTN and dependency; currently ViewMTN has to be manually symlinked in corresponding directory. 
svn path=/nixpkgs/trunk/; revision=12060
 2008-06-12 15:59:59 +00:00
Nicolas Pierron
9768f41783 Add PyX: Python graphics package. 
svn path=/nixpkgs/trunk/; revision=11945
 2008-06-01 16:06:18 +00:00
Michael Raskin
82177d1bc2 Added xxdiff 
svn path=/nixpkgs/trunk/; revision=11888
 2008-05-25 20:43:56 +00:00
Eelco Dolstra
26a152653d * Adde xpra. Doesn't quite work yet. 
* Removed python_alts.

svn path=/nixpkgs/trunk/; revision=11161
 2008-03-17 13:45:50 +00:00
Ludovic Courtès
c18141227f Add PyXML. 
svn path=/nixpkgs/trunk/; revision=10832
 2008-02-22 13:53:45 +00:00
Yury G. Kudryashov
5bca69ac34 Nix-expr style review 
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
 2008-01-30 17:20:48 +00:00
Eelco Dolstra
a5e0e39cdb * makeWrapper: option --run <CMD> to run a command from the wrapper. 
This is so that the Unison wrapper can be generated with
  makeWrapper.
* Use makeWrapper as a buildInput everywhere.
* Updated BitTorrent, cvs2svn.

svn path=/nixpkgs/trunk/; revision=10213
 2008-01-18 11:28:41 +00:00
Eelco Dolstra
607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/. 
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
 2007-08-27 13:01:33 +00:00
Michael Raskin
422433d1b9 Added pygame and some of its dependencies. Also added Python Imaging library. 
svn path=/nixpkgs/trunk/; revision=9082
 2007-08-09 17:33:18 +00:00
Eelco Dolstra
150b0712cd * Very subtle purity error: on NixOS, wxGTK wasn't being built with 
Xinerama support.  It gets libXinerama as an explicit build input,
  but it checks for its existence in /usr/X11/include etc.  This
  caused Bittorrent to fail (NIXPKGS-61).  Backported the builder
  fixes from wxGTK 2.8.

svn path=/nixpkgs/trunk/; revision=8813
 2007-05-31 14:02:16 +00:00
Eelco Dolstra
d16ae4efcf * Added wxGTK/wxPython 2.8. However this was quite pointless as 
Bittorrent is even more broken with wxPython 2.8.

svn path=/nixpkgs/trunk/; revision=8812
 2007-05-31 13:43:13 +00:00
Armijn Hemel
a268c294b5 make pygobject an inherited attribute 
svn path=/nixpkgs/trunk/; revision=8669
 2007-05-13 21:15:41 +00:00
Armijn Hemel
e6e620279e update pygtk 
svn path=/nixpkgs/trunk/; revision=8667
 2007-05-13 20:54:38 +00:00
Armijn Hemel
4d0fe8a249 add pycairo: cairo bindings for cairo 
svn path=/nixpkgs/trunk/; revision=8666
 2007-05-13 20:49:13 +00:00
Armijn Hemel
8a15f2a72a add pygobject 
svn path=/nixpkgs/trunk/; revision=8665
 2007-05-13 20:12:13 +00:00
Eelco Dolstra
dfd401259c * Added cvs2svn. 
* Berkeley DB 4.5 is now the default.

svn path=/nixpkgs/trunk/; revision=8641
 2007-05-02 11:49:18 +00:00
Eelco Dolstra
fe30bcab94 * Just-in-time compiler for Python. 
svn path=/nixpkgs/trunk/; revision=7429
 2006-12-19 18:55:04 +00:00
Eelco Dolstra
fb73ce99f2 * Added wxHaskell. 
* Added GNU MP, use it in pycrypto.

svn path=/nixpkgs/trunk/; revision=7343
 2006-12-13 22:29:40 +00:00
Eelco Dolstra
9ea7038c51 * BitTorrent 5.0.3. 
* wxPython 2.6.3.

svn path=/nixpkgs/trunk/; revision=7341
 2006-12-13 20:30:09 +00:00
Eelco Dolstra
e6f589d4bf * Some Python packages. 
svn path=/nixpkgs/trunk/; revision=7339
 2006-12-13 18:04:03 +00:00
Eelco Dolstra
cd8a033c15 * Remove some obsolete wxGTK/wxPython versions. 
svn path=/nixpkgs/trunk/; revision=7337
 2006-12-13 15:53:36 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=4623
 2006-01-30 16:04:03 +00:00
Eelco Dolstra
82e678362f * "." -> "source". 
svn path=/nixpkgs/trunk/; revision=4335
 2005-12-05 14:11:09 +00:00
Eelco Dolstra
454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=3660
 2005-08-22 08:39:27 +00:00
Eelco Dolstra
4e4ad61aee * Added pygtk. 
* Updated bittorrent to 4.0.1.

svn path=/nixpkgs/trunk/; revision=2879
 2005-04-22 18:26:04 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a 
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
 2005-02-15 14:44:19 +00:00
Eelco Dolstra
04c0ea5234 * Start adding wxPython 2.5. Doesn't work yet though, so disable it 
for now.

svn path=/nixpkgs/trunk/; revision=1489
 2004-09-22 10:18:02 +00:00
Eelco Dolstra
8776ba127c * Updated some more packages. However, bittorrent and vlc don't work 
right now because wxGTK is broken (it depends on internal symbols in
  GTK which where made private in GTK 2.4).

svn path=/nixpkgs/trunk/; revision=907
 2004-04-02 15:36:14 +00:00
Eelco Dolstra
12ae5363ea * Remove trivial builders. 
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
 2004-03-29 17:23:01 +00:00
Eelco Dolstra
9261c1eaa5 * Added wxPython. 
svn path=/nixpkgs/trunk/; revision=795
 2004-02-17 19:19:26 +00:00