Commit graph

17269 commits

Author SHA1 Message Date
Lluís Batlle i Rossell 9dca11bc33 Updating tmux to 1.5. Patch sent to nix-dev by Phil Hagelberg.
svn path=/nixpkgs/trunk/; revision=31463
2012-01-10 09:43:46 +00:00
Rob Vermaas 080c0b2f38 prefer local builds for fetchhg
svn path=/nixpkgs/trunk/; revision=31462
2012-01-10 06:41:44 +00:00
Yury G. Kudryashov 8b66ae590f kde48.kdelibs: use kerberos
svn path=/nixpkgs/trunk/; revision=31461
2012-01-09 23:44:48 +00:00
Yury G. Kudryashov 3a83df3438 conky-1.8.1, fix FTBFS
svn path=/nixpkgs/trunk/; revision=31460
2012-01-09 23:44:44 +00:00
Yury G. Kudryashov 2b50deaafc svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31459
2012-01-09 17:58:22 +00:00
Yury G. Kudryashov 4a11f058e4 update darktable, apply upstream libpng-15 patch
svn path=/nixpkgs/trunk/; revision=31458
2012-01-09 17:55:31 +00:00
Yury G. Kudryashov 7d018a5bc0 xine-ui: use libpng-1.2
svn path=/nixpkgs/branches/libpng15/; revision=31455
2012-01-09 12:48:45 +00:00
Peter Simons 83ed01cc12 haskell-zlib-bindings: updated to version 0.0.2
svn path=/nixpkgs/trunk/; revision=31454
2012-01-09 10:42:38 +00:00
Peter Simons 526f4172c2 haskell-skein: updated to version 0.1.0.4
svn path=/nixpkgs/trunk/; revision=31453
2012-01-09 10:42:34 +00:00
Yury G. Kudryashov 9e269f7e5e svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31452
2012-01-09 10:30:13 +00:00
Yury G. Kudryashov f4a079a76c Upgrade xine-lib and xine-ui
svn path=/nixpkgs/trunk/; revision=31451
2012-01-09 10:25:56 +00:00
Yury G. Kudryashov ff5134f8b0 Add lirc
svn path=/nixpkgs/trunk/; revision=31450
2012-01-09 10:25:49 +00:00
Yury G. Kudryashov c80ed42cf1 Add GNU vcdimager
svn path=/nixpkgs/trunk/; revision=31449
2012-01-09 10:25:42 +00:00
Yury G. Kudryashov 365e05f7ce svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31448
2012-01-08 23:33:18 +00:00
Yury G. Kudryashov c403364c06 xmoto-0.5.9+libpng-1.5 patch
svn path=/nixpkgs/trunk/; revision=31447
2012-01-08 23:31:31 +00:00
Cillian de Roiste d9d74208b5 Adding dvswitch: a digital video mixer intended for interactive live mixing of several incoming DV video streams, typically used for recording conferences
svn path=/nixpkgs/trunk/; revision=31446
2012-01-08 23:27:45 +00:00
Yury G. Kudryashov de228351cd slim needs libpng-1.2.x
svn path=/nixpkgs/branches/libpng15/; revision=31445
2012-01-08 21:33:55 +00:00
Yury G. Kudryashov e275cb515c Pass libpng12 to qt-4.6
svn path=/nixpkgs/branches/libpng15/; revision=31444
2012-01-08 21:26:12 +00:00
Yury G. Kudryashov 786a5c083f games/six: add meta.platforms to see if it compiles
svn path=/nixpkgs/trunk/; revision=31443
2012-01-08 20:58:04 +00:00
Yury G. Kudryashov de82ba69f8 kde4.basket works. Remove kde3.kbasket
svn path=/nixpkgs/trunk/; revision=31442
2012-01-08 20:57:55 +00:00
Yury G. Kudryashov af58b6ec5f Pass libpng12 to qt3 and kdelibs3
svn path=/nixpkgs/branches/libpng15/; revision=31441
2012-01-08 20:51:49 +00:00
Yury G. Kudryashov 2ebcb95219 Restore libpng-1.2.x
svn path=/nixpkgs/branches/libpng15/; revision=31440
2012-01-08 19:50:06 +00:00
Yury G. Kudryashov e957de48b8 libpng-1.5.7
svn path=/nixpkgs/branches/libpng15/; revision=31439
2012-01-08 19:49:56 +00:00
Yury G. Kudryashov a398e2a401 Add skrooge
svn path=/nixpkgs/trunk/; revision=31438
2012-01-08 19:29:28 +00:00
Yury G. Kudryashov 532930a55f kmymoney-4.6.1
No aqbanking nor gwenhywfar since aqbanking FTBFS

svn path=/nixpkgs/trunk/; revision=31437
2012-01-08 19:29:17 +00:00
Yury G. Kudryashov 7e66541ce8 Add bunch of kmymoney-4.6.1 dependencies
svn path=/nixpkgs/trunk/; revision=31436
2012-01-08 19:29:07 +00:00
Peter Simons 827479dc80 htop: updated to version 1.0
svn path=/nixpkgs/trunk/; revision=31435
2012-01-08 16:29:57 +00:00
Ludovic Courtès bfd6c7fa3e GNU Automake 1.11.x: Disable tests on FreeBSD.
svn path=/nixpkgs/trunk/; revision=31433
2012-01-08 15:41:17 +00:00
Peter Simons 65715f2e98 all-packages.nix: let 'python3' refer to the latest version, python 3.2
svn path=/nixpkgs/trunk/; revision=31432
2012-01-08 14:43:21 +00:00
Peter Simons 2c7ac76079 unclutter: X cursor management tool
Unclutter hides your X mouse cursor when you do not need it, to prevent
it from getting in the way. You have only to move the mouse to restore
the mouse cursor. Unclutter is very usefull in tiling wm's where you do
not need the mouse often.

Just run it from your .bash_profile like that:

	unclutter -idle 1 &

svn path=/nixpkgs/trunk/; revision=31431
2012-01-08 14:01:17 +00:00
Yury G. Kudryashov ca28f8ce31 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31430
2012-01-07 22:43:23 +00:00
Michael Raskin 47288a2224 Stop using ESound for space-orbit
svn path=/nixpkgs/trunk/; revision=31429
2012-01-07 21:59:16 +00:00
Michael Raskin 55f39a3aff Stop using Esound
svn path=/nixpkgs/trunk/; revision=31428
2012-01-07 21:58:20 +00:00
Peter Simons d85921798b haskell-hakyll: updated to version 3.2.4.0
svn path=/nixpkgs/trunk/; revision=31427
2012-01-07 21:51:36 +00:00
Peter Simons 2da358e6f4 haskell-conduit: updated to version 0.0.1.1
svn path=/nixpkgs/trunk/; revision=31426
2012-01-07 21:51:32 +00:00
Yury G. Kudryashov edd651131b Revert "polkit-0.104"
This reverts revision 31411

polkit-0.104 depends on glib-2.30, so this upgrade goes to branches/glib-2.30

svn path=/nixpkgs/trunk/; revision=31423
2012-01-07 20:29:08 +00:00
Yury G. Kudryashov a7f52f0fd0 xxdiff-4.0 beta (Qt4-based)
svn path=/nixpkgs/trunk/; revision=31422
2012-01-07 20:23:35 +00:00
Yury G. Kudryashov 3b672f9b75 (lib)gphoto-2.4.11
svn path=/nixpkgs/trunk/; revision=31412
2012-01-07 19:41:59 +00:00
Yury G. Kudryashov b4c7de3b7e polkit-0.104
svn path=/nixpkgs/trunk/; revision=31411
2012-01-07 19:41:52 +00:00
Yury G. Kudryashov f1c3a0f83c pam_usb-0.5.0; still depend on HAL
svn path=/nixpkgs/trunk/; revision=31410
2012-01-07 19:16:52 +00:00
Yury G. Kudryashov f4cfdb0619 pmount: disable HAL
pmount failed to find HAL for a long time, and nobody cared. So, I've just
removed it.
Also configure does not recognize "--with-cryptsetup", so I've removed it as
well.

svn path=/nixpkgs/trunk/; revision=31409
2012-01-07 19:16:45 +00:00
Yury G. Kudryashov cd6824cb9f -kde3.kuickshow, +kde4.kuickshow
svn path=/nixpkgs/trunk/; revision=31407
2012-01-07 17:06:57 +00:00
Yury G. Kudryashov 7e320a7043 State qt version (3/4) in packages, not in all-packages.nix
svn path=/nixpkgs/trunk/; revision=31406
2012-01-07 17:06:49 +00:00
Lluís Batlle i Rossell d126fe5806 Making fbtermStdenv both crossbuild and natively build. It failed to build without overriden patches.
svn path=/nixpkgs/trunk/; revision=31405
2012-01-07 16:11:20 +00:00
Yury G. Kudryashov a3f507892a Add gnome2.libgnome_keyring
svn path=/nixpkgs/trunk/; revision=31404
2012-01-07 15:31:36 +00:00
Yury G. Kudryashov 50dab98373 gnome2.gnome_vfs: disable HAL, enable ACL
svn path=/nixpkgs/trunk/; revision=31403
2012-01-07 15:31:31 +00:00
Yury G. Kudryashov b81dda6f0a phonon-backend-vlc: use callPackage
svn path=/nixpkgs/trunk/; revision=31402
2012-01-07 15:31:27 +00:00
Alexander Tsamutali 69c91f30ce applications/virtualization/qemu: Added 0.15.nix
svn path=/nixpkgs/trunk/; revision=31401
2012-01-07 15:06:49 +00:00
Lluís Batlle i Rossell d1807a7b9b Making fbida cross-build.
svn path=/nixpkgs/trunk/; revision=31400
2012-01-07 15:03:56 +00:00
Lluís Batlle i Rossell 80717672b4 Updating fbterm.
svn path=/nixpkgs/trunk/; revision=31399
2012-01-07 14:41:04 +00:00
Karn Kallio 4ae99c2e02 atkmm build was failing.
svn path=/nixpkgs/trunk/; revision=31398
2012-01-07 13:31:06 +00:00
Karn Kallio f94927717c Fix failing pangomm build.
svn path=/nixpkgs/trunk/; revision=31397
2012-01-07 13:19:13 +00:00
Karn Kallio 53d6a7b1ba Openoffice.org does not build with libwpd 0.9.
svn path=/nixpkgs/trunk/; revision=31396
2012-01-07 13:19:06 +00:00
Yury G. Kudryashov a5d1d871d7 libdbusmenu-qt: meta
svn path=/nixpkgs/trunk/; revision=31394
2012-01-07 09:50:53 +00:00
Lluís Batlle i Rossell d391d56f97 Setting the nanonote uboot to load 4MiB, and not 2MiB. My last 2.6.37 kernel
has more than 2MiB.


svn path=/nixpkgs/trunk/; revision=31393
2012-01-07 09:20:16 +00:00
Yury G. Kudryashov 12e5f5b070 Build gdk-pixbuf-xlib
svn path=/nixpkgs/trunk/; revision=31392
2012-01-07 00:27:17 +00:00
Yury G. Kudryashov 735de44b72 KDE SC 4.8: latest unstable akonadi
svn path=/nixpkgs/trunk/; revision=31391
2012-01-07 00:10:22 +00:00
Yury G. Kudryashov c3f7619999 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31390
2012-01-07 00:07:41 +00:00
Yury G. Kudryashov 1f0c154676 Make test-eval-release happy
svn path=/nixpkgs/trunk/; revision=31389
2012-01-07 00:02:36 +00:00
Yury G. Kudryashov 50de8e181f Fix kde48.kdelibs evaluation error
Will write kactivities.nix when hydra will build kde48.kdelibs

svn path=/nixpkgs/trunk/; revision=31388
2012-01-07 00:02:28 +00:00
Yury G. Kudryashov d4509553e6 Fix oxygen-icons outputHash
svn path=/nixpkgs/trunk/; revision=31387
2012-01-07 00:02:23 +00:00
Yury G. Kudryashov 3ce77ab9c4 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31386
2012-01-06 23:08:30 +00:00
Yury G. Kudryashov 1401241864 qrencode-3.2.0
Remove builderDefs magic, add meta

Cherry-pick r31382 from branches/libpng15

svn path=/nixpkgs/trunk/; revision=31385
2012-01-06 23:05:11 +00:00
Yury G. Kudryashov cfc9de7311 KDE SC 4.8 RC2
(Semi-)automatic updates

svn path=/nixpkgs/trunk/; revision=31384
2012-01-06 23:03:43 +00:00
Yury G. Kudryashov 8ba7a53129 gtk-2.x libs patchlevel upgrades
svn path=/nixpkgs/trunk/; revision=31383
2012-01-06 23:03:37 +00:00
Yury G. Kudryashov 26ea77ad65 qrencode-3.2.0
Remove builderDefs magic, add meta

svn path=/nixpkgs/branches/libpng15/; revision=31382
2012-01-06 23:01:44 +00:00
Lluís Batlle i Rossell 3e1ee548ba Make mtdtools crossbuild.
svn path=/nixpkgs/trunk/; revision=31381
2012-01-06 22:42:10 +00:00
Yury G. Kudryashov b9c72433cc Copy kde-4.7->kde-4.8
svn path=/nixpkgs/trunk/; revision=31380
2012-01-06 21:50:10 +00:00
Lluís Batlle i Rossell 11f55d273b I found that instantiating xbursttools brought to the openssl evaluation
throwing an exception about an undefined platform.openssl.system.

That was introduced by r31330, which made openssl for the build system to
evaluate the platform.openssl.system, that should only be needed for the host
system.

I also revert supplying openssl.system for xbursttools.


svn path=/nixpkgs/trunk/; revision=31379
2012-01-06 21:31:29 +00:00
Lluís Batlle i Rossell 54aa31cca3 Updating the cross-build of elfutils so the perf for 2.6.37 builds too. (again, nanonote)
svn path=/nixpkgs/trunk/; revision=31378
2012-01-06 21:10:19 +00:00
Lluís Batlle i Rossell 01c5028c7c Updating xburst-tools (blind commit, I did not try to build them)
svn path=/nixpkgs/trunk/; revision=31377
2012-01-06 21:06:22 +00:00
Yury G. Kudryashov 6df3e4e928 Add cantarell-fonts, part of GNOME-3
svn path=/nixpkgs/trunk/; revision=31375
2012-01-06 20:10:23 +00:00
Yury G. Kudryashov b2aac0e831 libgsf-1.14.22
svn path=/nixpkgs/trunk/; revision=31374
2012-01-06 20:10:15 +00:00
Yury G. Kudryashov a6288f1701 gnome3.gnome-user-docs
svn path=/nixpkgs/trunk/; revision=31373
2012-01-06 20:09:54 +00:00
Yury G. Kudryashov 9d03e96caa Add itstool
svn path=/nixpkgs/trunk/; revision=31372
2012-01-06 20:09:39 +00:00
Lluís Batlle i Rossell 29e69f119d Making perf cross-build again, now with manpages.
svn path=/nixpkgs/trunk/; revision=31371
2012-01-06 19:35:12 +00:00
Yury G. Kudryashov cee470de5a Remove gtk+-2.16
svn path=/nixpkgs/trunk/; revision=31370
2012-01-06 19:02:07 +00:00
Yury G. Kudryashov 206d17c17f Remove wxGTK-2.6
svn path=/nixpkgs/trunk/; revision=31369
2012-01-06 19:01:56 +00:00
Yury G. Kudryashov d7049d1c08 Add gnome3.gtk2
svn path=/nixpkgs/trunk/; revision=31368
2012-01-06 18:54:10 +00:00
Yury G. Kudryashov a9dc08d887 Add meta to many GNOME3 packages
svn path=/nixpkgs/trunk/; revision=31367
2012-01-06 18:54:02 +00:00
Yury G. Kudryashov 80480acf78 Remove TODO.txt
svn path=/nixpkgs/trunk/; revision=31366
2012-01-06 18:53:52 +00:00
Cillian de Roiste 9686b7def6 Adding a single expression to provide all ralink firmware, if there are no objections this could replace all the rt* firmware expressions
svn path=/nixpkgs/trunk/; revision=31365
2012-01-06 18:42:39 +00:00
Peter Simons d7edd1e22c haskell-epic: updated to version 0.9.2
svn path=/nixpkgs/trunk/; revision=31364
2012-01-06 18:41:23 +00:00
Yury G. Kudryashov af347062d0 Add gnome3.clutter
svn path=/nixpkgs/trunk/; revision=31363
2012-01-06 18:13:51 +00:00
Yury G. Kudryashov 69f2dfe7da cogl-1.8.2
svn path=/nixpkgs/trunk/; revision=31362
2012-01-06 18:13:43 +00:00
Yury G. Kudryashov 24448ed3de gnome3.libsoup
svn path=/nixpkgs/trunk/; revision=31361
2012-01-06 18:13:33 +00:00
Yury G. Kudryashov f3923f5b4a Remove some 'rec'
svn path=/nixpkgs/trunk/; revision=31360
2012-01-06 18:13:26 +00:00
Yury G. Kudryashov 265b149db1 Add gnome3.libgnome_keyring
svn path=/nixpkgs/trunk/; revision=31359
2012-01-06 18:13:19 +00:00
Yury G. Kudryashov ac911fce68 Fix XaraLX, add debian-patches.sh
svn path=/nixpkgs/trunk/; revision=31358
2012-01-06 18:13:11 +00:00
Yury G. Kudryashov 5a4b9fc92b gtk-2.x: use atk-2.2.x
svn path=/nixpkgs/trunk/; revision=31357
2012-01-06 18:13:00 +00:00
Yury G. Kudryashov 09060a0a19 Add gnome3.{glib_networking,gsettings_desktop_schemas}
Cherry-pick from stdenv-updates

svn path=/nixpkgs/trunk/; revision=31356
2012-01-06 18:12:38 +00:00
Lluís Batlle i Rossell 75d5ffe7ac Adding perf manual pages.
I copied the docbook inputs from awesome. I don't understand them.


svn path=/nixpkgs/trunk/; revision=31355
2012-01-06 17:45:53 +00:00
Lluís Batlle i Rossell b76352800e Adding slang to perf. It looks like it wants slang too.
svn path=/nixpkgs/trunk/; revision=31354
2012-01-06 17:04:32 +00:00
Lluís Batlle i Rossell cae619da08 Updating elfutils/perf to cross-build. I tested this for the nanonote.
I add newt, checking that it cross-builds too.

I update perf to have newt support, and now it's also finding python, whatever
that means. I've not tested if 'python' as buildInputs is enough.


svn path=/nixpkgs/trunk/; revision=31353
2012-01-06 16:45:14 +00:00
Shea Levy 8c063fdfc7 Fix tarball
svn path=/nixpkgs/trunk/; revision=31352
2012-01-06 16:14:02 +00:00
Shea Levy d788929c64 ledger3: Get building on darwin
svn path=/nixpkgs/trunk/; revision=31351
2012-01-06 15:55:24 +00:00
Shea Levy b884e56aa2 Enable parallel building of ledger 3
svn path=/nixpkgs/trunk/; revision=31350
2012-01-06 15:44:14 +00:00
Ludovic Courtès 81b3aecaec release-cross: Add OpenSSL for cross-GNU builds.
svn path=/nixpkgs/trunk/; revision=31349
2012-01-06 14:07:08 +00:00
Ludovic Courtès 7232a1e33a OpenSSL: Further fix `Configure' for GNU builds.
svn path=/nixpkgs/trunk/; revision=31348
2012-01-06 14:07:02 +00:00
Peter Simons d88a86d8ee haskell-unix-compat: updated to version 0.3.0.1
svn path=/nixpkgs/trunk/; revision=31347
2012-01-06 13:30:08 +00:00
Peter Simons e40df74665 haskell-yesod-core: updated to version 0.9.4.1
svn path=/nixpkgs/trunk/; revision=31346
2012-01-06 13:30:05 +00:00
Peter Simons 671455b8be haskell-maude: updated to version 0.3.0
svn path=/nixpkgs/trunk/; revision=31345
2012-01-06 13:30:02 +00:00
Peter Simons 25995d5fb6 haskell-iteratee: updated to version 0.8.7.6
svn path=/nixpkgs/trunk/; revision=31344
2012-01-06 13:29:59 +00:00
Peter Simons 5667c155bf haskell-http-enumerator: updated to version 0.7.2.3
svn path=/nixpkgs/trunk/; revision=31343
2012-01-06 13:29:57 +00:00
Peter Simons 3dafbad90f haskell-http-conduit: updated to version 1.1.0.1
svn path=/nixpkgs/trunk/; revision=31342
2012-01-06 13:29:53 +00:00
Peter Simons e840fafaf7 haskell-conduit: updated to version 0.0.1
svn path=/nixpkgs/trunk/; revision=31341
2012-01-06 13:29:50 +00:00
Shea Levy 06c29d5ae7 Ledger isn't Linux-specific
svn path=/nixpkgs/trunk/; revision=31338
2012-01-06 05:52:21 +00:00
Yury G. Kudryashov dc9bf79b54 attica-0.3.0
svn path=/nixpkgs/trunk/; revision=31336
2012-01-06 00:55:48 +00:00
Yury G. Kudryashov 53d922475d gtkLibs3x.glib: 2.30.2
svn path=/nixpkgs/trunk/; revision=31335
2012-01-06 00:55:42 +00:00
Yury G. Kudryashov 5a0de50cf5 Add kde4.basket
svn path=/nixpkgs/trunk/; revision=31334
2012-01-06 00:55:30 +00:00
Yury G. Kudryashov 20973a9280 GConf-2.28.1, policykit->polkit
svn path=/nixpkgs/trunk/; revision=31333
2012-01-06 00:55:14 +00:00
Yury G. Kudryashov 6a27a67605 gnome-2/audiofile-0.3.2
svn path=/nixpkgs/trunk/; revision=31331
2012-01-06 00:54:39 +00:00
Ludovic Courtès 3d0f767b91 OpenSSL: Fix compilation on GNU/Hurd.
svn path=/nixpkgs/trunk/; revision=31330
2012-01-05 23:46:17 +00:00
Yury G. Kudryashov ba80f4337f taglib{,-extras}: use buildNativeInputs, meta
svn path=/nixpkgs/trunk/; revision=31329
2012-01-05 23:43:22 +00:00
Yury G. Kudryashov c22e6aadc5 Add mobile-broadband-provider-info
svn path=/nixpkgs/trunk/; revision=31328
2012-01-05 23:25:28 +00:00
Yury G. Kudryashov ce32f3b5db Add meta to qtscriptgenerator
svn path=/nixpkgs/trunk/; revision=31327
2012-01-05 23:16:12 +00:00
Yury G. Kudryashov 18f1e5b594 libgpod-0.8.2
svn path=/nixpkgs/trunk/; revision=31326
2012-01-05 23:16:06 +00:00
Yury G. Kudryashov 49c2aebc3d libimobiledevice-1.0.6
disable swig version check
use libplist.swig

svn path=/nixpkgs/trunk/; revision=31325
2012-01-05 23:16:00 +00:00
Yury G. Kudryashov 2b20492775 libplist: use swig2
libplist compilation with swig1 fails in stdenv-updates

svn path=/nixpkgs/trunk/; revision=31324
2012-01-05 23:15:54 +00:00
Yury G. Kudryashov b00d19d775 elfutils-0.152, pass zlib, bzip2 and xz
svn path=/nixpkgs/trunk/; revision=31323
2012-01-05 23:15:48 +00:00
Yury G. Kudryashov 5925d6d9a7 most: add random meta.platforms
svn path=/nixpkgs/trunk/; revision=31322
2012-01-05 23:15:41 +00:00
Yury G. Kudryashov fcaa6a1abe usbmuxd-1.0.7
svn path=/nixpkgs/trunk/; revision=31321
2012-01-05 23:15:33 +00:00
Yury G. Kudryashov d15e2f70d9 Add swig-2.x
svn path=/nixpkgs/trunk/; revision=31320
2012-01-05 23:15:24 +00:00
Lluís Batlle i Rossell 4c814dd003 Adding linux 'perf' tool.
svn path=/nixpkgs/trunk/; revision=31319
2012-01-05 21:24:51 +00:00
Yury G. Kudryashov f490ef82b8 Pass xz to libwpg
svn path=/nixpkgs/trunk/; revision=31316
2012-01-05 18:05:18 +00:00
Yury G. Kudryashov f84a08bac3 Upgrade libwpd and libwpg to latest versions
svn path=/nixpkgs/trunk/; revision=31313
2012-01-05 17:05:31 +00:00
Florian Friesdorf d149922655 privateer compile succeeds, remove platform, still WIP
svn path=/nixpkgs/trunk/; revision=31312
2012-01-05 12:23:49 +00:00
Yury G. Kudryashov 6ed3147550 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31311
2012-01-05 12:11:18 +00:00
Michael Raskin e048801966 Update chipmunk
svn path=/nixpkgs/trunk/; revision=31310
2012-01-05 11:56:32 +00:00
Michael Raskin da6b6a9332 Update Linux 3.2 to release
svn path=/nixpkgs/trunk/; revision=31306
2012-01-05 07:24:37 +00:00
Florian Friesdorf 68db88bbf8 wip: privateer
svn path=/nixpkgs/trunk/; revision=31305
2012-01-04 23:05:51 +00:00
Florian Friesdorf 2c9461ebdd freeglut-2.8.0
svn path=/nixpkgs/trunk/; revision=31304
2012-01-04 23:05:41 +00:00
Lluís Batlle i Rossell b1ba53e50d Adding vimprobable2. Patch by Alexander Forenmy.
svn path=/nixpkgs/trunk/; revision=31303
2012-01-04 22:12:43 +00:00
Lluís Batlle i Rossell d0321537d9 Updating dwm to 6.0.
svn path=/nixpkgs/trunk/; revision=31301
2012-01-04 22:05:26 +00:00
Lluís Batlle i Rossell 95b42b8134 Updating linux to 2.6.32.52 and 3.1.7
svn path=/nixpkgs/trunk/; revision=31299
2012-01-04 21:34:03 +00:00
Lluís Batlle i Rossell 4b4022a4e0 Add meta for mono.
svn path=/nixpkgs/trunk/; revision=31297
2012-01-04 21:18:50 +00:00
Eelco Dolstra ca73b1fb33 * Resolve a collision between OpenSSL and man-pages
(in ‘share/man/man3/err.3’).

svn path=/nixpkgs/trunk/; revision=31296
2012-01-04 19:48:08 +00:00
Eelco Dolstra 961ad6a314 * rp-pppoe requires a version attribute in ppp.
svn path=/nixpkgs/trunk/; revision=31295
2012-01-04 19:04:09 +00:00
Peter Simons 8869873f10 haskell-random-fu: updated to version 0.2.1.1
svn path=/nixpkgs/trunk/; revision=31294
2012-01-04 17:49:07 +00:00
Peter Simons a227e558ee haskell-numeric-prelude: updated to version 0.3
svn path=/nixpkgs/trunk/; revision=31293
2012-01-04 17:49:04 +00:00
Peter Simons e822279529 haskell-xml-enumerator: updated to version 0.4.4.1
svn path=/nixpkgs/trunk/; revision=31292
2012-01-04 17:49:01 +00:00
Peter Simons 35807a138d haskell-http-enumerator: updated to version 0.7.2.2
svn path=/nixpkgs/trunk/; revision=31291
2012-01-04 17:48:58 +00:00
Peter Simons b515072dbe haskell-http-conduit: updated to version 1.0.0.1
svn path=/nixpkgs/trunk/; revision=31290
2012-01-04 17:48:55 +00:00
Peter Simons 18bf57c213 haskell-haskeline: updated to version 0.6.4.6
svn path=/nixpkgs/trunk/; revision=31289
2012-01-04 17:48:53 +00:00
Peter Simons cde76888f9 haskell-gamma: updated to version 0.9.0.2
svn path=/nixpkgs/trunk/; revision=31288
2012-01-04 17:48:50 +00:00
Peter Simons 9bd85d5cf2 haskell-continued-fractions: updated to version 0.9.1.1
svn path=/nixpkgs/trunk/; revision=31287
2012-01-04 17:48:47 +00:00
Peter Simons 883ae24a70 haskell-conduit: updated to version 0.0.0.2
svn path=/nixpkgs/trunk/; revision=31286
2012-01-04 17:48:44 +00:00
Peter Simons 660701471c Dropped obsolete versions of haskell-primitive and haskell-vector.
svn path=/nixpkgs/trunk/; revision=31285
2012-01-04 17:48:40 +00:00
Peter Simons 2f3cb61b98 haskell-sendfile: updated to version 0.7.4
svn path=/nixpkgs/trunk/; revision=31284
2012-01-04 17:48:36 +00:00
Peter Simons aac6654ed5 haskell-vector: updated to version 0.9.1
svn path=/nixpkgs/trunk/; revision=31283
2012-01-04 17:48:32 +00:00
Alexander Tsamutali 3b4451ade5 games/tremulous: Removed rust.
svn path=/nixpkgs/trunk/; revision=31282
2012-01-04 16:46:25 +00:00
Yury G. Kudryashov 3ca6582874 ppp-2.4.5, a few patches
svn path=/nixpkgs/trunk/; revision=31279
2012-01-04 15:10:27 +00:00
Eelco Dolstra 7fcf771c2a * Handle the attributes added by the multiple outputs branch.
svn path=/nixpkgs/trunk/; revision=31278
2012-01-04 15:06:21 +00:00
Eelco Dolstra 0348f11e22 * DBD::SQLite updated to 1.35.
svn path=/nixpkgs/trunk/; revision=31277
2012-01-04 14:23:41 +00:00
Lluís Batlle i Rossell 25db5f1a9d Adding libgdiplus for mono, and making mono reference it.
svn path=/nixpkgs/trunk/; revision=31276
2012-01-04 13:55:54 +00:00
Lluís Batlle i Rossell 8046598a80 Make gnome panel 2.28 build - it missed libtool as buildInputs.
svn path=/nixpkgs/trunk/; revision=31275
2012-01-04 13:37:54 +00:00
Michael Raskin 07de46c2fa Update E prover
svn path=/nixpkgs/trunk/; revision=31269
2012-01-04 10:31:49 +00:00
Lluís Batlle i Rossell 855e8f45a4 Fixing a typo in the icoutils file.
svn path=/nixpkgs/trunk/; revision=31267
2012-01-04 09:47:22 +00:00
Yury G. Kudryashov bdb01cc707 svn merge /path/to/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31266
2012-01-04 09:45:28 +00:00
Lluís Batlle i Rossell 8fadcd285a Adding icoutils
svn path=/nixpkgs/trunk/; revision=31265
2012-01-04 09:42:38 +00:00
Lluís Batlle i Rossell b15381fcf6 Adding pngtoico.
svn path=/nixpkgs/trunk/; revision=31264
2012-01-04 09:29:52 +00:00
Yury G. Kudryashov b3709689db Add modemmanager
svn path=/nixpkgs/trunk/; revision=31263
2012-01-04 09:05:22 +00:00
Lluís Batlle i Rossell fb0d088b33 Updating mono.
svn path=/nixpkgs/trunk/; revision=31262
2012-01-04 08:14:07 +00:00
Karn Kallio ec8e23cc97 In Emacs site-start.el check that NIX_PROFILES is set.
In the stdenv this is not set, which causes an elisp error
which in turn makes builds depending on Emacs (eg gnuplot) fail.

svn path=/nixpkgs/trunk/; revision=31261
2012-01-04 05:48:38 +00:00
Karn Kallio 0e1ea067ab Cause ghostscript to build libgs.
This fixes the failed build of libspectre.

svn path=/nixpkgs/trunk/; revision=31260
2012-01-04 00:26:48 +00:00
Eelco Dolstra f3c3f11520 * Debian requires/provides should be comma-separated.
svn path=/nixpkgs/trunk/; revision=31259
2012-01-03 22:33:48 +00:00
Eelco Dolstra 032617b0ab * Check whether any packages were generated. Apparently checkinstall
doesn't return a non-zero exit code if something goes wrong.

svn path=/nixpkgs/trunk/; revision=31258
2012-01-03 22:25:46 +00:00
Florian Friesdorf 30752215cd linux_3_2_powertop
svn path=/nixpkgs/trunk/; revision=31257
2012-01-03 22:25:38 +00:00
Cillian de Roiste 35879729d2 Ralink firmware is no longer available directly from ralinktech.com, it is now available from git.kernel.org. I've used the debian svn repo here instead for convenience
svn path=/nixpkgs/trunk/; revision=31256
2012-01-03 22:02:34 +00:00
Lluís Batlle i Rossell d028c7e00d Adding a preliminary package for librecad. It fails to install still.
svn path=/nixpkgs/trunk/; revision=31255
2012-01-03 21:14:14 +00:00
Florian Friesdorf 5a78287adf added myself to maintainers
svn path=/nixpkgs/trunk/; revision=31254
2012-01-03 20:59:00 +00:00
Florian Friesdorf f051f29fbd load-path also for emacs-22 and emacs-snapshot
svn path=/nixpkgs/trunk/; revision=31253
2012-01-03 20:58:57 +00:00
Florian Friesdorf 195ff32a63 set emacs load-path according to NIX_PROFILES via site-start.el
svn path=/nixpkgs/trunk/; revision=31252
2012-01-03 20:58:54 +00:00
Lluís Batlle i Rossell e43bd7c4ce Made lua and task warrior unstable crossbuild fine
svn path=/nixpkgs/trunk/; revision=31251
2012-01-03 19:12:06 +00:00
Yury G. Kudryashov b0f1da6b75 svn merge /path/to/nixpkgstrunk; resolve ghostscript as "theirs-full"
svn path=/nixpkgs/branches/libpng15/; revision=31250
2012-01-03 18:13:10 +00:00
Yury G. Kudryashov 29d613ba0e Add a warning to cmake/default.nix
svn path=/nixpkgs/trunk/; revision=31248
2012-01-03 18:00:02 +00:00
Peter Simons b916544651 Updated GNU ghostscript to version 9.04.1.
- Merged the builder.sh file into the expression itself.

 - Need to force "-lz" flag to fix linker errors. This is probably a bug
   in the build system, so further updates may not need that hack.

 - Need to force "-rpath=${freetype}/lib" flag to fix run-time errors
   because gs can't find the libfreetype.so.6 library. I don't quite
   understand why that path isn't hard-coded to begin with.

svn path=/nixpkgs/trunk/; revision=31247
2012-01-03 17:50:10 +00:00
Eelco Dolstra 5386b47ead * Revert. Cmake is still broken on i686-linux.
svn path=/nixpkgs/trunk/; revision=31244
2012-01-03 17:22:11 +00:00
Yury G. Kudryashov 71c6de7338 cmake-2.8.7
svn path=/nixpkgs/trunk/; revision=31241
2012-01-03 16:38:53 +00:00
Yury G. Kudryashov a988b581a0 Add libkvkontakte
svn path=/nixpkgs/trunk/; revision=31240
2012-01-03 16:15:22 +00:00
Yury G. Kudryashov 53739d23dc Merge trunk
svn path=/nixpkgs/branches/libpng15/; revision=31239
2012-01-03 15:50:39 +00:00
Yury G. Kudryashov 5321904c4e ortp-0.18.0
svn path=/nixpkgs/trunk/; revision=31238
2012-01-03 15:39:05 +00:00
Eelco Dolstra ab13fb0c34 * Firefox updated to 9.0.1.
svn path=/nixpkgs/trunk/; revision=31236
2012-01-03 15:18:03 +00:00
Lluís Batlle i Rossell 22e91e721e Removing references to openssl 1.0.0e
svn path=/nixpkgs/trunk/; revision=31234
2012-01-03 14:32:41 +00:00
Lluís Batlle i Rossell 2833652d5a Moving openssl 1.0.0e.nix to default.nix, as Eelco suggests. The 1.0.0e expression was moremaintained.
When I updated openssl, I didn't know there was such a file.


svn path=/nixpkgs/trunk/; revision=31233
2012-01-03 14:31:11 +00:00
Florian Friesdorf 9e050a9226 iwlwifi-5150-ucode: add Intel 5150 wireless firmware package
Author:    Sergey Mironov <ierton@gmail.com>

svn path=/nixpkgs/trunk/; revision=31232
2012-01-03 14:14:58 +00:00
Yury G. Kudryashov 3af2d4a89e Add kde4.networkmanagement
You still need to start NetworkManager daemon manually to use this widget

svn path=/nixpkgs/trunk/; revision=31229
2012-01-03 13:39:09 +00:00
Yury G. Kudryashov 7fdef7ca0d Merge trunk
svn path=/nixpkgs/branches/libpng15/; revision=31225
2012-01-03 11:39:50 +00:00
Yury G. Kudryashov e785aae6e8 Fix most packages depending on fltk
I failed to build cinepaint

svn path=/nixpkgs/trunk/; revision=31224
2012-01-03 10:32:56 +00:00
Yury G. Kudryashov 046ddeb32a fltk-1.3.0
svn path=/nixpkgs/trunk/; revision=31223
2012-01-03 10:02:33 +00:00
Yury G. Kudryashov 67add4eec5 pngcrush-1.7.22
svn path=/nixpkgs/branches/libpng15/; revision=31218
2012-01-02 19:25:08 +00:00
Yury G. Kudryashov b08a07a4eb Merge trunk
svn path=/nixpkgs/branches/libpng15/; revision=31217
2012-01-02 19:24:08 +00:00
Yury G. Kudryashov 995d3d3e03 tulip-3.6.1
svn path=/nixpkgs/trunk/; revision=31216
2012-01-02 18:36:04 +00:00
Lluís Batlle i Rossell 709ae01f34 Updating openssl.
svn path=/nixpkgs/trunk/; revision=31215
2012-01-02 18:18:04 +00:00
Yury G. Kudryashov 5ca5a0242a naev-0.5.0
svn path=/nixpkgs/trunk/; revision=31214
2012-01-02 17:37:53 +00:00
Yury G. Kudryashov 98e4666dcd update xfig, pull a few patches from debian
svn path=/nixpkgs/trunk/; revision=31213
2012-01-02 15:29:14 +00:00
Peter Simons 38f6d36e91 git-annex: updated to version 3.20111231
svn path=/nixpkgs/trunk/; revision=31212
2012-01-02 14:51:26 +00:00
Peter Simons e195f5b358 monad-control: use consistent naming scheme for all supported versions
svn path=/nixpkgs/trunk/; revision=31211
2012-01-02 14:51:23 +00:00
Peter Simons b21a827d2a ikiwiki: updated to version 3.20111229
svn path=/nixpkgs/trunk/; revision=31210
2012-01-02 14:51:20 +00:00
Yury G. Kudryashov cb2202e499 libpano13-2.9.18
svn path=/nixpkgs/trunk/; revision=31209
2012-01-02 14:25:03 +00:00
Yury G. Kudryashov ae88794123 dia-0.97.2
svn path=/nixpkgs/trunk/; revision=31208
2012-01-02 14:13:03 +00:00
Yury G. Kudryashov dd02a842e6 Merge trunk
svn path=/nixpkgs/branches/libpng15/; revision=31206
2012-01-02 13:45:14 +00:00
Yury G. Kudryashov 455d1e934b Merge trunk
svn path=/nixpkgs/branches/libpng15/; revision=31205
2012-01-02 13:43:54 +00:00
Yury G. Kudryashov 7928d532a2 Fix dia.name
svn path=/nixpkgs/trunk/; revision=31204
2012-01-02 13:42:11 +00:00
Yury G. Kudryashov 15ab248bca Revert "Use qt-4.8 by default"
This reverts r31196. Will re-apply after fixing most packages broken by this
change.

svn path=/nixpkgs/trunk/; revision=31203
2012-01-02 12:54:22 +00:00
Yury G. Kudryashov b8a3e5fbc9 kdelibs: depend on libjpeg
svn path=/nixpkgs/trunk/; revision=31202
2012-01-02 12:52:43 +00:00
Yury G. Kudryashov a6c6878f5b libdbusmenu-qt-0.9.0, disable apidocs
svn path=/nixpkgs/trunk/; revision=31201
2012-01-02 11:35:13 +00:00
Peter Simons 2a0453e43e haskell-enumerator: updated to version 0.4.17
svn path=/nixpkgs/trunk/; revision=31200
2012-01-02 11:22:58 +00:00
Yury G. Kudryashov 0c824aa456 Pass pkgconfig to strigi
svn path=/nixpkgs/trunk/; revision=31199
2012-01-02 11:16:48 +00:00
Yury G. Kudryashov 78c300f015 soprano-2.7.4, pass pkgconfig explicitly
svn path=/nixpkgs/trunk/; revision=31198
2012-01-02 11:12:27 +00:00
Yury G. Kudryashov 097b7635af Explicitly add sqlite to calibre.buildInputs
The better way would be adding sqlite to
pythonPackages.sqlite3.propagatedBuildInputs but I don't want to touch this
code.

svn path=/nixpkgs/trunk/; revision=31197
2012-01-02 10:42:36 +00:00
Yury G. Kudryashov 6639c58398 Use qt-4.8 by default
Some packages may break because pkgconfig is no longer propagated.

svn path=/nixpkgs/trunk/; revision=31196
2012-01-02 10:42:25 +00:00
Peter Simons a0e7016709 haskell-texmath: updated to version 0.5.0.4
svn path=/nixpkgs/trunk/; revision=31195
2012-01-01 21:24:20 +00:00
Peter Simons ff5e4c4f4b haskell-syb-with-class: updated to version 0.6.1.3
svn path=/nixpkgs/trunk/; revision=31194
2012-01-01 21:24:17 +00:00
Peter Simons e2c7b54f8c haskell-derive: updated to version 2.5.5
svn path=/nixpkgs/trunk/; revision=31193
2012-01-01 21:24:14 +00:00
Peter Simons 25db17f1b3 haskell-data-accessor: updated to version 0.2.2.1
svn path=/nixpkgs/trunk/; revision=31192
2012-01-01 21:24:11 +00:00
Lluís Batlle i Rossell be12dae1ec Fixing the busybox installation. All symlinks were pointing wrong.
svn path=/nixpkgs/trunk/; revision=31191
2012-01-01 20:14:50 +00:00
Lluís Batlle i Rossell 076977b462 Making procps crossbuild.
svn path=/nixpkgs/trunk/; revision=31190
2012-01-01 20:01:02 +00:00
Florian Friesdorf 2e31e7293a moved parts of extra.list back to tarballs-7.6.list
also added an short description about them to generate-expr-from-tarballs.pl

svn path=/nixpkgs/trunk/; revision=31189
2011-12-31 15:37:51 +00:00
Florian Friesdorf 90dda8a07f adjusted awesome to generated names of xcbutil-*
svn path=/nixpkgs/trunk/; revision=31186
2011-12-31 06:14:31 +00:00
Florian Friesdorf d2e8c37e41 default.nix now fully generated again
with additional xf86-video-intel-2.17.0 and what looks like a fixed
xf86-video-intel-2.14.901.

svn path=/nixpkgs/trunk/; revision=31185
2011-12-31 06:07:37 +00:00
Florian Friesdorf 1745900396 add xf86-video-intel-2.14.901 (and while at it 2.17.0) to extra.list
svn path=/nixpkgs/trunk/; revision=31184
2011-12-31 06:07:34 +00:00
Florian Friesdorf 2a2ceace7f generate-expr-from-tarballs.pl support multiple versions
svn path=/nixpkgs/trunk/; revision=31183
2011-12-31 06:07:32 +00:00
Florian Friesdorf f6090f6bba reproduced my previous manual changes through generation of default.nix
svn path=/nixpkgs/trunk/; revision=31182
2011-12-31 06:07:28 +00:00
Florian Friesdorf cebb40f533 adjusted oder of *.list in generate-expr-from-tarballs.pl example
svn path=/nixpkgs/trunk/; revision=31181
2011-12-31 06:07:26 +00:00
Florian Friesdorf e45921800c adjusted example generate-expr-from-tarballs.pl call to 7.6
svn path=/nixpkgs/trunk/; revision=31180
2011-12-31 06:07:23 +00:00
Florian Friesdorf 0bb20084b5 xorg: alphabetical extra.list
svn path=/nixpkgs/trunk/; revision=31179
2011-12-31 06:07:21 +00:00
Florian Friesdorf c9b2b8a182 xcb-util(-*)-0.3.8 and xlsclients-1.1.2 in extra.list
svn path=/nixpkgs/trunk/; revision=31178
2011-12-31 06:07:18 +00:00
Florian Friesdorf e1556e64d7 xorg: moved individuals from tarballs-7.6 to extra.list and regen tarballs-7.6
svn path=/nixpkgs/trunk/; revision=31177
2011-12-31 06:07:15 +00:00
Florian Friesdorf 44ef26c896 xlsclients-1.1.2
svn path=/nixpkgs/trunk/; revision=31176
2011-12-31 04:30:46 +00:00
Florian Friesdorf 8dd443c8df awesome-3.4.11 - ru manpages disabled because of build failure
svn path=/nixpkgs/trunk/; revision=31173
2011-12-31 04:06:02 +00:00
Florian Friesdorf 096d86bfb1 startup-notification-0.12 (works with xcb-util-0.3.8)
svn path=/nixpkgs/trunk/; revision=31172
2011-12-31 04:05:57 +00:00
Florian Friesdorf 251d42d03f xcb-util-0.3.8 (+image|keysyms|renderutil|wm)
this might break things but makes awesome-3.4.11 happy

svn path=/nixpkgs/trunk/; revision=31171
2011-12-31 04:05:50 +00:00
Florian Friesdorf 19246750bf libev-4.04 (frees awesome build from many warnings)
svn path=/nixpkgs/trunk/; revision=31170
2011-12-31 04:05:44 +00:00
Florian Friesdorf aefc550ae0 asciidoc-8.6.6
svn path=/nixpkgs/trunk/; revision=31169
2011-12-31 04:05:33 +00:00
Peter Simons 6dfd7b1446 haskell-yaml: updated to version 0.5.1.1
svn path=/nixpkgs/trunk/; revision=31159
2011-12-30 17:05:20 +00:00
Peter Simons 573455fd44 haskell-data-object-yaml: updated to version 0.3.4
svn path=/nixpkgs/trunk/; revision=31158
2011-12-30 17:05:17 +00:00
Lluís Batlle i Rossell 3e9953290a THe stable task warrior has a licence GPLv2+, not MIT.
svn path=/nixpkgs/trunk/; revision=31152
2011-12-29 22:28:22 +00:00
Lluís Batlle i Rossell 7d4e6bbec9 Adding task warrior unstable.
svn path=/nixpkgs/trunk/; revision=31151
2011-12-29 22:27:32 +00:00
Lluís Batlle i Rossell 99e6a23f03 Adding task warrior, stable.
svn path=/nixpkgs/trunk/; revision=31150
2011-12-29 22:14:08 +00:00
Florian Friesdorf 89c3120b20 zsh profile load tweaking only on nixos
svn path=/nixpkgs/trunk/; revision=31149
2011-12-29 20:09:30 +00:00
Florian Friesdorf 0009c1f650 zshprofile to load /etc/profile while emulating bash
svn path=/nixpkgs/trunk/; revision=31148
2011-12-29 19:46:47 +00:00
Florian Friesdorf ecba799e78 zsh meta
svn path=/nixpkgs/trunk/; revision=31147
2011-12-29 19:46:43 +00:00
Florian Friesdorf c6ad751a8c zsh-4.3.15
svn path=/nixpkgs/trunk/; revision=31146
2011-12-29 19:46:37 +00:00
Eelco Dolstra 633a194994 * PIL updated to 1.1.7.
svn path=/nixpkgs/trunk/; revision=31142
2011-12-29 16:53:14 +00:00
Peter Simons de1a6e09d7 haskell-path-pieces: added version 0.1.0
haskell-attoparsec-conduit: added version 0.0.0
haskell-blaze-builder-conduit: added version 0.0.0
haskell-conduit: added version 0.0.0.1
haskell-http-conduit: added version 1.0.0
haskell-lifted-base: added version 0.1.0.2
haskell-xml-conduit: added version 0.5.0
haskell-zlib-conduit: added version 0.0.0

svn path=/nixpkgs/trunk/; revision=31141
2011-12-29 16:42:08 +00:00
Eelco Dolstra bf55fb9192 * Fixed Calibre (it was referring to "python2", which doesn't exist)
and updated it to 0.8.32.

svn path=/nixpkgs/trunk/; revision=31140
2011-12-29 16:22:46 +00:00
Florian Friesdorf d5709cfb64 cryptsetup-1.4.1
Thanks to Mathijs Kwik and Peter Simons for preparing this.
Make sure you have nixos r31132.

svn path=/nixpkgs/trunk/; revision=31134
2011-12-28 21:48:58 +00:00
Florian Friesdorf daa459cc8a popt-0.16
Thanks to Peter Simons for preparing this. Make sure you have nixos 31132.

svn path=/nixpkgs/trunk/; revision=31133
2011-12-28 21:48:55 +00:00
Marco Maggesi fd64bc5289 Oops!
svn path=/nixpkgs/trunk/; revision=31126
2011-12-28 12:49:29 +00:00