Commit graph

5251 commits

Author SHA1 Message Date
Nicolas Pierron
692c5a62a4 Use "abort" instead of "throw" when option values cannot be merged.
Fix mergeListOption.
Add error support in mergeEnableOption.

svn path=/nixpkgs/trunk/; revision=12522
2008-08-06 19:24:36 +00:00
Nicolas Pierron
0ce4cafd88 * Do not always use the current result as argument.
* "filterOptionSets" returns the only option per attribute instead of a list of options.

svn path=/nixpkgs/trunk/; revision=12520
2008-08-06 18:34:11 +00:00
Marc Weber
7061a01749 removing empty directory, should have used --rmdir
svn path=/nixpkgs/trunk/; revision=12518
2008-08-06 17:02:28 +00:00
Marc Weber
ec717200c8 ghc68extralibraries: tidied up, no longer many small files, nicer indentation (at least same level now)
svn path=/nixpkgs/trunk/; revision=12517
2008-08-06 16:56:05 +00:00
Eelco Dolstra
decf974c94 * Command for mounting CIFS file systems.
svn path=/nixpkgs/trunk/; revision=12515
2008-08-06 15:43:03 +00:00
Eelco Dolstra
0a884b25f9 * util-linux: added an option to build just mount/umount, and an
option to set the path to the mount helpers programs
  (mount.<fstype>) to something other than /sbin.  Needed in NixOS to
  get the mount command to work for NTFS-3G, CIFS, etc.

svn path=/nixpkgs/trunk/; revision=12514
2008-08-06 15:27:50 +00:00
Sander van der Burg
63b9500b88 Added support for custom context.xml for Tomcat
svn path=/nixpkgs/trunk/; revision=12512
2008-08-06 14:59:45 +00:00
Sander van der Burg
c282368077 Some tomcat common lib fixes
svn path=/nixpkgs/trunk/; revision=12510
2008-08-06 13:25:51 +00:00
Marc Weber
7608d6f063 update ghc stuff (hsp is now supported as well except hsp-xml)
svn path=/nixpkgs/trunk/; revision=12509
2008-08-06 11:41:17 +00:00
Marc Weber
cc44e2bb54 updated jwm's url as suggested by Saadfuijk Naas <tachermourir@rambler.ru>
svn path=/nixpkgs/trunk/; revision=12508
2008-08-06 09:50:41 +00:00
Michael Raskin
e0db29c8f5 Removed 5 offending packages that caused latest build to fail
svn path=/nixpkgs/trunk/; revision=12507
2008-08-05 19:21:05 +00:00
Peter Simons
cea5d01592 git-git: change ${name} to reflect that this is not a pristine version
The git-git expression promises to build the current git HEAD, but in
fact it builds git HEAD plus a fairly extensive, undocumented, untested
patch that is apparently not part of the repository. By changing the
name of the installed package to 'git-git-with-glob-patch', we ensure
that users aren't mislead about what exactly they'll get when installing
this package. Technically, GIT-VERSION-FILE should be patched so that
the installed git binaries reflect this change too when called with
'--version', but the current solution is probably good enough.

svn path=/nixpkgs/trunk/; revision=12506
2008-08-05 17:31:13 +00:00
Nicolas Pierron
0e25bb67cf Add a new way to handle option sets.
svn path=/nixpkgs/trunk/; revision=12505
2008-08-05 17:16:35 +00:00
Sander van der Burg
7abbe5889f Added expect
svn path=/nixpkgs/trunk/; revision=12502
2008-08-05 13:44:13 +00:00
Sander van der Burg
90d46bba63 Added GCC 3.3 because it takes ages to compile and some proprietary components depends on libstdc++
svn path=/nixpkgs/trunk/; revision=12501
2008-08-05 13:28:32 +00:00
Michael Raskin
915909ecfa Now build-for-release.nix can be instantiated.
svn path=/nixpkgs/trunk/; revision=12498
2008-08-05 08:37:12 +00:00
Eelco Dolstra
d0aa54c8fa * Pan 0.133.
svn path=/nixpkgs/trunk/; revision=12496
2008-08-04 18:00:49 +00:00
Eelco Dolstra
f6935cfd98 * Linux 2.6.25.14.
svn path=/nixpkgs/trunk/; revision=12495
2008-08-04 17:54:34 +00:00
Michael Raskin
e8cc5fedb0 Fixing build-for-release.nix typo
svn path=/nixpkgs/trunk/; revision=12494
2008-08-04 17:50:23 +00:00
Pjotr Prins
b156f58d3e Added R-language to build-for-release
svn path=/nixpkgs/trunk/; revision=12492
2008-08-04 17:02:23 +00:00
Eelco Dolstra
0846ca2e5b * Don't fixup "#! /bin/sh" in Autoconf/Automake/Libtool, otherwise they
will use the "fixed" path in generated files.

svn path=/nixpkgs/trunk/; revision=12485
2008-08-04 14:37:51 +00:00
Eelco Dolstra
c62b4b2135 * Add Automake 1.10.x to the channel.
* Fix some incorrect x86_64-linux attributes.

svn path=/nixpkgs/trunk/; revision=12484
2008-08-04 14:07:00 +00:00
Sander van der Burg
6dd7896b4e Added shared JDBC driver support for tomcat
svn path=/nixpkgs/trunk/; revision=12476
2008-08-04 12:04:24 +00:00
Sander van der Burg
b23b849ba3 Updated MySQL JDBC driver
svn path=/nixpkgs/trunk/; revision=12475
2008-08-04 11:50:57 +00:00
Pjotr Prins
7b5ab1117d Added two (large) biology builds
svn path=/nixpkgs/trunk/; revision=12471
2008-08-03 21:19:31 +00:00
Michael Raskin
c4216c4aba Updated OpenFire
svn path=/nixpkgs/trunk/; revision=12470
2008-08-03 17:08:52 +00:00
Marc Weber
407b3e2e0d added bleeding-edge source info file
svn path=/nixpkgs/trunk/; revision=12469
2008-08-03 17:05:19 +00:00
Marc Weber
43d7fe0cfb Merge branch 'git_patch_glob'
svn path=/nixpkgs/trunk/; revision=12468
2008-08-03 12:23:27 +00:00
Michael Raskin
6458ed36d8 Should repair the buildfarm build: if stdenv does not know it has DietLibc, it does not have it
svn path=/nixpkgs/trunk/; revision=12467
2008-08-03 03:55:27 +00:00
Pjotr Prins
bc6b7a3213 Updated Ruby package to support shared libs and pthreads
svn path=/nixpkgs/trunk/; revision=12466
2008-08-02 22:25:54 +00:00
Michael Raskin
f10cfdbcc5 Adding xulrunner for Firefox3. Unfortunately, interface updates kill MPlayer plugin anyway
svn path=/nixpkgs/trunk/; revision=12464
2008-08-02 15:14:54 +00:00
Eelco Dolstra
eccb86b79b * Udev 125.
svn path=/nixpkgs/trunk/; revision=12457
2008-07-31 14:46:11 +00:00
Andres Löh
e53cbfbeae * added Haskell editline library
svn path=/nixpkgs/trunk/; revision=12455
2008-07-31 12:38:09 +00:00
Andres Löh
25fa56e74f * updated the ghc HEAD snapshot
svn path=/nixpkgs/trunk/; revision=12454
2008-07-31 12:36:47 +00:00
Sander van der Burg
2b11bc18f7 Undone seccure commit
svn path=/nixpkgs/trunk/; revision=12451
2008-07-30 13:41:01 +00:00
Sander van der Burg
3bd550f170 Some fixes
svn path=/nixpkgs/trunk/; revision=12450
2008-07-30 13:37:44 +00:00
Sander van der Burg
4f13fdc34d Fixed kile
svn path=/nixpkgs/trunk/; revision=12448
2008-07-30 11:43:47 +00:00
Ludovic Courtès
3b1eea4c83 aMule 2.2.1.
svn path=/nixpkgs/trunk/; revision=12446
2008-07-29 16:52:26 +00:00
Ludovic Courtès
2a5a982ad1 Add Crypto++, a C++ cryptography library.
svn path=/nixpkgs/trunk/; revision=12444
2008-07-29 14:26:03 +00:00
Ludovic Courtès
e79ae4bec4 Autobuild: Wrap `abbuild-sourceforge'.
svn path=/nixpkgs/trunk/; revision=12443
2008-07-28 22:54:31 +00:00
Ludovic Courtès
95fb46a440 Add Simon Josefsson's Autobuild tool.
svn path=/nixpkgs/trunk/; revision=12442
2008-07-28 21:29:17 +00:00
Ludovic Courtès
00230d4132 IceCat: Use GNOME VFS and libgnomeui.
svn path=/nixpkgs/trunk/; revision=12441
2008-07-28 20:41:14 +00:00
Ludovic Courtès
adec4e74f5 Mozilla MPlayer plug-in 3.55.
svn path=/nixpkgs/trunk/; revision=12440
2008-07-28 16:43:16 +00:00
Ludovic Courtès
6cb7c2fa68 Generalize `firefox-wrapper' so that it can be used for GNU IceCat.
svn path=/nixpkgs/trunk/; revision=12439
2008-07-28 16:25:09 +00:00
Ludovic Courtès
b3bc47784c IceCat: Remove useless file.
svn path=/nixpkgs/trunk/; revision=12438
2008-07-28 15:55:51 +00:00
Ludovic Courtès
a898666dc4 Add GNU IceCat 3, GNU's free variant of Mozilla Firefox 3.
Currently, MPlayerPlugin can't be built with IceCat 3.

svn path=/nixpkgs/trunk/; revision=12437
2008-07-28 15:55:11 +00:00
Ludovic Courtès
b0fb32ef3c Build Evince on the build farm.
svn path=/nixpkgs/trunk/; revision=12436
2008-07-28 10:22:44 +00:00
Eelco Dolstra
ec8d941064 * Subversion 1.5.1.
svn path=/nixpkgs/trunk/; revision=12435
2008-07-28 08:14:55 +00:00
Ludovic Courtès
1e63385865 Add Evince, GNOME's document viewer (PS, PDF, DVI, DjVu, TIFF, etc.).
Currently, a few theme icons provided by Evince are not found.  This is
possibly due to the lack of an `index.theme' file under `share/evince/icons',
but there's no rule to make it.

svn path=/nixpkgs/trunk/; revision=12434
2008-07-27 10:24:08 +00:00
Marc Weber
01cbcd94b3 added support for building uml_mconsole
svn path=/nixpkgs/trunk/; revision=12433
2008-07-26 01:02:27 +00:00