about summary refs log tree commit diff
path: root/gn/packages/genenetwork.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gn/packages/genenetwork.scm')
-rw-r--r--gn/packages/genenetwork.scm28
1 files changed, 16 insertions, 12 deletions
diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm
index 1d22a59..f8db089 100644
--- a/gn/packages/genenetwork.scm
+++ b/gn/packages/genenetwork.scm
@@ -19,7 +19,6 @@
   #:use-module (guix packages)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
-  #:use-module (gnu packages certs)
   #:use-module ((gnu packages nss) #:select (nss-certs))
   #:use-module (gnu packages bioconductor)
   #:use-module (gnu packages bioinformatics)
@@ -65,7 +64,7 @@
 
 
 (define-public rust-qtlreaper
-  (let ((commit "2e7fed6d45b0b602d80fa2a55835f96ef1cba9e3")
+  (let ((commit "4dafa7289432d10685b6b235e3552ac3d681bb03")
         (revision "1"))
     (package
       (name "rust-qtlreaper")
@@ -74,12 +73,12 @@
         (origin
           (method git-fetch)
           (uri (git-reference
-                 (url "https://github.com/chfi/rust-qtlreaper.git")
+                 (url "https://github.com/genenetwork/rust-qtlreaper.git")
                  (commit commit)))
           (file-name (git-file-name name version))
           (sha256
            (base32
-            "0h70aalsplmc6xn1w7ha102n3bsi3gqkbnbrjvjm2za37c07gv0g"))))
+            "1p7dmxh43ly0k7q6va0lzisqnk1i7af3dy5aw1sr4y5s7z0h6i0y"))))
       (build-system cargo-build-system)
       (arguments
        `(#:cargo-inputs
@@ -103,7 +102,7 @@
                        (("-0.3223330030526561") "-0.32233300305265566"))
                      (assoc-ref %standard-phases 'check)))
                #t)))))
-      (home-page "https://github.com/chfi/rust-qtlreaper")
+      (home-page "https://github.com/genenetwork/rust-qtlreaper")
       (synopsis "Reimplementation of genenetwork/QTLReaper in Rust")
       (description "Reimplementation of genenetwork/QTLReaper in Rust")
       (license #f))))
@@ -118,7 +117,7 @@
       ((#:tests? _ #f) #f)))))
 
 (define-public genenetwork3
-  (let ((commit "019282e64fb401f7a6823f3c8914d1d6e5ad0233")
+  (let ((commit "e6c44577b2489f7b1523cb6a5fd332015bde25c5")
         (revision "5"))
     (package
       (name "genenetwork3")
@@ -132,7 +131,7 @@
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "1rr2y4i93kpc998a123d32yaakqmqiv5b7n4xva01j6jfqjsgw9s"))))
+           "0i2n46lg73w06dfqcs4sxvwwfdxa0536gv95ism85h4j3dm9vzhz"))))
       (inputs
        (list python-click))
       (native-inputs
@@ -170,6 +169,7 @@
              python-scikit-learn
              python-scipy
              python-sparqlwrapper
+	     python-structlog
              python-wrapper
              python-xapian-bindings
              r
@@ -227,7 +227,7 @@ storage.")
     (license license:bsd-3)))
 
 (define-public genenetwork2
-  (let ((commit "e2f9e829bffcbffc5934e6b11685e5631fd7a001")
+  (let ((commit "5e596f0814b4cad57a847fae03df2867b6327653")
         (revision "4"))
     (package
       (name "genenetwork2")
@@ -240,7 +240,7 @@ storage.")
                 (file-name (string-append name "-" version))
                 (sha256
                  (base32
-                  "13bcq0ya9sjpf3lx2gdzwsm0ya3y0l4qq48198bqinjbh6avqq1f"))))
+                  "1arnq4b7c6i6fnvfim3yyghrvr0ncjdp1a4ix1hgj9bz2r9vxnzi"))))
       (native-inputs
        (list graphviz))
       (propagated-inputs
@@ -347,6 +347,7 @@ storage.")
              python-wrapper
              python-xlsxwriter
 	     python-pillow-9
+	     python-structlog
              r
              r-ctl
              r-qtl
@@ -508,7 +509,8 @@ storage.")
             javascript-datatables-select
             javascript-datatables-buttons-3
             javascript-datatables-scroller-2
-            node-resumablejs))
+            node-resumablejs
+            rust-qtlreaper))
      (synopsis "GeneNetwork Quality Control Application")
      (description
       "gn-uploader is a service allowing upload of new data into GeneNetwork,
@@ -564,6 +566,7 @@ storage.")
              python-mysqlclient-2.2.7
              python-pymonad
              python-redis
+	     python-structlog
              yoyo-migrations))
       (home-page "https://github.com/genenetwork/gn-auth")
       (synopsis "Authentication and Authorisation server for GeneNetwork services")
@@ -572,7 +575,7 @@ storage.")
 
 
 (define-public gn-libs
-  (let ((commit "894021d27da14bfb0bf286e188a36741bc475906")
+  (let ((commit "9422e39e5b79a4aaca7dc368368d39141a0242b7")
         (revision "02"))
     (package
       (name "gn-libs")
@@ -587,7 +590,7 @@ storage.")
          (hash
           (content-hash
            (base32
-            "0ysj8cs259naa0s6s0gr8149qj6zra3iq0n1fspq3bw0ij54wf8i")))))
+            "03i1kj7jbmlkjs61a9fb4j3s78p4d5lmd8lqnfsv42wxwwyvsm8p")))))
       (build-system pyproject-build-system)
       (arguments
        (list
@@ -607,6 +610,7 @@ storage.")
        (list python-authlib
              python-pymonad
              python-requests
+	     python-structlog
              python-mysqlclient-2.2.7))
       (home-page "https://github.com/genenetwork/gn-libs")
       (synopsis "Tools/utilities for GeneNetwork projects.")