Commit graph

2844 commits

Author SHA1 Message Date
Eelco Dolstra 174886639c * Updated libnih and mountall.
svn path=/nixpkgs/branches/kde-4.7/; revision=27927
2011-07-24 23:44:15 +00:00
Peter Simons 1bc8594052 hledger-chart: build this package only on Linux
The build should work on haskellPlatforms, but an attempt to build it on
Darwin generates assertion errors because it somehow ends up depending
on the Linux kernel headers.

svn path=/nixpkgs/trunk/; revision=27920
2011-07-24 20:05:08 +00:00
Eelco Dolstra 5a03576cb4 * Update kdegames.
svn path=/nixpkgs/branches/kde-4.7/; revision=27894
2011-07-21 21:54:40 +00:00
Peter Simons 71237fce00 adns: blind attempt to fix the shared library build on Darwin
svn path=/nixpkgs/trunk/; revision=27892
2011-07-21 21:26:21 +00:00
Peter Simons 903c9189c4 adns: dropped obsolete versions and static-only feature
svn path=/nixpkgs/trunk/; revision=27890
2011-07-21 20:58:34 +00:00
Eelco Dolstra 9253901104 * Whitespace.
svn path=/nixpkgs/branches/kde-4.7/; revision=27883
2011-07-21 17:32:35 +00:00
Ludovic Courtès 6f5e72deed libelf: Disable native language support on Darwin.
svn path=/nixpkgs/trunk/; revision=27877
2011-07-21 13:51:03 +00:00
Andres Löh 6e61ef2010 Version bump.
svn path=/nixpkgs/trunk/; revision=27875
2011-07-21 13:36:16 +00:00
Peter Simons 7f94a9ffbf boost: fix "locale::facet::_S_create_c_locale name not valid" error
One would assume that the boost maintainers would have been able to apply this
two line change within the last 10 months or so, but apparently not.

svn path=/nixpkgs/trunk/; revision=27864
2011-07-20 23:11:16 +00:00
Peter Simons 01fc263ff2 haskell-packages.nix: added hsdns
svn path=/nixpkgs/trunk/; revision=27856
2011-07-20 18:38:47 +00:00
Peter Simons 9d426cd470 haskell-packages.nix: added hledger-chart and hledger-vty
svn path=/nixpkgs/trunk/; revision=27855
2011-07-20 18:32:33 +00:00
Peter Simons 7237cf32ec haskell-packages.nix: added hledger and hledger-lib
svn path=/nixpkgs/trunk/; revision=27853
2011-07-20 18:20:42 +00:00
Peter Simons f8b4f9e85c haskell-packages.nix: added regexpr
svn path=/nixpkgs/trunk/; revision=27852
2011-07-20 18:20:37 +00:00
Peter Simons f05ab93c88 haskell-packages.nix: added mtlparse
svn path=/nixpkgs/trunk/; revision=27851
2011-07-20 18:20:32 +00:00
Peter Simons 37e07ad933 pandoc: updated to version 1.8.1.2
svn path=/nixpkgs/trunk/; revision=27850
2011-07-20 18:20:28 +00:00
Peter Simons fef790c942 numeric-prelude: updated to version 0.2.2
svn path=/nixpkgs/trunk/; revision=27848
2011-07-20 18:04:16 +00:00
Peter Simons c01bf4d344 non-negative: updated to version 0.1
svn path=/nixpkgs/trunk/; revision=27847
2011-07-20 18:04:12 +00:00
Peter Simons e0a9dc3a29 utility-ht: updated to version 0.0.7
svn path=/nixpkgs/trunk/; revision=27846
2011-07-20 18:04:08 +00:00
Peter Simons 35312ae76f haskell-packages.nix: added storable-record
svn path=/nixpkgs/trunk/; revision=27845
2011-07-20 18:04:03 +00:00
Lluís Batlle i Rossell d86570f94e Updating opencv.
svn path=/nixpkgs/trunk/; revision=27841
2011-07-20 13:24:26 +00:00
Eelco Dolstra 4437b6c49e * libdbusmenu-qt updated to 0.8.3.
svn path=/nixpkgs/branches/kde-4.7/; revision=27816
2011-07-18 11:57:18 +00:00
Eelco Dolstra c416926580 * Qt: remove Phonon since we can just use the external Phonon
package.  This also removes the GStreamer dependency because only
  Phonon uses it.

svn path=/nixpkgs/branches/kde-4.7/; revision=27814
2011-07-18 09:18:38 +00:00
Eelco Dolstra b6b4761dc6 * libcanberra updated to 0.28. Disabled the gstreamer backend by
default because there doesn't seem to be much point to it.

svn path=/nixpkgs/branches/kde-4.7/; revision=27809
2011-07-17 13:27:12 +00:00
Eelco Dolstra 56a081cd55 * Added libav, a fork of ffmpeg.
svn path=/nixpkgs/trunk/; revision=27797
2011-07-15 12:20:34 +00:00
Eelco Dolstra f4ac1126ff * Sync with the trunk.
svn path=/nixpkgs/branches/kde-4.7/; revision=27796
2011-07-15 10:02:22 +00:00
Peter Simons 7c10cbb6c8 We cannot use thread-local store in mesa, because the rest of our xorg
installation has been built without support for it.

svn path=/nixpkgs/trunk/; revision=27788
2011-07-14 20:04:34 +00:00
Peter Simons e7a9b41e9c mesa: enable full gallium, xcb, and egl support, and build all available dri back-ends
svn path=/nixpkgs/trunk/; revision=27786
2011-07-14 19:21:37 +00:00
Peter Simons 18bd4e67d7 mesa: add myself as a maintainer
svn path=/nixpkgs/trunk/; revision=27785
2011-07-14 19:21:33 +00:00
Peter Simons ea27b1b042 mesa: depend on python+libxml2Python rather than depending on pythonFull
The latter package contains Tcl/Tk and whatnot else, so using that
expression as a built input was a bad idea. I'm sorry.

The dependency on talloc is gone, too. It wasn't used, apparently, but
it broke the build on Darwin because talloc doesn't compile there.

svn path=/nixpkgs/trunk/; revision=27784
2011-07-14 19:21:29 +00:00
Peter Simons 13db8d6999 mesa: updated to version 7.10.3
svn path=/nixpkgs/trunk/; revision=27778
2011-07-14 12:22:59 +00:00
Peter Simons 10b7a4fe96 mesa: updated to version 7.10.2
There changes are based on patch <http://sprunge.us/bOMG> from goibhniu.

svn path=/nixpkgs/trunk/; revision=27777
2011-07-14 12:22:55 +00:00
Eelco Dolstra e061898b74 * ConsoleKit updated to 0.4.5.
svn path=/nixpkgs/branches/kde-4.7/; revision=27770
2011-07-13 18:54:27 +00:00
Peter Simons 13720273bb haskell-funcmp: added version 1.5
svn path=/nixpkgs/trunk/; revision=27761
2011-07-13 15:00:51 +00:00
Eelco Dolstra 35505a442e * Remove some dead files.
svn path=/nixpkgs/trunk/; revision=27752
2011-07-13 11:40:47 +00:00
Peter Simons 67bbb5203c boost: updated to version 1.47.0
Packages that don't build with the latest libraries can use 'boost144', which
is the version we had before.

svn path=/nixpkgs/trunk/; revision=27740
2011-07-12 14:24:01 +00:00
Eelco Dolstra c3e3111231 * Add kde-workspace.
* Make sure that polkit actions get installed in $out.

svn path=/nixpkgs/branches/kde-4.7/; revision=27737
2011-07-12 13:24:35 +00:00
Eelco Dolstra dce69134d0 * Added Okular (which is a separate package now).
svn path=/nixpkgs/branches/kde-4.7/; revision=27723
2011-07-11 14:29:27 +00:00
Eelco Dolstra a7b9ef8f4b * Update Poppler to 0.16.7.
svn path=/nixpkgs/branches/kde-4.7/; revision=27703
2011-07-11 13:04:38 +00:00
Eelco Dolstra 76ec0dd430 * Update a bunch of dependencies of kdelibs.
svn path=/nixpkgs/branches/kde-4.7/; revision=27702
2011-07-11 10:49:21 +00:00
Andres Löh eabbecd10f Added hp2any.
svn path=/nixpkgs/trunk/; revision=27701
2011-07-11 07:17:53 +00:00
Andres Löh d7d0700d18 Added test-framework.
svn path=/nixpkgs/trunk/; revision=27695
2011-07-10 17:38:21 +00:00
Lluís Batlle i Rossell 5d27ed479a Updating podofo
svn path=/nixpkgs/trunk/; revision=27694
2011-07-10 16:15:41 +00:00
Peter Simons 20ba4e9296 haskell-testpack: updated to version 2.1.0
svn path=/nixpkgs/trunk/; revision=27660
2011-07-07 23:48:17 +00:00
Andres Löh 6f43e422ba Added yesod-form and yesod-json.
svn path=/nixpkgs/trunk/; revision=27654
2011-07-07 21:40:46 +00:00
Andres Löh 29c7cd1298 Added aeson, unordered-containers.
svn path=/nixpkgs/trunk/; revision=27653
2011-07-07 21:40:43 +00:00
Andres Löh 65d9fa940b Adding yesod-persistent.
svn path=/nixpkgs/trunk/; revision=27652
2011-07-07 21:40:40 +00:00
Andres Löh bec4023fbe Version bump for attoparsec.
svn path=/nixpkgs/trunk/; revision=27651
2011-07-07 21:40:38 +00:00
Andres Löh 1b603fe157 Added yesod-core.
svn path=/nixpkgs/trunk/; revision=27650
2011-07-07 21:40:35 +00:00
Andres Löh f8b1ace1d7 Added warp plus dependencies.
svn path=/nixpkgs/trunk/; revision=27649
2011-07-07 21:40:33 +00:00
Eelco Dolstra a0b48e6cae * Enable parallel building.
svn path=/nixpkgs/branches/kde-4.7/; revision=27644
2011-07-07 20:48:06 +00:00
Eelco Dolstra c4b631967e * Move Attica and polkit-qt-1 out of desktops/kde (since they're not
part of a KDE release).

svn path=/nixpkgs/branches/kde-4.7/; revision=27643
2011-07-07 20:47:38 +00:00
Eelco Dolstra 389fc6e32a * libdbusmenu-qt updated to 0.8.2.
svn path=/nixpkgs/branches/kde-4.7/; revision=27642
2011-07-07 20:03:36 +00:00
Eelco Dolstra 3049b6788b * Doh, cmake doesn't extrapolate $(out).
svn path=/nixpkgs/branches/kde-4.7/; revision=27640
2011-07-07 19:56:01 +00:00
Andres Löh 5422838e56 Version bumps for hakyll and dependencies.
svn path=/nixpkgs/trunk/; revision=27638
2011-07-07 19:08:51 +00:00
Eelco Dolstra e5f1247dd1 * Strigi updated to 0.7.5.
svn path=/nixpkgs/branches/kde-4.7/; revision=27637
2011-07-07 18:23:38 +00:00
Eelco Dolstra 6ce3b9a806 * PolKit updated to 0.101.
svn path=/nixpkgs/branches/kde-4.7/; revision=27636
2011-07-07 18:16:03 +00:00
Eelco Dolstra e59ef4302a * gobject-introspection updated to 0.10.8.
svn path=/nixpkgs/branches/kde-4.7/; revision=27635
2011-07-07 18:15:34 +00:00
Eelco Dolstra f61230a97c * gst-plugins-base updated to 0.10.35.
svn path=/nixpkgs/branches/kde-4.7/; revision=27634
2011-07-07 17:33:45 +00:00
Eelco Dolstra d53d9617b7 * Gamin updated to 0.1.10.
svn path=/nixpkgs/branches/kde-4.7/; revision=27632
2011-07-07 17:25:47 +00:00
Eelco Dolstra fdf7a586a5 * gstreamer updated to 0.10.35.
svn path=/nixpkgs/branches/kde-4.7/; revision=27631
2011-07-07 17:25:31 +00:00
Eelco Dolstra c8fbe3a724 * DBus updated to 1.4.10.
svn path=/nixpkgs/branches/kde-4.7/; revision=27626
2011-07-07 15:44:12 +00:00
Eelco Dolstra 049191511c * GTK+ updated to 2.24.5.
svn path=/nixpkgs/branches/kde-4.7/; revision=27625
2011-07-07 15:43:48 +00:00
Eelco Dolstra 36c7d88de8 * Pango updated to 1.28.4.
svn path=/nixpkgs/branches/kde-4.7/; revision=27624
2011-07-07 15:43:26 +00:00
Eelco Dolstra 230f2a61d0 * glib updated to 2.28.8.
svn path=/nixpkgs/branches/kde-4.7/; revision=27623
2011-07-07 15:43:14 +00:00
Eelco Dolstra f62335822c * Qt 4.7.3.
svn path=/nixpkgs/branches/kde-4.7/; revision=27619
2011-07-07 12:13:16 +00:00
Eelco Dolstra cefbc72a35 * Oops.
svn path=/nixpkgs/trunk/; revision=27601
2011-07-04 15:05:12 +00:00
Eelco Dolstra 684186104c * Latest SQLite, Flash player (Vladimír Čunát).
svn path=/nixpkgs/trunk/; revision=27595
2011-07-04 14:12:20 +00:00
Ludovic Courtès 8defd87760 GNU uCommon C++ 5.0.3.
svn path=/nixpkgs/trunk/; revision=27584
2011-07-04 11:52:18 +00:00
Ludovic Courtès 7bd9ef1d5b GnuTLS 2.12.7.
svn path=/nixpkgs/trunk/; revision=27583
2011-07-04 11:52:13 +00:00
Lluís Batlle i Rossell 4f854226f5 Updating libharu. I renamed it from haru to libharu; I prefer libharu for the name.
svn path=/nixpkgs/trunk/; revision=27578
2011-07-02 14:16:06 +00:00
Ludovic Courtès fef7d9197e libunistring: Make libiconv a propagated input when cross-building for MinGW.
svn path=/nixpkgs/trunk/; revision=27577
2011-07-01 15:51:55 +00:00
Ludovic Courtès 7762934904 BDW-GC, GMP, libffi, libunistring, Readline: Don't use the native `strip'.
Using the native `strip' breaks static libraries when cross-compiling.

svn path=/nixpkgs/trunk/; revision=27572
2011-07-01 13:20:12 +00:00
Sander van der Burg aa16cb5f11 Added option to enable native midi support
svn path=/nixpkgs/trunk/; revision=27563
2011-06-30 15:12:26 +00:00
Eelco Dolstra e324357c8c * sqlite updated to 3.7.7.
svn path=/nixpkgs/trunk/; revision=27543
2011-06-27 08:04:29 +00:00
Ludovic Courtès ad3cea4fb1 glibc: Update Hurd snapshot.
svn path=/nixpkgs/trunk/; revision=27536
2011-06-23 21:14:35 +00:00
Andres Löh e908e92413 haskell/csv version bump
svn path=/nixpkgs/trunk/; revision=27533
2011-06-23 18:35:19 +00:00
Ludovic Courtès 054178e045 glibc: Update Hurd snapshot.
svn path=/nixpkgs/trunk/; revision=27525
2011-06-22 21:37:25 +00:00
Eelco Dolstra 611aecaeeb * Firefox 5.0.
* nspr updated to 4.8.8.

svn path=/nixpkgs/trunk/; revision=27516
2011-06-22 12:21:15 +00:00
Lluís Batlle i Rossell ba31e62e5a Making imlib2 know about libpng, and then feh showing pngs fine.
svn path=/nixpkgs/trunk/; revision=27489
2011-06-17 13:18:27 +00:00
Michael Raskin 0234b969a9 Fix build - add a patch from Debian
svn path=/nixpkgs/trunk/; revision=27488
2011-06-16 21:19:13 +00:00
Eelco Dolstra c81069e9d5 * apr updated to 1.4.5.
* apr-util updated to 1.3.12.
* httpd updated to 2.2.19.

svn path=/nixpkgs/trunk/; revision=27487
2011-06-16 15:19:53 +00:00
Lluís Batlle i Rossell 6dd9fd054e updating imlib2. This makes feh load tiffs correctly.
svn path=/nixpkgs/trunk/; revision=27467
2011-06-15 10:30:08 +00:00
Ludovic Courtès bc9e54bafb GNU uCommon C++ 5.0.2.
svn path=/nixpkgs/trunk/; revision=27442
2011-06-13 20:52:50 +00:00
Ludovic Courtès 73193ee1cb GnuTLS 2.12.6.1.
svn path=/nixpkgs/trunk/; revision=27441
2011-06-13 20:52:40 +00:00
Alexander Tsamutali a4a6c40b2c development/libraries/libevent: Updated to 2.0.12.
svn path=/nixpkgs/trunk/; revision=27432
2011-06-13 14:11:29 +00:00
Ludovic Courtès 74a7f5122e FreeType: Add dependency on GNU Make on FreeBSD.
svn path=/nixpkgs/trunk/; revision=27397
2011-06-08 12:04:47 +00:00
Eelco Dolstra 0ed22f9e3c * libvirt updated to 0.9.2.
svn path=/nixpkgs/trunk/; revision=27396
2011-06-08 11:15:27 +00:00
Yury G. Kudryashov a6704045e6 libxklavier-5.0
svn path=/nixpkgs/trunk/; revision=27389
2011-06-07 21:51:07 +00:00
Yury G. Kudryashov 2fb2742370 ntrack: fix hardcoded /usr
svn path=/nixpkgs/trunk/; revision=27387
2011-06-07 21:50:55 +00:00
Yury G. Kudryashov 496ab8b948 ntrack-011
svn path=/nixpkgs/trunk/; revision=27386
2011-06-07 21:50:48 +00:00
Yury G. Kudryashov 1c4b8e4886 gpgme: propagate some dependencies
svn path=/nixpkgs/trunk/; revision=27384
2011-06-07 21:50:36 +00:00
Yury G. Kudryashov 25c8f01659 libdmtx: propagate xz (move this propagation to ImageMagick?)
svn path=/nixpkgs/trunk/; revision=27383
2011-06-07 21:50:30 +00:00
Yury G. Kudryashov ab01869f17 Add libdmtx, restore alphabetical order
svn path=/nixpkgs/trunk/; revision=27382
2011-06-07 21:50:23 +00:00
Yury G. Kudryashov ff7e3daf73 Add flac, pulseaudio, libmng, libxcb
I need flac, pulseaudio and xcb.

svn path=/nixpkgs/trunk/; revision=27380
2011-06-07 21:50:05 +00:00
Yury G. Kudryashov 7d4d42a8aa libmng: propagate some build inputs
svn path=/nixpkgs/trunk/; revision=27379
2011-06-07 21:49:53 +00:00
Yury G. Kudryashov ee7583d685 libssh-0.4.8
svn path=/nixpkgs/trunk/; revision=27378
2011-06-07 21:49:42 +00:00
Yury G. Kudryashov 701e2b1cd4 ortp-0.16.4
svn path=/nixpkgs/trunk/; revision=27377
2011-06-07 21:49:37 +00:00
Yury G. Kudryashov b0e4af34be msilbc-2.0.3, use upstream buildsystem
svn path=/nixpkgs/trunk/; revision=27376
2011-06-07 21:49:31 +00:00
Yury G. Kudryashov d299591964 mediastreamer-2.7.2; drop my patches. TODO: forward-port plugins.patch
svn path=/nixpkgs/trunk/; revision=27375
2011-06-07 21:49:25 +00:00
Yury G. Kudryashov 8c12f7f6e9 iLBC codec. Extract directly from rfc
svn path=/nixpkgs/trunk/; revision=27374
2011-06-07 21:49:18 +00:00
Yury G. Kudryashov 92db687bf4 ConsoleKit-0.4.4
svn path=/nixpkgs/trunk/; revision=27373
2011-06-07 21:49:11 +00:00
Michael Raskin 3c82ed030f Adding GSM and CELT codecs; dependencies of sflphone - failed to buuild itself
svn path=/nixpkgs/trunk/; revision=27364
2011-06-07 14:42:24 +00:00
Andres Löh 1c00dfa14a Added smallcheck.
svn path=/nixpkgs/trunk/; revision=27363
2011-06-07 14:23:01 +00:00
Michael Raskin 317d2663d7 Twinkle needs an older version of ccrtp
svn path=/nixpkgs/trunk/; revision=27333
2011-05-31 09:09:35 +00:00
Ludovic Courtès 7c3c4722e1 GNU libzrtpcpp.
svn path=/nixpkgs/trunk/; revision=27331
2011-05-30 21:50:01 +00:00
Ludovic Courtès cc072bee92 GNU ccRTP 2.0.0.
svn path=/nixpkgs/trunk/; revision=27330
2011-05-30 21:49:56 +00:00
Ludovic Courtès 7e052f904e GNU uCommon C++ 5.0.1.
svn path=/nixpkgs/trunk/; revision=27328
2011-05-30 21:49:43 +00:00
Ludovic Courtès b7f8a4a795 GNU SASL 1.6.1.
svn path=/nixpkgs/trunk/; revision=27325
2011-05-30 21:49:24 +00:00
Ludovic Courtès 947f4db2e9 GNU Libidn 1.22.
svn path=/nixpkgs/trunk/; revision=27324
2011-05-30 21:49:18 +00:00
Ludovic Courtès 1323580c9a GNU Scientific Library 1.15.
svn path=/nixpkgs/trunk/; revision=27323
2011-05-30 21:49:12 +00:00
Ludovic Courtès b35e60ff61 GnuTLS 2.12.5.
svn path=/nixpkgs/trunk/; revision=27317
2011-05-30 21:48:32 +00:00
Michael Raskin e0a4f988a4 Make Ekiga build
svn path=/nixpkgs/trunk/; revision=27305
2011-05-27 05:39:44 +00:00
Michael Raskin 579433500a Update Lazarus
svn path=/nixpkgs/trunk/; revision=27302
2011-05-25 09:04:54 +00:00
Lluís Batlle i Rossell 6ec672232a Enabling most xcache settings
svn path=/nixpkgs/trunk/; revision=27296
2011-05-24 15:23:04 +00:00
Marco Maggesi 3c99107e82 Fix compilation of apr-util on darwin by removing dependence on openldap
svn path=/nixpkgs/trunk/; revision=27283
2011-05-20 17:00:49 +00:00
Andres Löh 0736b17460 Added repa library for Haskell.
svn path=/nixpkgs/trunk/; revision=27267
2011-05-16 13:48:03 +00:00
Michael Raskin 7dcbaadf78 Split WebKit into release expression and svn-trunk expression; WebKitGtk had a release recently, so it is not a big featurewise change
svn path=/nixpkgs/trunk/; revision=27259
2011-05-16 02:45:55 +00:00
Michael Raskin b3e1663faf Update WebKit
svn path=/nixpkgs/trunk/; revision=27255
2011-05-15 19:21:53 +00:00
Andres Löh 22377172b2 Added logfloat. Some version bumps for Haskell pkgs.
svn path=/nixpkgs/trunk/; revision=27241
2011-05-13 10:14:21 +00:00
Eelco Dolstra 03055c5300 * Updated ffmpeg, faac and xvidcore.
* ffmpeg: enable support for faac (disabled by default because faac is
  non-free).
* faac: use an external mp4v2 because the internal one doesn't build.

svn path=/nixpkgs/trunk/; revision=27240
2011-05-12 20:43:33 +00:00
Eelco Dolstra d5ee631b92 * libvirt: depend on libgcrypt.
svn path=/nixpkgs/trunk/; revision=27229
2011-05-11 15:02:53 +00:00
Eelco Dolstra 36cf6ea476 * libvirt updated to 0.9.1.
svn path=/nixpkgs/trunk/; revision=27193
2011-05-09 09:24:18 +00:00
Michael Raskin 70658f688a Apparently, this is the correct rubberband URL
svn path=/nixpkgs/trunk/; revision=27182
2011-05-08 10:02:42 +00:00
Florian Friesdorf 45859265b0 gmime 2.4.24
svn path=/nixpkgs/trunk/; revision=27174
2011-05-06 21:49:12 +00:00
Rob Vermaas 2881931569 forgot to commit
svn path=/nixpkgs/trunk/; revision=27139
2011-05-04 12:25:52 +00:00
Rob Vermaas 565c215340 add some versions of cppunit/boost/protobuf, added binutils with gold, added nlopt
svn path=/nixpkgs/trunk/; revision=27134
2011-05-04 10:04:26 +00:00
Rob Vermaas 1625c212d1 add some versions of cppunit/boost/protobuf, added binutils with gold, added nlopt
svn path=/nixpkgs/trunk/; revision=27133
2011-05-04 10:04:03 +00:00
Rob Vermaas 8f7cab5d5c add some versions of cppunit/boost/protobuf, added binutils with gold, added nlopt
svn path=/nixpkgs/trunk/; revision=27132
2011-05-04 10:03:46 +00:00
Eelco Dolstra 5c244c345d * wxGTK updated to 2.8.12.
svn path=/nixpkgs/trunk/; revision=27119
2011-05-03 16:01:19 +00:00
Eelco Dolstra c2c9b1d011 * SQLite updated to 3.7.6.2. Also enabled the SECURE_DELETE feature
(required by Firefox).

svn path=/nixpkgs/trunk/; revision=27116
2011-05-03 15:43:08 +00:00
Michael Raskin fbe2f38d98 Update WebKit
svn path=/nixpkgs/trunk/; revision=27064
2011-04-30 17:02:59 +00:00
Lluís Batlle i Rossell 18620ef05b php xcache wanted m4. Otherwise it built a wrong shared object (missing symbols).
svn path=/nixpkgs/trunk/; revision=27057
2011-04-29 21:38:32 +00:00
Lluís Batlle i Rossell 5bd133b65c Updating php 5.3 and adding php-xcache.
svn path=/nixpkgs/trunk/; revision=27056
2011-04-29 21:01:09 +00:00
Ludovic Courtès 67280cf5bb GNU libidn 1.21.
svn path=/nixpkgs/trunk/; revision=27041
2011-04-28 20:58:05 +00:00
Ludovic Courtès f138600ac9 GNU uCommon C++ 4.3.2.
svn path=/nixpkgs/trunk/; revision=27040
2011-04-28 20:58:00 +00:00
Ludovic Courtès f50b358f37 GnuTLS 2.12.3.
svn path=/nixpkgs/trunk/; revision=27039
2011-04-28 20:57:54 +00:00
Lluís Batlle i Rossell c259379dc9 Getting mars to build. Somehow the fetchsvn in sfml_svn did not work anymore.
svn path=/nixpkgs/trunk/; revision=27037
2011-04-28 20:50:12 +00:00
Shea Levy ab8ccf9fc3 Bump *sphinx* to 0.7
svn path=/nixpkgs/trunk/; revision=27015
2011-04-27 21:15:42 +00:00
Florian Friesdorf 6680e9f30b xapian: fixed version: GPL -> GPLv2+ - thanks Ludo’
svn path=/nixpkgs/trunk/; revision=26988
2011-04-27 12:49:55 +00:00
Ludovic Courtès 0387298eaa hwloc 1.2.
svn path=/nixpkgs/trunk/; revision=26986
2011-04-27 09:51:11 +00:00
Florian Friesdorf 3fb9e4da74 xapian and xapianBindings 1.2.5
svn path=/nixpkgs/trunk/; revision=26980
2011-04-26 20:57:16 +00:00
Florian Friesdorf 1e3d07eeea renamed current xapian/xapianBindings to xapian10/xapianBindings10
svn path=/nixpkgs/trunk/; revision=26979
2011-04-26 20:57:11 +00:00
Florian Friesdorf db215a1d94 xapian: gplv2 -> gpl (according to homepage), added myself as maintainer
svn path=/nixpkgs/trunk/; revision=26978
2011-04-26 20:57:04 +00:00
Michael Raskin 8665736894 Update WebKit
svn path=/nixpkgs/trunk/; revision=26977
2011-04-26 07:15:50 +00:00
Cillian de Roiste 5ca8e8041f fixing the url
svn path=/nixpkgs/trunk/; revision=26962
2011-04-25 09:16:12 +00:00
Cillian de Roiste df82318501 Updating Vamp-sdk and rubberband
svn path=/nixpkgs/trunk/; revision=26958
2011-04-24 20:10:49 +00:00
Lluís Batlle i Rossell bc88f37fcb Adding the leptonica library of image processing and analysis.
svn path=/nixpkgs/trunk/; revision=26954
2011-04-24 18:16:51 +00:00
Lluís Batlle i Rossell 7cc0eee61d Updating some xiph.org libraries, and making some cross-compile.
svn path=/nixpkgs/trunk/; revision=26943
2011-04-23 21:58:30 +00:00
Lluís Batlle i Rossell 3b0ea0e5d4 Updating ffmpeg and libvpx.
svn path=/nixpkgs/trunk/; revision=26938
2011-04-23 20:58:52 +00:00
Yury G. Kudryashov 0bfc84b0aa Cross-compile zlib for Windows
svn path=/nixpkgs/trunk/; revision=26928
2011-04-23 06:59:04 +00:00
Cillian de Roiste eb9ed1c09f Adding Specimen, an audio sampler and phat gtk+ widgets which Specimen uses
svn path=/nixpkgs/trunk/; revision=26923
2011-04-22 21:42:38 +00:00
Eelco Dolstra b2c4b433b4 * Added libpar2 and nzbget.
svn path=/nixpkgs/trunk/; revision=26895
2011-04-19 20:35:24 +00:00
Florian Friesdorf 25cd609b92 removed previously added xapian12
svn path=/nixpkgs/trunk/; revision=26882
2011-04-18 17:19:58 +00:00
Florian Friesdorf bd71b36628 notmuch with inheritable-tags-hack for thread muting
the muted tag is supposed to be inherited by messages of the same
thread, effictely muting a thread. A muted thread will not show up in
your inbox anymore. Current implementation is hackish but functional.

big thank you to amdragon!

svn path=/nixpkgs/trunk/; revision=26878
2011-04-18 17:19:44 +00:00
Michael Raskin c9f06b05c1 Add Widelands RTS
svn path=/nixpkgs/trunk/; revision=26869
2011-04-17 17:55:29 +00:00
Eelco Dolstra 69c0cfc9a5 * x264: bump to the latest snapshot to get MPlayer with x264 support
to build.

svn path=/nixpkgs/trunk/; revision=26867
2011-04-17 17:10:37 +00:00
Joachim Schiele 0686dd5767 same fix but now using stdenv.lib.optionals recommended by shlevy
svn path=/nixpkgs/trunk/; revision=26859
2011-04-16 23:00:47 +00:00
Joachim Schiele ece5a6bfc7 fixes this bug http://www.mail-archive.com/suspend-devel@lists.sourceforge.net/msg02355.html
svn path=/nixpkgs/trunk/; revision=26858
2011-04-16 22:47:15 +00:00
Lluís Batlle i Rossell 61b07dc110 Adding libva, to get some possible video acceleration in intel video cards.
svn path=/nixpkgs/trunk/; revision=26854
2011-04-16 11:00:31 +00:00
Michael Raskin d6d9493a4e Update libproxy
svn path=/nixpkgs/trunk/; revision=26847
2011-04-15 04:58:17 +00:00
Lluís Batlle i Rossell 41e1640b1f Adding php APC
svn path=/nixpkgs/trunk/; revision=26841
2011-04-14 11:12:04 +00:00
Michael Raskin b4dde807c2 Updating WebKit to latest and changing some feature flags
svn path=/nixpkgs/trunk/; revision=26818
2011-04-13 09:34:26 +00:00
Karn Kallio e29d509152 Move the gmp dependency to nettle, where it originates.
As pointed out by Ludovic Courtès.

svn path=/nixpkgs/trunk/; revision=26812
2011-04-13 02:02:11 +00:00
Karn Kallio 422455271c GnuTLS now introduces a dependency on gmp.
-- also removed poorly considered earlier individual patches.

svn path=/nixpkgs/trunk/; revision=26810
2011-04-12 16:59:52 +00:00
Karn Kallio f54bea2a72 Pass gmp to libimobiledevice.
svn path=/nixpkgs/trunk/; revision=26809
2011-04-12 16:37:11 +00:00
Ludovic Courtès 665bf1c775 GNU uCommon C++ 4.3.1.
svn path=/nixpkgs/trunk/; revision=26794
2011-04-12 08:05:35 +00:00
Ludovic Courtès 4ae531e532 GnuTLS 2.12.2.
svn path=/nixpkgs/trunk/; revision=26793
2011-04-12 08:05:31 +00:00
Michael Raskin ab7bb9e148 Adding OpenSceneGraph and SimGear
svn path=/nixpkgs/trunk/; revision=26769
2011-04-09 16:43:00 +00:00
Michael Raskin a74ae1f6ff OGRE needs leaving RPATH in place to work
svn path=/nixpkgs/trunk/; revision=26766
2011-04-09 15:51:00 +00:00
Lluís Batlle i Rossell ccd2316471 Fixing the builds of apr, apache, subversion and friends when having enabled the ldap support.
svn path=/nixpkgs/trunk/; revision=26764
2011-04-09 14:59:06 +00:00
Lluís Batlle i Rossell 450ef3730c Adding ldap support to apache (true by default).
I imagine noone would mind this 'addon' in their nixos apache installations.


svn path=/nixpkgs/trunk/; revision=26763
2011-04-09 14:24:25 +00:00
Shea Levy 1ee223e3f6 Bump flite to 1.4, move to libraries
svn path=/nixpkgs/trunk/; revision=26759
2011-04-08 16:15:44 +00:00
Cillian de Roiste 30c1dd27c8 Adding ZynAddSubFX, a software synthesizer, and minixml (a dependency of ZynAddSubFX)
svn path=/nixpkgs/trunk/; revision=26746
2011-04-07 22:24:56 +00:00
Cillian de Roiste fa84d216b0 Updating the snapshot for fltk, r6970 is no longer available
svn path=/nixpkgs/trunk/; revision=26745
2011-04-07 21:36:12 +00:00
Andres Löh 576eb992a4 Updated uu-parsinglib.
svn path=/nixpkgs/trunk/; revision=26729
2011-04-07 08:30:28 +00:00
Shea Levy 566a2eba74 Whoops, edited the wrong expression
svn path=/nixpkgs/trunk/; revision=26701
2011-04-05 16:14:23 +00:00
Shea Levy dc1af596fd Disable watchdog when building ppl-0.11 statically
svn path=/nixpkgs/trunk/; revision=26700
2011-04-05 16:10:58 +00:00
Eelco Dolstra fad57767e3 * Merge the modular-python branch.
svn path=/nixpkgs/trunk/; revision=26695
2011-04-05 15:02:22 +00:00
Eelco Dolstra db144edb60 * libvirt 0.9.0.
svn path=/nixpkgs/branches/modular-python/; revision=26693
2011-04-05 14:14:39 +00:00
Shea Levy 4551a76c2c Add the pocketsphinx voice recognition library
svn path=/nixpkgs/trunk/; revision=26686
2011-04-04 18:50:39 +00:00
Shea Levy f1a3b5e937 Use pkgconfig and a shorter sourceforge url
svn path=/nixpkgs/trunk/; revision=26685
2011-04-04 18:50:30 +00:00
Shea Levy 77d9a77fb1 Add the sphinxbase library
svn path=/nixpkgs/trunk/; revision=26684
2011-04-04 18:50:23 +00:00
Eelco Dolstra f99c0dd302 * Sync with the trunk.
svn path=/nixpkgs/branches/modular-python/; revision=26678
2011-04-04 13:36:05 +00:00
Andres Löh 291df5f0c1 Added the RC of Haskell Platform 2011.2.0.1 ...
svn path=/nixpkgs/trunk/; revision=26674
2011-04-04 08:45:05 +00:00
Andres Löh e5da05349c Updating Hakyll and dependencies.
Patch supplied by Vladimír Čunát. Thanks.

svn path=/nixpkgs/trunk/; revision=26648
2011-03-31 23:21:36 +00:00
Eelco Dolstra 8844b1545a * Libvirt keeps state (such as information about running VMs) in
$(sysconfdir).  So this needs to be /etc rather than $out/etc.  No
  wonder libvirt forgot about my VMs every time it got upgraded...
  (I guess it should really be /var, but that's upstream's decision.)

svn path=/nixpkgs/branches/modular-python/; revision=26643
2011-03-31 22:09:07 +00:00
Shea Levy 812e7c93ee Add ppl version 0.11, necessary for Graphite optimizations in GCC 4.6.0
svn path=/nixpkgs/trunk/; revision=26636
2011-03-31 21:32:01 +00:00
Shea Levy 8002302a31 Add CLooG, an alternative to CLooG-PPL based on the integer set library, an optional dependency for GCC 4.6.0
svn path=/nixpkgs/trunk/; revision=26635
2011-03-31 21:25:08 +00:00
Shea Levy bc6ee5020d Add isl, the integer set library (needed for cloog, an optional dependency for GCC 4.6.0)
svn path=/nixpkgs/trunk/; revision=26633
2011-03-31 21:19:39 +00:00
Eelco Dolstra 2cf4ac9c33 * libvirt updated to 0.9.0rc2. Nova likes this one better.
svn path=/nixpkgs/branches/modular-python/; revision=26627
2011-03-31 13:20:49 +00:00
Lluís Batlle i Rossell 627812ffbb Adding Rigs of Rods.
Basically it builds, but I still don't know how to run it. I imagine the
installPhase is still too poor, but it's better than nothing.

I also added two mygui versions. That stable, and that required by Rigs of Roads (svn).

svn path=/nixpkgs/trunk/; revision=26618
2011-03-30 22:08:33 +00:00
Andres Löh 3ae597033d Added tuple and OneTuple.
svn path=/nixpkgs/trunk/; revision=26592
2011-03-29 14:17:19 +00:00
Lluís Batlle i Rossell 497fc7bb94 Making btanks work (and adding smpeg).
svn path=/nixpkgs/trunk/; revision=26585
2011-03-28 18:58:49 +00:00
Lluís Batlle i Rossell 655a9ea9c3 Adding the racing videogame VDrift.
I added the asio library as a side effect.

svn path=/nixpkgs/trunk/; revision=26575
2011-03-28 16:08:21 +00:00
Lluís Batlle i Rossell 97182f0bcb Making SDL_gfx and SDL_image find the SDL headers, by a postInstall patch.
They expected to sit in the same directory as the SDL headers.

svn path=/nixpkgs/trunk/; revision=26574
2011-03-28 16:08:17 +00:00
Andres Löh b18dd91057 Removing trailing whitespace.
svn path=/nixpkgs/trunk/; revision=26570
2011-03-28 15:04:00 +00:00
Andres Löh 127a2fc8e0 Added random-fu plus dependencies.
(Unfortunately doesn't compile yet with ghc-7.)

svn path=/nixpkgs/trunk/; revision=26569
2011-03-28 15:03:51 +00:00
Ludovic Courtès b56430e7c0 MPC is now a GNU project.
svn path=/nixpkgs/trunk/; revision=26562
2011-03-28 12:04:59 +00:00
Lluís Batlle i Rossell 5142fda2bf Updating freeimage.
svn path=/nixpkgs/trunk/; revision=26560
2011-03-28 10:22:55 +00:00
Lluís Batlle i Rossell 20ef19e1d2 Updating enet
svn path=/nixpkgs/trunk/; revision=26546
2011-03-27 14:07:38 +00:00
Russell O'Connor 72124a0aa9 Bitcoin.
svn path=/nixpkgs/trunk/; revision=26544
2011-03-27 06:44:34 +00:00
Evgeny Egorochkin 836b0d259d ustr: packaged
svn path=/nixpkgs/trunk/; revision=26540
2011-03-27 04:46:05 +00:00
Evgeny Egorochkin 9f7e3964d4 taglib: version bump
svn path=/nixpkgs/trunk/; revision=26533
2011-03-26 18:23:30 +00:00
Karn Kallio f477fe9d3d Update libssh version to latest release 0.4.8
svn path=/nixpkgs/trunk/; revision=26519
2011-03-25 23:14:01 +00:00
Lluís Batlle i Rossell ef57b57b92 Adding two NES emulators.
Because of them, I made allegro build the allegrogl library.
I also added the HawkNL library.


svn path=/nixpkgs/trunk/; revision=26517
2011-03-25 22:15:48 +00:00
Karn Kallio 9eb80e4f94 URL to libssh has changed.
svn path=/nixpkgs/trunk/; revision=26516
2011-03-25 15:27:30 +00:00
Peter Simons 0e5593b0f6 libarchive: don't try to build e2fsprogs, attr, or acl unless running on Linux
These packages give errors when built on, say, Darwin.

svn path=/nixpkgs/trunk/; revision=26510
2011-03-25 12:55:22 +00:00
Rob Vermaas 592abae649 add patch for boost to get rid of ' what(): locale::facet::_S_create_c_locale name not valid' errors in some packages
svn path=/nixpkgs/trunk/; revision=26500
2011-03-25 08:04:00 +00:00
Lluís Batlle i Rossell 0b176e1bd0 Adding a first attempt of expression for wxwidgets 2.9.
It looks like building and installing. Part of the expression I copied from wxGTK 2.8,
and some parts of it may be irrelevant or wrong.


svn path=/nixpkgs/trunk/; revision=26484
2011-03-23 22:05:14 +00:00
Ludovic Courtès acffafe66f GStreamer: Actually use the setup hook.
svn path=/nixpkgs/trunk/; revision=26482
2011-03-23 21:56:05 +00:00
Ludovic Courtès 53eb747a5c GNU uCommon C++ 4.2.0.
svn path=/nixpkgs/trunk/; revision=26478
2011-03-23 21:55:43 +00:00
Peter Simons 2e24a92971 pathtype: added initial version 0.5.2
svn path=/nixpkgs/trunk/; revision=26471
2011-03-23 15:57:58 +00:00
Alexander Tsamutali e54a964632 development/libraries/sfml: New nixpkg.
svn path=/nixpkgs/trunk/; revision=26433
2011-03-20 18:21:37 +00:00
Alexander Tsamutali 4cbc38255f development/libraries/fribidi: Updated to 0.19.2.
svn path=/nixpkgs/trunk/; revision=26431
2011-03-20 14:54:39 +00:00
Andres Löh 19b2375799 Fix Haskell x11-xft package.
svn path=/nixpkgs/trunk/; revision=26430
2011-03-20 13:23:53 +00:00
Michael Raskin 6879f1e3b1 Update NSPR
svn path=/nixpkgs/trunk/; revision=26416
2011-03-18 08:26:11 +00:00
Yury G. Kudryashov 6923a32b33 Add funambol
svn path=/nixpkgs/trunk/; revision=26336
2011-03-15 23:09:27 +00:00
Yury G. Kudryashov e37f85adb7 Add liblikeback
svn path=/nixpkgs/trunk/; revision=26335
2011-03-15 23:09:21 +00:00
Yury G. Kudryashov a9eb45ae18 Add bluedevil
svn path=/nixpkgs/trunk/; revision=26333
2011-03-15 23:09:07 +00:00
Eelco Dolstra f208edd1a5 * Merge the x-updates branch.
svn path=/nixpkgs/trunk/; revision=26330
2011-03-15 18:29:27 +00:00
Andres Löh 1a7d72731b Added AC-Vector package.
svn path=/nixpkgs/trunk/; revision=26322
2011-03-15 13:56:55 +00:00
Eelco Dolstra 0648ceff32 * Enable the "tee" backend in Cairo. Apparently Firefox 4.0 needs
this.

svn path=/nixpkgs/branches/x-updates/; revision=26312
2011-03-15 09:25:08 +00:00
Eelco Dolstra 60510f2145 * One last glib/gtk update.
svn path=/nixpkgs/branches/x-updates/; revision=26309
2011-03-15 08:43:06 +00:00
Eelco Dolstra 3e3eac2e30 * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26303
2011-03-14 18:26:46 +00:00
Eelco Dolstra e5fcf7ebe9 * Fix the libvirt build on x86_64-linux
(http://hydra.nixos.org/build/959072).

svn path=/nixpkgs/trunk/; revision=26301
2011-03-14 14:46:41 +00:00
Eelco Dolstra fd2f86820c * Glib 2.28.2.
svn path=/nixpkgs/branches/x-updates/; revision=26299
2011-03-14 12:26:51 +00:00
Andres Löh b043946163 More Haskell library updates.
svn path=/nixpkgs/trunk/; revision=26292
2011-03-13 11:03:49 +00:00
Andres Löh f89b676312 Upgraded Hakyll to 2.4.3.
I know, that's not the latest version, but Hakyll-3 is rather
different from Hakyll-2 and the upgrade would require more work.

svn path=/nixpkgs/trunk/; revision=26291
2011-03-13 08:46:54 +00:00
Andres Löh 3e0ac9b040 Major Haskell packages overhaul.
Several changes, some highlights:

  * Structure of haskell-packages.nix updated. It's now easier to
    select different default versions of packages for different
    versions of GHC.

  * GHC 7.0.2 is now default.

  * Haskell Platform 2011.2.0.0 has been added and is now default.

  * Several packages have been updated
    (gtk2hs, gitit, xmonad, darcs, ...).

  * Some old packages have been removed.

svn path=/nixpkgs/trunk/; revision=26288
2011-03-12 17:28:15 +00:00
Yury G. Kudryashov 03b3d85fbf qt-4.7.2
svn path=/nixpkgs/trunk/; revision=26287
2011-03-12 06:59:49 +00:00
Karn Kallio 33fb7aef16 Update flapjax compiler to the latest release, version 2.1
Also add to nixpkgs new dependencies from hackage.

svn path=/nixpkgs/trunk/; revision=26283
2011-03-11 16:49:56 +00:00
Lluís Batlle i Rossell d58c5e2821 Adding GMU, a music player for small portable devices, written in SDL.
svn path=/nixpkgs/trunk/; revision=26266
2011-03-10 22:20:35 +00:00
Ludovic Courtès 9f34f8ea61 GNU uCommon C++ 4.1.7.
svn path=/nixpkgs/trunk/; revision=26263
2011-03-10 16:27:53 +00:00
Ludovic Courtès 6400cf78f0 GnuTLS 2.10.5.
svn path=/nixpkgs/trunk/; revision=26257
2011-03-10 14:53:51 +00:00
Ludovic Courtès 5cf585dce2 GNU libidn 1.20.
svn path=/nixpkgs/trunk/; revision=26256
2011-03-10 14:53:46 +00:00
Eelco Dolstra cc3d1e1c09 * Sync with trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26243
2011-03-10 08:48:14 +00:00
Lluís Batlle i Rossell dd190a5fb8 Updating cminpack (+ the meta homepage)
svn path=/nixpkgs/trunk/; revision=26206
2011-03-08 09:19:41 +00:00
Lluís Batlle i Rossell a136bd7968 Adding flann
svn path=/nixpkgs/trunk/; revision=26205
2011-03-08 09:19:37 +00:00
Lluís Batlle i Rossell d95300f90f Adding cminpack
svn path=/nixpkgs/trunk/; revision=26204
2011-03-08 09:19:32 +00:00
Eelco Dolstra cf6bc1aeae * Apply a patch to prevent the X server from segfaulting if kwin is
run with swrast_dri (e.g. with the VGA driver).  (NixOS/121)

svn path=/nixpkgs/branches/x-updates/; revision=26201
2011-03-07 21:16:34 +00:00
Eelco Dolstra d10651a8b7 * zOMG, a new Pan release!
* Delete gmime 2.2.x because the old version of Pan was the only
  package that needed it.

svn path=/nixpkgs/trunk/; revision=26200
2011-03-07 17:11:50 +00:00
Eelco Dolstra f16a2dc2f6 * Sync with the trunk. Remove glib_2_28 because the branch already
has it.

svn path=/nixpkgs/branches/x-updates/; revision=26189
2011-03-07 12:17:12 +00:00
Eelco Dolstra 3e9de5097d * Mesa updated to 7.10.1.
svn path=/nixpkgs/branches/x-updates/; revision=26186
2011-03-07 11:51:08 +00:00
Eelco Dolstra c3e68778ae * libdrm updated to 2.4.24.
svn path=/nixpkgs/branches/x-updates/; revision=26185
2011-03-07 11:22:40 +00:00
Michael Raskin 32b0f76435 Missing glib-2.28 expression
svn path=/nixpkgs/trunk/; revision=26165
2011-03-04 21:04:44 +00:00
Lluís Batlle i Rossell 3d50c7c0d7 Updating SDL_gfx, as it should fix a memory corruption:
http://yellowgrass.org/issue/Nixpkgs/108
https://gna.org/bugs/?17768


svn path=/nixpkgs/trunk/; revision=26163
2011-03-04 19:37:56 +00:00
Eelco Dolstra 69b8bc9ed7 * Remove the removal of swrast_dri.so :-) It's better to address this
in the NixOS X server module.

svn path=/nixpkgs/branches/x-updates/; revision=26157
2011-03-04 12:03:53 +00:00
Eelco Dolstra 927a41492d * Updated dbus, glib, gtk+.
svn path=/nixpkgs/branches/x-updates/; revision=26156
2011-03-04 11:59:04 +00:00
Lluís Batlle i Rossell a76b0fb6fa Making freecad install; it still does not find all shared objects though.
Either eigen changed the hash of the tarball, or I did not commit its latest hash.
I add boost 1.46 apart, because 1.44 does not work easily for freecad.

svn path=/nixpkgs/trunk/; revision=26151
2011-03-04 09:48:24 +00:00
Lluís Batlle i Rossell 5148ee9654 I revert the "Updating boost" change. I don't really need it new I think, and
it breaks things, niksnut reports.

svn path=/nixpkgs/trunk/; revision=26146
2011-03-03 14:10:18 +00:00