From 114a8eb850cc40da18070f0f7ab990dd54634ec6 Mon Sep 17 00:00:00 2001 From: parosen Date: Tue, 1 Oct 2024 14:17:47 +0200 Subject: [PATCH 1/7] {2023.06}[foss/2023a] ROOT 6.30.06 --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml index 27c18a487e..6823ea5cca 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml @@ -22,3 +22,4 @@ easyconfigs: from-pr: 20784 - Valgrind-3.21.0-gompi-2023a.eb - OrthoFinder-2.5.5-foss-2023a.eb + - ROOT-6.30.06-foss-2023a.eb From 1c82faa752e2144a01525c122926768a98f622b5 Mon Sep 17 00:00:00 2001 From: ocaisa Date: Tue, 1 Oct 2024 14:46:33 +0200 Subject: [PATCH 2/7] Install ROOT with EasyBuild 4.9.4 --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml diff --git a/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml b/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml new file mode 100644 index 0000000000..992e4c301c --- /dev/null +++ b/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml @@ -0,0 +1,2 @@ +easyconfigs: + - ROOT-6.30.06-foss-2023a.eb From 2b2e57d092230f755c635cf9abe031b01bb968dc Mon Sep 17 00:00:00 2001 From: ocaisa Date: Tue, 1 Oct 2024 14:46:58 +0200 Subject: [PATCH 3/7] Update eessi-2023.06-eb-4.9.1-2023a.yml --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml index 6823ea5cca..27c18a487e 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml @@ -22,4 +22,3 @@ easyconfigs: from-pr: 20784 - Valgrind-3.21.0-gompi-2023a.eb - OrthoFinder-2.5.5-foss-2023a.eb - - ROOT-6.30.06-foss-2023a.eb From 139f422fda241768ec9e033fa1cdc032ba7c328d Mon Sep 17 00:00:00 2001 From: ocaisa Date: Wed, 2 Oct 2024 16:56:45 +0200 Subject: [PATCH 4/7] Update eessi-2023.06-eb-4.9.4-2023a.yml --- .../2023.06/eessi-2023.06-eb-4.9.4-2023a.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml b/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml index 992e4c301c..3ca4d5f4c8 100644 --- a/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml @@ -1,2 +1,5 @@ easyconfigs: - - ROOT-6.30.06-foss-2023a.eb + - ROOT-6.30.06-foss-2023a.eb: + options: + # see https://github.com/easybuilders/easybuild-easyblocks/pull/3467 + include-easyblocks-from-commit: c3aebe1f133d064a228c5d6c282e898b83d74601 From 148e8efae37d2ad1e51756cd64574661fccb9ca5 Mon Sep 17 00:00:00 2001 From: ocaisa Date: Thu, 3 Oct 2024 14:17:36 +0200 Subject: [PATCH 5/7] Also use patched easyconfig --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml b/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml index 3ca4d5f4c8..2a8cb36994 100644 --- a/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml @@ -1,5 +1,7 @@ easyconfigs: - ROOT-6.30.06-foss-2023a.eb: options: + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21526 + from-commit: 0707601ccd7dd497a419ed39b1b5527ddd0450f4 # see https://github.com/easybuilders/easybuild-easyblocks/pull/3467 include-easyblocks-from-commit: c3aebe1f133d064a228c5d6c282e898b83d74601 From 719b5628ea93bdd321c96efc17e16d7c8d66f3ac Mon Sep 17 00:00:00 2001 From: ocaisa Date: Thu, 3 Oct 2024 15:29:10 +0200 Subject: [PATCH 6/7] Update eessi-2023.06-eb-4.9.4-2023a.yml --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml b/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml index 2a8cb36994..19d9aedfae 100644 --- a/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml @@ -2,6 +2,6 @@ easyconfigs: - ROOT-6.30.06-foss-2023a.eb: options: # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21526 - from-commit: 0707601ccd7dd497a419ed39b1b5527ddd0450f4 + from-commit: 6cbfbd7d7a55dc7243f46d0beea510278f4718df # see https://github.com/easybuilders/easybuild-easyblocks/pull/3467 include-easyblocks-from-commit: c3aebe1f133d064a228c5d6c282e898b83d74601 From bcaeec7737d6eb8679483f014c2b01c5a203c3c0 Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Fri, 4 Oct 2024 07:38:05 +0200 Subject: [PATCH 7/7] Move file to correct location --- .../2023.06 => }/eessi-2023.06-eb-4.9.4-2023a.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename easystacks/software.eessi.io/2023.06/{easystacks/software.eessi.io/2023.06 => }/eessi-2023.06-eb-4.9.4-2023a.yml (100%) diff --git a/easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml similarity index 100% rename from easystacks/software.eessi.io/2023.06/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml rename to easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.4-2023a.yml