Skip to content

Commit cbaeec8

Browse files
author
Richard Top
committed
Merge branch '2023.06-software.eessi.io' of ssh://github.com/EESSI/software-layer into eessi-2023.06-grace-apps-from-EB-4.9.4-easystack
2 parents df9d86c + 0aa79c1 commit cbaeec8

3 files changed

Lines changed: 12 additions & 1 deletion

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
easyconfigs:
2+
# from here on built originally with EB 4.8.2
3+
# need to keep building Qt5 with 4.8.2 because more recent versions include an
4+
# updated easyblock for python which doesn't work correctly for Python-2.7.18
5+
- Qt5-5.15.7-GCCcore-12.2.0.eb

easystacks/software.eessi.io/2023.06/grace/eessi-2023.06-eb-4.9.4-2022b.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,7 @@ easyconfigs:
3030
# options:
3131
# from-pr: 19339
3232
- HarfBuzz-5.3.1-GCCcore-12.2.0.eb
33+
# moved Qt5 to easystack file used with EB 4.8.2 because it needs an older
34+
# version of the python easyblock
3335
# - Qt5-5.15.7-GCCcore-12.2.0.eb
3436
# - QuantumESPRESSO-7.2-foss-2022b.eb

easystacks/software.eessi.io/2023.06/grace/eessi-2023.06-eb-4.9.4-2023a.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,11 @@ easyconfigs:
9292
- GDAL-3.7.1-foss-2023a.eb
9393
- ncdu-1.18-GCC-12.3.0.eb
9494
- SAMtools-1.18-GCC-12.3.0.eb
95-
- R-bundle-Bioconductor-3.18-foss-2023a-R-4.3.2.eb
95+
- R-bundle-Bioconductor-3.18-foss-2023a-R-4.3.2.eb:
96+
options:
97+
# (additional extensions have been added)
98+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21948
99+
from-commit: f9cfe6ac7d9019970c2be3e8b09db4d846cf005a
96100
- ipympl-0.9.3-gfbf-2023a.eb
97101
- ESPResSo-4.2.2-foss-2023a.eb
98102
- GATK-4.5.0.0-GCCcore-12.3.0-Java-17.eb

0 commit comments

Comments
 (0)