Fenicsx: update for basix (#21220)

3 files changed, 29 insertions, 2 deletions

diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
index f3520b034c..411fb1042e 100644
--- a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
+++ b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py
@@ -33,8 +33,9 @@ class FenicsDolfinx(CMakePackage):
     depends_on("slepc", when="+slepc")
 
     depends_on("py-fenics-ffcx", type=("build", "run"))
+    depends_on("py-fenics-basix", type=("build", "run"))
 
-    conflicts('%gcc@:6', msg='C++17 support required')
+    conflicts('%gcc@:8', msg='Improved C++17 support required')
 
     root_cmakelists_dir = "cpp"
 
diff --git a/var/spack/repos/builtin/packages/py-fenics-basix/package.py b/var/spack/repos/builtin/packages/py-fenics-basix/package.py
new file mode 100644
index 0000000000..581dabfcf3
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-fenics-basix/package.py
@@ -0,0 +1,26 @@
+# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack import *
+
+
+class PyFenicsBasix(PythonPackage):
+    """Python basis evaluation library for Next generation FEniCS problem solving
+    environment"""
+
+    homepage = "https://github.com/FEniCS/basix"
+    git = "https://github.com/FEniCS/basix.git"
+    maintainers = ["chrisrichardson", "mscroggs"]
+
+    version("main", branch="main")
+
+    depends_on("cmake@3.9:", type="build")
+    depends_on("eigen@3.3.7:")
+    depends_on("python@3.5:", type=('build', 'run'))
+    depends_on("py-setuptools", type="build")
+    depends_on("py-scikit-build", type="build")
+    depends_on("py-pybind11", type="build")
+
+    phases = ['build', 'install']
diff --git a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py
index c7485c9b8b..b74de19508 100644
--- a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py
+++ b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py
@@ -19,5 +19,5 @@ class PyFenicsFfcx(PythonPackage):
     depends_on("py-setuptools", type=("build", "run"))
     depends_on("py-cffi", type=("build", "run"))
     depends_on("py-fenics-ufl@master", type=("build", "run"))
-    depends_on("py-fenics-fiat@master", type=("build", "run"))
+    depends_on("py-fenics-basix@main", type=("build", "run"))
     depends_on("py-numpy", type=("build", "run"))