File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -299,18 +299,19 @@ in {
299299 saveMetadataHidden = mkEnableOption "" ;
300300
301301 contentTypes = mkOption {
302- type = with types ; listOf ( submodule {
303- options = {
304- name = mkOption {
305- type = str ;
306- description = "Content type name" ;
302+ type = with types ;
303+ listOf ( submodule {
304+ options = {
305+ name = mkOption {
306+ type = str ;
307+ description = "Content type name" ;
308+ } ;
309+ value = mkOption {
310+ type = str ;
311+ description = "Content type value" ;
312+ } ;
307313 } ;
308- value = mkOption {
309- type = str ;
310- description = "Content type value" ;
311- } ;
312- } ;
313- } ) ;
314+ } ) ;
314315 default = [ ] ;
315316 } ;
316317
@@ -362,18 +363,19 @@ in {
362363 } ;
363364
364365 pathSubstitutions = mkOption {
365- type = with types ; listOf ( submodule {
366- options = {
367- from = mkOption {
368- type = str ;
369- description = "Path to substitute from" ;
370- } ;
371- to = mkOption {
372- type = str ;
373- description = "Path to substitute to" ;
366+ type = with types ;
367+ listOf ( submodule {
368+ options = {
369+ from = mkOption {
370+ type = str ;
371+ description = "Path to substitute from" ;
372+ } ;
373+ to = mkOption {
374+ type = str ;
375+ description = "Path to substitute to" ;
376+ } ;
374377 } ;
375- } ;
376- } ) ;
378+ } ) ;
377379 default = [ ] ;
378380 } ;
379381
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ with lib; let
2222
2323 buildUserPayload = userName : userCfg : {
2424 name = userName ;
25- enableAutoLogin = userCfg . enableAutoLogin ;
25+ inherit ( userCfg ) enableAutoLogin ;
2626 configuration = util . recursiveTransform userCfg . preferences ;
2727 policy = util . recursiveTransform ( userCfg . policy
2828 // {
Original file line number Diff line number Diff line change @@ -7,13 +7,12 @@ with lib; rec {
77 ( toUpper firstChar ) + rest ;
88
99 recursiveTransform = value :
10- if isAttrs value then
11- if value ? tag && value ? content then
12- recursiveTransform value . content
13- else
14- mapAttrs' ( k : v : nameValuePair ( toPascalCase k ) ( recursiveTransform v ) ) value
15- else if isList value then
16- map recursiveTransform value
17- else
18- value ;
10+ if isAttrs value
11+ then
12+ if value ? tag && value ? content
13+ then recursiveTransform value . content
14+ else mapAttrs' ( k : v : nameValuePair ( toPascalCase k ) ( recursiveTransform v ) ) value
15+ else if isList value
16+ then map recursiveTransform value
17+ else value ;
1918}
You can’t perform that action at this time.
0 commit comments