From b364aa96c9b162fc6e87dbfdb9a643551a285f7f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 27 Oct 2016 19:44:53 +0200
Subject: [PATCH 1/2] tv nixpkgs: e4fb65a -> 0195ab8

---
 tv/2configs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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";

From 3abb88edf4bf04b60212bb4c94aadb52b4c9c9ef Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 27 Oct 2016 22:04:21 +0200
Subject: [PATCH 2/2] add krebs.tinc.*.hostsArchive

---
 krebs/3modules/retiolum.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

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 {