diff options
| author | haralmha <47558670+haralmha@users.noreply.github.com> | 2022-06-28 19:43:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-28 10:43:16 -0700 |
| commit | 24048e3be77dcbd061d02d43dba8f87e0706324c (patch) | |
| tree | f45aef77aadc204973b5739b332cbf8983091a6a | |
| parent | f1d8b711ede1b23ba1e42a41586e08096fd0a9c9 (diff) | |
| download | spack-24048e3be77dcbd061d02d43dba8f87e0706324c.tar.gz spack-24048e3be77dcbd061d02d43dba8f87e0706324c.tar.bz2 spack-24048e3be77dcbd061d02d43dba8f87e0706324c.tar.xz spack-24048e3be77dcbd061d02d43dba8f87e0706324c.zip | |
herwig3: Add version 7.2.3 and update dependency versions (thepeg and lhapdf) (#31329)
| -rw-r--r-- | var/spack/repos/builtin/packages/herwig3/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/lhapdf/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/thepeg/package.py | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/herwig3/package.py b/var/spack/repos/builtin/packages/herwig3/package.py index 12c3e0171a..e2913e4ca7 100644 --- a/var/spack/repos/builtin/packages/herwig3/package.py +++ b/var/spack/repos/builtin/packages/herwig3/package.py @@ -15,6 +15,7 @@ class Herwig3(AutotoolsPackage): tags = ['hep'] + version('7.2.3', sha256='5599899379b01b09e331a2426d78d39b7f6ec126db2543e9d340aefe6aa50f84') version('7.2.1', sha256='d4fff32f21c5c08a4b2e563c476b079859c2c8e3b78d853a8a60da96d5eea686') depends_on('autoconf', type='build') @@ -24,6 +25,8 @@ class Herwig3(AutotoolsPackage): depends_on('lhapdf') depends_on('lhapdfsets') depends_on('thepeg@2.2.1', when='@7.2.1') + depends_on('thepeg@2.2.3', when='@7.2.3') + depends_on('evtgen') # TODO: replace this with an explicit list of components of Boost, # for instance depends_on('boost +filesystem') @@ -54,7 +57,8 @@ class Herwig3(AutotoolsPackage): '--with-openloops=' + self.spec['openloops'].prefix, '--with-gosam-contrib=' + self.spec['gosam-contrib'].prefix, '--with-njet=' + self.spec['njet'].prefix, - '--with-vbfnlo=' + self.spec['vbfnlo'].prefix] + '--with-vbfnlo=' + self.spec['vbfnlo'].prefix, + '--with-evtgen=' + self.spec['evtgen'].prefix] if self.spec.satisfies('^python@2.7.0:2.7'): args.append('--with-gosam=' + self.spec['gosam'].prefix) diff --git a/var/spack/repos/builtin/packages/lhapdf/package.py b/var/spack/repos/builtin/packages/lhapdf/package.py index def9ab23ce..8672c0f389 100644 --- a/var/spack/repos/builtin/packages/lhapdf/package.py +++ b/var/spack/repos/builtin/packages/lhapdf/package.py @@ -19,6 +19,7 @@ class Lhapdf(AutotoolsPackage): tags = ['hep'] + version('6.5.1', sha256='7a19ba4cdee7053bb79db317143fe768dd6abef1ec34e2d183225e13df96a983') version('6.4.0', sha256='155702c36df46de30c5f7fa249193a9a0eea614191de1606301e06cd8062fc29') version('6.3.0', sha256='864468439c7662bbceed6c61c7132682ec83381a23c9c9920502fdd7329dd816') version('6.2.3', sha256='37200a1ab70247250a141dfed7419d178f9a83bd23a4f8a38e203d4e27b41308') @@ -35,6 +36,7 @@ class Lhapdf(AutotoolsPackage): depends_on('py-setuptools', type='build', when='+python') def configure_args(self): - args = ['FCFLAGS=-O3', 'CFLAGS=-O3', 'CXXFLAGS=-O3'] + args = ['FCFLAGS=-O3', 'CFLAGS=-O3', 'CXXFLAGS=-O3', + 'LIBS=-L' + self.spec['python'].prefix.lib] args.extend(self.enable_or_disable('python')) return args diff --git a/var/spack/repos/builtin/packages/thepeg/package.py b/var/spack/repos/builtin/packages/thepeg/package.py index 5e5fa23b17..c817f8c976 100644 --- a/var/spack/repos/builtin/packages/thepeg/package.py +++ b/var/spack/repos/builtin/packages/thepeg/package.py @@ -17,6 +17,7 @@ class Thepeg(AutotoolsPackage): # The commented out versions exist, but may need patches # and/or recipe changes + version('2.2.3', sha256='f21473197a761fc32917b08a8d24d2bfaf93ff57f3441fd605da99ac9de5d50b') version('2.2.1', sha256='63abc7215e6ad45c11cf9dac013738e194cc38556a8368b850b70ab1b57ea58f') version('2.2.0', sha256='d3e1474811b7d9f61a4a98db1e9d60d8ef8f913a50de4cae4dc2cc4f98e6fbf8') # version('2.1.7', sha256='2e15727afc1fbfb158fa42ded31c4b1e5b51c25ed6bb66a38233e1fc594329c8') |