From 5669792ca580bbde7c60d6617daf7de7f3941d4f Mon Sep 17 00:00:00 2001
From: Harshula Jayasuriya <harshula.jayasuriya@anu.edu.au>
Date: Tue, 13 Feb 2024 11:06:57 +1100
Subject: [PATCH] nci-openmpi: do not rely on implicit import of spack.package
 (#64)

* Spack is planning on removing the implicit import of spack.package.
  See https://github.com/spack/spack/pull/39380
* Recommended changes from the code review have been added.
  See https://github.com/ACCESS-NRI/spack-packages/pull/21
---
 packages/nci-openmpi/package.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/nci-openmpi/package.py b/packages/nci-openmpi/package.py
index 260bf9f..3af2e6e 100644
--- a/packages/nci-openmpi/package.py
+++ b/packages/nci-openmpi/package.py
@@ -1,7 +1,8 @@
-## Adapted from https://github.com/spack/spack/blob/v0.20.0/var/spack/repos/builtin/packages/openmpi/package.py
-## Scott Wales 2023
+# Adapted from https://github.com/spack/spack/blob/v0.20.0/var/spack/repos/builtin/packages/openmpi/package.py
+# Scott Wales 2023
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+from spack.package import *
 
 class NciOpenmpi(Package):
     """
@@ -14,6 +15,8 @@ class NciOpenmpi(Package):
           externals:
             - spec: nci-openmpi@4.1.4
               prefix: /apps/openmpi/4.1.4
+              modules:
+              - openmpi/4.1.4
           buildable: False
     """