diff options
| author | pjotrp | 2021-08-07 10:50:33 +0200 |
|---|---|---|
| committer | pjotrp | 2021-08-07 10:50:33 +0200 |
| commit | cdf65fa27f7be6d0a2da5f72da023e6342b86244 (patch) | |
| tree | 71e2e3cb8b4fed1dff74dee98fe6fe1aba75096d | |
| parent | 8fd543b68726a5fd68a7cf49c78d4abc3df60f97 (diff) | |
| download | guix-bioinformatics-cdf65fa27f7be6d0a2da5f72da023e6342b86244.tar.gz | |
shunit2: rename to shunit2-old, so as not to conflict with upstream
| -rw-r--r-- | gn/packages/gemma.scm | 10 | ||||
| -rw-r--r-- | gn/packages/sambamba.scm | 2 | ||||
| -rw-r--r-- | gn/packages/shell.scm | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/gn/packages/gemma.scm b/gn/packages/gemma.scm index 494fc54..5b4819b 100644 --- a/gn/packages/gemma.scm +++ b/gn/packages/gemma.scm @@ -120,7 +120,7 @@ "0wydfm2svrlrz4zbrvxymqc33ici3vi7xy9br37mfbb9lh3fmb2w")))) (inputs `( ("gsl" ,gsl) - ("shunit2" ,shunit2) + ("shunit2-old" ,shunit2-old) ("openblas" ,openblas) ("zlib" ,zlib) )) @@ -158,7 +158,7 @@ genome-wide association studies (GWAS).") (name "gemma-gn2-git") (inputs `( ("gsl" ,gsl) - ("shunit2" ,shunit2) + ("shunit2-old" ,shunit2-old) ("openblas" ,openblas-git) ("zlib" ,zlib) )) @@ -196,7 +196,7 @@ genome-wide association studies (GWAS).") ; guix environment -C guix --ad-hoc gcc-toolchain gdb gsl openblas zlib bash ld-wrapper perl vim which (inputs `( ("gsl" ,gsl) - ("shunit2" ,shunit2) + ("shunit2-old" ,shunit2-old) ("openblas" ,openblas) ("zlib" ,zlib) )) @@ -299,7 +299,7 @@ genome-wide association studies (GWAS).") ("eigen" ,eigen) ("linux-libre-headers" ,linux-libre-headers) ("openblas" ,openblas-git) - ("shunit2" ,shunit2) + ("shunit2-old" ,shunit2-old) ("zlib" ,zlib) )) (arguments @@ -347,7 +347,7 @@ genome-wide association studies (GWAS).") ("gfortran:lib" ,gfortran "lib") ; ("make" ,make) ("ldc" ,ldc) - ("shunit2" ,shunit2) + ("shunit2-old" ,shunit2-old) ("linux-libre-headers" ,linux-libre-headers) ("openblas" ,openblas-git) )) diff --git a/gn/packages/sambamba.scm b/gn/packages/sambamba.scm index 31ec54f..dd8fbfa 100644 --- a/gn/packages/sambamba.scm +++ b/gn/packages/sambamba.scm @@ -89,7 +89,7 @@ data. It also provides the @command{bgzip}, @command{htsfile}, and )) (native-inputs `(("ldc" ,ldc) - ("shunit2" ,shunit2) + ("shunit2-old" ,shunit2-old) ("coreutils" ,coreutils) ; for env ("perl" ,perl) ; Needed for building htslib ("ruby" ,ruby) ; Needed for building htslib diff --git a/gn/packages/shell.scm b/gn/packages/shell.scm index eb9178f..bef3ad4 100644 --- a/gn/packages/shell.scm +++ b/gn/packages/shell.scm @@ -8,10 +8,10 @@ #:use-module ((guix licenses) #:prefix license:) ) -(define-public shunit2 +(define-public shunit2-old ;; maintain old version for gemma and sambamba, for now (let ((commit "60dd60bcd1573befe38465010263ab242e55811d")) (package - (name "shunit2") + (name "shunit2-old") (version (string-append "2.0.4-" (string-take commit 7))) (source (origin (method git-fetch) |