Commit graph

129 commits

Author SHA1 Message Date
Nicolas Pierron 13d5c8923d factor mergeOptionSets and filterOptionSets into the function handleOptionSets.
svn path=/nixpkgs/trunk/; revision=13838
2009-01-25 00:31:23 +00:00
Michael Raskin c87887ddd0 Oops. A typo fix
svn path=/nixpkgs/trunk/; revision=13727
2009-01-08 23:04:18 +00:00
Michael Raskin 46fec9e4c9 Add a (failure-prone) last-chance string merger
svn path=/nixpkgs/trunk/; revision=13726
2009-01-08 23:02:44 +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
Nicolas Pierron 071c62a942 Rewrite uniqFlattenAttr to handle any type of elements with associated keys.
Keys are introduced because manipulated sets cannot be compared safely.

svn path=/nixpkgs/trunk/; revision=13574
2008-12-03 18:56:00 +00:00
Marc Weber a7e33ec60c updates: istanbul starts without errors. But no window appears.
svn path=/nixpkgs/trunk/; revision=13554
2008-12-02 12:28:45 +00:00
Marc Weber 9e7846d214 added Haskell's foldl
svn path=/nixpkgs/trunk/; revision=13553
2008-12-02 12:28:21 +00:00
Marc Weber d8e1f6c976 adding lib function composableDerivation
providing easy setups of flags and configurations for derivations.
configuration is passed via passthru automatically,
additional names can be merged with final attrs in an automatic sensible way
even supporting fix.
fun and funMerge idea by Michael Raskin

svn path=/nixpkgs/trunk/; revision=13546
2008-12-02 12:26:53 +00:00
Marc Weber 429df4f864 added prepareDerivationArgs
svn path=/nixpkgs/trunk/; revision=13545
2008-12-02 12:26:43 +00:00
Marc Weber 570a103136 adding mergeAttrsByFunc function - its easiy to customize how a name should be merged - the merge function is passed by the attr set itself (and can be overridden/ extended this way) This code can probably be shortened using zip and the like as proposed by Nicolas Pierron (mailinglist)
svn path=/nixpkgs/trunk/; revision=13544
2008-12-02 12:26:36 +00:00
Marc Weber 55976c6f8d depreceating functions which have been sud by me only replacements are in the following commits.. I still have to remove and adopt the code using them
svn path=/nixpkgs/trunk/; revision=13543
2008-12-02 12:26:28 +00:00
Marc Weber bd0b75fe28 added mergeAttr and concatList functions giving // and ++ a name
svn path=/nixpkgs/trunk/; revision=13542
2008-12-02 12:26:20 +00:00
Marc Weber 1f69d4d1eb enhancing whatis trace function
svn path=/nixpkgs/trunk/; revision=13541
2008-12-02 12:26:12 +00:00
Marc Weber 01fc783e7f added debug functions tracing function arguments and result
svn path=/nixpkgs/trunk/; revision=13540
2008-12-02 12:26:05 +00:00
Nicolas Pierron 53e6c77aca Fix previous commit.
svn path=/nixpkgs/trunk/; revision=13373
2008-11-23 01:23:32 +00:00
Nicolas Pierron 249a3a314f Add: Handle a way to factor conditions.
mkIf config.foo.enable {
  require = [ .. ];

  environment = {
    // infer the else part.
    extraPackages = [pkgs.foo];
    etc = mkThenElse {
      thenPart = { .. };
      elsePart = { .. };
    };
  };
}

Fix: UniqFlattenAttr compare configuration without the "require" attribute.

svn path=/nixpkgs/trunk/; revision=13372
2008-11-23 00:19:18 +00:00
Nicolas Pierron 0f2bd6c305 mergeDefaultOption: handle boolean values.
svn path=/nixpkgs/trunk/; revision=13371
2008-11-23 00:19:12 +00:00
Nicolas Pierron b62298f7c7 Add a common pattern used in jobs definition.
svn path=/nixpkgs/trunk/; revision=13370
2008-11-23 00:19:06 +00:00
Nicolas Pierron 34f916700d Add mergeStringOption and factor mergeSomethingOption by introducing mergeTypedOption.
svn path=/nixpkgs/trunk/; revision=13310
2008-11-16 19:23:00 +00:00
Nicolas Pierron b196bab378 Remove obsolete functions.
svn path=/nixpkgs/trunk/; revision=13309
2008-11-16 19:22:55 +00:00
Nicolas Pierron 08b583682a Handle apply attribute for each option declared with MkOption.
This is similar to the new-proposal in upstart-jobs except that the default value is also processed with this function. (the existing merge function acts only on extra values).

svn path=/nixpkgs/trunk/; revision=13308
2008-11-16 19:22:47 +00:00
Marc Weber 2bf82b4470 added examples for composedArgsAndFun, introducing setAttrMerge
svn path=/nixpkgs/trunk/; revision=13193
2008-11-04 21:40:51 +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
Marc Weber 1bdbe847f7 removed finalReference not beeing used anywhere
svn path=/nixpkgs/trunk/; revision=13137
2008-10-28 14:20:52 +00:00
Marc Weber a9b19788fb simplified isOption reusing typeOf
svn path=/nixpkgs/trunk/; revision=13119
2008-10-26 17:44:23 +00:00
Marc Weber 892db3bb8c update bleeding edge repo management
it now figures out the dist name from the url and the revision is added to the url
This way a new version doesn't override the old one and you can keep multiple dist tar.gz files

svn path=/nixpkgs/trunk/; revision=13065
2008-10-14 14:01:00 +00:00
Michael Raskin 29149e5385 The even more incredibly verbose debugging machine...
svn path=/nixpkgs/trunk/; revision=12758
2008-08-27 21:23:49 +00:00
Michael Raskin c406fcf194 Some diagnostics for NixOS manual helper
svn path=/nixpkgs/trunk/; revision=12756
2008-08-27 21:19:03 +00:00
Nicolas Pierron 042bc846df Handle new configuration file argument notation:
{pkgs, config, ...}:

svn path=/nixpkgs/trunk/; revision=12753
2008-08-27 17:54:24 +00:00
Nicolas Pierron ae163f596e Replace "finalReference" prefix by "fix".
svn path=/nixpkgs/trunk/; revision=12740
2008-08-27 13:58:36 +00:00
Michael Raskin d7acaeb096 Refactorings and removing hard-coded assumptions
svn path=/nixpkgs/trunk/; revision=12668
2008-08-20 11:20:32 +00:00
Michael Raskin a921f752b8 Saner tracing of booleans
svn path=/nixpkgs/trunk/; revision=12667
2008-08-20 08:41:53 +00:00
Michael Raskin ff0d85fdc8 Added traceMarked; it is traceWhatis with the extra (first) argument to distinguish the output of that exat statement.
svn path=/nixpkgs/trunk/; revision=12666
2008-08-20 08:21:54 +00:00
Michael Raskin a8da119da4 Silly mistake fixed
svn path=/nixpkgs/trunk/; revision=12665
2008-08-20 07:17:55 +00:00
Michael Raskin 97e15cc2b8 Noticed an associativity direction problem
svn path=/nixpkgs/trunk/; revision=12664
2008-08-20 06:45:14 +00:00
Michael Raskin 69e4f17372 Added null recognition to whatis
svn path=/nixpkgs/trunk/; revision=12663
2008-08-20 04:34:28 +00:00
Marc Weber 6394358c9a fix of cosmetic commit (sry)
svn path=/nixpkgs/trunk/; revision=12646
2008-08-17 07:40:35 +00:00
Marc Weber bab435592b cosmetic var name change
svn path=/nixpkgs/trunk/; revision=12644
2008-08-17 00:06:01 +00:00
Michael Raskin 99c46f200c Forgot to make composedArgsAndFun support function overrides in addition to attrSet-merging ones.
svn path=/nixpkgs/trunk/; revision=12627
2008-08-14 22:12:50 +00:00
Michael Raskin f1f9e38e94 Big breaking change. I have radically reduced number of nulls used in all-packages.nix and generally switched to composedArgsAndFun which simply adds .meta.function to everything that has come through it.. I have not tested the build, because OO.o has to be updated...
svn path=/nixpkgs/trunk/; revision=12625
2008-08-14 22:04:30 +00:00
Michael Raskin eb50dd2c0d Added StumpWM
svn path=/nixpkgs/trunk/; revision=12566
2008-08-09 20:21:33 +00:00
Nicolas Pierron 692c5a62a4 Use "abort" instead of "throw" when option values cannot be merged.
Fix mergeListOption.
Add error support in mergeEnableOption.

svn path=/nixpkgs/trunk/; revision=12522
2008-08-06 19:24:36 +00:00
Nicolas Pierron 0ce4cafd88 * Do not always use the current result as argument.
* "filterOptionSets" returns the only option per attribute instead of a list of options.

svn path=/nixpkgs/trunk/; revision=12520
2008-08-06 18:34:11 +00:00
Nicolas Pierron 0e25bb67cf Add a new way to handle option sets.
svn path=/nixpkgs/trunk/; revision=12505
2008-08-05 17:16:35 +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
Michael Raskin e8e0d1665c traceWhatIs works for empty lists
svn path=/nixpkgs/trunk/; revision=12046
2008-06-12 06:58:07 +00:00
Eelco Dolstra dcf01e5925 * A convenience function `makeLibraryPath' that adds "/lib" to each
element of a list and concatenates them separated by colons.

svn path=/nixpkgs/branches/stdenv-updates/; revision=11970
2008-06-04 09:56:11 +00:00
Marc Weber e17c96c881 Support for profiling (all libraries) enabled by custom config
moved flapjax to ghcExecutables
added haskelldb mysql
added ghc darcs build (left in comments)

svn path=/nixpkgs/trunk/; revision=11742
2008-04-28 22:27:03 +00:00
Michael Raskin 55f4987f42 Added optionalString (similar to optional)
svn path=/nixpkgs/trunk/; revision=11733
2008-04-27 23:17:24 +00:00