Merge remote-tracking branch 'ni/master'

3 files changed, 15 insertions, 12 deletions

diff --git a/krebs/3modules/acl.nix b/krebs/3modules/acl.nix
index d2370649..05f7e824 100644
--- a/krebs/3modules/acl.nix
+++ b/krebs/3modules/acl.nix
@@ -33,7 +33,7 @@ in {
     default = {};
   };
   config = {
-    systemd.services = lib.mapAttrs' (path: rules: lib.nameValuePair "acl-${lib.replaceChars ["/"] ["_"] path}" {
+    systemd.services = lib.mapAttrs' (path: rules: lib.nameValuePair "acl-${lib.replaceStrings ["/"] ["_"] path}" {
       wantedBy = [ "multi-user.target" ];
       path = [
         pkgs.acl
diff --git a/krebs/3modules/iana-etc.nix b/krebs/3modules/iana-etc.nix
index 3195f71d..dabe2f8a 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)}
diff --git a/krebs/3modules/permown.nix b/krebs/3modules/permown.nix
index 3ebbc44f..ae870297 100644
--- a/krebs/3modules/permown.nix
+++ b/krebs/3modules/permown.nix
@@ -1,4 +1,6 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, ... }: let
+  slib = import ../../lib/pure.nix { inherit lib; };
+in
 with lib; {
 
   options.krebs.permown = mkOption {
@@ -16,7 +18,7 @@ with lib; {
         group = mkOption {
           apply = x: if x == null then "" else x;
           default = null;
-          type = types.nullOr types.groupname;
+          type = types.nullOr slib.types.groupname;
         };
         keepGoing = mkOption {
           default = false;
@@ -28,15 +30,15 @@ with lib; {
           '';
         };
         owner = mkOption {
-          type = types.username;
+          type = slib.types.username;
         };
         path = mkOption {
           default = config._module.args.name;
-          type = types.absolute-pathname;
+          type = slib.types.absolute-pathname;
         };
         umask = mkOption {
           default = "0027";
-          type = types.file-mode;
+          type = slib.types.file-mode;
         };
       };
     }));
@@ -48,11 +50,11 @@ with lib; {
 
     system.activationScripts.permown = let
       mkdir = plan: /* sh */ ''
-        ${pkgs.coreutils}/bin/mkdir -p ${shell.escape plan.path}
+        ${pkgs.coreutils}/bin/mkdir -p ${slib.shell.escape plan.path}
       '';
     in concatMapStrings mkdir plans;
 
-    systemd.services = genAttrs' plans (plan: let
+    systemd.services = slib.genAttrs' plans (plan: let
       continuable = command:
         if plan.keepGoing
           then /* sh */ "{ ${command}; } || :"