From ea08f87819291a21ee6e031fe7748bdb04518bab Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 12 Jul 2018 14:30:10 +0200
Subject: populate: inline script

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

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

diff --git a/pkgs/krops/default.nix b/pkgs/krops/default.nix
index d9bea4b..d2f9c8a 100644
--- a/pkgs/krops/default.nix
+++ b/pkgs/krops/default.nix
@@ -2,42 +2,26 @@ let
   lib = import ../../lib;
 in
 
-{ nix, openssh, populate, writeDash, writeJSON }: let
-
-  populate' = name: { source, target }:
-    writeDash "${name}-populate" ''
-      set -efu
-      source=${writeJSON "${name}-source.json" source}
-      target=${target.user}@${target.host}:${target.port}${target.path}
-      exec ${populate}/bin/populate "$target" < "$source"
-    '';
-
-in {
+{ nix, openssh, populate, writeDash, writeJSON }: {
 
   writeDeploy = name: { source, target }: let
     target' = lib.mkTarget target;
   in
     writeDash name ''
       set -efu
-      ${populate' name { inherit source; target = target'; }}
+      ${populate { inherit source; target = target'; }}
       ${openssh}/bin/ssh \
           ${target'.user}@${target'.host} -p ${target'.port} \
           nixos-rebuild switch -I ${target'.path}
     '';
 
-  writePopulate = name: { source, target }:
-    populate' name {
-      inherit source;
-      target = lib.mkTarget target;
-    };
-
   writeTest = name: { source, target }: let
     target' = lib.mkTarget target;
   in
     assert lib.isLocalTarget target';
     writeDash name ''
       set -efu
-      ${populate' name { inherit source; target = target'; }}
+      ${populate { inherit source; target = target'; }}
       ${nix}/bin/nix-build \
           -A config.system.build.toplevel \
           -I ${target'.path} \
-- 
cgit v1.2.3