add new BLT release

Without it, the build fails with errors like this:
```
Can't locate File/Compare.pm in @INC (you may need to install the File::Compare module) (@INC contains: ...) at ../../../src/backend/catalog/Catalog.pm line 19.
```

lib/spack/spack/build_environment.py

@@ -881,21 +881,6 @@ def get_rpath_deps(pkg: spack.package_base.PackageBase) -> List[spack.spec.Spec]
     return _get_rpath_deps_from_spec(pkg.spec, pkg.transitive_rpaths)
 
 
-def load_external_modules(pkg):
-    """Traverse a package's spec DAG and load any external modules.
-
-    Traverse a package's dependencies and load any external modules
-    associated with them.
-
-    Args:
-        pkg (spack.package_base.PackageBase): package to load deps for
-    """
-    for dep in list(pkg.spec.traverse()):
-        external_modules = dep.external_modules or []
-        for external_module in external_modules:
-            load_module(external_module)
-
-
 def setup_package(pkg, dirty, context: Context = Context.BUILD):
     """Execute all environment setup routines."""
     if context not in (Context.BUILD, Context.TEST):
@@ -946,7 +931,7 @@ def setup_package(pkg, dirty, context: Context = Context.BUILD):
         for mod in pkg.compiler.modules:
             load_module(mod)
 
-    load_external_modules(pkg)
+    load_external_modules(setup_context)
 
     # Make sure nothing's strange about the Spack environment.
     validate(env_mods, tty.warn)
@@ -1235,6 +1220,21 @@ def _make_runnable(self, dep: spack.spec.Spec, env: EnvironmentModifications):
                 env.prepend_path("PATH", bin_dir)
 
 
+def load_external_modules(context: SetupContext) -> None:
+    """Traverse a package's spec DAG and load any external modules.
+
+    Traverse a package's dependencies and load any external modules
+    associated with them.
+
+    Args:
+        context: A populated SetupContext object
+    """
+    for spec, _ in context.external:
+        external_modules = spec.external_modules or []
+        for external_module in external_modules:
+            load_module(external_module)
+
+
 def _setup_pkg_and_run(
     serialized_pkg: "spack.subprocess_context.PackageInstallContext",
     function: Callable,

share/spack/gitlab/cloud_pipelines/configs/win64/ci.yaml

@@ -5,6 +5,7 @@ ci:
       - Write-Output "Done"
 
       before_script::
+      - git config core.autocrlf true
       - fsutil 8dot3name set C:\ 0
       - . .\share\spack\setup-env.ps1
       - If (Test-Path -path C:\\key\intermediate_ci_signing_key.gpg) { spack.ps1 gpg trust C:\\key\intermediate_ci_signing_key.gpg }

var/spack/repos/builtin/packages/adios2/package.py

@@ -395,6 +395,7 @@ def test_examples(self):
         # Create the build tree within this spec's test stage dir so it gets
         # cleaned up automatically
         build_dir = tempfile.mkdtemp(dir=test_stage_dir)
+        cmake = Executable(spec["cmake"].prefix.bin.cmake)
 
         std_cmake_args = []
 
@@ -409,7 +410,7 @@ def test_examples(self):
                 self, "test_examples_build", purpose="build example against installed adios2"
             ):
                 cmake(src_dir, *std_cmake_args)
-                make()
+                cmake(*(["--build", "."]))
 
             for p in built_programs:
                 exe = which(join_path(".", p))

var/spack/repos/builtin/packages/blt/package.py

@@ -72,6 +72,7 @@ class Blt(Package):
     #  if you export targets this could cause problems in downstream
     #  projects if not handled properly. More info here:
     #  https://llnl-blt.readthedocs.io/en/develop/tutorial/exporting_targets.html
+    version("0.7.0", sha256="df8720a9cba1199d21f1d32649cebb9dddf95aa61bc3ac23f6c8a3c6b6083528")
     version("0.6.2", sha256="84b663162957c1fe0e896ac8e94cbf2b6def4a152ccfa12a293db14fb25191c8")
     version("0.6.1", sha256="205540b704b8da5a967475be9e8f2d1a5e77009b950e7fbf01c0edabc4315906")
     version("0.6.0", sha256="ede355e85f7b11d7c8442b51e4f7871c152093818606e00b1e1cf30f67ebdb23")

var/spack/repos/builtin/packages/ca-certificates-mozilla/package.py

@@ -14,12 +14,15 @@ class CaCertificatesMozilla(Package):
     maintainers("haampie")
 
     version(
-        "2024-12-31",
-        sha256="a3f328c21e39ddd1f2be1cea43ac0dec819eaa20a90425d7da901a11531b3aa5",
+        "2025-02-25",
+        sha256="50a6277ec69113f00c5fd45f09e8b97a4b3e32daa35d3a95ab30137a55386cef",
         expand=False,
     )
 
     with default_args(deprecated=True, expand=False):
+        version(
+            "2024-12-31", sha256="a3f328c21e39ddd1f2be1cea43ac0dec819eaa20a90425d7da901a11531b3aa5"
+        )
         version(
             "2024-11-26", sha256="bb1782d281fe60d4a2dcf41bc229abe3e46c280212597d4abcc25bddf667739b"
         )

var/spack/repos/builtin/packages/cairo/package.py

@@ -45,14 +45,18 @@ class Cairo(AutotoolsPackage, MesonPackage):
     variant("X", default=False, description="Build with X11 support")
     variant("gobject", default=False, description="Enable cairo's gobject functions feature")
 
+    variant("svg", default=False, description="Enable cairo's SVG functions feature")
+    variant("png", default=False, description="Enable cairo's PNG functions feature")
+
+    # doesn't exist @1.17.8: but kept as compatibility
+    variant("pdf", default=False, description="Enable cairo's PDF surface backend feature")
+
+    variant("ft", default=False, description="Enable cairo's FreeType font backend feature")
+    variant("fc", default=False, description="Enable cairo's Fontconfig font backend feature")
+
     # variants and build system depends for the autotools builds
     with when("build_system=autotools"):
-        variant("png", default=False, description="Enable cairo's PNG functions feature")
-        variant("svg", default=False, description="Enable cairo's SVG functions feature")
         variant("pic", default=True, description="Enable position-independent code (PIC)")
-        variant("pdf", default=False, description="Enable cairo's PDF surface backend feature")
-        variant("ft", default=False, description="Enable cairo's FreeType font backend feature")
-        variant("fc", default=False, description="Enable cairo's Fontconfig font backend feature")
 
         # seems to be an older cairo limitation as cairo@1.18.2 seems to build fine against libpng
         conflicts("+png", when="platform=darwin")
@@ -74,71 +78,23 @@ class Cairo(AutotoolsPackage, MesonPackage):
     # https://gitlab.freedesktop.org/cairo/cairo/-/blob/1.18.2/meson_options.txt
     with when("build_system=meson"):
         variant("dwrite", default=False, description="Microsoft Windows DWrite font backend")
-
-        # doesn't exist @1.17.8: but kept as compatibility
-        variant(
-            "pdf",
-            default=False,
-            description="""+pdf is combined into +zlib now, kept seperate for compatibility.
-              +pdf implies +zlib now. Please use the updated variants""",
-        )
-        # svg is combined into png now, kept seperate for compatibility
-        variant(
-            "svg",
-            default=False,
-            description="""+svg is combined into +png now, kept seperate for compatibility.
-              +svg implies +png now. Please use the updated variants""",
-        )
-
-        # meson seems to have assumptions about what is enabled/disabled
-        # these four compile best if +variant in unison, otherwise various errors happen
-        # if these aren't in sync. It is  easier to have a sane default. conflicts below
-        # to try to protect known incompatibilities
-        variant("png", default=True, description="Enable cairo's PNG and SVG functions feature")
-        variant("ft", default=True, description="Enable cairo's FreeType font backend feature")
-        variant("fc", default=True, description="Enable cairo's Fontconfig font backend feature")
         variant(
             "zlib",
-            default=True,
+            default=False,
             description="Enable cairo's script, ps, pdf, xml functions feature",
         )
 
         variant("quartz", default=False, description="Enable cairo's Quartz functions feature")
         variant("tee", default=False, description="Enable cairo's tee functions feature")
 
-        # not in spack
-        variant(
-            "spectre",
-            default=False,
-            description="Not available. Enable cairo's spectre functions feature",
-        )
-
-        # (bfd might be too old) with binutils 2.43.1 on macos
-        #  so not sure how this is supposed to work
-        variant(
-            "symbol-lookup",
-            default=False,
-            description="Not available. Enable cairo's symbol lookup functions feature",
-        )
-
-        # not currently supported variants
-        conflicts("+spectre", msg="Not currently supported")
-        conflicts("+symbol-lookup", msg="Not currently supported")
-
         # meson seems to have assumptions about what is enabled/disabled
         # so this protects against incompatible combinations
-        conflicts("~zlib+png", msg="+png requires +zlib")
-        conflicts("~ft+fc", msg="+fc requires +ft")
-        conflicts("+ft~fc", msg="+ft requires +fc")
-        conflicts("+ft+fc~zlib", msg="+fc+ft requires +zlib")
-        conflicts("+fc+ft~png+zlib", msg="+ft+fc+zlib requires +png")
-
-        # +pdf implies zlib now
-        requires("+zlib", when="+pdf")
-        requires("~zlib", when="~pdf", msg="+pdf implies +zlib now")
-        # +svg implies png now
-        requires("+svg", when="+png")
-        requires("~png", when="~svg", msg="+svg implies +png now")
+        requires(
+            "~zlib~ft~fc~png~pdf",
+            "+zlib+ft+fc+png+pdf",
+            policy="one_of",
+            msg="these variants must be activated, or deactivated, together",
+        )
 
         # https://gitlab.freedesktop.org/cairo/cairo/-/blob/1.18.2/meson.build?ref_type=tags#L2
         depends_on("meson@1.3.0:", type="build")
@@ -146,19 +102,16 @@ class Cairo(AutotoolsPackage, MesonPackage):
     # both autotools and meson need this for auto discovery of depends
     depends_on("pkgconfig", type="build")
 
-    # non build system specific depends
-    # versions that use (the old) autotools build
-    with when("@:1.17.4"):
-        depends_on("pixman@0.36.0:", when="@1.17.2:")
-        depends_on("freetype", when="+ft")
-        depends_on("fontconfig@2.10.91:", when="+fc")
-        depends_on("libpng", when="+png")
-        depends_on("glib")
+    # non build system specific dependencies
+    depends_on("freetype", when="+ft")
+    depends_on("libpng", when="+png")
+    depends_on("glib")
+    depends_on("pixman@0.36.0:", when="@1.17.2:")
+    depends_on("fontconfig@2.10.91:", when="+fc")
 
     # non build system specific depends
     # versions that use (the new) meson build
     with when("@1.18.0:"):
-        depends_on("binutils", when="+symbol-lookup")
         depends_on("freetype@2.13.0:", when="+ft")
         depends_on("libpng@1.4.0:", when="+png")
         depends_on("glib@2.14:", when="+gobject")
@@ -200,27 +153,21 @@ def enable_or_disable(self, feature_name, variant=None):
         )
 
     def meson_args(self):
-        args = []
-
-        args.append(self.enable_or_disable("dwrite"))
-        args.append(self.enable_or_disable("fontconfig", variant="ft"))
-        args.append(self.enable_or_disable("freetype", variant="fc"))
-
-        args.append(self.enable_or_disable("png"))
-
-        args.append(self.enable_or_disable("quartz"))
-        args.append(self.enable_or_disable("tee"))
-        args.append(self.enable_or_disable("xcb"))
-
-        args.append(self.enable_or_disable("xlib", variant="X"))
-        args.append(self.enable_or_disable("xlib-xcb", variant="X"))
-
-        args.append(self.enable_or_disable("zlib"))
-
-        args.append(self.enable_or_disable("glib", variant="gobject"))
-        args.append(self.enable_or_disable("spectre"))
-        args.append(self.enable_or_disable("symbol-lookup"))
-
+        args = [
+            self.enable_or_disable("dwrite"),
+            self.enable_or_disable("fontconfig", variant="ft"),
+            self.enable_or_disable("freetype", variant="fc"),
+            self.enable_or_disable("png"),
+            self.enable_or_disable("quartz"),
+            self.enable_or_disable("tee"),
+            self.enable_or_disable("xcb"),
+            self.enable_or_disable("xlib", variant="X"),
+            self.enable_or_disable("xlib-xcb", variant="X"),
+            self.enable_or_disable("zlib"),
+            self.enable_or_disable("glib", variant="gobject"),
+            "-Dspectre=disabled",
+            "-Dsymbol-lookup=disabled",
+        ]
         return args
 
 

var/spack/repos/builtin/packages/cmake/package.py

@@ -30,12 +30,14 @@ class Cmake(Package):
     license("BSD-3-Clause")
 
     version("master", branch="master")
+    version("3.31.6", sha256="653427f0f5014750aafff22727fb2aa60c6c732ca91808cfb78ce22ddd9e55f0")
     version("3.31.5", sha256="66fb53a145648be56b46fa9e8ccade3a4d0dfc92e401e52ce76bdad1fea43d27")
     version("3.31.4", sha256="a6130bfe75f5ba5c73e672e34359f7c0a1931521957e8393a5c2922c8b0f7f25")
     version("3.31.3", sha256="fac45bc6d410b49b3113ab866074888d6c9e9dc81a141874446eb239ac38cb87")
     version("3.31.2", sha256="42abb3f48f37dbd739cdfeb19d3712db0c5935ed5c2aef6c340f9ae9114238a2")
     version("3.31.1", sha256="c4fc2a9bd0cd5f899ccb2fb81ec422e175090bc0de5d90e906dd453b53065719")
     version("3.31.0", sha256="300b71db6d69dcc1ab7c5aae61cbc1aa2778a3e00cbd918bc720203e311468c3")
+    version("3.30.8", sha256="10434223a40531b4d6bd77f8ffc471f1714029f4e6d2c83c499187a940276720")
     version("3.30.7", sha256="470e44d9c7caa3bd869ef953071b84f565b5d378d0a9eccbbbcd72031f21b9de")
     version("3.30.6", sha256="a7aa25cdd8545156fe0fec95ebbd53cb2b5173a8717e227f6e8a755185c168cf")
     version("3.30.5", sha256="9f55e1a40508f2f29b7e065fa08c29f82c402fa0402da839fffe64a25755a86d")

var/spack/repos/builtin/packages/fish/package.py

@@ -21,6 +21,7 @@ class Fish(CMakePackage):
     license("GPL-2.0-only")
 
     version("master", branch="master")
+    version("4.0.0", sha256="2fda5bd970357064d8d4c896e08285ba59965ca2a8c4829ca8a82bf3b89c69f3")
     version("3.7.1", sha256="614c9f5643cd0799df391395fa6bbc3649427bb839722ce3b114d3bbc1a3b250")
     version("3.7.0", sha256="df1b7378b714f0690b285ed9e4e58afe270ac98dbc9ca5839589c1afcca33ab1")
     version("3.6.4", sha256="0f3f610e580de092fbe882c8aa76623ecf91bb16fdf0543241e6e90d5d4bc393")
@@ -35,20 +36,25 @@ class Fish(CMakePackage):
     version("3.1.0", sha256="e5db1e6839685c56f172e1000c138e290add4aa521f187df4cd79d4eab294368")
     version("3.0.0", sha256="ea9dd3614bb0346829ce7319437c6a93e3e1dfde3b7f6a469b543b0d2c68f2cf")
 
-    depends_on("cxx", type="build")  # generated
-
     variant("docs", default=False, description="Build documentation")
 
     # https://github.com/fish-shell/fish-shell#dependencies-1
+    depends_on("rust@1.70:", when="@4:")
+    depends_on("cmake@3.15:", when="@4:", type="build")
     depends_on("cmake@3.5:", when="@3.4:", type="build")
     depends_on("cmake@3.2:", type="build")
-    depends_on("ncurses")
+    depends_on("c", when="@4:", type="build")
     depends_on("pcre2@10.21:")
     depends_on("gettext")
     depends_on("py-sphinx", when="+docs", type="build")
-    depends_on("python@3.3:", type="test")
+    depends_on("python", type="test")
+    depends_on("tmux", when="@4:", type="test")
     depends_on("py-pexpect", type="test")
 
+    # Historical dependencies
+    depends_on("cxx", when="@:3", type="build")
+    depends_on("ncurses", when="@:3")
+
     # https://github.com/fish-shell/fish-shell/issues/7310
     patch("codesign.patch", when="@3.1.2 platform=darwin")
 
@@ -68,20 +74,5 @@ def url_for_version(self, version):
             ext = "xz"
         return url.format(version, ext)
 
-    def setup_build_environment(self, env):
-        env.append_flags("LDFLAGS", self.spec["ncurses"].libs.link_flags)
-
     def cmake_args(self):
-        args = [
-            "-DBUILD_SHARED_LIBS=ON",
-            "-DMAC_CODESIGN_ID=OFF",
-            "-DPCRE2_LIB=" + self.spec["pcre2"].libs[0],
-            "-DPCRE2_INCLUDE_DIR=" + self.spec["pcre2"].headers.directories[0],
-        ]
-
-        if self.spec.satisfies("+docs"):
-            args.append("-DBUILD_DOCS=ON")
-        else:
-            args.append("-DBUILD_DOCS=OFF")
-
-        return args
+        return [self.define_from_variant("BUILD_DOCS", "docs")]

var/spack/repos/builtin/packages/fjcontrib/package.py

@@ -15,6 +15,7 @@ class Fjcontrib(AutotoolsPackage):
 
     license("GPL-2.0-or-later")
 
+    version("1.101", sha256="dbe8ad2199f72d64dd29f6218f6f53efddc8fb3e5dd9c5d10f2fd1e23d6e44f6")
     version("1.100", sha256="52ad945d9195c40f347958dc04041e41c7130e845ebdf0c13f1bbdd5b6d2429b")
     version("1.056", sha256="fc31544424dece0d0676ea2433ad1e96fd9db82920bc7a7ef6294ce94e659d6e")
     version("1.055", sha256="d9aa46560fdfd85082f202a5a9ce64768fe0c598660f013206a8c9c17ecd0f36")

var/spack/repos/builtin/packages/flux-python/package.py

@@ -0,0 +1,26 @@
+# Copyright Spack Project Developers. See COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class FluxPython(PythonPackage):
+    """Python bindings for the flux resource manager API"""
+
+    homepage = "https://github.com/flux-framework/flux-python/"
+    pypi = "flux-python/flux_python-0.70.0.tar.gz"
+
+    license("LGPL-3.0-only")
+
+    version("0.70.0", sha256="88835aaa4d8886a5db825f72940171b92a8d33abd4835915e97e1dbd1f09c49a")
+    version("0.68.0", sha256="5ab31bffe0ea369e4cb204f809f7f4db63626f31e84e9cf9f83286d37bff96eb")
+    version("0.66.0", sha256="56b6f0356e8bb143629332c1fb0ddaa16b7e6afdf1fa459bb9b3b35d1366c8e3")
+    version("0.65.0", sha256="a3598835603fba21d09e76183bb1e8b939350118c57f1ca3d9f67994562eaded")
+    version("0.63.0", sha256="963cd5e2198cd8c534c062a11815746469abe078ab23caa076fafada75d65cda")
+    version("0.62.0", sha256="7121e02f81c87a8a0723019dad2c9800bbd749f3704ca54b9649e02ed89e87c3")
+    version("0.61.2", sha256="a3cfe0125b97f39ecf34a1d7f479368f5152abc022be6adb44adb7356d099ba8")
+
+    depends_on("py-setuptools", type="build")
+    depends_on("py-pyyaml", type=("build", "run"))
+    depends_on("py-cffi", type=("build", "run"))

var/spack/repos/builtin/packages/geomodel/package.py

@@ -17,6 +17,7 @@ class Geomodel(CMakePackage):
 
     license("Apache-2.0", checked_by="wdconinc")
 
+    version("6.10.0", sha256="968a0f7c8108b14f22041ca0c6ae8a3293175131c6f61055527ecdefe8c7839a")
     version("6.9.0", sha256="ea34dad8a0cd392e06794b8a1b7407dd6ad617fefd19fb4cccdf36b154749793")
     version("6.8.0", sha256="4dfd5a932955ee2618a880bb210aed9ce7087cfadd31f23f92e5ff009c8384eb")
     version("6.7.0", sha256="bfa69062ba191d0844d7099b28c0d6c3c0f87e726dacfaa21dba7a6f593d34bf")

var/spack/repos/builtin/packages/geos/package.py

@@ -21,15 +21,19 @@ class Geos(CMakePackage):
     license("LGPL-2.1-or-later")
     maintainers("adamjstewart")
 
+    version("3.13.1", sha256="df2c50503295f325e7c8d7b783aca8ba4773919cde984193850cf9e361dfd28c")
     version("3.13.0", sha256="47ec83ff334d672b9e4426695f15da6e6368244214971fabf386ff8ef6df39e4")
+    version("3.12.3", sha256="6155e5a570cc2e80a5e2617e0f5831af1ad2e2573d500538732e481357a9adcf")
     version("3.12.2", sha256="34c7770bf0090ee88488af98767d08e779f124fa33437e0aabec8abd4609fec6")
     version("3.12.1", sha256="d6ea7e492224b51193e8244fe3ec17c4d44d0777f3c32ca4fb171140549a0d03")
     version("3.12.0", sha256="d96db96011259178a35555a0f6d6e75a739e52a495a6b2aa5efb3d75390fbc39")
+    version("3.11.5", sha256="7d9432f94e2c743cca13977b1f9943dfcc9a83854578870a215fb8dd7d6f21c1")
     version("3.11.4", sha256="364c88ccfc38aa50cf65c700e7b2ae4706ed103326128493dbf750c78d136d2c")
     version("3.11.3", sha256="80d60a2bbc0cde7745a3366b9eb8c0d65a142b03e063ea0a52c364758cd5ee89")
     version("3.11.2", sha256="b1f077669481c5a3e62affc49e96eb06f281987a5d36fdab225217e5b825e4cc")
     version("3.11.1", sha256="6d0eb3cfa9f92d947731cc75f1750356b3bdfc07ea020553daf6af1c768e0be2")
     version("3.11.0", sha256="79ab8cabf4aa8604d161557b52e3e4d84575acdc0d08cb09ab3f7aaefa4d858a")
+    version("3.10.7", sha256="8b2ab4d04d660e27f2006550798f49dd11748c3767455cae9f71967dc437da1f")
     version("3.10.6", sha256="078403158da66cad8be39ad1ede5e2fe4b70dcf7bb292fb06a65bdfe8afa6daf")
     version("3.10.5", sha256="cc47d95e846e2745c493d8f9f3a9913b1c61f26717a1165898da64352aec4dde")
     version("3.10.4", sha256="d6fc11bcfd265cbf2714199174e4c3392d657551e5fd84c74c07c863b29357e3")
@@ -37,6 +41,7 @@ class Geos(CMakePackage):
     version("3.10.2", sha256="50bbc599ac386b4c2b3962dcc411f0040a61f204aaef4eba7225ecdd0cf45715")
     version("3.10.1", sha256="a8148eec9636814c8ab0f8f5266ce6f9b914ed65b0d083fc43bb0bbb01f83648")
     version("3.10.0", sha256="097d70e3c8f688e59633ceb8d38ad5c9b0d7ead5729adeb925dbc489437abe13")
+    version("3.9.6", sha256="8c284a341592f960d84813ebba3c2fd4fc9eb0b665820a27f6f8beb211ab6b00")
     version("3.9.5", sha256="c6c9aedfa8864fb44ba78911408442382bfd0690cf2d4091ae3805c863789036")
     version("3.9.4", sha256="70dff2530d8cd2dfaeeb91a5014bd17afb1baee8f0e3eb18e44d5b4dbea47b14")
     version("3.9.3", sha256="f8b2314e311456f7a449144efb5e3188c2a28774752bc50fc882a3cd5c89ee35")

var/spack/repos/builtin/packages/icu4c/ICU4C_NMAKE_NO_DOUBLE_QUOTE_VARS.patch

@@ -0,0 +1,13 @@
+diff --git a/source/test/testdata/testdata.mak b/source/test/testdata/testdata.mak
+index 2809efd..02f5b79 100644
+--- a/source/test/testdata/testdata.mak
++++ b/source/test/testdata/testdata.mak
+@@ -25,7 +25,7 @@ ALL : "$(TESTDATAOUT)\testdata.dat"
+ 
+ # old_e_testtypes.res is the same, but icuswapped to big-endian EBCDIC
+ 
+-TESTDATATMP="$(TESTDATAOUT)\testdata"
++TESTDATATMP=$(TESTDATAOUT)\testdata
+ 
+ CREATE_DIRS :
+ 	@if not exist "$(TESTDATAOUT)\$(NULL)" mkdir "$(TESTDATAOUT)"

var/spack/repos/builtin/packages/icu4c/package.py

@@ -53,6 +53,9 @@ class Icu4c(AutotoolsPackage, MSBuildPackage):
         depends_on("automake", type="build")
         depends_on("libtool", type="build")
 
+    with when("build_system=msbuild"):
+        patch("ICU4C_NMAKE_NO_DOUBLE_QUOTE_VARS.patch", when="@64.1:")
+
     conflicts(
         "%intel@:16",
         when="@60.1:",

var/spack/repos/builtin/packages/libspatialindex/package.py

@@ -13,13 +13,15 @@ class Libspatialindex(CMakePackage):
 
     license("MIT")
 
+    version("2.1.0", sha256="a04513cea04dd20ab2c9d153c14cc45692805ee496b30619103f7929f6fb81bf")
     version("1.9.3", sha256="7b44340a3edc55c11abfc453bb60f148b29f569cef9e1148583e76132e9c7379")
     version("1.8.5", sha256="93cce77269612f45287b521d5afdfb245be2b93b8b6438d92f8b9e0bdb37059d")
 
     depends_on("c", type="build")
     depends_on("cxx", type="build")
 
-    depends_on("cmake@3.5.0:", type="build")
+    depends_on("cmake@3.13:", when="@2:", type="build")
+    depends_on("cmake@3.5:", type="build")
 
     @property
     def libs(self):

var/spack/repos/builtin/packages/node-js/package.py

@@ -37,12 +37,23 @@ class NodeJs(Package):
 
     # LTS (recommended for most users) - even major number
     version(
-        "22.11.0",
-        sha256="24e5130fa7bc1eaab218a0c9cb05e03168fa381bb9e3babddc6a11f655799222",
+        "22.14.0",
+        sha256="6c4e31ed5702dc45cfd8c435af56a36a474427e1bd7afe74c346136060beba8a",
         preferred=True,
     )
+    version("22.13.1", sha256="e7d5b1e84e7f3c3cebda81e2b138469eef41ba4ecf16a87fd15fc3f7afa3f701")
+    version("22.13.0", sha256="38e15a1d0dd0e95c237bc4651d7c9930a78d3fe7954a7ee7693b403f2d879e46")
+    version("22.12.0", sha256="3157e7c002b6e964bdbefb331ec38db1e2dceb064ab11c038275155461b22ce3")
+    version("22.11.0", sha256="24e5130fa7bc1eaab218a0c9cb05e03168fa381bb9e3babddc6a11f655799222")
     version("22.4.0", sha256="b62cd83c9a57a11349883f89b1727a16e66c02eb6255a4bf32714ff5d93165f5")
     version("22.3.0", sha256="6326484853093ab6b8f361a267445f4a5bff469042cda11a3585497b13136b55")
+    version("20.18.3", sha256="eba088fa562735140b283c7bb33f53e026ccd5febe68c52c5737ef6e577ec874")
+    version("20.18.2", sha256="cf3ef49fafbfee3cdcd936a0d6031341b73bfa6b26a484ea0a4936c26d24b829")
+    version("20.18.1", sha256="5bad8ced873eef3b32e7daee703156bce9224920ac6044f4232f5393df0628b8")
+    version("20.18.0", sha256="c0819f8fc5038584d24c22002aeffd23f2d4a6fd6b337b30c502cbe4a659720c")
+    version("20.17.0", sha256="409bda5f1896c7c20866610d778d1760991884ad2e7940837cd3f2854cf73747")
+    version("20.16.0", sha256="8f24bf9abe455a09ab30f9ae8edda1e945ed678a4b1c3b07ee0f901fdc0ff4fd")
+    version("20.15.1", sha256="da228a0c27922f02001d9a781793696432096ab2da658eb77d7fc21693f4c5cb")
     version("20.15.0", sha256="01e2c034467a324a33e778c81f2808dff13d289eaa9307d3e9b06c171e4d932d")
     version("18.12.1", sha256="ba8174dda00d5b90943f37c6a180a1d37c861d91e04a4cb38dc1c0c74981c186")
     version("16.18.1", sha256="3d24c9c3a953afee43edc44569045eda56cd45cd58b0539922d17da62736189c")
@@ -97,10 +108,10 @@ class NodeJs(Package):
     depends_on("python@:3.10", when="@19.0.0:19.0.1", type="build")
     depends_on("python@:3.11", when="@19.1.0:20.10.0", type="build")
     depends_on("python@:3.12", when="@20.11.0:20.15.1", type="build")
-    depends_on("python@:3.13", when="@20.16.0:20.18.1", type="build")
+    depends_on("python@:3.13", when="@20.16.0:20.18.3", type="build")
     depends_on("python@:3.11", when="@21.0.0:21.1.0", type="build")
     depends_on("python@:3.12", when="@21.2.0:22.2.0", type="build")
-    depends_on("python@:3.13", when="@22.3.0:22.7.0", type="build")
+    depends_on("python@:3.13", when="@22.3.0:22.14.0", type="build")
 
     depends_on("libtool", type="build", when=sys.platform != "darwin")
     depends_on("pkgconfig", type="build")

var/spack/repos/builtin/packages/postgresql/package.py

@@ -75,8 +75,9 @@ class Postgresql(AutotoolsPackage):
     depends_on("perl+opcode", when="+perl")
     depends_on("python", when="+python")
     depends_on("libxml2", when="+xml")
-    depends_on("flex", when="@17:")
-    depends_on("bison", when="@17:")
+    depends_on("perl", when="@17:", type="build")
+    depends_on("flex", when="@17:", type="build")
+    depends_on("bison", when="@17:", type="build")
     depends_on("pkgconfig", when="+xml", type="build")
 
     @property

var/spack/repos/builtin/packages/py-keras/package.py

@@ -22,6 +22,7 @@ class PyKeras(PythonPackage):
     maintainers("adamjstewart")
     license("Apache-2.0")
 
+    version("3.9.0", sha256="b5bf04e7c64c3176eda5124d035005bb7a676fb505f42496c7b03a99d5683652")
     version("3.8.0", sha256="6289006e6f6cb2b68a563b58cf8ae5a45569449c5a791df6b2f54c1877f3f344")
     version("3.7.0", sha256="a4451a5591e75dfb414d0b84a3fd2fb9c0240cc87ebe7e397f547ce10b0e67b7")
     version("3.6.0", sha256="405727525a3522ed8f9ec0b46e0667e4c65fcf714a067322c16a00d902ded41d")

var/spack/repos/builtin/packages/py-psyclone/package.py

@@ -18,7 +18,7 @@ class PyPsyclone(PythonPackage):
     # Links
     homepage = "https://github.com/stfc/PSyclone"
     git = "https://github.com/stfc/PSyclone.git"
-    pypi = "PSyclone/psyclone-3.0.0.tar.gz"
+    pypi = "PSyclone/psyclone-3.1.0.tar.gz"
 
     # Maintainers
     maintainers("arporter", "sergisiso", "TeranIvy", "hiker")
@@ -28,6 +28,7 @@ class PyPsyclone(PythonPackage):
 
     # Releases
     version("master", branch="master")
+    version("3.1.0", sha256="7b369353942358afcb93b199ef2b11116d756cf9d671667ca95fa83fb31f0355")
     version("3.0.0", sha256="25085a6d0dad36c03ec1f06becf7e2f915ded26603d4a1a2981392f5752fdb3e")
     version("2.5.0", sha256="dd1b40d635423c6b23effd2c569908d319afa6153680692e1cbae27f7b5bf4dc")
     version("2.4.0", sha256="14fd3717f99b317471356c59c1d4c4c22c41fd264af11b78ed831dd2eb71a270")
@@ -41,7 +42,7 @@ class PyPsyclone(PythonPackage):
     # Current dependencies
     depends_on("py-setuptools", type="build")
     depends_on("py-pyparsing", type=("build", "run"))
-    depends_on("py-fparser@0.2.0:", type=("build", "run"), when="@3.0.0")
+    depends_on("py-fparser@0.2.0:", type=("build", "run"), when="@3.0.0:")
     depends_on("py-graphviz", type=("build", "run"))
     depends_on("py-configparser", type=("build", "run"))
     depends_on("py-jinja2", type="build")

var/spack/repos/builtin/packages/py-rtree/package.py

@@ -11,10 +11,10 @@ class PyRtree(PythonPackage):
     homepage = "https://github.com/Toblerity/rtree"
     pypi = "Rtree/rtree-1.3.0.tar.gz"
 
+    license("MIT")
     maintainers("adamjstewart", "hobu")
 
-    license("MIT")
-
+    version("1.4.0", sha256="9d97c7c5dcf25f6c0599c76d9933368c6a8d7238f2c1d00e76f1a69369ca82a0")
     version("1.3.0", sha256="b36e9dd2dc60ffe3d02e367242d2c26f7281b00e1aaf0c39590442edaaadd916")
     version("1.2.0", sha256="f5145f7852bf7f95c126fb16bf1a4c2ca9300ae151b07f8a0f7083ea47912675")
     version("1.1.0", sha256="6f8ee504dde5d005b25b08aaf5be0b3404af3ad5fece6e1ddcde35908a798a95")
@@ -23,12 +23,11 @@ class PyRtree(PythonPackage):
     version("0.9.7", sha256="be8772ca34699a9ad3fb4cfe2cfb6629854e453c10b3328039301bbfc128ca3e")
     version("0.8.3", sha256="6cb9cf3000963ea6a3db777a597baee2bc55c4fc891e4f1967f262cc96148649")
 
-    depends_on("python@3.8:", when="@1.1:", type=("build", "run"))
     depends_on("py-setuptools@61:", when="@1.1:", type="build")
     depends_on("py-setuptools@39.2:", when="@1:", type="build")
     depends_on("py-setuptools", type="build")
-    depends_on("py-typing-extensions@3.7:", when="@1: ^python@:3.7", type=("build", "run"))
     depends_on("libspatialindex@1.8.5:")
+    depends_on("py-numpy", when="@1.4:", type="test")
 
     def url_for_version(self, version):
         url = "https://files.pythonhosted.org/packages/source/R/Rtree/{}-{}.tar.gz"

var/spack/repos/builtin/packages/vim/package.py

@@ -21,6 +21,7 @@ class Vim(AutotoolsPackage):
 
     license("Vim")
 
+    version("9.1.1194", sha256="4575b9ae81cca6a304f165d16ea3c65f4864390001ed5d7bf000e55417153f30")
     version("9.1.0437", sha256="7024fbf8d0e8eec2eae21d279d487b60c58dc4ba3d42146388dc3743506d1fe6")
     version("9.0.0045", sha256="594a31e96e3eda07a358db305de939ca749693b4684de9e027bfa70311b1994d")
     version(