Commit graph

5 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 32e2dbf87f added wavesurfer (sound analysis tool) and its dependency snack (tcl /python sound tool library)
svn path=/nixpkgs/trunk/; revision=12904
2008-09-24 00:42:06 +00:00
Michael Raskin 41ecc6941b svn path=/nixpkgs/trunk/; revision=9861 2007-12-04 22:06:13 +00:00
Marc Weber e87c6a6793 sox, ffmpeg_svn expressions added
ghcPkgUtil defines a function to create setup-hook 
- creating a packagedatabase (nix-support/package.conf)
- adding it to GHC_PACKAGE_PATH
see comments for details

svn path=/nixpkgs/trunk/; revision=9500
2007-10-22 00:51:40 +00:00