From 85e83e076b4ac4f4d1e389318de1bc8be723ddb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Moretti?= <smoretti@unil.ch>
Date: Wed, 14 Dec 2022 16:28:39 +0100
Subject: [PATCH 1/3] Add R 4.1.0

---
 EESSI-pilot-install-software.sh | 6 ++++++
 eessi-2021.12.yml               | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index dc50f7fae2..ee81c47196 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -356,6 +356,12 @@ fail_msg="Installation of WRF failed, that's unexpected..."
 OMPI_MCA_pml=ucx UCX_TLS=tcp $EB WRF-3.9.1.1-foss-2020a-dmpar.eb -r --include-easyblocks-from-pr 2648
 check_exit_code $? "${ok_msg}" "${fail_msg}"
 
+echo ">> Installing R 4.1.0 (better be patient)..."
+ok_msg="R installed, wow!"
+fail_msg="Installation of R failed, so sad..."
+$EB --from-pr 16386 R-4.1.0-foss-2021a.eb --robot --parallel-extensions-install --experimental
+check_exit_code $? "${ok_msg}" "${fail_msg}"
+
 echo ">> Installing Nextflow 22.10.1..."
 ok_msg="Nextflow installed, the work must flow..."
 fail_msg="Installation of Nextflow failed, that's unexpected..."
diff --git a/eessi-2021.12.yml b/eessi-2021.12.yml
index 58101777ca..2b00bfe5a8 100644
--- a/eessi-2021.12.yml
+++ b/eessi-2021.12.yml
@@ -53,6 +53,10 @@ software:
          versions: 
            '3.9.1.1': 
              versionsuffix: -dmpar
+  R:
+    toolchains:
+      foss-2021a:
+        versions: '4.1.0'
   Nextflow:
     toolchains:
       SYSTEM:

From 97af63be874103f62c026160b9734a0ffb5bf146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Moretti?= <smoretti@unil.ch>
Date: Tue, 20 Dec 2022 16:34:05 +0100
Subject: [PATCH 2/3] Move to a less problematic R 4.1.0 PR

---
 EESSI-pilot-install-software.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index ee81c47196..a33ebc9e54 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -359,7 +359,7 @@ check_exit_code $? "${ok_msg}" "${fail_msg}"
 echo ">> Installing R 4.1.0 (better be patient)..."
 ok_msg="R installed, wow!"
 fail_msg="Installation of R failed, so sad..."
-$EB --from-pr 16386 R-4.1.0-foss-2021a.eb --robot --parallel-extensions-install --experimental
+$EB --from-pr 16011 R-4.1.0-foss-2021a.eb --robot --parallel-extensions-install --experimental
 check_exit_code $? "${ok_msg}" "${fail_msg}"
 
 echo ">> Installing Nextflow 22.10.1..."

From 33a34203b40f838fb9f8bc6c1f27ee5c804ad2bb Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Tue, 20 Dec 2022 17:54:13 +0100
Subject: [PATCH 3/3] install X11 dependency for R 4.1.0 via PR to pick up
 patch that fixes installation problem for libXfont2 component

---
 EESSI-pilot-install-software.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index a33ebc9e54..b68ff1c93d 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -359,7 +359,7 @@ check_exit_code $? "${ok_msg}" "${fail_msg}"
 echo ">> Installing R 4.1.0 (better be patient)..."
 ok_msg="R installed, wow!"
 fail_msg="Installation of R failed, so sad..."
-$EB --from-pr 16011 R-4.1.0-foss-2021a.eb --robot --parallel-extensions-install --experimental
+$EB --from-pr 14821 X11-20210518-GCCcore-10.3.0.eb -r && $EB --from-pr 16011 R-4.1.0-foss-2021a.eb --robot --parallel-extensions-install --experimental
 check_exit_code $? "${ok_msg}" "${fail_msg}"
 
 echo ">> Installing Nextflow 22.10.1..."