diff options
| author | Munyoki Kilyungi | 2026-03-23 10:48:13 +0300 |
|---|---|---|
| committer | Munyoki Kilyungi | 2026-05-15 18:17:02 +0300 |
| commit | 251f080599f67544cc16dc7ddeafc7cee94a7a5c (patch) | |
| tree | 911bb4a19910cc3c9ba8cf58c23897a54970e426 | |
| parent | 1c62f8dac09754e7e08dd1ee42d3059dc05425c3 (diff) | |
| download | gn-machines-251f080599f67544cc16dc7ddeafc7cee94a7a5c.tar.gz | |
Update how gn-guile is called.
Signed-off-by: Munyoki Kilyungi <me@bonfacemunyoki.com>
| -rw-r--r-- | genenetwork-development.scm | 26 | ||||
| -rw-r--r-- | guix/gn-machines/genenetwork.scm | 3 |
2 files changed, 17 insertions, 12 deletions
diff --git a/genenetwork-development.scm b/genenetwork-development.scm index f91a8f1..f7098d1 100644 --- a/genenetwork-development.scm +++ b/genenetwork-development.scm @@ -22,9 +22,8 @@ (use-modules (gnu) (gn-machines services monitoring) - ((gn-machines genenetwork) #:select (genenetwork2 genenetwork3 gn-auth)) + ((gn-machines genenetwork) #:select (genenetwork2 genenetwork3 gn-auth gn-guile)) (gn services databases) - ((gn packages guile) #:select (gn-guile)) (gnu build linux-container) ((gnu packages admin) #:select (shepherd shadow)) ((gnu packages base) #:select (gnu-make tar coreutils-minimal)) @@ -40,7 +39,7 @@ ((gnu packages graphviz) #:select (graphviz)) ((gnu packages guile) #:select (guile-3.0 guile-git guile-zlib)) ((gnu packages guile-xyz) #:select (guile-dbd-mysql guile-dbi guile-dsv guile-hashing guile-uuid - guile-ini guile-lib guile-libyaml guile-smc guile-xapian)) + guile-ini guile-lib guile-libyaml guile-smc guile-xapian)) ((gnu packages guile-xyz) #:select (guile-sparql) #:prefix guix:) ((gnu packages haskell-apps) #:select (shellcheck)) ((gnu packages python-check) #:select (python-mypy)) @@ -751,14 +750,19 @@ server described by CONFIG, a <genenetwork-configuration> object." (when (file-exists? "gn-guile") (delete-file-recursively "gn-guile")) (invoke "git" "clone" "--depth" "1" "https://git.genenetwork.org/gn-guile") - ;; We have a gn-guile-dev wrapper script that sets a "./" in the - ;; GN_GUILE_LOAD_PATH hence allowing this to be run from the gn-guile - ;; directory. This allows gn-guile to be run from the latest - ;; upstream commits without pinning to guix. - (with-directory-excursion "gn-guile" - (show-head-commit) - (invoke #$(file-append gn-guile "/bin/gn-guile-dev") - (number->string #$gn-guile-port))))))))) + (with-directory-excursion + "gn-guile" + (setenv "HOME" "/home/genenetwork/gn-guile") + (show-head-commit) + (invoke #$(file-append gn-guile "/bin/gn-guile") + "--port" + (number->string #$gn-guile-port) + "--gn-docs-local-checkout" + "/home/genenetwork/gn-docs" + "--gn-docs-remote-url" + "https://git.genenetwork.org/gn-guile" + "--gn-docs-working-branch" + "gn-cd-branch")))))))) (define (genenetwork-shepherd-services config) "Return shepherd services to run the genenetwork development server diff --git a/guix/gn-machines/genenetwork.scm b/guix/gn-machines/genenetwork.scm index a1ca607..9850e0d 100644 --- a/guix/gn-machines/genenetwork.scm +++ b/guix/gn-machines/genenetwork.scm @@ -193,7 +193,8 @@ (string-append #$output "/bin/" script-name) `("PATH" prefix (,guile-path ,(getenv "PATH"))) `("GUILE_LOAD_PATH" prefix - (,(string-append #$output + ("./" ;; for CD. Should not affect production. + ,(string-append #$output "/share/guile/site/" effective-version) ,(getenv "GUILE_LOAD_PATH"))) |