JCSDA · climbfuji · Dec 18, 2025 · Dec 17, 2025 · Dec 17, 2025 · Dec 11, 2025
diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
@@ -161,6 +161,10 @@ packages:
     #gsl-lite:
     #  require:
     #  - '@0.37.0'
+    harfbuzz:
+      # cmake-based harfbuzz fails during build
+      require:
+      - one_of: ['build_system=meson', 'build_system=autotools']
     hdf:
       require:
       - '@4.2.15'

diff --git a/configs/sites/tier1/acorn/deployments.yaml b/configs/sites/tier1/acorn/deployments.yaml
@@ -1,6 +1,6 @@
 deployments:
   - template: "unified-dev"
-    compilers: ["oneapi-2024.2.1", "intel-19.1.3.304"]
+    compilers: ["oneapi@2024.2.1", "intel@19.1.3.304"]
     packages_to_install:
     - ufs-weather-model-env
     - global-workflow-env
@@ -20,7 +20,7 @@ deployments:
     - py-numpy
 
   - template: "nco"
-    compilers: ["oneapi-2024.2.1", "intel-19.1.3.304"]
+    compilers: ["oneapi@2024.2.1", "intel@19.1.3.304"]
     duplicates_to_ignore: ["crtm", "crtm-fix", "boost", "harfbuzz"]
     allowed_gcc_packages:
     - antlr

diff --git a/configs/sites/tier1/acorn/modules.yaml b/configs/sites/tier1/acorn/modules.yaml
@@ -5,3 +5,5 @@ modules:
     lmod:
       include:
       - python
+      all:
+        autoload: run
diff --git a/configs/sites/tier1/acorn/packages.yaml b/configs/sites/tier1/acorn/packages.yaml
@@ -12,7 +12,7 @@ packages:
   blas:
     require:: ['openblas']
   fftw-api:
-    require: ['fftw']
+    require:: ['fftw']
   jpeg:
     require: ['libjpeg-turbo']
   lapack:
@@ -39,6 +39,7 @@ packages:
     require: ['~crypto']
   nco:
     require:: ['%oneapi']
+  py-colorama:: {}
   py-pandas:
     require:: ['~excel']
   subversion:

diff --git a/configs/templates/nco/approved_list.txt → .../sites/tier1/wcoss2/approved_packages.txt b/configs/templates/nco/approved_list.txt → .../sites/tier1/wcoss2/approved_packages.txt
@@ -2,9 +2,9 @@ awscli
 bacio
 boost
 bufr
-bufr_dump
-bufr_tranjb
-bufr_util
+bufr-dump
+bufr-tranjb
+bufr-util
 cairo
 cdo
 cfitsio
@@ -28,14 +28,14 @@ gempak
 geos
 gfsio
 git
-grib_util
+grib-util
 gsl
 hdf5
 imagemagick
 ip
 ip2
 jasper
-lamp_shared
+lamp-shared
 landsfcutil
 libdap4
 libgeotiff
@@ -54,19 +54,20 @@ mbedtls
 met
 metis
 metplus
-mos_shared
+mos-shared
 nco
 ncview
 nemsio
 nemsiogfs
-netcdf
+netcdf-c
+netcdf-fortran
 perl
 pigz
 pio
 pixman
 prepobs
-prod_envir
-prod_util
+prod-envir
+prod-util
 proj
 python
 readline
@@ -79,11 +80,11 @@ sp
 subversion
 udunits
 upp
-util_shared
+util-shared
 w3emc
 w3nco
 wgrib2
-wrf_io
+wrf-io
 xyz2shp
 xz
 zlib
@@ -210,7 +211,7 @@ xproto
 xtrans
 xxhash
 zstd
-atlas
+ecmwf-atlas
 eckit
 fckit
 gsl-lite
@@ -223,3 +224,4 @@ glibc
 parallelio
 pkg-config
 ecbuild
+gsi-ncdiag
diff --git a/configs/sites/tier1/wcoss2/modules.yaml b/configs/sites/tier1/wcoss2/modules.yaml
@@ -11,6 +11,8 @@ modules:
       - netcdf_c_virtual
       - esmf_virtual
       - python_virtual
+      all:
+        autoload: run
       boost:
         suffixes:
           '%gcc': gcc
diff --git a/configs/sites/tier1/wcoss2/packages.yaml b/configs/sites/tier1/wcoss2/packages.yaml
@@ -12,7 +12,7 @@ packages:
   blas:
     require:: ['openblas']
   fftw-api:
-    require: ['fftw']
+    require:: ['fftw']
   jpeg:
     require: ['libjpeg-turbo']
   lapack:
@@ -55,6 +55,7 @@ packages:
     require:: ['%oneapi']
   netcdf-c:
     require:: ['@4.9.2', '+mpi', '~parallel-netcdf', '~dap', '~blosc', '~szip']
+  py-colorama:: {}
   py-pandas:
     require:: ['~excel']
   scotch:

diff --git a/repos/builtin b/repos/builtin
diff --git a/setup.sh b/setup.sh
@@ -25,7 +25,7 @@ echo "Sourcing spack environment ${SPACK_STACK_DIR}/spack/share/spack/setup-env.
 echo "Changing bootstrap path to $(spack bootstrap root '$spack/bootstrap')"
 
 # Get the current hash of the spack-stack code
-export SPACK_STACK_HASH=`git rev-parse --short HEAD`
+export SPACK_STACK_HASH=`cd $SPACK_STACK_DIR && git rev-parse --short HEAD`
 echo "Current hash of spack-stack is ${SPACK_STACK_HASH}"
 
 ## Register the spack extension
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,5 @@ modules: @@
         lmod:
           include:
           - python
+          all:
+            autoload: run
+17 −0		repos/spack_repo/builtin/packages/harfbuzz/harfbuzz_10_0_cmake_add_missing_table_sources.patch
+17 −0		repos/spack_repo/builtin/packages/harfbuzz/harfbuzz_11_2_cmake_add_missing_table_sources.patch
+17 −0		repos/spack_repo/builtin/packages/harfbuzz/harfbuzz_11_4_cmake_add_missing_table_sources.patch
+68 −33		repos/spack_repo/builtin/packages/harfbuzz/package.py
+2 −0		repos/spack_repo/builtin/packages/pango/package.py