From 3922e00ee254873668dfe45df58e328de8ee4ce3 Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Thu, 2 May 2024 06:58:18 +0200
Subject: [PATCH 1/5] {2023.06}[foss/2023a] R-bundle-bioconductor v3.18

---
 .../pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml
index 9b51f740b7..ca7021a15a 100644
--- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml
+++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml
@@ -18,3 +18,7 @@ easyconfigs:
   - SuiteSparse-7.1.0-foss-2023a.eb
   - Hypre-2.29.0-foss-2023a.eb
   - netCDF-Fortran-4.6.1-gompi-2023a.eb
+  - R-bundle-Bioconductor-3.18-foss-2023a-R-4.3.2.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20379
+        from-commit: 968654eef0a4984fc82e475ae4739eb42d8a2275

From 533cc18ee2e549c880ae7db60394089229424a77 Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Thu, 2 May 2024 08:46:04 +0200
Subject: [PATCH 2/5] use last non-merge commit

---
 .../pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml
index ca7021a15a..20b373970e 100644
--- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml
+++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml
@@ -21,4 +21,5 @@ easyconfigs:
   - R-bundle-Bioconductor-3.18-foss-2023a-R-4.3.2.eb:
       options:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20379
-        from-commit: 968654eef0a4984fc82e475ae4739eb42d8a2275
+        # Note, it's not the merge commit but the one before.
+        from-commit: ae2fc38307b56ae7ac12dff95c9d07404e1a8530

From 81648adffa7d5fb43ab105bed3ae62e92ae06593 Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Thu, 2 May 2024 18:58:09 +0200
Subject: [PATCH 3/5] limit parallelism to 4

---
 EESSI-install-software.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh
index f996fd626d..4e7bc08499 100755
--- a/EESSI-install-software.sh
+++ b/EESSI-install-software.sh
@@ -232,6 +232,8 @@ else
         # load EasyBuild module (will be installed if it's not available yet)
         source ${TOPDIR}/load_easybuild_module.sh ${eb_version}
 
+        export EASYBUILD_PARALLEL=4
+
         ${EB} --show-config
 
         echo_green "All set, let's start installing some software with EasyBuild v${eb_version} in ${EASYBUILD_INSTALLPATH}..."

From b04060d670719adcce20636cb8a2955a40063105 Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Fri, 3 May 2024 19:27:19 +0200
Subject: [PATCH 4/5] try using from-pr and don't restrict 'parallel'

---
 EESSI-install-software.sh                                     | 2 +-
 .../pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh
index 4e7bc08499..900b513365 100755
--- a/EESSI-install-software.sh
+++ b/EESSI-install-software.sh
@@ -232,7 +232,7 @@ else
         # load EasyBuild module (will be installed if it's not available yet)
         source ${TOPDIR}/load_easybuild_module.sh ${eb_version}
 
-        export EASYBUILD_PARALLEL=4
+        # export EASYBUILD_PARALLEL=4
 
         ${EB} --show-config
 
diff --git a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml
index 20b373970e..14dfa97ef2 100644
--- a/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml
+++ b/easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml
@@ -22,4 +22,6 @@ easyconfigs:
       options:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20379
         # Note, it's not the merge commit but the one before.
-        from-commit: ae2fc38307b56ae7ac12dff95c9d07404e1a8530
+        # from-commit: ae2fc38307b56ae7ac12dff95c9d07404e1a8530
+        # trying from-pr as an alternative
+        from-pr: 20379

From db675f21ca4289b2b45b800f6f03b0c0f1abc7bf Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Sat, 4 May 2024 09:14:32 +0200
Subject: [PATCH 5/5] remove setting of EASYBUILD_PARALLEL

---
 EESSI-install-software.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/EESSI-install-software.sh b/EESSI-install-software.sh
index 900b513365..f996fd626d 100755
--- a/EESSI-install-software.sh
+++ b/EESSI-install-software.sh
@@ -232,8 +232,6 @@ else
         # load EasyBuild module (will be installed if it's not available yet)
         source ${TOPDIR}/load_easybuild_module.sh ${eb_version}
 
-        # export EASYBUILD_PARALLEL=4
-
         ${EB} --show-config
 
         echo_green "All set, let's start installing some software with EasyBuild v${eb_version} in ${EASYBUILD_INSTALLPATH}..."