about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederick Muriuki Muriithi2026-04-23 10:46:22 -0500
committerFrederick Muriuki Muriithi2026-04-23 10:58:04 -0500
commit5153c403cf52531de33d1377448c1267acce99bb (patch)
tree6ee4b723753f5f423514a94bfa8a41a11ba1a4bf
parent552afd98246c0990856cad114a4bf507fb39f0fe (diff)
downloadgn-machines-5153c403cf52531de33d1377448c1267acce99bb.tar.gz
gn-guile: Upgrade to commit 0e8e6054.
This commit upgrades gn-guile to commit 0e8e6054, that no longer has
the gn-guile.sh script, and therefore no longer needs the extra gexp
to patch paths for bash and guile.
-rw-r--r--guix/gn-machines/genenetwork.scm15
1 files changed, 3 insertions, 12 deletions
diff --git a/guix/gn-machines/genenetwork.scm b/guix/gn-machines/genenetwork.scm
index 3ace8a7..04a610e 100644
--- a/guix/gn-machines/genenetwork.scm
+++ b/guix/gn-machines/genenetwork.scm
@@ -116,7 +116,7 @@
                   "0qcwdn0jbd39dccxa1c8a9ph6yfprwldscc4byanm0y0c68ijy98")))))))
 
 (define-public gn-guile
-  (let ((commit "6d122aab03afa3060fe988731d964061e965e1ec")
+  (let ((commit "0e8e605434b37251e6729121c77afa963cebef6a")
 	(revision "0"))
     (package
       (inherit gng:gn-guile)
@@ -130,7 +130,7 @@
 		(file-name (string-append name "-" version))
 		(sha256
 		 (base32
-                  "1z0r4wi3nxncchc9ivgikg9ixhwk1nga4qd1m6gq8p847c8ijfqx"))))
+                  "0xy8c4x0hfi9za47prf59a9qjc983ygl2g34ndi9imjy36aa4pib"))))
       (arguments
        (list
 	#:not-compiled-file-regexp "(guix|guix/.*)[.]scm$"
@@ -144,16 +144,7 @@
 	        (let ((git (search-input-file inputs "/bin/git")))
 	          (substitute* "web/view/markdown.scm"
 	            (("\"git\"") (string-append "\"" git "\""))
-	            (("git -C") (string-append git " -C")))
-                  (substitute* "gn-guile.sh"
-                    ((" @SHELL@")
-                     (search-input-file inputs "/bin/bash"))
-	            (("guile") (search-input-file inputs "/bin/guile"))
-                    (("main web")
-                     (string-append "main " #$output
-                                    "/share/guile/site/"
-                                    (target-guile-effective-version)
-                                    "/web"))))))
+	            (("git -C") (string-append git " -C"))))))
             (add-after 'patch-source-shebangs 'patch-gn-guile-source-shebangs
               ;; there is still the shell-script `lmdb-publishdata-export' that
               ;; needs to be patched the usual way, so we have 2 different