Merge branch 'master' into staging/17.09

3 files changed, 25 insertions, 3 deletions

diff --git a/tv/3modules/charybdis/default.nix b/tv/3modules/charybdis/default.nix
index 859dc122c..e252f2e1d 100644
--- a/tv/3modules/charybdis/default.nix
+++ b/tv/3modules/charybdis/default.nix
@@ -52,7 +52,7 @@ in {
     systemd.services.charybdis = {
       wantedBy = [ "multi-user.target" ];
       requires = [ "secret.service" ];
-      after = [ "network.target" "secret.service" ];
+      after = [ "network-online.target" "secret.service" ];
       environment = {
         BANDB_DBPATH = "${cfg.user.home}/ban.db";
       };
diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix
index 83dc212a6..493cc8b72 100644
--- a/tv/3modules/default.nix
+++ b/tv/3modules/default.nix
@@ -1,11 +1,10 @@
-_:
-
 {
   imports = [
     ./charybdis
     ./ejabberd
     ./hosts.nix
     ./iptables.nix
+    ./nixpkgs-overlays.nix
     ./x0vncserver.nix
   ];
 }
diff --git a/tv/3modules/nixpkgs-overlays.nix b/tv/3modules/nixpkgs-overlays.nix
new file mode 100644
index 000000000..4eb7a86bd
--- /dev/null
+++ b/tv/3modules/nixpkgs-overlays.nix
@@ -0,0 +1,23 @@
+with import <stockholm/lib>;
+{ config, pkgs, ... }: {
+
+  options.tv.nixpkgs-overlays = mkOption {
+    apply = src:
+      pkgs.runCommand "nixpkgs-overlays" {} ''
+        mkdir $out
+        ${concatStringsSep "\n" (mapAttrsToList (name: path:
+          "ln -s ${shell.escape path} $out/${shell.escape name}"
+        ) src)}
+      '' // {
+        inherit src;
+      };
+    type = types.attrsOf types.absolute-pathname;
+  };
+
+  config = {
+    tv.nixpkgs-overlays = {
+      krebs = mkDefault "/var/src/stockholm/krebs/5pkgs";
+      tv = mkDefault "/var/src/stockholm/tv/5pkgs";
+    };
+  };
+}