From 3f86fa26e8ccb794adc198fd4aa6abf19c1f8f1c Mon Sep 17 00:00:00 2001
From: Simon Branford <4967+branfosj@users.noreply.github.com>
Date: Tue, 13 Aug 2024 17:39:23 +0100
Subject: [PATCH 1/2] stop RStudio-Server installing R packages

---
 .../RStudio-Server-2023.09.1+494-gfbf-2023a-Java-11-R-4.3.2.eb  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/easybuild/easyconfigs/r/RStudio-Server/RStudio-Server-2023.09.1+494-gfbf-2023a-Java-11-R-4.3.2.eb b/easybuild/easyconfigs/r/RStudio-Server/RStudio-Server-2023.09.1+494-gfbf-2023a-Java-11-R-4.3.2.eb
index 020dde50a43..f95b26d2a6a 100644
--- a/easybuild/easyconfigs/r/RStudio-Server/RStudio-Server-2023.09.1+494-gfbf-2023a-Java-11-R-4.3.2.eb
+++ b/easybuild/easyconfigs/r/RStudio-Server/RStudio-Server-2023.09.1+494-gfbf-2023a-Java-11-R-4.3.2.eb
@@ -36,6 +36,7 @@ dependencies = [
     ('Boost', '1.82.0'),
     ('Java', '11', '', SYSTEM),
     ('R', '4.3.2'),
+    ('R-bundle-CRAN', '2023.12'),
     ('SOCI', '4.0.3'),
     ('yaml-cpp', '0.7.0'),
 ]
@@ -52,7 +53,6 @@ preconfigopts = " && ".join([
     "./install-dictionaries",
     "./install-mathjax",
     "./install-pandoc",
-    "./install-packages",
     "./install-panmirror",
     "./install-npm-dependencies)",
     ""

From 271a36fcc22d0c56d856716a3ffe30f481f9b2d4 Mon Sep 17 00:00:00 2001
From: Simon Branford <4967+branfosj@users.noreply.github.com>
Date: Tue, 13 Aug 2024 18:09:21 +0100
Subject: [PATCH 2/2] requires change in toolchain

---
 ... RStudio-Server-2023.09.1+494-foss-2023a-Java-11-R-4.3.2.eb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename easybuild/easyconfigs/r/RStudio-Server/{RStudio-Server-2023.09.1+494-gfbf-2023a-Java-11-R-4.3.2.eb => RStudio-Server-2023.09.1+494-foss-2023a-Java-11-R-4.3.2.eb} (98%)

diff --git a/easybuild/easyconfigs/r/RStudio-Server/RStudio-Server-2023.09.1+494-gfbf-2023a-Java-11-R-4.3.2.eb b/easybuild/easyconfigs/r/RStudio-Server/RStudio-Server-2023.09.1+494-foss-2023a-Java-11-R-4.3.2.eb
similarity index 98%
rename from easybuild/easyconfigs/r/RStudio-Server/RStudio-Server-2023.09.1+494-gfbf-2023a-Java-11-R-4.3.2.eb
rename to easybuild/easyconfigs/r/RStudio-Server/RStudio-Server-2023.09.1+494-foss-2023a-Java-11-R-4.3.2.eb
index f95b26d2a6a..56585dad1c0 100644
--- a/easybuild/easyconfigs/r/RStudio-Server/RStudio-Server-2023.09.1+494-gfbf-2023a-Java-11-R-4.3.2.eb
+++ b/easybuild/easyconfigs/r/RStudio-Server/RStudio-Server-2023.09.1+494-foss-2023a-Java-11-R-4.3.2.eb
@@ -18,7 +18,7 @@ and then used with:
   rserver ... --database-config-file="${MYTMP}/db.conf"
 """
 
-toolchain = {'name': 'gfbf', 'version': '2023a'}
+toolchain = {'name': 'foss', 'version': '2023a'}
 
 source_urls = ['https://github.com/rstudio/rstudio/archive']
 sources = ['v%(version)s.tar.gz']