Commit graph

175 commits

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