1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Commit graph

5905 commits

Author SHA1 Message Date
Nicolas Pierron c2be87e132 Remove support for merge function with name argument.
svn path=/nixpkgs/trunk/; revision=13869
2009-01-25 21:23:47 +00:00
Lluís Batlle i Rossell 6c2c6d7fe4 Fixing commits I did, which didn't follow well the writing rules.
svn path=/nixpkgs/trunk/; revision=13868
2009-01-25 21:03:07 +00:00
Lluís Batlle i Rossell 09d68fcad2 First steps trying to build VirtualBox. I haven't finished.
I left before trying to install and run the files compiled.

svn path=/nixpkgs/trunk/; revision=13863
2009-01-25 20:09:17 +00:00
Ludovic Courtès 52474a1f6c C++ bindings of the GTK+ 2.14 libraries.
svn path=/nixpkgs/trunk/; revision=13862
2009-01-25 17:01:29 +00:00
Lluís Batlle i Rossell c844c68142 Adding yafc-1.1.1
svn path=/nixpkgs/trunk/; revision=13846
2009-01-25 14:31:51 +00:00
Lluís Batlle i Rossell fb1fd1115f Adding Intel ACPI Compiler (trying to build virtualbox)
svn path=/nixpkgs/trunk/; revision=13845
2009-01-25 14:31:42 +00:00
Lluís Batlle i Rossell e44ec52b45 Adding dev86 (I'll try to get virtualbox built)
svn path=/nixpkgs/trunk/; revision=13844
2009-01-25 14:31:24 +00:00
Ludovic Courtès e8847fd2e7 Cairo: Arrange so that Freetype `-I' flags are propagated.
svn path=/nixpkgs/trunk/; revision=13843
2009-01-25 11:50:29 +00:00
Nicolas Pierron c1b9946c28 Name argument of option's merge functions are now obsolete.
svn path=/nixpkgs/trunk/; revision=13842
2009-01-25 00:31:43 +00:00
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
Ludovic Courtès e71dbdbb83 Add Teeworlds, a Worms-like game, if you see what I mean.
svn path=/nixpkgs/trunk/; revision=13762
2009-01-13 19:44:11 +00:00
Andres Löh 4d5c788b81 Removed broken quotes.
svn path=/nixpkgs/trunk/; revision=13761
2009-01-13 16:36:47 +00:00
Eelco Dolstra 20cb460c67 * Updated DBIx::Class.
svn path=/nixpkgs/trunk/; revision=13760
2009-01-13 15:56:55 +00:00
Eelco Dolstra 1a3a6835c2 * KVM 82.
* Kernel headers for Linux 2.6.28.

svn path=/nixpkgs/trunk/; revision=13755
2009-01-13 12:40:58 +00:00
Eelco Dolstra 6c0b144efc * Linux 2.6.27.10.
svn path=/nixpkgs/trunk/; revision=13752
2009-01-13 09:05:05 +00:00
Peter Simons 6fb297513a Committing Lluís Batlle's submissions from mailing list posting
<45219fb00901110456i6f21db35tbd1894eaea2146ff@mail.gmail.com>:

 * nixpkgs-ccrypt-1.7-new.patch
 * nixpkgs-cmake-add-ccmake.patch
 * nixpkgs-cpufrequtils-005-new.patch
 * nixpkgs-dwm-5.1-fix.patch
 * nixpkgs-freeimage-3.11.0-new.patch
 * nixpkgs-proxychains-3.1-new.patch
 * nixpkgs-psi-to-0.12.patch
 * nixpkgs-skype-to-2.0.0.72.patch
 * nixpkgs-truecrypt-6.1a-fix.patch
 * nixpkgs-vxl-1.11.0-new.patch
 * nixpkgs-xkb-popular-esperanto-symbols.patch
 * nixpkgs-xorg-via-video-fix.patch

svn path=/nixpkgs/trunk/; revision=13751
2009-01-12 21:12:07 +00:00
Ludovic Courtès 4080ba42c5 Build GnuPG 2.x.
svn path=/nixpkgs/trunk/; revision=13750
2009-01-12 20:23:10 +00:00
Ludovic Courtès abfb6c220d GnuPG 2.0.10.
svn path=/nixpkgs/trunk/; revision=13749
2009-01-12 20:20:18 +00:00
Ludovic Courtès 0d579bfcda Libgpg-error 1.7.
svn path=/nixpkgs/trunk/; revision=13748
2009-01-12 19:13:34 +00:00
Ludovic Courtès c50a4146c6 Libassuan 1.0.5.
svn path=/nixpkgs/trunk/; revision=13747
2009-01-12 19:06:35 +00:00
Ludovic Courtès c18603c3b3 GDB: Use the system Readline library.
svn path=/nixpkgs/trunk/; revision=13746
2009-01-12 18:06:32 +00:00
Eelco Dolstra b321f31c45 * NVIDIA X11 driver updated to 180.22.
svn path=/nixpkgs/trunk/; revision=13745
2009-01-12 17:00:25 +00:00
Eelco Dolstra 33278912fd * Linux 2.6.28.
svn path=/nixpkgs/trunk/; revision=13743
2009-01-12 13:11:18 +00:00
Eelco Dolstra dda1e103fc * Latest Grub patches from Gentoo. In particular adds support for
booting from ext4.

svn path=/nixpkgs/trunk/; revision=13741
2009-01-12 12:39:16 +00:00
Ludovic Courtès 21443fb797 GNU gv: Properly substitute the default value of `gsInterpreter'.
svn path=/nixpkgs/trunk/; revision=13740
2009-01-12 11:12:17 +00:00
Michael Raskin 2f770f46e4 Added back old XNeur version (did not have XIM bug)
svn path=/nixpkgs/trunk/; revision=13739
2009-01-12 06:14:13 +00:00
Ludovic Courtès 1ef61a2580 Bigloo 3.2a.
svn path=/nixpkgs/trunk/; revision=13738
2009-01-11 22:49:44 +00:00
Michael Raskin 490c7d417e Added XSokoban
svn path=/nixpkgs/trunk/; revision=13737
2009-01-11 22:05:19 +00:00
Marc Weber 7807b74774 php: enable gd support (2d graphics) by default
svn path=/nixpkgs/trunk/; revision=13736
2009-01-11 14:31:48 +00:00
Michael Raskin 46f022b4ce Fixed dependencies for updated Xneur
svn path=/nixpkgs/trunk/; revision=13735
2009-01-11 10:19:11 +00:00
Michael Raskin cc2e747a1b Updated XNeur
svn path=/nixpkgs/trunk/; revision=13734
2009-01-11 09:28:07 +00:00
Ludovic Courtès 68eec57920 GNU Troff 1.20.1.
svn path=/nixpkgs/trunk/; revision=13733
2009-01-10 23:35:15 +00:00
Michael Raskin fe07ca76d0 Added GNU console theme from CD
svn path=/nixpkgs/trunk/; revision=13729
2009-01-08 23:48:59 +00:00
Michael Raskin c87887ddd0 Oops. A typo fix
svn path=/nixpkgs/trunk/; revision=13727
2009-01-08 23:04:18 +00:00
Michael Raskin 46fec9e4c9 Add a (failure-prone) last-chance string merger
svn path=/nixpkgs/trunk/; revision=13726
2009-01-08 23:02:44 +00:00
Michael Raskin 5c21897316 Copied Green theme declaration from NixOS source here
svn path=/nixpkgs/trunk/; revision=13725
2009-01-08 22:21:32 +00:00
Eelco Dolstra 5689d7338e * Support LaTeX documents that have multiple bibliographies (using the
multibib package).

svn path=/nixpkgs/trunk/; revision=13723
2009-01-08 09:54:04 +00:00
Andres Löh 2fd7742470 Updated apparently incorrect sha256 checksum of flash player.
svn path=/nixpkgs/trunk/; revision=13721
2009-01-07 16:46:00 +00:00
Ludovic Courtès 383c2a401a GNU IceCat 3.0.5-g1.
svn path=/nixpkgs/trunk/; revision=13720
2009-01-07 13:53:15 +00:00
Michael Raskin ed11a2bbc8 Build e2fsprogs at last
svn path=/nixpkgs/trunk/; revision=13719
2009-01-06 23:22:29 +00:00
Ludovic Courtès 7b6b14df31 GNU Freefont, Jan. 2009.
svn path=/nixpkgs/trunk/; revision=13718
2009-01-06 21:20:33 +00:00
Andres Löh 77d9eec2a1 Changed the bootstrapping version of ghc-6.10.1.
Several binaries (except for ghc itself, for which there was a
workaround) were broken before because they were stripped
during installation. Now, all binaries should work, in particular
ghc-pkg ...

svn path=/nixpkgs/trunk/; revision=13717
2009-01-06 16:29:49 +00:00
Eelco Dolstra ed62007229 * xpdf 3.02pl2.
svn path=/nixpkgs/trunk/; revision=13716
2009-01-06 15:30:55 +00:00
Eelco Dolstra 1bdb17a5bc * Thunderbird 2.0.0.19.
* Firefox 2.0.0.20.
* Firefox 3.0.5: forgot to update xulrunner.

svn path=/nixpkgs/trunk/; revision=13715
2009-01-06 12:43:00 +00:00
Eelco Dolstra e1281affb5 * man-pages 3.15.
svn path=/nixpkgs/trunk/; revision=13713
2009-01-06 09:43:16 +00:00
Eelco Dolstra 73275bb354 * Added util-linux-ng, a fork of util-linux (which seems unmaintained).
svn path=/nixpkgs/trunk/; revision=13712
2009-01-06 09:28:45 +00:00
Eelco Dolstra a36a329e57 * e2fsprogs 1.41.3. This adds userspace support for ext4.
svn path=/nixpkgs/trunk/; revision=13711
2009-01-06 09:16:41 +00:00
Eelco Dolstra fa4e5051c7 * Firefox 3.0.5.
svn path=/nixpkgs/trunk/; revision=13710
2009-01-05 17:34:32 +00:00
Michael Raskin a2ac3a3f18 Fixing a typo
svn path=/nixpkgs/trunk/; revision=13708
2009-01-05 14:19:27 +00:00
Eelco Dolstra d15a5e9625 * Get rid of references to losser.st-lab.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13707
2009-01-05 14:01:42 +00:00
Eelco Dolstra 7e9eb1bf70 * Valgrind 3.4.0.
* callgrind_annotate.patch isn't needed because the generic builder
  rewrites /usr/bin/perl automatically.

svn path=/nixpkgs/trunk/; revision=13705
2009-01-05 10:51:57 +00:00
Marc Weber 692d493f4e php: enabling mbstring support by default
svn path=/nixpkgs/trunk/; revision=13704
2009-01-04 20:18:20 +00:00
Marc Weber 7cd7c4cffb maxima version bump to 5.17.0
svn path=/nixpkgs/trunk/; revision=13703
2009-01-04 20:18:10 +00:00
Michael Raskin 73b0973818 Adding MLDonkey multiprotocol data distribution client - patch by Lluis Batlle
svn path=/nixpkgs/trunk/; revision=13702
2009-01-04 17:35:11 +00:00
Andres Löh 9d67550148 version bump to 0.8
svn path=/nixpkgs/trunk/; revision=13701
2009-01-04 17:30:03 +00:00
Michael Raskin 772b50f138 Added cromfs - patch by Lluis Batlle
svn path=/nixpkgs/trunk/; revision=13700
2009-01-04 17:24:11 +00:00
Michael Raskin b9b8abb1cb Removing unnecessary sed invokation for ts - patch by Lluis Batlle
svn path=/nixpkgs/trunk/; revision=13699
2009-01-04 17:21:29 +00:00
Michael Raskin 45df59809d Adding mcabber console jabber client - patch by Lluis Batlle
svn path=/nixpkgs/trunk/; revision=13698
2009-01-04 17:11:38 +00:00
Andres Löh c1ae54a6b3 version bump to 0.9.7
svn path=/nixpkgs/trunk/; revision=13697
2009-01-04 13:48:58 +00:00
Michael Raskin 4c78e32aba Updating iproute - patch by Lluis Batlle
svn path=/nixpkgs/trunk/; revision=13696
2009-01-03 15:13:19 +00:00
Michael Raskin b04fc9492c Adding dar (disk archiver with indexable archives) - patch by Lluis Batlle
svn path=/nixpkgs/trunk/; revision=13695
2009-01-03 15:11:52 +00:00
Michael Raskin b689e76b2e all-packages.nix changes for my last commits
svn path=/nixpkgs/trunk/; revision=13693
2009-01-03 13:44:04 +00:00
Michael Raskin 039eb4f162 Added pthread_stubs - non-discriminating pthread compatibility layer for both multithreaded and singlethreaded environment
svn path=/nixpkgs/trunk/; revision=13692
2009-01-03 13:43:38 +00:00
Michael Raskin f87ad9b663 Autoconf 2.13 (older version used by Mozilla)
svn path=/nixpkgs/trunk/; revision=13691
2009-01-03 13:42:36 +00:00
Michael Raskin 23545f821a Added FF3.1b2. Main change: TraceMonkey JS JIT compiler.
svn path=/nixpkgs/trunk/; revision=13690
2009-01-03 13:40:21 +00:00
Michael Raskin 8f4c32886a Updated ts task spooler; patch by Lluis Batlle
svn path=/nixpkgs/trunk/; revision=13687
2009-01-02 16:33:39 +00:00
Michael Raskin 02d4d7ada4 Bigloo has tired me with disappearing betas..
svn path=/nixpkgs/trunk/; revision=13672
2009-01-01 19:52:20 +00:00
Marc Weber 31ff337203 doh, I comitted the wrong heimdal hash. this fixes it
svn path=/nixpkgs/trunk/; revision=13671
2008-12-23 23:51:29 +00:00
Marc Weber e4a6036ca9 adding cvs zsh version because it has better hg, tg completion support
svn path=/nixpkgs/trunk/; revision=13670
2008-12-22 18:36:26 +00:00
Marc Weber 1b30419aa6 added yodl, dependency for zsh documentation
svn path=/nixpkgs/trunk/; revision=13669
2008-12-22 18:36:02 +00:00
Marc Weber a8e0eae74b added second mirror to heimdal
suggested by Karl Trygve Kalleberg

svn path=/nixpkgs/trunk/; revision=13668
2008-12-21 19:34:45 +00:00
Michael Raskin e95557f033 Bigloo version bump to beta 2088-12-18
svn path=/nixpkgs/trunk/; revision=13667
2008-12-21 17:41:10 +00:00
Marc Weber 5b4a355362 squid update. Proposal for multiple versions
svn path=/nixpkgs/trunk/; revision=13666
2008-12-21 16:36:47 +00:00
Ludovic Courtès 2e5148a0f8 Don't build Namazu on x86-64.
svn path=/nixpkgs/trunk/; revision=13665
2008-12-20 18:28:22 +00:00
Ludovic Courtès 93a030534a Build Namazu.
svn path=/nixpkgs/trunk/; revision=13664
2008-12-20 17:11:46 +00:00
Marc Weber 5638574907 fixes for previous commit
svn path=/nixpkgs/trunk/; revision=13662
2008-12-20 02:15:26 +00:00
Marc Weber e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
2008-12-20 01:20:35 +00:00
Ludovic Courtès 5ab6464edb Build GSL.
svn path=/nixpkgs/trunk/; revision=13660
2008-12-19 20:58:18 +00:00
Ludovic Courtès 2887933c8b Add PulseAudio, an audio server.
svn path=/nixpkgs/trunk/; revision=13659
2008-12-19 14:56:37 +00:00
Eelco Dolstra 9ba80ff346 * Apache 2.2.11.
svn path=/nixpkgs/trunk/; revision=13658
2008-12-19 12:52:55 +00:00
Ludovic Courtès 01ed35dc5f GSL 1.12.
svn path=/nixpkgs/trunk/; revision=13656
2008-12-18 09:18:36 +00:00
Ludovic Courtès f64c0bc28e Add Namazu, a full-text search engine.
svn path=/nixpkgs/trunk/; revision=13655
2008-12-17 17:09:29 +00:00
Ludovic Courtès 01545132b4 Cdrkit 1.1.9.
svn path=/nixpkgs/trunk/; revision=13647
2008-12-16 14:06:46 +00:00
Eelco Dolstra 2750bec889 * Latest version.
svn path=/nixpkgs/trunk/; revision=13643
2008-12-16 00:18:20 +00:00
Eelco Dolstra 29b53db1c2 * A helper function for writing the list of references of a path to a
file.  (This really shouldn't be in all-packages.nix - all these
  utility builders should be moved someplace else...)

svn path=/nixpkgs/trunk/; revision=13639
2008-12-15 23:52:25 +00:00
Eelco Dolstra 6211cf4c0c * dbus-tools: purity fix (don't try to create /var).
svn path=/nixpkgs/trunk/; revision=13638
2008-12-15 23:45:52 +00:00
Michael Raskin 6a83330e8b Using old compizManager by default.
svn path=/nixpkgs/trunk/; revision=13635
2008-12-15 12:10:42 +00:00
Michael Raskin a0657e021f Added Simon Tatham's puzzle collection
svn path=/nixpkgs/trunk/; revision=13634
2008-12-15 11:55:53 +00:00
Michael Raskin a69221ec2b Oops. A stupid typo fixed.
svn path=/nixpkgs/trunk/; revision=13632
2008-12-14 17:10:11 +00:00
Michael Raskin 7115d5e143 compiz-fusion does not build without gettext specified explicitly anymore
svn path=/nixpkgs/trunk/; revision=13631
2008-12-14 16:09:28 +00:00
Michael Raskin 560d0d1597 I found a package that carries LICENCE file - adding to forceCopy list; also added some service functionality (needed by the same package).
svn path=/nixpkgs/trunk/; revision=13630
2008-12-14 14:54:47 +00:00
Michael Raskin abf1aeca3b Fixed missing description
svn path=/nixpkgs/trunk/; revision=13629
2008-12-14 11:21:30 +00:00
Michael Raskin 15cfe51b42 Correcting src passthru in builderDefs
svn path=/nixpkgs/trunk/; revision=13628
2008-12-14 10:40:03 +00:00
Ludovic Courtès 5dbd5eac6d GnuTLS 2.6.3.
svn path=/nixpkgs/trunk/; revision=13627
2008-12-13 16:52:31 +00:00
Ludovic Courtès b2f24eb5fa Avahi 0.6.24.
svn path=/nixpkgs/trunk/; revision=13626
2008-12-12 23:02:11 +00:00
Eelco Dolstra 9ed6e06b38 * Wine 1.1.10.
svn path=/nixpkgs/trunk/; revision=13625
2008-12-12 23:00:15 +00:00
Ludovic Courtès b942701506 GNU Bison 2.4.1.
svn path=/nixpkgs/trunk/; revision=13619
2008-12-12 12:37:29 +00:00
Ludovic Courtès 6213bb808c GNU IceCat 3.0.4-g1.
svn path=/nixpkgs/trunk/; revision=13616
2008-12-12 09:39:14 +00:00
Ludovic Courtès 219a11b567 IceCat: Inherit isFirefox3Like' in icecat3Xul'.
svn path=/nixpkgs/trunk/; revision=13615
2008-12-12 09:38:31 +00:00
Peter Simons 82e14b3605 Updated htop to version 0.8.1.
svn path=/nixpkgs/trunk/; revision=13614
2008-12-11 23:18:46 +00:00
Eelco Dolstra d25aa3c8a5 * checkinstall: build properly on x86_64.
* checkinstall: get rid of the RUNPATH in the LD_PRELOAD library so
  that it works with native Glibc (e.g. in VM builds).
* debBuild: use our own checkinstall.  In particular this allows us to
  build Debs on x86_64.

svn path=/nixpkgs/trunk/; revision=13608
2008-12-10 17:12:19 +00:00
Eelco Dolstra 0cf7b1c811 * Latest strace.
svn path=/nixpkgs/trunk/; revision=13607
2008-12-10 17:09:11 +00:00
Eelco Dolstra 016e2d912e * Name attribute did not match the actual version.
svn path=/nixpkgs/trunk/; revision=13600
2008-12-09 13:52:37 +00:00
Ludovic Courtès 37812e79dd GNU Guile 1.8.6.
svn path=/nixpkgs/trunk/; revision=13599
2008-12-08 22:15:47 +00:00
Ludovic Courtès bbc6db936c Build Pinentry.
svn path=/nixpkgs/trunk/; revision=13598
2008-12-08 21:23:45 +00:00
Ludovic Courtès 6d92197ffd Pinentry 0.7.5.
svn path=/nixpkgs/trunk/; revision=13597
2008-12-08 21:22:20 +00:00
Michael Raskin e66080438b Added FBTerm - framebuffer terminal emulator
svn path=/nixpkgs/trunk/; revision=13596
2008-12-08 12:44:42 +00:00
Ludovic Courtès bcb25659a1 Build Tcpdump.
svn path=/nixpkgs/trunk/; revision=13595
2008-12-08 10:59:40 +00:00
Michael Raskin d49a6f0641 Starting migrating old builderDefs packages to builderDefsPackage style.
svn path=/nixpkgs/trunk/; revision=13591
2008-12-04 21:01:26 +00:00
Eelco Dolstra 2b2bb11f32 * Always include "/nix/store/*" in lcovFilter.
svn path=/nixpkgs/trunk/; revision=13583
2008-12-04 15:32:30 +00:00
Eelco Dolstra f679021d11 * OpenSSH updated to 5.1p1.
svn path=/nixpkgs/trunk/; revision=13579
2008-12-04 13:16:38 +00:00
Nicolas Pierron 071c62a942 Rewrite uniqFlattenAttr to handle any type of elements with associated keys.
Keys are introduced because manipulated sets cannot be compared safely.

svn path=/nixpkgs/trunk/; revision=13574
2008-12-03 18:56:00 +00:00
Eelco Dolstra a5d3e865ea * Make building a tarball from a Subversion working copy faster by
filtering out all the .svn files.  To build a Nixpkgs tarball from
  your working copy (and run the same tests that the build farm does):

  $ nix-build pkgs/top-level/release.nix -A tarball

  If this fails, then you broke something ;-)

svn path=/nixpkgs/trunk/; revision=13573
2008-12-03 18:20:14 +00:00
Ludovic Courtès c08a809373 Build Jnettop.
svn path=/nixpkgs/trunk/; revision=13565
2008-12-03 14:27:28 +00:00
Ludovic Courtès e442925ccd Add Jnettop, a network traffic visualizer.
svn path=/nixpkgs/trunk/; revision=13564
2008-12-03 14:22:55 +00:00
Eelco Dolstra cf6908d2f9 svn path=/nixpkgs/trunk/; revision=13563 2008-12-03 11:06:43 +00:00
Ludovic Courtès 3918c63518 GNU Automake 1.10.2.
svn path=/nixpkgs/trunk/; revision=13562
2008-12-03 08:32:47 +00:00
Marc Weber 90b53dcccc bleeding edge octave version (without docs)
svn path=/nixpkgs/trunk/; revision=13561
2008-12-02 22:55:45 +00:00
Marc Weber d97a7e08bc make atlas build again (tested on amd64)
svn path=/nixpkgs/trunk/; revision=13560
2008-12-02 22:55:33 +00:00
Valentin David 0720af543a Update stlport to 5.2.0.
svn path=/nixpkgs/trunk/; revision=13558
2008-12-02 16:51:39 +00:00
Marc Weber a2ec5b8c2d fix my dir spelling mistake
svn path=/nixpkgs/trunk/; revision=13556
2008-12-02 15:13:31 +00:00
Marc Weber 896fb49cb0 Hopefully build farm fix
I've forgotten to comment out a name preventing filtering out a half finished derivation.
(The missing glib is passed using fix by the following code)

svn path=/nixpkgs/trunk/; revision=13555
2008-12-02 13:23:31 +00:00
Marc Weber a7e33ec60c updates: istanbul starts without errors. But no window appears.
svn path=/nixpkgs/trunk/; revision=13554
2008-12-02 12:28:45 +00:00
Marc Weber 9e7846d214 added Haskell's foldl
svn path=/nixpkgs/trunk/; revision=13553
2008-12-02 12:28:21 +00:00
Marc Weber 0b49861c7b added goocanvas
svn path=/nixpkgs/trunk/; revision=13552
2008-12-02 12:28:13 +00:00
Marc Weber fd3148dd5e new version icon-naming-utils-0.8.2
svn path=/nixpkgs/trunk/; revision=13551
2008-12-02 12:27:55 +00:00
Marc Weber 677812de8f added gstreamer gnonlin package
svn path=/nixpkgs/trunk/; revision=13550
2008-12-02 12:27:44 +00:00
Marc Weber 84db2ea357 dbus update
svn path=/nixpkgs/trunk/; revision=13549
2008-12-02 12:27:27 +00:00
Marc Weber 48f11e576b update of gnomeicontheme
svn path=/nixpkgs/trunk/; revision=13548
2008-12-02 12:27:17 +00:00
Marc Weber 30794845ee python 25 proposal
svn path=/nixpkgs/trunk/; revision=13547
2008-12-02 12:27:05 +00:00
Marc Weber d8e1f6c976 adding lib function composableDerivation
providing easy setups of flags and configurations for derivations.
configuration is passed via passthru automatically,
additional names can be merged with final attrs in an automatic sensible way
even supporting fix.
fun and funMerge idea by Michael Raskin

svn path=/nixpkgs/trunk/; revision=13546
2008-12-02 12:26:53 +00:00
Marc Weber 429df4f864 added prepareDerivationArgs
svn path=/nixpkgs/trunk/; revision=13545
2008-12-02 12:26:43 +00:00
Marc Weber 570a103136 adding mergeAttrsByFunc function - its easiy to customize how a name should be merged - the merge function is passed by the attr set itself (and can be overridden/ extended this way) This code can probably be shortened using zip and the like as proposed by Nicolas Pierron (mailinglist)
svn path=/nixpkgs/trunk/; revision=13544
2008-12-02 12:26:36 +00:00
Marc Weber 55976c6f8d depreceating functions which have been sud by me only replacements are in the following commits.. I still have to remove and adopt the code using them
svn path=/nixpkgs/trunk/; revision=13543
2008-12-02 12:26:28 +00:00
Marc Weber bd0b75fe28 added mergeAttr and concatList functions giving // and ++ a name
svn path=/nixpkgs/trunk/; revision=13542
2008-12-02 12:26:20 +00:00
Marc Weber 1f69d4d1eb enhancing whatis trace function
svn path=/nixpkgs/trunk/; revision=13541
2008-12-02 12:26:12 +00:00
Marc Weber 01fc783e7f added debug functions tracing function arguments and result
svn path=/nixpkgs/trunk/; revision=13540
2008-12-02 12:26:05 +00:00
Marc Weber 38cf2a4d7e added multisync - plugins are not yet shown ?
svn path=/nixpkgs/trunk/; revision=13539
2008-12-02 12:25:56 +00:00
Ludovic Courtès a9f0680f77 Git 1.6.0.4.
svn path=/nixpkgs/trunk/; revision=13529
2008-12-01 10:24:24 +00:00
Eelco Dolstra 2ffc686b67 * Latest Wine, Thunderbird.
svn path=/nixpkgs/trunk/; revision=13527
2008-12-01 00:06:14 +00:00
Michael Raskin d6f1d7acb3 Added Tk support for Python
svn path=/nixpkgs/trunk/; revision=13526
2008-12-01 00:02:25 +00:00
Eelco Dolstra 18501e572a * Test building some random packages.
svn path=/nixpkgs/trunk/; revision=13525
2008-11-30 19:07:18 +00:00
Eelco Dolstra c058ff0e40 * Moved the expression for building a Nixpkgs tarball from the release
tree.

svn path=/nixpkgs/trunk/; revision=13522
2008-11-30 18:36:23 +00:00
Michael Raskin 1cd17e8140 Adding XMoto game
svn path=/nixpkgs/trunk/; revision=13521
2008-11-30 17:15:29 +00:00
Michael Raskin ed8215aca7 Added Open Dynamics Engine
svn path=/nixpkgs/trunk/; revision=13520
2008-11-30 16:50:05 +00:00
Michael Raskin e357cb4e65 Added chipmunk 2 physics library
svn path=/nixpkgs/trunk/; revision=13519
2008-11-30 15:05:43 +00:00
Michael Raskin 8c90c64e94 Added nginx - lightweight http server
svn path=/nixpkgs/trunk/; revision=13518
2008-11-30 09:06:53 +00:00
Ludovic Courtès ab0f8f2bb4 Build `at'.
svn path=/nixpkgs/trunk/; revision=13516
2008-11-29 17:38:44 +00:00
Eelco Dolstra 9f206fb8f9 * Use the latest unstable Nix.
svn path=/nixpkgs/trunk/; revision=13503
2008-11-28 18:43:19 +00:00
Eelco Dolstra e056ebd34e * Don't repeat the standard definition of $phases.
svn path=/nixpkgs/trunk/; revision=13493
2008-11-28 16:12:50 +00:00
Eelco Dolstra 8bcfad7e9c * Strip in libexec.
* In stripDirs: use xargs -r, otherwise when there is nothing to
  strip, strip prints its help text.  Harmless but annoying.

svn path=/nixpkgs/trunk/; revision=13492
2008-11-28 16:11:59 +00:00
Eelco Dolstra 85fa8661e3 * A patch to make TemplateToolkit work properly on templates in the
Nix store.

svn path=/nixpkgs/trunk/; revision=13491
2008-11-28 16:10:32 +00:00
Eelco Dolstra 3189f877d0 * Linux 2.6.27.7
svn path=/nixpkgs/trunk/; revision=13487
2008-11-28 13:12:43 +00:00
Eelco Dolstra 31d4efb9d7 * Oops.
svn path=/nixpkgs/trunk/; revision=13486
2008-11-28 13:09:07 +00:00
Eelco Dolstra 60431bb1e8 * Install the man page.
svn path=/nixpkgs/trunk/; revision=13485
2008-11-28 13:06:54 +00:00
Eelco Dolstra 7027006e4d * A release expression for building Nixpkgs on Hydra (the new build
farm).

svn path=/nixpkgs/trunk/; revision=13478
2008-11-28 10:56:36 +00:00
Eelco Dolstra 82ab4c6105 * buildRPM: Set the %_topdir variable to a known location, otherwise
we run into trouble on Fedora 10 (RPM 4.6), where the default is no
  longer /usr/src/something but $HOME/something.

svn path=/nixpkgs/trunk/; revision=13466
2008-11-27 18:58:37 +00:00
Ludovic Courtès 349f9c13e6 Build `host'.
svn path=/nixpkgs/trunk/; revision=13461
2008-11-27 15:28:30 +00:00
Ludovic Courtès 31c156de83 Add `host', a DNS query utility.
svn path=/nixpkgs/trunk/; revision=13459
2008-11-27 13:54:49 +00:00
Ludovic Courtès e5e3c7ec73 Build vpnc.
svn path=/nixpkgs/trunk/; revision=13458
2008-11-27 10:34:25 +00:00
Ludovic Courtès f38077a30e vpnc 0.5.3.
svn path=/nixpkgs/trunk/; revision=13457
2008-11-27 10:32:47 +00:00
Ludovic Courtès 2a16a3d0ab Revert change erroneously introduced in r13429.
svn path=/nixpkgs/trunk/; revision=13439
2008-11-26 14:57:59 +00:00
Marc Weber 79536f8240 fix fcron: don't check for /var/setuid-wrappers/sendmail
svn path=/nixpkgs/trunk/; revision=13435
2008-11-26 14:38:16 +00:00
Marc Weber 1a4a270855 bumped intltool to version 0.40.5
svn path=/nixpkgs/trunk/; revision=13434
2008-11-26 14:38:05 +00:00
Eelco Dolstra 79072e871f * Preserve meta attributes from the caller.
svn path=/nixpkgs/trunk/; revision=13433
2008-11-26 14:34:29 +00:00
Ludovic Courtès 564b82630b Add Intel Wi-Fi firmware for kernels 2.6.27 and later;
make `iwlwifi4965ucode' part of `kernelPackagesFor'.

svn path=/nixpkgs/trunk/; revision=13429
2008-11-26 13:15:38 +00:00
Eelco Dolstra 5dad580963 * Added Fedora 10.
svn path=/nixpkgs/trunk/; revision=13428
2008-11-26 11:14:39 +00:00
Eelco Dolstra dd61c77d4e * Use libtool.
svn path=/nixpkgs/trunk/; revision=13425
2008-11-26 01:00:23 +00:00
Eelco Dolstra 31d12fc641 * Don't suppress error messages.
svn path=/nixpkgs/trunk/; revision=13424
2008-11-25 18:34:46 +00:00
Eelco Dolstra a37251e2a5 * -pre' should be pre'.
svn path=/nixpkgs/trunk/; revision=13420
2008-11-25 18:08:49 +00:00
Eelco Dolstra fd6e8a0f26 * Figure out the release name.
svn path=/nixpkgs/trunk/; revision=13415
2008-11-25 16:12:36 +00:00
Eelco Dolstra 8cc8ee244a svn path=/nixpkgs/trunk/; revision=13414 2008-11-25 15:54:05 +00:00
Eelco Dolstra 2efa4abeae * Set VERSION_SUFFIX to -pre<revision> unless building an "official"
release.
* Use @-patterns and `...' instead of using a "with".

svn path=/nixpkgs/trunk/; revision=13413
2008-11-25 15:53:45 +00:00
Eelco Dolstra 75ed8f2e20 * Added IPC::Run.
svn path=/nixpkgs/trunk/; revision=13409
2008-11-25 13:06:58 +00:00
Eelco Dolstra fc06d93252 svn path=/nixpkgs/trunk/; revision=13401 2008-11-25 02:26:54 +00:00
Eelco Dolstra c90bd0756c * Automatically build Debian packages using checkinstall, as suggested
by Pjotr Prins a while back.  This could also be used to generate
  RPMs for packages that don't have a spec-file.

* Added checkinstall to Nixpkgs.  However we don't use our own build
  yet because with it "make install" segfaults in a Debian VM, while
  the pre-built binary does work.

svn path=/nixpkgs/trunk/; revision=13400
2008-11-25 02:20:41 +00:00
Eelco Dolstra da8bcbd9a5 * Moved more stuff from the release tree.
svn path=/nixpkgs/trunk/; revision=13395
2008-11-25 00:20:51 +00:00
Michael Raskin 044c4dfe9f Fix shebang in more scripts...
svn path=/nixpkgs/trunk/; revision=13393
2008-11-24 22:36:39 +00:00
Marc Weber 6fb6ecff1e fix fcron: don't try to create /etc/fcron.{allow,deny,conf}
svn path=/nixpkgs/trunk/; revision=13391
2008-11-24 22:30:58 +00:00
Eelco Dolstra 01acea6bbc * Start moving the Nix expressions that support the build farm
(e.g. making source tarballs, doing coverage analysis) to the
  Nixpkgs tree.  This makes it easier to run build farm jobs locally
  since you don't need to check out the "release" tree separately.
  Also it means one less input to declare for build farm jobs.

* Removed succeedOnFailure and separate logging of phases.  Hydra
  doesn't need that.

svn path=/nixpkgs/trunk/; revision=13388
2008-11-24 15:10:06 +00:00
Eelco Dolstra 9cb29889d2 * A function "buildPerlPackage" to replace all those "import
../development/perl-modules/generic perl" incantations.

svn path=/nixpkgs/trunk/; revision=13387
2008-11-24 10:24:51 +00:00
Eelco Dolstra 1357c14500 * DBD::SQLite needs a patch to prevent segfaults in case of timeouts.
svn path=/nixpkgs/trunk/; revision=13386
2008-11-24 10:11:09 +00:00
Eelco Dolstra e02462f034 * MPlayerPlugin is a function...
svn path=/nixpkgs/trunk/; revision=13385
2008-11-24 10:00:40 +00:00
Eelco Dolstra 21c1ee574c * Use exec.
svn path=/nixpkgs/trunk/; revision=13384
2008-11-24 09:59:38 +00:00
Nicolas Pierron 53e6c77aca Fix previous commit.
svn path=/nixpkgs/trunk/; revision=13373
2008-11-23 01:23:32 +00:00
Nicolas Pierron 249a3a314f Add: Handle a way to factor conditions.
mkIf config.foo.enable {
  require = [ .. ];

  environment = {
    // infer the else part.
    extraPackages = [pkgs.foo];
    etc = mkThenElse {
      thenPart = { .. };
      elsePart = { .. };
    };
  };
}

Fix: UniqFlattenAttr compare configuration without the "require" attribute.

svn path=/nixpkgs/trunk/; revision=13372
2008-11-23 00:19:18 +00:00
Nicolas Pierron 0f2bd6c305 mergeDefaultOption: handle boolean values.
svn path=/nixpkgs/trunk/; revision=13371
2008-11-23 00:19:12 +00:00
Nicolas Pierron b62298f7c7 Add a common pattern used in jobs definition.
svn path=/nixpkgs/trunk/; revision=13370
2008-11-23 00:19:06 +00:00
Marc Weber 26212b62c7 (last) fcron fix for now because the service works as expected
svn path=/nixpkgs/trunk/; revision=13368
2008-11-22 16:57:31 +00:00
Marc Weber 57c012cd8c zsh update to 4.3.9
svn path=/nixpkgs/trunk/; revision=13367
2008-11-22 16:57:16 +00:00
Marc Weber eb0f06a162 default locations for fcron config settings (don't use store path)
svn path=/nixpkgs/trunk/; revision=13366
2008-11-21 23:53:31 +00:00
Eelco Dolstra a4a95f2962 * Latest stable, unstable releases.
svn path=/nixpkgs/trunk/; revision=13365
2008-11-21 17:06:49 +00:00
Marc Weber ce242a0bd8 ghc-6.10 binary
svn path=/nixpkgs/trunk/; revision=13345
2008-11-19 21:46:19 +00:00
Marc Weber 7aa7f85bb5 gstreamer update (needed by gstPython)
dropping dep gnomevfs (see code commment)

svn path=/nixpkgs/trunk/; revision=13344
2008-11-19 21:46:01 +00:00
Marc Weber 96aade5a27 hackish fix to build cdrtools again
svn path=/nixpkgs/trunk/; revision=13343
2008-11-19 21:45:43 +00:00
Ludovic Courtès 42f234343b GnuTLS 2.6.2.
svn path=/nixpkgs/trunk/; revision=13341
2008-11-19 18:49:53 +00:00
Eelco Dolstra 3d52d1593a * Revert to version 76, 77 gives strange hangs.
svn path=/nixpkgs/trunk/; revision=13338
2008-11-19 17:21:49 +00:00
Nicolas Pierron 14b2be147f Use composedArgsAndFun on utilliinux to remove some references to nixPkgs from Nixos.
svn path=/nixpkgs/trunk/; revision=13311
2008-11-16 19:23:06 +00:00
Nicolas Pierron 34f916700d Add mergeStringOption and factor mergeSomethingOption by introducing mergeTypedOption.
svn path=/nixpkgs/trunk/; revision=13310
2008-11-16 19:23:00 +00:00
Nicolas Pierron b196bab378 Remove obsolete functions.
svn path=/nixpkgs/trunk/; revision=13309
2008-11-16 19:22:55 +00:00
Nicolas Pierron 08b583682a Handle apply attribute for each option declared with MkOption.
This is similar to the new-proposal in upstart-jobs except that the default value is also processed with this function. (the existing merge function acts only on extra values).

svn path=/nixpkgs/trunk/; revision=13308
2008-11-16 19:22:47 +00:00