aboutsummaryrefslogtreecommitdiff
path: root/gn
diff options
context:
space:
mode:
authorMuriithi Frederick Muriuki2018-12-03 07:59:13 +0300
committerMuriithi Frederick Muriuki2018-12-03 07:59:13 +0300
commit4a1ef2cc9a5d01ca26ab99ddac73cb0fa18fbd08 (patch)
treed0d4d26d5eb02cb9e45594a810e975321ca4c982 /gn
parentb249b3ce8cfe983a042e9a7815c69239877efea8 (diff)
parentc1f2ddf52bb6372ae86fee65adfb8302dea3be13 (diff)
downloadguix-bioinformatics-4a1ef2cc9a5d01ca26ab99ddac73cb0fa18fbd08.tar.gz
Merge branch 'master' of https://gitlab.com/genenetwork/guix-bioinformatics
Diffstat (limited to 'gn')
-rw-r--r--gn/packages/edash.scm5
-rw-r--r--gn/packages/gemma.scm4
-rw-r--r--gn/packages/python.scm5
3 files changed, 9 insertions, 5 deletions
diff --git a/gn/packages/edash.scm b/gn/packages/edash.scm
index e4d3a9f..7d5fc63 100644
--- a/gn/packages/edash.scm
+++ b/gn/packages/edash.scm
@@ -169,7 +169,10 @@ interface to the Amazon Web Services (AWS) API.")
("python-sqlalchemy" ,python-sqlalchemy)
("python-flask-sqlalchemy" ,python-flask-sqlalchemy)
("python-flask-mail" ,python-flask-mail)
- ("python-flask-wtf" ,python-flask-wtf)))
+ ("python-flask-wtf" ,python-flask-wtf)
+ ("sqlite" ,sqlite)
+ ("python-ipython" ,python-ipython)
+ ))
(arguments
`(#:modules ((guix build utils))
#:builder
diff --git a/gn/packages/gemma.scm b/gn/packages/gemma.scm
index ec66a3d..d602679 100644
--- a/gn/packages/gemma.scm
+++ b/gn/packages/gemma.scm
@@ -236,14 +236,14 @@ genome-wide association studies (GWAS).")
(define-public gemma-wrapper
(package
(name "gemma-wrapper")
- (version "0.97")
+ (version "0.98.1")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "bio-gemma-wrapper" version))
(sha256
(base32
- "0nypw1fnq03ssm73rij7xcgz3fqgx5rdzksbpggylbnvn7fz1q17"))))
+ "0wysg7s64vyzm19j2hvxyflbszx00d9diw9zwzbqirzagzmqbfwk"))))
(build-system ruby-build-system)
(inputs `(("gemma-gn2" ,gemma-gn2-git)))
(arguments
diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index f254ce3..5ce44d6 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -174,9 +174,10 @@ functions.")
`(("python2-eventlet" ,python2-eventlet)
("python2-gevent" ,python2-gevent)))
(propagated-inputs
- `(("inotify-tools" ,inotify-tools)))
+ `(("python2" ,python-2)
+ ("inotify-tools" ,inotify-tools)))
(arguments `(
- ;; #:python ,python-2 ; GN2 is still python2
+ #:python ,python-2 ; GN2 is still python2
#:tests? #f)) ;; No tests.
(home-page "http://gunicorn.org")
(synopsis