From ae924e0c589d546651725abf87dc59877cfb3bfb Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Tue, 7 May 2024 15:21:29 +0200
Subject: [PATCH 01/34] {2023.06}[foss/2023a] OpenFOAM v2312

---
 .../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 e65747e4a5..674cc49a39 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
@@ -4,3 +4,4 @@ easyconfigs:
   - R-bundle-Bioconductor-3.18-foss-2023a-R-4.3.2.eb:
       options:
         from-pr: 20379
+  - OpenFOAM-v2312-foss-2023a.eb

From 408417394078072338bb13bce6d226cf08ebec7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Fri, 7 Jun 2024 14:19:29 +0200
Subject: [PATCH 02/34] use PRs with fixes for easyconfig+easyblock

Co-authored-by: ocaisa <alan.ocais@cecam.org>
---
 .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml | 3 +++
 1 file changed, 3 insertions(+)

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 674cc49a39..5ca2d7d3ec 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
@@ -5,3 +5,6 @@ easyconfigs:
       options:
         from-pr: 20379
   - OpenFOAM-v2312-foss-2023a.eb
+      options:
+        include-easyblocks-from-pr: 3328
+        from-pr: 20517

From 958e78ac5f03af4faccf59caa5f18c2544f20da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Fri, 7 Jun 2024 14:27:38 +0200
Subject: [PATCH 03/34] add missing colon

---
 .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml  | 2 +-
 1 file changed, 1 insertion(+), 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 cb7ee4ab27..c9334c2acf 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
@@ -17,7 +17,7 @@ easyconfigs:
         from-pr: 20595
   - GATK-4.5.0.0-GCCcore-12.3.0-Java-17.eb
   - WhatsHap-2.2-foss-2023a.eb
-  - OpenFOAM-v2312-foss-2023a.eb
+  - OpenFOAM-v2312-foss-2023a.eb:
       options:
         include-easyblocks-from-pr: 3328
         from-pr: 20517

From 1d4462095458803c6563178b5db8212a71138510 Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Sat, 15 Jun 2024 09:25:55 +0200
Subject: [PATCH 04/34] {2023.06,zen4}[foss/2023b] R-bundle-Bioconductor 3.18

---
 .../2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
index 09f525364f..d39af75783 100644
--- a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -2,3 +2,4 @@ easyconfigs:
   - ESPResSo-4.2.2-foss-2023a.eb
   - TensorFlow-2.13.0-foss-2023a.eb
   - R-4.3.2-gfbf-2023a.eb
+  - R-bundle-Bioconductor-3.18-foss-2023a-R-4.3.2.eb

From 59ad3f572148b5e862ee415df37463cb9a91e646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Mon, 17 Jun 2024 22:40:47 +0200
Subject: [PATCH 05/34] use new PRs for OpenFOAM

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

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 f62267a0a3..4c3a0a5bd1 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
@@ -24,5 +24,5 @@ easyconfigs:
   - OrthoFinder-2.5.5-foss-2023a.eb
   - OpenFOAM-v2312-foss-2023a.eb:
       options:
-        include-easyblocks-from-pr: 3328
-        from-pr: 20517
+        include-easyblocks-from-pr: 3366
+        from-pr: 20841

From 3af05e91a6289502978b53222abba74ce6a88b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Tue, 18 Jun 2024 10:26:19 +0200
Subject: [PATCH 06/34] move OpenFOAM to EB 4.9.2 easystack

---
 .../2023.06/eessi-2023.06-eb-4.9.1-2023a.yml                | 4 ----
 .../2023.06/eessi-2023.06-eb-4.9.2-2023a.yml                | 6 ++++++
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml

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 4c3a0a5bd1..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,7 +22,3 @@ easyconfigs:
         from-pr: 20784
   - Valgrind-3.21.0-gompi-2023a.eb
   - OrthoFinder-2.5.5-foss-2023a.eb
-  - OpenFOAM-v2312-foss-2023a.eb:
-      options:
-        include-easyblocks-from-pr: 3366
-        from-pr: 20841
diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
new file mode 100644
index 0000000000..eb1169918f
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -0,0 +1,6 @@
+easyconfigs:
+  - OpenFOAM-v2312-foss-2023a.eb:
+      options:
+        include-easyblocks-from-pr: 3366
+        from-pr: 20841
+

From 76c963f63ad8100fd87424e15be926bcdcb91d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Wed, 19 Jun 2024 12:02:00 +0200
Subject: [PATCH 07/34] use from-commit instead of from-pr

---
 .../2023.06/eessi-2023.06-eb-4.9.2-2023a.yml               | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
index eb1169918f..74e1f4610b 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -1,6 +1,7 @@
 easyconfigs:
   - OpenFOAM-v2312-foss-2023a.eb:
       options:
-        include-easyblocks-from-pr: 3366
-        from-pr: 20841
-
+        # https://github.com/easybuilders/easybuild-easyblocks/pull/3366
+        include-easyblocks-from-commit: d1f2231b2de4f8548c75c7367456873a8c33b5f9
+        # https://github.com/easybuilders/easybuild-easyconfigs/pull/20841
+        from-commit: f0e91e6e430ebf902f7788ebb47f0203dee60649

From f31f09142b1749ffbe2aa12ba20d2974b43a82e4 Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Sat, 29 Jun 2024 11:39:23 +0200
Subject: [PATCH 08/34] {2023.06,2023a,zen4} Highway v1.0.4 with fix for
 failing test

---
 .../2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
index 09f525364f..082204087e 100644
--- a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -2,3 +2,7 @@ easyconfigs:
   - ESPResSo-4.2.2-foss-2023a.eb
   - TensorFlow-2.13.0-foss-2023a.eb
   - R-4.3.2-gfbf-2023a.eb
+  - Highway-1.0.4-GCCcore-12.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20942
+        from-pr: 20942

From fa2914e1c31f69a83119d4e0829941ead1fff7ca Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Sat, 29 Jun 2024 11:56:58 +0200
Subject: [PATCH 09/34] double-check without the patch

---
 .../2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
index 082204087e..664555aeab 100644
--- a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -2,7 +2,8 @@ easyconfigs:
   - ESPResSo-4.2.2-foss-2023a.eb
   - TensorFlow-2.13.0-foss-2023a.eb
   - R-4.3.2-gfbf-2023a.eb
-  - Highway-1.0.4-GCCcore-12.3.0.eb:
-      options:
-        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20942
-        from-pr: 20942
+  - Highway-1.0.4-GCCcore-12.3.0.eb
+  #- Highway-1.0.4-GCCcore-12.3.0.eb:
+  #    options:
+  #      # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20942
+  #      from-pr: 20942

From 391d5eda743660471b7bcb6aa4df6df0229052e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= <b.e.droge@rug.nl>
Date: Tue, 9 Jul 2024 15:47:14 +0200
Subject: [PATCH 10/34] use easyblock from PR 3388

---
 .../2023.06/eessi-2023.06-eb-4.9.2-2023a.yml                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
index 74e1f4610b..05e86a8565 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -1,7 +1,7 @@
 easyconfigs:
   - OpenFOAM-v2312-foss-2023a.eb:
       options:
-        # https://github.com/easybuilders/easybuild-easyblocks/pull/3366
-        include-easyblocks-from-commit: d1f2231b2de4f8548c75c7367456873a8c33b5f9
+        # https://github.com/easybuilders/easybuild-easyblocks/pull/3388
+        include-easyblocks-from-commit: c8256a36e7062bc09f5ce30552a9de9827054c9e
         # https://github.com/easybuilders/easybuild-easyconfigs/pull/20841
         from-commit: f0e91e6e430ebf902f7788ebb47f0203dee60649

From 05164ad4bc76f565088dd4f743646a8571528dd8 Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Mon, 29 Jul 2024 11:24:34 +0200
Subject: [PATCH 11/34] Add a check for the bash shell to archdetect

---
 init/eessi_archdetect.sh | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/init/eessi_archdetect.sh b/init/eessi_archdetect.sh
index ddfed1bfae..afa6c0b387 100755
--- a/init/eessi_archdetect.sh
+++ b/init/eessi_archdetect.sh
@@ -1,4 +1,26 @@
 #!/usr/bin/env bash
+
+# Confirm the current shell is Bash >= 4
+check_bash() {
+    if [ -n "$BASH_VERSION" ]; then
+        # Extract the major version numbers
+        bash_version=$(echo "$BASH_VERSION" | grep -oP '^\d+\.\d+')
+        major_version=$(echo "$bash_version" | cut -d. -f1)
+
+        # Check if the major version is 4 or higher
+        if [ "$major_version" -ge 4 ]; then
+            return 0
+        else
+            echo "Error: This script must be run with Bash > 4, you have $BASH_VERSION." >&2
+            exit 1
+        fi
+    else
+        echo "Error: This script must be run with Bash." >&2
+        exit 1
+    fi
+}
+check_bash
+
 VERSION="1.1.0"
 
 # default log level: only emit warnings or errors

From 6f43f1349daecd474805828af255abec4d83f2a7 Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Mon, 29 Jul 2024 11:35:22 +0200
Subject: [PATCH 12/34] List compatibility

---
 init/eessi_archdetect.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init/eessi_archdetect.sh b/init/eessi_archdetect.sh
index afa6c0b387..ed6a1f8c51 100755
--- a/init/eessi_archdetect.sh
+++ b/init/eessi_archdetect.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 # Confirm the current shell is Bash >= 4
+# (works for sh, bash, dash, zsh, ksh, but not fish, tcsh, elvish)
 check_bash() {
     if [ -n "$BASH_VERSION" ]; then
         # Extract the major version numbers

From 47c0a34173e8431f22794905e8c6addd81a3210c Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Mon, 29 Jul 2024 11:38:33 +0200
Subject: [PATCH 13/34] Don't declare a function for bash check

---
 init/eessi_archdetect.sh | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/init/eessi_archdetect.sh b/init/eessi_archdetect.sh
index ed6a1f8c51..0e83a45d2f 100755
--- a/init/eessi_archdetect.sh
+++ b/init/eessi_archdetect.sh
@@ -2,25 +2,22 @@
 
 # Confirm the current shell is Bash >= 4
 # (works for sh, bash, dash, zsh, ksh, but not fish, tcsh, elvish)
-check_bash() {
-    if [ -n "$BASH_VERSION" ]; then
-        # Extract the major version numbers
-        bash_version=$(echo "$BASH_VERSION" | grep -oP '^\d+\.\d+')
-        major_version=$(echo "$bash_version" | cut -d. -f1)
-
-        # Check if the major version is 4 or higher
-        if [ "$major_version" -ge 4 ]; then
-            return 0
-        else
-            echo "Error: This script must be run with Bash > 4, you have $BASH_VERSION." >&2
-            exit 1
-        fi
+if [ -n "$BASH_VERSION" ]; then
+    # Extract the major version numbers
+    bash_version=$(echo "$BASH_VERSION" | grep -oP '^\d+\.\d+')
+    major_version=$(echo "$bash_version" | cut -d. -f1)
+
+    # Check if the major version is 4 or higher
+    if [ "$major_version" -ge 4 ]; then
+        return 0
     else
-        echo "Error: This script must be run with Bash." >&2
+        echo "Error: This script must be run with Bash > 4, you have $BASH_VERSION." >&2
         exit 1
     fi
-}
-check_bash
+else
+    echo "Error: This script must be run with Bash." >&2
+    exit 1
+fi
 
 VERSION="1.1.0"
 

From 0750f5f4f0753dcb08362a4ed9dae90faf4b157c Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Mon, 29 Jul 2024 11:41:34 +0200
Subject: [PATCH 14/34] Don't use return values

---
 init/eessi_archdetect.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/init/eessi_archdetect.sh b/init/eessi_archdetect.sh
index 0e83a45d2f..001683f50a 100755
--- a/init/eessi_archdetect.sh
+++ b/init/eessi_archdetect.sh
@@ -8,9 +8,7 @@ if [ -n "$BASH_VERSION" ]; then
     major_version=$(echo "$bash_version" | cut -d. -f1)
 
     # Check if the major version is 4 or higher
-    if [ "$major_version" -ge 4 ]; then
-        return 0
-    else
+    if [ "$major_version" -lt 4 ]; then
         echo "Error: This script must be run with Bash > 4, you have $BASH_VERSION." >&2
         exit 1
     fi

From ba8ee7a0ee2b1668eccf95665acf40886dce0868 Mon Sep 17 00:00:00 2001
From: Alan O'Cais <alan.ocais@cecam.org>
Date: Mon, 29 Jul 2024 14:47:31 +0200
Subject: [PATCH 15/34] Rebuild Python with ctypes fix

---
 .../20240729-eb-4.9.2-Python-ctypes.yml       | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml

diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml
new file mode 100644
index 0000000000..95bd27852a
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml
@@ -0,0 +1,21 @@
+# 2024.07.29
+# Python ctypes relies on LD_LIBRARY_PATH and doesn't respect rpath linking. There is a workaround
+# for the EasyBuild context in https://github.com/easybuilders/easybuild-easyblocks/pull/3352.
+#
+# This rebuild ensures this fix is available for all Python versions shipped with EESSI.
+# 
+# See https://gitlab.com/eessi/support/-/issues/77
+easyconfigs:
+  - Python/3.10.8-GCCcore-12.2.0-bare
+      options:
+        include-easyblocks-from-pr: 3352
+  - Python/3.10.8-GCCcore-12.2.0
+      options:
+        include-easyblocks-from-pr: 3352
+  - Python/3.11.3-GCCcore-12.3.0
+      options:
+        include-easyblocks-from-pr: 3352
+  - Python/3.11.5-GCCcore-13.2.0
+      options:
+        include-easyblocks-from-pr: 3352
+  - librosa-0.10.1-foss-2023a.eb

From bfd12d220e9487939a5b6c1372d074a7290c579e Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn1.local.snellius.surf.nl>
Date: Mon, 29 Jul 2024 15:44:23 +0200
Subject: [PATCH 16/34] Finish with colon if we want to pass options

---
 .../2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml
index 95bd27852a..6fa1b34992 100644
--- a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml
@@ -6,16 +6,16 @@
 # 
 # See https://gitlab.com/eessi/support/-/issues/77
 easyconfigs:
-  - Python/3.10.8-GCCcore-12.2.0-bare
+  - Python/3.10.8-GCCcore-12.2.0-bare:
       options:
         include-easyblocks-from-pr: 3352
-  - Python/3.10.8-GCCcore-12.2.0
+  - Python/3.10.8-GCCcore-12.2.0:
       options:
         include-easyblocks-from-pr: 3352
-  - Python/3.11.3-GCCcore-12.3.0
+  - Python/3.11.3-GCCcore-12.3.0:
       options:
         include-easyblocks-from-pr: 3352
-  - Python/3.11.5-GCCcore-13.2.0
+  - Python/3.11.5-GCCcore-13.2.0:
       options:
         include-easyblocks-from-pr: 3352
   - librosa-0.10.1-foss-2023a.eb

From 0f816f5a9e4081b3abccae0851f3a22cd9c187fd Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn1.local.snellius.surf.nl>
Date: Mon, 29 Jul 2024 15:55:25 +0200
Subject: [PATCH 17/34] Move librosa to a regular EasyStack file, instead of a
 rebuilds

---
 .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml   | 1 +
 .../2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml         | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
index d405d17193..8db39671ee 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -27,3 +27,4 @@ easyconfigs:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20951
         from-commit: a92667fe32396bbd4106243658625f7ff2adcd68
   - amdahl-0.3.1-gompi-2023a.eb
+  - librosa-0.10.1-foss-2023a.eb
diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml
index 6fa1b34992..09dde357cd 100644
--- a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml
@@ -18,4 +18,3 @@ easyconfigs:
   - Python/3.11.5-GCCcore-13.2.0:
       options:
         include-easyblocks-from-pr: 3352
-  - librosa-0.10.1-foss-2023a.eb

From 66093b7a154bdbcd22bb5ce4dcbb6397951b4369 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn1.local.snellius.surf.nl>
Date: Mon, 29 Jul 2024 16:24:01 +0200
Subject: [PATCH 18/34] Replace slash with dash to make this a proper
 easyconfig name, instead of a module name

---
 .../2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml
index 09dde357cd..c73d67fcd2 100644
--- a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml
@@ -6,15 +6,15 @@
 # 
 # See https://gitlab.com/eessi/support/-/issues/77
 easyconfigs:
-  - Python/3.10.8-GCCcore-12.2.0-bare:
+  - Python-3.10.8-GCCcore-12.2.0-bare:
       options:
         include-easyblocks-from-pr: 3352
-  - Python/3.10.8-GCCcore-12.2.0:
+  - Python-3.10.8-GCCcore-12.2.0:
       options:
         include-easyblocks-from-pr: 3352
-  - Python/3.11.3-GCCcore-12.3.0:
+  - Python-3.11.3-GCCcore-12.3.0:
       options:
         include-easyblocks-from-pr: 3352
-  - Python/3.11.5-GCCcore-13.2.0:
+  - Python-3.11.5-GCCcore-13.2.0:
       options:
         include-easyblocks-from-pr: 3352

From a2041a00cdf4847ea71db941139bb4d83250f4e4 Mon Sep 17 00:00:00 2001
From: ocaisa <alan.ocais@cecam.org>
Date: Tue, 30 Jul 2024 09:10:49 +0200
Subject: [PATCH 19/34] Update 20240729-eb-4.9.2-Python-ctypes.yml

---
 .../rebuilds/20240729-eb-4.9.2-Python-ctypes.yml     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml
index c73d67fcd2..7554289c3b 100644
--- a/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240729-eb-4.9.2-Python-ctypes.yml
@@ -8,13 +8,17 @@
 easyconfigs:
   - Python-3.10.8-GCCcore-12.2.0-bare:
       options:
-        include-easyblocks-from-pr: 3352
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3352
+        include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f
   - Python-3.10.8-GCCcore-12.2.0:
       options:
-        include-easyblocks-from-pr: 3352
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3352
+        include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f
   - Python-3.11.3-GCCcore-12.3.0:
       options:
-        include-easyblocks-from-pr: 3352
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3352
+        include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f
   - Python-3.11.5-GCCcore-13.2.0:
       options:
-        include-easyblocks-from-pr: 3352
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3352
+        include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f

From bbe101b0dda05658d2f0692f8d65132fa7ab6900 Mon Sep 17 00:00:00 2001
From: ocaisa <alan.ocais@cecam.org>
Date: Tue, 30 Jul 2024 13:16:15 +0200
Subject: [PATCH 20/34] Update eessi_archdetect.sh

---
 init/eessi_archdetect.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init/eessi_archdetect.sh b/init/eessi_archdetect.sh
index 001683f50a..ad6dce6f9a 100755
--- a/init/eessi_archdetect.sh
+++ b/init/eessi_archdetect.sh
@@ -9,7 +9,7 @@ if [ -n "$BASH_VERSION" ]; then
 
     # Check if the major version is 4 or higher
     if [ "$major_version" -lt 4 ]; then
-        echo "Error: This script must be run with Bash > 4, you have $BASH_VERSION." >&2
+        echo "Error: This script must be run with Bash >= 4, you have $BASH_VERSION." >&2
         exit 1
     fi
 else

From 9a2e0a1532154e6654ff504fc0887aee8f1ae99f Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn1.local.snellius.surf.nl>
Date: Wed, 31 Jul 2024 10:50:16 +0200
Subject: [PATCH 21/34] Add SciTools-iris and xarray

---
 .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml  | 2 ++
 .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
index ade226c217..2536c4bcc5 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -1,2 +1,4 @@
 easyconfigs:
   - BCFtools-1.18-GCC-12.3.0.eb
+  - xarray-2023.9.0-gfbf-2023a.eb
+  - SciTools-Iris-3.9.0-foss-2023a.eb
diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml
index 38bfa81142..39294717b6 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml
@@ -1,3 +1,4 @@
 easyconfigs:
   - IPython-8.17.2-GCCcore-13.2.0.eb
   - dlb-3.4-gompi-2023b.eb
+  - xarray-2024.5.0-gfbf-2023b.eb

From 1ba5d41de2cbfce6cc51fb6b14ebdcd28b99538f Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@int4.local.snellius.surf.nl>
Date: Wed, 31 Jul 2024 16:08:41 +0200
Subject: [PATCH 22/34] Remove xarray for 2023b. There's no rush, and this one
 is not in eb 4.9.2 yet.

---
 .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml
index 39294717b6..38bfa81142 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023b.yml
@@ -1,4 +1,3 @@
 easyconfigs:
   - IPython-8.17.2-GCCcore-13.2.0.eb
   - dlb-3.4-gompi-2023b.eb
-  - xarray-2024.5.0-gfbf-2023b.eb

From f8ebe2036dc9f5baca1205ffb82d47e078aec506 Mon Sep 17 00:00:00 2001
From: ocaisa <alan.ocais@cecam.org>
Date: Thu, 1 Aug 2024 11:15:41 +0200
Subject: [PATCH 23/34] Update
 easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml

---
 .../2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
index c56b8e05fd..fdd1a80630 100644
--- a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -15,4 +15,4 @@ easyconfigs:
   - Highway-1.0.4-GCCcore-12.3.0.eb:
       options:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20942
-        from-pr: 20942
+        from-commit: 524da37b903585cea5a9eeb4156d1c8d57636bd8

From 544b9beddc89f2d4b547822a883cac4a7383aa5d Mon Sep 17 00:00:00 2001
From: ocaisa <alan.ocais@cecam.org>
Date: Thu, 1 Aug 2024 14:00:31 +0200
Subject: [PATCH 24/34] Update
 easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml

---
 .../2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml                | 1 -
 1 file changed, 1 deletion(-)

diff --git a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
index fdd1a80630..5773087db3 100644
--- a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -11,7 +11,6 @@ easyconfigs:
       options:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20958
         from-commit: dbadb2074464d816740ee0e95595c2cb31b6338f
-  #- Highway-1.0.4-GCCcore-12.3.0.eb
   - Highway-1.0.4-GCCcore-12.3.0.eb:
       options:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20942

From 3931e33132179ff505f2b126a507fe14f09db125 Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Thu, 1 Aug 2024 20:57:09 +0200
Subject: [PATCH 25/34] {2023.06,2023a+2023b,zen4} Rebuild Python + add librosa
 0.10.1

---
 .../20240801-eb-4.9.2-Python-ctypes-zen4.yml    | 17 +++++++++++++++++
 .../zen4/eessi-2023.06-eb-4.9.2-2023a.yml       |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 easystacks/software.eessi.io/2023.06/rebuilds/20240801-eb-4.9.2-Python-ctypes-zen4.yml

diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20240801-eb-4.9.2-Python-ctypes-zen4.yml b/easystacks/software.eessi.io/2023.06/rebuilds/20240801-eb-4.9.2-Python-ctypes-zen4.yml
new file mode 100644
index 0000000000..2104b4d836
--- /dev/null
+++ b/easystacks/software.eessi.io/2023.06/rebuilds/20240801-eb-4.9.2-Python-ctypes-zen4.yml
@@ -0,0 +1,17 @@
+# 2024.08.01
+# Python ctypes relies on LD_LIBRARY_PATH and doesn't respect rpath linking. There is a workaround
+# for the EasyBuild context in https://github.com/easybuilders/easybuild-easyblocks/pull/3352.
+#
+# This rebuild ensures this fix is available for all Python versions shipped for
+# zen4 with EESSI.
+# 
+# See https://gitlab.com/eessi/support/-/issues/77
+easyconfigs:
+  - Python-3.11.3-GCCcore-12.3.0:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3352
+        include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f
+  - Python-3.11.5-GCCcore-13.2.0:
+      options:
+        # See https://github.com/easybuilders/easybuild-easyblocks/pull/3352
+        include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f
diff --git a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
index 5773087db3..825b1f5082 100644
--- a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -15,3 +15,4 @@ easyconfigs:
       options:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20942
         from-commit: 524da37b903585cea5a9eeb4156d1c8d57636bd8
+  - librosa-0.10.1-foss-2023a.eb

From 448f0ab05440c4904a64cf5b83d9f340f349f54c Mon Sep 17 00:00:00 2001
From: Richard Top <richard.topouchian@uib.no>
Date: Mon, 5 Aug 2024 06:52:05 +0000
Subject: [PATCH 26/34] {2023.06}[GCCcore/12.2.0][GCCcore/12.3.0] BioPerl
 v1.7.8

---
 .../2023.06/eessi-2023.06-eb-4.9.2-2022b.yml          |  1 +
 .../2023.06/eessi-2023.06-eb-4.9.2-2023a.yml          |  1 +
 eb_hooks.py                                           | 11 +++++++++++
 3 files changed, 13 insertions(+)

diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml
index 7a04eaa9d3..27a79d8c80 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml
@@ -1,2 +1,3 @@
 easyconfigs:
   - BLAST+-2.14.0-gompi-2022b.eb
+  - BioPerl-1.7.8-GCCcore-12.2.0.eb 
diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
index 90dda5236b..e60cd83909 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -30,3 +30,4 @@ easyconfigs:
   - librosa-0.10.1-foss-2023a.eb
   - xarray-2023.9.0-gfbf-2023a.eb
   - SciTools-Iris-3.9.0-foss-2023a.eb
+  - BioPerl-1.7.8-GCCcore-12.3.0.eb
diff --git a/eb_hooks.py b/eb_hooks.py
index 7f7e4e57bd..eafcb5b417 100644
--- a/eb_hooks.py
+++ b/eb_hooks.py
@@ -647,6 +647,16 @@ def post_sanitycheck_hook(self, *args, **kwargs):
         POST_SANITYCHECK_HOOKS[self.name](self, *args, **kwargs)
 
 
+def post_sanitycheck_bioperl(self, *args, **kwargs):
+    """
+    Allow the copy of easyblock perlmodule.py to /tmp/eb... after sanity check by changing directory permissions 
+    """
+    if self.name == 'BioPerl':
+        print_msg("Adding user write permission for EasyBuild directories under /tmp/eb*...")
+        bioperlcmd = "chmod u+w -R /tmp/eb*"
+        run_cmd(bioperlcmd)
+
+
 def post_sanitycheck_cuda(self, *args, **kwargs):
     """
     Remove files from CUDA installation that we are not allowed to ship,
@@ -791,5 +801,6 @@ def inject_gpu_property(ec):
 }
 
 POST_SANITYCHECK_HOOKS = {
+    'BioPerl': post_sanitycheck_bioperl,
     'CUDA': post_sanitycheck_cuda,
 }

From 4b37ea27c969fea88211761141238e4f65b90872 Mon Sep 17 00:00:00 2001
From: Richard Top <richard.topouchian@uib.no>
Date: Mon, 5 Aug 2024 12:42:33 +0000
Subject: [PATCH 27/34] removed BioPerl hook

---
 eb_hooks.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/eb_hooks.py b/eb_hooks.py
index eafcb5b417..7f7e4e57bd 100644
--- a/eb_hooks.py
+++ b/eb_hooks.py
@@ -647,16 +647,6 @@ def post_sanitycheck_hook(self, *args, **kwargs):
         POST_SANITYCHECK_HOOKS[self.name](self, *args, **kwargs)
 
 
-def post_sanitycheck_bioperl(self, *args, **kwargs):
-    """
-    Allow the copy of easyblock perlmodule.py to /tmp/eb... after sanity check by changing directory permissions 
-    """
-    if self.name == 'BioPerl':
-        print_msg("Adding user write permission for EasyBuild directories under /tmp/eb*...")
-        bioperlcmd = "chmod u+w -R /tmp/eb*"
-        run_cmd(bioperlcmd)
-
-
 def post_sanitycheck_cuda(self, *args, **kwargs):
     """
     Remove files from CUDA installation that we are not allowed to ship,
@@ -801,6 +791,5 @@ def inject_gpu_property(ec):
 }
 
 POST_SANITYCHECK_HOOKS = {
-    'BioPerl': post_sanitycheck_bioperl,
     'CUDA': post_sanitycheck_cuda,
 }

From 9bf2ce3824d34d5eff7f80000f1916ddc6054fba Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn1.local.snellius.surf.nl>
Date: Mon, 5 Aug 2024 18:02:12 +0200
Subject: [PATCH 28/34] Add modflow for zen4

---
 .../2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
index 09f525364f..959d4fe92d 100644
--- a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -2,3 +2,4 @@ easyconfigs:
   - ESPResSo-4.2.2-foss-2023a.eb
   - TensorFlow-2.13.0-foss-2023a.eb
   - R-4.3.2-gfbf-2023a.eb
+  - MODFLOW-6.4.4-foss-2023a.eb

From b2341ff68e5bdfeb3189c92e342fec3ef2653e28 Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Tue, 6 Aug 2024 11:55:15 +0200
Subject: [PATCH 29/34] {2023.06}[foss/2023a] grpcio v1.57.0

---
 .../2023.06/eessi-2023.06-eb-4.9.2-2023a.yml        |  1 +
 eb_hooks.py                                         | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
index 90dda5236b..a8a38ec80c 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -30,3 +30,4 @@ easyconfigs:
   - librosa-0.10.1-foss-2023a.eb
   - xarray-2023.9.0-gfbf-2023a.eb
   - SciTools-Iris-3.9.0-foss-2023a.eb
+  - grpcio-1.57.0-GCCcore-12.3.0.eb
diff --git a/eb_hooks.py b/eb_hooks.py
index 7f7e4e57bd..13b619344a 100644
--- a/eb_hooks.py
+++ b/eb_hooks.py
@@ -220,6 +220,19 @@ def parse_hook_fontconfig_add_fonts(ec, eprefix):
         raise EasyBuildError("fontconfig-specific hook triggered for non-fontconfig easyconfig?!")
 
 
+def parse_hook_grpcio_zlib(ec, ecprefix):
+    """Adjust preinstallopts to use ZLIB from compat layer."""
+    if ec.name == 'grpcio' and ec.version in ['1.57.0']:
+        exts_list = ec['exts_list']
+        original_preinstallopts = (exts_list[0][2])['preinstallopts']
+        original_option = "GRPC_PYTHON_BUILD_SYSTEM_ZLIB=True"
+        new_option = "GRPC_PYTHON_BUILD_SYSTEM_ZLIB=False"
+        (exts_list[0][2])['preinstallopts'] = original_preinstallopts.replace(original_option, new_option, 1)
+        print_msg("Modified the easyconfig to use compat ZLIB with GRPC_PYTHON_BUILD_SYSTEM_ZLIB=False")
+    else:
+        raise EasyBuildError("grpcio-specific hook triggered for a non-grpcio easyconfig?!")
+
+
 def parse_hook_openblas_relax_lapack_tests_num_errors(ec, eprefix):
     """Relax number of failing numerical LAPACK tests for aarch64/neoverse_v1 CPU target for OpenBLAS < 0.3.23"""
     cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')

From e194d2a88a2b38879ac816a392ff77c145480583 Mon Sep 17 00:00:00 2001
From: Richard Top <richard.topouchian@uib.no>
Date: Tue, 6 Aug 2024 11:28:00 +0000
Subject: [PATCH 30/34] Added --include-easyblock and an issue reference to
 EasyBuild framework

---
 .../2023.06/eessi-2023.06-eb-4.9.2-2022b.yml                 | 5 ++++-
 .../2023.06/eessi-2023.06-eb-4.9.2-2023a.yml                 | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml
index 27a79d8c80..1c4ea68b3f 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml
@@ -1,3 +1,6 @@
 easyconfigs:
   - BLAST+-2.14.0-gompi-2022b.eb
-  - BioPerl-1.7.8-GCCcore-12.2.0.eb 
+  - BioPerl-1.7.8-GCCcore-12.2.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-framework/issues/4602 
+        include-easyblocks-from-commit: 89ea2e4737d792055de828e18f38bccee26b76cf 
diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
index e60cd83909..a5b425dc09 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -30,4 +30,7 @@ easyconfigs:
   - librosa-0.10.1-foss-2023a.eb
   - xarray-2023.9.0-gfbf-2023a.eb
   - SciTools-Iris-3.9.0-foss-2023a.eb
-  - BioPerl-1.7.8-GCCcore-12.3.0.eb
+  - BioPerl-1.7.8-GCCcore-12.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-framework/issues/4602 
+        include-easyblocks-from-commit: 89ea2e4737d792055de828e18f38bccee26b76cf

From 475653cd5a84f8ac8608dbc1fc471404ed68f4cd Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Tue, 6 Aug 2024 13:38:22 +0200
Subject: [PATCH 31/34] enable parse hook for grpcio

---
 eb_hooks.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eb_hooks.py b/eb_hooks.py
index 13b619344a..73e1ff7df6 100644
--- a/eb_hooks.py
+++ b/eb_hooks.py
@@ -756,6 +756,7 @@ def inject_gpu_property(ec):
     'casacore': parse_hook_casacore_disable_vectorize,
     'CGAL': parse_hook_cgal_toolchainopts_precise,
     'fontconfig': parse_hook_fontconfig_add_fonts,
+    'grpcio': parse_hook_grpcio_zlib,
     'LAMMPS': parse_hook_lammps_remove_deps_for_CI_aarch64,
     'CP2K': parse_hook_CP2K_remove_deps_for_aarch64,
     'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors,

From 448e6b30c47dbea249c0ed6f89880ed229f3e659 Mon Sep 17 00:00:00 2001
From: ocaisa <alan.ocais@cecam.org>
Date: Tue, 6 Aug 2024 16:16:59 +0200
Subject: [PATCH 32/34] Apply suggestions from code review

---
 .../2023.06/eessi-2023.06-eb-4.9.2-2022b.yml                  | 4 ++--
 .../2023.06/eessi-2023.06-eb-4.9.2-2023a.yml                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml
index 1c4ea68b3f..140876f43b 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml
@@ -2,5 +2,5 @@ easyconfigs:
   - BLAST+-2.14.0-gompi-2022b.eb
   - BioPerl-1.7.8-GCCcore-12.2.0.eb:
       options:
-        # see https://github.com/easybuilders/easybuild-framework/issues/4602 
-        include-easyblocks-from-commit: 89ea2e4737d792055de828e18f38bccee26b76cf 
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21136
+        from-commit: d8076ebaf8cb915762adebf88d385cc672b350dc 
diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
index 14dc2a17bc..e07ed409a4 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -38,5 +38,5 @@ easyconfigs:
         from-commit: f0e91e6e430ebf902f7788ebb47f0203dee60649
   - BioPerl-1.7.8-GCCcore-12.3.0.eb:
       options:
-        # see https://github.com/easybuilders/easybuild-framework/issues/4602 
-        include-easyblocks-from-commit: 89ea2e4737d792055de828e18f38bccee26b76cf
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21136
+        from-commit: d8076ebaf8cb915762adebf88d385cc672b350dc

From dc0d5f8fc258257fe24c3dbaffee13a21c8cc48f Mon Sep 17 00:00:00 2001
From: Richard Top <richard.topouchian@uib.no>
Date: Wed, 7 Aug 2024 07:29:00 +0000
Subject: [PATCH 33/34] {2023.06}[GCCcore/12.2.0] gnuplot v5.4.6

---
 .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml
index 140876f43b..d0f9f66b06 100644
--- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml
+++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2022b.yml
@@ -3,4 +3,5 @@ easyconfigs:
   - BioPerl-1.7.8-GCCcore-12.2.0.eb:
       options:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21136
-        from-commit: d8076ebaf8cb915762adebf88d385cc672b350dc 
+        from-commit: d8076ebaf8cb915762adebf88d385cc672b350dc
+  - gnuplot-5.4.6-GCCcore-12.2.0.eb 

From 7f2bd7cc87de25c1c2d90d8ae9dd76b6153e2201 Mon Sep 17 00:00:00 2001
From: Richard Top <richard.topouchian@uib.no>
Date: Wed, 7 Aug 2024 07:45:45 +0000
Subject: [PATCH 34/34] {2023.06,zen4}[2023a] BioPerl 1.7.8

---
 .../2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
index 79d6136af9..871958f363 100644
--- a/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
+++ b/easystacks/software.eessi.io/2023.06/zen4/eessi-2023.06-eb-4.9.2-2023a.yml
@@ -17,3 +17,7 @@ easyconfigs:
         from-commit: 524da37b903585cea5a9eeb4156d1c8d57636bd8
   - librosa-0.10.1-foss-2023a.eb
   - R-bundle-Bioconductor-3.18-foss-2023a-R-4.3.2.eb
+  - BioPerl-1.7.8-GCCcore-12.3.0.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21136
+        from-commit: d8076ebaf8cb915762adebf88d385cc672b350dc