···

       
76
       
76
       
 
       
      };

     

       
77
       
77
       
 
       


     

       
78
       
78
       
 
       
      tags = mkOption {

     

       
79
       
79
       
-
       
        type = types.attrsOf types.str;

     

       
79
       
79
       
+
       
        type = types.attrsOf (types.either types.str (types.listOf types.str));

     

       
80
       
80
       
 
       
        default = {};

     

       
81
       
81
       
 
       
        example = { queue = "default"; docker = "true"; ruby2 ="true"; };

     

       
82
       
82
       
 
       
        description = ''

     
···

       
230
       
230
       
 
       
        ##     don't end up in the Nix store.

     

       
231
       
231
       
 
       
        preStart = let

     

       
232
       
232
       
 
       
          sshDir = "${cfg.dataDir}/.ssh";

     

       
233
       
233
       
-
       
          tagStr = lib.concatStringsSep "," (lib.mapAttrsToList (name: value: "${name}=${value}") cfg.tags);

     

       
233
       
233
       
+
       
          tagStr = name: value:

     

       
234
       
234
       
+
       
            if lib.isList value

     

       
235
       
235
       
+
       
            then lib.concatStringsSep "," (builtins.map (v: "${name}=${v}") value)

     

       
236
       
236
       
+
       
            else "${name}=${value}";

     

       
237
       
237
       
+
       
          tagsStr = lib.concatStringsSep "," (lib.mapAttrsToList tagStr cfg.tags);

     

       
234
       
238
       
 
       
        in

     

       
235
       
239
       
 
       
          optionalString (cfg.privateSshKeyPath != null) ''

     

       
236
       
240
       
 
       
            mkdir -m 0700 -p "${sshDir}"

     
···

       
241
       
245
       
 
       
            token="$(cat ${toString cfg.tokenPath})"

     

       
242
       
246
       
 
       
            name="${cfg.name}"

     

       
243
       
247
       
 
       
            shell="${cfg.shell}"

     

       
244
       
244
       
-
       
            tags="${tagStr}"

     

       
248
       
248
       
+
       
            tags="${tagsStr}"

     

       
245
       
249
       
 
       
            build-path="${cfg.dataDir}/builds"

     

       
246
       
250
       
 
       
            hooks-path="${cfg.hooksPath}"

     

       
247
       
251
       
 
       
            ${cfg.extraConfig}