diff --git a/nix/module.nix b/nix/module.nix index f8a8984..0496c09 100644 --- a/nix/module.nix +++ b/nix/module.nix @@ -5,6 +5,7 @@ self: { pkgs, ... }: let + inherit (builtins) toJSON baseNameOf toString; inherit (lib.modules) mkIf; inherit (lib.options) mkOption mkEnableOption literalExpression; inherit (lib.types) package str port int listOf enum bool attrsOf path; @@ -13,7 +14,7 @@ self: { cfg = config.services.eris; # Generate the config.json content - erisConfigFile = pkgs.writeText "eris-config.json" (builtins.toJSON { + erisConfigFile = pkgs.writeText "eris-config.json" (toJSON { listen_addr = cfg.listenAddress; metrics_port = cfg.metricsPort; backend_addr = cfg.backendAddress; @@ -362,15 +363,15 @@ in { mkdir -p ${cfg.stateDir}/conf ${cfg.dataDir} ${corporaDir} ${scriptsDir} # Ensure ownership is correct for all relevant dirs managed by systemd or created here - ${chownCmd} /var/lib/${lib.baseNameOf cfg.stateDir} \ - /var/cache/${lib.baseNameOf cfg.cacheDir} \ + ${chownCmd} /var/lib/${baseNameOf cfg.stateDir} \ + /var/cache/${baseNameOf cfg.cacheDir} \ ${cfg.stateDir}/conf \ ${cfg.dataDir} \ ${corporaDir} \ ${scriptsDir} # Copy declarative files - ${lib.toString copyCorporaCmds} - ${lib.toString copyLuaScriptCmds} + ${toString copyCorporaCmds} + ${toString copyLuaScriptCmds} ''; }; };