lzo: fix style

* r-ggplot2: v3.5.1, r-haven: v2.5.4, r-jsonlite: v1.8.8, r-pkgload: v1.3.4, r-vctrs: v0.6.5

* r-scales: v1.3.0

lib/spack/spack/compilers/clang.py

@@ -96,6 +96,8 @@ def verbose_flag(self):
 
     openmp_flag = "-fopenmp"
 
+    # C++ flags based on CMake Modules/Compiler/Clang.cmake
+
     @property
     def cxx11_flag(self):
         if self.real_version < Version("3.3"):
@@ -120,6 +122,24 @@ def cxx17_flag(self):
 
         return "-std=c++17"
 
+    @property
+    def cxx20_flag(self):
+        if self.real_version < Version("5.0"):
+            raise UnsupportedCompilerFlag(self, "the C++20 standard", "cxx20_flag", "< 5.0")
+        elif self.real_version < Version("11.0"):
+            return "-std=c++2a"
+        else:
+            return "-std=c++20"
+
+    @property
+    def cxx23_flag(self):
+        if self.real_version < Version("12.0"):
+            raise UnsupportedCompilerFlag(self, "the C++23 standard", "cxx23_flag", "< 12.0")
+        elif self.real_version < Version("17.0"):
+            return "-std=c++2b"
+        else:
+            return "-std=c++23"
+
     @property
     def c99_flag(self):
         return "-std=c99"
@@ -142,7 +162,10 @@ def c17_flag(self):
     def c23_flag(self):
         if self.real_version < Version("9.0"):
             raise UnsupportedCompilerFlag(self, "the C23 standard", "c23_flag", "< 9.0")
-        return "-std=c2x"
+        elif self.real_version < Version("18.0"):
+            return "-std=c2x"
+        else:
+            return "-std=c23"
 
     @property
     def cc_pic_flag(self):

lib/spack/spack/test/compilers/basics.py

@@ -384,9 +384,18 @@ def test_clang_flags():
     unsupported_flag_test("cxx17_flag", "clang@3.4")
     supported_flag_test("cxx17_flag", "-std=c++1z", "clang@3.5")
     supported_flag_test("cxx17_flag", "-std=c++17", "clang@5.0")
+    unsupported_flag_test("cxx20_flag", "clang@4.0")
+    supported_flag_test("cxx20_flag", "-std=c++2a", "clang@5.0")
+    supported_flag_test("cxx20_flag", "-std=c++20", "clang@11.0")
+    unsupported_flag_test("cxx23_flag", "clang@11.0")
+    supported_flag_test("cxx23_flag", "-std=c++2b", "clang@12.0")
+    supported_flag_test("cxx23_flag", "-std=c++23", "clang@17.0")
     supported_flag_test("c99_flag", "-std=c99", "clang@3.3")
     unsupported_flag_test("c11_flag", "clang@2.0")
     supported_flag_test("c11_flag", "-std=c11", "clang@6.1.0")
+    unsupported_flag_test("c23_flag", "clang@8.0")
+    supported_flag_test("c23_flag", "-std=c2x", "clang@9.0")
+    supported_flag_test("c23_flag", "-std=c23", "clang@18.0")
     supported_flag_test("cc_pic_flag", "-fPIC", "clang@3.3")
     supported_flag_test("cxx_pic_flag", "-fPIC", "clang@3.3")
     supported_flag_test("f77_pic_flag", "-fPIC", "clang@3.3")

share/spack/gitlab/cloud_pipelines/scripts/pcluster/setup-pcluster.sh

@@ -10,6 +10,7 @@ set -e
 # The best solution would be to have the compilers hash (or packages contents) be part of the
 # individual packages hashes. I don't see this at the moment.
 # Set to the latest tag including a recent oneapi compiler.
+# NOTE: If we update this spack version in the future make sure the compiler version also updates.
 spack_intel_compiler_commit="develop-2023-08-06"
 
 set_pcluster_defaults() {
@@ -23,10 +24,9 @@ set_pcluster_defaults() {
 
 setup_spack() {
     spack compiler add --scope site
-    spack external find --scope site
-    # Remove all autotools/buildtools packages. These versions need to be managed by spack or it will
+    # Do not add  autotools/buildtools packages. These versions need to be managed by spack or it will
     # eventually end up in a version mismatch (e.g. when compiling gmp).
-    spack tags build-tools | xargs -I {} spack config --scope site rm packages:{}
+    spack external find --scope site --tag core-packages
 }
 
 patch_compilers_yaml() {
@@ -99,7 +99,7 @@ install_compilers() {
     # The compilers needs to be in the same install tree as the rest of the software such that the path
     # relocation works correctly. This holds the danger that this part will fail when the current spack gets
     # incompatible with the one in $spack_intel_compiler_commit. Therefore, we make intel installations optional
-    # in package.yaml files.
+    # in package.yaml files and add a fallback `%gcc` version for each application.
     if [ "x86_64" == "$(arch)" ]; then
         (
             CURRENT_SPACK_ROOT=${SPACK_ROOT}

share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/packages.yaml

@@ -19,7 +19,10 @@ packages:
   llvm:
     variants: ~lldb
   mpas-model:
-    require: "precision=single make_target=llvm %arm ^parallelio+pnetcdf"
+    require:
+      - one_of:
+          - "precision=single make_target=llvm %arm ^parallelio+pnetcdf"
+          - "precision=single %gcc ^parallelio+pnetcdf"
   mpich:
     require: "mpich pmi=pmi2 device=ch4 netmod=ofi +slurm"
   nvhpc:

share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml

@@ -2,13 +2,23 @@ spack:
   view: false
 
   definitions:
-  - optimized_configs:
-    - gromacs target=neoverse_v1
-    - gromacs target=neoverse_n1
+  - apps:
+    - gromacs
+    # - mpas-model: Spack currently forces REAL(8) when using GCC. This conflicts with `precision=single`
+    # Fix proposed in https://github.com/spack/spack/pull/43547
+    - openfoam
+    # - quantum-espresso : %gcc@12.3.0 on neoverse_v1 fails.
+    # Root cause: internal compiler error: in compute_live_loop_exits, at tree-ssa-loop-manip.cc:247
+    - wrf
+
+  - targets:
+      - 'target=neoverse_v1'
+      - 'target=neoverse_n1'
 
   specs:
-  - $optimized_configs
-
+  - matrix:
+      - [$apps]
+      - [$targets]
   ci:
     pipeline-gen:
     - build-job:

share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/packages.yaml

@@ -5,13 +5,20 @@ packages:
       - one_of:
           - "cflags=-std=c18 target=x86_64_v4"
           - "cflags=-std=c18 target=x86_64_v3"
-          - "%gcc"
+        when: "%intel"
+  gettext:
+    # Newer gettext cannot build with gcc@12 and old AL2 glibc headers
+    # Older gettext versions do not build correctly with oneapi.
+    require:
+      - one_of:
+          - '@:0.20'
+          - '%oneapi'
   gromacs:
     require:
       - one_of:
-          - "+intel_provided_gcc %intel ^intel-oneapi-mkl target=x86_64_v4"
-          - "+intel_provided_gcc %intel ^intel-oneapi-mkl target=x86_64_v3"
-          - "%gcc"
+          - "+intel_provided_gcc ^intel-oneapi-mkl target=x86_64_v4"
+          - "+intel_provided_gcc ^intel-oneapi-mkl target=x86_64_v3"
+        when: "%intel"
   intel-mpi:
     variants: +external-libfabric
   intel-oneapi-compilers:
@@ -21,15 +28,15 @@ packages:
   lammps:
     require:
       - one_of:
-          - "lammps_sizes=bigbig +molecule +kspace +rigid +asphere +opt +openmp +openmp-package +intel %intel ^intel-oneapi-mkl target=x86_64_v4"
-          - "lammps_sizes=bigbig +molecule +kspace +rigid +asphere +opt +openmp +openmp-package %intel ^intel-oneapi-mkl target=x86_64_v3"
-          - "%gcc"
+          - "lammps_sizes=bigbig +molecule +kspace +rigid +asphere +opt +openmp +openmp-package +intel ^intel-oneapi-mkl target=x86_64_v4"
+          - "lammps_sizes=bigbig +molecule +kspace +rigid +asphere +opt +openmp +openmp-package ^intel-oneapi-mkl target=x86_64_v3"
+        when: "%intel"
   libidn2:
     require:
       - one_of:
           - "cflags=-std=c18 target=x86_64_v4"
           - "cflags=-std=c18 target=x86_64_v3"
-          - '%gcc'
+        when: "%intel"
   libfabric:
     buildable: true
     externals:
@@ -41,13 +48,13 @@ packages:
       - one_of:
           - "cflags=-std=c18 target=x86_64_v4"
           - "cflags=-std=c18 target=x86_64_v3"
-          - "%gcc"
+        when: "%intel"
   mpas-model:
     require:
       - one_of:
-          - "precision=single %intel ^parallelio+pnetcdf target=x86_64_v4"
-          - "precision=single %intel ^parallelio+pnetcdf target=x86_64_v3"
-          - "%gcc"
+          - "precision=single ^parallelio+pnetcdf target=x86_64_v4"
+          - "precision=single ^parallelio+pnetcdf target=x86_64_v3"
+        when: "%intel"
   mpich:
     require:
       - one_of:
@@ -67,9 +74,12 @@ packages:
   palace:
     require:
       - one_of:
-          - "palace %oneapi ^fmt@9.1.0 target=x86_64_v4"
-          - "palace %oneapi ^fmt@9.1.0 target=x86_64_v3"
-          - "%gcc ^fmt@9.1.0"
+          - "palace ^fmt@9.1.0 target=x86_64_v4"
+          - "palace ^fmt@9.1.0 target=x86_64_v3"
+        when: "%oneapi"
+      - one_of:
+          - "palace ^fmt@9.1.0"
+        when: "%gcc"
   pmix:
     require:
       - one_of:
@@ -78,9 +88,9 @@ packages:
   quantum-espresso:
     require:
       - one_of:
-          - "quantum-espresso@6.6 %intel ^intel-oneapi-mkl+cluster target=x86_64_v4"
-          - "quantum-espresso@6.6 %intel ^intel-oneapi-mkl+cluster target=x86_64_v3"
-          - "%gcc"
+          - "quantum-espresso@6.6 ^intel-oneapi-mkl+cluster target=x86_64_v4"
+          - "quantum-espresso@6.6 ^intel-oneapi-mkl+cluster target=x86_64_v3"
+        when: "%intel"
   slurm:
     buildable: false
     externals:
@@ -89,12 +99,13 @@ packages:
   wrf:
     require:
       - one_of:
-          - "wrf@4 build_type=dm+sm %intel target=x86_64_v4"
-          - "wrf@4 build_type=dm+sm %intel target=x86_64_v3"
-          - "wrf@4.2.2 +netcdf_classic fflags=\"-fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common\" build_type=dm+sm %intel  target=x86_64_v3"
-          - "%gcc"
+          - "wrf@4 build_type=dm+sm target=x86_64_v4"
+          - "wrf@4 build_type=dm+sm target=x86_64_v3"
+          - "wrf@4.2.2 +netcdf_classic fflags=\"-fp-model fast=2 -no-heap-arrays -no-prec-div -no-prec-sqrt -fno-common\" build_type=dm+sm target=x86_64_v3"
+        when: "%intel"
+
   all:
-    compiler: [intel, gcc]
+    compiler: [intel, oneapi, gcc]
     permissions:
       read: world
       write: user

share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-x86_64_v4/spack.yaml

@@ -2,14 +2,24 @@ spack:
   view: false
 
   definitions:
+  - apps:
+    - gromacs %intel
+    - lammps %intel
+    - mpas-model %intel
+    - openfoam %gcc
+    - palace %oneapi
+    - quantum-espresso %intel
+    # - wrf : While building hdf5 cmake errors out with Detecting Fortran/C Interface: Failed to compile
+    # Root cause: ifort cannot deal with arbitrarily long file names.
 
-  - optimized_configs:
-    - palace target=x86_64_v4
-    - palace target=x86_64_v3
+  - targets:
+      - 'target=x86_64_v4'
+      - 'target=x86_64_v3'
 
   specs:
-  - $optimized_configs
-
+  - matrix:
+      - [$apps]
+      - [$targets]
   ci:
     pipeline-gen:
     - build-job:
@@ -28,5 +38,6 @@ spack:
           # Do not distribute Intel & ARM binaries
           - - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep intel-oneapi | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done
             - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep armpl | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done
+
   cdash:
     build-group: AWS Packages

var/spack/repos/builtin/packages/fastjet/package.py

@@ -72,6 +72,14 @@ class Fastjet(AutotoolsPackage):
     )
     variant("atlas", default=False, description="Patch to make random generator thread_local")
 
+    variant(
+        "cxxstd",
+        default="11",
+        values=("11", "17", "20", "23"),
+        multi=False,
+        description="Use the specified C++ standard when building",
+    )
+
     available_plugins = (
         conditional("atlascone", when="@2.4.0:"),
         conditional("cdfcones", when="@2.1.0:"),
@@ -126,3 +134,8 @@ def configure_args(self):
             extra_args += ["--enable-thread-safety"]
 
         return extra_args
+
+    def flag_handler(self, name, flags):
+        if name == "cxxflags":
+            flags.append(f"-std=c++{self.spec.variants['cxxstd'].value}")
+        return (None, flags, None)

var/spack/repos/builtin/packages/llvm/package.py

@@ -36,6 +36,8 @@ class Llvm(CMakePackage, CudaPackage, CompilerPackage):
     license("Apache-2.0")
 
     version("main", branch="main")
+    version("18.1.5", sha256="d543309f55ae3f9b422108302b45c40f5696c96862f4bda8f5526955daa54284")
+    version("18.1.4", sha256="deca5a29e8b1d103ecc4badb3c304aca50d5cac6453364d88ee415dc55699dfb")
     version("18.1.3", sha256="fc5a2fd176d73ceb17f4e522f8fe96d8dde23300b8c233476d3609f55d995a7a")
     version("18.1.2", sha256="8d686d5ece6f12b09985cb382a3a530dc06bb6e7eb907f57c7f8bf2d868ebb0b")
     version("18.1.1", sha256="62439f733311869dbbaf704ce2e02141d2a07092d952fc87ef52d1d636a9b1e4")

var/spack/repos/builtin/packages/lzo/package.py

@@ -33,3 +33,10 @@ def configure_args(self):
         args = ["--disable-dependency-tracking"]
         args += self.enable_or_disable("libs")
         return args
+
+    @run_after("install")
+    def postinstall(self):
+        # ensure e.g. #include <lzo/lzo1x.h> works with Cflags: -I${includedir}/lzo in pkgconf
+        # by creating symlink ${includedir}/lzo/lzo -> ${includedir}/lzo
+        with working_dir(self.prefix.include.lzo):
+            symlink(".", "lzo")

var/spack/repos/builtin/packages/octave/package.py

@@ -72,6 +72,7 @@ class Octave(AutotoolsPackage, GNUMirrorPackage):
     variant("jdk", default=False, description="Use Java")
     variant("llvm", default=False, description="Use LLVM")
     variant("opengl", default=False, description="Use OpenGL")
+    variant("pcre2", default=True, when="@8:", description="Use PCRE2 instead of PCRE")
     variant("qhull", default=False, description="Use qhull")
     variant("qrupdate", default=False, description="Use qrupdate")
     variant("qscintilla", default=False, description="Use QScintill")
@@ -84,7 +85,9 @@ class Octave(AutotoolsPackage, GNUMirrorPackage):
     depends_on("lapack")
     # Octave does not configure with sed from darwin:
     depends_on("sed", when=sys.platform == "darwin", type="build")
-    depends_on("pcre")
+    depends_on("pcre", when="@:7")
+    depends_on("pcre", when="~pcre2")
+    depends_on("pcre2", when="+pcre2")
     depends_on("pkgconfig", type="build")
     depends_on("texinfo", type="build")
 
@@ -350,6 +353,8 @@ def configure_args(self):
         else:
             config_args.append("--without-z")
 
+        if spec.satisfies("~pcre2"):
+            config_args.append("--without-pcre2")
         # If 64-bit BLAS is used:
         if (
             spec.satisfies("^openblas+ilp64")

var/spack/repos/builtin/packages/r-ggplot2/package.py

@@ -18,6 +18,10 @@ class RGgplot2(RPackage):
 
     license("MIT")
 
+    version("3.5.1", sha256="7c58b424f99b3634038e6f6d1fe4b0241b8aecb50e9c50466d5590f7e3144721")
+    version("3.5.0", sha256="07fa1cd4e02d409ade32e69a9088d9209f864c6ddd70fa2f904769dec21090e2")
+    version("3.4.4", sha256="2d76ec065d3e604d019506f45b3b713ae20f38e47dbebfb5ba1648b47fe63e46")
+    version("3.4.3", sha256="5ce29ace6be7727be434506a1c759dfc322f65b17eabeec863b93be10f91a543")
     version("3.4.2", sha256="70230aa70a2c6f844fc41dd93e5f62af6859dfed390026ae58f223637e5283ca")
     version("3.4.0", sha256="a82f9e52f974389439765f71a8206ec26e3be30a8864d2c784d5ea8abcb0473e")
     version("3.3.6", sha256="bfcb4eb92a0fcd3fab713aca4bb25e916e05914f2540271a45522ad7e43943a9")
@@ -44,7 +48,8 @@ class RGgplot2(RPackage):
     depends_on("r-rlang@1.0.0:", type=("build", "run"), when="@3.4.0:")
     depends_on("r-rlang@1.1.0:", type=("build", "run"), when="@3.4.2:")
     depends_on("r-scales@0.5.0:", type=("build", "run"))
-    depends_on("r-scales@1.2.0:", type=("build", "run"), when="@3.4.0:")
+    depends_on("r-scales@1.2.0:", type=("build", "run"), when="@3.4.0:3.4.4")
+    depends_on("r-scales@1.3.0:", type=("build", "run"), when="@3.5.0:")
     depends_on("r-tibble", type=("build", "run"))
     depends_on("r-vctrs@0.5.0:", type=("build", "run"), when="@3.4.0:")
     depends_on("r-withr@2.0.0:", type=("build", "run"), when="@3.0.0:")

var/spack/repos/builtin/packages/r-haven/package.py

@@ -16,6 +16,8 @@ class RHaven(RPackage):
 
     license("MIT")
 
+    version("2.5.4", sha256="9e1531bb37aa474abd91db5e0ed9e3a355c03faa65f4e653b3ea68b7c61ea835")
+    version("2.5.3", sha256="9a5999afad09f0cf80515241b2ff19a0c480658c4bd3810638ad52762e04b7e3")
     version("2.5.2", sha256="2131fb0377ae1beffae54bf4beb8b3a876e9b6b9841a5acc39a2a2615023561d")
     version("2.5.1", sha256="9f40462097a0b1cf3831bca493851fe4a6b3570d957a775ca81940f241c50a70")
     version("2.5.0", sha256="b580311bc1b28efc6b123e29a331282b9f7eb552c485f4e5cacab39fe534aff4")

var/spack/repos/builtin/packages/r-jsonlite/package.py

@@ -24,6 +24,9 @@ class RJsonlite(RPackage):
 
     license("MIT")
 
+    version("1.8.8", sha256="7de21316984c3ba3d7423d12f43d1c30c716007c5e39bf07e11885e0ceb0caa4")
+    version("1.8.7", sha256="7d42b7784b72d728698ea02b97818df51e2015ffa39fec2eaa2400771b0f601c")
+    version("1.8.5", sha256="dc3cca4bdca1b6d6836c412760ea9656140683126c54cb89c3e42219dec4a3ad")
     version("1.8.4", sha256="79eaabe042226b0918aa828cc63d54fee8be67ae7c67f5e0d3010f468efb1278")
     version("1.8.3", sha256="c57f1daf681fc7d5db893693a65ac61a48ddd7aabf66b28647b0e30df92ac8f0")
     version("1.8.2", sha256="677b645c081a7e004b71f0c48a1d46c1be9715163ccb6b419fbb0342a6c9cc3a")

var/spack/repos/builtin/packages/r-pkgload/package.py

@@ -17,6 +17,9 @@ class RPkgload(RPackage):
 
     license("GPL-3.0-only")
 
+    version("1.3.4", sha256="60b04b948cda4dc56257b1e89f9b0a4b1273cacecdb2bd995d66dd76e89926ce")
+    version("1.3.3", sha256="b0898122876479cc4a35cd566654b3a7b50f8ac105565dbf3f8b9d4283816959")
+    version("1.3.2.1", sha256="a1987b123fcbdb9d908b6dc55a04d3cf47d68cfa5090186e4876a429313374b2")
     version("1.3.2", sha256="35d19a032bfeeefcab92d76a768b4a420c2ede0920badaf48cca878592b46b2f")
     version("1.3.1", sha256="c6b8b70d7b7e194e7d44a42364f0362e971d9ab9c5794c4ae5ed4f9e61b1679a")
     version("1.3.0", sha256="5af653c901662260cc221971cc968355428cc6183b61c15be80aa9545f9f4228")
@@ -33,10 +36,12 @@ class RPkgload(RPackage):
     depends_on("r-glue", type=("build", "run"), when="@1.3.0:")
     depends_on("r-fs", type=("build", "run"), when="@1.3.0:")
     depends_on("r-rlang", type=("build", "run"))
-    depends_on("r-rlang@1.0.3:", type=("build", "run"), when="@1.3.0:")
+    depends_on("r-rlang@1.0.3:", type=("build", "run"), when="@1.3.0:1.3.3")
+    depends_on("r-rlang@1.1.1:", type=("build", "run"), when="@1.3.4:")
     depends_on("r-rprojroot", type=("build", "run"))
     depends_on("r-withr", type=("build", "run"))
     depends_on("r-withr@2.4.3:", type=("build", "run"), when="@1.3.0:")
 
     depends_on("r-pkgbuild", type=("build", "run"), when="@:1.1.0")
+    depends_on("r-pkgbuild", type=("build", "run"), when="@1.3.4:")
     depends_on("r-rstudioapi", type=("build", "run"), when="@:1.2.4")

var/spack/repos/builtin/packages/r-scales/package.py

@@ -16,6 +16,7 @@ class RScales(RPackage):
 
     license("MIT")
 
+    version("1.3.0", sha256="b33e0f6b44259551ce02befd52eac53602509fbfdd903920620c658c50f35888")
     version("1.2.1", sha256="59453e6dbdafee93dfb101e4d86048a62a12898134259d3ef02d65aeec57ed08")
     version("1.2.0", sha256="185d50240e6b3e84d36ec7fbca6aef7a85db7c8c1b0dde51d4af28d363ce02df")
     version("1.1.1", sha256="40b2b66522f1f314a20fd09426011b0cdc9d16b23ee2e765fe1930292dd03705")

var/spack/repos/builtin/packages/r-vctrs/package.py

@@ -18,7 +18,14 @@ class RVctrs(RPackage):
 
     license("MIT")
 
+    version("0.6.5", sha256="43167d2248fd699594044b5c8f1dbb7ed163f2d64761e08ba805b04e7ec8e402")
+    version("0.6.4", sha256="8a80192356e724d21bd89a0ce3e5835856fd5bb1651e7fc205c6fee58fd001c8")
+    version("0.6.3", sha256="93dc220dcde8b440586b2260460ef354e827a17dfec1ea6a9815585a10cfa5c2")
     version("0.6.2", sha256="feecabe11f6c55e04377d36fa59842187f0a6fe52aaf867c08289a948781ee84")
+    version("0.6.1", sha256="77552463bd7c40af2618d635de6bb9ad1614d161a5e34d90167601dc5e8e1283")
+    version("0.6.0", sha256="be0b712c4e6aae353120a60ded6a4301eb9631c8d256927b79b9ad83b4299757")
+    version("0.5.2", sha256="76bf10243b9b31e23f56ffdaa1677a01767699e2098487f86bd42cb801d8c047")
+    version("0.5.1", sha256="497982f717f21e7612b84940e95c282e2a96b942e6d47108f92cd92b7341db07")
     version("0.5.0", sha256="7c372e13c39ddace9c9bb9f33238de6dd2cd0f37dcc7054ba6435d271e5df686")
     version("0.4.2", sha256="5414d1d6977163b4e85efa40d6facdd98089d6ffd460daaba729d4200942d815")
     version("0.4.1", sha256="9676881e009aa1217818f326338e8b35dd9a9438918f8b1ac249f4c8afe460dd")

var/spack/repos/builtin/packages/whizard/package.py

@@ -27,6 +27,7 @@ class Whizard(AutotoolsPackage):
     license("GPL-2.0-or-later")
 
     version("master", branch="master")
+    version("3.1.4", sha256="9da9805251d786adaf4ad5a112f9c4ee61d515778af0d2623d6460c3f1f900cd")
     version("3.1.2", sha256="4f706f8ef02a580ae4dba867828691dfe0b3f9f9b8982b617af72eb8cd4c6fa3")
     version("3.1.1", sha256="dd48e4e39b8a4990be47775ec6171f89d8147cb2e9e293afc7051a7dbc5a23ef")
     version("3.1.0", sha256="9dc5e6d1a25d2fc708625f85010cb81b63559ff02cceb9b35024cf9f426c0ad9")
@@ -66,6 +67,7 @@ class Whizard(AutotoolsPackage):
     depends_on("hepmc3", when="hepmc=3")
     depends_on("lcio", when="+lcio")
     depends_on("pythia8", when="+pythia8")
+    depends_on("pythia8@:8.309", when="@:3.1.3+pythia8")
     depends_on("lhapdf", when="+lhapdf")
     depends_on("fastjet", when="+fastjet")
     depends_on(
@@ -78,7 +80,7 @@ class Whizard(AutotoolsPackage):
     # Fix for https://github.com/key4hep/key4hep-spack/issues/71
     # NOTE: This will become obsolete in a future release of whizard, so once
     # that happens, this needs to be adapted with a when clause
-    patch("parallel_build_fix.patch", when="@3:")
+    patch("parallel_build_fix.patch", when="@3:3.1.3")
     patch("parallel_build_fix_2.8.patch", when="@2.8")
     # Make sure that the patch actually has an effect by running autoreconf
     force_autoreconf = True