Commit Graph

55 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
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
Marc Weber
ba6c703918 jackaudio connection kit (jackd) is back
svn path=/nixpkgs/trunk/; revision=12649
2008-08-18 16:03:04 +00:00
Eelco Dolstra
08f647a5e6 * Added a telnet client.
svn path=/nixpkgs/trunk/; revision=9431
2007-10-09 09:56:39 +00:00
Marc Weber
a6f18fb565 jack added - compiles - haven't done any testing yet
svn path=/nixpkgs/trunk/; revision=9403
2007-10-03 22:38:09 +00:00