From 8892a5dcb6b19b304f6d1aa1dc2b0b3fba3e5b78 Mon Sep 17 00:00:00 2001
From: Liam Hupfer <liam@hpfr.net>
Date: Sun, 18 May 2025 16:13:47 -0500
Subject: [PATCH 1/4] guix: Fix guile-ssh library load

guile-ssh ships with a foreign library loaded at runtime. Most Guile
modules using foreign libraries template the location and substitute an
absolute path at configure time, but guile-ssh currently does not. Set
GUILE_EXTENSIONS_PATH in the wrapper so Guix can dlopen libguile-ssh.so.
---
 pkgs/by-name/gu/guix/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gu/guix/package.nix b/pkgs/by-name/gu/guix/package.nix
index feb26b3ea606..88d0c5ba4a5a 100644
--- a/pkgs/by-name/gu/guix/package.nix
+++ b/pkgs/by-name/gu/guix/package.nix
@@ -146,7 +146,8 @@ stdenv.mkDerivation rec {
     for f in $out/bin/*; do
       wrapProgram $f \
         --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \
-        --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH"
+        --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" \
+        --prefix GUILE_EXTENSIONS_PATH : "${guile-ssh}/lib/guile/3.0/extensions:$GUILE_EXTENSIONS_PATH"
     done
   '';
 

From f4ad89e41e840d43f75ccfb59d98772fde953eed Mon Sep 17 00:00:00 2001
From: Liam Hupfer <liam@hpfr.net>
Date: Sun, 18 May 2025 13:38:57 -0500
Subject: [PATCH 2/4] guix: Fix guile-ssh detection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See the upstream patch commit message. guile-ssh 0.18 inadvertently
changed the make-session API in a way that broke Guix’s configure-time
version check. This means Guix was built without guile-ssh support since
the guile-ssh upgrade, but ‘guix offload’ was broken anyway due to the
dlopen issue fixed in the previous commit.
---
 pkgs/by-name/gu/guix/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gu/guix/package.nix b/pkgs/by-name/gu/guix/package.nix
index 88d0c5ba4a5a..9e750cce8792 100644
--- a/pkgs/by-name/gu/guix/package.nix
+++ b/pkgs/by-name/gu/guix/package.nix
@@ -71,6 +71,11 @@ stdenv.mkDerivation rec {
       patch = "security/0102-daemon-Sanitize-successful-build-outputs-prior-to-ex.patch";
       hash = "sha256-mOnlYtpIuYL+kDvSNuXuoDLJP03AA9aI2ALhap+0NOM=";
     })
+    (fetchpatch {
+      name = "fix-guile-ssh-detection.patch";
+      url = "https://git.savannah.gnu.org/cgit/guix.git/patch/?id=b8a45bd0473ab2ba9b96b7ef429a557ece9bf06c";
+      hash = "sha256-oYkgM694qPK8kqgxatkr4fj/GL73ozTNQADNyDeU6WY=";
+    })
   ];
 
   postPatch = ''
@@ -147,7 +152,7 @@ stdenv.mkDerivation rec {
       wrapProgram $f \
         --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \
         --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH" \
-        --prefix GUILE_EXTENSIONS_PATH : "${guile-ssh}/lib/guile/3.0/extensions:$GUILE_EXTENSIONS_PATH"
+        --prefix GUILE_EXTENSIONS_PATH : "${guile-ssh}/lib/guile/3.0/extensions"
     done
   '';
 

From 5f72371b4d50fbb0a7e6b4074938e25861fa4417 Mon Sep 17 00:00:00 2001
From: Liam Hupfer <liam@hpfr.net>
Date: Fri, 23 May 2025 21:24:27 -0500
Subject: [PATCH 3/4] maintainers: add hpfr

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2bdd25f9a199..b3e7c4916e4d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10087,6 +10087,12 @@
     githubId = 130903;
     name = "Ana Hobden";
   };
+  hpfr = {
+    email = "liam@hpfr.net";
+    github = "hpfr";
+    githubId = 44043764;
+    name = "Liam Hupfer";
+  };
   hqurve = {
     email = "hqurve@outlook.com";
     github = "hqurve";

From 19acb808050baf1ae26fc3f8f0ee2b263d45509e Mon Sep 17 00:00:00 2001
From: Liam Hupfer <liam@hpfr.net>
Date: Fri, 23 May 2025 21:32:02 -0500
Subject: [PATCH 4/4] guix: add hpfr to meta.maintainers

---
 pkgs/by-name/gu/guix/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gu/guix/package.nix b/pkgs/by-name/gu/guix/package.nix
index 9e750cce8792..82a824e4e2d0 100644
--- a/pkgs/by-name/gu/guix/package.nix
+++ b/pkgs/by-name/gu/guix/package.nix
@@ -181,6 +181,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [
       cafkafk
       foo-dogsquared
+      hpfr
     ];
     platforms = platforms.linux;
   };