diff options
| -rw-r--r-- | genenetwork-development.scm | 14 | ||||
| -rw-r--r-- | guix/gn-machines/genenetwork.scm | 12 |
2 files changed, 15 insertions, 11 deletions
diff --git a/genenetwork-development.scm b/genenetwork-development.scm index 67e39a9..03b6b11 100644 --- a/genenetwork-development.scm +++ b/genenetwork-development.scm @@ -575,6 +575,7 @@ server described by CONFIG, a <genenetwork-configuration> object." "--max-requests" "100" "--max-requests-jitter" "30" "--timeout" "1200" + "--log-level" "debug" "gn2.wsgi"))))))) (define (genenetwork3-cd-gexp config) @@ -644,7 +645,8 @@ server described by CONFIG, a <genenetwork-configuration> object." ;; gunicorn's default 30 second timeout is ;; insufficient for Fahamu AI endpoints and ;; results in worker timeout errors. - "--timeout" "1200")))))))) + "--timeout" "1200" + "--log-level" "debug")))))))) (define (gn-auth-cd-gexp config) "Return a G-expression that runs the latest gn-auth development @@ -708,6 +710,7 @@ server described by CONFIG, a <genenetwork-configuration> object." (invoke #$(file-append gunicorn "/bin/gunicorn") "-b" #$(string-append "localhost:" (number->string gn-auth-port)) "--workers" "8" + "--log-level" "debug" "gn_auth.wsgi:app")))))))) (define (gn-guile-gexp gn-guile-port) @@ -757,11 +760,12 @@ server described by CONFIG, a <genenetwork-configuration> object." ;; be persistent. (unless (file-exists? current-repo-path) (invoke #$(file-append git-minimal "/bin/git") - "clone" "--depth" "1" (getenv "CGIT_REPO_PATH") current-repo-path)) + "clone" "--depth" "1" + (string-append "file://" (getenv "CGIT_REPO_PATH")) current-repo-path)) (when (file-exists? "gn-guile") (delete-file-recursively "gn-guile")) - (invoke "git" "clone" "--depth" "1" "https://git.genenetwork.org/gn-guile") + (invoke "git" "clone" "--depth" "1" "https://git.genenetwork.org/gn-guile" "gn-guile") (with-directory-excursion "gn-guile" (setenv "HOME" "/home/genenetwork/gn-guile") @@ -770,9 +774,9 @@ server described by CONFIG, a <genenetwork-configuration> object." "--port" (number->string #$gn-guile-port) "--gn-docs-local-checkout" - "/home/genenetwork/gn-docs" + current-repo-path "--gn-docs-remote-url" - "https://git.genenetwork.org/gn-guile" + (getenv "CGIT_REPO_PATH") "--gn-docs-working-branch" "gn-cd-branch")))))))) diff --git a/guix/gn-machines/genenetwork.scm b/guix/gn-machines/genenetwork.scm index 9850e0d..49256c0 100644 --- a/guix/gn-machines/genenetwork.scm +++ b/guix/gn-machines/genenetwork.scm @@ -14,7 +14,7 @@ #:prefix gng:)) (define-public genenetwork2 - (let ((commit "8f2628103de5bf5f2faab41fd8272a5c568a263f") + (let ((commit "054123eec761ea385fe5557b31c431a8fe09cce3") (revision "4")) (package (inherit gn:genenetwork2) @@ -28,7 +28,7 @@ (file-name (string-append name "-" version)) (sha256 (base32 - "1q3rvcmrpqz0lp7dby9q5yy7i9k5h60xac2lfp44v47vrask3np0")))) + "1j4b0jn4mnhg5a6s5ghnnlfw2b9pwhsx32gjhm2zcz9wwwzlc0x8")))) (propagated-inputs (modify-inputs (package-propagated-inputs gn:genenetwork2) (replace "gn-libs" gn-libs) @@ -74,7 +74,7 @@ (replace "gn-libs" gn-libs)))))) (define-public gn-auth - (let ((commit "8a11dda78f1142347c85d943b11bf0a48e8530fe") + (let ((commit "d2f780b931b9a7d4a99578c6ba4dc1f110cda1d1") (revision "1")) (package (inherit gn:gn-auth) @@ -90,7 +90,7 @@ (hash (content-hash (base32 - "1pilsj5gbm2m7jm48bba7x7yxykk864a1wkhmxb0wajhmzlf0hd1"))))) + "01iawqnqskr5ryp8qpjfpdswqcla3gyh3mijpxmlmmima5sq5v7h"))))) (propagated-inputs (modify-inputs (package-propagated-inputs gn:gn-auth) (replace "gn-libs" gn-libs)))))) @@ -118,7 +118,7 @@ (replace "rust-qtlreaper" rust-qtlreaper)))))) (define-public gn-libs - (let ((commit "422d40142e4373f51c539fa846cc33b604e54c0f") + (let ((commit "22fe4293947499628f87f36561c96a3b3b070166") (revision "03")) (package (inherit gn:gn-libs) @@ -132,7 +132,7 @@ (file-name (string-append name "-" version)) (sha256 (base32 - "0v8d5mqn2bj5rf5919bkvsb5yrdz7cl09dnam4blafy2awqk3fm7"))))))) + "1pfy24abv958lg6qac1y58rrvrbswb1fp0y0hm7q7zyjd4jy7a45"))))))) (define-public gn-guile (let ((commit "0e8e605434b37251e6729121c77afa963cebef6a") |