Commit graph

7917 commits

Author SHA1 Message Date
Michael Raskin
5d3b1a1b07 Change some options most different from mainline to build a probably bootable kernel
svn path=/nixpkgs/trunk/; revision=17095
2009-09-13 16:37:17 +00:00
Michael Raskin
01063c854b Remove option stopping 2.6.31 from booting
svn path=/nixpkgs/trunk/; revision=17094
2009-09-13 16:24:44 +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
a54fc7e7f7 svn path=/nixpkgs/trunk/; revision=17083 2009-09-13 10:54:47 +00:00
Eelco Dolstra
b6a5b7267e svn path=/nixpkgs/trunk/; revision=17081 2009-09-13 10:45:16 +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
8fabb58eee thinking rock update
svn path=/nixpkgs/trunk/; revision=17078
2009-09-13 08:54:50 +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
Ludovic Courtès
5d459c6465 GNU IceCat 3.5.3.
svn path=/nixpkgs/trunk/; revision=17073
2009-09-12 21:19:01 +00:00
Ludovic Courtès
f9a44eb4aa Mailutils: Restrict to GNU platforms.
svn path=/nixpkgs/trunk/; revision=17072
2009-09-12 20:53:21 +00:00
Ludovic Courtès
e94e1de693 Mailutils: Add home page.
svn path=/nixpkgs/trunk/; revision=17071
2009-09-12 19:54:08 +00:00
Ludovic Courtès
a6ab726b0f Try to build Mailutils everywhere.
svn path=/nixpkgs/trunk/; revision=17070
2009-09-12 18:47:34 +00:00
Ludovic Courtès
b7fa5f13c9 Add gnu' as an alias for linux'.
The rationale is that usually applications don't care about the kernel
but rather about the C library, tool chain, and standard utilities,
which are GNU, not Linux.

svn path=/nixpkgs/trunk/; revision=17069
2009-09-12 18:46:04 +00:00
Michael Raskin
0462878b22 Fixing a typo
svn path=/nixpkgs/trunk/; revision=17067
2009-09-12 07:33:55 +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
11de02585a Trying to reconfigure kernel to boot
svn path=/nixpkgs/trunk/; revision=17064
2009-09-12 06:59:44 +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
7c38144378 Temporarily (?) reverting Thunderbird update because updated version failed to build for ununderstandable reasons
svn path=/nixpkgs/trunk/; revision=17061
2009-09-12 05:36:07 +00:00
Michael Raskin
37cbc33a6e Try harder to forcefeed sqlite3 into the build process
svn path=/nixpkgs/trunk/; revision=17060
2009-09-11 20:10:55 +00:00
Michael Raskin
a497fc4d6f Fix typo
svn path=/nixpkgs/trunk/; revision=17059
2009-09-11 19:34:03 +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
da94aa680b Fix typo
svn path=/nixpkgs/trunk/; revision=17057
2009-09-11 18:55:14 +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
9612c02ad7 Added marble support to kdeplasma-addons
svn path=/nixpkgs/trunk/; revision=17055
2009-09-11 14:46:39 +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
7cc0f07690 Fix kernel configuration editing script snippets
svn path=/nixpkgs/trunk/; revision=17053
2009-09-11 13:59:32 +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
ec57ec6d6f Disable IMA because of conflict with aufs
svn path=/nixpkgs/trunk/; revision=17051
2009-09-11 13:50:40 +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
687f931c12 Fixed path to the VirtualBox desktop file
svn path=/nixpkgs/trunk/; revision=17048
2009-09-11 12:43:35 +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
Ludovic Courtès
77110de089 GSL 1.13.
svn path=/nixpkgs/trunk/; revision=17039
2009-09-10 21:23:46 +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
f0bc865339 Upgraded kmplayer to 0.11.1b
svn path=/nixpkgs/trunk/; revision=17037
2009-09-10 20:39:43 +00:00
Sander van der Burg
98bad63d6c Upgraded kdesvn to 1.4.0
svn path=/nixpkgs/trunk/; revision=17036
2009-09-10 20:34:45 +00:00
Sander van der Burg
aa2946a8c5 Claimed maintainership on the krusader package
svn path=/nixpkgs/trunk/; revision=17035
2009-09-10 20:27:23 +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
96ff884c3d - Added kdepim-runtime package
- Updated KDE plasma addons to 4.3.1


svn path=/nixpkgs/trunk/; revision=17033
2009-09-10 20:01:22 +00:00
Sander van der Burg
b8efc63561 Updated KDE bindings, admin, utils to 4.3.1
svn path=/nixpkgs/trunk/; revision=17032
2009-09-10 19:14:48 +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
7c02d7eb0b fix opera on x86_64
svn path=/nixpkgs/trunk/; revision=17024
2009-09-10 16:57:45 +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
4800303718 nixUnstable: allow passing patches
svn path=/nixpkgs/trunk/; revision=17022
2009-09-10 16:57:37 +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
d3cb19bd41 added note that steps in builderDefs should be rewritten using '' syntax
in order to strip spaces

svn path=/nixpkgs/trunk/; revision=17019
2009-09-10 16:57:29 +00:00
Marc Weber
60aa746f6b removing dropPath. It's used once and in that case it behaves like
builtins.dropPath

svn path=/nixpkgs/trunk/; revision=17018
2009-09-10 16:57:26 +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
82ce10a720 Upgraded KDE network, pim to 4.3.1
svn path=/nixpkgs/trunk/; revision=17014
2009-09-10 16:11:29 +00:00
Sander van der Burg
33d7ae6288 Upgraded KDE EDU to 4.3.1
svn path=/nixpkgs/trunk/; revision=17011
2009-09-10 14:58:08 +00:00
Sander van der Burg
48497bd320 Upgraded KDE SDK, Multimedia, Webdev to 4.3.1
svn path=/nixpkgs/trunk/; revision=17009
2009-09-10 13:57:37 +00:00
Sander van der Burg
4e39d699c4 Updated KDE toys to 4.3.1
svn path=/nixpkgs/trunk/; revision=17007
2009-09-10 13:13:48 +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
Eelco Dolstra
5b7f46ea43 * A utility function `optionalAttrs', similar to optional and
optionalString but for attribute sets.

svn path=/nixpkgs/trunk/; revision=17002
2009-09-10 10:52:51 +00:00
Eelco Dolstra
9d15693163 * Make sure that the X server can write the compiled xkb keymap. This
requires $out/share/X11/xkb/compiled to be writable, so symlink it
  to /var/tmp.  Using --with-xkb-output doesn't work in a chroot build
  because `make install' tries to write a README.compiled file to
  /var/tmp, which doesn't exist in the chroot.

svn path=/nixpkgs/trunk/; revision=17000
2009-09-09 22:16:09 +00:00
Andres Löh
cb3722a72a Version bump for uu-parsinglib.
svn path=/nixpkgs/trunk/; revision=16997
2009-09-09 15:49:52 +00:00
Andres Löh
dbfe44e6eb Added parseargs.
svn path=/nixpkgs/trunk/; revision=16996
2009-09-09 15:45:27 +00:00
Eelco Dolstra
daceb23a25 * qemu-kvm 0.11.0rc2.
svn path=/nixpkgs/trunk/; revision=16995
2009-09-09 15:44:14 +00:00
Peter Simons
bba3090136 Updated git to version 1.6.4.2.
svn path=/nixpkgs/trunk/; revision=16994
2009-09-09 11:26:53 +00:00
Sander van der Burg
16beaadb96 Implemented base packages for KDE 4.3.1
svn path=/nixpkgs/trunk/; revision=16993
2009-09-09 10:53:32 +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
Eelco Dolstra
1511a6f28c * Thunderbird 2.0.0.23.
svn path=/nixpkgs/trunk/; revision=16991
2009-09-09 09:32:42 +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
Sander van der Burg
379a499dca Updated all KDE support packages required for KDE 4.3
svn path=/nixpkgs/trunk/; revision=16988
2009-09-08 14:38:27 +00:00
Sander van der Burg
c2a8340195 Updated Clucene core to 0.9.21b
svn path=/nixpkgs/trunk/; revision=16987
2009-09-08 13:38:47 +00:00
Ludovic Courtès
e5eb79cee4 lsh: Fix typo.
svn path=/nixpkgs/trunk/; revision=16986
2009-09-08 10:31:07 +00:00
Ludovic Courtès
80e34c69f5 lsh: Use GNU URL; handle --no-root-login' in lshd'.
svn path=/nixpkgs/trunk/; revision=16985
2009-09-08 10:29:22 +00:00
Sander van der Burg
b44d46ee21 Removed my dirty hacks, because I discovered a undocumented feature in the QT configure script which picks the opensource edition
svn path=/nixpkgs/trunk/; revision=16984
2009-09-08 09:50:06 +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
e4b91c91c7 typo
svn path=/nixpkgs/trunk/; revision=16973
2009-09-07 10:07:03 +00:00
Eelco Dolstra
934d30e35f * Fix a broken URL, and update sudo while we're at it.
svn path=/nixpkgs/trunk/; revision=16972
2009-09-06 21:36:51 +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
edae4e83b0 * Urgh, forgot to commit.
svn path=/nixpkgs/trunk/; revision=16948
2009-09-02 23:10:30 +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
99cd5a1679 * ImageMagick updated to 6.5.5-6.
svn path=/nixpkgs/trunk/; revision=16945
2009-09-02 22:43:08 +00:00
Eelco Dolstra
28af8ad308 * Fix the build of gnome-utils.
svn path=/nixpkgs/trunk/; revision=16944
2009-09-02 22:42:52 +00:00
Eelco Dolstra
ced7a48e5d * glx: make the XORG_DRI_DRIVER_PATH environment variable work for the
software renderer as well.

svn path=/nixpkgs/trunk/; revision=16943
2009-09-02 22:32:56 +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
76f1d68360 svn path=/nixpkgs/trunk/; revision=16933 2009-09-02 13:31:33 +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
Eelco Dolstra
f560f49faa * Fix nix-env evaluation.
svn path=/nixpkgs/trunk/; revision=16931
2009-09-02 13:22:34 +00:00
Rob Vermaas
63c175dc46 * opera 10
svn path=/nixpkgs/trunk/; revision=16930
2009-09-02 12:23:01 +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
4c89d4f833 * Clean up the coverage report in the case where absolute paths are
used in the *.gcno files.

svn path=/nixpkgs/trunk/; revision=16925
2009-09-02 09:37:52 +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
Eelco Dolstra
086dd25510 * Use --coverage, which is identical to -fprofile-arcs -ftest-coverage.
svn path=/nixpkgs/trunk/; revision=16903
2009-08-31 15:02:27 +00:00
Eelco Dolstra
54a5ad0c6f * Hacked up a patch to let lcov find source files referenced by a
path relative to some arbitrary parent of the .gcno file.  For
  instance, this happens when building Subversion with coverage.

svn path=/nixpkgs/trunk/; revision=16902
2009-08-31 15:02:01 +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
Eelco Dolstra
df5cd8776a * Apache 2.2.13.
svn path=/nixpkgs/trunk/; revision=16889
2009-08-28 16:05:48 +00:00
Eelco Dolstra
024c82ee04 * lcov 1.7.
svn path=/nixpkgs/trunk/; revision=16888
2009-08-28 14:11:09 +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
54207c7ce2 * Get rid of more old Compiz versions.
svn path=/nixpkgs/trunk/; revision=16871
2009-08-26 17:17:01 +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
921de5b511 * Remove the warning, it's rather annoying.
svn path=/nixpkgs/trunk/; revision=16862
2009-08-26 14:13:05 +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
781a112230 Remove broken platforms
svn path=/nixpkgs/trunk/; revision=16860
2009-08-26 12:05:28 +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
Eelco Dolstra
e8931adcf3 * Latest NVIDIA driver. This one isn't broken on laptops.
svn path=/nixpkgs/trunk/; revision=16858
2009-08-26 09:01:05 +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
98a62231d6 The chosen tarball failed; trying the previous one
svn path=/nixpkgs/trunk/; revision=16838
2009-08-24 18:59:29 +00:00
Michael Raskin
5e2b099a6a Tried to track down incompatible change..
svn path=/nixpkgs/trunk/; revision=16837
2009-08-24 18:38:07 +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
743e35d24d Re-enable WebKit WML support
svn path=/nixpkgs/trunk/; revision=16829
2009-08-24 07:35:11 +00:00
Michael Raskin
1dbae09f4d Re-upgrade WebKit to the latest
svn path=/nixpkgs/trunk/; revision=16828
2009-08-24 07:31:22 +00:00
Michael Raskin
a212ab8899 gnome-keyring is not what we really need in libsoup for WebKit, so build fresh libsoup without Gnome features causing failure
svn path=/nixpkgs/trunk/; revision=16827
2009-08-24 07:29:37 +00:00
Michael Raskin
6770d7aa4d Downgrade WebKit - probably enough to go with old libsoup. Libsoup mostly updated, but it seems to require fresher unstable gtk...
svn path=/nixpkgs/trunk/; revision=16826
2009-08-24 07:25:30 +00:00
Michael Raskin
2f8c8d39e8 OOps, fixed wrong file
svn path=/nixpkgs/trunk/; revision=16825
2009-08-24 05:31:15 +00:00
Michael Raskin
f6ad0fc5ee Who could think nix-prefetch-git defaults to md5...
svn path=/nixpkgs/trunk/; revision=16824
2009-08-24 05:29:39 +00:00
Michael Raskin
be9c640e16 Forgot to replace fetchurl -> fetchgit
svn path=/nixpkgs/trunk/; revision=16823
2009-08-24 05:25:58 +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
0e6cd4b794 Fix typo
svn path=/nixpkgs/trunk/; revision=16821
2009-08-24 05:19:30 +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
d436b3a8f2 Try downgrading WebKit further
svn path=/nixpkgs/trunk/; revision=16819
2009-08-24 03:54:25 +00:00
Michael Raskin
109f116bb4 Roll back - until the requird libsoup version is released..
svn path=/nixpkgs/trunk/; revision=16818
2009-08-23 22:46:26 +00:00
Michael Raskin
f0a3ff997f Update wine (use new updater script in the process)
svn path=/nixpkgs/trunk/; revision=16817
2009-08-23 22:24:17 +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
Eelco Dolstra
c8886f7215 * dblatex 0.2.12.
svn path=/nixpkgs/trunk/; revision=16815
2009-08-22 23:11:12 +00:00
Marc Weber
3235c889b9 fix of warning. It should be correct now
svn path=/nixpkgs/trunk/; revision=16813
2009-08-22 18:13:56 +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
9c49ad9f70 trace warning when using attrs for textClosureList
svn path=/nixpkgs/trunk/; revision=16810
2009-08-22 09:35:59 +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
Marc Weber
ad292ae9d4 pass intltool to gnomepanel making. It didn't build without it
svn path=/nixpkgs/trunk/; revision=16807
2009-08-22 09:18:02 +00:00
Marc Weber
05ebbec1aa pass zoneinfo to libgweather
svn path=/nixpkgs/trunk/; revision=16806
2009-08-22 09:17:54 +00:00
Eelco Dolstra
b67e9a0415 * qemu-kvm unix domain patch: when accepting a connection, initialise
the remote address / port to something sensible.  Otherwise
  simultaneous connections to the same guest port don't work properly.

svn path=/nixpkgs/trunk/; revision=16805
2009-08-21 15:40:32 +00:00
Eelco Dolstra
c7eb810826 * haddr -> hport.
svn path=/nixpkgs/trunk/; revision=16804
2009-08-21 14:26:46 +00:00
Ludovic Courtès
4ad3ea4107 Add GNU MyServer.
svn path=/nixpkgs/trunk/; revision=16801
2009-08-21 10:20:40 +00:00
Ludovic Courtès
a56fecb102 JDEE: Update.
svn path=/nixpkgs/trunk/; revision=16797
2009-08-21 08:43:07 +00:00
Eelco Dolstra
0c86d710fe * Make sure that the pid file is placed in /var/run.
svn path=/nixpkgs/trunk/; revision=16794
2009-08-20 23:57:33 +00:00
Eelco Dolstra
d937a1bae0 * at 3.1.11.
svn path=/nixpkgs/trunk/; revision=16793
2009-08-20 23:40:50 +00:00
Marc Weber
16b2e9f951 updating libtorrent and rtorrent making both compile on x86_64
svn path=/nixpkgs/trunk/; revision=16791
2009-08-20 20:19:06 +00:00
Marc Weber
075f9712f2 fix soappy by using trunk version
svn path=/nixpkgs/trunk/; revision=16790
2009-08-20 20:19:04 +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
d0a9bac4c1 Making minicom use /etc instead of $out/etc for configuration files (sysconfdir).
I could not find how to open a given serial device without allowing minicom to write into
its sysconfdir.

svn path=/nixpkgs/trunk/; revision=16782
2009-08-19 20:19:40 +00:00
Lluís Batlle i Rossell
116c1e4bdd Adding the proper derivation name to the openchrome xorg driver override.
svn path=/nixpkgs/trunk/; revision=16781
2009-08-19 20:19:33 +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
Lluís Batlle i Rossell
62a8e0806b Radare update from 1.4.1 to 1.4.2
svn path=/nixpkgs/trunk/; revision=16778
2009-08-19 20:19:08 +00:00
Eelco Dolstra
2c30535768 * Apply a fix for Flash crashing in fullscreen mode with Xv
acceleration on NVIDIA cards.

svn path=/nixpkgs/trunk/; revision=16761
2009-08-18 16:45:22 +00:00
Eelco Dolstra
2dffe66c92 * Linux 2.6.27.31.
svn path=/nixpkgs/trunk/; revision=16754
2009-08-18 09:29:03 +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
dd9f68b1f5 * xpdf updated to 3.02pl3.
svn path=/nixpkgs/trunk/; revision=16749
2009-08-17 13:50:18 +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
e93367dc45 * Enable auto-mounting/unmounting of optical media and USB sticks
(e.g. in KDE).

svn path=/nixpkgs/trunk/; revision=16745
2009-08-17 02:04:26 +00:00
Eelco Dolstra
ce76cb5686 * slim: ConsoleKit compatibility fix.
svn path=/nixpkgs/trunk/; revision=16742
2009-08-17 01:09:17 +00:00
Eelco Dolstra
cfbbeb02e1 * ConsoleKit: build the PAM connector, put state in /var, read
configuration from /etc.  The latter is necessary because there is
  no way to override the configuration path (in particular to
  run-session.d) at runtime.

svn path=/nixpkgs/trunk/; revision=16741
2009-08-17 00:36:48 +00:00
Eelco Dolstra
6e89ec648c * ConsoleKit compatibility.
svn path=/nixpkgs/trunk/; revision=16740
2009-08-17 00:35:18 +00:00
Ludovic Courtès
ba4ae2ad37 GnuTLS 2.8.3.
svn path=/nixpkgs/trunk/; revision=16739
2009-08-16 22:59:15 +00:00
Eelco Dolstra
8bfccbbcdf * policy-kit: keep state in /var.
svn path=/nixpkgs/trunk/; revision=16737
2009-08-16 21:47:51 +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
Michael Raskin
89fc3a896c Fix PolicyKit build
svn path=/nixpkgs/trunk/; revision=16727
2009-08-16 12:03:45 +00:00
Michael Raskin
06b4ca8e6c Fix policyKit references
svn path=/nixpkgs/trunk/; revision=16726
2009-08-16 08:52:18 +00:00
Sander van der Burg
bd1b49e546 Added a prefix which is not passed to the configure script anymore
svn path=/nixpkgs/trunk/; revision=16725
2009-08-15 16:18:03 +00:00
Sander van der Burg
f114f1a64e Fixed it, because otherwise it keeps looping
svn path=/nixpkgs/trunk/; revision=16724
2009-08-15 14:17:16 +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
Michael Raskin
8703ea4070 Update uzbl
svn path=/nixpkgs/trunk/; revision=16707
2009-08-13 14:31:43 +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
0fa5cdc251 * Remove some trace calls.
svn path=/nixpkgs/trunk/; revision=16705
2009-08-13 08:37:00 +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
40854d65b4 svn path=/nixpkgs/trunk/; revision=16700 2009-08-12 13:36:36 +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
17828d8442 * udev: updated to 145. Dropped support for doing a static build
since we don't need it anymore.  Patched the udev rules/helper
  programs for CD-ROM symlink generation and firmware loading so that
  we don't have to provide our own.

svn path=/nixpkgs/trunk/; revision=16684
2009-08-11 21:00:42 +00:00
Eelco Dolstra
17132958a9 * dbus: updated to 1.2.16.
svn path=/nixpkgs/trunk/; revision=16683
2009-08-11 20:58:05 +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