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.
---
 makefu/krops.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'makefu')

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


From 516a425edad3a86c95fdadf9d777d43c79dd6d08 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Sun, 9 Sep 2018 19:16:57 +0200
Subject: m krops.nix: unify interface for ci.nix

---
 makefu/krops.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu')

diff --git a/makefu/krops.nix b/makefu/krops.nix
index 30385c10..3838db63 100644
--- a/makefu/krops.nix
+++ b/makefu/krops.nix
@@ -76,7 +76,7 @@ in {
   };
 
   # usage: $(nix-build --no-out-link --argstr name HOSTNAME --argstr target PATH -A test)
-  test = pkgs.krops.writeTest "${name}-test" {
+  test = { target ? target }: pkgs.krops.writeTest "${name}-test" {
     inherit target;
     source = source { test = true; };
   };
-- 
cgit v1.2.3