From bfee81246e891fc7d4b7b19cd0375168f83624ad Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Wed, 23 Mar 2016 17:42:12 -0500
Subject: Fixed hash

---
 gn/packages/bioinformatics.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gn/packages')

diff --git a/gn/packages/bioinformatics.scm b/gn/packages/bioinformatics.scm
index 1aee0ef..f3a1e87 100644
--- a/gn/packages/bioinformatics.scm
+++ b/gn/packages/bioinformatics.scm
@@ -372,7 +372,7 @@ association studies (GWAS).")
              (file-name (string-append name "-" commit)) 
              (sha256
               (base32
-               "09hvy9mf4dnmkb8qg49viffzrxk53m2kr4r955m84dxaa5pdrjhd"))))
+               "1fimy5959q24wdk9jm83574fpywrarwvf9cd162vs6lriirq0cq5"))))
     (propagated-inputs `(
               ("python" ,python-2) ;; probably superfluous
               ("r" ,r) 
-- 
cgit v1.2.3


From 7dbdfa3d6930096d27e12003b9677c537febc74f Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Wed, 23 Mar 2016 18:00:55 -0500
Subject: GN2 fix

---
 gn/packages/bioinformatics.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'gn/packages')

diff --git a/gn/packages/bioinformatics.scm b/gn/packages/bioinformatics.scm
index f3a1e87..aa5432a 100644
--- a/gn/packages/bioinformatics.scm
+++ b/gn/packages/bioinformatics.scm
@@ -359,20 +359,21 @@ association studies (GWAS).")
     (license license:agpl3+))))
 
 (define-public genenetwork2
-  (let ((commit "9e9475053"))
+  (let ((commit "234aa9820eeaa3e4611239de31de1ba526d8bf09"))
   (package
     (name "genenetwork2")
-    (version (string-append "2.0-" commit ))
+    (version (string-append "2.0-" (string-take commit 7) ))
     (source (origin
              (method git-fetch)
              (uri (git-reference
                    ;; (url "https://github.com/genenetwork/genenetwork2.git")
-                   (url "https://github.com/pjotrp/genenetwork2.git")
+                   ;; (url "https://github.com/pjotrp/genenetwork2.git")
+                   (url "https://github.com/genenetwork/genenetwork2_diet.git")
                    (commit commit)))
-             (file-name (string-append name "-" commit)) 
+             (file-name (string-append name "-" (string-take commit 7))) 
              (sha256
               (base32
-               "1fimy5959q24wdk9jm83574fpywrarwvf9cd162vs6lriirq0cq5"))))
+               "10knws2azy53bar615r0b1dk6nr9lrl0x25k7vsc6jm879wcp91b"))))
     (propagated-inputs `(
               ("python" ,python-2) ;; probably superfluous
               ("r" ,r) 
-- 
cgit v1.2.3


From 390831e540aa2f4d00fdb74be5e0bccce02fa7ef Mon Sep 17 00:00:00 2001
From: pjotrp
Date: Wed, 23 Mar 2016 18:16:20 -0500
Subject: GN2 fix

---
 gn/packages/bioinformatics.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gn/packages')

diff --git a/gn/packages/bioinformatics.scm b/gn/packages/bioinformatics.scm
index aa5432a..3629963 100644
--- a/gn/packages/bioinformatics.scm
+++ b/gn/packages/bioinformatics.scm
@@ -404,7 +404,7 @@ association studies (GWAS).")
               ("python2-scipy" ,python2-scipy)
               ("python2-simplejson" ,python2-simplejson)
               ("python2-pyyaml" ,python2-pyyaml)
-              ("python-xlsxwriter" ,python-xlsxwriter)
+              ("python2-xlsxwriter" ,python-xlsxwriter)
               ;; python-yolk is not needed
               ("plink" ,plink) 
               ("qtlreaper" ,qtlreaper) 
-- 
cgit v1.2.3