Commit Graph

1932 Commits

Author SHA1 Message Date
Marc Weber
b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
2009-03-06 23:21:28 +00:00
Marc Weber
51289a41b0 adjust packages to overridableDelayableArgs
svn path=/nixpkgs/trunk/; revision=14427
2009-03-06 23:21:24 +00:00
Ludovic Courtès
a2317f6997 Doxygen 1.5.8.
svn path=/nixpkgs/trunk/; revision=14350
2009-03-05 15:17:53 +00:00
Eelco Dolstra
fcad0b0a5a * Cleaned up a lot of description fields that contained newlines.
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
2009-03-03 13:27:40 +00:00
Eelco Dolstra
9efba4b3b0 * Added IO::Compress::Bzip2.
svn path=/nixpkgs/trunk/; revision=14306
2009-03-03 10:36:29 +00:00
Eelco Dolstra
2c0558e11c * Valgrind 3.4.1.
svn path=/nixpkgs/trunk/; revision=14304
2009-03-03 09:19:50 +00:00
Michael Raskin
9d06868cda Updated Lazarus
svn path=/nixpkgs/trunk/; revision=14263
2009-02-26 15:49:55 +00:00
Michael Raskin
d6682c9514 Updated FPC. Patch partially by Felix Breuer
svn path=/nixpkgs/trunk/; revision=14261
2009-02-26 15:14:17 +00:00
Ludovic Courtès
820ee6e61b G-Wrap 1.9.12.
svn path=/nixpkgs/trunk/; revision=14248
2009-02-25 16:57:41 +00:00
Sander van der Burg
3a1c208a69 Added pycups,desktop_file_utils,system_config_printer packages and added python kdebindings closure
svn path=/nixpkgs/trunk/; revision=14246
2009-02-25 16:05:13 +00:00
Sander van der Burg
17dc18fd56 Added libmsn package
svn path=/nixpkgs/trunk/; revision=14206
2009-02-23 15:30:07 +00:00
Lluís Batlle i Rossell
098d9937a2 Adding a license tag for fmod: "unfree", as advised by Ludo.
svn path=/nixpkgs/trunk/; revision=14197
2009-02-22 23:15:01 +00:00
Lluís Batlle i Rossell
9ab8cb9ec1 Adding fmod.
svn path=/nixpkgs/trunk/; revision=14193
2009-02-22 22:06:20 +00:00
Ludovic Courtès
5c3c2d9860 Poppler: Disable test suite when `qt4Support' is true.
svn path=/nixpkgs/trunk/; revision=14155
2009-02-21 21:53:50 +00:00
Ludovic Courtès
d622b7a1f8 Poppler 0.10.4.
svn path=/nixpkgs/trunk/; revision=14149
2009-02-20 23:43:29 +00:00
Sander van der Burg
e685c82812 Refactored tapioca-qt closure with using the latest stable release instead of SVN version
svn path=/nixpkgs/trunk/; revision=14143
2009-02-20 16:18:56 +00:00
Eelco Dolstra
6d35e85dcb * Doh! Qt install doc, not share/doc, but the post-fixup phase
renamed it to that. 

svn path=/nixpkgs/trunk/; revision=14140
2009-02-20 15:31:29 +00:00
Peter Simons
c8e6fa7dd6 cmake: added (low priority) expression for 2.6.3-rc-15.
svn path=/nixpkgs/trunk/; revision=14124
2009-02-19 14:41:51 +00:00
Ludovic Courtès
4373d12cb4 Add GNU Prolog.
svn path=/nixpkgs/trunk/; revision=14122
2009-02-19 13:32:07 +00:00
Sander van der Burg
770b01890a Added libical package, patch submitted by Andrew Morsillo
svn path=/nixpkgs/trunk/; revision=14118
2009-02-18 20:57:36 +00:00
Sander van der Burg
08e92c5e70 Added kdegraphics-4.2 closure
svn path=/nixpkgs/trunk/; revision=14114
2009-02-18 15:25:40 +00:00
Marc Weber
307fd7b70f added pexpect and mechanize python libraries
svn path=/nixpkgs/trunk/; revision=14111
2009-02-18 11:50:46 +00:00
Marc Weber
4576378434 added avr8-burn-omat (gui for avrdude, fuse bits)
svn path=/nixpkgs/trunk/; revision=14110
2009-02-18 11:50:39 +00:00
Marc Weber
dab6268c79 added avr gcc avrlibc dev environment. Its not worth doing this properly. It works this way
svn path=/nixpkgs/trunk/; revision=14095
2009-02-17 12:56:35 +00:00
Peter Simons
25a9e73924 Updated SHA256 hash for Full Maude 2.4. Unfortunately, the maintainers
have the habit of releasing updates under the exact same file name and
URL.

svn path=/nixpkgs/trunk/; revision=14094
2009-02-17 12:51:04 +00:00
Ludovic Courtès
f59b3d14dc Add SLOCCount, a tool to count source lines of code (SLOCs).
svn path=/nixpkgs/trunk/; revision=14091
2009-02-17 10:11:33 +00:00
Eelco Dolstra
62fa1a418f * cmake setup hook: override the whole configurePhase rather than
setting a postUnpack hook.

svn path=/nixpkgs/trunk/; revision=14074
2009-02-13 14:43:01 +00:00
Eelco Dolstra
cd6864e7e9 * Perl BerkeleyDB module: updated to 0.36 since "make test" failed in
the old one.

svn path=/nixpkgs/trunk/; revision=14068
2009-02-13 10:59:01 +00:00
Sander van der Burg
6ba0ddb19b Applied -dbus-linked option which it needed by kdelibs. Patch submitted by Andrew Morsillo
svn path=/nixpkgs/trunk/; revision=14060
2009-02-12 21:43:03 +00:00
Marc Weber
8bd7e25079 libpcap: added missing patch file
svn path=/nixpkgs/trunk/; revision=14059
2009-02-12 21:24:00 +00:00
Marc Weber
498be42912 version bump: wireshark-1.1.2, libpcap-1.0.0
svn path=/nixpkgs/trunk/; revision=14054
2009-02-12 20:28:01 +00:00
Eelco Dolstra
0c3abad795 * Latest Compress::Zlib.
* Put the fix for Perl modules that install in the wrong location
  ($out/lib instead of $out/lib/site_perl) in the generic Perl
  builder.

svn path=/nixpkgs/trunk/; revision=14051
2009-02-12 20:18:13 +00:00
Eelco Dolstra
61e7bd7372 * Perl builder: run tests by default.
svn path=/nixpkgs/trunk/; revision=14041
2009-02-12 15:56:35 +00:00
Sander van der Burg
09bb1e1116 Updated log4cxx to version 0.10.0 by using a patch from Andrew Morsillo
svn path=/nixpkgs/trunk/; revision=14039
2009-02-12 14:52:23 +00:00
Michael Raskin
7590daad42 Extra mirror for lsof
svn path=/nixpkgs/trunk/; revision=14036
2009-02-11 21:51:05 +00:00
Peter Simons
3fb26823cd Use correct hash for boost 1.38.0. Oops.
svn path=/nixpkgs/trunk/; revision=14032
2009-02-11 10:02:18 +00:00
Peter Simons
05eb6625ed Bumped boost libraries to version 1.38.0.
svn path=/nixpkgs/trunk/; revision=14031
2009-02-11 10:02:10 +00:00
Eelco Dolstra
efbfa0c395 * Latest lsof.
svn path=/nixpkgs/trunk/; revision=14025
2009-02-10 23:11:29 +00:00
Eelco Dolstra
599015e8b0 * Split lib/default.nix into several files, as it had become a big
mess.  Also cleaned up some functions:

  - foldl appeared broken (it recursively called fold).
  - Renamed logicalAND/logicalOR to and/or.
  - Removed listOfListsToAttrs, eqStrings: obsolete.
  - Removed isInList, which does the same thing as elem.
  - stringToCharacters: don't return a "" at the end of the list.
  - Renamed concatList to concat, as concatList (singular) is a
    misnomer: it takes two lists.  Likewise, renamed mergeAttr to
    mergeAttrs.

  misc.nix still contains a lot of stuff that should be refactored and
  moved to other files.

svn path=/nixpkgs/trunk/; revision=14013
2009-02-09 16:51:03 +00:00
Lluís Batlle i Rossell
863e9181d5 Adding vtk-5.2.1, The Visualization Toolkit.
svn path=/nixpkgs/trunk/; revision=14006
2009-02-08 16:27:57 +00:00
Peter Simons
0d64423f60 ftp://oss.sgi.com/projects/xfs/cmd_tars/acl_2.2.47-1.tar.gz no longer
exists. There is a newer version on the server, but it cannot be
downloaded, apparently because of misconfigured permissions.

svn path=/nixpkgs/trunk/; revision=13996
2009-02-06 09:52:27 +00:00
Peter Simons
c84c92d3e8 ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_2.4.41-1.tar.gz no longer
exists. There is a newer version on the server, but it cannot be
downloaded, apparently because of misconfigured permissions.

svn path=/nixpkgs/trunk/; revision=13995
2009-02-06 09:48:20 +00:00
Peter Simons
ecddd8b472 Added syslog-ng (and the eventlog library that it depends on).
svn path=/nixpkgs/trunk/; revision=13988
2009-02-05 16:50:45 +00:00
Eelco Dolstra
b3ff9f5275 * Qt 4: don't install the docs.
svn path=/nixpkgs/trunk/; revision=13979
2009-02-05 09:55:10 +00:00
Eelco Dolstra
6ed4aa7ecb * Qt updated to 4.4.3 in preparation of upgrading KDE to 4.2.
svn path=/nixpkgs/trunk/; revision=13974
2009-02-03 16:32:56 +00:00
Ludovic Courtès
2a89f2ea99 Add Pangomm 2.14.1, omitted in previous commits.
svn path=/nixpkgs/trunk/; revision=13953
2009-02-02 14:29:40 +00:00
Eelco Dolstra
79a039080c svn path=/nixpkgs/trunk/; revision=13951 2009-02-02 12:44:20 +00:00
Michael Raskin
9dcefd67ec Fix hash for JDK: was duplicate
svn path=/nixpkgs/trunk/; revision=13950
2009-02-02 12:42:00 +00:00
Armijn Hemel
4fc2a64242 version bump to 0.0.22
svn path=/nixpkgs/trunk/; revision=13927
2009-02-01 18:51:15 +00:00
Marc Weber
f47649b3db update jre/jdk to 1.6.0_11 cause _6 has known bugs (-> Eclipse FAQ)
svn path=/nixpkgs/trunk/; revision=13924
2009-01-31 22:03:18 +00:00
Eelco Dolstra
da4fb573a7 * Added ATerm 2.8. Also removed some old versions and patches that
were no longer in use.

* A patch for compiling the ATerm library with GCC 4.3.  Without it,
  the code for resizing ATerm tables gets stuck in an infinite loop
  (http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=841).  The problem
  is in this bit of code in hash.c, which tries to dynamically figure
  out the maximum signed integer:

    long try_long_max;
    long long_max;
    long delta;

    try_long_max = 1;
    do {
      long_max = try_long_max;
      try_long_max = long_max * 2;
    } while (try_long_max > 0);

  At -O2, GCC 4.3 determines that 1 * 2 * 2 * ... can never be <= 0,
  and so it optimises this into a 1-instruction infinite loop:

    0x0805a782 <keyPut+1282>: jmp  0x805a782 <keyPut+1282>

  Quite beautiful really. ;-)

  The fix is to use the LONG_MAX macro instead.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13888
2009-01-27 17:46:07 +00:00
Nicolas Pierron
507ab31cbe Add ragel: A state machine compiler.
svn path=/nixpkgs/trunk/; revision=13881
2009-01-27 14:00:54 +00:00
Eelco Dolstra
cfda61c7c6 * GCC 4.3.3, just in time too :-)
svn path=/nixpkgs/branches/stdenv-updates/; revision=13877
2009-01-27 11:53:35 +00:00
Lluís Batlle i Rossell
c5a95e894e Adding opencascade 6.4.0.
svn path=/nixpkgs/trunk/; revision=13874
2009-01-27 08:14:27 +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
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
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
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
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
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
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
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
Eelco Dolstra
581af921ea * Latest OpenSSL, Curl.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13817
2009-01-21 14:11:22 +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
Eelco Dolstra
808bf6d34a * Make the nested output patch in GNU Make runtime configurable (by
setting the NIX_INDENT_MAKE variable; disabled by default) so we
  don't need a separate gnumakeNix package.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13807
2009-01-19 18:49:58 +00:00
Eelco Dolstra
f7ad184041 * ncurses: don't do make check because it doesn't have one.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13804
2009-01-19 11:01:20 +00:00
Eelco Dolstra
d8f6e06ae4 * Latest gmp, mpfr libraries.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13803
2009-01-19 10:45:46 +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
8bf27945c6 GNU aDNS: Disable the test suite for now.
svn path=/nixpkgs/trunk/; revision=13799
2009-01-17 20:19:54 +00:00
Eelco Dolstra
c1579d2e78 * stdenv branch: synced with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
2009-01-16 10:59:27 +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
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
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
Ludovic Courtès
1ef61a2580 Bigloo 3.2a.
svn path=/nixpkgs/trunk/; revision=13738
2009-01-11 22:49:44 +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
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
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
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
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
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
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
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
01ed35dc5f GSL 1.12.
svn path=/nixpkgs/trunk/; revision=13656
2008-12-18 09:18:36 +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
Ludovic Courtès
5dbd5eac6d GnuTLS 2.6.3.
svn path=/nixpkgs/trunk/; revision=13627
2008-12-13 16:52:31 +00:00