diff options
| author | Dr. Christian Tacke <58549698+ChristianTackeGSI@users.noreply.github.com> | 2021-04-14 23:32:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-14 14:32:07 -0700 |
| commit | 066caa1d2a4051b0c6c865237b548d9fb555cc1c (patch) | |
| tree | 36e5a6f6ef9b2fcce7cc9413139ef5fa5c3c1b01 /var | |
| parent | 7175c213b5c43ea87a3d9d653f9b8108b4aeabd4 (diff) | |
| download | spack-066caa1d2a4051b0c6c865237b548d9fb555cc1c.tar.gz spack-066caa1d2a4051b0c6c865237b548d9fb555cc1c.tar.bz2 spack-066caa1d2a4051b0c6c865237b548d9fb555cc1c.tar.xz spack-066caa1d2a4051b0c6c865237b548d9fb555cc1c.zip | |
root: Add Version 6.24.00 (#22996)
* 6.24 needs nlohmann-json (and disable the builtin one)
* Move the git url to the top (allows easier building of
tags, etc)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/root/package.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/root/package.py b/var/spack/repos/builtin/packages/root/package.py index 78d0d59edb..c743218546 100644 --- a/var/spack/repos/builtin/packages/root/package.py +++ b/var/spack/repos/builtin/packages/root/package.py @@ -14,6 +14,7 @@ class Root(CMakePackage): homepage = "https://root.cern.ch" url = "https://root.cern/download/root_v6.16.00.source.tar.gz" + git = "https://github.com/root-project/root.git" tags = ['hep'] @@ -22,12 +23,12 @@ class Root(CMakePackage): # ###################### Versions ########################## # Master branch - version('master', git="https://github.com/root-project/root.git", - branch='master') + version('master', branch='master') # Development version (when more recent than production). # Production version + version('6.24.00', sha256='9da30548a289211c3122d47dacb07e85d35e61067fac2be6c5a5ff7bda979989') version('6.22.08', sha256='6f061ff6ef8f5ec218a12c4c9ea92665eea116b16e1cd4df4f96f00c078a2f6f') version('6.22.06', sha256='c4688784a7e946cd10b311040b6cf0b2f75125a7520e04d1af0b746505911b57') version('6.22.02', sha256='89784afa9c9047e9da25afa72a724f32fa8aa646df267b7731e4527cc8a0c340') @@ -196,6 +197,7 @@ class Root(CMakePackage): depends_on('libpng') depends_on('lz4', when='@6.13.02:') # See cmake_args, below. depends_on('ncurses') + depends_on('nlohmann-json', when='@6.24:') depends_on('pcre') depends_on('xxhash', when='@6.13.02:') # See cmake_args, below. depends_on('xz') @@ -336,6 +338,7 @@ class Root(CMakePackage): define('builtin_llvm', True), define('builtin_lz4', self.spec.satisfies('@6.12.02:6.12.99')), define('builtin_lzma', False), + define('builtin_nlohmannjson', False), define('builtin_openssl', False), define('builtin_pcre', False), define('builtin_tbb', False), |