From 2ea74d65ea9830a39938510bd0e2ebb3d3067c62 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck <wdconinc@gmail.com> Date: Sun, 3 Dec 2023 19:44:10 +0000 Subject: [PATCH] fix: spack cherry-pick root package name in conflicts --- spack.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spack.sh b/spack.sh index 9ee78d9db..9e46b3cf3 100644 --- a/spack.sh +++ b/spack.sh @@ -60,6 +60,7 @@ a65f13f79f617b6aa0b235aa5db612473b6d8c0e ed8ecc469e7b87842a876323878831e301f136a2 4991a60eacb5df289383f755e40702b720ed0513 c485709f625429a88a184a099373d76c9438f8e3 +e91db7793038b4e7235c8ec7c82244afbb9dfc9e 81e73b4dd4ea0bf6c6947359d3cee9d4270df13d 6f08daf67020289e6a5ed1df9783ac5b2919e477 --- @@ -121,5 +122,6 @@ c485709f625429a88a184a099373d76c9438f8e3 ## ed8ecc469e7b87842a876323878831e301f136a2: podio: Add the latest tag (0.17.2) ## 4991a60eacb5df289383f755e40702b720ed0513: podio: Add latest tag 0.17.3 ## c485709f625429a88a184a099373d76c9438f8e3: iwyu: new versions up 0.21 (depends_on llvm-17) +## e91db7793038b4e7235c8ec7c82244afbb9dfc9e: root: Add package name to all conflict messages ## 81e73b4dd4ea0bf6c6947359d3cee9d4270df13d: root: new version 6.30.00 ## 6f08daf67020289e6a5ed1df9783ac5b2919e477: root: add a webgui patch -- GitLab