diff --git a/VERSION b/VERSION
index 437459cd94c9fa59d82c61c0bc8aa36e293b735e..e70b4523ae7ffe8aa3cac8ecd1b093fba5a98737 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.0
+2.6.0
diff --git a/containers/builder/spack.yaml b/containers/builder/spack.yaml
index f215c3147563acbefded3d3fea4f4180e39f9f60..41658b79312037c8fa3673c17ea6f73919ce9f6a 100644
--- a/containers/builder/spack.yaml
+++ b/containers/builder/spack.yaml
@@ -6,7 +6,7 @@ spack:
- nlohmann-json@3.9.1
- heppdt@3.04.01
- clhep@2.4.1.3 cxxstd=17
- - eigen@3.3.7
+ - eigen@3.3.8
- python@3.7.8
- py-pip
- py-numpy
@@ -23,7 +23,7 @@ spack:
- podio@0.13
- geant4@10.6.2 cxxstd=17 +opengl +vecgeom +x11 +qt ^qt +opengl
- dd4hep@1.14.1 +geant4 +assimp +hepmc3 +ipo
- - acts@1.02.0 +dd4hep +digitization +identification +json +tgeo +ipo
+ - acts@4.01.0 +dd4hep +digitization +identification +json +tgeo +ipo
- gaudi@34.0
- dawn@3_91a
- dawncut@1_54a
diff --git a/spack/packages/acts/README.md b/spack/packages/acts/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..5d8500e622718cd278d5f869f5102d3f20216cb0
--- /dev/null
+++ b/spack/packages/acts/README.md
@@ -0,0 +1 @@
+Same as develop version at 2021-1-17, except that I added acts version 4.1
diff --git a/spack/packages/acts/package.py b/spack/packages/acts/package.py
index 931e07fc1a7dc751ca4052e67f07c98868ac77d1..0cc0dae7cda2eeb58dedca8e4a7580477c97639b 100644
--- a/spack/packages/acts/package.py
+++ b/spack/packages/acts/package.py
@@ -1,4 +1,4 @@
-# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
+# 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)
@@ -33,8 +33,15 @@ class Acts(CMakePackage, CudaPackage):
git = "https://github.com/acts-project/acts.git"
maintainers = ['HadrienG2']
+ tags = ['hep']
+
# Supported Acts versions
version('master', branch='master')
+ version('4.01.0', commit='c383bf434ef69939b47e840e0eac0ba632e6af9f')
+ version('4.00.0', commit='ed64b4b88d366b63adc4a8d1afe5bc97aa5751eb')
+ version('3.00.0', commit='e20260fccb469f4253519d3f0ddb3191b7046db3')
+ version('2.00.0', commit='8708eae2b2ccdf57ab7b451cfbba413daa1fc43c')
+ version('1.02.1', commit='f6ebeb9a28297ba8c54fd08b700057dd4ff2a311')
version('1.02.0', commit='e69b95acc9a264e63aded7d1714632066e090542')
version('1.01.0', commit='836fddd02c3eff33825833ff97d6abda5b5c20a0')
version('1.00.0', commit='ec9ce0bcdc837f568d42a12ddf3fc9c80db62f5d')
@@ -96,6 +103,7 @@ class Acts(CMakePackage, CudaPackage):
variant('identification', default=False, description='Build the Identification plugin')
variant('json', default=False, description='Build the Json plugin')
variant('legacy', default=False, description='Build the Legacy package')
+ # FIXME: Cannot build ONNX plugin as Spack doesn't have an ONNX runtime
# FIXME: Cannot build SyCL plugin yet as Spack doesn't have SyCL support
variant('tgeo', default=False, description='Build the TGeo plugin')
@@ -139,6 +147,7 @@ class Acts(CMakePackage, CudaPackage):
conflicts('+pythia8', when='@:0.22')
conflicts('+pythia8', when='-examples')
conflicts('+tgeo', when='-identification')
+ conflicts('%gcc@:7', when='@0.23:')
def cmake_args(self):
spec = self.spec
diff --git a/spack/packages/eigen/package.py b/spack/packages/eigen/package.py
deleted file mode 100644
index d133f9f01a3aa65d06920aa5abd32a25d2ee6c4e..0000000000000000000000000000000000000000
--- a/spack/packages/eigen/package.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2013-2020 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)
-
-
-class Eigen(CMakePackage):
- """Eigen is a C++ template library for linear algebra matrices,
- vectors, numerical solvers, and related algorithms.
- """
-
- homepage = 'http://eigen.tuxfamily.org/'
- url = 'https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.gz'
-
- version('3.3.8', sha256='146a480b8ed1fb6ac7cd33fec9eb5e8f8f62c3683b3f850094d9d5c35a92419a')
- version('3.3.7', sha256='d56fbad95abf993f8af608484729e3d87ef611dd85b3380a8bad1d5cbc373a57')
- version('3.3.6', sha256='e7cd8c94d6516d1ada9893ccc7c9a400fcee99927c902f15adba940787104dba')
- version('3.3.5', sha256='383407ab3d0c268074e97a2cbba84ac197fd24532f014aa2adc522355c1aa2d0')
- version('3.3.4', sha256='c5ca6e3442fb48ae75159ca7568854d9ba737bc351460f27ee91b6f3f9fd1f3d')
- version('3.3.3', sha256='fd72694390bd8e81586205717d2cf823e718f584b779a155db747d1e68481a2e')
- version('3.3.2', sha256='8d7611247fba1236da4dee7a64607017b6fb9ca5e3f0dc44d480e5d33d5663a5')
- version('3.3.1', sha256='50dd21a8997fce0857b27a126811ae8ee7619984ab5425ecf33510cec649e642')
- version('3.3.0', sha256='de82e01f97e1a95f121bd3ace87aa1237818353c14e38f630a65f5ba2c92f0e1')
- version('3.2.10', sha256='0920cb60ec38de5fb509650014eff7cc6d26a097c7b38c7db4b1aa5df5c85042')
- version('3.2.9', sha256='f683b20259ad72c3d384c00278166dd2a42d99b78dcd589ed4a6ca74bbb4ca07')
- version('3.2.8', sha256='64c54781cfe9eefef2792003ab04b271d4b2ec32eda6e9cdf120d7aad4ebb282')
- version('3.2.7', sha256='0ea9df884873275bf39c2965d486fa2d112f3a64b97b60b45b8bc4bb034a36c1')
- version('3.2.6', sha256='e097b8dcc5ad30d40af4ad72d7052e3f78639469baf83cffaadc045459cda21f')
- version('3.2.5', sha256='8068bd528a2ff3885eb55225c27237cf5cda834355599f05c2c85345db8338b4')
-
- # there is a bug in 3.3.8 that provokes a compile error in dependent packages, see https://gitlab.com/libeigen/eigen/-/issues/2011
- patch('https://gitlab.com/libeigen/eigen/-/commit/6d822a1052fc665f06dc51b4729f6a38e0da0546.diff', when='@3.3.8',
- sha256='62590e9b33a8f72b608a72b87147a306e7cb20766ea53c6b8e0a183fa6cb7635')
-
- # From http://eigen.tuxfamily.org/index.php?title=Main_Page#Requirements
- # "Eigen doesn't have any dependencies other than the C++ standard
- # library."
- variant('build_type', default='RelWithDebInfo',
- description='The build type to build',
- values=('Debug', 'Release', 'RelWithDebInfo'))
-
- # TODO: latex and doxygen needed to produce docs with make doc
- # TODO: Other dependencies might be needed to test this package
-
- def setup_run_environment(self, env):
- env.prepend_path('CPATH', self.prefix.include.eigen3)
-
- @property
- def headers(self):
- headers = find_all_headers(self.prefix.include)
- headers.directories = [self.prefix.include.eigen3]
- return headers