cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
14880 commits 1 branch 0 tags 3.7 GiB
Commit graph

2792 commits

Author SHA1 Message Date
Florian Friesdorf
25cd609b92 removed previously added xapian12 
svn path=/nixpkgs/trunk/; revision=26882
 2011-04-18 17:19:58 +00:00
Florian Friesdorf
bd71b36628 notmuch with inheritable-tags-hack for thread muting 
the muted tag is supposed to be inherited by messages of the same
thread, effictely muting a thread. A muted thread will not show up in
your inbox anymore. Current implementation is hackish but functional.

big thank you to amdragon!

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

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

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

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


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

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

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

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

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

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

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

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


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

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


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

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

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

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

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

  * GHC 7.0.2 is now default.

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

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

  * Some old packages have been removed.

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

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

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

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

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


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

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

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

svn path=/nixpkgs/trunk/; revision=26146
 2011-03-03 14:10:18 +00:00
Lluís Batlle i Rossell
7912200505 Adding libf2c 
svn path=/nixpkgs/trunk/; revision=26144
 2011-03-03 13:41:06 +00:00
Lluís Batlle i Rossell
b679cf6a66 Updating boost 
svn path=/nixpkgs/trunk/; revision=26143
 2011-03-03 13:41:01 +00:00
Eelco Dolstra
eb4b1e8b04 * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26141
 2011-03-03 12:02:50 +00:00
Yury G. Kudryashov
efb12635d3 Qca2: do not separate debug info 
svn path=/nixpkgs/trunk/; revision=26138
 2011-03-02 18:50:00 +00:00
Lluís Batlle i Rossell
d11c00e5a5 Adding xercesc, the references to coin3d and soqt, and trying to add 
freecad (that still does not build).

svn path=/nixpkgs/trunk/; revision=26135
 2011-03-02 17:18:30 +00:00
Lluís Batlle i Rossell
f58e7158e0 Updating ODE. 
svn path=/nixpkgs/trunk/; revision=26134
 2011-03-02 17:18:24 +00:00
Lluís Batlle i Rossell
6381040f0a Adding coin3d and soqt 
svn path=/nixpkgs/trunk/; revision=26133
 2011-03-02 17:18:20 +00:00
Lluís Batlle i Rossell
e1cf8f90e6 Adding GNU Triangulated Surface library 
svn path=/nixpkgs/trunk/; revision=26132
 2011-03-02 17:18:15 +00:00
Eelco Dolstra
f543078655 * Install the libvirt-guests boot script for saving/restoring VMs 
across host reboots.

svn path=/nixpkgs/trunk/; revision=26120
 2011-02-25 15:56:10 +00:00
Eelco Dolstra
583053d018 * libvirt: enable some more features. 
svn path=/nixpkgs/trunk/; revision=26111
 2011-02-25 13:24:41 +00:00
Eelco Dolstra
6538f20485 * Revert to Boost 1.44 for now, as 1.46 breaks several packages. 
svn path=/nixpkgs/branches/x-updates/; revision=26110
 2011-02-25 11:01:50 +00:00
Eelco Dolstra
a9ca5acac3 * Grrr, we should really mirror jquery-ui. 
svn path=/nixpkgs/trunk/; revision=26099
 2011-02-24 16:20:47 +00:00
Eelco Dolstra
9bbe78533e * Add readline support to libvirt. 
svn path=/nixpkgs/trunk/; revision=26097
 2011-02-24 15:42:51 +00:00
Eelco Dolstra
6bab14437c * libvirt: use /var and set the correct paths to ip/iptables. 
svn path=/nixpkgs/trunk/; revision=26091
 2011-02-24 13:36:18 +00:00
Eelco Dolstra
a35dcdb281 * libvirt updated to 0.8.8. 
svn path=/nixpkgs/trunk/; revision=26088
 2011-02-24 11:59:30 +00:00
Yury G. Kudryashov
072df43f00 boost-1.46.0 
svn path=/nixpkgs/branches/x-updates/; revision=26066
 2011-02-23 11:29:23 +00:00
Yury G. Kudryashov
4a5b7854a8 Move eigen outside of kde-4.x 
Michael, sorry for overriding your work but I want to maintain it...

svn path=/nixpkgs/trunk/; revision=26058
 2011-02-22 11:54:56 +00:00
Yury G. Kudryashov
0646cfee1e Move strigi outside of kde-4.x 
svn path=/nixpkgs/trunk/; revision=26057
 2011-02-22 11:54:49 +00:00
Yury G. Kudryashov
78127c3b86 Move qimageblitz outside of kde-4.x 
svn path=/nixpkgs/trunk/; revision=26056
 2011-02-22 11:54:42 +00:00
Eelco Dolstra
d47cf5a35e * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26054
 2011-02-22 10:00:18 +00:00
Yury G. Kudryashov
68299a0202 Move qca2 outside of kde-4.x 
svn path=/nixpkgs/trunk/; revision=26053
 2011-02-22 09:53:01 +00:00
Karn Kallio
db53a4e36a Advance version of libjpeg to 8c. 
svn path=/nixpkgs/trunk/; revision=26037
 2011-02-19 22:16:31 +00:00
Eelco Dolstra
b35383d9b2 * jquery-ui updated to 1.8.9. 
svn path=/nixpkgs/trunk/; revision=26033
 2011-02-19 16:54:54 +00:00
Eelco Dolstra
e5d12bbca7 * Disable swrast_dri.so because it doesn't work properly (NixOS/121). 
svn path=/nixpkgs/branches/x-updates/; revision=26020
 2011-02-18 09:16:11 +00:00
Eelco Dolstra
9b6dfe840a * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=25993
 2011-02-16 15:14:04 +00:00
Andres Löh
0a69fe9898 Restored HaXml-1.13.3 to keep happstack and gitit working. 
svn path=/nixpkgs/trunk/; revision=25974
 2011-02-15 10:36:52 +00:00
Andres Löh
bcb46affc2 Version bump for Haskell libs: HaXml and json. 
svn path=/nixpkgs/trunk/; revision=25973
 2011-02-15 09:47:36 +00:00
Eelco Dolstra
070f7debe0 * gdk-pixbuf: build gdk-pixbuf-xlib. 
svn path=/nixpkgs/branches/x-updates/; revision=25961
 2011-02-14 13:44:01 +00:00
Eelco Dolstra
5042a81534 * Fix broken icons such as the back/forward buttons in Firefox. 
svn path=/nixpkgs/branches/x-updates/; revision=25944
 2011-02-13 23:38:28 +00:00
Yury G. Kudryashov
33e30b8601 libdbusmenu-qt-0.7.0 
svn path=/nixpkgs/trunk/; revision=25936
 2011-02-13 04:36:55 +00:00
Florian Friesdorf
db47cdae9d xapian(-bindings)-1.0.23 from 1.0.14 
svn path=/nixpkgs/trunk/; revision=25928
 2011-02-13 00:49:07 +00:00
David Guibert
188b3c00ba libmatroska: 1.0.0 
svn path=/nixpkgs/trunk/; revision=25924
 2011-02-12 20:18:46 +00:00
David Guibert
489b0e2fe5 libebml: 1.0.0 
svn path=/nixpkgs/trunk/; revision=25923
 2011-02-12 20:18:41 +00:00
Eelco Dolstra
52787275a4 * Update clutter and clutter-gtk to get it to build with the latest 
GTK+ (http://hydra.nixos.org/build/902751).

svn path=/nixpkgs/branches/x-updates/; revision=25920
 2011-02-12 13:52:17 +00:00
Eelco Dolstra
4b45a4c4cb * Build GTK+ with Xinput support, necessary for tablet support in Gimp 
and Inkscape (suggested by Cillian de Róiste).

svn path=/nixpkgs/branches/x-updates/; revision=25919
 2011-02-12 13:38:30 +00:00
Eelco Dolstra
57eed75265 * polkit updated to 0.99. 
svn path=/nixpkgs/branches/x-updates/; revision=25916
 2011-02-12 09:25:10 +00:00
Yury G. Kudryashov
38b1c5fbfc Fix #! line in gtester-report 
svn path=/nixpkgs/branches/x-updates/; revision=25915
 2011-02-12 08:44:35 +00:00
Eelco Dolstra
bdafe406db * Update gobject-introspection. 
svn path=/nixpkgs/branches/x-updates/; revision=25910
 2011-02-11 17:27:16 +00:00
Lluís Batlle i Rossell
cb41a67c47 Building mumble a bit further. 
svn path=/nixpkgs/trunk/; revision=25908
 2011-02-11 15:56:29 +00:00
Eelco Dolstra
2c72c03de5 * Mesa 7.9.1. 
svn path=/nixpkgs/branches/x-updates/; revision=25905
 2011-02-11 14:48:30 +00:00
Eelco Dolstra
e877e4dc13 * Dbus 1.4.1. 
svn path=/nixpkgs/branches/x-updates/; revision=25903
 2011-02-11 14:01:39 +00:00
Eelco Dolstra
5dcde6d437 * Expat: apply a fix for CVE-2009-3560. 
svn path=/nixpkgs/branches/x-updates/; revision=25902
 2011-02-11 13:55:30 +00:00
Eelco Dolstra
a08d99715d * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=25900
 2011-02-11 13:08:45 +00:00
Lluís Batlle i Rossell
951b65cf9c Trying to add mumble. It still does not build. 
svn path=/nixpkgs/trunk/; revision=25890
 2011-02-10 19:23:27 +00:00
Yury G. Kudryashov
857121483f Add libtiger 
svn path=/nixpkgs/trunk/; revision=25871
 2011-02-09 21:11:16 +00:00
Yury G. Kudryashov
7e4e25bbd2 taglib-1.6.3 
svn path=/nixpkgs/trunk/; revision=25870
 2011-02-09 21:11:02 +00:00
Yury G. Kudryashov
822ddb6b5e Add libkate 
svn path=/nixpkgs/trunk/; revision=25869
 2011-02-09 21:10:55 +00:00
Yury G. Kudryashov
e67fdbf901 Add libass 
svn path=/nixpkgs/trunk/; revision=25868
 2011-02-09 21:10:42 +00:00
Yury G. Kudryashov
e936f855a1 Add liboggz 
svn path=/nixpkgs/trunk/; revision=25867
 2011-02-09 21:10:28 +00:00
Yury G. Kudryashov
5c6389f69c SDL_image-1.2.10 
svn path=/nixpkgs/trunk/; revision=25865
 2011-02-09 21:10:05 +00:00
Yury G. Kudryashov
f8369c6f2b xine-lib-1.1.19; remove unused files 
svn path=/nixpkgs/trunk/; revision=25864
 2011-02-09 21:09:56 +00:00
Karn Kallio
69f2e5d157 Bump version of mlt to 0.6.2 
This also fixes compilation error in kdenlive

svn path=/nixpkgs/trunk/; revision=25857
 2011-02-09 15:34:30 +00:00
Eelco Dolstra
d924bbb775 * openssl: per Nixpkgs convention, don't install static libraries when 
building dynamic libraries.

svn path=/nixpkgs/branches/x-updates/; revision=25856
 2011-02-09 15:27:34 +00:00
Eelco Dolstra
935a8efdb0 * Remove the old gdk-pixbuf. 
svn path=/nixpkgs/branches/x-updates/; revision=25854
 2011-02-09 15:12:05 +00:00
Eelco Dolstra
6a59d1a98f * Latest Glib, ATK, Pango and GTK+. 
* Added gdk-pixbuf, which has been revived and is required by GTK+.
* Don't install the documentation of aforementioned packages.  This
  cuts 56 MiB off the closure of GTK+-based packages.  It wasn't
  really useful anyway because it's not installed in a way that allows
  users to find it easily on NixOS.  And if you want it, it's faster
  to Google it.

svn path=/nixpkgs/branches/x-updates/; revision=25853
 2011-02-09 15:09:29 +00:00
Eelco Dolstra
51fe520113 * Fix the GTK+ build. It depends directly on libXrender, but probably 
we didn't notice because some other X package used to have it as a
  propagated dependency.

svn path=/nixpkgs/branches/x-updates/; revision=25831
 2011-02-09 12:36:08 +00:00
Eelco Dolstra
0b86d85634 * Updated gmime to 2.4.22. 
svn path=/nixpkgs/branches/x-updates/; revision=25830
 2011-02-09 12:35:20 +00:00
Eelco Dolstra
bafc1b5cb8 * While we're at it, bump OpenSSL to 1.0.0d (with a fix for 
CVE-2011-0014).

svn path=/nixpkgs/branches/x-updates/; revision=25827
 2011-02-09 11:02:24 +00:00
Eelco Dolstra
52e0027c93 * Glib 2.24.2. 
svn path=/nixpkgs/branches/x-updates/; revision=25826
 2011-02-09 11:01:48 +00:00
Eelco Dolstra
b705289759 * Remove gtkLibs218 and an old Cairo. 
svn path=/nixpkgs/branches/x-updates/; revision=25824
 2011-02-09 10:49:20 +00:00
Sander van der Burg
0c4706f165 Bumped qt-4.7 to version 4.7.1 
svn path=/nixpkgs/trunk/; revision=25820
 2011-02-08 21:23:17 +00:00
Eelco Dolstra
0003f76f9b * Cairo 1.10.2. 
svn path=/nixpkgs/branches/x-updates/; revision=25819
 2011-02-08 17:57:00 +00:00
Eelco Dolstra
e9c3b7b55a * libdrm 2.4.23. 
svn path=/nixpkgs/branches/x-updates/; revision=25814
 2011-02-08 14:15:53 +00:00
Eelco Dolstra
e848a70b31 * Freetype 2.4.4. 
svn path=/nixpkgs/branches/x-updates/; revision=25813
 2011-02-08 14:12:24 +00:00
Eelco Dolstra
f1c8cbed52 * libjpeg updated to 8c. 
svn path=/nixpkgs/branches/x-updates/; revision=25812
 2011-02-08 13:41:28 +00:00
Eelco Dolstra
58744ab7f3 * SQLite 3.7.5. 
svn path=/nixpkgs/trunk/; revision=25804
 2011-02-08 11:56:49 +00:00
Lluís Batlle i Rossell
47c7daa2af Adding vmime 
svn path=/nixpkgs/trunk/; revision=25783
 2011-02-06 15:27:14 +00:00
Andres Löh
9fdd920391 Version bump for convertible. 
svn path=/nixpkgs/trunk/; revision=25781
 2011-02-05 23:40:34 +00:00
Eelco Dolstra
207f3278c1 * boehm-gc: For simplicity, use a tarball containing the CVS export 
instead of fetchcvs.  Then we don't need to special-case FreeBSD
  either.  Also, removed the Cygwin patch which no longer seems
  needed.

svn path=/nixpkgs/trunk/; revision=25759
 2011-02-02 12:17:29 +00:00
Michael Raskin
e6621da1c3 Adding Sphere of Influence 
svn path=/nixpkgs/trunk/; revision=25711
 2011-01-28 08:13:52 +00:00
Peter Simons
031edc4509 pkgs/development/libraries/glibc-2.5: fix build with GNU Make 3.82 
svn path=/nixpkgs/trunk/; revision=25701
 2011-01-27 13:35:53 +00:00
Ludovic Courtès
d968cb95a2 libelf: Attempt to fix Darwin builds. 
svn path=/nixpkgs/trunk/; revision=25694
 2011-01-27 09:50:44 +00:00
Ludovic Courtès
bef4ae60e4 BDW-GC: Fix Cygwin builds with the CVS tree. 
svn path=/nixpkgs/trunk/; revision=25691
 2011-01-26 08:09:59 +00:00
David Guibert
4f50c9147f update swt from 3.1.1 to 3.6.1 
svn path=/nixpkgs/trunk/; revision=25682
 2011-01-24 19:57:15 +00:00
Lluís Batlle i Rossell
07b89a3fbb Adding offrss 
svn path=/nixpkgs/trunk/; revision=25672
 2011-01-23 16:40:25 +00:00
Ludovic Courtès
04bd33d520 BDW-GC: Default to the current CVS version. 
svn path=/nixpkgs/trunk/; revision=25669
 2011-01-22 21:34:18 +00:00
Ludovic Courtès
3593d48524 GMP: Further attempt to fix `x86_64-darwin' builds. 
svn path=/nixpkgs/trunk/; revision=25668
 2011-01-22 20:26:50 +00:00
Ludovic Courtès
ec042dad00 GNU Ncurses: Fix C++-less builds. 
svn path=/nixpkgs/trunk/; revision=25649
 2011-01-20 23:32:09 +00:00
Lluís Batlle i Rossell
038e045bc7 Updating libraries related to zrtp. 
svn path=/nixpkgs/trunk/; revision=25645
 2011-01-20 22:05:28 +00:00
Ludovic Courtès
73ed1693f8 GNU libxmi: Augment `meta'. 
svn path=/nixpkgs/trunk/; revision=25637
 2011-01-19 22:56:25 +00:00
Lluís Batlle i Rossell
39506a095d Telling those GNU SIP Witch related packages to use gnutls. 
svn path=/nixpkgs/trunk/; revision=25635
 2011-01-19 21:48:05 +00:00
Lluís Batlle i Rossell
02f2fd1837 Adding GNU SIP Witch. 
svn path=/nixpkgs/trunk/; revision=25634
 2011-01-19 21:17:05 +00:00
Ludovic Courtès
11679ebe4b GNU Ncurses: Attempt to fix Solaris builds. 
svn path=/nixpkgs/trunk/; revision=25594
 2011-01-17 09:16:30 +00:00
Ludovic Courtès
e437b85040 GNU oSIP: Slightly improve `meta'. 
svn path=/nixpkgs/trunk/; revision=25549
 2011-01-13 22:36:07 +00:00
Lluís Batlle i Rossell
3c282f5a31 Adding linphone 
svn path=/nixpkgs/trunk/; revision=25545
 2011-01-13 20:49:58 +00:00
Ludovic Courtès
9b9b5e2f53 Work around hard-coded /usr/bin/nroff' in configure'. 
svn path=/nixpkgs/trunk/; revision=25533
 2011-01-13 10:03:16 +00:00
Michael Raskin
f9c5b90489 Fixing mistaken naming 
svn path=/nixpkgs/trunk/; revision=25516
 2011-01-12 10:46:13 +00:00
Michael Raskin
3a9825c9b0 Adding dissi 
svn path=/nixpkgs/trunk/; revision=25515
 2011-01-12 10:37:57 +00:00
Michael Raskin
dccf3394b1 Adding liblrdf 
svn path=/nixpkgs/trunk/; revision=25514
 2011-01-12 10:25:56 +00:00
Michael Raskin
49ff7df6f1 Adding Mesa 7.9 as an option 
svn path=/nixpkgs/trunk/; revision=25513
 2011-01-12 10:03:37 +00:00
Andres Löh
9d2ff1e084 Added pretty-show Haskell library. 
svn path=/nixpkgs/trunk/; revision=25504
 2011-01-11 10:43:13 +00:00
Ludovic Courtès
52eb2ed976 hwloc 1.1. 
svn path=/nixpkgs/trunk/; revision=25483
 2011-01-10 09:55:14 +00:00
Eelco Dolstra
475ae50c70 * Added jQuery UI. 
svn path=/nixpkgs/trunk/; revision=25465
 2011-01-09 15:43:53 +00:00
Ludovic Courtès
da0860c036 GNU SASL 1.6.0. 
svn path=/nixpkgs/trunk/; revision=25446
 2011-01-06 14:37:55 +00:00
Rob Vermaas
2881362972 do not build commoncpp2 on freebsd 
svn path=/nixpkgs/trunk/; revision=25413
 2011-01-05 10:06:10 +00:00
Rob Vermaas
f6ae8a20bf do not build cln on cygwin 
svn path=/nixpkgs/trunk/; revision=25411
 2011-01-05 09:59:12 +00:00
Rob Vermaas
fb952b2f68 build buddy on all but cygwin 
svn path=/nixpkgs/trunk/; revision=25409
 2011-01-05 09:52:15 +00:00
Rob Vermaas
66402577a0 only build avahi on linux, because it has never built on any platforms other than linux 
svn path=/nixpkgs/trunk/; revision=25408
 2011-01-05 09:46:50 +00:00
Rob Vermaas
adeb63e4c2 remove aterm242fixes 
svn path=/nixpkgs/trunk/; revision=25407
 2011-01-05 09:42:56 +00:00
Rob Vermaas
8a019554f5 only build SDL_gfx on linux 
svn path=/nixpkgs/trunk/; revision=25405
 2011-01-05 09:29:26 +00:00
Peter Simons
781012ed27 pkgs/development/libraries/glibc-2.5/binutils-ld.patch: migrate patch from glibc 2.9 
Adjust the sed script to insert _begin in to newer linker scripts.

svn path=/nixpkgs/trunk/; revision=25383
 2011-01-04 13:12:01 +00:00
Peter Simons
1805fc5229 pkgs/development/libraries/glibc-2.5: patch the 'configure' script to support ld 2.21 or later 
This patch fixes a flawed shell expression that attempts (but fails) to ensure
that GNU ld version 2.13 or later is available.

svn path=/nixpkgs/trunk/; revision=25382
 2011-01-04 13:11:57 +00:00
Evgeny Egorochkin
06c543b11d NSS: version bump and patch to provide pkgconfig info. 
svn path=/nixpkgs/trunk/; revision=25366
 2011-01-03 17:02:58 +00:00
Evgeny Egorochkin
bbedfb4a5e Live builds support: initially for git and svn. taglib_live is packaged as an example. 
svn path=/nixpkgs/trunk/; revision=25351
 2011-01-02 23:23:59 +00:00
Michael Raskin
d22126580e Fix license typo 
svn path=/nixpkgs/trunk/; revision=25339
 2011-01-02 16:35:14 +00:00
Michael Raskin
00544a0fc3 Propagate dbus/glib 
svn path=/nixpkgs/trunk/; revision=25337
 2011-01-02 15:13:36 +00:00
Michael Raskin
660792741d Adding a portaudio svn-head expression 
svn path=/nixpkgs/trunk/; revision=25336
 2011-01-02 14:52:32 +00:00
Michael Raskin
03419cfc5a Adding geoclue - as framework only, feel free to build it with proper data providers if you have a reason for that 
svn path=/nixpkgs/trunk/; revision=25335
 2011-01-02 13:23:59 +00:00
Russell O'Connor
88ec92d14c Matita and its dependencies. 
svn path=/nixpkgs/trunk/; revision=25328
 2010-12-31 17:48:55 +00:00
Lluís Batlle i Rossell
e57b416d69 Fixing the metadata for libmrss. 
svn path=/nixpkgs/trunk/; revision=25326
 2010-12-30 21:24:27 +00:00
Lluís Batlle i Rossell
1c5180c7e5 Adding libmrss and libnxml (dependency of the former) 
svn path=/nixpkgs/trunk/; revision=25325
 2010-12-30 21:23:19 +00:00
Yury G. Kudryashov
0d582266a8 Remove unused patch 
svn path=/nixpkgs/trunk/; revision=25321
 2010-12-29 18:04:17 +00:00
Eelco Dolstra
aa6f43149a * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25308
 2010-12-28 16:42:00 +00:00
Eelco Dolstra
1f5b61713e * Added libvdpau and vdpauinfo. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25296
 2010-12-27 18:30:52 +00:00
Yury G. Kudryashov
e9e22a7238 Rename hupnp to herqq 
Don't pass it to kdelibs as it breaks kdelibs build

svn path=/nixpkgs/trunk/; revision=25289
 2010-12-26 17:18:13 +00:00
Yury G. Kudryashov
20bffe3591 Add hupnp library 
svn path=/nixpkgs/trunk/; revision=25286
 2010-12-26 15:27:26 +00:00
Eelco Dolstra
aceef005c3 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25244
 2010-12-22 17:02:03 +00:00
Michael Raskin
dbd6382955 Fixing license attribute 
svn path=/nixpkgs/trunk/; revision=25241
 2010-12-22 14:52:04 +00:00
Michael Raskin
22c42a26b6 Adding OGRE - object-oriented graphical engine 
svn path=/nixpkgs/trunk/; revision=25240
 2010-12-22 14:50:13 +00:00
Michael Raskin
f7f753b3a4 Adding OIS library 
svn path=/nixpkgs/trunk/; revision=25232
 2010-12-22 10:46:57 +00:00
Eelco Dolstra
c14382cb45 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25225
 2010-12-21 15:14:33 +00:00
Marco Maggesi
d43bda0086 * Update lablgtk2 (and enable hydra build) 
svn path=/nixpkgs/trunk/; revision=25213
 2010-12-20 14:58:56 +00:00
Lluís Batlle i Rossell
b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
 2010-12-17 20:39:58 +00:00
Michael Raskin
af589388b0 Increase polygon vertex count for Box2D 
svn path=/nixpkgs/trunk/; revision=25177
 2010-12-17 15:40:34 +00:00
Michael Raskin
871112b8db Adding Box2D version 2.0.1 
svn path=/nixpkgs/trunk/; revision=25174
 2010-12-17 14:15:52 +00:00
Michael Raskin
aa744f88a1 Adding Box2D library 
svn path=/nixpkgs/trunk/; revision=25172
 2010-12-17 13:02:17 +00:00
Yury G. Kudryashov
b93fed7f31 poppler-0.14.5 
svn path=/nixpkgs/trunk/; revision=25122
 2010-12-14 13:30:06 +00:00
Yury G. Kudryashov
858d869d66 iso-codes-3.23 
svn path=/nixpkgs/trunk/; revision=25117
 2010-12-14 10:21:38 +00:00
Yury G. Kudryashov
f3ec17a7ed enchant-1.6.1 
svn path=/nixpkgs/trunk/; revision=25116
 2010-12-14 10:21:33 +00:00
Lluís Batlle i Rossell
a8a01a54ab Removing another glibc patch already upstream. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25111
 2010-12-14 07:32:07 +00:00
Lluís Batlle i Rossell
8895565d45 I think we had a *double* patch for the security problem CVE-2010-3856. 
I had added the audit_suid.patch some time ago, and at some point niksnut added
this ignore-origin.patch. I think both fix the situation, the
ignore-origin.patch being released sooner than the audit_suid. As the
ignore-origin-patch is not in the recent glibc, it makes me think it was a quick
solution to the vulnerability, later properly fixed.

I remove, then, the ignore-origin.patch. We can check later if we remain
vulnerable.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25110
 2010-12-13 23:09:57 +00:00
Lluís Batlle i Rossell
55051fec78 Removing patches for glibc bugs already fixed in the new glibc version. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25109
 2010-12-13 23:09:09 +00:00
Lluís Batlle i Rossell
3c78b20229 Updating glibc to 2.12.2 (considering the ports for 2.12.1 would work equally). 
I also update the url for the ports to take the upstream tarball instead of a
copy I had in vicerveza.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25108
 2010-12-13 23:08:10 +00:00
Yury G. Kudryashov
3c6835f8d8 Hunspell-1.2.12 
svn path=/nixpkgs/trunk/; revision=25103
 2010-12-13 18:10:31 +00:00
Yury G. Kudryashov
9302989be1 exiv2-0.21 
svn path=/nixpkgs/trunk/; revision=25102
 2010-12-13 18:10:26 +00:00
Yury G. Kudryashov
14bf6f5ea5 icu-4.6 
svn path=/nixpkgs/trunk/; revision=25101
 2010-12-13 18:10:21 +00:00
Ludovic Courtès
ac8c173eb6 GnuTLS 2.10.4. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25081
 2010-12-12 20:19:33 +00:00
Ludovic Courtès
c4756a5bb3 GNU libtasn1 2.9. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25079
 2010-12-12 20:19:23 +00:00
Ludovic Courtès
12280e41b6 GNU Linear Programming Kit 4.45. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25078
 2010-12-12 20:19:18 +00:00
Ludovic Courtès
209522e365 GNU Common C++ 1.8.1. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25077
 2010-12-12 20:19:13 +00:00
Ludovic Courtès
ac09f5b42d GNU ccRTP 1.7.2. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25076
 2010-12-12 20:19:08 +00:00
Lluís Batlle i Rossell
ee04ffcb55 Updating from trunk. I resolved simple conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
 2010-12-11 12:47:00 +00:00
Eelco Dolstra
5b9427a829 * SQLite 3.7.4. 
svn path=/nixpkgs/trunk/; revision=25049
 2010-12-10 10:21:45 +00:00
Lluís Batlle i Rossell
2d3cf91094 Updating openssl according to a security advisory in their web page. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25039
 2010-12-08 21:36:03 +00:00
Eelco Dolstra
528a471aa8 * apr-util updated to 1.3.10. 
svn path=/nixpkgs/trunk/; revision=25000
 2010-12-06 13:34:00 +00:00
Yury G. Kudryashov
eeda98a673 Remove qt-4.5 
svn path=/nixpkgs/trunk/; revision=24991
 2010-12-06 12:04:09 +00:00
Lluís Batlle i Rossell
1b62c9c061 I made changes to achieve a working cross-built gcc wrapper. Now, 
"gcc45.hostDrv" works in the host system, together with libc, binutils, dynamic
linker, ...


svn path=/nixpkgs/branches/stdenv-updates/; revision=24971
 2010-12-04 21:45:37 +00:00
Lluís Batlle i Rossell
9af474ca72 Fixing a problem of nscd on (only) armv5tel (soft-float). 
It gets linked to libgcc_s (shared lib) unless doing the trick I thought feasible of
telling 'configure' that the linker does not support "as-needed".
I found this reading their 'configure' script.

We don't want nscd linked to libgcc because that would make glibc dependant on the
previous gcc. This only happens on armv5tel, for the supported platforms.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24959
 2010-12-02 22:23:15 +00:00
Lluís Batlle i Rossell
fca73ee251 Making directfb with more options, so it can be cross-built without X for example. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24926
 2010-11-29 18:00:26 +00:00
Eelco Dolstra
009bfb702d * Sync with the trunk. 
svn path=/nixpkgs/branches/cve-2010-3856/; revision=24921
 2010-11-29 16:03:36 +00:00
Evgeny Egorochkin
676562ac15 encfs: packaged. Patch by Ambrus Kaposi. 
svn path=/nixpkgs/trunk/; revision=24900
 2010-11-28 09:59:13 +00:00
Michael Raskin
94585b9776 Add CGUI library 
svn path=/nixpkgs/trunk/; revision=24894
 2010-11-27 19:38:34 +00:00
Michael Raskin
ec741fee8c Adding Allegro library 
svn path=/nixpkgs/trunk/; revision=24891
 2010-11-27 18:31:05 +00:00
Lluís Batlle i Rossell
0e4c970d11 Updating from trunk - I hope I fixed the conflict around gettext - I left it as 
it was before merging.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24876
 2010-11-26 14:40:39 +00:00
Eelco Dolstra
16c34f2f6f * SQLite 3.6.23.1. 
svn path=/nixpkgs/trunk/; revision=24825
 2010-11-23 18:01:33 +00:00
Michael Raskin
31b22ed108 Merge from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24820
 2010-11-23 08:57:29 +00:00
Andres Löh
c2916439fe Added multiplate. 
svn path=/nixpkgs/trunk/; revision=24813
 2010-11-22 15:19:23 +00:00
Rob Vermaas
a2df7f46ea v8: no abort 
svn path=/nixpkgs/trunk/; revision=24810
 2010-11-22 14:32:43 +00:00
Rob Vermaas
1c86c832c1 add google v8 engine 
svn path=/nixpkgs/trunk/; revision=24809
 2010-11-22 14:23:06 +00:00
Eelco Dolstra
1af46c1160 * Qt doesn't build on Darwin. 
svn path=/nixpkgs/trunk/; revision=24807
 2010-11-22 12:45:59 +00:00
Michael Raskin
6af8a1debd Merging from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24804
 2010-11-22 11:39:42 +00:00
Lluís Batlle i Rossell
560b88b920 I forgot a patch I mentioned in the previous commit. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24779
 2010-11-19 22:21:05 +00:00
Andres Löh
fcdc36c848 Added gtk-based plot capabilities for criterion. 
svn path=/nixpkgs/trunk/; revision=24778
 2010-11-19 19:34:41 +00:00
Rob Vermaas
db8748b170 added eclipse 3.6.1, maven3, szip 
svn path=/nixpkgs/trunk/; revision=24772
 2010-11-19 13:24:11 +00:00
Michael Raskin
f904e3c821 Brute-force fix; I cannot understand why GCC behaves in a complicated way, but there is a simple workaround 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24771
 2010-11-19 13:12:13 +00:00
Lluís Batlle i Rossell
a98b72fb77 New glibc fix, this time for https://bugzilla.redhat.com/show_bug.cgi?id=651638 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24761
 2010-11-18 22:59:57 +00:00
Lluís Batlle i Rossell
453150ae83 Adding another fix for glibc, for a security hole, suggested by niksnut. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24760
 2010-11-18 20:33:29 +00:00
Lluís Batlle i Rossell
d7b494a2f4 Updating from trunk to get a security fix on openssl. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24759
 2010-11-18 20:00:39 +00:00
Eelco Dolstra
9d0330014e * Patches for two critical Glibc vulnerabilities: CVE-2010-3847 
($ORIGIN not ignored for setuid programs) and CVE-2010-3856
  (arbitrary DSO loading via LD_AUDIT).

svn path=/nixpkgs/branches/cve-2010-3856/; revision=24755
 2010-11-18 10:49:55 +00:00
Michael Raskin
d1f4ec332b Quick-and-dirty insertion of missing include - we would fail on a platform without stat.h anyway 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24753
 2010-11-18 10:16:54 +00:00
Evgeny Egorochkin
f9e49da793 openSSL: bump due to security issues 
svn path=/nixpkgs/trunk/; revision=24751
 2010-11-17 22:17:36 +00:00
Michael Raskin
fb58f74d82 Updating from trunk again 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
 2010-11-17 17:03:09 +00:00
Michael Raskin
2254567b31 Update farsight2 and enable python bindings 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24744
 2010-11-17 16:27:48 +00:00
Andres Löh
7ad36d1940 Agda version bump to 2.2.8 
svn path=/nixpkgs/trunk/; revision=24743
 2010-11-17 16:00:33 +00:00
Andres Löh
fa79bbbc9a Added the Haskell criterion package. 
svn path=/nixpkgs/trunk/; revision=24741
 2010-11-17 15:38:16 +00:00
Andres Löh
ad9d05d909 Version bump for leksah (plus dependencies). Now works with ghc-6.12.3. 
svn path=/nixpkgs/trunk/; revision=24737
 2010-11-17 14:48:12 +00:00
Michael Raskin
0cfdfadc73 Add gst-python 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24733
 2010-11-17 13:11:41 +00:00
Rob Vermaas
de68a76cf8 added netcdf-4.1.1 
svn path=/nixpkgs/trunk/; revision=24722
 2010-11-17 10:05:46 +00:00
Michael Raskin
e59ddf7bcb Update Cairo, Pixman; update FF4beta - still broken, cannot pass fresh cairo correctly to it yet 
svn path=/nixpkgs/trunk/; revision=24714
 2010-11-16 21:05:54 +00:00
Andres Löh
2482ad5215 darcs version-bumped to 2.5 
svn path=/nixpkgs/trunk/; revision=24710
 2010-11-16 13:14:50 +00:00
Andres Löh
bc1f04c744 Updated/added a number of Haskell libraries. 
svn path=/nixpkgs/trunk/; revision=24700
 2010-11-15 20:28:21 +00:00
Lluís Batlle i Rossell
7cde3a69cd Updating the libedit build so it works fine with wide chars. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24693
 2010-11-15 19:39:11 +00:00
Peter Simons
0460e3f2f7 Enable building of static libraries so that urweb can build statically 
linked binaries.

svn path=/nixpkgs/trunk/; revision=24692
 2010-11-15 17:47:36 +00:00
Evgeny Egorochkin
87d199330f Libtorrent-rasterbar: fix license 
svn path=/nixpkgs/trunk/; revision=24687
 2010-11-15 09:52:52 +00:00
Evgeny Egorochkin
5029db2160 Spring RTS: packaged along with its deps and utils: libDevIL, libtorrent-rasterbar, spring-lobby. 
svn path=/nixpkgs/trunk/; revision=24681
 2010-11-13 07:47:04 +00:00
Lluís Batlle i Rossell
8746de3ae8 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
 2010-11-11 22:18:14 +00:00
Lluís Batlle i Rossell
8876963325 I forgot a patch for freeimage. 
svn path=/nixpkgs/trunk/; revision=24673
 2010-11-11 22:16:39 +00:00
Rob Vermaas
523c1de575 re-add gettext 0.17 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24663
 2010-11-11 14:42:35 +00:00
Michael Raskin
df168884a0 amd64 is still x86 
svn path=/nixpkgs/trunk/; revision=24648
 2010-11-10 17:32:08 +00:00
Michael Raskin
d19aa61253 Update Botan 
svn path=/nixpkgs/trunk/; revision=24639
 2010-11-10 14:48:42 +00:00
Lluís Batlle i Rossell
93718907e4 Updating freeimage 
svn path=/nixpkgs/trunk/; revision=24630
 2010-11-09 14:30:58 +00:00
Rob Vermaas
5cf61c616b openssl: to make darwin build again, update darwin-arch.patch 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24629
 2010-11-09 14:09:22 +00:00
Piotr Pietraszkiewicz
f540277f97 added the sword framework 
svn path=/nixpkgs/trunk/; revision=24586
 2010-11-03 20:36:36 +00:00
Michael Raskin
770eaeb8e2 Roll back on XHTML-MP 
svn path=/nixpkgs/trunk/; revision=24576
 2010-11-02 18:38:09 +00:00
Michael Raskin
1521632413 Try updating WebKit 
svn path=/nixpkgs/trunk/; revision=24572
 2010-11-02 15:34:20 +00:00
Lluís Batlle i Rossell
00d1d949d7 Updating kdenlive (and mlt as a requirement) 
svn path=/nixpkgs/trunk/; revision=24567
 2010-11-02 13:23:59 +00:00
Lluís Batlle i Rossell
f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in 
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
 2010-10-31 19:30:31 +00:00
Ludovic Courtès
eb40c213dd Add Tokyo Cabinet, a key-value database that performs better. 
svn path=/nixpkgs/trunk/; revision=24548
 2010-10-30 21:44:29 +00:00
Ludovic Courtès
b6072abeac Add Google's Protocol Buffers. 
svn path=/nixpkgs/trunk/; revision=24547
 2010-10-30 21:44:22 +00:00
Lluís Batlle i Rossell
acd1e6ee3a Removing a patch for glibc that I thought was needed for i686-linux. 
Building with gcc 4.4 as minimum was needed, and not this patch.
http://sourceware.org/bugzilla/show_bug.cgi?id=12123

I uploaded new i686-linux bootstrap-tools with gcc 4.5.1, but I'll not update
the i686 reference to those bootstrap-tools until they are reachable by http.
The bootstrap-tools we used until now had gcc 4.3, said not to be able to build
glibc 2.12.1.

Meanwhile other platforms can go on building this glibc already without the
patch.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24522
 2010-10-28 23:04:34 +00:00
Russell O'Connor
d953e6bb35 Add flac and ogg vorbis to libsndfile 
Updating libsndfile to the latest version while I'm at it.


svn path=/nixpkgs/trunk/; revision=24514
 2010-10-28 14:00:41 +00:00
Lluís Batlle i Rossell
2b34bdd2ba Two fixes in one: 
- our gcc should not bring libssp, because glibc provides __stack_chk_fail
  already. libssp is only for some non-glibc systems.
  The gcc configure script was not finding the header files of our glibc, so
  it assumed it did not provide __stack_chk_fail. I wrote code in the builder
  that patches the gcc/configure script properly for that.

  As a consequence, the glibc does not need anymore the "nscd-ssp-linking"
  patch, and we have a saner gcc (without libssp when using -fstack-protector)
- Instead of disabling the sse42 strstr() implementation in glibc due to the
  bug http://sourceware.org/bugzilla/show_bug.cgi?id=12123, I provide a better
  patch written after more reserach (that I submitted upstream already, and
  it's pending review).


svn path=/nixpkgs/branches/stdenv-updates/; revision=24493
 2010-10-26 18:56:02 +00:00
Lluís Batlle i Rossell
f3da1c5e80 Adding a fix for an important glibc vulnerability, very easy to exploit: 
http://www.securityfocus.com/bid/44347

svn path=/nixpkgs/branches/stdenv-updates/; revision=24475
 2010-10-25 18:25:23 +00:00
Michael Raskin
45f78e3feb Fixing source 
svn path=/nixpkgs/trunk/; revision=24463
 2010-10-25 09:04:45 +00:00
Michael Raskin
ec500ae264 Add libfixposix 
svn path=/nixpkgs/trunk/; revision=24462
 2010-10-25 05:52:13 +00:00
Lluís Batlle i Rossell
6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
 2010-10-23 14:52:21 +00:00
Lluís Batlle i Rossell
3ae506c409 Updating libjpeg-turbo 
svn path=/nixpkgs/trunk/; revision=24427
 2010-10-23 14:42:31 +00:00
Peter Simons
1e7ef9e33f pkgs/development/libraries/libsamplerate: fixed the sha256 hash of the release tarball 
svn path=/nixpkgs/trunk/; revision=24421
 2010-10-22 15:04:26 +00:00
Rob Vermaas
202774b93e added ftgl, gource 
svn path=/nixpkgs/trunk/; revision=24379
 2010-10-20 10:53:45 +00:00
Lluís Batlle i Rossell
4309788df0 Adding a comment on the status of the nscd patch in glibc 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24371
 2010-10-19 21:20:00 +00:00
Ludovic Courtès
ce292f38f9 Add IcedTea. 
This is an old attempt at making it work.  Help welcome!

svn path=/nixpkgs/trunk/; revision=24360
 2010-10-19 08:19:46 +00:00
Sander van der Burg
0cc4ca1fcd Changed my dirty libiconv hacks I once made for i686-freebsd, into a more consistent manner by checking for a non-Linux platform in the build expressions. Hopefully, this increases portability for non-Linux platforms 
svn path=/nixpkgs/trunk/; revision=24347
 2010-10-18 11:30:44 +00:00
Yury G. Kudryashov
13101cfab2 Fix evaluation 
svn path=/nixpkgs/trunk/; revision=24333
 2010-10-17 19:07:03 +00:00
Yury G. Kudryashov
c703c1d560 hspell (another KDE dependency) 
svn path=/nixpkgs/trunk/; revision=24331
 2010-10-17 18:44:00 +00:00
Yury G. Kudryashov
74c19fec9b grantlee-0.1.7 
svn path=/nixpkgs/trunk/; revision=24329
 2010-10-17 18:43:43 +00:00
Lluís Batlle i Rossell
955fe6f69d Fixing the nscd patch again. The other attempts did not give a working nscd. 
The build system was making a nscd dynamically linked with libssp, which we
don't want in general. We want a glibc not depending on the gcc that built it.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24313
 2010-10-15 22:58:12 +00:00
Lluís Batlle i Rossell
d5f6182edc I made one of the glibc patches wrong (typo). I fix it. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24309
 2010-10-15 20:06:55 +00:00
Lluís Batlle i Rossell
6b35b69a28 Workaround to overcome the glibc/gcc bug: 
http://sources.redhat.com/bugzilla/show_bug.cgi?id=12123

I also fixed a wrong comment I had committed in the previous commit.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24306
 2010-10-15 18:00:12 +00:00
Lluís Batlle i Rossell
9ed84bc432 Trying to fix the nscd ssp problem finally. 
http://sources.redhat.com/bugzilla/show_bug.cgi?id=12125
I also reported this upstream, as it seems broken since 2.11.1


svn path=/nixpkgs/branches/stdenv-updates/; revision=24305
 2010-10-15 17:56:01 +00:00
Lluís Batlle i Rossell
262bcb3f58 Blind commit enabling the '-lssp' for nscd in glibc2.12 
It looks like we need it when building the glibc212 attribute using nixpkgs's
gcc, instead of bootstrap-tools'.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24296
 2010-10-15 09:17:34 +00:00
Evgeny Egorochkin
cd9d20d2e7 incrTcl: packaged 
svn path=/nixpkgs/trunk/; revision=24279
 2010-10-14 11:54:13 +00:00
Evgeny Egorochkin
5a4bc5b072 URT library: packaged 
svn path=/nixpkgs/trunk/; revision=24278
 2010-10-14 11:54:06 +00:00
Evgeny Egorochkin
0dfc76901b JaMa library: packaged 
svn path=/nixpkgs/trunk/; revision=24277
 2010-10-14 11:53:59 +00:00
Evgeny Egorochkin
41ff904b91 TNT library: packaged 
svn path=/nixpkgs/trunk/; revision=24276
 2010-10-14 11:53:53 +00:00
Michael Raskin
dc1f986944 Remove libcv; reference opencv instead. 
svn path=/nixpkgs/trunk/; revision=24272
 2010-10-14 10:45:36 +00:00
Michael Raskin
494ba6a813 Add unicap 
svn path=/nixpkgs/trunk/; revision=24271
 2010-10-14 10:10:45 +00:00
Andres Löh
b421bbd0ea Added a few Haskell packages as submitted by Ilya Cassina. 
svn path=/nixpkgs/trunk/; revision=24269
 2010-10-13 21:18:35 +00:00
Michael Raskin
ae55f51ab6 Add missing XRender buildinputs for WebKit 
svn path=/nixpkgs/trunk/; revision=24265
 2010-10-13 13:11:50 +00:00
Michael Raskin
334dde45ab Try updating WebKit and a missing buildInput 
svn path=/nixpkgs/trunk/; revision=24260
 2010-10-13 11:53:18 +00:00
Eelco Dolstra
40c9c60211 * libdrm updated to 2.4.22. 
svn path=/nixpkgs/trunk/; revision=24256
 2010-10-12 22:12:54 +00:00
Lluís Batlle i Rossell
27ae94e566 The glibc locales expression did not work limiting SUPPORTED-LOCALES. Now it does. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24249
 2010-10-12 20:41:40 +00:00
Lluís Batlle i Rossell
61e9f9cede Cross-building ncursesw was not that easy; it needed this patch, at least for 
the current nixpkgs (gcc, glibc)

svn path=/nixpkgs/branches/stdenv-updates/; revision=24246
 2010-10-12 19:39:30 +00:00
Yury G. Kudryashov
9808967475 grantlee-0.1.6 
svn path=/nixpkgs/trunk/; revision=24236
 2010-10-12 08:04:16 +00:00
Yury G. Kudryashov
42c91e693d libspectre-0.2.6 
svn path=/nixpkgs/trunk/; revision=24234
 2010-10-12 07:49:19 +00:00
Andres Löh
c4c983464a Moved creation of symlink to postFixup phase. 
This, together with a check if the symlink is necessary,
should prevent the occurrence of dangling symlinks.

svn path=/nixpkgs/trunk/; revision=24232
 2010-10-12 07:26:45 +00:00
Andres Löh
ff00c38541 Added a few Haskell packages, updated vty. 
svn path=/nixpkgs/trunk/; revision=24231
 2010-10-12 07:02:25 +00:00
Sander van der Burg
e1426e9993 Bumped gst-plugins-good to version 0.10.25. This also fixes a compilation error 
svn path=/nixpkgs/trunk/; revision=24215
 2010-10-11 13:51:50 +00:00
Eelco Dolstra
0fcf6e1f40 * Added xfce4-mixer. This requires gstreamer and gst-plugins-base. 
* Allow gst-plugins-base to be built with a minimal set of dependencies
  (to prevent dependency bloat in Xfce).
* Updated gstreamer.

svn path=/nixpkgs/trunk/; revision=24207
 2010-10-10 22:34:48 +00:00
Lluís Batlle i Rossell
e7e103b8eb Updating from trunk (to catch cron changes) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24200
 2010-10-10 11:44:28 +00:00
Michael Raskin
0d765e6673 Update description to mention APNG patch 
svn path=/nixpkgs/trunk/; revision=24189
 2010-10-08 19:11:15 +00:00
Michael Raskin
758a6aa848 Fixing libpng-apng source expression 
svn path=/nixpkgs/trunk/; revision=24170
 2010-10-08 05:59:40 +00:00
Michael Raskin
9e3af1a70a Giving libpng-APNG a distinct name 
svn path=/nixpkgs/trunk/; revision=24168
 2010-10-08 05:57:40 +00:00
Michael Raskin
dbca05712e Adding libpng-APNG (libpng with a patch for animated png support) 
svn path=/nixpkgs/trunk/; revision=24167
 2010-10-08 05:57:15 +00:00
Ludovic Courtès
481ec66882 attr: Remove unnecessary dependency on Libtool. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24163
 2010-10-07 22:29:25 +00:00
Lluís Batlle i Rossell
fa4ef6621a Fixing nscd in glibc (thank you Ludovic!). 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24157
 2010-10-07 21:59:31 +00:00
Lluís Batlle i Rossell
180cb34e2a Removing a glibc patch for nscd I think we don't need anymore in the main glibc 
expression.
For what I could see from the build log, although it should add a '-lssp', it
did not have any effect in this glibc 2.12.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24156
 2010-10-07 21:23:09 +00:00
Lluís Batlle i Rossell
fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
 2010-10-07 21:21:31 +00:00
Ludovic Courtès
40e57793f9 Add Check, a unit testing framework for C. 
svn path=/nixpkgs/trunk/; revision=24127
 2010-10-07 07:29:36 +00:00
Peter Simons
8a3066dca8 pkgs/development/libraries/pango: support 64-bit Darwin 
svn path=/nixpkgs/trunk/; revision=24114
 2010-10-06 11:52:00 +00:00
Peter Simons
69aa532b32 pkgs/development/libraries/pango: updated to version 1.28.3 
svn path=/nixpkgs/trunk/; revision=24113
 2010-10-06 11:51:53 +00:00
Peter Simons
d095fbb13e pkgs/development/libraries/pcre: fixed build on Darwin 
The gcc version used on Darwin crashes while compiling the C++ interface
of PCRE. Building that code with -O0 avoids the crash.

svn path=/nixpkgs/trunk/; revision=24107
 2010-10-06 10:29:45 +00:00
Ludovic Courtès
97ae4239e4 GnuTLS 2.10.2. 
svn path=/nixpkgs/trunk/; revision=24103
 2010-10-05 22:08:53 +00:00