DGNum/liminix
13
0
Fork 1
Code Issues 16 Pull requests 10 Projects Releases Packages Wiki Activity Actions

move typeChecked into pkgs.liminix.lib

Browse source
This commit is contained in:
Daniel Barlow 2023-07-14 20:22:29 +01:00
parent 69e6eb5a89
commit 682183a88d
4 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pkgs/liminix-tools/networking/pppoe.nix
View file

@ -8,26 +8,23 @@
} :
let
inherit (liminix.services) longrun;
inherit (liminix.lib) typeChecked;
inherit (lib)
mergeDefinitions
mkEnableOption mkOption isType types isDerivation hasAttr;
t = {
interface = mkOption {
type = types.package; # actually a service
type = liminix.lib.types.service;
description = "ethernet interface to run PPPoE over";
};
ppp-options = mkOption {
type = types.listOf types.str;
};
};
t' = types.submodule { options = t; };
typeChecked = type: value:
let defs = [{ file = "pppoe.nix"; inherit value; }];
in (lib.mergeDefinitions [ ] type defs).mergedValue;
in
params:
let
inherit (typeChecked t' params) ppp-options interface;
inherit (typeChecked "pppoe.nix" t params) ppp-options interface;
name = "${interface.device}.pppoe";
ip-up = writeAshScript "ip-up" {} ''
. ${serviceFns}