diff options
| author | kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> | 2022-12-07 12:27:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-07 10:27:47 -0800 |
| commit | 8ba0faa9ee81a81a044bb03745742fd1b93e8f65 (patch) | |
| tree | a19e566ac66a4d1c2795b16cc87ea76a539d108e | |
| parent | d464185bba7fc6fb4f81f0687da4889451346cef (diff) | |
| download | spack-8ba0faa9ee81a81a044bb03745742fd1b93e8f65.tar.gz spack-8ba0faa9ee81a81a044bb03745742fd1b93e8f65.tar.bz2 spack-8ba0faa9ee81a81a044bb03745742fd1b93e8f65.tar.xz spack-8ba0faa9ee81a81a044bb03745742fd1b93e8f65.zip | |
Paraview catalyst updates (#34364)
* LibCatalyst: Fix version of pre-release develop version
* ParaView: Requires libcatalyst@2:
* ParaView: Apply adios2 module no kit patch to 5.11
This patch is still pending in VTK and didn't make it into 5.11 as anticipated.
| -rw-r--r-- | var/spack/repos/builtin/packages/libcatalyst/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/paraview/package.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/libcatalyst/package.py b/var/spack/repos/builtin/packages/libcatalyst/package.py index a166fd3445..7975deecaa 100644 --- a/var/spack/repos/builtin/packages/libcatalyst/package.py +++ b/var/spack/repos/builtin/packages/libcatalyst/package.py @@ -19,7 +19,7 @@ class Libcatalyst(CMakePackage): version("2.0.0-rc3", sha256="8862bd0a4d0be2176b4272f9affda1ea4e5092087acbb99a2fe2621c33834e05") # master as of 2021-05-12 - version("2021-05-12", commit="8456ccd6015142b5a7705f79471361d4f5644fa7") + version("0.20210512", commit="8456ccd6015142b5a7705f79471361d4f5644fa7") variant("mpi", default=False, description="Enable MPI support") diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index dfcd08959f..fb8f86a7e2 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -196,7 +196,7 @@ class Paraview(CMakePackage, CudaPackage): depends_on("lz4") depends_on("xz") depends_on("zlib") - depends_on("libcatalyst", when="+libcatalyst") + depends_on("libcatalyst@2:", when="+libcatalyst") # Older builds of pugi export their symbols differently, # and pre-5.9 is unable to handle that. @@ -237,7 +237,7 @@ class Paraview(CMakePackage, CudaPackage): # Fix IOADIOS2 module to work with kits # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/8653 - patch("vtk-adios2-module-no-kit.patch", when="@5.8:5.10") + patch("vtk-adios2-module-no-kit.patch", when="@5.8:") # Patch for paraview 5.9.0%xl_r # https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7591 |