these 9 derivations will be built: /nix/store/v0a9n1kx0402zk40nh0002y2pcjm82fn-punch-20260814.drv /nix/store/yhagl5asxmwy587vwkp38lfab0k6ms25-herdr-0.8.0.drv /nix/store/07ap06cj4xqsk1j6m3bqm35vmjvscfms-home-manager-applications.drv /nix/store/dr602dp4pl4ic8kav0h8lq9lya90d022-home-manager-fonts.drv /nix/store/is1c4pv4rvdvry8znjv3c3qiys9z7793-hm_LibraryFonts.homemanagerfontsversion.drv /nix/store/bgjf6q3sgq5791i94pbz0dwhxi7p5cpn-home-manager-files.drv /nix/store/bvj1bb0awixsm0bjvpkibn1yxxq5r63p-home-manager-path.drv /nix/store/mhbk2c5hbhl0qybhxap9khi4n5rksmlr-activation-script.drv /nix/store/fphbbmzzjmk0wrpri5i1h2iv9dglgvcx-home-manager-generation.drv building '/nix/store/yhagl5asxmwy587vwkp38lfab0k6ms25-herdr-0.8.0.drv' on 'ssh-ng://customer@mac02' building '/nix/store/yhagl5asxmwy587vwkp38lfab0k6ms25-herdr-0.8.0.drv' herdr-0.8.0> Using versionCheckHook herdr-0.8.0> Running phase: patchPhase herdr-0.8.0> applying patch /nix/store/pc2vl475f6mli95d8zr09y0zvvihhl66-0001-remote-make-ssh-transport-program-configurable.patch herdr-0.8.0> can't find file to patch at input line 34 herdr-0.8.0> Perhaps you used the wrong -p or --strip option? herdr-0.8.0> The text leading up to this was: herdr-0.8.0> -------------------------- herdr-0.8.0> |From 7f65636f020511fe6f1781f58bb8feab11e7e63f Mon Sep 17 00:00:00 2001 herdr-0.8.0> |From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= herdr-0.8.0> |Date: Sun, 26 Jul 2026 10:43:42 +0200 herdr-0.8.0> |Subject: [PATCH] remote: make ssh transport program configurable herdr-0.8.0> |MIME-Version: 1.0 herdr-0.8.0> |Content-Type: text/plain; charset=UTF-8 herdr-0.8.0> |Content-Transfer-Encoding: 8bit herdr-0.8.0> | herdr-0.8.0> |herdr --remote hardcodes the OpenSSH client binary. Most ssh-invoking herdr-0.8.0> |tools grew an escape hatch for this (GIT_SSH_COMMAND, rsync -e, herdr-0.8.0> |BORG_RSH, ansible ssh_executable) because users need it for reasons herdr-0.8.0> |plain ssh_config cannot cover: corporate bastion wrappers that inject herdr-0.8.0> |short-lived certificates (Teleport tsh, gcloud compute ssh, aws ssm), herdr-0.8.0> |picking a specific ssh build, debugging wrappers, stub transports in herdr-0.8.0> |tests, or roaming transports such as mosh/Eternal Terminal herdr-0.8.0> |(discussion #1780) - all without shadowing ssh in PATH for every herdr-0.8.0> |process on the machine. herdr-0.8.0> | herdr-0.8.0> |Add remote.ssh_command (default "ssh") and use it for both the herdr-0.8.0> |bootstrap commands and the stdio bridge. The replacement only needs to herdr-0.8.0> |accept OpenSSH-compatible arguments (-T ). herdr-0.8.0> | herdr-0.8.0> |Signed-off-by: Jörg Thalheim herdr-0.8.0> |--- herdr-0.8.0> | src/config/model.rs | 4 ++++ herdr-0.8.0> | src/main.rs | 3 +++ herdr-0.8.0> | src/remote/unix.rs | 41 +++++++++++++++++++++++++++++++++-------- herdr-0.8.0> | 3 files changed, 40 insertions(+), 8 deletions(-) herdr-0.8.0> | herdr-0.8.0> |diff --git a/src/config/model.rs b/src/config/model.rs herdr-0.8.0> |index e56ac08..1d471f3 100644 herdr-0.8.0> |--- a/src/config/model.rs herdr-0.8.0> |+++ b/src/config/model.rs herdr-0.8.0> -------------------------- herdr-0.8.0> File to patch: herdr-0.8.0> Skip this patch? [y] herdr-0.8.0> Skipping patch. herdr-0.8.0> 1 out of 1 hunk ignored herdr-0.8.0> can't find file to patch at input line 55 herdr-0.8.0> Perhaps you used the wrong -p or --strip option? herdr-0.8.0> The text leading up to this was: herdr-0.8.0> -------------------------- herdr-0.8.0> |diff --git a/src/main.rs b/src/main.rs herdr-0.8.0> |index 27c1d92..0227cd2 100644 herdr-0.8.0> |--- a/src/main.rs herdr-0.8.0> |+++ b/src/main.rs herdr-0.8.0> -------------------------- herdr-0.8.0> File to patch: herdr-0.8.0> Skip this patch? [y] herdr-0.8.0> Skipping patch. herdr-0.8.0> 1 out of 1 hunk ignored herdr-0.8.0> can't find file to patch at input line 69 herdr-0.8.0> Perhaps you used the wrong -p or --strip option? herdr-0.8.0> The text leading up to this was: herdr-0.8.0> -------------------------- herdr-0.8.0> |diff --git a/src/remote/unix.rs b/src/remote/unix.rs herdr-0.8.0> |index 6fe927c..55a0764 100644 herdr-0.8.0> |--- a/src/remote/unix.rs herdr-0.8.0> |+++ b/src/remote/unix.rs herdr-0.8.0> -------------------------- herdr-0.8.0> File to patch: herdr-0.8.0> Skip this patch? [y] herdr-0.8.0> Skipping patch. herdr-0.8.0> 12 out of 12 hunks ignored error: build of '/nix/store/yhagl5asxmwy587vwkp38lfab0k6ms25-herdr-0.8.0.drv' on 'ssh-ng://customer@mac02' failed: Cannot build '/nix/store/yhagl5asxmwy587vwkp38lfab0k6ms25-herdr-0.8.0.drv'. Reason: builder failed with exit code 1. Output paths: /nix/store/i51rwimfnryz62w102pr8qsxnmc69jj9-herdr-0.8.0 Last 25 log lines: > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |diff --git a/src/main.rs b/src/main.rs > |index 27c1d92..0227cd2 100644 > |--- a/src/main.rs > |+++ b/src/main.rs > -------------------------- > File to patch: > Skip this patch? [y] > Skipping patch. > 1 out of 1 hunk ignored > can't find file to patch at input line 69 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |diff --git a/src/remote/unix.rs b/src/remote/unix.rs > |index 6fe927c..55a0764 100644 > |--- a/src/remote/unix.rs > |+++ b/src/remote/unix.rs > -------------------------- > File to patch: > Skip this patch? [y] > Skipping patch. > 12 out of 12 hunks ignored For full logs, run: nix log /nix/store/yhagl5asxmwy587vwkp38lfab0k6ms25-herdr-0.8.0.drv error: Cannot build '/nix/store/yhagl5asxmwy587vwkp38lfab0k6ms25-herdr-0.8.0.drv'. Reason: builder failed with exit code 1. Output paths: /nix/store/i51rwimfnryz62w102pr8qsxnmc69jj9-herdr-0.8.0 error: Cannot build '/nix/store/07ap06cj4xqsk1j6m3bqm35vmjvscfms-home-manager-applications.drv'. Reason: 1 dependency failed. Output paths: /nix/store/g9lb9yyq9d9dqgiw79k4ij481pj5brhn-home-manager-applications error: Cannot build '/nix/store/dr602dp4pl4ic8kav0h8lq9lya90d022-home-manager-fonts.drv'. Reason: 1 dependency failed. Output paths: /nix/store/xzm57s202gpmpirdzk7jr10k9zn65mz7-home-manager-fonts error: Cannot build '/nix/store/bvj1bb0awixsm0bjvpkibn1yxxq5r63p-home-manager-path.drv'. Reason: 1 dependency failed. Output paths: /nix/store/f22g3170n3034dpryv2b5ckb9kka06s4-home-manager-path error: Cannot build '/nix/store/is1c4pv4rvdvry8znjv3c3qiys9z7793-hm_LibraryFonts.homemanagerfontsversion.drv'. Reason: 1 dependency failed. Output paths: /nix/store/35hf7jvw2bncr0ci277wf0v9s137w052-hm_LibraryFonts.homemanagerfontsversion error: Cannot build '/nix/store/mhbk2c5hbhl0qybhxap9khi4n5rksmlr-activation-script.drv'. Reason: 3 dependencies failed. Output paths: /nix/store/c3gkpz4a5ldg3hwvss3p7738m4i2s2rb-activation-script error: Cannot build '/nix/store/bgjf6q3sgq5791i94pbz0dwhxi7p5cpn-home-manager-files.drv'. Reason: 2 dependencies failed. Output paths: /nix/store/fx54z2nwvrzmb3nxg4srlb5h31drj6va-home-manager-files error: Cannot build '/nix/store/fphbbmzzjmk0wrpri5i1h2iv9dglgvcx-home-manager-generation.drv'. Reason: 3 dependencies failed. Output paths: /nix/store/f1d9yggs12w9rsnrv2fqimaqyigqh06j-home-manager-generation