newedge/liminix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move module-based-service parameter types into service

Browse Source 
This is in preparation for writing something that extracts them
into documentation.

user configurations now call config.system.service.foo.build { ...params }
instead of config.system.service.foo

the parameter type definitions themselves now move into the
config stanza of the module referencing the service

new helper function  liminix.callService

The only service moved so far is dnsmasq
This commit is contained in:
Daniel Barlow
2023-08-04 20:39:29 +01:00
parent c3631f4c9d
commit fbb2c04132
5 changed files with 73 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/default.nix
View File

@@ -2,7 +2,14 @@
callPackage
, lib
}:
{
let
typeChecked = caller: type: value:
let
inherit (lib) types mergeDefinitions;
defs = [{ file = caller; inherit value; }];
type' = types.submodule { options = type; };
in (mergeDefinitions [] type' defs).mergedValue;
in {
pseudofile = callPackage ./pseudofile {};
liminix = {
services = callPackage ./liminix-tools/services {};
@@ -11,22 +18,29 @@
squashfs = callPackage ./liminix-tools/builders/squashfs.nix {};
kernel = callPackage ./kernel {};
};
callService = path : parameters :
let pkg = callPackage path {};
checkTypes = t : p : typeChecked (builtins.tostring path) t p;
in {
inherit parameters;
build = args : pkg (checkTypes parameters args);
};
lib = {
types = {
service =
let inherit (lib) types isDerivation hasAttr;
in types.package // {
types =
let inherit (lib) types isDerivation;
in {
service = types.package // {
name = "service";
description = "s6-rc service";
check = x: isDerivation x && hasAttr "serviceType" x;
check = x: isDerivation x && x ? serviceType;
};
};
typeChecked = caller: type: value:
let
inherit (lib) types mergeDefinitions;
defs = [{ file = caller; inherit value; }];
type' = types.submodule { options = type; };
in (mergeDefinitions [] type' defs).mergedValue;
serviceDefn = types.attrs // {
name = "service-defn";
description = "parametrisable s6-rc service definition";
check = x: lib.isAttrs x && x ? parameters && x ? build;
};
};
inherit typeChecked;
};
};
writeFennelScript = callPackage ./write-fennel-script {};