Commit Graph

6104 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
Marc Weber
f1183f33e3 added simple lib test case for overridableDelayableArgs
svn path=/nixpkgs/trunk/; revision=14426
2009-03-06 23:21:17 +00:00
Marc Weber
5ddfa7ed64 moved catAttrs, attrVals into attrsets.nix, adding attrValues
svn path=/nixpkgs/trunk/; revision=14425
2009-03-06 23:21:14 +00:00
Marc Weber
be3a9f2346 added overridableDelayableArgs replacing applyAndFun
svn path=/nixpkgs/trunk/; revision=14424
2009-03-06 23:21:12 +00:00
Marc Weber
e917282535 added eqStrict (deep, strict test for equality)
it can replace eqList and can compare attrs as well

svn path=/nixpkgs/trunk/; revision=14423
2009-03-06 23:21:09 +00:00
Eelco Dolstra
d0691bf1d7 * We don't need all that src.outPath / src.path hackery anymore.
svn path=/nixpkgs/trunk/; revision=14419
2009-03-06 16:53:44 +00:00
Eelco Dolstra
bd5aed6fd6 * Set argv[0] to a nicer value.
svn path=/nixpkgs/trunk/; revision=14418
2009-03-06 16:53:02 +00:00
Ludovic Courtès
f301e8423b GNU Gnash 0.8.5.
svn path=/nixpkgs/trunk/; revision=14415
2009-03-06 14:24:27 +00:00
Ludovic Courtès
fac7dc875a Build Doxygen.
svn path=/nixpkgs/trunk/; revision=14352
2009-03-05 15:42:42 +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
e263446442 * Firefox 3.0.7.
* Chatzilla 0.9.84.

svn path=/nixpkgs/trunk/; revision=14346
2009-03-05 14:06:07 +00:00
Sander van der Burg
628c3d0929 Changed download location of phonon
svn path=/nixpkgs/trunk/; revision=14341
2009-03-05 11:44:54 +00:00
Sander van der Burg
5e8908c481 Upgrade to KDE 4.2.1
svn path=/nixpkgs/trunk/; revision=14340
2009-03-05 11:09:47 +00:00
Armijn Hemel
53bf781136 update to 2.5.5
svn path=/nixpkgs/trunk/; revision=14339
2009-03-04 23:05:11 +00:00
Lluís Batlle i Rossell
08a1042318 Adding neverball 1.5.0, which comes with neverputt. Fun.
svn path=/nixpkgs/trunk/; revision=14338
2009-03-04 17:28:25 +00:00
Ludovic Courtès
70657dbb83 GnuPG 2.0.11.
svn path=/nixpkgs/trunk/; revision=14329
2009-03-04 13:41:52 +00:00
Marc Weber
b288a02e9a nixUnstable version bump to 0.13pre14314
svn path=/nixpkgs/trunk/; revision=14326
2009-03-04 12:08:56 +00:00
Marc Weber
62a0aafa04 nixUnstable version bump to 0.13pre13641
svn path=/nixpkgs/trunk/; revision=14325
2009-03-04 12:08:51 +00:00
Lluís Batlle i Rossell
f3a4388ddc Updating flashplayer10 for i686, and adding it for x64.
I haven't tried the builder for i686, but I think it should work. The fix should be easy in any cas.
I don't think I've written pretty nix code, so I'm looking forward for revision.


svn path=/nixpkgs/trunk/; revision=14324
2009-03-04 11:04:16 +00:00
Ludovic Courtès
fb9ace2e56 CEDET: Run the test suite the right way.
svn path=/nixpkgs/trunk/; revision=14318
2009-03-03 19:45:04 +00:00
Ludovic Courtès
1c7bf2d846 GNU Zile 2.3.3.
svn path=/nixpkgs/trunk/; revision=14317
2009-03-03 19:35:56 +00:00
Eelco Dolstra
94b0227aad svn path=/nixpkgs/trunk/; revision=14311 2009-03-03 13:47:46 +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
Armijn Hemel
2d1a047761 add stunnel
svn path=/nixpkgs/trunk/; revision=14301
2009-03-02 15:23:52 +00:00
Ludovic Courtès
fd93dfbe9d CEDET 1.0pre6.
svn path=/nixpkgs/trunk/; revision=14298
2009-03-02 15:11:54 +00:00
Eelco Dolstra
6bb95494e7 * Use the version attribute if available.
svn path=/nixpkgs/trunk/; revision=14297
2009-03-02 14:33:33 +00:00
Eelco Dolstra
84a0bd9c83 * Use qcow2.
svn path=/nixpkgs/trunk/; revision=14296
2009-03-02 14:31:33 +00:00
Eelco Dolstra
45081f330d * Append the version to the "name" attribute to make the store paths
of Hydra builds more distinct (e.g. "patchelf-build-0.5pre1234"
  instead of just "patchelf-build").  If the version isn't known,
  append at least the revision.

* Propagate the release name of the source tarball to Nix builds.
  Useful to provide sensible package names in channels.

svn path=/nixpkgs/trunk/; revision=14294
2009-03-02 13:45:48 +00:00
Eelco Dolstra
f19aea6d5a * Added openSUSE 11.0.
* Create some device nodes in the RPM/Deb disk images, since modern
  distributions may not provide any device nodes (they're all
  generated by udev).

svn path=/nixpkgs/trunk/; revision=14293
2009-03-02 13:22:31 +00:00
Sander van der Burg
df84d143c1 Some kdebindings-4.2 fixes
svn path=/nixpkgs/trunk/; revision=14291
2009-03-02 10:19:20 +00:00
Lluís Batlle i Rossell
301c3d31c9 Adding tunctl. I didn't know how to build the manpage, though.
svn path=/nixpkgs/trunk/; revision=14290
2009-03-01 21:34:39 +00:00
Lluís Batlle i Rossell
247ad8bfcf Adding LUKS cryptsetup for the devicemapper.
svn path=/nixpkgs/trunk/; revision=14289
2009-03-01 11:11:21 +00:00
Armijn Hemel
67cbb2c3fb update to 0.13.0
svn path=/nixpkgs/trunk/; revision=14288
2009-03-01 00:48:25 +00:00
Nicolas Pierron
e18a10d0ae * Refactor mkIf to extract the concept of properties.
Properties can be delay on any attribute set and have
functions which are used to define the semantic of each
property.

* Introduce the mkOverride property.

svn path=/nixpkgs/trunk/; revision=14285
2009-02-28 18:21:25 +00:00
Eelco Dolstra
02b2540b15 svn path=/nixpkgs/trunk/; revision=14284 2009-02-27 16:25:27 +00:00
Eelco Dolstra
30d188f92d * Graphviz 2.20.3.
svn path=/nixpkgs/trunk/; revision=14281
2009-02-27 15:36:14 +00:00
Peter Simons
c7e3110299 Use $NIXPKGS_CONFIG to determine whether ghostscript has cups support.
svn path=/nixpkgs/trunk/; revision=14275
2009-02-27 13:44:31 +00:00
Eelco Dolstra
0175270bf9 * Wine 1.1.15.
svn path=/nixpkgs/trunk/; revision=14273
2009-02-27 12:52:55 +00:00
Michael Raskin
9d06868cda Updated Lazarus
svn path=/nixpkgs/trunk/; revision=14263
2009-02-26 15:49:55 +00:00
Pjotr Prins
17e2100b03 Updated PAML package to 4.2a
svn path=/nixpkgs/trunk/; revision=14262
2009-02-26 15:22:13 +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
Marc Weber
6a1ecaee94 added tightvnc note about solving connecting trouble
svn path=/nixpkgs/trunk/; revision=14260
2009-02-26 13:16:25 +00:00
Peter Simons
9cab85dd63 git: updated from 1.6.0.4 to 1.6.1.3
svn path=/nixpkgs/trunk/; revision=14259
2009-02-26 10:54:52 +00:00
Peter Simons
6febac4529 git.el: added fill-paragraph patch
The patch makes Emacs recognize "--- log message follows this line ---"
as a paragraph separator. It's going to be part of the distribution in
the foreseeable future.

svn path=/nixpkgs/trunk/; revision=14258
2009-02-26 10:54:44 +00:00
Ludovic Courtès
5ee528446d Build GNU Zile.
svn path=/nixpkgs/trunk/; revision=14257
2009-02-26 09:57:48 +00:00
Ludovic Courtès
9aabbea00e Build portmap' and nfs-utils'.
svn path=/nixpkgs/trunk/; revision=14256
2009-02-26 09:57:27 +00:00
Ludovic Courtès
e221d7ce61 TCP Wrappers: Use the Debian patches.
It has the following side effects (among others):

  * Fix compilation on x86_64.  We now only install the shared
    library and one of the Debian patches makes sure its objects
    are compiled with `-fPIC'.

  * Provide IPv6 support.

  * Fix man pages.

  * Fix `linux' makefile target.


svn path=/nixpkgs/trunk/; revision=14255
2009-02-26 09:53:31 +00:00