Skip to content

Commit 0e42c22

Browse files
authored
Update submodule pointer for spack (spack-stack-dev update to spack release 0.23) (#1392)
- Update submodule pointer for spack - Pin py-cryptography to version 42 or earlier to avoid full dependency on rust - Build pixman with %gcc if the preferred compiler is %intel (Intel Classic)
1 parent 5c40f2e commit 0e42c22

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

configs/common/packages.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,9 @@ packages:
204204
require: '@21.4.0'
205205
py-cartopy:
206206
require: '+plotting'
207+
# Avoid full rust dependency: version 43+ requires py-maturin
207208
py-cryptography:
208-
require: '+rust_bootstrap'
209+
require: '@:42 +rust_bootstrap'
209210
# Introduced in https://github.com/JCSDA/spack-stack/pull/894, pin py-cython
210211
# to avoid duplicate packages being built (cylc dependencies soft-want @3:)
211212
py-cython:

configs/common/packages_intel.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ packages:
2424
ecflow:
2525
require:
2626
- '%gcc'
27+
pixman:
28+
require:
29+
- '%gcc'

spack

Submodule spack updated 310 files

0 commit comments

Comments
 (0)