diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/htslib/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/star/package.py | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/htslib/package.py b/var/spack/repos/builtin/packages/htslib/package.py index 3da320625b..3b4b9fcf2d 100644 --- a/var/spack/repos/builtin/packages/htslib/package.py +++ b/var/spack/repos/builtin/packages/htslib/package.py @@ -16,6 +16,7 @@ class Htslib(AutotoolsPackage): license("MIT AND BSD-3-Clause-Modification") + version("1.20", sha256="e52d95b14da68e0cfd7d27faf56fef2f88c2eaf32a2be51c72e146e3aa928544") version("1.19.1", sha256="222d74d3574fb67b158c6988c980eeaaba8a0656f5e4ffb76b5fa57f035933ec") version("1.19", sha256="8751c40c4fa7d1f23a6864c5b20a73744f8be68239535ae7729c5f7d394d0736") version("1.18", sha256="f1ab53a593a2320a1bfadf4ef915dae784006c5b5c922c8a8174d7530a9af18f") @@ -60,6 +61,8 @@ class Htslib(AutotoolsPackage): depends_on("automake", when="@1.2") depends_on("libtool", when="@1.2") + conflicts("zlib-ng", when="@:1.12") # https://github.com/samtools/htslib/issues/1257 + @property def libs(self): return find_libraries("libhts", root=self.prefix, recursive=True) diff --git a/var/spack/repos/builtin/packages/star/package.py b/var/spack/repos/builtin/packages/star/package.py index c0781d3b21..6fe52cecb6 100644 --- a/var/spack/repos/builtin/packages/star/package.py +++ b/var/spack/repos/builtin/packages/star/package.py @@ -41,6 +41,8 @@ class Star(MakefilePackage): # required for certain steps in the makefile depends_on("xxd", type="build") + conflicts("zlib-ng") # https://github.com/alexdobin/STAR/issues/2063 + build_directory = "source" def edit(self, spec, prefix): |