diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 7fbacae57..d486874f7 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -307,6 +307,8 @@ packages: # Note - we can remove upp from stack at some point? upp: require: '@10.0.10' + uwtools: + require: '@2.7.2' # Need extradeps for grib-utils, which ties us to w3ecm@:2.11 w3emc: require: diff --git a/configs/sites/tier1/orion/packages.yaml b/configs/sites/tier1/orion/packages.yaml index a7ef7c899..d469336de 100644 --- a/configs/sites/tier1/orion/packages.yaml +++ b/configs/sites/tier1/orion/packages.yaml @@ -91,10 +91,6 @@ packages: externals: - spec: openssh@8.7p1 prefix: /usr - openssl: - externals: - - spec: openssl@3.0.1 - prefix: /usr perl: externals: - spec: perl@5.32.1~cpanm+opcode+open+shared+threads diff --git a/spack b/spack index 43381fe76..29265cff4 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 43381fe761f7280ac91fbdda462f86a062979843 +Subproject commit 29265cff4abb9a7f48e19165ee0bdaf6ceb8d317 diff --git a/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py b/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py index bfb4bc708..1ea9f8b82 100644 --- a/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py +++ b/spack-ext/repos/spack-stack/packages/global-workflow-env/package.py @@ -45,5 +45,6 @@ class GlobalWorkflowEnv(BundlePackage): depends_on("gsi-ncdiag") depends_on("crtm") depends_on("py-wxflow", when="+python") + depends_on("uwtools") # There is no need for install() since there is no code.