From da388defd91647eddf1f80fc1c135ecd6513372e Mon Sep 17 00:00:00 2001
From: Harshula Jayasuriya <harshula.jayasuriya@anu.edu.au>
Date: Fri, 31 Jan 2025 14:41:07 +1100
Subject: [PATCH] Set the spack-version explicitly when @git.<gitref> is used

* Spack upstream is planning to insert a spack-version when one is
  not explicitly provided.
* The error we saw when using `spack config change` can be avoided
  when a spack-version is explicitly provided.
* The latest spack-packages repository contains changes that this
  change requires.
---
 config/versions.json |  2 +-
 spack.yaml           | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/versions.json b/config/versions.json
index 9e7d8cc..8965f43 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,5 +1,5 @@
 {
     "$schema": "https://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json",
     "spack": "0.22",
-    "spack-packages": "2024.03.22"
+    "spack-packages": "2025.01.1"
 }
diff --git a/spack.yaml b/spack.yaml
index bfa6df2..5228c50 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -5,20 +5,20 @@
 spack:
   # add package specs to the `specs` list
   specs:
-    - access-om2@git.2024.03.0
+    - access-om2@git.2024.03.0=access-om2
   packages:
     cice5:
       require:
-        - '@git.2023.10.19'
+        - '@git.2023.10.19=access-om2'
     mom5:
       require:
-        - '@git.2023.11.09'
+        - '@git.2023.11.09=access-om2'
     libaccessom2:
       require:
-        - '@git.2023.10.26'
+        - '@git.2023.10.26=access-om2'
     oasis3-mct:
       require:
-        - '@git.2023.11.09'
+        - '@git.2023.11.09=access-om2'
     netcdf-c:
       require:
         - '@4.7.4'