From 6274691ae73a7a50011bb2c87902b80ceb1631ef Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sun, 8 Sep 2024 21:23:05 +0000
Subject: [PATCH] Revert "fix: reenable dbg and prod"

This reverts merge request !923
---
 .gitlab-ci.yml                    | 4 ++--
 spack-environment/dbg/spack.yaml  | 2 --
 spack-environment/packages.yaml   | 6 +++---
 spack-environment/prod/spack.yaml | 6 ++----
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b34a1e6b6..0109963cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -310,8 +310,8 @@ eic:
         BUILD_IMAGE: eic_
         PLATFORM: linux/amd64
         ENV:
-        - dbg
-        - prod
+#        - dbg
+#        - prod
         - xl
 #      - BUILD_TYPE:
 #        - default
diff --git a/spack-environment/dbg/spack.yaml b/spack-environment/dbg/spack.yaml
index b1043ab70..ba53572ed 100644
--- a/spack-environment/dbg/spack.yaml
+++ b/spack-environment/dbg/spack.yaml
@@ -2,8 +2,6 @@ spack:
   include:
   - ../concretizer.yaml
   - ../packages.yaml
-  concretizer:
-    unify: true
   config:
     install_missing_compilers: false
   specs:
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index ac2ec5ec1..d48b74103 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -78,8 +78,8 @@ packages:
   dd4hep:
     require:
     - '@1.29'
-    - +ddg4 +ddcad +hepmc3 +xercesc
-    - any_of: [+ddeve +utilityapps, -ddeve -utilityapps]
+    - +ddg4 +ddcad +hepmc3 +utilityapps +xercesc
+    - any_of: [+ddeve, -ddeve]
   dpmjet:
     require:
     - '@19.3.5'
@@ -148,7 +148,7 @@ packages:
   geant4:
     require:
     - '@11.2.2.east'
-    - cxxstd=20 -vecgeom +threads -timemory -vtk
+    - cxxstd=20 -vecgeom +threads -vtk
     - any_of: [+opengl +qt +x11, -opengl -qt -x11]
   gettext: 
     require:
diff --git a/spack-environment/prod/spack.yaml b/spack-environment/prod/spack.yaml
index 6abb6d77d..4cf7f9439 100644
--- a/spack-environment/prod/spack.yaml
+++ b/spack-environment/prod/spack.yaml
@@ -2,8 +2,6 @@ spack:
   include:
   - ../concretizer.yaml
   - ../packages.yaml
-  concretizer:
-    unify: true
   config:
     install_missing_compilers: false
   specs:
@@ -27,5 +25,5 @@ spack:
   - py-jinja2
   - py-jinja2-cli
   - py-pip
-  - root -opengl ~webgui ~x
-  - xrootd
+  - root -opengl
+  - xrootd
\ No newline at end of file
-- 
GitLab