From e312a5f9616ac65102b63919d55bd72264a5e3a6 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 28 Jul 2017 13:37:39 +0200
Subject: krebs ci: add --force-populate

---
 krebs/3modules/ci.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix
index 542a9252..6e4db6ed 100644
--- a/krebs/3modules/ci.nix
+++ b/krebs/3modules/ci.nix
@@ -116,8 +116,12 @@ in
                     "dummy_secrets": "true",
                   },
                   command=[
-                    "nix-shell", "--run",
-                    "test --user={} --system={} --target=$LOGNAME@${config.krebs.build.host.name}$HOME/{}".format(user, host, user)
+                    "nix-shell", "--run", " ".join(["test",
+                      "--user={}".format(user),
+                      "--system={}".format(host),
+                      "--force-populate",
+                      "--target=$LOGNAME@${config.krebs.build.host.name}$HOME/{}".format(user),
+                    ])
                   ]
               )
 
-- 
cgit v1.2.3


From 568798cc1ede5346f05272e4bec07794d6443c08 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 28 Jul 2017 18:18:31 +0200
Subject: cgit.prism.r: rip

---
 krebs/3modules/lass/default.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index c554391f..224c6f83 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -97,7 +97,6 @@ with import <stockholm/lib>;
           aliases = [
             "prism.r"
             "build.prism.r"
-            "cgit.prism.r"
             "cache.prism.r"
             "paste.r"
             "p.r"
-- 
cgit v1.2.3


From f83fc4ba4b2ac2f6300e115133d6db1e871b7ca3 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 28 Jul 2017 18:41:46 +0200
Subject: krebs fetchWallpaper: implement cond-file robuster

---
 krebs/3modules/fetchWallpaper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/fetchWallpaper.nix b/krebs/3modules/fetchWallpaper.nix
index cdb9fe70..8d4933cb 100644
--- a/krebs/3modules/fetchWallpaper.nix
+++ b/krebs/3modules/fetchWallpaper.nix
@@ -51,7 +51,7 @@ let
     mkdir -p ${cfg.stateDir}
     chmod o+rx ${cfg.stateDir}
     cd ${cfg.stateDir}
-    (curl --max-time ${toString cfg.maxTime} -s -o wallpaper.tmp -z wallpaper ${shell.escape cfg.url} && mv wallpaper.tmp wallpaper) || :
+    (curl --max-time ${toString cfg.maxTime} -s -o wallpaper.tmp -z wallpaper.tmp ${shell.escape cfg.url} && cp wallpaper.tmp wallpaper) || :
     feh --no-fehbg --bg-scale ${shell.escape cfg.stateDir}/wallpaper
   '';
 
-- 
cgit v1.2.3


From 32d8c202b0ec037dcf78ebf6ecad730cfb9c5272 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 28 Jul 2017 20:20:40 +0200
Subject: icarus: set correct ipv6

---
 krebs/3modules/lass/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index 224c6f83..f0722e9b 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -254,7 +254,7 @@ with import <stockholm/lib>;
       nets = rec {
         retiolum = {
           ip4.addr = "10.243.133.114";
-          ip6.addr = "42:0:0:0:0:0:1ca0:1205";
+          ip6.addr = "42:0:0:0:0:0:01ca:1205";
           aliases = [
             "icarus.r"
             "cgit.icarus.r"
-- 
cgit v1.2.3