Commit graph

3103 commits

Author SHA1 Message Date
Eelco Dolstra
a96c83d70e * Build HAL with ConsoleKit and PolicyKit support. Without it, HAL's
configure script prints out this ominous warning:

WARNING: PolicyKit is disabled. You need to manually edit the hal.conf
         file to lock down the service. Failure to do so allows any
         caller to make hald do work on their behalf which may be
         a huge SECURITY HOLE. I repeat: YOU NEED TO EDIT THE FILE
         hal.conf to match your distro/site to avoid NASTY SECURITY HOLES.

  Note that HAL only builds with the old PolicyKit (it looks for
  polkit.pc).  Reverted ConsoleKit to the last version that used the
  old PolicyKit for this reason.

svn path=/nixpkgs/trunk/; revision=17432
2009-09-25 23:05:53 +00:00
Eelco Dolstra
ef2f9c1968 * Added pm-utils.
svn path=/nixpkgs/trunk/; revision=17430
2009-09-25 21:43:25 +00:00
Eelco Dolstra
90fc367427 * e2fsprogs 1.41.9.
svn path=/nixpkgs/trunk/; revision=17429
2009-09-25 20:53:21 +00:00
Eelco Dolstra
aab405ccb5 * For consistency.
svn path=/nixpkgs/trunk/; revision=17426
2009-09-25 20:09:50 +00:00
Eelco Dolstra
7dd58cda98 * Sigh. For PolicyKit, follow the upstream names, otherwise I'll get
a headache.  "polkit" is the new, unstable release series.
  "policykit" is the old series.  (See
  http://lists.freedesktop.org/archives/polkit-devel/2009-February/000106.html
  for an "explanation" of the name change.)  It seems that for HAL we
  need to revert to the old "policykit", since it doesn't compile
  against "polkit".

svn path=/nixpkgs/trunk/; revision=17425
2009-09-25 20:06:36 +00:00
Marc Weber
931a5936cb using getConfig for php so that users who don't know the composableDerivation very well can switch off features.
svn path=/nixpkgs/trunk/; revision=17423
2009-09-25 19:39:05 +00:00
Peter Simons
4dc1e7ba44 Network Block Device (nbd): initial version 2.9.13
svn path=/nixpkgs/trunk/; revision=17414
2009-09-25 02:09:43 +00:00
Marc Weber
a5fdba90e2 reverting -r17404 - the patch I should have kept private
svn path=/nixpkgs/trunk/; revision=17408
2009-09-24 21:39:32 +00:00
Lluís Batlle i Rossell
f9035543d5 Made openocd work with ft2232 jtag chipset, that of the Sheevaplug.
svn path=/nixpkgs/trunk/; revision=17407
2009-09-24 21:28:27 +00:00
Marc Weber
4d41884f8e nixUnstable: adding experimental debug coercion failure patch - for debugging only
svn path=/nixpkgs/trunk/; revision=17405
2009-09-24 18:22:30 +00:00
Ludovic Courtès
18e946cb9d Add Apache Ant, built from source with GCJ.
svn path=/nixpkgs/trunk/; revision=17401
2009-09-24 14:49:15 +00:00
Eelco Dolstra
b7a90c11d3 * selectMaintained (renamed): don't use meta.maintainer, just use
meta.platforms.
* Valgrind *should* work on Darwin now, except that our GCC doesn't
  recognise the -arch flag.

svn path=/nixpkgs/trunk/; revision=17372
2009-09-23 19:45:02 +00:00
Eelco Dolstra
22c35b04dd * GCC 4.3 should be the default.
svn path=/nixpkgs/trunk/; revision=17368
2009-09-23 18:33:40 +00:00
Eelco Dolstra
251c7207cf * Revert to KVM 76 in the VM build functions. The latest qemu-kvm has
weird performance and data corruption regressions in the build farm.

svn path=/nixpkgs/trunk/; revision=17364
2009-09-23 14:24:37 +00:00
Marc Weber
47828714e4 redland 1.0.9 breaks kde-4.3. So also provide 1.0.8
svn path=/nixpkgs/trunk/; revision=17357
2009-09-22 23:07:35 +00:00
Peter Simons
04558d8496 xlock: fixed build and updated to version 5.24
svn path=/nixpkgs/trunk/; revision=17356
2009-09-22 20:16:38 +00:00
Ludovic Courtès
03043bce33 ECJ: Merge the 2 expressions.
svn path=/nixpkgs/trunk/; revision=17354
2009-09-22 14:40:54 +00:00
Ludovic Courtès
a4af741f8d Damn it, we already had an ECJ.
svn path=/nixpkgs/trunk/; revision=17353
2009-09-22 14:24:35 +00:00
Ludovic Courtès
bf0f4deabb Add ECJ.
svn path=/nixpkgs/trunk/; revision=17352
2009-09-22 14:19:44 +00:00
Ludovic Courtès
7735b54340 Keep only one SWIG, with support for all languages.
svn path=/nixpkgs/trunk/; revision=17351
2009-09-22 11:59:41 +00:00
Michael Raskin
740f54a49a Fix one more typo
svn path=/nixpkgs/trunk/; revision=17349
2009-09-22 09:29:00 +00:00
Eelco Dolstra
12395c36a9 * Typos.
svn path=/nixpkgs/trunk/; revision=17348
2009-09-22 09:26:18 +00:00
Eelco Dolstra
912e9f2c80 * Revert Redland - see http://hydra.nixos.org/build/78513.
svn path=/nixpkgs/trunk/; revision=17347
2009-09-22 08:55:37 +00:00
Rob Vermaas
cce34a0779 * added ethtool 6
svn path=/nixpkgs/trunk/; revision=17346
2009-09-22 08:37:41 +00:00
Rob Vermaas
a9d801d645 * added davfs2 1.4.1
svn path=/nixpkgs/trunk/; revision=17345
2009-09-22 08:12:11 +00:00
Michael Raskin
2750e04339 Adding uzbl experimental snapshot
svn path=/nixpkgs/trunk/; revision=17344
2009-09-22 03:51:04 +00:00
Ludovic Courtès
7b2932cd9b SWIG 1.3.40, with Guile support.
svn path=/nixpkgs/trunk/; revision=17343
2009-09-21 20:56:53 +00:00
Ludovic Courtès
0dd49cdce3 guile-2-test: Add SWIG.
svn path=/nixpkgs/trunk/; revision=17342
2009-09-21 20:25:36 +00:00
Marc Weber
8398a33112 pass jackaudio to alsaPlugins also adding convinient wrapper script
svn path=/nixpkgs/trunk/; revision=17340
2009-09-21 15:55:26 +00:00
Marc Weber
f88b8d0bf1 adding hint telling where to set config for nixos
svn path=/nixpkgs/trunk/; revision=17337
2009-09-21 15:55:18 +00:00
Ludovic Courtès
a41355339a guile-2-test: Next attempt at overriding `guile'.
svn path=/nixpkgs/trunk/; revision=17330
2009-09-21 12:24:04 +00:00
Marc Weber
0ba0fefa95 mplayer-trunk: build with jackaudio support
svn path=/nixpkgs/trunk/; revision=17329
2009-09-21 10:09:24 +00:00
Marc Weber
c28aeffc87 finally fixing netsurf
svn path=/nixpkgs/trunk/; revision=17328
2009-09-21 10:09:20 +00:00
Marc Weber
db19c4e24e adding ardour
svn path=/nixpkgs/trunk/; revision=17327
2009-09-21 09:58:41 +00:00
Marc Weber
7957310a66 adding aubio
svn path=/nixpkgs/trunk/; revision=17326
2009-09-21 09:58:38 +00:00
Marc Weber
8cce0a0db4 adding sonic visualizer (music analysis app)
svn path=/nixpkgs/trunk/; revision=17325
2009-09-21 09:58:36 +00:00
Marc Weber
b2791eaa70 adding jackmeter
svn path=/nixpkgs/trunk/; revision=17324
2009-09-21 09:58:33 +00:00
Marc Weber
c01f00b3ff adding vamp sdk and rubberband
svn path=/nixpkgs/trunk/; revision=17323
2009-09-21 09:58:30 +00:00
Marc Weber
6f37fc253b adding liblo
svn path=/nixpkgs/trunk/; revision=17322
2009-09-21 09:58:27 +00:00
Marc Weber
028f3ec7d0 updating redland, adding rasqal, raptor, librdf
svn path=/nixpkgs/trunk/; revision=17320
2009-09-21 09:58:21 +00:00
Marc Weber
862fcb0252 adding alsa-plugin and patching alsa so that you can tell it about additional plugins
svn path=/nixpkgs/trunk/; revision=17316
2009-09-20 21:54:23 +00:00
Marc Weber
47a2c768f9 evince: allow overriding number of items shown in recent opened list
svn path=/nixpkgs/trunk/; revision=17314
2009-09-20 21:54:11 +00:00
Michael Raskin
cde0f366c2 Fix signature mismatch
svn path=/nixpkgs/trunk/; revision=17313
2009-09-20 20:37:41 +00:00
Michael Raskin
b13ead6f28 Maybe using the actual overridden packages will work?
svn path=/nixpkgs/trunk/; revision=17312
2009-09-20 20:30:00 +00:00
Ludovic Courtès
9d1a48de59 guile-2-test: Try a different approach.
svn path=/nixpkgs/trunk/; revision=17309
2009-09-20 18:11:48 +00:00
Ludovic Courtès
b8461305f6 guile-2-test: Revert previous commit.
svn path=/nixpkgs/trunk/; revision=17308
2009-09-20 17:55:31 +00:00
Ludovic Courtès
e7366d6219 guile-2-test: Hopefully override `guile' for good.
svn path=/nixpkgs/trunk/; revision=17307
2009-09-20 17:47:47 +00:00
Marc Weber
b0b44c8185 grip fixes
svn path=/nixpkgs/trunk/; revision=17306
2009-09-20 17:33:12 +00:00
Marc Weber
d0d9fc300f adding grip, a gui rip application (segfaults on amd64 ?)
svn path=/nixpkgs/trunk/; revision=17305
2009-09-20 17:01:31 +00:00
Marc Weber
34be37b51e adding twinkle, a voice over IP phone software
svn path=/nixpkgs/trunk/; revision=17303
2009-09-20 17:01:19 +00:00
Lluís Batlle i Rossell
3eeec96a31 Adding OpenOCD.
svn path=/nixpkgs/trunk/; revision=17302
2009-09-20 16:43:16 +00:00
Lluís Batlle i Rossell
f85146e2fc Making radare more flexible on build options.
svn path=/nixpkgs/trunk/; revision=17294
2009-09-20 09:33:37 +00:00
Lluís Batlle i Rossell
b1a7cd1692 Fixing cryptsetup build.
svn path=/nixpkgs/trunk/; revision=17293
2009-09-20 09:22:02 +00:00
Michael Raskin
107a5ee327 Adding dmraid
svn path=/nixpkgs/trunk/; revision=17292
2009-09-20 08:38:30 +00:00
Ludovic Courtès
25badc1ed7 guile-2-test: Next attempt to have `guile' actually overridden.
svn path=/nixpkgs/trunk/; revision=17290
2009-09-19 22:46:30 +00:00
Ludovic Courtès
5137763d01 guile-2-test: Attempt to have `guile' actually overridden.
svn path=/nixpkgs/trunk/; revision=17288
2009-09-19 22:23:29 +00:00
Ludovic Courtès
de9c8771bd GNU libunistring 0.9.1.1.
svn path=/nixpkgs/trunk/; revision=17287
2009-09-19 22:17:11 +00:00
Lluís Batlle i Rossell
854293fc7b Adding the nvidia legacy drivers (I still use a geForce 4 AGP)
svn path=/nixpkgs/trunk/; revision=17284
2009-09-19 22:09:08 +00:00
Ludovic Courtès
0e79b7a46b guile-2-test: Add missing definition for `toJob'.
svn path=/nixpkgs/trunk/; revision=17283
2009-09-19 22:07:37 +00:00
Ludovic Courtès
e3351fb625 Add GNU libiconv as a stand-alone package.
svn path=/nixpkgs/trunk/; revision=17282
2009-09-19 22:03:24 +00:00
Ludovic Courtès
9d9fa8dd55 guile-2-test: Attempt to provide Hydra with what it wants.
Thanks to Michael Raskin!

svn path=/nixpkgs/trunk/; revision=17280
2009-09-19 21:44:50 +00:00
Ludovic Courtès
12468cc5c8 guile-2-test: Attempt to fix "unknown value: <unknown>" error.
svn path=/nixpkgs/trunk/; revision=17279
2009-09-19 21:21:29 +00:00
Ludovic Courtès
bdd6470100 guile-2-test: Fix `packageOverrides' magic.
svn path=/nixpkgs/trunk/; revision=17278
2009-09-19 18:15:32 +00:00
Michael Raskin
7c6b01a130 Missed that Nix trunk uses fresher libxml2..
svn path=/nixpkgs/trunk/; revision=17275
2009-09-19 12:35:52 +00:00
Michael Raskin
50c69a093c Building Nix from SVN now needs libxml2
svn path=/nixpkgs/trunk/; revision=17273
2009-09-19 11:40:36 +00:00
Marc Weber
b6580e4b14 adding kphone
svn path=/nixpkgs/trunk/; revision=17265
2009-09-18 21:16:32 +00:00
Lluís Batlle i Rossell
72d6ffb8cf Adding the firmware for the rt73 usb wifi nic.
svn path=/nixpkgs/trunk/; revision=17263
2009-09-18 20:45:10 +00:00
Ludovic Courtès
ee720ec763 xmlto: Remove explicit dependency on Glibc.
svn path=/nixpkgs/trunk/; revision=17261
2009-09-18 18:22:42 +00:00
Eelco Dolstra
11e76d7303 * libxml2 2.7.4. Quite a few packages depend on libxml2, so this
isn't the default yet.

svn path=/nixpkgs/trunk/; revision=17245
2009-09-18 11:41:37 +00:00
Michael Raskin
86a90971d7 I am an idiot. Correcting -zen1 -> -zen2
svn path=/nixpkgs/trunk/; revision=17242
2009-09-18 06:38:36 +00:00
Andres Löh
ea843fa435 Added GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=17227
2009-09-17 11:45:20 +00:00
Michael Raskin
3b032d4299 Mentioning 2.6.31-zen1 in the all-packages.nix
svn path=/nixpkgs/trunk/; revision=17218
2009-09-17 09:03:42 +00:00
Rob Vermaas
c3fe985546 * added ncftp
svn path=/nixpkgs/trunk/; revision=17214
2009-09-17 07:31:34 +00:00
Sander van der Burg
b25e2987a6 - Fixed slang so that it always finds the terminfo files
- Added GPM support to midnight commander


svn path=/nixpkgs/trunk/; revision=17209
2009-09-16 17:52:54 +00:00
Sander van der Burg
08b7947416 Enabled support for X11 events in midnight commander
svn path=/nixpkgs/trunk/; revision=17208
2009-09-16 17:26:19 +00:00
Sander van der Burg
3e69dab469 Applied some fixes to midnight commander so that it no longer displays weird characters
svn path=/nixpkgs/trunk/; revision=17207
2009-09-16 17:08:33 +00:00
Michael Raskin
a9dc68b1ea Specify some obvious platform sets
svn path=/nixpkgs/trunk/; revision=17205
2009-09-16 15:12:24 +00:00
Ludovic Courtès
be5087cc6e Build Python packages only on platforms supported by Python.
svn path=/nixpkgs/trunk/; revision=17199
2009-09-16 14:44:31 +00:00
Ludovic Courtès
bdc8e21d9e Crypto++: Fix on Darwin.
svn path=/nixpkgs/trunk/; revision=17196
2009-09-16 14:35:38 +00:00
Ludovic Courtès
26bf0b0150 Fix GNU Fdisk.
svn path=/nixpkgs/trunk/; revision=17195
2009-09-16 14:30:53 +00:00
Ludovic Courtès
ba315f3052 Fix GNU Nettle.
svn path=/nixpkgs/trunk/; revision=17194
2009-09-16 14:26:00 +00:00
Ludovic Courtès
e263837a86 Add Guile itself to the jobset.
svn path=/nixpkgs/trunk/; revision=17193
2009-09-16 14:14:57 +00:00
Ludovic Courtès
7e15a1d3bc Add Guile 2.x Hydra jobset.
svn path=/nixpkgs/trunk/; revision=17192
2009-09-16 14:13:26 +00:00
Michael Raskin
b5dc8f98d2 Use attrByPath for feature retrieval
svn path=/nixpkgs/trunk/; revision=17191
2009-09-16 13:54:11 +00:00
Michael Raskin
9d85db847b Fix Typo
svn path=/nixpkgs/trunk/; revision=17190
2009-09-16 13:53:25 +00:00
Ludovic Courtès
2e32120360 When `meta.platforms' is absent, assume packages target all platforms.
svn path=/nixpkgs/trunk/; revision=17189
2009-09-16 12:47:27 +00:00
Ludovic Courtès
717910394b GNU Guile 1.9.3.
svn path=/nixpkgs/trunk/; revision=17188
2009-09-16 12:46:17 +00:00
Eelco Dolstra
2c0b739bca * XHTML 1.0 DTDs.
svn path=/nixpkgs/trunk/; revision=17185
2009-09-16 12:25:22 +00:00
Rob Vermaas
52b1b33028 * ddclient
svn path=/nixpkgs/trunk/; revision=17183
2009-09-16 11:53:09 +00:00
Rob Vermaas
6ddd76f095 * added gnuvd, dutch dictionary application
svn path=/nixpkgs/trunk/; revision=17177
2009-09-16 08:36:05 +00:00
Rob Vermaas
8afb39344e * added uptimed 0.3.16
svn path=/nixpkgs/trunk/; revision=17172
2009-09-16 07:31:16 +00:00
Eelco Dolstra
6d3edf1030 * Some Perl updates.
svn path=/nixpkgs/trunk/; revision=17164
2009-09-15 13:47:08 +00:00
Rob Vermaas
0f02e39a6e added stratego 0.18 pre release
svn path=/nixpkgs/trunk/; revision=17157
2009-09-15 11:36:41 +00:00
Michael Raskin
0428a7405a Fix aufs utilities for NixOS manual
svn path=/nixpkgs/trunk/; revision=17153
2009-09-15 10:28:40 +00:00
Michael Raskin
9ebb44e92e AUFS2 utilities
svn path=/nixpkgs/trunk/; revision=17147
2009-09-15 07:58:44 +00:00
Michael Raskin
a593492d4f Add a version of Zen kernel with Con Kolivas' BFS scheduler
svn path=/nixpkgs/trunk/; revision=17142
2009-09-14 21:56:31 +00:00
Lluís Batlle i Rossell
da09a4e950 Adding kermit.
svn path=/nixpkgs/trunk/; revision=17114
2009-09-14 18:50:17 +00:00
Michael Raskin
b1dd203499 Give up on aufs2 for now
svn path=/nixpkgs/trunk/; revision=17112
2009-09-14 14:23:22 +00:00
Andres Löh
5b20a89f11 Version bumps for a number of Haskell packages.
svn path=/nixpkgs/trunk/; revision=17107
2009-09-14 08:35:39 +00:00
Eelco Dolstra
03c8eb97fb svn path=/nixpkgs/trunk/; revision=17096 2009-09-13 16:40:36 +00:00
Eelco Dolstra
5d0b5d06e9 * qt-4 -> qt-4.4.
* kde-4.2 shouldn't depend on poppler built with qt 4.5.

svn path=/nixpkgs/trunk/; revision=17084
2009-09-13 11:04:54 +00:00
Eelco Dolstra
eb6f32c9cb * Fix the aufs2 build (hopefully).
svn path=/nixpkgs/trunk/; revision=17080
2009-09-13 10:25:58 +00:00
Marc Weber
c8ee5671cb commenting Eclipse - use the new eclipseRunner instead
svn path=/nixpkgs/trunk/; revision=17079
2009-09-13 08:54:55 +00:00
Marc Weber
5478df996a adding netsurf browser. No JavaScript yet
svn path=/nixpkgs/trunk/; revision=17077
2009-09-13 08:54:47 +00:00
Marc Weber
dee4d93757 adding haru pdf lib
svn path=/nixpkgs/trunk/; revision=17076
2009-09-13 08:54:44 +00:00
Marc Weber
8b8b058662 adding libmng
svn path=/nixpkgs/trunk/; revision=17075
2009-09-13 08:54:41 +00:00
Michael Raskin
b7d9689224 Building 2.6.31
svn path=/nixpkgs/trunk/; revision=17066
2009-09-12 07:13:58 +00:00
Michael Raskin
a5023cf381 Adding 2.6.31 kernel and trying to generate config for it without manual operations
svn path=/nixpkgs/trunk/; revision=17065
2009-09-12 07:13:20 +00:00
Michael Raskin
b3281f994f KQemu needs perl to build
svn path=/nixpkgs/trunk/; revision=17063
2009-09-12 06:11:21 +00:00
Michael Raskin
3557e1c843 Removing sqliteargument for tb2
svn path=/nixpkgs/trunk/; revision=17062
2009-09-12 05:53:25 +00:00
Michael Raskin
fdf28e4074 Thunderbird seems to need SQLite3 in a half-explicit way
svn path=/nixpkgs/trunk/; revision=17058
2009-09-11 19:28:12 +00:00
Michael Raskin
03a9137114 Add matching kernelPackages for Zen Linux Kernel
svn path=/nixpkgs/trunk/; revision=17056
2009-09-11 15:55:52 +00:00
Sander van der Burg
cdfc752210 Added XPlanet support to kdeedu-4.3.1, not that is an essential feature but it looks cool :-)
svn path=/nixpkgs/trunk/; revision=17054
2009-09-11 14:06:51 +00:00
Michael Raskin
e1faa9650d Remove non-existant gnuplotX
svn path=/nixpkgs/trunk/; revision=17052
2009-09-11 13:58:19 +00:00
Michael Raskin
491255bbb3 Trying to add Zen Linux Kernel
svn path=/nixpkgs/trunk/; revision=17050
2009-09-11 13:16:18 +00:00
Sander van der Burg
3a5645269d Claimed maintainership of VICE package and added VICE to the releases.nix
svn path=/nixpkgs/trunk/; revision=17049
2009-09-11 13:16:00 +00:00
Sander van der Burg
40755c9412 Added Amarok 2.1.1
svn path=/nixpkgs/trunk/; revision=17047
2009-09-11 12:32:43 +00:00
Sander van der Burg
32e16ca9c6 Upgraded VirtualBox to 3.0.6
svn path=/nixpkgs/trunk/; revision=17046
2009-09-11 12:24:32 +00:00
Sander van der Burg
0ff1faaf1b - Added Qt script generator package (dependency for Amarok)
- Added taglib-extras package (dependency for Amarok)
- Upgraded Amarok to 2.1.1


svn path=/nixpkgs/trunk/; revision=17045
2009-09-11 12:05:23 +00:00
Ludovic Courtès
0d362f72ba Add GNU Mailutils 2.1.
svn path=/nixpkgs/trunk/; revision=17041
2009-09-11 09:38:25 +00:00
Sander van der Burg
1d3e827479 Added a few KDE 4.3 extragear packages
svn path=/nixpkgs/trunk/; revision=17040
2009-09-10 21:58:19 +00:00
Sander van der Burg
2b0544f223 - Loudmouth uses OpenSSL now instead of GnuTLS, because I could not compile it with GnuTLS
- Upgraded KOffice to 2.0.2
- Upgraded KTorrent to 3.2.3
- Upgraded Amarok to 2.1.1


svn path=/nixpkgs/trunk/; revision=17038
2009-09-10 21:08:46 +00:00
Sander van der Burg
117988bb01 Added KDE 4.3 packages
svn path=/nixpkgs/trunk/; revision=17034
2009-09-10 20:06:57 +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
Marc Weber
09920037c0 adding mplayer trunk cause the stable source distribution is said to be
outdated

svn path=/nixpkgs/trunk/; revision=17030
2009-09-10 16:58:02 +00:00
Marc Weber
b441632f92 timidity: fix instruments also adding jack and default alsa backend
svn path=/nixpkgs/trunk/; revision=17029
2009-09-10 16:57:58 +00:00
Marc Weber
3201717bdb adding lilypond
svn path=/nixpkgs/trunk/; revision=17028
2009-09-10 16:57:56 +00:00
Marc Weber
21b7f04330 adding halevt
svn path=/nixpkgs/trunk/; revision=17027
2009-09-10 16:57:53 +00:00
Marc Weber
5d39e92acc adding boolstuff
svn path=/nixpkgs/trunk/; revision=17026
2009-09-10 16:57:50 +00:00
Marc Weber
059b19e693 rxvt-unicode: add optional perl support (I'm keen on tabs and the search feature)
svn path=/nixpkgs/trunk/; revision=17025
2009-09-10 16:57:47 +00:00
Marc Weber
2f91d73018 adding texitohtml (dependency of lilypond)
svn path=/nixpkgs/trunk/; revision=17023
2009-09-10 16:57:42 +00:00
Marc Weber
dab5d6463f Adding partition manager. It builds. But it waits forever on some devices?
So maybe just use gparted..

svn path=/nixpkgs/trunk/; revision=17021
2009-09-10 16:57:34 +00:00
Marc Weber
74c5a4d9d9 adding jigdo-lite
svn path=/nixpkgs/trunk/; revision=17020
2009-09-10 16:57:31 +00:00
Marc Weber
50ccc55d62 removing qtparted. It didn't compile. No updates since 2005
svn path=/nixpkgs/trunk/; revision=17017
2009-09-10 16:57:24 +00:00
Marc Weber
7a9b9e74a5 adding gparted. qparted is no longer maintained (?)
svn path=/nixpkgs/trunk/; revision=17016
2009-09-10 16:57:21 +00:00
Marc Weber
f55148cf88 fix avrlibcgcc
svn path=/nixpkgs/trunk/; revision=17015
2009-09-10 16:57:06 +00:00
Sander van der Burg
51e0549398 - Added oxygen icons, which are mandatory for KDE 4.3
- Updated DJVU libre to 3.5.22
- Updated KDE graphics, artwork, games to 4.3.1
- Poppler Qt4 backend now uses QT-4.5.x


svn path=/nixpkgs/trunk/; revision=17006
2009-09-10 13:04:14 +00:00
Eelco Dolstra
580096378b * Fixed the Wacom package (version 0.8.4 has disappeared).
svn path=/nixpkgs/trunk/; revision=17003
2009-09-10 12:21:25 +00:00
Andres Löh
dbfe44e6eb Added parseargs.
svn path=/nixpkgs/trunk/; revision=16996
2009-09-09 15:45:27 +00:00
Peter Simons
c5179a098c Updated Gnuplot to version 4.2.5.
* Merged 'gnuplot' and 'gnuplotX' attributes into one that uses (getPkgConfig
   "gnuplot" "x11" false) to determine whether X11 support is desired or not.

 * Added Emacs as a build-time dependency to ensure that Gnuplot's lisp code is
   installed, too.

 * Added optional support for the wxt terminal by means of (getPkgConfig
   "gnuplot" "wxGtk" false).

 * Removed the '-nix' suffix to the package name. The Gnuplot license requires
   a vendor-specific version suffix only in case of modified binary
   distributions. That is not the case here.

svn path=/nixpkgs/trunk/; revision=16992
2009-09-09 09:36:03 +00:00
Sander van der Burg
f931c1ccfe Claimed maintainership of the qt-4.5 package
svn path=/nixpkgs/trunk/; revision=16990
2009-09-08 21:25:08 +00:00
Sander van der Burg
7fa38ea9fa Added XZ package
svn path=/nixpkgs/trunk/; revision=16989
2009-09-08 20:03:37 +00:00
Michael Raskin
edd56d707a Update source updater to support fetchgit; add aufs2 using that method. Unfortunately, AUFS2 seems to require some strict conditions on kernel options and version..
svn path=/nixpkgs/trunk/; revision=16983
2009-09-08 09:35:21 +00:00
Sander van der Burg
9121ae7fb8 Changed to let KDE 4.3 use qt-4.5.x
svn path=/nixpkgs/trunk/; revision=16982
2009-09-08 09:23:45 +00:00
Ludovic Courtès
d185972f22 Add GNU Accounting Utilities.
svn path=/nixpkgs/trunk/; revision=16981
2009-09-08 08:29:40 +00:00
Ludovic Courtès
26bd10a892 lsh: Help `lsh-make-seed' gather more entropy.
svn path=/nixpkgs/trunk/; revision=16978
2009-09-07 13:45:06 +00:00
Rob Vermaas
c0e46e52ba * added postgresql 8.4.0
svn path=/nixpkgs/trunk/; revision=16956
2009-09-04 12:55:03 +00:00
Eelco Dolstra
bf3c2912ab svn path=/nixpkgs/trunk/; revision=16947 2009-09-02 23:04:57 +00:00
Eelco Dolstra
5de6c065d3 * Added scrot, a command-line screen capture utility.
svn path=/nixpkgs/trunk/; revision=16946
2009-09-02 22:56:33 +00:00
Eelco Dolstra
e4428949fe * Build Audacious with XSPF (playlist) support.
svn path=/nixpkgs/trunk/; revision=16935
2009-09-02 16:54:08 +00:00
Eelco Dolstra
c26262e72e * Some cleanup of the Opera expression. It doesn't need the libstdcpp
from GCC 3.3 anymore, GCC 4.x is fine.  So we can use the regular Qt
  3 build.  Also, there don't seem to be any references to Motif
  anymore.

svn path=/nixpkgs/trunk/; revision=16932
2009-09-02 13:24:08 +00:00
Sander van der Burg
c9254649c0 Added Disnix activation scripts package
svn path=/nixpkgs/trunk/; revision=16928
2009-09-02 10:03:45 +00:00
Sander van der Burg
d573d5f621 Upgraded disnix package to SVN revision 16924
svn path=/nixpkgs/trunk/; revision=16927
2009-09-02 09:47:47 +00:00
Eelco Dolstra
f782f14e58 * Factor out an adapter to clean up the build tree.
svn path=/nixpkgs/trunk/; revision=16920
2009-09-02 06:31:13 +00:00
Michael Raskin
3d7152db82 Fix /sbin/ reference. On Linux just replace it with an "ip link" reference
svn path=/nixpkgs/trunk/; revision=16918
2009-09-01 22:42:05 +00:00
Eelco Dolstra
58e6161768 * addCoverageInstrumentation: factor out the code that keeps the build
tree under $out into a separate stdenv adapter named keepBuildTree.
* makeModulesClosure: support building an initrd for a kernel that has
  been compiled with coverage instrumentation.

svn path=/nixpkgs/trunk/; revision=16916
2009-09-01 21:56:46 +00:00
Michael Raskin
043fe38f80 Enable some features in gvpe
svn path=/nixpkgs/trunk/; revision=16915
2009-09-01 21:00:34 +00:00
Michael Raskin
ef6a270501 Adding GVPE - a protected virtual multinode ethernet
svn path=/nixpkgs/trunk/; revision=16913
2009-09-01 20:12:01 +00:00
Ludovic Courtès
b6a12ac090 GraphViz for AutoDia.
svn path=/nixpkgs/trunk/; revision=16912
2009-09-01 14:48:47 +00:00
Ludovic Courtès
62dc1d45f5 Add Inline' and Inline::Java'; fix Autodia.
svn path=/nixpkgs/trunk/; revision=16911
2009-09-01 14:36:10 +00:00
Rob Vermaas
f016a6bcbc * stratego-mode for emacs
svn path=/nixpkgs/trunk/; revision=16910
2009-09-01 14:27:24 +00:00
Ludovic Courtès
0dc8e1418e Add Autodia.
svn path=/nixpkgs/trunk/; revision=16909
2009-09-01 13:59:37 +00:00
Michael Raskin
42027eee24 Reverting the hack
svn path=/nixpkgs/trunk/; revision=16907
2009-09-01 07:56:35 +00:00
Michael Raskin
bdcdfbadea Temporary hack to check whether Hydra actually uses fresh Nix.
svn path=/nixpkgs/trunk/; revision=16906
2009-09-01 07:51:29 +00:00
Eelco Dolstra
61acec5361 * Use makeOverridable for a few packages used in the Subversion
coverage test, and inherit from pkgsOverriden.  This is really
  ugly.  Should think hard about how to do this in a cleaner way.

svn path=/nixpkgs/trunk/; revision=16904
2009-08-31 15:03:31 +00:00
Michael Raskin
11e09ffad1 Adding GlusterFS - a distributed storage system
svn path=/nixpkgs/trunk/; revision=16896
2009-08-31 09:52:01 +00:00
Sander van der Burg
dd25b49bfa Added setuptools as propagated buildInput for Trac
svn path=/nixpkgs/trunk/; revision=16893
2009-08-30 17:28:26 +00:00
Sander van der Burg
f51dd41ff1 Implemented Trac python package and dependencies
svn path=/nixpkgs/trunk/; revision=16892
2009-08-30 13:43:35 +00:00
Eelco Dolstra
0fd5ed507e * A stdenv adapter to build a package with coverage instrumentation.
svn path=/nixpkgs/trunk/; revision=16890
2009-08-28 16:45:56 +00:00
Michael Raskin
3a993e2f8e Fixing typos
svn path=/nixpkgs/trunk/; revision=16887
2009-08-28 07:07:55 +00:00
Michael Raskin
8bdc1503c1 Put the meta-based choice in suspended state to be used automatically when tryEval is available
svn path=/nixpkgs/trunk/; revision=16886
2009-08-28 07:00:40 +00:00
Michael Raskin
3e89d56999 Trying meta-based selection again
svn path=/nixpkgs/trunk/; revision=16885
2009-08-28 06:57:08 +00:00
Michael Raskin
d0443c07fc Temporarily removing by-meta build and updating Nix..
svn path=/nixpkgs/trunk/; revision=16884
2009-08-28 06:37:05 +00:00
Michael Raskin
d109e4cd95 Trying to reinstate the meta-based Hydra builds
svn path=/nixpkgs/trunk/; revision=16883
2009-08-28 06:29:21 +00:00
Marc Weber
08d98a9972 Revert "mod-python unfinished"
reverting -r 16808 (unfinished mod_python). Sth working does already exist

svn path=/nixpkgs/trunk/; revision=16882
2009-08-27 23:46:15 +00:00
Marc Weber
8ff2647169 adding gutenprint (former gimp-print) and gutenprintBin. I still haven't
found the source of the binary package containing the .ppd files
Still impure but works. See comment.

svn path=/nixpkgs/trunk/; revision=16881
2009-08-27 23:32:13 +00:00
Marc Weber
bc8a85288d cups-bjnp driver
svn path=/nixpkgs/trunk/; revision=16880
2009-08-27 23:32:10 +00:00
Michael Raskin
a1ea759dd9 Adding libev - an even loop library remotely similar to libevent
svn path=/nixpkgs/trunk/; revision=16877
2009-08-27 07:17:57 +00:00
Andres Löh
39b651fb44 Added scion.
svn path=/nixpkgs/trunk/; revision=16876
2009-08-27 07:01:48 +00:00
Andres Löh
543483d99f Added mkcabal.
svn path=/nixpkgs/trunk/; revision=16875
2009-08-27 06:35:17 +00:00
Eelco Dolstra
d22e36efe0 * Grrrr... I should go home.
svn path=/nixpkgs/trunk/; revision=16874
2009-08-26 17:36:41 +00:00
Eelco Dolstra
978b1ce09d * Oop.s
svn path=/nixpkgs/trunk/; revision=16873
2009-08-26 17:32:41 +00:00
Eelco Dolstra
179c8c9ae6 * Disable for now.
svn path=/nixpkgs/trunk/; revision=16872
2009-08-26 17:23:23 +00:00
Eelco Dolstra
ca13d6918e * As predicted, returning {} if a package isn't supported on a
platform won't work: nix-env -qa barfs with "error: cannot coerce an
  attribute set (except a derivation) to a string".  So throw an error
  instead.  Anyway, condPackage/platformPackage doesn't belong in
  all-packages.nix (it should be specified in the package itself).

svn path=/nixpkgs/trunk/; revision=16870
2009-08-26 17:14:08 +00:00
Eelco Dolstra
5977d741b8 svn path=/nixpkgs/trunk/; revision=16869 2009-08-26 17:09:02 +00:00
Eelco Dolstra
9358ffa39c * Get rid of some old Compiz versions.
svn path=/nixpkgs/trunk/; revision=16868
2009-08-26 17:04:15 +00:00
Michael Raskin
f16657b14f Adding monit monitoring tool; in the course of action creating a script to auto-prepare basic autoupdate layout
svn path=/nixpkgs/trunk/; revision=16863
2009-08-26 16:22:20 +00:00
Eelco Dolstra
24487fa73e * Allow the Nixpkgs config to be passed as a function argument (rather
than through ~/.nixpkgs/config.nix or $NIXPKGS_CONFIG).

svn path=/nixpkgs/trunk/; revision=16861
2009-08-26 13:51:37 +00:00
Michael Raskin
fbea8a558a Adding WebDruid log analyzer. In the same time, reworking source autoupdate system a bit
svn path=/nixpkgs/trunk/; revision=16859
2009-08-26 11:13:36 +00:00
Michael Raskin
9e58814536 Changing CLisp, FPC to new style of adding to hydra
svn path=/nixpkgs/trunk/; revision=16855
2009-08-25 09:00:19 +00:00
Michael Raskin
9e928bb1e9 Adding eProver to buildfarm via maintanership
svn path=/nixpkgs/trunk/; revision=16854
2009-08-25 08:28:08 +00:00
Michael Raskin
e6b1990f24 The trick to increase reliability does not work
svn path=/nixpkgs/trunk/; revision=16853
2009-08-25 06:53:43 +00:00
Michael Raskin
426c46cd97 Forgot to mark Google Earth
svn path=/nixpkgs/trunk/; revision=16852
2009-08-25 06:45:31 +00:00
Michael Raskin
88ae620570 Fix syntax error after the marking up
svn path=/nixpkgs/trunk/; revision=16851
2009-08-25 06:40:26 +00:00
Michael Raskin
8baf01155b Attempt to mark up packages with platform assertions
svn path=/nixpkgs/trunk/; revision=16850
2009-08-25 06:36:05 +00:00
Michael Raskin
62cd2b2247 Folding@Home also has platform assertions.
svn path=/nixpkgs/trunk/; revision=16849
2009-08-25 06:18:29 +00:00
Michael Raskin
031c6275fd Flash player also has assertions..
svn path=/nixpkgs/trunk/; revision=16848
2009-08-25 06:11:22 +00:00
Michael Raskin
0c294c4827 My way of testing packages was wrong..
svn path=/nixpkgs/trunk/; revision=16847
2009-08-25 06:07:42 +00:00
Michael Raskin
3b5b31afed Hopefully that should a) work b) not break things when it does not work
svn path=/nixpkgs/trunk/; revision=16846
2009-08-25 06:04:13 +00:00
Michael Raskin
585e52c406 Temporarily roll back the change until I check evaluation in more cases
svn path=/nixpkgs/trunk/; revision=16845
2009-08-25 05:50:42 +00:00
Michael Raskin
feed5f087f Try selecting packages to build based on their being maintained
svn path=/nixpkgs/trunk/; revision=16844
2009-08-25 05:46:48 +00:00
Michael Raskin
4ba8f74591 Adding Gphoto2FS - filesystem for attached cameras
svn path=/nixpkgs/trunk/; revision=16841
2009-08-24 21:35:45 +00:00
Michael Raskin
85849fdfdd Roll back to older WebKit anyway pending a GTK update
svn path=/nixpkgs/trunk/; revision=16836
2009-08-24 18:22:58 +00:00
Michael Raskin
c4b524f2fa Removing midori from hydra; currently I see no easy solution without GTK rebuild
svn path=/nixpkgs/trunk/; revision=16833
2009-08-24 14:24:47 +00:00
Michael Raskin
bdf2bb0bf5 Fix uzbl build, although in a bit hacky way
svn path=/nixpkgs/trunk/; revision=16832
2009-08-24 13:05:19 +00:00
Michael Raskin
e0bfd8d7e7 Use fresher libsoup in GStreamer
svn path=/nixpkgs/trunk/; revision=16830
2009-08-24 09:40:18 +00:00
Michael Raskin
6496dbbbc5 Correctly pass libsoup_git_head to webkit and packages using it
svn path=/nixpkgs/trunk/; revision=16822
2009-08-24 05:23:27 +00:00
Michael Raskin
8e85ed36fb Update WebKit to latest and use Git checkout for libsoup
svn path=/nixpkgs/trunk/; revision=16820
2009-08-24 04:55:55 +00:00
Michael Raskin
5a6e313abf Add an automated updater script and definitions for its use for WebKit
svn path=/nixpkgs/trunk/; revision=16816
2009-08-23 22:10:08 +00:00
Marc Weber
024d1b7851 fix compiz-0.6. Now nix-env -q \* should work again.
svn path=/nixpkgs/trunk/; revision=16811
2009-08-22 14:50:18 +00:00
Marc Weber
84e5a94257 making compiz compile again. builderDefsPackage is used now
svn path=/nixpkgs/trunk/; revision=16809
2009-08-22 09:33:38 +00:00
Marc Weber
159eebd808 mod-python unfinished
svn path=/nixpkgs/trunk/; revision=16808
2009-08-22 09:33:35 +00:00
Ludovic Courtès
4ad3ea4107 Add GNU MyServer.
svn path=/nixpkgs/trunk/; revision=16801
2009-08-21 10:20:40 +00:00
Marc Weber
79038a2038 build ruby with gdbm support
svn path=/nixpkgs/trunk/; revision=16789
2009-08-20 20:19:01 +00:00
Marc Weber
e7dc062579 adding xapian and xapian-bindings
svn path=/nixpkgs/trunk/; revision=16788
2009-08-20 20:18:58 +00:00
Lluís Batlle i Rossell
c06da1dce7 Adding netkit tftp client and server.
svn path=/nixpkgs/trunk/; revision=16780
2009-08-19 20:19:27 +00:00
Lluís Batlle i Rossell
f474284147 Adding the xinetd package.
svn path=/nixpkgs/trunk/; revision=16779
2009-08-19 20:19:17 +00:00
Michael Raskin
a194af141b Fix GConf from Gnome 2.26
svn path=/nixpkgs/trunk/; revision=16751
2009-08-17 18:31:42 +00:00
Eelco Dolstra
c6abacdebf svn path=/nixpkgs/trunk/; revision=16748 2009-08-17 13:12:16 +00:00
Eelco Dolstra
99995d01a9 svn path=/nixpkgs/trunk/; revision=16746 2009-08-17 02:04:45 +00:00
Eelco Dolstra
c2c7c18316 * dbus: get the configuration from /etc/dbus-1. It's purer to use a
command-line argument when starting the system bus daemon, but
  unfortunately dbus-daemon-launch-helper is started with an empty
  environment and no way to override the compile-time location of the
  configuration file.

  I've made a temporary copy of dbus since lots of things depend on it
  and I don't want a big recompile.

svn path=/nixpkgs/trunk/; revision=16735
2009-08-16 21:44:07 +00:00
Sander van der Burg
9b32ae7ce3 - Started my initial KDE 4.3.x expression which is a fork of the KDE 4.2.x expression
- Also forked the qt-4.4.x expression and adapted it. The old qt-4.4.x cannot be replaced since KDE 4.2.x does not work with qt-4.5.x, but on the other hand KDE 4.3.x requires qt-4.5.x
- It is now possible to disable the demos and examples in the qt-4.5.x build. By default, the demos, examples and documentation are disabled


svn path=/nixpkgs/trunk/; revision=16723
2009-08-15 14:02:49 +00:00
Eelco Dolstra
8f3bb9b4cb * ConsoleKit -> console-kit. Build against policy-kit.
svn path=/nixpkgs/trunk/; revision=16722
2009-08-14 21:28:44 +00:00
Eelco Dolstra
9ea1a49aa2 * PolicyKit -> policy-kit (suggested by Ludovic).
* Oops, there already was a polkit package.  Mea culpa...

svn path=/nixpkgs/trunk/; revision=16721
2009-08-14 21:12:46 +00:00
Andres Löh
0e14f884d3 Added HGL.
svn path=/nixpkgs/trunk/; revision=16715
2009-08-14 08:02:57 +00:00
Michael Raskin
fcab7941bb Update RelFS dependencies
svn path=/nixpkgs/trunk/; revision=16710
2009-08-14 06:32:18 +00:00
Michael Raskin
7ffff9d558 Adding ACL2.
ACL2 = A Computational Logic for Applicative Common Lisp. It is 
a Lisp sublanguage and a correctness prover for it.

svn path=/nixpkgs/trunk/; revision=16708
2009-08-13 14:32:52 +00:00
Andres Löh
3194a76689 Added LambdaHack package.
svn path=/nixpkgs/trunk/; revision=16706
2009-08-13 13:23:01 +00:00
Eelco Dolstra
714555bb81 * Added PolicyKit and eggdbus. There is a newer version of PolicyKit
(0.93), but it doesn't compile with the current glib.

svn path=/nixpkgs/trunk/; revision=16704
2009-08-13 07:55:11 +00:00
Michael Raskin
374c8b7e70 Add a few more jobs to buildfarm
svn path=/nixpkgs/trunk/; revision=16703
2009-08-13 05:38:33 +00:00
Andres Löh
738b44d9d2 Some Haskell package updates.
svn path=/nixpkgs/trunk/; revision=16702
2009-08-12 15:28:47 +00:00
Eelco Dolstra
211b4d9292 * Added Text::Table.
svn path=/nixpkgs/trunk/; revision=16698
2009-08-12 13:31:07 +00:00
Eelco Dolstra
0f9dec17c7 svn path=/nixpkgs/trunk/; revision=16696 2009-08-12 10:39:49 +00:00
Eelco Dolstra
bbf64219b4 * More e2fsprogs -> libuuid.
svn path=/nixpkgs/trunk/; revision=16695
2009-08-11 22:29:03 +00:00
Eelco Dolstra
130b060d90 * GNU parted: e2fsprogs -> libuuid.
svn path=/nixpkgs/trunk/; revision=16694
2009-08-11 22:23:30 +00:00
Eelco Dolstra
a63c9c8e71 * hal: updated to 0.5.13.
* hal-info: updated to 20090716.

svn path=/nixpkgs/trunk/; revision=16686
2009-08-11 21:03:53 +00:00
Eelco Dolstra
d66fd6e36b svn path=/nixpkgs/trunk/; revision=16685 2009-08-11 21:01:20 +00:00
Eelco Dolstra
6f70fd1c6b * util-linux-ng: updated to 2.16. Don't build a separate mount
anymore since the build process was very hacky.  Instead
  mount/umount looks for mount helpers in
  /var/run/current-system/sw/sbin.  It would be better to use an
  environment variable, but that would be risky if mount is setuid
  root.
* e2fsprogs: updated to 1.41.8.  Don't build libuuid, libblkid
  etc. anymore, since they have been moved to util-linux-ng.
* nfs-utils: updated to 1.2.0.

svn path=/nixpkgs/trunk/; revision=16682
2009-08-11 20:57:29 +00:00
Eelco Dolstra
c2737e315a * usbutils updated to 0.84.
* usb.ids updated to the latest version.

svn path=/nixpkgs/trunk/; revision=16681
2009-08-11 20:48:56 +00:00
Eelco Dolstra
4d7e5187d8 * xine-lib: updated to 1.1.16.3.
* xine-lib: dropped the dependency on SDL, which is not really
  necessary.  (And it caused Phonon/KDE to depend on SDL.)

svn path=/nixpkgs/trunk/; revision=16680
2009-08-11 20:47:33 +00:00
Eelco Dolstra
6e4a53de74 * dmidecode 2.10.
svn path=/nixpkgs/trunk/; revision=16678
2009-08-11 20:43:39 +00:00
Ludovic Courtès
054c8237e7 Tahoe 1.5.0.
svn path=/nixpkgs/trunk/; revision=16666
2009-08-11 08:11:13 +00:00
Ludovic Courtès
5cd915c6eb pycryptopp 0.5.15.
svn path=/nixpkgs/trunk/; revision=16665
2009-08-11 07:55:18 +00:00
Andres Löh
92f8b3767f Version bump for leksah.
svn path=/nixpkgs/trunk/; revision=16642
2009-08-10 12:43:30 +00:00
Michael Raskin
9d7600ccf5 Oops, libsigsegv-2.5 was not a builderDefs expression
svn path=/nixpkgs/trunk/; revision=16633
2009-08-10 05:50:42 +00:00
Michael Raskin
2ef1fe1b5b Restore libsigsegv-2.5 and fix clisp-2.44.1 build for bootstrapping needs
svn path=/nixpkgs/trunk/; revision=16632
2009-08-10 05:20:14 +00:00
Michael Raskin
c5b0f1e2f7 Check using fresh CLisp for SBCL bootstrap
svn path=/nixpkgs/trunk/; revision=16629
2009-08-09 22:42:35 +00:00
Ludovic Courtès
c1a05331f3 GNU libsigsegv 2.7.
svn path=/nixpkgs/trunk/; revision=16627
2009-08-09 22:24:05 +00:00
Ludovic Courtès
c3943258ce Add GNU fdisk.
svn path=/nixpkgs/trunk/; revision=16626
2009-08-09 22:15:40 +00:00
Michael Raskin
a42b80d221 Adding OpenLieroX
svn path=/nixpkgs/trunk/; revision=16617
2009-08-08 18:18:33 +00:00