nixos,lib: move environment generation related copy-paste to lib

2015-09-18 18:48:49 +00:00
parent c8ea6c07c6
commit 33ae3f2fe4
3 changed files with 20 additions and 29 deletions
@@ -41,20 +41,7 @@ in
        strings.  The latter is concatenated, interspersed with colon
        characters.
      '';
-      type = types.attrsOf (mkOptionType {
-        name = "a string or a list of strings";
-        merge = loc: defs:
-          let
-            defs' = filterOverrides defs;
-            res = (head defs').value;
-          in
-          if isList res then concatLists (getValues defs')
-          else if lessThan 1 (length defs') then
-            throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
-          else if !isString res then
-            throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."
-          else res;
-      });
+      type = types.attrsOf (types.loeOf types.str);
      apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v);
    };