diff options
| author | Garth N. Wells <gnw20@cam.ac.uk> | 2021-10-04 08:20:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-04 09:20:53 +0200 |
| commit | baa50c66797550547ea449434430df1d33547f3b (patch) | |
| tree | b84f95c8c45c6bcc0359c7d75b6f6459ec07cfde | |
| parent | 44d7218038d54248882e86b56246dfe4aab115e1 (diff) | |
| download | spack-baa50c66797550547ea449434430df1d33547f3b.tar.gz spack-baa50c66797550547ea449434430df1d33547f3b.tar.bz2 spack-baa50c66797550547ea449434430df1d33547f3b.tar.xz spack-baa50c66797550547ea449434430df1d33547f3b.zip | |
FEniCSx: fix CMake root directory and dependency versions (#26445)
3 files changed, 7 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/fenics-basix/package.py b/var/spack/repos/builtin/packages/fenics-basix/package.py index deaa45dd7b..11fdbac31a 100644 --- a/var/spack/repos/builtin/packages/fenics-basix/package.py +++ b/var/spack/repos/builtin/packages/fenics-basix/package.py @@ -22,10 +22,11 @@ class FenicsBasix(CMakePackage): depends_on("cmake@3.18:", type="build") depends_on("xtl@0.7.2:") depends_on("xtensor@0.23.10:") - depends_on("blas", type=("build", "run")) + depends_on("blas") + depends_on("lapack") @property - def root_cmake_lists_dir(self): + def root_cmakelists_dir(self): if self.spec.satisfies("@main"): return "cpp" - return None + return self.stage.source_path diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py index 1266b7e166..21e9cd9c16 100644 --- a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py @@ -12,7 +12,7 @@ class FenicsDolfinx(CMakePackage): homepage = "https://github.com/FEniCS/dolfinx" git = "https://github.com/FEniCS/dolfinx.git" url = "https://github.com/FEniCS/dolfinx/archive/v0.1.0.tar.gz" - maintainers = ["js947", "chrisrichardson", "garth-wells"] + maintainers = ["chrisrichardson", "garth-wells", "nate-sime"] version("main", branch="main") version("0.3.0", sha256="4857d0fcb44a4e9bf9eb298ba5377abdee17a7ad0327448bdd06cce73d109bed") diff --git a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py index 15fd924f19..a57a1ae2d7 100644 --- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py @@ -13,7 +13,7 @@ class PyFenicsDolfinx(PythonPackage): homepage = "https://github.com/FEniCS/dolfinx" url = "https://github.com/FEniCS/dolfinx/archive/v0.1.0.tar.gz" git = "https://github.com/FEniCS/dolfinx.git" - maintainers = ["js947", "chrisrichardson", "garth-wells"] + maintainers = ["chrisrichardson", "garth-wells", "nate-sime"] version("main", branch="main") version("0.3.0", sha256="4857d0fcb44a4e9bf9eb298ba5377abdee17a7ad0327448bdd06cce73d109bed") @@ -44,7 +44,7 @@ class PyFenicsDolfinx(PythonPackage): depends_on("py-fenics-ffcx@0.2.0", type="run", when="@0.2.0") depends_on("py-fenics-ffcx@0.1.0", type="run", when="@0.1.0") depends_on("py-fenics-ufl@main", type="run", when="@main") - depends_on("py-fenics-ufl@2021.1.0", type="run", when="@0.1:") + depends_on("py-fenics-ufl@2021.1.0", type="run", when="@0.1:0.3.99") depends_on("py-cffi", type="run") depends_on("py-numpy", type="run") |