diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-15 18:07:18 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-15 18:07:44 +0200 |
| commit | a4925bcfa8ba5517dda7fa5369b2493f363936af (patch) | |
| tree | be298a4740120310b7a06bd6894235a432be735e /lib/options.nix | |
| parent | 2c9b93b01c471a4d933ae05e36504c6f26d1f08b (diff) | |
| download | nixlib-a4925bcfa8ba5517dda7fa5369b2493f363936af.tar nixlib-a4925bcfa8ba5517dda7fa5369b2493f363936af.tar.gz nixlib-a4925bcfa8ba5517dda7fa5369b2493f363936af.tar.bz2 nixlib-a4925bcfa8ba5517dda7fa5369b2493f363936af.tar.lz nixlib-a4925bcfa8ba5517dda7fa5369b2493f363936af.tar.xz nixlib-a4925bcfa8ba5517dda7fa5369b2493f363936af.tar.zst nixlib-a4925bcfa8ba5517dda7fa5369b2493f363936af.zip | |
Remove obsolete stuff
Diffstat (limited to 'lib/options.nix')
| -rw-r--r-- | lib/options.nix | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/lib/options.nix b/lib/options.nix index eed43daaeccf..a30397c72161 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -59,20 +59,6 @@ rec { else if all isInt list && all (x: x == head list) list then head list else throw "Cannot merge definitions of `${showOption loc}' given in ${showFiles (getFiles defs)}."; - /* Obsolete, will remove soon. Specify an option type or apply - function instead. */ - mergeTypedOption = typeName: predicate: merge: loc: list: - let list' = map (x: x.value) list; in - if all predicate list then merge list' - else throw "Expected a ${typeName}."; - - mergeEnableOption = mergeTypedOption "boolean" - (x: true == x || false == x) (fold lib.or false); - - mergeListOption = mergeTypedOption "list" isList concatLists; - - mergeStringOption = mergeTypedOption "string" isString lib.concatStrings; - mergeOneOption = loc: defs: if defs == [] then abort "This case should never happen." else if length defs != 1 then |