Commit graph

484 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 2c0558e11c * Valgrind 3.4.1.
svn path=/nixpkgs/trunk/; revision=14304
2009-03-03 09:19:50 +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
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
Eelco Dolstra 6d62e290a0 * elfutils: updated to 0.140. The older versions don't seem to be
needed.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14105
2009-02-17 16:42:51 +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 390695e73f * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14057
2009-02-12 21:16:55 +00:00
Michael Raskin 7590daad42 Extra mirror for lsof
svn path=/nixpkgs/trunk/; revision=14036
2009-02-11 21:51:05 +00:00
Eelco Dolstra efbfa0c395 * Latest lsof.
svn path=/nixpkgs/trunk/; revision=14025
2009-02-10 23:11:29 +00:00
Ludovic Courtès 6aa15fcfb0 GNU gperf 3.0.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13987
2009-02-05 16:49:41 +00:00
Ludovic Courtès 8b87ac3eeb GNU Binutils 2.19.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13975
2009-02-03 19:36:56 +00:00
Eelco Dolstra e8358099f5 * Doh.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13959
2009-02-02 15:41:13 +00:00
Eelco Dolstra a68773a3ea * GNU m4: `make check' fails on Darwin:
===
Checking ./219.improved_f
Checking ./stackovf.test
Stack soft limit set to 300K
Failure - m4 aborted unexpectedly
Output from m4:
m4: internal error detected; please report this bug to <bug-m4@gnu.org>: Bus error

Skipped checks were:
  ./116.changeword ./117.changeword ./118.changeword ./119.changeword ./120.changeword ./121.changeword
Failed checks were:
  ./stackovf.test
make[2]: *** [check] Error 1
make[1]: *** [check-recursive] Error 1
===

  So disable the check on Darwin for now.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13958
2009-02-02 15:34:59 +00:00
Eelco Dolstra 15258b7f50 * Disable make check.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13937
2009-02-01 21:21:21 +00:00
Eelco Dolstra c584bb878a * Sync with trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13903
2009-01-29 16:33:02 +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
Lluís Batlle i Rossell aad3e77b44 Adding cdecl-2.5
svn path=/nixpkgs/trunk/; revision=13833
2009-01-24 21:01:27 +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 c1579d2e78 * stdenv branch: synced with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
2009-01-16 10:59:27 +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 c18603c3b3 GDB: Use the system Readline library.
svn path=/nixpkgs/trunk/; revision=13746
2009-01-12 18:06:32 +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
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 f87ad9b663 Autoconf 2.13 (older version used by Mozilla)
svn path=/nixpkgs/trunk/; revision=13691
2009-01-03 13:42:36 +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 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 b942701506 GNU Bison 2.4.1.
svn path=/nixpkgs/trunk/; revision=13619
2008-12-12 12:37:29 +00:00
Eelco Dolstra 0cf7b1c811 * Latest strace.
svn path=/nixpkgs/trunk/; revision=13607
2008-12-10 17:09:11 +00:00
Eelco Dolstra e31341510d * Merged from the trunk. Let's see how well this works with
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
2008-12-10 09:59:21 +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 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 1a4a270855 bumped intltool to version 0.40.5
svn path=/nixpkgs/trunk/; revision=13434
2008-11-26 14:38:05 +00:00
Eelco Dolstra f7f25d81a7 * Oops.
svn path=/nixpkgs/trunk/; revision=13301
2008-11-14 17:27:54 +00:00
Eelco Dolstra aa84bce64d * Get rid of all references to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=13299
2008-11-14 16:57:19 +00:00
Eelco Dolstra c1cbd437dc * Doh.
svn path=/nixpkgs/trunk/; revision=13297
2008-11-14 16:28:15 +00:00
Eelco Dolstra 704e51d3e2 * Reenable the check phase in Bison 2.4.
* Use the passthru attribute.

svn path=/nixpkgs/trunk/; revision=13295
2008-11-14 15:53:07 +00:00
Peter Simons 6a051f96a2 Updated cmake to version 2.6.2.
svn path=/nixpkgs/trunk/; revision=13286
2008-11-13 21:05:01 +00:00
Michael Raskin c5363217ad meta.function -> passthru.function, not killing other contents of passthru
svn path=/nixpkgs/trunk/; revision=13190
2008-11-04 21:24:10 +00:00
Michael Raskin 8b06e2e228 Try producing release without running bison2.4 testsuite..
svn path=/nixpkgs/trunk/; revision=13189
2008-11-04 18:39:52 +00:00
Ludovic Courtès d7a1a64e57 GNU Bison 2.3: Fix `meta.license'.
svn path=/nixpkgs/trunk/; revision=13182
2008-11-03 18:28:13 +00:00
Ludovic Courtès c0960419b2 GNU Bison 2.3: Update `meta' attribute.
svn path=/nixpkgs/trunk/; revision=13181
2008-11-03 18:27:35 +00:00
Ludovic Courtès 8c1408bf27 GNU Bison 2.4 (2.3.x remains the default).
svn path=/nixpkgs/trunk/; revision=13180
2008-11-03 18:25:17 +00:00
Ludovic Courtès 6e9e3c0cc6 GNU Libtool 1.5.x: Add `meta' attribute.
svn path=/nixpkgs/trunk/; revision=13178
2008-11-03 10:23:33 +00:00
Ludovic Courtès fccfff91dd GNU Libtool 2.x: Add `meta' attribute.
svn path=/nixpkgs/trunk/; revision=13177
2008-11-03 10:22:41 +00:00
Ludovic Courtès e967438c48 Add GNU Libtool 2.2.x.
svn path=/nixpkgs/trunk/; revision=13176
2008-11-03 10:15:37 +00:00
Ludovic Courtès c4df2f80d5 GNU M4 1.4.12.
Untested!

svn path=/nixpkgs/branches/stdenv-updates/; revision=13142
2008-10-29 08:58:48 +00:00
Ludovic Courtès c0892721d0 GNU Binutils 2.19.
Untested!

svn path=/nixpkgs/branches/stdenv-updates/; revision=13141
2008-10-29 08:57:58 +00:00
Ludovic Courtès 79bcd85e81 GNU cflow: Fix reference to `cpp'.
svn path=/nixpkgs/trunk/; revision=13132
2008-10-28 10:25:10 +00:00
Ludovic Courtès 6921e41e84 Add GNU cflow.
svn path=/nixpkgs/trunk/; revision=13129
2008-10-28 08:43:44 +00:00
Peter Simons 574a1aa636 Added build expression for doxygen 1.5.7.1.
svn path=/nixpkgs/trunk/; revision=13106
2008-10-23 14:23:12 +00:00
Ludovic Courtès 8521b5c73f DejaGNU: Update comments, document chroot impurity.
svn path=/nixpkgs/trunk/; revision=13088
2008-10-16 20:54:32 +00:00
Ludovic Courtès 81542299cc DejaGNU: Disable test suite for now.
svn path=/nixpkgs/trunk/; revision=13087
2008-10-16 20:11:21 +00:00
Eelco Dolstra 5bc2dc536d * `pkg-config --cflags': ignore Requires.private (just like --libs).
Whether this is correct is debatable (especially since there is no
  formal semantics for Requires.private), but not ignoring it breaks
  some packages (like Pango's dependency on Cairo).

svn path=/nixpkgs/branches/stdenv-updates/; revision=13060
2008-10-14 12:06:36 +00:00
Eelco Dolstra 1e6622f4d5 * The patch for proper Requires.private processing is still necessary,
unfortunately.  For instance, libxcb's xcb.pc declares:

    Requires.private: pthread-stubs ...

  Thus libxcb has to declare the pthread-stubs package as a
  propagatedBuildInput, otherwise packages that check for libxcb using
  pkg-config (such as libX11) will fail.  But then we get a totally
  unnecessary additional runtime dependency, which is clearly a bad
  thing.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13058
2008-10-13 12:51:04 +00:00
Ludovic Courtès b43d4f87db Pkgconfig 0.23.
Untested!

svn path=/nixpkgs/branches/stdenv-updates/; revision=13054
2008-10-12 19:15:29 +00:00
Eelco Dolstra 5eef7df51d * intltool: deleted redundant copy (it's already in the Gnome Nix
expressions).
* Fixed xkbcomp: it no longer found the keyboard definitions since it
  disregards the -R option passed by the X server (it chdirs to the -R
  path, but "." has been removed from the xkbcomp search path in
  xkbcomp 1.0.5).  Build it with /etc/X11/xkb as its default
  location.  This is less pure but it does allow for updating
  xkeyboard-config in a running server.
* xkeyboard-config: updated to 1.4.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13018
2008-10-09 12:12:58 +00:00
Eelco Dolstra 0d62334693 * 1.4.11.nix -> default.nix.
svn path=/nixpkgs/branches/stdenv-updates/; revision=12997
2008-10-08 08:47:20 +00:00
Eelco Dolstra 51aa939b21 * GNU M4 1.4.11.
svn path=/nixpkgs/branches/stdenv-updates/; revision=12993
2008-10-07 17:34:00 +00:00
Eelco Dolstra bf65ff9ec6 * Use the texinfo-4.13a tarball. Strangely, the texinfo-4.13 tarball
has a different hash on ftp.nluug.nl, which happens to be the first
  mirror for fetchurl, thus building texinfo failed.

svn path=/nixpkgs/trunk/; revision=12902
2008-09-23 00:21:49 +00:00
Ludovic Courtès a4a186d4cf GNU Texinfo 4.13.
svn path=/nixpkgs/trunk/; revision=12901
2008-09-22 21:21:39 +00:00
Ludovic Courtès 88f0359c5c OProfile 0.9.4.
svn path=/nixpkgs/trunk/; revision=12867
2008-09-15 15:26:01 +00:00
Ludovic Courtès a8876e7130 GNU Autoconf 2.63.
svn path=/nixpkgs/trunk/; revision=12840
2008-09-11 12:45:20 +00:00
Ludovic Courtès 0a096340ad GDB 6.8.
svn path=/nixpkgs/trunk/; revision=12792
2008-09-03 13:12:23 +00:00
Peter Simons 85546a8e31 Updated scons and twisted; added buildbot.
* Updated scons to version 1.0.0. Also added appropriate makeWrapper calls to
   ensure that the python binary finds its library files.

 * Updated Twisted from 2.5 to 8.1.

 * Added an expression for buildbot.

svn path=/nixpkgs/trunk/; revision=12782
2008-09-01 15:11:09 +00:00
Pjotr Prins 73d2e4f49d - Some Ruby interpreter bumped version
- Kernel headers 2.6.18 added (XEN virtual images)
- unifdef package added for kernel headers 2.6.18
- Python Zope and 4suite added
- Trying bioconductor packages with R-lang (still failing)
- Bumped gmp version
- Added rq cluster runner - still requires extra gems (installs, but does not run)


svn path=/nixpkgs/trunk/; revision=12766
2008-08-29 13:53:28 +00:00
Eelco Dolstra b35469a42e * Nitpick.
svn path=/nixpkgs/trunk/; revision=12747
2008-08-27 15:21:10 +00:00
Ludovic Courtès 74d72ee6bf Cscope: Fix erroneous substitution that caused Cscope to depend on all
of stdenv.

svn path=/nixpkgs/trunk/; revision=12714
2008-08-25 19:34:14 +00:00
Ludovic Courtès 956a4e1ed2 Add Cscope, a C code browser.
svn path=/nixpkgs/trunk/; revision=12711
2008-08-25 15:34:14 +00:00
Ludovic Courtès 3328fd9d3d Add Sparse, a static analysis tool for C.
svn path=/nixpkgs/trunk/; revision=12696
2008-08-22 18:33:52 +00:00
Marc Weber c4270fb9b8 moved hasktags to ghc68executables, updated url to new location
svn path=/nixpkgs/trunk/; revision=12680
2008-08-21 11:07:44 +00:00
Eelco Dolstra 1acf5fa9f0 * Make Valgrind's default suppressions useful for Nix-compiled
programs (e.g. a rule should match any libc.so, not just
  /lib/libc.so).

svn path=/nixpkgs/trunk/; revision=12661
2008-08-19 13:03:08 +00:00
Michael Raskin 87ff8d6347 Changed builderDefs to use composedArgsAndFun, reduced number of nulls, made overrides in builderDefsPackage to work in an intuitive manner.
svn path=/nixpkgs/trunk/; revision=12655
2008-08-19 05:54:09 +00:00
Marc Weber 9e55727832 Added:
* dmenu
* gftp
* micropolis
* byacc as a build-time dependency for micropolis
contributed by baldo <baldo@quimby.lan>

svn path=/nixpkgs/trunk/; revision=12526
2008-08-06 20:39:01 +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
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
Eelco Dolstra 8f309bc83e * Add a meta attribute.
svn path=/nixpkgs/trunk/; revision=12415
2008-07-24 13:02:22 +00:00
Andres Löh cf7b225cf4 * changed from haddock-2.0.0.0 to haddock-2.1.0
(both only work with ghc-6.8.2, not ghc-6.8.3)
* added haddock-0.9 as a version that compiles with
  nearly all ghc's we have
* added haddock-0.9-boot the works with ghc-6.4.2-boot
* the haddock-0.9-boot is now used to generate library
  documentation while building ghc-6.8.3

svn path=/nixpkgs/trunk/; revision=12392
2008-07-22 13:01:30 +00:00
Peter Simons a16eebd0a6 Cosmetic, no functional change intended.
This patch moves curly braces to the end of the line, i.e.

  foo = { 
    ...
  };

instead of the previously used style:

  foo = 
  { 
    ...
  };

I commit this change hoping that my contributions to this project now conform
to the rules described in maintainers/docs/coding-conventions.txt so that the
self-appointed indention sheriff of the NixOS community can finally get off my
back and rest assured knowing that all i's are dotted and all t's are crossed.

svn path=/nixpkgs/trunk/; revision=12386
2008-07-18 20:11:25 +00:00
Ludovic Courtès 57030a28aa Add Splint, a static code analyzer for C.
svn path=/nixpkgs/trunk/; revision=12343
2008-07-11 09:13:34 +00:00
Nicolas Pierron bb72d90805 Add "ddd": Graphical front-end for command-line debuggers.
svn path=/nixpkgs/trunk/; revision=12336
2008-07-10 16:56:51 +00:00
Wouter den Breejen 33efc97c20 Put patches in svn please.
svn path=/nixpkgs/trunk/; revision=12318
2008-07-08 05:52:09 +00:00
Wouter den Breejen e9df8084c2 Put patches in svn please.
svn path=/nixpkgs/trunk/; revision=12317
2008-07-08 05:51:59 +00:00
Ludovic Courtès 4793092374 GNU Make: Make `nix-log2xml' support optional.
One question remains: how to make the option available to the user.
`getConfig' is nice but useless as long as `useFromStdenv' prevails.

svn path=/nixpkgs/trunk/; revision=12311
2008-07-07 22:02:36 +00:00
Ludovic Courtès b71ae8ce6b GNU Automake 1.10.1, with test suite.
svn path=/nixpkgs/trunk/; revision=12241
2008-07-02 15:27:07 +00:00
Ludovic Courtès 7a1735a705 Add GNU M4 1.4.11, with test suite and all.
Can't replace 1.4.9 right now since it's part of stdenv.

svn path=/nixpkgs/trunk/; revision=12238
2008-07-01 19:50:34 +00:00
Ludovic Courtès 117865a28f Switch to GNU Autoconf 2.62.
svn path=/nixpkgs/trunk/; revision=12230
2008-07-01 08:31:48 +00:00
Ludovic Courtès 21e500ac88 GNU Autoconf 2.62 improvements.
svn path=/nixpkgs/trunk/; revision=12228
2008-07-01 08:07:22 +00:00
Eelco Dolstra aaccd6f6e2 * Fix building the Fortran compiler.
svn path=/nixpkgs/trunk/; revision=12201
2008-06-27 14:43:25 +00:00
Eelco Dolstra de4901c4fe * lsof 4.80.
svn path=/nixpkgs/trunk/; revision=12186
2008-06-25 13:08:09 +00:00
Peter Simons 4842708ca1 scons: install library files in python's site-package directory
svn path=/nixpkgs/trunk/; revision=12179
2008-06-23 22:24:12 +00:00
Michael Raskin 8b90ef4690 Python must be propagatedBuildInputs now that they are using env
svn path=/nixpkgs/trunk/; revision=12158
2008-06-19 07:24:43 +00:00
Peter Simons bc4f5932ad scons: updated to version 0.95.5 and added selectVersion dispatcher
Scons is not only a tool, it's also a python library. However, the
modules are installed in ~/.nix-profile/lib/scons-${version} -- not in
python's "site-packages" directory -- so python won't find the library
without further help. Maybe there should be a symlink in nix-profile? I
guess there should, but I didn't know how to write that into the
expression.

svn path=/nixpkgs/trunk/; revision=12157
2008-06-18 22:48:54 +00:00
Michael Raskin 71e1e1fe6e Added autoconf 2.62
svn path=/nixpkgs/trunk/; revision=12117
2008-06-16 12:58:43 +00:00
Eelco Dolstra fc5eebdf8b * Merged the stdenv branch
(https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates
  -r10966:12061).

svn path=/nixpkgs/trunk/; revision=12073
2008-06-13 11:46:39 +00:00
Eelco Dolstra 5a66790cce * Valgrind 3.3.1.
svn path=/nixpkgs/trunk/; revision=12071
2008-06-13 09:27:02 +00:00