From 57a9fb7610452f50e561d31692386307a786b4ba Mon Sep 17 00:00:00 2001 From: Stephen Herbein Date: Fri, 9 Jul 2021 01:55:06 -0700 Subject: flux: add latest tagged releases (#24687) flux-core v0.21 requires jansson 2.10+ For more details, see: https://github.com/flux-framework/flux-core/commit/a6086e021ee9bf869663bc475d4311dc540486fe --- var/spack/repos/builtin/packages/flux-core/package.py | 2 ++ var/spack/repos/builtin/packages/flux-sched/package.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py index 2593b184ac..71357bdabd 100644 --- a/var/spack/repos/builtin/packages/flux-core/package.py +++ b/var/spack/repos/builtin/packages/flux-core/package.py @@ -17,6 +17,7 @@ class FluxCore(AutotoolsPackage): maintainers = ['SteVwonder'] version('master', branch='master') + version('0.28.0', sha256='9a784def7186b0036091bd8d6d8fe5bc3425ab2927e1465e1c9ad266631c285d') version('0.27.0', sha256='abd46d38081ba6b501adb1c111374b39d6ae72ac1aec9fbbf31943a856541d3a') version('0.26.0', sha256='58bfd4742c59364b13cd83214e8f70735952d01793800b149cae056fddfeeff1') version('0.25.0', sha256='3c97e21eaec51e8aa0eaee6aa8eb23246650d102a6b6a5c9943cd69e3c8e1008') @@ -56,6 +57,7 @@ class FluxCore(AutotoolsPackage): depends_on("py-pyyaml") depends_on("py-jsonschema") depends_on("jansson") + depends_on("jansson@2.10:", when="@0.21.0:") depends_on("pkgconfig") depends_on("yaml-cpp") depends_on("lz4") diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py index 9fa525cf6e..6378cb044f 100644 --- a/var/spack/repos/builtin/packages/flux-sched/package.py +++ b/var/spack/repos/builtin/packages/flux-sched/package.py @@ -17,6 +17,7 @@ class FluxSched(AutotoolsPackage): maintainers = ['SteVwonder'] version('master', branch='master') + version('0.17.0', sha256='5acfcb757e2294a92eaa91be58ba9b42736b88b42d2937de4a78f4642b1c4933') version('0.16.0', sha256='08313976161c141b9b34e2d44d5a08d1b11302e22d60aeaf878eef84d4bd2884') version('0.15.0', sha256='ff24d26997f91af415f98734b8117291f5a5001e86dac865b56b3d72980c80c8') version('0.14.0', sha256='2808f42032b917823d69cd26103c9238694416e2f30c6d39c11c670927ed232a') @@ -46,6 +47,7 @@ class FluxSched(AutotoolsPackage): depends_on("flux-core@0.22.0", when='@0.14.0', type=('build', 'run', 'link')) depends_on("flux-core@0.23.0:0.25.99", when='@0.15.0', type=('build', 'run', 'link')) depends_on("flux-core@0.26.0:", when='@0.16.0', type=('build', 'run', 'link')) + depends_on("flux-core@0.28.0:", when='@0.17.0', type=('build', 'run', 'link')) depends_on("flux-core@master", when='@master', type=('build', 'run', 'link')) # Need autotools when building on master: -- cgit v1.2.3-60-g2f50