From 29e5989265bf2f1f8df3dd83706abf791fc63712 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 7 Sep 2018 00:04:24 +0200
Subject: jeschli git: fix irc-announce call

---
 jeschli/2configs/git.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'jeschli')

diff --git a/jeschli/2configs/git.nix b/jeschli/2configs/git.nix
index 77602e0f1..181ad8dc1 100644
--- a/jeschli/2configs/git.nix
+++ b/jeschli/2configs/git.nix
@@ -42,11 +42,13 @@ let
     public = true;
     hooks = {
       post-receive = pkgs.git-hooks.irc-announce {
-        nick = config.krebs.build.host.name;
         channel = "#xxx";
+        nick = config.krebs.build.host.name;
+        refs = [
+          "refs/heads/master"
+        ];
         server = "irc.r";
-        verbose = true; 
-        branches = [ "master" ];
+        verbose = true;
       };
     };
   };
-- 
cgit v1.2.3


From ddc30bfbfda39f37a0b139d89b992c5c1f4ffc70 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Fri, 7 Sep 2018 14:16:40 +0200
Subject: enklave git: add xmonad-stockholm repo

---
 jeschli/2configs/git.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'jeschli')

diff --git a/jeschli/2configs/git.nix b/jeschli/2configs/git.nix
index 77602e0f1..e07af1bc0 100644
--- a/jeschli/2configs/git.nix
+++ b/jeschli/2configs/git.nix
@@ -35,6 +35,9 @@ let
     krebs-page = {
       cgit.desc = "Die Krebs Page";
     };
+    xmonad-stockholm = {
+      cgit.desc = "XMonad Stockholm";
+    };
   };
 
   make-public-repo = name: { cgit ? {}, ... }: {
-- 
cgit v1.2.3


From df809dca51b2a4037449d626e14a75aa91be7b3a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 9 Sep 2018 10:23:20 +0200
Subject: buildbot-stockholm: build using the test attribute

While at it, fix */krops.nix to actually use the target attribute.
---
 jeschli/krops.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'jeschli')

diff --git a/jeschli/krops.nix b/jeschli/krops.nix
index e55f207d3..34f3aaa53 100644
--- a/jeschli/krops.nix
+++ b/jeschli/krops.nix
@@ -27,14 +27,9 @@ in {
     target = "root@${name}/var/src";
   };
 
-  # usage: $(nix-build --no-out-link --argstr name HOSTNAME -A test)
-  test = pkgs.krops.writeTest "${name}-test" {
+  # usage: $(nix-build --no-out-link --argstr name HOSTNAME --argstr target PATH -A test)
+  test = { target }: pkgs.krops.writeTest "${name}-test" {
+    inherit target;
     source = source { test = true; };
-    target = "${lib.getEnv "HOME"}/tmp/${name}-stockholm-test";
-  };
-
-  ci = pkgs.krops.writeTest "${name}-test" {
-    source = source { test = true; };
-    target = "${lib.getEnv "HOME"}/stockholm-build";
   };
 }
-- 
cgit v1.2.3