diff options
| -rw-r--r-- | gn/packages/genenetwork.scm | 18 | ||||
| -rw-r--r-- | gn/packages/guile.scm | 9 |
2 files changed, 18 insertions, 9 deletions
diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm index 4dcb8f9..121c30b 100644 --- a/gn/packages/genenetwork.scm +++ b/gn/packages/genenetwork.scm @@ -115,7 +115,7 @@ ((#:tests? _ #f) #f))))) (define-public genenetwork3 - (let ((commit "f9f752152e9e00dbfb756d8a08c10e1892685104") + (let ((commit "5d2aebb8c1e3af7751a7b23d3467c63006395c58") (revision "5")) (package (name "genenetwork3") @@ -129,7 +129,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1ggc597xqj280qdp5gzlk745ldgx54k5sgn1w865ini6ph3i18zr")))) + "0gmpndln4j39m2wk48qqirdynn3ivjvinppsgm6lgrjbqcjg27zb")))) (inputs (list python-click)) (native-inputs @@ -139,6 +139,7 @@ python-pylint)) (propagated-inputs (list csvdiff + coreutils-minimal diffutils nss-certs gemma-wrapper @@ -190,7 +191,7 @@ (license license:agpl3+)))) (define-public genenetwork2 - (let ((commit "a08d76600b46968131b51ca6880c348262947119") + (let ((commit "0db8dca5edc931b1cea5aaa8096ece0134725481") (revision "4")) (package (name "genenetwork2") @@ -203,7 +204,7 @@ (file-name (string-append name "-" version)) (sha256 (base32 - "0818642y05jk4662jx5w6cc611k92zwhdqbnrs3sjs2ryqhjwdc8")))) + "0h26arq4mrj4jyvh3k3x7my8vx9p9dhnkmvpj1dz4jyxjv66n265")))) (native-inputs (list graphviz)) (propagated-inputs @@ -487,7 +488,7 @@ (license license:agpl3+)))) (define-public gn-auth - (let ((commit "346217b95a4aac17a5c7ac05c00d1205fa1855c5") + (let ((commit "e345a04030249c99237a7f4e1e80e29918e99c7c") (revision "01")) (package (name "gn-auth") @@ -501,7 +502,7 @@ (hash (content-hash (base32 - "0nyxml3s778zaq3r0r9z5d7010hmbzvlwdbm5xnmrzc0xlx223g3"))))) + "17srcxk5zwnsx97jqmg1csarmjsny8z8k7q435kq19p472f27yv7"))))) (build-system python-build-system) (arguments (list @@ -539,7 +540,7 @@ (define-public gn-libs - (let ((commit "66bac3df1748ff263c991e121b3ce80599807998") + (let ((commit "72a95f8ffa5401649f70978e863dd3f21900a611") (revision "01")) (package (name "gn-libs") @@ -553,7 +554,7 @@ (hash (content-hash (base32 - "11qpz6x4hgi13j1wznlxyl9fxh1la4f3s9vand34zmxk1diqisbb"))))) + "1jvlz85pn10cx2icjxk0klz1g8k8vn1f8vp6kb4xyjskb1228yrx"))))) (build-system pyproject-build-system) (arguments (list @@ -570,6 +571,7 @@ (propagated-inputs (list python-authlib python-pymonad + python-requests python-mysqlclient)) (home-page "https://github.com/genenetwork/gn-libs") (synopsis "Tools/utilities for GeneNetwork projects.") diff --git a/gn/packages/guile.scm b/gn/packages/guile.scm index 2b6bc5b..7328397 100644 --- a/gn/packages/guile.scm +++ b/gn/packages/guile.scm @@ -11,6 +11,7 @@ #:use-module ((gnu packages compression) #:select (zlib)) #:use-module ((gnu packages perl) #:select (perl)) #:use-module ((gnu packages texinfo) #:select (texinfo)) + #:use-module ((gnu packages version-control) #:select (git-minimal)) #:use-module (guix utils) #:use-module (gnu packages build-tools) #:use-module (gnu packages package-management) @@ -137,7 +138,7 @@ for MySQL.") (inputs (list guile-3.0 guile3-dbi guile3-dbd-mysql guile-fibers guile-gnutls guile-readline guile-commonmark guile-redis openssl nss-certs gemma parallel guile-hashing - guile-json-4 bash-minimal)) + guile-json-4 bash-minimal git-minimal)) (arguments (list #:not-compiled-file-regexp "(guix|guix/.*)[.]scm$" @@ -147,6 +148,12 @@ for MySQL.") (guix build utils)) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-git + (lambda* (#:key inputs #:allow-other-keys) + (let ((git (assoc-ref inputs "git-minimal"))) + (substitute* "web/view/markdown.scm" + (("\"git\"") (string-append "\"" git "/bin/git" "\"")) + (("git -C") (string-append git "/bin/git -C")))))) (add-after 'build 'install-script (lambda* _ (let* ((bash #$(this-package-input "bash-minimal")) |