aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpjotrp2017-09-30 12:33:16 +0000
committerpjotrp2017-09-30 12:33:16 +0000
commit77dfced2ab74e06cf4bb84b6d3d192e486bd50f7 (patch)
tree65640a8299b892db93e9263c67b3d1c7eff45067
parentbd74079473c26fe545f02bffea68eba5d58be71b (diff)
parenta4bc1e85c11a6dc2281a1cd6c45e2c02148c1e50 (diff)
downloadguix-bioinformatics-77dfced2ab74e06cf4bb84b6d3d192e486bd50f7.tar.gz
Merge branch 'master' of gitlab.com:genenetwork/guix-bioinformatics
-rw-r--r--gn/packages/elixir.scm1
-rw-r--r--gn/packages/genenetwork.scm3
2 files changed, 3 insertions, 1 deletions
diff --git a/gn/packages/elixir.scm b/gn/packages/elixir.scm
index a16de2d..f4b1ece 100644
--- a/gn/packages/elixir.scm
+++ b/gn/packages/elixir.scm
@@ -53,6 +53,7 @@
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
+ #:tests? #f
#:make-flags (list (string-append "PREFIX="
(assoc-ref %outputs "out")))
#:phases
diff --git a/gn/packages/genenetwork.scm b/gn/packages/genenetwork.scm
index 7e5339f..5f119a7 100644
--- a/gn/packages/genenetwork.scm
+++ b/gn/packages/genenetwork.scm
@@ -21,7 +21,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
#:use-module (gnu packages cpio)
- #:use-module (gnu packages elixir)
+ #:use-module (gn packages elixir)
#:use-module (gnu packages file)
#:use-module (gnu packages gcc)
#:use-module (gnu packages graphviz)
@@ -111,6 +111,7 @@
`(("python" ,python)
("elixir" ,elixir)
("mysql" ,mysql)
+ ("gnu-make" ,gnu-make) ; needed for mysqlex
))
(arguments
`(#:modules ((guix build utils))