zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update rivet to 3.1.6, yoda to 1.9.5; fix recipes (#30702)

Browse Source 
* Update rivet to 3.1.6, yoda to 1.9.5; fix recipes

* Use filter_compiler_wrappers instead of custom post-install step
This commit is contained in:
iarspider 2022-05-17 19:17:24 +02:00 committed by GitHub
parent d6f8ffc6bc
commit 10ea0a2a3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/rivet/package.py
View File

@ -17,6 +17,7 @@ class Rivet(AutotoolsPackage):
tags = ['hep'] tags = ['hep']
version('3.1.6', sha256='1cf6ebb6a79d181c441d1d0c7c6d623c423817c61093f36f21adaae23e679090')
version('3.1.4', sha256='37edc80a2968ce1031589e43ba6b492877ca7901bea38f8bb7536a5c8cf8100d') version('3.1.4', sha256='37edc80a2968ce1031589e43ba6b492877ca7901bea38f8bb7536a5c8cf8100d')
version('3.1.3', sha256='53ddce41705b9c22b2eaa90603f6659aa9bf46c466d8772ca9dbe4430972e021') version('3.1.3', sha256='53ddce41705b9c22b2eaa90603f6659aa9bf46c466d8772ca9dbe4430972e021')
version('3.1.2', sha256='c041d09644f4eae7c212d82237033267fbc1583dfbb4e3e67377f86cece9577a') version('3.1.2', sha256='c041d09644f4eae7c212d82237033267fbc1583dfbb4e3e67377f86cece9577a')
@ -101,6 +102,7 @@ class Rivet(AutotoolsPackage):
depends_on('yoda@1.8.2', when='@3.1.1') depends_on('yoda@1.8.2', when='@3.1.1')
depends_on('yoda@1.8.3', when='@3.1.2') depends_on('yoda@1.8.3', when='@3.1.2')
depends_on('yoda@1.8.5:', when='@3.1.3:') depends_on('yoda@1.8.5:', when='@3.1.3:')
depends_on('yoda@1.9.5:', when='@3.1.6:')
# The following versions were not a part of LCG stack # The following versions were not a part of LCG stack
# and thus the exact version of YODA is unknown # and thus the exact version of YODA is unknown
@ -127,6 +129,10 @@ class Rivet(AutotoolsPackage):
depends_on('libtool', type='build') depends_on('libtool', type='build')
depends_on('m4', type='build') depends_on('m4', type='build')
extends('python')
filter_compiler_wrappers('rivet-build', relative_root='bin')
patch('rivet-1.8.2.patch', when='@1.8.2', level=0) patch('rivet-1.8.2.patch', when='@1.8.2', level=0)
patch('rivet-1.9.0.patch', when='@1.9.0', level=0) patch('rivet-1.9.0.patch', when='@1.9.0', level=0)
patch('rivet-2.2.0.patch', when='@2.2.0', level=0) patch('rivet-2.2.0.patch', when='@2.2.0', level=0)

3
var/spack/repos/builtin/packages/yoda/package.py
View File

@ -15,6 +15,7 @@ class Yoda(AutotoolsPackage):
tags = ['hep'] tags = ['hep']
version('1.9.5', sha256='59191a0e9afa8db53ffaa2079f8532e5b13de1be622703d6f7060d3610528b6b')
version('1.9.0', sha256='9a55de12ffebbe41d1704459c5c9289eeaf0f0eb6a4d0104ea222d7ab889fdf4') version('1.9.0', sha256='9a55de12ffebbe41d1704459c5c9289eeaf0f0eb6a4d0104ea222d7ab889fdf4')
version('1.8.5', sha256='4c2e6b8571fc176271515a309b45687a2981af1b07ff3f00d0b035a597aa32fd') version('1.8.5', sha256='4c2e6b8571fc176271515a309b45687a2981af1b07ff3f00d0b035a597aa32fd')
version('1.8.4', sha256='9d24a41c9b7cc6eb14cab0a48f65d2fca7ec9d794afe0922ceb158d0153c150e') version('1.8.4', sha256='9d24a41c9b7cc6eb14cab0a48f65d2fca7ec9d794afe0922ceb158d0153c150e')
@ -78,6 +79,8 @@ class Yoda(AutotoolsPackage):
depends_on('py-matplotlib', when='@1.3.0:', type=('build', 'run')) depends_on('py-matplotlib', when='@1.3.0:', type=('build', 'run'))
depends_on('root', type=('build', 'link', 'run'), when='+root') depends_on('root', type=('build', 'link', 'run'), when='+root')
extends('python')
patch('yoda-1.5.5.patch', level=0, when='@1.5.5') patch('yoda-1.5.5.patch', level=0, when='@1.5.5')
patch('yoda-1.5.9.patch', level=0, when='@1.5.9') patch('yoda-1.5.9.patch', level=0, when='@1.5.9')
patch('yoda-1.6.1.patch', level=0, when='@1.6.1') patch('yoda-1.6.1.patch', level=0, when='@1.6.1')