diff options
| -rw-r--r-- | guix/gn-machines/genenetwork.scm | 45 | ||||
| -rw-r--r-- | production.scm | 4 |
2 files changed, 24 insertions, 25 deletions
diff --git a/guix/gn-machines/genenetwork.scm b/guix/gn-machines/genenetwork.scm index e90a5cf..ac2c759 100644 --- a/guix/gn-machines/genenetwork.scm +++ b/guix/gn-machines/genenetwork.scm @@ -14,7 +14,7 @@ #:prefix gng:)) (define-public genenetwork2 - (let ((commit "020abee91428a2c67b122dbe28b9135cd319aed7") + (let ((commit "fc968a1f37b154830d394b656d067e456efd53ea") (revision "4")) (package (inherit gn:genenetwork2) @@ -28,14 +28,14 @@ (file-name (string-append name "-" version)) (sha256 (base32 - "0snbg7qz2569byp2si6v5vdyvq9rq5c7xmsis85djd0gixk8kzc1")))) + "0l4ws9mbhyik2q0mgm6hpck9a2l4lp9d1mbr2kqx4qg6g35vq85i")))) (propagated-inputs (modify-inputs (package-propagated-inputs gn:genenetwork2) (replace "gn-libs" gn-libs) (replace "genenetwork3" genenetwork3)))))) (define-public genenetwork3 - (let ((commit "b3de4f55947630c64cfe13bdcce26950322864b8") + (let ((commit "e1cf6c46ae35ae758e247f3ed09e48e9eddc47cb") (revision "5")) (package (inherit gn:genenetwork3) @@ -50,13 +50,13 @@ (file-name (git-file-name name version)) (sha256 (base32 - "12ac4h2ajcfmszg19kkg7pdx9ffmmaarlq578h45kqzr2z2j1lf2")))) + "14hxrqrnv320dmfnp7zzp58w72a072pjp770crsbhjyc1cngbcbf")))) (propagated-inputs (modify-inputs (package-propagated-inputs gn:genenetwork3) (replace "gn-libs" gn-libs)))))) (define-public gn-auth - (let ((commit "8312082b66775ba89dce842d86686d86c33771be") + (let ((commit "15c417b4c69343a0e085d0fd1c41d98ec81a1011") (revision "1")) (package (inherit gn:gn-auth) @@ -72,13 +72,13 @@ (hash (content-hash (base32 - "173mpiiqy4x7mlwsmaycbf3dra1b2vjck5mhfs81w4w0fznlxkjg"))))) + "0l0fjsyf42h98mg6gyksmkjzg82v62wpfqlsda5ibfny80nak8w2"))))) (propagated-inputs (modify-inputs (package-propagated-inputs gn:gn-auth) (replace "gn-libs" gn-libs)))))) (define-public gn-uploader - (let ((commit "92286b4734963770ae3e6a930a5cd96c6ac430a4") + (let ((commit "112aa267709b130447d8ca387631f5dbeba02366") (revision "0")) (package (inherit gn:gn-uploader) @@ -93,13 +93,13 @@ (hash (content-hash (base32 - "0h25v6g4anfx8y34hiqhir31zis8820bwwkrz6j9g47vrv88aznc"))))) + "073jy7cxkmjk881yp6kccsd6mg2gkdg2ky059m4m6p2kqnlkdh82"))))) (propagated-inputs (modify-inputs (package-propagated-inputs gn:gn-uploader) (replace "gn-libs" gn-libs)))))) (define-public gn-libs - (let ((commit "20e43c94672f299c457468a7eb3663e51a31f77b") + (let ((commit "78c54eed593e1ddd6fb31745e101b4d9a1d2647d") (revision "03")) (package (inherit gn:gn-libs) @@ -113,10 +113,10 @@ (file-name (string-append name "-" version)) (sha256 (base32 - "1s8hjfmpczd6lryn4d0aqnpl4l8y4r1g18c3b6y0yjibl24sk8mq"))))))) + "0qcwdn0jbd39dccxa1c8a9ph6yfprwldscc4byanm0y0c68ijy98"))))))) (define-public gn-guile - (let ((commit "d19fcd79a028e649cb8ab3e42f5796bc353309ed") + (let ((commit "0e8e605434b37251e6729121c77afa963cebef6a") (revision "0")) (package (inherit gng:gn-guile) @@ -130,7 +130,7 @@ (file-name (string-append name "-" version)) (sha256 (base32 - "0ylv4psdmd442jg73sw8danv9n9wj3wi8b96jfnzx025llz9ka3m")))) + "0xy8c4x0hfi9za47prf59a9qjc983ygl2g34ndi9imjy36aa4pib")))) (arguments (list #:not-compiled-file-regexp "(guix|guix/.*)[.]scm$" @@ -144,20 +144,19 @@ (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 + ;; source-shebang patching phases. + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "bin/gn-guile" + (("^exec guile") + (string-append "exec " + (search-input-file inputs "/bin/guile")))))) (add-after 'build 'install-scripts (lambda* _ (mkdir-p "bin") - (copy-file "gn-guile.sh" "bin/gn-guile") (copy-file "scripts/lmdb-publishdata-export.scm" "bin/lmdb-publishdata-export") (for-each (lambda (script-path) diff --git a/production.scm b/production.scm index bd84a9b..302e7ef 100644 --- a/production.scm +++ b/production.scm @@ -92,7 +92,7 @@ (gn-guile-working-dir "/var/lib/genenetwork/gn-guile/") (gn-docs-working-branch "gn2-production-branch") (gn-guile-ssh-identity-file "/opt/home/gn-guile/.ssh/id-ed25519-gn2-production-on-tux04") - (log-level 'warning))) + (log-level 'info))) (service gn-uploader-service-type (gn-uploader-configuration (server-name "uploader.genenetwork.org") @@ -104,5 +104,5 @@ (auth-server-url "https://auth.genenetwork.org/") (gn2-server-url "https://genenetwork.org") (sqlite-databases-directory "/var/lib/genenetwork/sqlite/gn-uploader") - (log-level 'warning))) + (log-level 'info))) %base-services))) |