alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/syncthing: Fix submodule name usage

Browse source 
Module arguments should be taken from the arguments directly. This
allows evalModule's specialArgs to override them if necessary
This commit is contained in:
Silvan Mosberger 2019-12-05 06:49:23 +01:00
parent 90c82bfee7
commit bc42515736
No known key found for this signature in database
GPG key ID: E8F1E9EAD284E17D
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nixos/modules/services/networking/syncthing.nix
View file

@ -112,12 +112,12 @@ in {
addresses = [ "tcp://192.168.0.10:51820" ];
};
};
type = types.attrsOf (types.submodule ({ config, ... }: {
type = types.attrsOf (types.submodule ({ name, ... }: {
options = {
name = mkOption {
type = types.str;
default = config._module.args.name;
default = name;
description = ''
Name of the device
'';
@ -175,7 +175,7 @@ in {
devices = [ "bigbox" ];
};
};
type = types.attrsOf (types.submodule ({ config, ... }: {
type = types.attrsOf (types.submodule ({ name, ... }: {
options = {
enable = mkOption {
@ -190,7 +190,7 @@ in {
path = mkOption {
type = types.str;
default = config._module.args.name;
default = name;
description = ''
The path to the folder which should be shared.
'';
@ -198,7 +198,7 @@ in {
id = mkOption {
type = types.str;
default = config._module.args.name;
default = name;
description = ''
The id of the folder. Must be the same on all devices.
'';
@ -206,7 +206,7 @@ in {
label = mkOption {
type = types.str;
default = config._module.args.name;
default = name;
description = ''
The label of the folder.
'';