From b74b0b958a11598f7dd8c0e32b1bb3d8265eb147 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 13 Sep 2018 20:14:33 +0200
Subject: writeTest: simplify nix-build call

---
 pkgs/krops/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'pkgs/krops/default.nix')

diff --git a/pkgs/krops/default.nix b/pkgs/krops/default.nix
index d2f9c8a..98d7e17 100644
--- a/pkgs/krops/default.nix
+++ b/pkgs/krops/default.nix
@@ -23,12 +23,11 @@ in
       set -efu
       ${populate { inherit source; target = target'; }}
       ${nix}/bin/nix-build \
-          -A config.system.build.toplevel \
+          -A system \
           -I ${target'.path} \
-          --arg modules '[<nixos-config>]' \
           --no-out-link \
           --show-trace \
-          '<nixpkgs/nixos/lib/eval-config.nix>'
+          '<nixpkgs/nixos>'
     '';
 
 }
-- 
cgit v1.2.3


From 5cd8bd046e9f8e5f03453e3c49161a9901787649 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 16 Sep 2018 01:53:53 +0200
Subject: pkgs.krops: add rebuild

---
 pkgs/krops/default.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'pkgs/krops/default.nix')

diff --git a/pkgs/krops/default.nix b/pkgs/krops/default.nix
index 98d7e17..6bef6e1 100644
--- a/pkgs/krops/default.nix
+++ b/pkgs/krops/default.nix
@@ -2,7 +2,19 @@ let
   lib = import ../../lib;
 in
 
-{ nix, openssh, populate, writeDash, writeJSON }: {
+{ exec, nix, openssh, populate, writeDash, writeJSON }: rec {
+
+  rebuild = target:
+    exec "rebuild.${target.host}" rec {
+      filename = "${openssh}/bin/ssh";
+      argv = [
+        filename
+        "-l" target.user
+        "-p" target.port
+        target.host
+        "nixos-rebuild switch -I ${lib.escapeShellArg target.path}"
+      ];
+    };
 
   writeDeploy = name: { source, target }: let
     target' = lib.mkTarget target;
@@ -10,9 +22,7 @@ in
     writeDash name ''
       set -efu
       ${populate { inherit source; target = target'; }}
-      ${openssh}/bin/ssh \
-          ${target'.user}@${target'.host} -p ${target'.port} \
-          nixos-rebuild switch -I ${target'.path}
+      ${rebuild target'}
     '';
 
   writeTest = name: { source, target }: let
-- 
cgit v1.2.3


From a690f0aeca7eb53c9757933607f3d3fdb64c7012 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 16 Sep 2018 02:16:22 +0200
Subject: pkgs.krops: remove unused writeJSON

Last use was removed in commit ea08f87819291a21ee6e031fe7748bdb04518bab.
---
 pkgs/krops/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/krops/default.nix')

diff --git a/pkgs/krops/default.nix b/pkgs/krops/default.nix
index 6bef6e1..2d3395d 100644
--- a/pkgs/krops/default.nix
+++ b/pkgs/krops/default.nix
@@ -2,7 +2,7 @@ let
   lib = import ../../lib;
 in
 
-{ exec, nix, openssh, populate, writeDash, writeJSON }: rec {
+{ exec, nix, openssh, populate, writeDash }: rec {
 
   rebuild = target:
     exec "rebuild.${target.host}" rec {
-- 
cgit v1.2.3