From daf1517382d4a68286d5f6186282c70b4932dafe Mon Sep 17 00:00:00 2001
From: pjotrp
Date: Fri, 13 Jul 2018 06:50:47 +0000
Subject: gemma-dev script

---
 gn/packages/gemma.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'gn')

diff --git a/gn/packages/gemma.scm b/gn/packages/gemma.scm
index 5e9b4b7..1bc2cb1 100644
--- a/gn/packages/gemma.scm
+++ b/gn/packages/gemma.scm
@@ -313,3 +313,39 @@ association studies (GWAS).")
     (description "Gemma wrapper")
     (home-page "https://rubygems.org/gems/bio-gemma-wrapper")
     (license license:gpl3)))
+
+(define-public gemma-dev
+  (let ((md5 "93e745e9c"))
+    (package
+    (name "gemma-dev")
+    (version "0.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri "http://biogems.info/genenetwork2-2.0-a8fcff4.svg") ; any old file
+       (file-name (string-append name "-" md5))
+       (sha256
+        (base32 "0rir1mcn3a8i1mbw3ppgnjl7wg71mapljik7n3v5i8j5ic95mqr5"))))
+    (build-system trivial-build-system)
+    (native-inputs `(("unzip" ,unzip)
+                     ("source" ,source)))
+    (inputs `(("sassc" ,sassc)))
+    (propagated-inputs
+     `(("gemma-wrapper" ,gemma-wrapper)
+       ))
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+         (let ((target (string-append (assoc-ref %outputs "out")
+                                      "/share")))
+             (write target)
+             (mkdir-p target)
+             ; (copy-recursively (assoc-ref %build-inputs "source") target)
+             #t))))
+
+    (home-page "http://github.com/genetics-statistics/")
+    (synopsis "GEMMA development environment imports build tools, gemma-wrapper and faster-lmm-d")
+    (description "Gemma-development")
+    (license license:gpl3))))
-- 
cgit v1.2.3


From f7a4bbf655bb255df46228f04cc191c1f08f198b Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Fri, 13 Jul 2018 08:00:04 -0500
Subject: GEMMA dev

---
 gn/packages/gemma.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'gn')

diff --git a/gn/packages/gemma.scm b/gn/packages/gemma.scm
index 1bc2cb1..973a077 100644
--- a/gn/packages/gemma.scm
+++ b/gn/packages/gemma.scm
@@ -112,9 +112,11 @@
 
 (define-public openblas-git
   (let ((commit "893bd14e924fa72a4ed345a75d64c637f1b1c550"))
+  ; (let ((commit "36aea5ce2d5565e006a027a23e805cd9ff0e2eee"))
     (package
     (name "openblas-git")
     (version (string-append "0.2.20-git-" (string-take commit 7)))
+    ; (version (string-append "0.3.1-git-" (string-take commit 7)))
     (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -124,6 +126,7 @@
              (sha256
               (base32
                "0qv03c2yq46p9sajc3a3f56ijfifyv6f4n51a81wc2hihy4ilcap"))))
+               ; "1rva61y4lwi6zkja5349r59fxichdhqaqk608kklw5bwk04fjh86"))))
     (build-system gnu-build-system)
     (arguments
 
@@ -314,11 +317,11 @@ association studies (GWAS).")
     (home-page "https://rubygems.org/gems/bio-gemma-wrapper")
     (license license:gpl3)))
 
-(define-public gemma-dev
+(define-public gemma-dev-env
   (let ((md5 "93e745e9c"))
     (package
-    (name "gemma-dev")
-    (version "0.0.1")
+    (name "gemma-dev-env")
+    (version "0.98")
     (source
      (origin
        (method url-fetch)
@@ -332,6 +335,7 @@ association studies (GWAS).")
     (inputs `(("sassc" ,sassc)))
     (propagated-inputs
      `(("gemma-wrapper" ,gemma-wrapper)
+        ;; ("gcc" ,gcc-8)
        ))
     (arguments
      `(#:modules ((guix build utils))
-- 
cgit v1.2.3


From 99718d253ec9ed8ed836f0a348381a7cd83d4b9f Mon Sep 17 00:00:00 2001
From: pjotrp
Date: Sat, 14 Jul 2018 10:43:53 +0000
Subject: Update dependencies for building gemma

---
 gn/packages/gemma.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'gn')

diff --git a/gn/packages/gemma.scm b/gn/packages/gemma.scm
index 973a077..e3a03c6 100644
--- a/gn/packages/gemma.scm
+++ b/gn/packages/gemma.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages file)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages gcc)
+  #:use-module (gnu packages gdb)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages java)
   #:use-module (gnu packages ldc)
@@ -334,8 +335,19 @@ association studies (GWAS).")
                      ("source" ,source)))
     (inputs `(("sassc" ,sassc)))
     (propagated-inputs
-     `(("gemma-wrapper" ,gemma-wrapper)
-        ;; ("gcc" ,gcc-8)
+     `(("binutils" ,binutils) ; for ld
+       ("gemma-gn2" ,gemma-gn2-git)
+       ; ("gemma-wrapper" ,gemma-wrapper)
+       ("gcc" ,gcc-7)
+       ("gdb" ,gdb)
+       ("gfortran:lib" ,gfortran "lib")
+       ("glibc" ,glibc) ; for crt1.o
+       ("gsl" ,gsl)
+       ("eigen" ,eigen)
+       ("linux-libre-headers" ,linux-libre-headers)
+       ("openblas" ,openblas-git)
+       ("shunit2" ,shunit2)
+       ("zlib" ,zlib)
        ))
     (arguments
      `(#:modules ((guix build utils))
-- 
cgit v1.2.3