1 files changed, 45 insertions(+), 26 deletions(-)

M gnu/packages/guile-xyz.scm

@@ 1522,35 1522,54 @@ order to provide IDE functionality for Guile Scheme.")
     (license license:expat)))
 
 (define-public guile-ares-rs
-  ;; Commit to support Guile 3.9 + guile-custom-ports
-  (let ((commit "6ccca2e21457c47917846e07c449d48c66b9420b")
-        (revision "0"))
-    (package
-      (name "guile-ares-rs")
-      (version (git-version "0.9.5" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://git.sr.ht/~abcdw/guile-ares-rs")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "04n42wn6jblhmcx5l43nl7nsy3s0qlsn09l4k9xwgw5hg9nkkmg7"))))
-      (build-system guile-build-system)
-      (arguments
-       (list
-        #:source-directory "src/guile"))
-      (inputs (list guile-3.0))
-      (propagated-inputs (list guile-fibers guile-custom-ports))
-      (home-page "https://git.sr.ht/~abcdw/guile-ares-rs")
-      (synopsis "Asynchronous Reliable Extensible Sleek RPC Server for Guile")
-      (description "Asynchronous Reliable Extensible Sleek RPC Server for
+  (package
+    (name "guile-ares-rs")
+    (version "0.9.6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://git.sr.ht/~abcdw/guile-ares-rs")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1vkww3vc0lsh5f8yh6fnh402rx3rsm0ss69rdkmplhzp4c7c4z1d"))))
+    (build-system guile-build-system)
+    (arguments
+     (list
+      #:source-directory "src/guile"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'build 'install-script
+            (lambda _
+              (let* ((bin (string-append #$output "/bin"))
+                     (oldpath (string-append
+                               #$output
+                               ;; This file will be named ares-nrepl.scm for
+                               ;; the next version.
+                               "/share/guile/site/3.0/ares/scripts/ares.scm"))
+                     (newpath (string-append bin "/ares-nrepl")))
+                (mkdir bin)
+                (symlink oldpath newpath)
+                (wrap-program newpath
+                  `("GUILE_LOAD_PATH" ":" =
+                    ,(list (string-append #$output "/share/guile/site/3.0")
+                           (getenv "GUILE_LOAD_PATH")))
+                  `("GUILE_LOAD_COMPILED_PATH" ":" =
+                    ,(list (string-append #$output "/lib/guile/3.0/site-ccache")
+                           (getenv "GUILE_LOAD_COMPILED_PATH"))))
+                ;; Not needed since the wrapper followed the symlink.
+                (delete-file (string-append bin "/.ares-nrepl-real"))))))))
+    (inputs (list bash-minimal guile-3.0))
+    (propagated-inputs (list guile-fibers guile-custom-ports))
+    (home-page "https://git.sr.ht/~abcdw/guile-ares-rs")
+    (synopsis "Asynchronous Reliable Extensible Sleek RPC Server for Guile")
+    (description "Asynchronous Reliable Extensible Sleek RPC Server for
  Guile.  It's based on nREPL protocol and can be used for programmable
  interactions with a running guile processes, for implementing REPLs, IDEs,
  test runners or other tools.")
-      (license license:gpl3+))))
+    (license license:gpl3+)))
 
 (define-public guile-custom-ports
   (package