From 9cae68ac8853027367934b819004b78b8192bc86 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 28 Mar 2024 16:59:03 +0000
Subject: [PATCH] chore: eic-spack root: add 6.30 forward compatibility fix
---
containers/jug/dev.Dockerfile | 3 +++
eic-spack.sh | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 9897c52a0..a3e965cbc 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -311,6 +311,9 @@ mv /usr/._local/${PREFIX_PATH} /usr/local
ln -s /usr/local /usr/._local/${PREFIX_PATH}
EOF
+## set ROOT TFile forward compatibility
+RUN sed -i 's/# \(TFile.v630forwardCompatibility:\) no/\1 yes/' /usr/local/etc/root/system.rootrc
+
## set the local spack configuration
ENV SPACK_DISABLE_LOCAL_CONFIG="true"
RUN <<EOF
diff --git a/eic-spack.sh b/eic-spack.sh
index f0d2b6748..534f82a96 100644
--- a/eic-spack.sh
+++ b/eic-spack.sh
@@ -3,7 +3,7 @@ EICSPACK_ORGREPO="eic/eic-spack"
## EIC spack commit hash or github version, e.g. v0.19.7
## note: nightly builds could use a branch e.g. releases/v0.19
-EICSPACK_VERSION="5a7e0e41ab9a8a6cbeda6b2f2c68129ce178f578"
+EICSPACK_VERSION="23e83fea6641a0771d85cecaae1f9a4f3c084bfb"
## Space-separated list of eic-spack cherry-picks
read -r -d '' EICSPACK_CHERRYPICKS <<- \
--
GitLab