From c1b24328c42adc64983c18a718fd0a4cb0b9aeee Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 25 Oct 2021 16:05:12 +0200
Subject: krops writeDeploy: deprecate fast parameter

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

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

diff --git a/pkgs/krops/default.nix b/pkgs/krops/default.nix
index 8336b51..d773052 100644
--- a/pkgs/krops/default.nix
+++ b/pkgs/krops/default.nix
@@ -4,14 +4,6 @@ in
 
 { nix, openssh, populate, writers }: rec {
 
-  build = target:
-    runShell target (lib.concatStringsSep " " [
-      "nix build"
-      "-I ${lib.escapeShellArg target.path}"
-      "--no-link -f '<nixpkgs/nixos>'"
-      "config.system.build.toplevel"
-    ]);
-
   rebuild = args: target:
     runShell target "nixos-rebuild -I ${lib.escapeShellArg target.path} ${
       lib.concatMapStringsSep " " lib.escapeShellArg args
@@ -53,7 +45,7 @@ in
     backup ? false,
     buildTarget ? null,
     crossDeploy ? false,
-    fast ? false,
+    fast ? null,
     force ? false,
     source,
     target
@@ -64,26 +56,24 @@ in
         else lib.mkTarget buildTarget;
     target' = lib.mkTarget target;
   in
-    writers.writeDash name ''
-      set -efu
-      ${lib.optionalString (buildTarget' != target')
-        (populate { inherit backup force source; target = buildTarget'; })}
-      ${populate { inherit backup force source; target = target'; }}
-      ${lib.optionalString (! fast) ''
-        ${rebuild ["dry-build"] buildTarget'}
-        ${build buildTarget'}
-      ''}
-      ${rebuild ([
-        "switch"
-      ] ++ lib.optionals crossDeploy [
-        "--no-build-nix"
-      ] ++ lib.optionals (buildTarget' != target') [
-        "--build-host" "${buildTarget'.user}@${buildTarget'.host}"
-        "--target-host" "${target'.user}@${target'.host}"
-      ] ++ lib.optionals target'.sudo [
-        "--use-remote-sudo"
-      ]) buildTarget'}
-    '';
+    lib.traceIf (fast != null) "writeDeploy: it's now always fast, setting the `fast` attribute is deprecated and will be removed in future" (
+      writers.writeDash name ''
+        set -efu
+        ${lib.optionalString (buildTarget' != target')
+          (populate { inherit backup force source; target = buildTarget'; })}
+        ${populate { inherit backup force source; target = target'; }}
+        ${rebuild ([
+          "switch"
+        ] ++ lib.optionals crossDeploy [
+          "--no-build-nix"
+        ] ++ lib.optionals (buildTarget' != target') [
+          "--build-host" "${buildTarget'.user}@${buildTarget'.host}"
+          "--target-host" "${target'.user}@${target'.host}"
+        ] ++ lib.optionals target'.sudo [
+          "--use-remote-sudo"
+        ]) buildTarget'}
+      ''
+    );
 
   writeTest = name: {
     backup ? false,
-- 
cgit v1.2.3


From d80cb74c7400962b08e77ff06153ace419693505 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 27 Mar 2021 20:25:31 +0100
Subject: runShell/writeCommand: add allocateTTY argument

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

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

diff --git a/pkgs/krops/default.nix b/pkgs/krops/default.nix
index d773052..d092307 100644
--- a/pkgs/krops/default.nix
+++ b/pkgs/krops/default.nix
@@ -5,11 +5,13 @@ in
 { nix, openssh, populate, writers }: rec {
 
   rebuild = args: target:
-    runShell target "nixos-rebuild -I ${lib.escapeShellArg target.path} ${
+    runShell target {} "nixos-rebuild -I ${lib.escapeShellArg target.path} ${
       lib.concatMapStringsSep " " lib.escapeShellArg args
     }";
 
-  runShell = target: command:
+  runShell = target: {
+    allocateTTY ? false
+  }: command:
     let
       command' = if target.sudo then "sudo ${command}" else command;
     in
@@ -20,7 +22,7 @@ in
           exec ${openssh}/bin/ssh ${lib.escapeShellArgs (lib.flatten [
             (lib.optionals (target.user != "") ["-l" target.user])
             "-p" target.port
-            "-T"
+            (if allocateTTY then "-t" else "-T")
             target.extraOptions
             target.host
             command'])}
@@ -30,6 +32,7 @@ in
     command ? (targetPath: "echo ${targetPath}"),
     backup ? false,
     force ? false,
+    allocateTTY ? false,
     source,
     target
   }: let
@@ -38,7 +41,7 @@ in
     writers.writeDash name ''
       set -efu
       ${populate { inherit backup force source; target = target'; }}
-      ${runShell target' (command target'.path)}
+      ${runShell target' { inherit allocateTTY; } (command target'.path)}
     '';
 
   writeDeploy = name: {
-- 
cgit v1.2.3


From 9fc8cbf8e826d4c8a118f37202ab3f335341082a Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 19 Nov 2021 23:42:56 +0100
Subject: target: use default port from SSH config

This is the expected behavior.
The SSH config is also implicitly used for other SSH-related settings.
---
 pkgs/krops/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/pkgs/krops/default.nix b/pkgs/krops/default.nix
index d092307..7fe8370 100644
--- a/pkgs/krops/default.nix
+++ b/pkgs/krops/default.nix
@@ -20,8 +20,7 @@ in
       else
         writers.writeDash "krops.${target.host}.${lib.firstWord command}" ''
           exec ${openssh}/bin/ssh ${lib.escapeShellArgs (lib.flatten [
-            (lib.optionals (target.user != "") ["-l" target.user])
-            "-p" target.port
+            (lib.mkUserPortSSHOpts target)
             (if allocateTTY then "-t" else "-T")
             target.extraOptions
             target.host
-- 
cgit v1.2.3