From c6c1b20167ff1ad312ac461a7d1af38bbc53f52a Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Sun, 6 Aug 2023 15:56:47 +0000 Subject: [PATCH] feat: re-enable cppcoro --- spack-environment/dev/spack.yaml | 2 +- spack-environment/packages.yaml | 2 +- spack.sh | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spack-environment/dev/spack.yaml b/spack-environment/dev/spack.yaml index 56b17cb04..48939823e 100644 --- a/spack-environment/dev/spack.yaml +++ b/spack-environment/dev/spack.yaml @@ -13,7 +13,7 @@ spack: - cli11 - cmake - cnpy - #- cppcoro + - cppcoro - dawn - dawncut - dd4hep diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 54df0145d..aa7a132dd 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -56,7 +56,7 @@ packages: - '@master' cppcoro: require: - - '@git.10bbcdbf2be3ad3aa56febcf4c7662d771460a99' + - '@10bbcdbf2be3ad3aa56febcf4c7662d771460a99' dawn: require: - '@3_91a' diff --git a/spack.sh b/spack.sh index e6765adf7..a0bc78ac5 100644 --- a/spack.sh +++ b/spack.sh @@ -18,6 +18,7 @@ d8a9b42da6cdef3a08ec48931bf282e5e4811d38 ce0b9ea8cf184c9048cac1ae88f2d69f0e4520c7 ea1439dfa11a3996c9927ed792dc9fe4b7efc1b8 5996aaa4e3b8b37f847da356489bb27958b968f1 +31431f967a59c07585021cba40683c2ca6ff2c47 --- ## Ref: https://github.com/spack/spack/commit/[hash] ## [hash]: [description] @@ -31,3 +32,4 @@ ea1439dfa11a3996c9927ed792dc9fe4b7efc1b8 ## ce0b9ea8cf184c9048cac1ae88f2d69f0e4520c7: acts: ensure Python_EXECUTABLE uses ^python when +python ## ea1439dfa11a3996c9927ed792dc9fe4b7efc1b8: acts: new variant cxxstd ## 5996aaa4e3b8b37f847da356489bb27958b968f1: acts: new versions 23.[3-5].0, 24.0.0, 25.0.[0-1], 26.0.0, 27.[0-1].0, 28.0.0 +## 31431f967a59c07585021cba40683c2ca6ff2c47: Environment/depfile: fix bug with Git hash versions -- GitLab