kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity

simplify helper function evalOption to drop the first parameter (#580)

Browse source 
Reviewed-on: fediversity/fediversity#580
This commit is contained in:
Kiara Grouwstra 2025-11-08 21:05:45 +01:00
parent b0b32af2ab
commit 1690fcb265
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
deployment/check/netbox-ips/nixosTest.nix
View file

@ -17,12 +17,12 @@ let
tf-netbox-store-ips tf-netbox-store-ips
tf-netbox-get-ip tf-netbox-get-ip
; ;
netbox-store-ips = evalOption "tf-netbox-store-ips" tf-netbox-store-ips { netbox-store-ips = evalOption tf-netbox-store-ips {
httpBackend = tfBackend "proxmox-test/store-ips"; httpBackend = tfBackend "proxmox-test/store-ips";
startAddress = "192.168.10.236/24"; startAddress = "192.168.10.236/24";
endAddress = "192.168.10.240/24"; endAddress = "192.168.10.240/24";
}; };
netbox-get-ip = evalOption "tf-netbox-get-ip" tf-netbox-get-ip { netbox-get-ip = evalOption tf-netbox-get-ip {
httpBackend = tfBackend "proxmox-test/get-ip"; httpBackend = tfBackend "proxmox-test/get-ip";
}; };
netboxUser = "netbox"; netboxUser = "netbox";

10
deployment/utils.nix
View file

@ -28,17 +28,15 @@ rec {
}).config; }).config;
evalOption = evalOption =
name: opts: conf: opts: conf:
(lib.evalModules { (lib.evalModules {
modules = [ modules = [
{ {
options = { options.opt = opts;
"${name}" = opts; config.opt = conf;
};
config."${name}" = conf;
} }
]; ];
}).config."${name}"; }).config.opt;
toBash = toBash =
v: v: