Browse Source

shunit2: rename to shunit2-old, so as not to conflict with upstream

wip-tensorflow
pjotrp 11 months ago
parent
commit
cdf65fa27f
  1. 10
      gn/packages/gemma.scm
  2. 2
      gn/packages/sambamba.scm
  3. 4
      gn/packages/shell.scm

10
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)
))

2
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

4
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)

Loading…
Cancel
Save