diff options
-rw-r--r-- | krebs/3modules/retiolum.nix | 9 | ||||
-rw-r--r-- | tv/2configs/default.nix | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix index fddaed9e3..ed99cc551 100644 --- a/krebs/3modules/retiolum.nix +++ b/krebs/3modules/retiolum.nix @@ -79,6 +79,15 @@ let ''; }; + hostsArchive = mkOption { + type = types.package; + default = pkgs.runCommand "retiolum-hosts.tar.bz2" {} '' + ${pkgs.coreutils}/bin/ln -s ${tinc.config.hostsPackage} hosts + ${pkgs.gnutar}/bin/tar -hcjf $out hosts + ''; + readOnly = true; + }; + hostsPackage = mkOption { type = types.package; default = pkgs.stdenv.mkDerivation { diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 0854e53c2..1114ac1a5 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with import <stockholm/lib>; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "e4fb65a3627f8c17a2f92c08bf302dc30f0a8db9"; + ref = "0195ab84607ac3a3aa07a79d2d6c2781b1bb6731"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; |