From dd7b6eea241f57451ab8384170d520aa30032eda Mon Sep 17 00:00:00 2001
From: Nazar Bartosik <nazar.bartosik@cern.ch>
Date: Sun, 18 Jun 2023 15:31:20 +0200
Subject: [PATCH 1/3] Removed redundant 'when' conditions

---
 packages/mucoll-stack/package.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/mucoll-stack/package.py b/packages/mucoll-stack/package.py
index e8237d9..ae5b5b7 100644
--- a/packages/mucoll-stack/package.py
+++ b/packages/mucoll-stack/package.py
@@ -31,8 +31,8 @@ class MucollStack(BundlePackage, Key4hepPackage):
     # should use `environments/mucoll-release/packages.yaml`
     version('2.8')
 
-    # this bundle package installs a custom setup script, so
-    # need to add the install phase 
+    # this bundle package installs a custom setup script,
+    # so need to add the install phase
     # (normally doesn't exist for a bundle package)
     phases = ['install']
 
@@ -113,19 +113,19 @@ class MucollStack(BundlePackage, Key4hepPackage):
         depends_on('onnx')
         depends_on('xgboost')
         # Python tools
-        depends_on('py-h5py', when='+devtools')
-        depends_on('py-ipython', when='+devtools')
-        depends_on('py-jupytext', when='+devtools')
-        depends_on('py-matplotlib', when='+devtools')
-        depends_on('py-onnxruntime', when='+devtools')
-        depends_on('py-onnx', when='+devtools')
-        depends_on('py-pandas', when='+devtools')
-        depends_on('py-particle', when='+devtools')
-        depends_on('py-pip', when='+devtools')
-        depends_on('py-scikit-learn', when='+devtools')
-        depends_on('py-scipy', when='+devtools')
-        depends_on('py-uproot', when='+devtools')
-        depends_on('py-xgboost', when='+devtools')
+        depends_on('py-h5py')
+        depends_on('py-ipython')
+        depends_on('py-jupytext')
+        depends_on('py-matplotlib')
+        depends_on('py-onnxruntime')
+        depends_on('py-onnx')
+        depends_on('py-pandas')
+        depends_on('py-particle')
+        depends_on('py-pip')
+        depends_on('py-scikit-learn')
+        depends_on('py-scipy')
+        depends_on('py-uproot')
+        depends_on('py-xgboost')
 
     ##################### conflicts #######################
     #######################################################

From a8771923099388248e2b3b928386166c3021b11a Mon Sep 17 00:00:00 2001
From: Nazar Bartosik <nazar.bartosik@cern.ch>
Date: Sun, 18 Jun 2023 21:40:59 +0200
Subject: [PATCH 2/3] Adjusted package version requirements to help concretizer

---
 environments/mucoll-release/packages.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/environments/mucoll-release/packages.yaml b/environments/mucoll-release/packages.yaml
index d5732e4..a830edc 100644
--- a/environments/mucoll-release/packages.yaml
+++ b/environments/mucoll-release/packages.yaml
@@ -104,11 +104,19 @@ packages:
   generalbrokenlines:
     require: '@2.2.1'
 
+  # Loose version requirements
+  gdb:
+    require: '@10:'
+  xrootd:
+    require: '@5:
+
   # Just variants. No specific version requirements
   fftw:
     variants: ~mpi
   mesa:
     variants: ~llvm+glx+opengl swr=none
+  tauola:
+    variants: ~lhapdf
 
   all:
     target: [x86_64]

From 13eb54d6d1fc5e897f4649c7e39c17b3a6b2c4c0 Mon Sep 17 00:00:00 2001
From: Nazar Bartosik <nazar.bartosik@cern.ch>
Date: Sun, 18 Jun 2023 21:43:09 +0200
Subject: [PATCH 3/3] Fixed a syntax error

---
 environments/mucoll-release/packages.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environments/mucoll-release/packages.yaml b/environments/mucoll-release/packages.yaml
index a830edc..fad0542 100644
--- a/environments/mucoll-release/packages.yaml
+++ b/environments/mucoll-release/packages.yaml
@@ -108,7 +108,7 @@ packages:
   gdb:
     require: '@10:'
   xrootd:
-    require: '@5:
+    require: '@5:'
 
   # Just variants. No specific version requirements
   fftw: