about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoel Janssen2016-03-11 13:02:51 +0100
committerRoel Janssen2016-03-11 13:02:51 +0100
commit95daf655ee7eb4647cb295b29335ac838b805cc0 (patch)
treeb4fbfdbb37bacad8aa1eeb95171bd8ff697a1269
parentf4e38087ff0c0261196304179f7d537d4806f164 (diff)
parentcd6dea3c1cc7489d02b93d66dee135ba040f19f7 (diff)
downloadguix-bioinformatics-95daf655ee7eb4647cb295b29335ac838b805cc0.tar.gz
Merge branch 'master' of https://github.com/genenetwork/guix-bioinformatics
-rw-r--r--gn/packages/bioinformatics.scm1
-rw-r--r--gn/packages/llvm.scm4
2 files changed, 3 insertions, 2 deletions
diff --git a/gn/packages/bioinformatics.scm b/gn/packages/bioinformatics.scm
index 2c8feec..d81a19a 100644
--- a/gn/packages/bioinformatics.scm
+++ b/gn/packages/bioinformatics.scm
@@ -13,6 +13,7 @@
   ;; #:use-module (guix build-system ruby)
   #:use-module (guix build-system r)
   #:use-module (guix build-system trivial)
+  #:use-module (gn packages statistics)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages algebra)
diff --git a/gn/packages/llvm.scm b/gn/packages/llvm.scm
index 83ea5d1..607f7c2 100644
--- a/gn/packages/llvm.scm
+++ b/gn/packages/llvm.scm
@@ -19,7 +19,7 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu packages llvm)
+(define-module (gn packages llvm)
   #:use-module (guix packages)
   #:use-module (guix licenses)
   #:use-module (guix download)
@@ -62,4 +62,4 @@ languages.  It currently supports compilation of C and C++ programs, using
 front-ends derived from GCC 4.0.1.  A new front-end for the C family of
 languages is in development.  The compiler infrastructure includes mirror sets
 of programming tools as well as libraries with equivalent functionality.")
-    (license license:ncsa)))
+    (license ncsa)))