From 0fc8f1b2a64c61fed3c71ef7edbe57a9f3e2af64 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 26 Oct 2021 12:48:22 +0200
Subject: populate: add rsyncDefaultConfig

---
 pkgs/populate/default.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

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

diff --git a/pkgs/populate/default.nix b/pkgs/populate/default.nix
index 517b12e..d86d949 100644
--- a/pkgs/populate/default.nix
+++ b/pkgs/populate/default.nix
@@ -45,8 +45,8 @@ let
   '';
 
   pop.file = target: source: let
-    configAttrs = ["useChecksum" "exclude" "filters" "deleteExcluded"];
-    config = filterAttrs (name: _: elem name configAttrs) source;
+    config = rsyncDefaultConfig // sourceConfig;
+    sourceConfig = getAttrs (attrNames rsyncDefaultConfig) source;
   in
     rsync' target config (quote source.path);
 
@@ -144,7 +144,7 @@ let
       echo "$local_pass_info" > "$tmp_dir"/.pass_info
     fi
 
-    ${rsync' target {} /* sh */ "$tmp_dir"}
+    ${rsync' target rsyncDefaultConfig /* sh */ "$tmp_dir"}
   '';
 
   pop.pipe = target: source: /* sh */ ''
@@ -172,17 +172,17 @@ let
       source_path=$source_path/
     fi
     ${rsync}/bin/rsync \
-        ${optionalString (config.useChecksum or false) /* sh */ "--checksum"} \
+        ${optionalString config.useChecksum /* sh */ "--checksum"} \
         ${optionalString target.sudo /* sh */ "--rsync-path=\"sudo rsync\""} \
         ${concatMapStringsSep " "
           (pattern: /* sh */ "--exclude ${quote pattern}")
-          (config.exclude or [])} \
+          config.exclude} \
         ${concatMapStringsSep " "
           (filter: /* sh */ "--${filter.type} ${quote filter.pattern}")
-          (config.filters or [])} \
+          config.filters} \
         -e ${quote (ssh' target)} \
         -vFrlptD \
-        ${optionalString (config.deleteExcluded or true) /* sh */ "--delete-excluded"} \
+        ${optionalString config.deleteExcluded /* sh */ "--delete-excluded"} \
         "$source_path" \
         ${quote (
           optionalString (!isLocalTarget target) (
@@ -194,6 +194,13 @@ let
       >&2
   '';
 
+  rsyncDefaultConfig = {
+    useChecksum = false;
+    exclude = [];
+    filters = [];
+    deleteExcluded = true
+  };
+
   runShell = target: command:
     if isLocalTarget target
       then command
-- 
cgit v1.2.3


From 6ef8900af4bca2901f00c718e3ac8ba457348451 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 26 Oct 2021 13:05:49 +0200
Subject: populate file: admit derivations

---
 pkgs/populate/default.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

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

diff --git a/pkgs/populate/default.nix b/pkgs/populate/default.nix
index d86d949..3be1932 100644
--- a/pkgs/populate/default.nix
+++ b/pkgs/populate/default.nix
@@ -45,10 +45,21 @@ let
   '';
 
   pop.file = target: source: let
-    config = rsyncDefaultConfig // sourceConfig;
-    sourceConfig = getAttrs (attrNames rsyncDefaultConfig) source;
+    config = rsyncDefaultConfig // derivedConfig // sourceConfig;
+    derivedConfig = {
+      useChecksum =
+        if isDerivation source.path
+          then true
+          else rsyncDefaultConfig.useChecksum;
+    };
+    sourceConfig =
+      filterAttrs (name: _: elem name (attrNames rsyncDefaultConfig)) source;
+    sourcePath =
+      if isDerivation source.path
+        then quote (toString source.path)
+        else quote source.path;
   in
-    rsync' target config (quote source.path);
+    rsync' target config sourcePath;
 
   pop.git = target: source: runShell target /* sh */ ''
     set -efu
@@ -198,7 +209,7 @@ let
     useChecksum = false;
     exclude = [];
     filters = [];
-    deleteExcluded = true
+    deleteExcluded = true;
   };
 
   runShell = target: command:
-- 
cgit v1.2.3


From 05f0d3b5c1d38fbbd53142362a7821cc8bc1150a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 26 Oct 2021 19:36:12 +0200
Subject: populate file: isDerivation -> isStorePath

---
 pkgs/populate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/pkgs/populate/default.nix b/pkgs/populate/default.nix
index 3be1932..ee2e5db 100644
--- a/pkgs/populate/default.nix
+++ b/pkgs/populate/default.nix
@@ -48,14 +48,14 @@ let
     config = rsyncDefaultConfig // derivedConfig // sourceConfig;
     derivedConfig = {
       useChecksum =
-        if isDerivation source.path
+        if isStorePath source.path
           then true
           else rsyncDefaultConfig.useChecksum;
     };
     sourceConfig =
       filterAttrs (name: _: elem name (attrNames rsyncDefaultConfig)) source;
     sourcePath =
-      if isDerivation source.path
+      if isStorePath source.path
         then quote (toString source.path)
         else quote source.path;
   in
-- 
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/populate/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/pkgs/populate/default.nix b/pkgs/populate/default.nix
index ee2e5db..bf6f76d 100644
--- a/pkgs/populate/default.nix
+++ b/pkgs/populate/default.nix
@@ -224,8 +224,7 @@ let
 
   ssh' = target: concatMapStringsSep " " quote (flatten [
     "${openssh}/bin/ssh"
-    (optionals (target.user != "") ["-l" target.user])
-    "-p" target.port
+    (mkUserPortSSHOpts target)
     "-T"
     target.extraOptions
   ]);
-- 
cgit v1.2.3