From 9d60b42a9757cbce2fac5b55485afa2628edd6de Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Tue, 16 Apr 2024 11:17:18 -0500 Subject: jwt-cpp: new version 0.7.0, scitokens-cpp: new versions to 1.1.1 (#43657) * jwt-cpp: new version 0.7.0, depends_on nlohmann-json * scitokens-cpp: new versions to 1.1.1 * scitokens-cpp: conflicts ^jwt-cpp@0.7: when @:1.1 --- var/spack/repos/builtin/packages/jwt-cpp/package.py | 2 ++ var/spack/repos/builtin/packages/scitokens-cpp/package.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/var/spack/repos/builtin/packages/jwt-cpp/package.py b/var/spack/repos/builtin/packages/jwt-cpp/package.py index f0a9784824..f489305c65 100644 --- a/var/spack/repos/builtin/packages/jwt-cpp/package.py +++ b/var/spack/repos/builtin/packages/jwt-cpp/package.py @@ -16,6 +16,7 @@ class JwtCpp(CMakePackage): license("MIT") + version("0.7.0", sha256="b9eb270e3ba8221e4b2bc38723c9a1cb4fa6c241a42908b9a334daff31137406") version("0.6.0", sha256="0227bd6e0356b211341075c7997c837f0b388c01379bd256aa525566a5553f03") version("0.5.2", sha256="d3188f9611597eb1bb285169879e1d87202bf10a08e4e7734c9f2097bfd4a850") version("0.5.1", sha256="d8f5ffb361824630b3b6f4aad26c730c915081071040c232ac57947d6177ef4f") @@ -37,6 +38,7 @@ class JwtCpp(CMakePackage): depends_on("openssl@1.0.2:", when="@0.5.0:0.5.99 ssl=openssl") depends_on("openssl@1.0.1:", when="@0.6.0: ssl=openssl") depends_on("libressl@3:", when="@0.5.0: ssl=libressl") + depends_on("nlohmann-json", when="@0.7.0:") def cmake_args(self): spec = self.spec diff --git a/var/spack/repos/builtin/packages/scitokens-cpp/package.py b/var/spack/repos/builtin/packages/scitokens-cpp/package.py index c52e850098..d64b15f442 100644 --- a/var/spack/repos/builtin/packages/scitokens-cpp/package.py +++ b/var/spack/repos/builtin/packages/scitokens-cpp/package.py @@ -17,6 +17,9 @@ class ScitokensCpp(CMakePackage): license("Apache-2.0") + version("1.1.1", sha256="a9091b888fc778282caf2a6808c86f685d2411557673152d58fe53932a6c7212") + version("1.1.0", sha256="9c4afd6638e94855ede52ecfc3d4f05082f2bdf151a9ab8dafcc2bb7cd4d9039") + version("1.0.2", sha256="cdc1e80e0cba9ca0e16de2efa10ec5e38765792bf5107024bfb66ddad5a16a85") version("1.0.1", sha256="d4660521fa17189e7a7858747d066052dd8ea8f430ce7649911c157d4423c412") version("1.0.0", sha256="88376c5cd065aac8d92445184a02ccf5186dc4890ccd7518e88be436978675c0") version("0.7.3", sha256="7d3c438596588cd74cf1af8255c55f44ca86a34293b81415ee24b33de64f886a") @@ -41,7 +44,9 @@ class ScitokensCpp(CMakePackage): depends_on("pkgconfig", type="build") depends_on("uuid", type="build") + # Some jwt-cpp releases introduce breaking API changes conflicts("^jwt-cpp@0.5:", when="@:0.7") + conflicts("^jwt-cpp@0.7:", when="@:1.1") # https://github.com/scitokens/scitokens-cpp/issues/72 @when("@0.7.0 ^openssl@3:") -- cgit v1.2.3-70-g09d2