From be9e03264d1ec0ec8e7b75f940e6415e1f84c34e Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 19 Jan 2023 15:23:03 +0100 Subject: tinc: use pkgs.write for default hostsPackage --- krebs/3modules/tinc.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix index 0babc448a..f6727e4d4 100644 --- a/krebs/3modules/tinc.nix +++ b/krebs/3modules/tinc.nix @@ -125,17 +125,13 @@ with import ; hostsPackage = mkOption { type = types.package; - default = pkgs.stdenv.mkDerivation { - name = "${tinc.config.netname}-tinc-hosts"; - phases = [ "installPhase" ]; - installPhase = '' - mkdir $out - ${concatStrings (mapAttrsToList (_: host: '' - echo ${shell.escape host.nets."${tinc.config.netname}".tinc.config} \ - > $out/${shell.escape host.name} - '') tinc.config.hosts)} - ''; - }; + default = + pkgs.write "${tinc.config.netname}-tinc-hosts" + (mapAttrs' + (_: host: (nameValuePair "/${host.name}" { + text = host.nets.${tinc.config.netname}.tinc.config; + })) + tinc.config.hosts); defaultText = "‹netname›-tinc-hosts"; description = '' Package of tinc host configuration files. By default, a package will -- cgit v1.2.3