nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-04 03:03:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/scion: use recursiveUpdate instead of //

Browse Source
This commit is contained in:
matthewcroughan 2024-06-25 13:31:27 +01:00 committed by Valentin Gagarin
parent 65d005b5bf
commit 973108d3ed
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/networking/scion/scion-control.nix
View File

@ -24,7 +24,7 @@ let
level = "info";
};
};
configFile = toml.generate "scion-control.toml" (defaultConfig // cfg.settings);
configFile = toml.generate "scion-control.toml" (recursiveUpdate defaultConfig cfg.settings);
in
{
options.services.scion.scion-control = {

2
nixos/modules/services/networking/scion/scion-daemon.nix
View File

@ -21,7 +21,7 @@ let
level = "info";
};
};
configFile = toml.generate "scion-daemon.toml" (defaultConfig // cfg.settings);
configFile = toml.generate "scion-daemon.toml" (recursiveUpdate defaultConfig cfg.settings);
in
{
options.services.scion.scion-daemon = {

2
nixos/modules/services/networking/scion/scion-dispatcher.nix
View File

@ -15,7 +15,7 @@ let
level = "info";
};
};
configFile = toml.generate "scion-dispatcher.toml" (defaultConfig // cfg.settings);
configFile = toml.generate "scion-dispatcher.toml" (recursiveUpdate defaultConfig cfg.settings);
in
{
options.services.scion.scion-dispatcher = {

2
nixos/modules/services/networking/scion/scion-router.nix
View File

@ -11,7 +11,7 @@ let
config_dir = "/etc/scion";
};
};
configFile = toml.generate "scion-router.toml" (defaultConfig // cfg.settings);
configFile = toml.generate "scion-router.toml" (recursiveUpdate defaultConfig cfg.settings);
in
{
options.services.scion.scion-router = {