diff options
author | lassulus <git@lassul.us> | 2023-07-09 11:32:26 +0200 |
---|---|---|
committer | lassulus <git@lassul.us> | 2023-07-09 11:32:26 +0200 |
commit | 305b9e1deee5d9b2d48ff01f647471fdd9ee766c (patch) | |
tree | d428676c99fff445126a1d689e6a557dd9a78a91 /krebs/3modules/iana-etc.nix | |
parent | 581665cc9f3c3e8e281ae0fc513fec903cc17b7c (diff) | |
parent | a4ace2b0b35331be531795a351401bc6ca8d827c (diff) |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/3modules/iana-etc.nix')
-rw-r--r-- | krebs/3modules/iana-etc.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/krebs/3modules/iana-etc.nix b/krebs/3modules/iana-etc.nix index 3195f71d9..dabe2f8aa 100644 --- a/krebs/3modules/iana-etc.nix +++ b/krebs/3modules/iana-etc.nix @@ -1,5 +1,6 @@ -{ config, pkgs, lib, ... }: -with lib; { +{ config, lib, pkgs, ... }: let + slib = import ../../lib/pure.nix { inherit lib; }; +in with lib; { options.krebs.iana-etc.services = mkOption { default = {}; @@ -7,7 +8,7 @@ with lib; { options = { port = mkOption { default = config._module.args.name; - type = types.addCheck types.str (test "[1-9][0-9]*"); + type = types.addCheck types.str (slib.test "[1-9][0-9]*"); }; } // genAttrs ["tcp" "udp"] (protocol: mkOption { default = null; @@ -30,7 +31,7 @@ with lib; { (proto: let line = "${entry.${proto}.name} ${entry.port}/${proto}"; in /* sh */ '' - echo ${shell.escape line} + echo ${slib.shell.escape line} '') (filter (proto: entry.${proto} != null) ["tcp" "udp"])} '') (attrValues config.krebs.iana-etc.services)} |