Commit graph

6047 commits

Author SHA1 Message Date
Nicolas Pierron
daa6f9c7ef Add a common merge function. (mergeOneOption)
This merge function allow only one definition for an option.

svn path=/nixpkgs/trunk/; revision=13841
2009-01-25 00:31:38 +00:00
Nicolas Pierron
9581664fb9 Add the "notdef" value when no else-part is defined.
Remove the "notdef" values from the user-defined values.

svn path=/nixpkgs/trunk/; revision=13840
2009-01-25 00:31:33 +00:00
Nicolas Pierron
57f66db54c Remove extra arguments from uniqFlatten.
Clean-up fixOptionSetsFun.

svn path=/nixpkgs/trunk/; revision=13839
2009-01-25 00:31:29 +00:00
Nicolas Pierron
13d5c8923d factor mergeOptionSets and filterOptionSets into the function handleOptionSets.
svn path=/nixpkgs/trunk/; revision=13838
2009-01-25 00:31:23 +00:00
Ludovic Courtès
db7f0d3ef5 Cairo: Propagate Freetype, since public headers include it.
svn path=/nixpkgs/trunk/; revision=13837
2009-01-24 22:09:14 +00:00
Ludovic Courtès
f5b2036a60 Cairomm 1.7.2.
svn path=/nixpkgs/trunk/; revision=13836
2009-01-24 21:55:16 +00:00
Ludovic Courtès
0b6168c587 Cairo 1.8.6.
svn path=/nixpkgs/trunk/; revision=13835
2009-01-24 21:32:25 +00:00
Ludovic Courtès
05e01abc75 Xorg Pixman 0.13.2.
svn path=/nixpkgs/trunk/; revision=13834
2009-01-24 21:29:57 +00:00
Lluís Batlle i Rossell
aad3e77b44 Adding cdecl-2.5
svn path=/nixpkgs/trunk/; revision=13833
2009-01-24 21:01:27 +00:00
Lluís Batlle i Rossell
00756b63b0 Adding a qt3gcc3 package, for opera.
svn path=/nixpkgs/trunk/; revision=13832
2009-01-24 21:01:17 +00:00
Lluís Batlle i Rossell
50d8df47b2 Making wxGTK-2.8 to provide wxGLCanvas. Adding dependence on mesa.
svn path=/nixpkgs/trunk/; revision=13831
2009-01-24 21:00:53 +00:00
Lluís Batlle i Rossell
5a9098ea36 Fixing the dict-1.9.15 url, setting it to sourceforge mirror.
The old didn't work for me for several days.

svn path=/nixpkgs/trunk/; revision=13830
2009-01-24 20:58:29 +00:00
Ludovic Courtès
402a4e3b3a GNU libgcrypt 1.4.4.
svn path=/nixpkgs/trunk/; revision=13828
2009-01-23 15:59:31 +00:00
Ludovic Courtès
71cbd0995a Enlightenment 0.16.8.15.
Patch by John Altobelli <acocaracha@gmail.com>, minor edits by
Ludovic Courtès <ludo@gnu.org>.

svn path=/nixpkgs/trunk/; revision=13823
2009-01-22 22:46:39 +00:00
Ludovic Courtès
7137c6dea8 libcanberra: Use the right GTK+ version, use GThread as well, disable OSS support (recommended).
svn path=/nixpkgs/trunk/; revision=13822
2009-01-22 22:34:06 +00:00
Ludovic Courtès
3e20a89b3d GTK+ 2.14.7 and companion libraries.
svn path=/nixpkgs/trunk/; revision=13821
2009-01-22 22:32:02 +00:00
Michael Raskin
3b06a508f1 Updating SGT-Puzzles
svn path=/nixpkgs/trunk/; revision=13820
2009-01-21 19:29:08 +00:00
Michael Raskin
c1c19985e5 sgt-puzzles update - patch by Pauline
svn path=/nixpkgs/trunk/; revision=13819
2009-01-21 18:39:38 +00:00
Marc Weber
0ad62a0edb adding gitAttr
now containing qgit, stgit, topGit, hg2git
updating gitGit (git dev version), adding qgit-git (dev version)

svn path=/nixpkgs/trunk/; revision=13816
2009-01-20 22:15:42 +00:00
Ludovic Courtès
269f914ab7 Add `libcanberra'.
svn path=/nixpkgs/trunk/; revision=13814
2009-01-20 09:50:15 +00:00
Ludovic Courtès
5f8017b492 libvorbis: Propagate `libogg'.
svn path=/nixpkgs/trunk/; revision=13813
2009-01-20 09:50:05 +00:00
Ludovic Courtès
5bc0b549f0 PulseAudio: Use new ALSA, disable ConsoleKit.
svn path=/nixpkgs/trunk/; revision=13809
2009-01-19 20:22:54 +00:00
Ludovic Courtès
d17d9dfb39 ALSA 1.0.19.
svn path=/nixpkgs/trunk/; revision=13808
2009-01-19 20:21:23 +00:00
Andres Löh
8a1fb2e075 Updated URIs of old ghc-6.8.2.
svn path=/nixpkgs/trunk/; revision=13802
2009-01-18 14:04:34 +00:00
Ludovic Courtès
2034ecb046 PulseAudio: Remove aDNS since what it really wants is `libasyncns'.
svn path=/nixpkgs/trunk/; revision=13801
2009-01-17 21:25:26 +00:00
Ludovic Courtès
443bb3960a PulseAudio: Use aDNS and X11 libraries.
svn path=/nixpkgs/trunk/; revision=13800
2009-01-17 21:17:57 +00:00
Ludovic Courtès
8bf27945c6 GNU aDNS: Disable the test suite for now.
svn path=/nixpkgs/trunk/; revision=13799
2009-01-17 20:19:54 +00:00
Ludovic Courtès
417303c201 PulseAudio: Set the right `localstatedir'.
svn path=/nixpkgs/trunk/; revision=13798
2009-01-17 18:22:30 +00:00
Michael Raskin
b8cbf3b794 Syncing ghostscriptX to main gs expression
svn path=/nixpkgs/trunk/; revision=13797
2009-01-17 13:49:42 +00:00
Michael Raskin
4e9b120ad2 small fixes to build custom kernel
svn path=/nixpkgs/trunk/; revision=13795
2009-01-17 13:40:12 +00:00
Eelco Dolstra
e7a94d6fef * Ghostscript: build the CUPS filter. This allows CUPS to print to
non-Postscript printers.

svn path=/nixpkgs/trunk/; revision=13793
2009-01-17 13:08:51 +00:00
Eelco Dolstra
dc8e9933f9 * Fixed URL.
svn path=/nixpkgs/trunk/; revision=13792
2009-01-17 13:08:04 +00:00
Eelco Dolstra
979f70ab5b * Subversion 1.5.5.
svn path=/nixpkgs/trunk/; revision=13784
2009-01-16 10:40:50 +00:00
Eelco Dolstra
4eedf7dae8 * Install the arch-specific headers for Linux <= 2.6.27 properly
again.

svn path=/nixpkgs/trunk/; revision=13783
2009-01-16 10:28:18 +00:00
Eelco Dolstra
8236fa02be svn path=/nixpkgs/trunk/; revision=13782 2009-01-15 20:52:33 +00:00
Eelco Dolstra
89364df3e9 svn path=/nixpkgs/trunk/; revision=13781 2009-01-15 16:22:01 +00:00
Eelco Dolstra
7df6cdf6da * Doh.
svn path=/nixpkgs/trunk/; revision=13780
2009-01-15 15:59:59 +00:00
Eelco Dolstra
f89876974e * Use the generic kernel builder.
svn path=/nixpkgs/trunk/; revision=13779
2009-01-15 15:54:24 +00:00
Eelco Dolstra
a0670a904e * Reduce duplication between kernel expressions.
svn path=/nixpkgs/trunk/; revision=13778
2009-01-15 15:40:23 +00:00
Eelco Dolstra
2188660f2d * CONFIG_LSF should be set on i686, otherwise ext4 can't even mount
filesystems created by mkfs.ext4 with default options.

svn path=/nixpkgs/trunk/; revision=13777
2009-01-15 15:11:14 +00:00
Sander van der Burg
2d0881a5ff Updated Apache Tomcat to 6.0.18
svn path=/nixpkgs/trunk/; revision=13776
2009-01-15 15:06:20 +00:00
Eelco Dolstra
739ef5e82a * Various hacks needed to get the NVIDIA driver to build on
Linux 2.6.28.  In particular the arch-specific headers
  are in a different place now.  (I'd like to do "make
  headers_install", but it doesn't install all the headers
  that are needed to build external kernel modules.  What
  a mess.)
* Add Linux 2.6.28 to the channel.

svn path=/nixpkgs/trunk/; revision=13775
2009-01-15 15:00:30 +00:00
Eelco Dolstra
eeb63a3ed4 * Latest splashutils.
svn path=/nixpkgs/trunk/; revision=13774
2009-01-15 14:58:50 +00:00
Eelco Dolstra
164e1a7ff2 * Latest Intel 3945/4965 wireless firmwares. Actually there are newer
versions, but they're apparently for Linux >= 2.6.29 (e.g. they
  provide iwlwifi-3945-2.ucode instead of iwlwifi-3945-1.ucode).

svn path=/nixpkgs/trunk/; revision=13771
2009-01-15 10:36:21 +00:00
Marc Weber
b92b8242fd bazaar version bump to 1.10 (by Jan Kroeze)
svn path=/nixpkgs/trunk/; revision=13768
2009-01-14 16:26:53 +00:00
Marc Weber
e6ab06e3fa python wrapper: install pydoc as well
svn path=/nixpkgs/trunk/; revision=13767
2009-01-14 16:23:17 +00:00
Marc Weber
91f9300897 added dvdauthor
svn path=/nixpkgs/trunk/; revision=13766
2009-01-14 16:23:06 +00:00
Ludovic Courtès
3a1e0aa114 Build Teeworlds.
svn path=/nixpkgs/trunk/; revision=13765
2009-01-14 00:24:02 +00:00
Ludovic Courtès
474ff7c05c Teeworlds 0.5.0.
svn path=/nixpkgs/trunk/; revision=13764
2009-01-14 00:23:11 +00:00
Ludovic Courtès
dc28c92e63 Teeworlds: install all the executables (client, server, etc.).
svn path=/nixpkgs/trunk/; revision=13763
2009-01-13 20:36:09 +00:00