Commit graph

211 commits

Author SHA1 Message Date
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