From 881571c4bab18349294637f6523e1fa3efce0bbe Mon Sep 17 00:00:00 2001 From: snehring <7978778+snehring@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:06:08 -0500 Subject: canu: new version 2.2 (#32999) --- var/spack/repos/builtin/packages/canu/package.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/var/spack/repos/builtin/packages/canu/package.py b/var/spack/repos/builtin/packages/canu/package.py index 32f9a37971..00f5e18f93 100644 --- a/var/spack/repos/builtin/packages/canu/package.py +++ b/var/spack/repos/builtin/packages/canu/package.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack.package import * -from spack.pkg.builtin.boost import Boost class Canu(MakefilePackage): @@ -14,22 +13,24 @@ class Canu(MakefilePackage): homepage = "https://canu.readthedocs.io/" url = "https://github.com/marbl/canu/archive/v1.5.tar.gz" + version( + "2.2", + sha256="e4d0c7b82149114f442ccd39e18f7fe2061c63b28d53700ad896e022b73b7404", + url="https://github.com/marbl/canu/releases/download/v2.2/canu-2.2.tar.xz", + ) version("2.0", sha256="e2e6e8b5ec4dd4cfba5e372f4a64b2c01fbd544d4b5867746021f10771a6f4ef") version("1.8", sha256="30ecfe574166f54f79606038830f68927cf0efab33bdc3c6e43fd1448fa0b2e4") version("1.7.1", sha256="c314659c929ee05fd413274f391463a93f19b8337eabb7ee5de1ecfc061caafa") version("1.7", sha256="c5be54b0ad20729093413e7e722a19637d32e966dc8ecd2b579ba3e4958d378a") version("1.5", sha256="06e2c6d7b9f6d325b3b468e9c1a5de65e4689aed41154f2cee5ccd2cef0d5cf6") + depends_on("git@2.12:", type="build", when="@2.2:") depends_on("gnuplot", type="run") depends_on("java", type="run") depends_on("perl", type="run") - # build fail when using boost@1.71.0:1.73.0 by canu@1.8:2.0 - depends_on("boost@:1.70.0") - - # TODO: replace this with an explicit list of components of Boost, - # for instance depends_on('boost +filesystem') - # See https://github.com/spack/spack/pull/22303 for reference - depends_on(Boost.with_default_variants) + # version guessed from include date of vendored boost + depends_on("boost@1.60.0:+graph") + conflicts("boost@1.70.1:", when="@:2.0") build_directory = "src" build_targets = ["clean"] -- cgit v1.2.3-60-g2f50