diff options
| author | pjotrp <pjotr.public01@thebird.nl> | 2026-11-17 16:52:30 +0100 |
|---|---|---|
| committer | pjotrp <pjotr.public01@thebird.nl> | 2026-11-17 16:52:30 +0100 |
| commit | 3811fd1f67ce64b92765993151784f742bff04d7 (patch) | |
| tree | aea85dada28179f8370c03e5f5500f9e16d851e4 /gn/packages | |
| parent | 847d712f9fbe21b3362dbbe31bcfdb179fae390d (diff) | |
| download | guix-bioinformatics-gemma-update.tar.gz | |
Gemma with GN gemma-update
Diffstat (limited to 'gn/packages')
| -rw-r--r-- | gn/packages/gemma.scm | 10 | ||||
| -rw-r--r-- | gn/packages/genenetwork.scm | 14 | ||||
| -rw-r--r-- | gn/packages/javascript.scm | 29 | ||||
| -rw-r--r-- | gn/packages/python.scm | 9 | ||||
| -rw-r--r-- | gn/packages/statistics.scm | 90 |
5 files changed, 91 insertions, 61 deletions
diff --git a/gn/packages/gemma.scm b/gn/packages/gemma.scm index f337a37..c52b8c4 100644 --- a/gn/packages/gemma.scm +++ b/gn/packages/gemma.scm @@ -61,7 +61,7 @@ (base32 "06csrh8rgcjcl52ljyynizb15gy84gcd6glzl0gfkawmxy6am9n4")))) (inputs `( - ("catch" ,catch2) + ;; ("catch" ,catch2) ; see #:tests? below ("gsl" ,gsl) ("shunit2-old" ,shunit2-old) ("openblas" ,openblas) @@ -85,7 +85,11 @@ (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (install-file "bin/gemma" (string-append out "/bin")))))) - ; #:tests? #f + ;; GEMMA 0.98.5 ships a test suite written against the single-header + ;; Catch2 v2 API (test/src/unittests-main.cpp includes + ;; <catch2/catch.hpp>); Guix now provides Catch2 v3, which no longer + ;; has that header, so `make check' cannot be built here. + #:tests? #f #:parallel-tests? #f)) (home-page "https://github.com/genetics-statistics/GEMMA") (synopsis "Tool for genome-wide efficient mixed model association") @@ -259,7 +263,7 @@ dependency lands.") ;;; there, but cuirass.genenetwork.org has no gemma substitute and ;;; every cold build ran into it. Skip the check for this variant ;;; (the GEMMA test-suite needs shunit2 fixtures and takes a while); -;;; used by gn-guile. +;;; used by gn-guile and, as GEMMA_COMMAND, by genenetwork2. (define-public gemma-exec-fix (package/inherit gemma (arguments diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm index 4690ffb..9c86cb3 100644 --- a/gn/packages/genenetwork.scm +++ b/gn/packages/genenetwork.scm @@ -193,7 +193,9 @@ storage.") genenetwork3 coreutils nss-certs - gemma + ;; gemma executable-fix variant: upstream gemma's check phase + ;; fails on cold builds, see gemma-exec-fix. + gemma-exec-fix gemma-wrapper git glibc-utf8-locales @@ -239,7 +241,13 @@ storage.") javascript-nouislider javascript-nvd3 javascript-plotly - javascript-purescript-genome-browser + ;; javascript-purescript-genome-browser is disabled: its pinned + ;; commit (93d45a5) is no longer served by GitHub and the prebuilt + ;; js/ tree it copied does not exist in any reachable commit + ;; (current master only ships dist/{index.html,style.css}), so the + ;; source cannot be fetched. The genome browser page + ;; (mapping_results.html) then has no client-side JS. + ;; javascript-purescript-genome-browser javascript-qtip2 javascript-shapiro-wilk javascript-twitter-post-fetcher @@ -328,6 +336,8 @@ storage.") (add-before 'install 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (let* ((plink2cmd (string-append (assoc-ref inputs "plink-ng-gn") "/bin/plink2")) + ;; The input is gemma-exec-fix, whose package name is + ;; still "gemma" (it inherits upstream gemma). (gemmacmd (string-append (assoc-ref inputs "gemma") "/bin/gemma"))) (substitute* '("gn2/default_settings.py") (("^PLINK_COMMAND =.*") (string-append "PLINK_COMMAND = \"" plink2cmd "\"\n" )) diff --git a/gn/packages/javascript.scm b/gn/packages/javascript.scm index 6ba75ca..77ad6b4 100644 --- a/gn/packages/javascript.scm +++ b/gn/packages/javascript.scm @@ -1,5 +1,6 @@ (define-module (gn packages javascript) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages javascript) #:use-module (gn packages web) @@ -894,10 +895,14 @@ visualization components and a data-driven approach to DOM manipulation.") (source (origin (method url-fetch) - ;; note that D3 no longer provides a prebuilt JS file - except through CDS - (uri (string-append "https://files.genenetwork.org/software/d3.v" version ".min.js.gz")) + ;; D3 ships no prebuilt d3.min.js in its GitHub release, and the + ;; gzipped copy that used to be mirrored on + ;; files.genenetwork.org/software is gone (404), so take the + ;; npm tarball instead. + (uri (string-append "https://registry.npmjs.org/d3/-/d3-" + version ".tgz")) (sha256 - (base32 "0k7g40zb65s12z1zchvimj5xibkrqff5sylbrhcwmwpcplpigid7")))) + (base32 "0pim4jwa0j9aqdyjalxf2nr424wii3ccdj4pcy259fm221bn0dky")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -906,17 +911,21 @@ visualization components and a data-driven approach to DOM manipulation.") (use-modules (guix build utils)) (let* ((out (assoc-ref %outputs "out")) (module-name "d3js-7") - (gzip (string-append (assoc-ref %build-inputs "gzip") - "/bin/gzip")) - (targetdir (string-append out "/share/genenetwork2/javascript/" module-name)) - (jsname (string-append "d3.v" "7.9.0" ".min.js")) - (gzname (string-append jsname ".gz")) + (tar (string-append (assoc-ref %build-inputs "tar") "/bin/tar")) + (gzip (string-append (assoc-ref %build-inputs "gzip") "/bin/gzip")) + (targetdir (string-append out + "/share/genenetwork2/javascript/" + module-name)) (source (assoc-ref %build-inputs "source"))) + (invoke tar (string-append "--use-compress-program=" gzip) + "--extract" "--file" source) (mkdir-p targetdir) - (copy-file (pk source) (pk (string-append targetdir "/" gzname))) - (invoke gzip "-fd" (string-append targetdir "/" gzname)))))) + (copy-file "package/dist/d3.min.js" + (string-append targetdir "/d3.v7.9.0.min.js")))))) (native-inputs `(("source" ,source) + ("tar" ,tar) + ;; tar shells out to gzip to decompress the npm tarball. ("gzip" ,gzip))) (home-page "https://d3js.org/") (synopsis "JavaScript library for visualizing data") diff --git a/gn/packages/python.scm b/gn/packages/python.scm index dd7c9f0..576f535 100644 --- a/gn/packages/python.scm +++ b/gn/packages/python.scm @@ -81,8 +81,10 @@ "11hfx5x3jg4hyfxzav6ypsb57mahb5nk6qzg4zn1pyy1lilllqj6")))) (build-system python-build-system) (arguments (list #:tests? #f)) + ;; setuptools is no longer implied by python-build-system's build phase. (native-inputs - `(("python-asserts" ,python-asserts))) + `(("python-asserts" ,python-asserts) + ("python-setuptools" ,python-setuptools))) (synopsis "Python HTML 5 Generator") (description "This is a python library for generating html from classes.") (home-page "https://github.com/srittau/python-htmlgen") @@ -103,6 +105,8 @@ (base32 "10lzdbhyl1s1fpq34prhi288wcigrk0z4hphql20pyjxx6yla8ya")))) (build-system python-build-system) (arguments (list #:tests? #f)) + ;; setuptools is no longer implied by python-build-system's build phase. + (native-inputs (list python-setuptools)) (synopsis "Stand-alone Assertions for Python") (description "This is a python library that can provide assertions in a stand-alone manner.") @@ -362,7 +366,8 @@ file format spec.") ;; Included in 10.1.0. "python-pillow-use-zlib-1.3.patch")))) (build-system python-build-system) - (native-inputs (list python-pytest)) + ;; setuptools is no longer implied by python-build-system's build phase. + (native-inputs (list python-pytest python-setuptools python-wheel)) (inputs (list freetype lcms libjpeg-turbo diff --git a/gn/packages/statistics.scm b/gn/packages/statistics.scm index c391b2d..07d1bec 100644 --- a/gn/packages/statistics.scm +++ b/gn/packages/statistics.scm @@ -80,32 +80,41 @@ combined with QTL information to perform de novo reconstruction of interaction networks.") (license license:gpl3))) +(define rpy2-git-origin + ;; rpy2 >= 3.6.7 handles the removal of the R_nchar C API entry point in + ;; R 4.6; 3.6.2 and older fail to load _rinterface_cffi_api against it. + ;; The two rpy2 source distributions live in this single repository. + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rpy2/rpy2") + (commit "RELEASE_3_6_7"))) + (file-name (git-file-name "rpy2" "3.6.7")) + (sha256 + (base32 "0py2q283kcsnx4av01x25lxq3cv1m3zd428ns6s21k841l9wi739")))) + (define-public python-rpy2-rinterface (package (name "python-rpy2-rinterface") - (version "3.6.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "rpy2_rinterface" version)) - (sha256 - (base32 "1hjnc4143dvcrp9m4vnxm4fs2ahiagp5lklsqp1nki341kh0samn")))) + (version "3.6.7") + (source rpy2-git-origin) (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "rpy2-rinterface")))))) (propagated-inputs (list python-cffi - python-packaging ;;python-backports-zoneinfo ; needed for python_version<3.9 r-minimal)) - (native-inputs (list zlib - icu4c - libdeflate - python-cffi - python-coverage - python-packaging + (inputs (list icu4c + libdeflate + r-survival + zlib)) + (native-inputs (list python-cffi python-pytest - python-pytest-cov - python-setuptools - python-wheel - r-survival)) + python-setuptools)) (home-page "https://rpy2.github.io/") (synopsis "Low-level interface from Python to the R") (description "Low-level interface for rpy2. rpy2 is an interface to R @@ -115,56 +124,49 @@ interaction networks.") (define-public python-rpy2-robjects (package (name "python-rpy2-robjects") - (version "3.6.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "rpy2_robjects" version)) - (sha256 - (base32 "0yn4nq26na9hzlm08vsxr050ls5nmngpyma49fpfwc9mhxc7njlk")))) + (version "3.6.7") + (source rpy2-git-origin) (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; test_rmagic.py fails with pytest 9: marks on fixtures - ;; are no longer allowed. - (invoke "pytest" "-vv" - "--ignore=src/rpy2/ipython/tests/test_rmagic.py"))))))) + (add-after 'unpack 'chdir + (lambda _ (chdir "rpy2-robjects")))) + #:test-flags + ;; TODO: remove this deselection when the pandas conversion test is + ;; fixed upstream (StringDtype vs dtype('O') assertion). + #~(list (string-append "--deselect=src/rpy2/robjects/tests/robjects/" + "test_pandas_conversions.py" + "::TestPandasConversions::test_ri2pandas")))) (propagated-inputs (list python-jinja2 - python-packaging python-rpy2-rinterface ;;python-backports-zoneinfo; needed for python_version<3.9 python-tzlocal)) - (native-inputs (list python-coverage - python-ipython + (native-inputs (list python-ipython-minimal python-numpy - python-packaging python-pandas python-pytest - python-pytest-cov - python-setuptools - python-wheel)) - (home-page #f) + python-setuptools)) + (home-page "https://rpy2.github.io/") (synopsis "Python interface to the R language (embedded R)") (description "Python interface to the R language (embedded R).") - (license #f))) + (license license:gpl2))) (define-public python-rpy2-patched - ;; TODO: Delete this after python-rpy2 is fixed upstream. + ;; TODO: Delete this after genenetwork2 can use python-rpy2 upstream; + ;; kept so deployments pinned to an older guix, whose python-rpy2 + ;; cannot be built, still get a working rpy2. (package (inherit python-rpy2) (name "python-rpy2") - (version "3.6.2") + (version "3.6.7") (source (origin (method url-fetch) (uri (pypi-uri "rpy2" version)) (sha256 - (base32 "1l3paflfc2wczjms9ghaklg4bxg0c2cqh4anvlskpl4id9vsakhp")))) + (base32 "17wczrbabp41bww11ivwrqvyn9ysgk4xx21h2csyj53xrr4ldyzi")))) (propagated-inputs (modify-inputs (package-propagated-inputs python-rpy2) (prepend r-minimal) |
