hipsycl: add missing c dependency (#50294)

* Add cupy 13.4.0, 13.3.0, 13.2.0

* [@spackbot] updating style on behalf of tehrengruber

* Update var/spack/repos/builtin/packages/py-cupy/package.py

Co-authored-by: Mikael Simberg <mikael.simberg@iki.fi>

* Update var/spack/repos/builtin/packages/py-cupy/package.py

Co-authored-by: Mikael Simberg <mikael.simberg@iki.fi>

---------

Co-authored-by: tehrengruber <tehrengruber@users.noreply.github.com>
Co-authored-by: Mikael Simberg <mikael.simberg@iki.fi>

lib/spack/spack/cmd/solve.py

@@ -136,20 +136,7 @@ def solve(parser, args):
     setup_only = set(show) == {"asp"}
     unify = spack.config.get("concretizer:unify")
     allow_deprecated = spack.config.get("config:deprecated", False)
-    if unify != "when_possible":
-        # set up solver parameters
-        # Note: reuse and other concretizer prefs are passed as configuration
-        result = solver.solve(
-            specs,
-            out=output,
-            timers=args.timers,
-            stats=args.stats,
-            setup_only=setup_only,
-            allow_deprecated=allow_deprecated,
-        )
-        if not setup_only:
-            _process_result(result, show, required_format, kwargs)
-    else:
+    if unify == "when_possible":
         for idx, result in enumerate(
             solver.solve_in_rounds(
                 specs,
@@ -166,3 +153,29 @@ def solve(parser, args):
                 print("% END ROUND {0}\n".format(idx))
             if not setup_only:
                 _process_result(result, show, required_format, kwargs)
+    elif unify:
+        # set up solver parameters
+        # Note: reuse and other concretizer prefs are passed as configuration
+        result = solver.solve(
+            specs,
+            out=output,
+            timers=args.timers,
+            stats=args.stats,
+            setup_only=setup_only,
+            allow_deprecated=allow_deprecated,
+        )
+        if not setup_only:
+            _process_result(result, show, required_format, kwargs)
+    else:
+        for spec in specs:
+            tty.msg("SOLVING SPEC:", spec)
+            result = solver.solve(
+                [spec],
+                out=output,
+                timers=args.timers,
+                stats=args.stats,
+                setup_only=setup_only,
+                allow_deprecated=allow_deprecated,
+            )
+            if not setup_only:
+                _process_result(result, show, required_format, kwargs)

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

@@ -5,7 +5,6 @@ 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 }

share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml

@@ -173,11 +173,11 @@ spack:
   - vtk-m ~openmp                   # +openmp: https://github.com/spack/spack/issues/31830
   - zfp
   # --
-  # - paraview +qt                  # llvm-17.0.6: https://github.com/spack/spack/issues/49625
-  # - py-cinemasci                  # llvm-14.0.6: https://github.com/spack/spack/issues/49625
-  # - visit                         # llvm-17.0.6: https://github.com/spack/spack/issues/49625
+  # - paraview +qt                  # concretize: paraview: Qt support requires GLX on non Windows; llvm-17.0.6: https://github.com/spack/spack/issues/49625
+  # - py-cinemasci                  # py-maturin-1.8.3: rust-lld: error: undefined symbol: _intel_fast_memcpy
+  # - visit                         # vtk-9.2.6: ??
   # --
-  # - chapel ~cuda ~rocm            # llvm-19.1.7: https://github.com/spack/spack/issues/49625
+  # - chapel ~cuda ~rocm            # chapel-2.4.0: KeyError: 'intel-oneapi-compilers': /builds/spack/spack/var/spack/repos/builtin/packages/chapel/package.py:602, in setup_chpl_compilers: env.set("CHPL_HOST_COMPILER", self.compiler_map[self.spec.compiler.name])
   # - cp2k +mpi                     # dbcsr-2.8.0: FAILED: src/CMakeFiles/dbcsr.dir/dbcsr_api.F-pp.f src/CMakeFiles/dbcsr.dir/dbcsr_api.F.o.ddi: 
   # - dealii                        # taskflow@3.7.0: cmake: Taskflow currently supports the following compilers: g++ v7.0 or above, clang++ v6.0 or above
   # - exago +mpi ~ipopt +hiop ~python +raja ^hiop+raja~sparse # raja-0.14.0: RAJA/pattern/kernel/Tile.hpp:174:30: error: no member named 'block_id' in 'IterableTiler<Iterable>'
@@ -185,8 +185,8 @@ spack:
   # - fftx                          # fftx-1.2.0: https://github.com/spack/spack/issues/49621
   # - fpm                           # fpm-0.10.0: /tmp/ifx1305151083OkWTRB/ifxqBG60i.i90: error #6405: The same named entity from different modules and/or program units cannot be referenced.   [TOML_TABLE]; fpm.F90(32048): error #7002: Error in opening the compiled module file.  Check INCLUDE paths.   [FPM_MANIFEST_PREPROCESS]
   # - geopm-runtime                 # concretize: c-blosc2: conflicts with '%oneapi';
-  # - glvis                         # llvm-17.0.6: https://github.com/spack/spack/issues/49625
-  # - gptune ~mpispawn              # llvm-14.0.6: https://github.com/spack/spack/issues/49625
+  - glvis                         # llvm-17.0.6: https://github.com/spack/spack/issues/49625
+  # - gptune ~mpispawn              # py-maturin-1.8.3: rust-lld: error: undefined symbol: __intel_cpu_feature_indicator_x
   # - lbann                         # lbann-0.104: https://github.com/spack/spack/issues/49619
   # - libpressio +bitgrooming +bzip2 ~cuda ~cusz +fpzip +hdf5 +libdistributed +lua +openmp +python +sz +sz3 +unix +zfp # concretize: c-blosc2: conflicts with '%oneapi';
   # - nek5000 +mpi ~visit           # nek5000-19.0: RuntimeError: Cannot build example: short_tests/eddy.
@@ -209,8 +209,8 @@ spack:
   # --
   # - py-jupyterlab                 # py-maturin: rust-lld: error: undefined symbol: _intel_fast_memcpy
   # - py-notebook                   # py-maturin: rust-lld: error: undefined symbol: _intel_fast_memcpy
-  # - py-numba                      # llvm-14.0.6: https://github.com/spack/spack/issues/49625
-  # - py-pandas                     # llvm-14.0.6: https://github.com/spack/spack/issues/49625
+  - py-numba                      # llvm-14.0.6: https://github.com/spack/spack/issues/49625
+  - py-pandas                     # llvm-14.0.6: https://github.com/spack/spack/issues/49625
   # - py-plotly                     # py-maturin: rust-lld: error: undefined symbol: _intel_fast_memcpy
 
   - aml +level_zero

var/spack/repos/builtin/packages/3dtk/package.py

@@ -21,6 +21,9 @@ class _3dtk(CMakePackage):
     version("trunk", svn="https://svn.code.sf.net/p/slam6d/code/trunk", preferred=True)
     version("1.2", svn="https://svn.code.sf.net/p/slam6d/code/branches/3dtk-release-1.2")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     variant("cgal", default=False, description="Compile with CGAL support")
     variant("opengl", default=True, description="Compile with OpenGL support")
     variant("opencv", default=True, description="Compile with OpenCV support")

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

@@ -46,6 +46,9 @@ class Actsvg(CMakePackage):
         "web", default=True, when="@0.4.36:", description="Build the webpage builder interface"
     )
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("boost +program_options", type="test")
     depends_on("boost +program_options", when="+examples")
     depends_on("googletest", when="+examples")

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

@@ -20,6 +20,9 @@ class Ambertools(CMakePackage):
 
     version("22jlmrcc", sha256="1571d4e0f7d45b2a71dce5999fa875aea8c90ee219eb218d7916bf30ea229121")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("flex", type="build")
     depends_on("bison", type="build")
     depends_on("tcsh", type="build")

var/spack/repos/builtin/packages/amdblis/blis-4.0_gcc_clang_znver4.patch

@@ -1,55 +0,0 @@
-diff -Naur a/config/zen4/make_defs.mk b/config/zen4/make_defs.mk
---- a/config/zen4/make_defs.mk	2022-11-12 13:05:45.000000000 +0000
-+++ b/config/zen4/make_defs.mk	2023-05-12 14:40:10.848359434 +0000
-@@ -73,6 +73,15 @@
- 
- 
- # gcc 11.0 or later:
-+ifeq ($(shell test $(GCC_VERSION) -ge 13; echo $$?),0)
-+ifneq ($(DEBUG_TYPE),noopt)
-+CKOPTFLAGS     := -O2 -fgcse-after-reload -fipa-cp-clone -floop-interchange -floop-unroll-and-jam -fpeel-loops -fpredictive-commoning -fsplit-loops -fsplit-paths -ftree-loop-distribution -funswitch-loops -fvect-cost-model=dynamic -fversion-loops-for-strides -fomit-frame-pointer
-+endif
-+
-+CKVECFLAGS     +=  -march=znver4 -mfpmath=sse
-+CRVECFLAGS     +=  -march=znver4
-+
-+else
- ifeq ($(shell test $(GCC_VERSION) -ge 11; echo $$?),0)
- # Update CKOPTFLAGS for gcc 11+ to use O3 optimization without
- # -ftree-partial-pre flag. This flag results in suboptimal code
-@@ -100,6 +109,7 @@
- endif # GCC 8
- endif # GCC 9
- endif # GCC 11
-+endif # GCC 13
- else
- ifeq ($(CC_VENDOR),clang)
- 
-@@ -132,6 +142,16 @@
- #if compiling with clang
- VENDOR_STRING := $(strip $(shell ${CC_VENDOR} --version | egrep -o '[0-9]+\.[0-9]+\.?[0-9]*'))
- CC_MAJOR := $(shell (echo ${VENDOR_STRING} | cut -d. -f1))
-+#clang 16 or later:
-+ifeq ($(shell test $(CC_MAJOR) -ge 16; echo $$?),0)
-+CKVECFLAGS += -march=znver4
-+CRVECFLAGS += -march=znver4
-+else
-+#clang 12 or later:
-+ifeq ($(shell test $(CC_MAJOR) -ge 12; echo $$?),0)
-+CKVECFLAGS += -march=znver3 -mavx512f -mavx512dq -mavx512bw -mavx512vl -mavx512vnni -mavx512bf16 -mfpmath=sse -falign-loops=64
-+CRVECFLAGS += -march=znver3
-+else
- #clang 9.0 or later:
- ifeq ($(shell test $(CC_MAJOR) -ge 9; echo $$?),0)
- CKVECFLAGS += -march=znver2
-@@ -139,7 +159,9 @@
- else
- CKVECFLAGS += -march=znver1
- CRVECFLAGS += -march=znver1
--endif # ge 9
-+endif # clang 9
-+endif # clang 12
-+endif # clang 16
- endif # aocc 2
- endif # aocc 3
- endif # aocc 4

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

@@ -30,6 +30,9 @@ class Bcl2fastq2(Package):
 
     conflicts("platform=darwin", msg="malloc.h/etc requirements break build on macs")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("boost@1.54.0:1.55")
 
     # TODO: replace this with an explicit list of components of Boost,

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

@@ -25,7 +25,7 @@ class Binutils(AutotoolsPackage, GNUMirrorPackage):
         "GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later",
         checked_by="tgamblin",
     )
-
+    version("2.44", sha256="f66390a661faa117d00fab2e79cf2dc9d097b42cc296bf3f8677d1e7b452dc3a")
     version("2.43.1", sha256="becaac5d295e037587b63a42fad57fe3d9d7b83f478eb24b67f9eec5d0f1872f")
     version("2.43", sha256="fed3c3077f0df7a4a1aa47b080b8c53277593ccbb4e5e78b73ffb4e3f265e750")
     version("2.42", sha256="aa54850ebda5064c72cd4ec2d9b056c294252991486350d9a97ab2a6dfdfaf12")

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

@@ -52,7 +52,9 @@ class Cosma(CMakePackage):
     with when("+rocm"):
         variant("rccl", default=False, description="Use rocm rccl")
 
-    depends_on("cxx", type="build")  # generated
+    depends_on("cxx", type="build")
+    depends_on("c", type="build")
+    depends_on("fortran", type="build")
 
     depends_on("cmake@3.22:", type="build")
     depends_on("mpi@3:")

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

@@ -115,7 +115,7 @@ class Cp2k(MakefilePackage, CMakePackage, CudaPackage, ROCmPackage):
     variant("pytorch", default=False, description="Enable libtorch support")
     variant("quip", default=False, description="Enable quip support")
     variant("dftd4", when="@2024.2:", default=False, description="Enable DFT-D4 support")
-    variant("mpi_f08", default=False, description="Use MPI F08 module")
+    variant("mpi_f08", default=False, description="Use MPI F08 module", when="+mpi")
     variant("smeagol", default=False, description="Enable libsmeagol support", when="@2025.2:")
     variant(
         "pw_gpu", default=True, description="Enable FFT calculations on GPU", when="@2025.2: +cuda"
@@ -159,6 +159,13 @@ class Cp2k(MakefilePackage, CMakePackage, CudaPackage, ROCmPackage):
         description="Enable TrexIO support",
         when="@2025.2: build_system=cmake",
     )
+    variant(
+        "greenx",
+        default=False,
+        description="Enable green X support",
+        when="@2025.2: build_system=cmake",
+    )
+
     variant("deepmd", default=False, description="Enable DeepMD-kit support")
     conflicts("+deepmd", msg="DeepMD-kit is not yet available in Spack")
 
@@ -208,7 +215,7 @@ class Cp2k(MakefilePackage, CMakePackage, CudaPackage, ROCmPackage):
     depends_on("blas")
     depends_on("lapack")
     depends_on("fftw-api@3")
-
+    depends_on("greenx", when="+greenx")
     depends_on("hdf5+hl+fortran", when="+hdf5")
     depends_on("trexio", when="+trexio")
 
@@ -637,7 +644,6 @@ def edit(self, pkg, spec, prefix):
                 )
             else:
                 libs.append(elpa.libs.ld_flags)
-
             if spec.satisfies("@:4"):
                 if elpa.satisfies("@:2014.5"):
                     cppflags.append("-D__ELPA")
@@ -1050,6 +1056,8 @@ def cmake_args(self):
                 ]
 
         args += [
+            "-DCP2K_USE_FFTW3=ON",
+            self.define_from_variant("CP2K_USE_MPI", "mpi"),
             self.define_from_variant("CP2K_ENABLE_REGTESTS", "enable_regtests"),
             self.define_from_variant("CP2K_USE_ELPA", "elpa"),
             self.define_from_variant("CP2K_USE_DLAF", "dlaf"),
@@ -1076,8 +1084,12 @@ def cmake_args(self):
             self.define_from_variant("CP2K_USE_HDF5", "hdf5"),
             self.define_from_variant("CP2K_USE_DEEPMD", "deepmd"),
             self.define_from_variant("CP2K_USE_TREXIO", "trexio"),
+            self.define_from_variant("CP2K_USE_GREENX", "greenx"),
         ]
 
+        if spec.satisfies("^[virtuals=fftw-api] fftw+openmp"):
+            args += ["-DCP2K_USE_FFTW3_WITH_OPENMP=ON"]
+
         # we force the use elpa openmp threading support. might need to be revisited though
         args += [
             self.define(
@@ -1089,8 +1101,6 @@ def cmake_args(self):
         if "spla" in spec and (spec.satisfies("+cuda") or spec.satisfies("+rocm")):
             args += ["-DCP2K_USE_SPLA_GEMM_OFFLOADING=ON"]
 
-        args += ["-DCP2K_USE_FFTW3=ON"]
-
         if spec.satisfies("smm=libxsmm"):
             args += ["-DCP2K_USE_LIBXSMM=ON"]
         else:
@@ -1100,6 +1110,9 @@ def cmake_args(self):
         blas = spec["blas"]
 
         if blas.name == "intel-oneapi-mkl":
+            if spec.satisfies("^[virtuals=fftw-api] intel-oneapi-mkl"):
+                args += ["-DCP2K_USE_FFTW3_WITH_MKL=ON"]
+
             args += ["-DCP2K_BLAS_VENDOR=MKL"]
             if sys.platform == "darwin":
                 args += [

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

@@ -31,6 +31,8 @@ class Dbcsr(CMakePackage, CudaPackage, ROCmPackage):
     version("2.1.0", sha256="9e58fd998f224632f356e479d18b5032570d00d87b86736b6a6ac2d03f8d4b3c")
     version("2.0.1", sha256="61d5531b661e1dab043353a1d67939ddcde3893d3dc7b0ab3d05074d448b485c")
 
+    variant("tests", default=False, description="Build DBCSR unit tests")
+    variant("tests", default=True, description="Build DBCSR unit tests", when="@2.1:2.2")
     variant("mpi", default=True, description="Compile with MPI")
     variant("openmp", default=False, description="Build with OpenMP support")
     variant("shared", default=True, description="Build shared library")
@@ -162,12 +164,9 @@ def cmake_args(self):
             self.define_from_variant("BUILD_SHARED_LIBS", "shared"),
             self.define_from_variant("WITH_EXAMPLES", "examples"),
             self.define_from_variant("WITH_G2G", "g2g"),
+            self.define_from_variant("BUILD_TESTING", "tests"),
         ]
 
-        # Switch necessary as a result of a bug.
-        if spec.satisfies("@2.1:2.2"):
-            args += ["-DBUILD_TESTING=ON"]
-
         if self.spec.satisfies("+cuda"):
             cuda_arch = self.spec.variants["cuda_arch"].value[0]
 

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

@@ -21,6 +21,8 @@ class Dlb(AutotoolsPackage):
     license("LGPL-3.0-or-later")
 
     version("main", branch="main")
+    version("3.5.2", sha256="ec81284f77aa07c1589a91f75ed1c88501beb6c8340f5bcad603c210f5c446d4")
+    version("3.5.1", sha256="32ec884c90220478f9873bf37eb11b536bfc3739d108ba6b29edefb651a10c34")
     version("3.5.0", sha256="df7fe979059998c2199dc4ee3775d623287fcce728be07e2f6657da2314daf6b")
     version("3.4.1", sha256="7c071b75c126f8e77c1a30369348751624d5636edcbd663bf3d41fa04733c894")
     version("3.4", sha256="6091d032c11a094a3ce0bec11c0a164783fdff83cb4ec870c9d8e192410c353a")

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

@@ -30,6 +30,8 @@ class Express(CMakePackage):
     )
     depends_on("bamtools")
     depends_on("zlib-api")
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
 
     # patch from the debian package repo:
     # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811859

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

@@ -21,6 +21,8 @@ class Gplates(CMakePackage):
 
     version("2.3.0", sha256="7d4be9d524d1fcbb6a81de29bd1d4b13133082db23f0808965c5efe30e9538ab")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
     depends_on("cmake@3.5:", when="@2.3:", type="build")
     depends_on("cmake@2.8.8:", when="@2.1", type="build")
     depends_on("cmake@2.6.2:", when="@2.0", type="build")

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

@@ -28,15 +28,16 @@ class Hcoll(Package):
     version("3.9.1927")
 
     # ucx throws warnings when running alongside the wrong version of hcoll
-    requires("ucx@1.18", when="@4.8.3230")
-    requires("ucx@1.17", when="@4.8.3228")
-    requires("ucx@1.16:1.17", when="@4.8.3227")
-    requires("ucx@1.15:1.16", when="@4.8.3223")
-    requires("ucx@1.15", when="@4.8.3221")
-    requires("ucx@1.14", when="@4.8.3217:4.8.3220")
-    requires("ucx@1.13", when="@4.7.3208")
-    requires("ucx@1.12", when="@4.7.3202")
-    requires("ucx@1.11", when="@4.7.3199")
+    # commented out until a working solution is found
+    # requires("ucx@1.18", when="@4.8.3230")
+    # requires("ucx@1.17", when="@4.8.3228")
+    # requires("ucx@1.16:1.17", when="@4.8.3227")
+    # requires("ucx@1.15:1.16", when="@4.8.3223")
+    # requires("ucx@1.15", when="@4.8.3221")
+    # requires("ucx@1.14", when="@4.8.3217:4.8.3220")
+    # requires("ucx@1.13", when="@4.7.3208")
+    # requires("ucx@1.12", when="@4.7.3202")
+    # requires("ucx@1.11", when="@4.7.3199")
 
     # HCOLL needs to be added as an external package to SPACK. For this, the
     # config file packages.yaml needs to be adjusted:

var/spack/repos/builtin/packages/hermes-shm/package.py

@@ -41,6 +41,8 @@ class HermesShm(CMakePackage):
     depends_on("yaml-cpp")
     depends_on("doxygen@1.9.3:", type="build")
     depends_on("libelf")
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
 
     # Machine variants
     variant("ares", default=False, description="Build in ares")

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

@@ -21,6 +21,9 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage):
     license("BSD-3-Clause")
 
     # Most recent tagged snapshot is the preferred version when profiling.
+    version(
+        "1.1.1", tag="v1.1.1", commit="d8762e05150b2040a27f69d8bf6603f22190a869", submodules=True
+    )
     version(
         "1.1.0", tag="v1.1.0", commit="7ccfa86a71fdb670ae690199ac676f3c1365799a", submodules=True
     )
@@ -72,10 +75,6 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage):
     version("master", branch="master")
     version("develop", branch="develop")
 
-    depends_on("c", type="build")
-    depends_on("cxx", type="build")
-    depends_on("fortran", type="build")
-
     variant(
         "axom",
         default=False,
@@ -100,9 +99,9 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage):
         description="Enable/disable cuSovler LU refactorization",
     )
 
-    depends_on("c", type="build")  # generated
-    depends_on("cxx", type="build")  # generated
-    depends_on("fortran", type="build")  # generated
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+    depends_on("fortran", type="build")
 
     depends_on("lapack")
     depends_on("blas")
@@ -152,11 +151,14 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage):
 
     # RAJA > 0.14 and Umpire > 6.0 require c++ std 14
     # We are working on supporting newer Umpire/RAJA versions
-    depends_on("raja@0.14", when="@0.5:+raja")
+    depends_on("raja@2024.07.0", when="@1.1.1:+raja")
+    depends_on("raja@0.14", when="@0.5:1.1.0+raja")
     depends_on("raja@:0.13", when="@0.3.99:0.4+raja")
-    depends_on("umpire@6", when="@0.5:+raja")
+    depends_on("umpire@2024.07.0", when="@1.1.1:+raja")
+    depends_on("umpire@6", when="@0.5:1.1.0+raja")
     depends_on("umpire@:5", when="@0.3.99:0.4+raja")
-    depends_on("camp@0.2.3:0.2", when="@0.3.99:+raja")
+    depends_on("camp@0.2.3:0.2", when="@0.3.99:1.1.0+raja")
+    depends_on("camp@2024.07.0", when="@1.1.1+raja")
 
     # This is no longer a requirement in RAJA > 0.14
     depends_on("umpire+cuda~shared", when="+raja+cuda ^raja@:0.14")

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

@@ -38,6 +38,7 @@ class Hipsycl(CMakePackage, ROCmPackage):
     variant("cuda", default=False, description="Enable CUDA backend for SYCL kernels")
     variant("rocm", default=False, description="Enable ROCM backend for SYCL kernels")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")
 
     depends_on("cmake@3.5:", type="build")

var/spack/repos/builtin/packages/intel-oneapi-advisor/package.py

@@ -23,6 +23,12 @@ class IntelOneapiAdvisor(IntelOneApiLibraryPackageWithSdk):
         "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/advisor.html"
     )
 
+    version(
+        "2025.1.1",
+        url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/4e67c003-b691-442c-846e-ef4ff4432d4d/intel-advisor-2025.1.1.25_offline.sh",
+        sha256="7377d85b4e02237aab932d53dfbef1564ba385b9407506022266b0c854f64ab8",
+        expand=False,
+    )
     version(
         "2025.1.0",
         url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/d9566edf-d6dd-4b85-9dda-efdf0ebb199a/intel-advisor-2025.1.0.507_offline.sh",

var/spack/repos/builtin/packages/intel-oneapi-ccl/package.py

@@ -26,6 +26,12 @@ class IntelOneapiCcl(IntelOneApiLibraryPackage):
 
     depends_on("intel-oneapi-mpi")
 
+    version(
+        "2021.15.1",
+        url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/422b4c09-4f3b-4e4d-b74e-502775398c9a/intel-oneccl-2021.15.1.5_offline.sh",
+        sha256="551a32d0cdf537d34d73bad1268ec70b6776be2a7c28b9753754ded7eb3407e0",
+        expand=False,
+    )
     version(
         "2021.15.0",
         url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/8f5d5e38-1626-41c1-9c20-44d966c43ae1/intel-oneccl-2021.15.0.401_offline.sh",

var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py

@@ -11,6 +11,17 @@
 from spack.package import *
 
 versions = [
+    {
+        "version": "2025.1.1",
+        "cpp": {
+            "url": "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/c4d2aef3-3123-475e-800c-7d66fd8da2a5/intel-dpcpp-cpp-compiler-2025.1.1.9_offline.sh",
+            "sha256": "63ea61f54a5ea9d30059ea499697e04953915ef317c0e8fc457077b690c726df",
+        },
+        "ftn": {
+            "url": "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/0e4735b3-8721-422b-b204-00eefe413bfd/intel-fortran-compiler-2025.1.1.10_offline.sh",
+            "sha256": "c59060a5b959fb0faeb1cde349689086da41d491adb41fd6c97177fcf59bf957",
+        },
+    },
     {
         "version": "2025.1.0",
         "cpp": {

var/spack/repos/builtin/packages/intel-oneapi-dal/package.py

@@ -25,6 +25,12 @@ class IntelOneapiDal(IntelOneApiLibraryPackage):
         "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onedal.html"
     )
 
+    version(
+        "2025.5.0",
+        url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/6f7d2b45-7c33-4ab7-80ac-ac0f7f6e38ed/intel-onedal-2025.5.0.11_offline.sh",
+        sha256="9b6224a60a1d2c266e98d3aa80cd8dc4f64b9429c9115c6f5236ad2fa88cacd0",
+        expand=False,
+    )
     version(
         "2025.4.0",
         url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e4da59ef-aa3a-4223-b3a0-4728014113e6/intel-onedal-2025.4.0.655_offline.sh",

var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py

@@ -25,6 +25,12 @@ class IntelOneapiDnn(IntelOneApiLibraryPackage):
         "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onednn.html"
     )
 
+    version(
+        "2025.1.1",
+        url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/72399822-f66b-4699-b723-214850e74b25/intel-onednn-2025.1.1.10_offline.sh",
+        sha256="bb466368c22f55ff8cd6e0ff82763740588cc42deaada7acf8948f1b807c0661",
+        expand=False,
+    )
     version(
         "2025.1.0",
         url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/9cf476b7-5b8b-4995-ac33-91a446bc0c6e/intel-onednn-2025.1.0.653_offline.sh",

var/spack/repos/builtin/packages/intel-oneapi-vtune/package.py

@@ -24,6 +24,12 @@ class IntelOneapiVtune(IntelOneApiLibraryPackageWithSdk):
 
     homepage = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/vtune-profiler.html"
 
+    version(
+        "2025.3.0",
+        url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/740981cd-e6af-4eb6-b147-c7912fadfb84/intel-vtune-2025.3.0.18_offline.sh",
+        sha256="d5237c577716ec221f12777f9e3a48b34d6bbb8bbeb22c000cc400b2b4f1325a",
+        expand=False,
+    )
     version(
         "2025.2.0",
         url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/c4c4ece5-c19f-43a9-99ad-3192164d8529/intel-vtune-2025.2.0.219_offline.sh",

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

@@ -14,6 +14,7 @@ class Libiconv(AutotoolsPackage, GNUMirrorPackage):
 
     license("LGPL-2.1-or-later")
 
+    version("1.18", sha256="3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8")
     version("1.17", sha256="8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313")
     version("1.16", sha256="e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04")
     version("1.15", sha256="ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178")

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

@@ -95,7 +95,7 @@ class Libxsmm(MakefilePackage):
     # A recent `as` is needed to compile libxmss until version 1.17
     # (<https://github.com/spack/spack/issues/28404>), but not afterwards
     # (<https://github.com/spack/spack/pull/21671#issuecomment-779882282>).
-    depends_on("binutils+ld+gas@2.33:", type="build", when="@:1.17")
+    depends_on("binutils+ld+gas@2.33:", type="build")
 
     # Version 2.0 supports both x86_64 and aarch64
     requires("target=x86_64:", "target=aarch64:")

var/spack/repos/builtin/packages/linaro-forge/package.py

@@ -22,6 +22,9 @@ class LinaroForge(Package):
     maintainers("kenche-linaro")
 
     if platform.machine() == "aarch64":
+        version(
+            "24.1.3", sha256="e79975611ae17b17481ec6626e9932bd0901cffcc6919bed523e3dc58dddefcd"
+        )
         version(
             "24.1.2", sha256="c3821b2e792d07b1b09f1ca81d1a27590b1bef62d5c48d6f7271debef62b6398"
         )
@@ -100,6 +103,9 @@ class LinaroForge(Package):
             "22.0.4", sha256="f4cb5bcbaa67f9209299fe4653186a2829760b8b16a2883913aa43766375b04c"
         )
     elif platform.machine() == "x86_64":
+        version(
+            "24.1.3", sha256="94ac68bbde8b56897d507c1ed27ff113bc8bf5167a2c513510a7ac7aed139d50"
+        )
         version(
             "24.1.2", sha256="794fed7cb60dd96fd68f0f414f6a8d15920cd2bd5a8795978150ca27c55a547d"
         )

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

@@ -55,6 +55,7 @@ class Llvm(CMakePackage, CudaPackage, LlvmDetection, CompilerPackage):
     version("main", branch="main")
 
     # Latest stable
+    version("20.1.4", sha256="65e3a582c4c684fa707a56ff643427bce3633eceaceae3295d81c0e830f44b89")
     version("20.1.3", sha256="b40c0d185b98c2ee3c0cb2f14cde65a06008b33dfb471cc7ad868f8ca3f7f897")
     version("20.1.2", sha256="9ee597456405ddf4809bcf66a4765137a68a85361347ca2a4bb13d9176e932ab")
     version("20.1.1", sha256="edde69aa3e48a3892a8f01332ff79cfb6179151b42503c4ba77d2cd408b013bf")
@@ -951,6 +952,12 @@ def setup_build_environment(self, env: EnvironmentModifications) -> None:
             # set the SDKROOT so the bootstrap compiler finds its C++ headers
             env.set("SDKROOT", macos_sdk_path())
 
+        if self.spec.satisfies("%intel-oneapi-compilers"):
+            intel_libs = find_libraries(
+                ["libsvml", "libimf", "libirc"], self.spec["intel-oneapi-runtime"].prefix.lib
+            )
+            env.append_flags("LDFLAGS", intel_libs.ld_flags)
+
     def setup_run_environment(self, env: EnvironmentModifications) -> None:
         if self.spec.satisfies("+clang"):
             env.set("CC", join_path(self.spec.prefix.bin, "clang"))

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

@@ -50,6 +50,8 @@ class Log4cxx(CMakePackage):
     depends_on("expat")
     depends_on("zlib-api")
     depends_on("zip")
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
 
     def cmake_args(self):
         return [

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

@@ -10,12 +10,13 @@ class Mpl(CMakePackage):
 
     homepage = "https://rabauke.github.io/mpl/html/"
     git = "https://github.com/rabauke/mpl.git"
-    url = "https://github.com/rabauke/mpl/archive/refs/tags/v0.3.0.tar.gz"
+    url = "https://github.com/rabauke/mpl/archive/refs/tags/v0.4.0.tar.gz"
     maintainers("rabauke")
 
     license("BSD-3-Clause")
 
     version("develop", branch="master")
+    version("0.4.0", tag="v0.4.0", commit="a7469769a3e183104594252c45c8026d3d6f87ec")
     version("0.3.0", tag="v0.3.0", commit="e6bd4926914127f3609a14474aa4a9c4fabbff0b")
     version("0.2.1", tag="v0.2.1", commit="5bee297b453d7b66a803453bfc6884611a36c4d0")
     version("0.2.0", tag="v0.2.0", commit="f322352c93627c1b91d8efb1c4ee2e4873aed016")

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

@@ -72,6 +72,8 @@ class Nix(AutotoolsPackage):
     depends_on("openssl")
     depends_on("sqlite@3.6.19:")
     depends_on("xz")
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
 
     # gcc 4.9+ and higher supported with c++14
     conflicts("%gcc@:4.8")

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

@@ -17,8 +17,7 @@ class Openfast(CMakePackage):
 
     version("develop", branch="dev")
     version("master", branch="main")
-    version("4.0.3", tag="v4.0.3", commit="20632d7728da024478956b545876eb24a48dadbe")
-    version("4.0.2", tag="v4.0.2", commit="fc1110183bcc87b16d93129edabdce6d30e3a497")
+    version("4.0.4", tag="v4.0.4", commit="d28a823169e75029d73362b07a2942d0a454f03b")
     version("3.5.5", tag="v3.5.5", commit="b48e032303c12df6949c67ebffb7050b888db000")
     version("3.5.4", tag="v3.5.4", commit="6a63db76978b0f703165391291963beb517d5a9e")
     version("3.5.3", tag="v3.5.3", commit="6a7a543790f3cad4a65b87242a619ac5b34b4c0f")
@@ -39,6 +38,8 @@ class Openfast(CMakePackage):
     version("1.0.0", tag="v1.0.0", commit="e788b9b18bd5ed96ea59d4bc0812d461bc430cfe")
 
     with default_args(deprecated=True):
+        version("4.0.3", tag="v4.0.3", commit="20632d7728da024478956b545876eb24a48dadbe")
+        version("4.0.2", tag="v4.0.2", commit="fc1110183bcc87b16d93129edabdce6d30e3a497")
         version("4.0.1", tag="v4.0.1", commit="89358f1843b62071ee1a8ca943c1b5277bcbd45a")
         version("4.0.0", tag="v4.0.0", commit="da685d4997fd17ea845812c785325efa72edcf47")
 

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

@@ -36,6 +36,8 @@ class Paradiseo(CMakePackage):
 
     # Required dependencies
     depends_on("cmake@2.8:", type="build")
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
 
     # Optional dependencies
     depends_on("mpi", when="+mpi")

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

@@ -59,6 +59,8 @@ class Purify(CMakePackage):
     depends_on("py-onnxruntime@1.17.1:", when="+onnxrt")
     depends_on("hdf5+cxx", when="+hdf5")
     depends_on("highfive", when="+hdf5")
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
 
     def cmake_args(self):
         args = [

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

@@ -17,6 +17,9 @@ class PyCupy(PythonPackage, CudaPackage, ROCmPackage):
     homepage = "https://cupy.dev/"
     pypi = "cupy/cupy-8.0.0.tar.gz"
 
+    version("13.4.0", sha256="d4b60e5a1d3b89be40fad0845bb9fc467a653abe8660f752416fd38d24ab7fdb")
+    version("13.3.0", sha256="9a2a17af2b99cce91dd1366939c3805e3f51f9de5046df64f29ccbad3bdf78ed")
+    version("13.2.0", sha256="e4dbd2b2ed4159a5cc0c0f98a710a014950eb2c16eeb455e956128f3b3bd0d51")
     version("13.1.0", sha256="5caf62288481a27713384523623045380ff42e618be4245f478238ed1786f32d")
     version("12.1.0", sha256="f6d31989cdb2d96581da12822e28b102f29e254427195c2017eac327869b7320")
     version("12.0.0", sha256="61ddbbef73d50d606bd5087570645f3c91ec9176c2566784c1d486d6a3404545")
@@ -28,12 +31,16 @@ class PyCupy(PythonPackage, CudaPackage, ROCmPackage):
 
     variant("all", default=False, description="Enable optional py-scipy, optuna, and cython")
 
-    depends_on("cxx", type="build")  # generated
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
 
     depends_on("python@3.7:", when="@:11", type=("build", "run"))
     depends_on("python@3.8:", when="@12:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
-    depends_on("py-cython@0.29.22:2", type="build")
+    depends_on("py-cython@0.29.22:2", type="build", when="@:13.3")
+    depends_on(
+        "py-cython@3:3.0.10,3.0.12:", type="build", when="@13.4:"
+    )  # 3.0.11 broken likely because of cython#6335, fixed in 3.0.12
     depends_on("py-fastrlock@0.5:", type=("build", "run"))
     depends_on("py-numpy@1.20:1.25", when="@:11", type=("build", "run"))
     depends_on("py-numpy@1.20:1.26", when="@12:", type=("build", "run"))
@@ -47,7 +54,10 @@ class PyCupy(PythonPackage, CudaPackage, ROCmPackage):
     # Based on https://github.com/cupy/cupy/releases
     depends_on("cuda@:11.9", when="@:11 +cuda")
     depends_on("cuda@:12.1", when="@12:12.1.0 +cuda")
-    depends_on("cuda@:12.4", when="@13: +cuda")
+    depends_on("cuda@:12.1", when="@13.0 +cuda")
+    depends_on("cuda@:12.4", when="@13.1:13.2 +cuda")
+    depends_on("cuda@:12.6", when="@13.3 +cuda")
+    depends_on("cuda@:12.8", when="@13.4: +cuda")
 
     for a in CudaPackage.cuda_arch_values:
         depends_on("nccl +cuda cuda_arch={0}".format(a), when="+cuda cuda_arch={0}".format(a))

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

@@ -48,6 +48,9 @@ class PyEspresso(CMakePackage):
 
     variant("hdf5", default=True, description="Enable HDF5 backend")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("cmake@3.0:", type="build")
     depends_on("mpi")
     depends_on("boost+serialization+filesystem+system+python+mpi")

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

@@ -14,6 +14,7 @@ class PyHatchling(PythonPackage):
 
     license("MIT", checked_by="tgamblin")
 
+    version("1.27.0", sha256="971c296d9819abb3811112fc52c7a9751c8d381898f36533bb16f9791e941fd6")
     version("1.25.0", sha256="7064631a512610b52250a4d3ff1bd81551d6d1431c4eb7b72e734df6c74f4262")
     version("1.24.2", sha256="41ddc27cdb25db9ef7b68bef075f829c84cb349aa1bff8240797d012510547b0")
     version("1.21.0", sha256="5c086772357a50723b825fd5da5278ac7e3697cdf7797d07541a6c90b6ff754c")
@@ -25,11 +26,23 @@ class PyHatchling(PythonPackage):
     version("1.8.1", sha256="448b04b23faed669b2b565b998ac955af4feea66c5deed3a1212ac9399d2e1cd")
     version("1.4.1", sha256="13461b42876ade4f75ee5d2a2c656b288ca0aab7f048ef66657ef166996b2118")
 
-    depends_on("py-editables@0.3:", type=("build", "run"))
-    depends_on("py-packaging@21.3:", type=("build", "run"))
-    depends_on("py-packaging@23.2:", when="@1.24.2:", type=("build", "run"))
-    depends_on("py-pathspec@0.10.1:", when="@1.9:", type=("build", "run"))
-    depends_on("py-pathspec@0.9:", type=("build", "run"))
-    depends_on("py-pluggy@1:", type=("build", "run"))
-    depends_on("py-tomli@1.2.2:", when="^python@:3.10", type=("build", "run"))
-    depends_on("py-trove-classifiers", when="@1.14:", type=("build", "run"))
+    with default_args(type=("build", "run")):
+        depends_on("python@3.8:", when="@1.18:")
+        depends_on("python@3.7:", when="@1.12:")
+
+        depends_on("py-editables@0.3:", when="@:1.21")
+
+        depends_on("py-importlib-metadata", when="@1.12:1.17 ^python@:3.7")
+
+        depends_on("py-packaging@24.2:", when="@1.26:")
+        depends_on("py-packaging@23.2:", when="@1.23:")
+        depends_on("py-packaging@21.3:")
+
+        depends_on("py-pathspec@0.10.1:", when="@1.9:")
+        depends_on("py-pathspec@0.9:")
+
+        depends_on("py-pluggy@1:")
+
+        depends_on("py-tomli@1.2.2:", when="^python@:3.10")
+
+        depends_on("py-trove-classifiers", when="@1.14:")

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

@@ -31,6 +31,9 @@ class PyRpy2(PythonPackage):
     variant("pandas", default=True, description="Pandas", when="@3.5.17:")
     variant("ipython", default=True, description="iPython", when="@3.5.17:")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     # many of the previous minor and patch versions change dependency versions so future updates
     # should be careful of that
     depends_on("python@3.8:", type=("build", "run"), when="@3.5.17:")
@@ -61,7 +64,7 @@ class PyRpy2(PythonPackage):
 
     depends_on("py-backports-zoneinfo", type=("build", "run"), when="@3.5.17: ^python@:3.8")
 
-    depends_on("iconv", type=("link"))
+    depends_on("iconv")
 
     # These are from 2019 and predate the pyproject.toml config that currently exists
     with when("@3.0.0:3.0.4"):

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

@@ -12,6 +12,7 @@ class PySympy(PythonPackage):
 
     license("BSD-3-Clause")
 
+    version("1.13.3", sha256="b27fd2c6530e0ab39e275fc9b683895367e51d5da91baa8d3d64db2565fec4d9")
     version("1.13.1", sha256="9cebf7e04ff162015ce31c9c6c9144daa34a93bd082f54fd8f12deca4f47515f")
     version("1.13.0", sha256="3b6af8f4d008b9a1a6a4268b335b984b23835f26d1d60b0526ebc71d48a25f57")
     version("1.12", sha256="ebf595c8dac3e0fdc4152c51878b498396ec7f30e7a914d6071e674d49420fb8")

var/spack/repos/builtin/packages/py-torch/macos_rpath.patch

@@ -0,0 +1,14 @@
+diff --git a/setup.py b/setup.py
+index 61ee9363fc2..db476913d31 100644
+--- a/setup.py
++++ b/setup.py
+@@ -720,9 +720,6 @@ class build_ext(setuptools.command.build_ext.build_ext):
+         # It's an old-style class in Python 2.7...
+         setuptools.command.build_ext.build_ext.run(self)
+ 
+-        if IS_DARWIN:
+-            self._embed_libomp()
+-
+         # Copy the essential export library to compile C++ extensions.
+         if IS_WINDOWS:
+             build_temp = self.build_temp

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

@@ -26,6 +26,7 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
     tags = ["e4s"]
 
     version("main", branch="main")
+    version("2.7.0", tag="v2.7.0", commit="134179474539648ba7dee1317959529fbd0e7f89")
     version("2.6.0", tag="v2.6.0", commit="1eba9b3aa3c43f86f4a2c807ac8e12c4a7767340")
     version("2.5.1", tag="v2.5.1", commit="a8d6afb511a69687bbb2b7e88a3cf67917e1697e")
     version("2.5.0", tag="v2.5.0", commit="32f585d9346e316e554c8d9bf7548af9f62141fc")
@@ -177,7 +178,8 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
         depends_on("py-typing-extensions@4.8:", when="@2.2:")
         depends_on("py-typing-extensions@3.6.2.1:", when="@1.7:")
         depends_on("py-setuptools")
-        depends_on("py-sympy@1.13.1", when="@2.5:")
+        depends_on("py-sympy@1.13.3:", when="@2.7:")
+        depends_on("py-sympy@1.13.1", when="@2.5:2.6")
         depends_on("py-sympy", when="@2:")
         depends_on("py-networkx", when="@2:")
         depends_on("py-jinja2", when="@2:")
@@ -196,7 +198,7 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
     depends_on("blas")
     depends_on("lapack")
 
-    # Third party dependencies
+    # third_party
     depends_on("fp16@2020-05-14", when="@1.6:")
     depends_on("fxdiv@2020-04-17", when="@1.6:")
     depends_on("nvtx@3.1.0", when="@2.6:")
@@ -265,7 +267,8 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
         depends_on("py-pybind11@2.10.0:", when="@1.13:1")
         depends_on("py-pybind11@2.6.2:", when="@1.8:1.12")
         depends_on("py-pybind11@2.3.0:", when="@:1.7")
-    depends_on("sleef@3.6.0_2024-03-20", when="@2.4:")
+    depends_on("sleef@3.7.0_2024-12-06", when="@2.7:")
+    depends_on("sleef@3.6.0_2024-03-20", when="@2.4:2.6")
     depends_on("sleef@3.5.1_2020-12-22", when="@1.8:2.3")
     depends_on("sleef@3.4.0_2019-07-30", when="@1.6:1.7")
 
@@ -325,6 +328,9 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
 
     conflicts("%gcc@:9.3", when="@2.2:", msg="C++17 support required")
 
+    # https://github.com/pytorch/pytorch/issues/151592
+    patch("macos_rpath.patch", when="@2.7:")
+
     # https://github.com/pytorch/pytorch/issues/151316
     patch(
         "https://github.com/pytorch/pytorch/pull/151344.patch?full_index=1",
@@ -335,10 +341,16 @@ class PyTorch(PythonPackage, CudaPackage, ROCmPackage):
 
     # https://github.com/pytorch/pytorch/issues/146239
     patch(
-        "https://github.com/pytorch/pytorch/pull/140275.patch?full_index=1",
-        sha256="65f56305a27d47d7065711d1131c6ac1611fabcb55b129c27ed6beabe4b94fe0",
+        "https://github.com/pytorch/pytorch/pull/146637.patch?full_index=1",
+        sha256="f93aa66e2cf9c0febdbcf72f44213a213e570e5f860186e81c92c8d2af0857c0",
         when="@2.6:",
-        reverse=True,
+    )
+
+    # Fixes 'FindBLAS.cmake' error: unknown command check_function_exists
+    patch(
+        "https://github.com/pytorch/pytorch/pull/145849.patch?full_index=1",
+        sha256="5675ab543b786b8f360de451b27b3eb5d3ce8499d6c1a207f4a854f0c473ab03",
+        when="@:2.6",
     )
 
     # https://github.com/pytorch/pytorch/issues/90448
@@ -563,6 +575,10 @@ def enable_or_disable(variant, keyword="USE", var=None):
             elif "~" + variant in self.spec:
                 env.set(keyword + "_" + var, "OFF")
 
+        # https://github.com/pytorch/pytorch/issues/151592
+        if self.spec.satisfies("@:2.6"):
+            env.set("PACKAGE_TYPE", "conda")
+
         # Build in parallel to speed up build times
         env.set("MAX_JOBS", str(make_jobs))
 

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

@@ -17,6 +17,7 @@ class PyTorchaudio(PythonPackage):
     maintainers("adamjstewart")
 
     version("main", branch="main")
+    version("2.7.0", tag="v2.7.0", commit="654fee8fd17784271be1637eac1293fd834b4e9a")
     version("2.6.0", tag="v2.6.0", commit="d8831425203385077a03c1d92cfbbe3bf2106008")
     version("2.5.1", tag="v2.5.1", commit="1661daf10599ca8889f092ec37814fabbe202bb0")
     version("2.5.0", tag="v2.5.0", commit="56bc006d56a0d4960de6a1e0b6340cba4eda05cd")
@@ -76,6 +77,7 @@ class PyTorchaudio(PythonPackage):
         depends_on("python@:3.8", when="@:0.7.0")
 
         depends_on("py-torch@main", when="@main")
+        depends_on("py-torch@2.7.0", when="@2.7.0")
         depends_on("py-torch@2.6.0", when="@2.6.0")
         depends_on("py-torch@2.5.1", when="@2.5.1")
         depends_on("py-torch@2.5.0", when="@2.5.0")
@@ -149,13 +151,6 @@ def patch(self):
                 string=True,
             )
 
-    def flag_handler(self, name, flags):
-        # https://github.com/pytorch/vision/issues/8653
-        if name == "ldflags":
-            if self.spec.satisfies("%apple-clang@15:"):
-                flags.append("-Wl,-ld_classic")
-        return (flags, None, None)
-
     def setup_build_environment(self, env: EnvironmentModifications) -> None:
         # tools/setup_helpers/extension.py
         env.set("BUILD_SOX", "0")

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

@@ -18,6 +18,7 @@ class PyTorchvision(PythonPackage):
     license("BSD-3-Clause")
 
     version("main", branch="main")
+    version("0.22.0", sha256="83ed8855cdfb138aba6f116f8fd8da8b83463170dad67a70f60327915ed12014")
     version("0.21.0", sha256="0a4a967bbb7f9810f792cd0289a07fb98c8fb5d1303fae8b63e3a6b05d720058")
     version("0.20.1", sha256="7e08c7f56e2c89859310e53d898f72bccc4987cd83e08cfd6303513da15a9e71")
     version("0.20.0", sha256="b59d9896c5c957c6db0018754bbd17d079c5102b82b9be0b438553b40a7b6029")
@@ -82,6 +83,7 @@ class PyTorchvision(PythonPackage):
 
         # https://github.com/pytorch/vision#installation
         depends_on("py-torch@main", when="@main")
+        depends_on("py-torch@2.7.0", when="@0.22.0")
         depends_on("py-torch@2.6.0", when="@0.21.0")
         depends_on("py-torch@2.5.1", when="@0.20.1")
         depends_on("py-torch@2.5.0", when="@0.20.0")
@@ -166,13 +168,6 @@ class PyTorchvision(PythonPackage):
     # Many of the datasets require additional dependencies to use.
     # These can be installed after the fact.
 
-    def flag_handler(self, name, flags):
-        # https://github.com/pytorch/vision/issues/8653
-        if name == "ldflags":
-            if self.spec.satisfies("%apple-clang@15:"):
-                flags.append("-Wl,-ld_classic")
-        return (flags, None, None)
-
     def setup_build_environment(self, env: EnvironmentModifications) -> None:
         # The only documentation on building is what is found in setup.py and:
         # https://github.com/pytorch/vision/blob/main/CONTRIBUTING.md#development-installation

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

@@ -23,6 +23,7 @@ class Qmcpack(CMakePackage, CudaPackage):
     # can occasionally change.
     # NOTE: 12/19/2017 QMCPACK 3.0.0 does not build properly with Spack.
     version("develop")
+    version("4.1.0", tag="v4.1.0", commit="c32123a5233186b177d75b800b86f1ad3b1a1413")
     version("4.0.0", tag="v4.0.0", commit="0199944fb644b4798446fdfc0549c81666a4a943")
     version("3.17.1", tag="v3.17.1", commit="9d0d968139fc33f71dbf9159f526dd7b47f10a3b")
     version("3.17.0", tag="v3.17.0", commit="9049a90626d1fe3c431f55c56a7197f8a13d5fc6")

var/spack/repos/builtin/packages/r-askpass/package.py

@@ -24,4 +24,7 @@ class RAskpass(RPackage):
     version("1.2.0", sha256="b922369781934d0ffc8d0c0177e8ace56796c2e6a726f65e460c16f792592cef")
     version("1.1", sha256="db40827d1bdbb90c0aa2846a2961d3bf9d76ad1b392302f9dd84cc2fd18c001f")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r-sys@2.1:", type=("build", "run"))

var/spack/repos/builtin/packages/r-backports/package.py

@@ -28,4 +28,6 @@ class RBackports(RPackage):
     version("1.1.1", sha256="494e81a4829339c8f1cc3e015daa807e9138b8e21b929965fc7c00b1abbe8897")
     version("1.1.0", sha256="c5536966ed6ca93f20c9a21d4f569cc1c6865d3352445ea66448f82590349fcd")
 
+    depends_on("c", type="build")
+
     depends_on("r@3.0.0:", type=("build", "run"))

var/spack/repos/builtin/packages/r-cachem/package.py

@@ -20,6 +20,9 @@ class RCachem(RPackage):
     version("1.0.7", sha256="234fad2a947d1e1fb87d3fa92abf9197877772e31bc81ae5991ae69689b6320a")
     version("1.0.6", sha256="9a9452f7bcf3f79436c418b3c3290449fb8fd338714d9b992153754d112f1864")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r-rlang", type=("build", "run"))
     depends_on("r-fastmap", type=("build", "run"))
     depends_on("r-fastmap@1.2.0:", when="@1.1.0:", type=("build", "run"))

var/spack/repos/builtin/packages/r-cli/package.py

@@ -33,6 +33,8 @@ class RCli(RPackage):
     version("1.0.1", sha256="ef80fbcde15760fd55abbf9413b306e3971b2a7034ab8c415fb52dc0088c5ee4")
     version("1.0.0", sha256="8fa3dbfc954ca61b8510f767ede9e8a365dac2ef95fe87c715a0f37d721b5a1d")
 
+    depends_on("c", type="build")
+
     depends_on("r@2.10:", type=("build", "run"))
     depends_on("r@3.4:", type=("build", "run"), when="@3.3.0:")
 

var/spack/repos/builtin/packages/r-curl/package.py

@@ -61,6 +61,9 @@ class RCurl(RPackage):
         deprecated=True,
     )
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.0.0:", type=("build", "run"))
     depends_on("curl", when="@4.3:")
     depends_on("curl@:7.63", when="@:4.0")

var/spack/repos/builtin/packages/r-data-table/package.py

@@ -39,6 +39,9 @@ class RDataTable(RPackage):
     version("1.9.8", sha256="dadb21a14a7f4d60955cdd8fb9779136833498be97b1625914e9a6b580646f4d")
     version("1.9.6", sha256="6f74c349c1731823aef6899edcf18418454167d04eba983e3a6fe17ee9fd236e")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.1.0:", type=("build", "run"))
     depends_on("zlib-api")
     depends_on("llvm-openmp", when="platform=darwin %apple-clang", type=("build", "run"))

var/spack/repos/builtin/packages/r-digest/package.py

@@ -42,6 +42,9 @@ class RDigest(RPackage):
     version("0.6.11", sha256="edab2ca2a38bd7ee19482c9d2531cd169d5123cde4aa2a3dd65c0bcf3d1d5209")
     version("0.6.9", sha256="95fdc36011869fcfe21b40c3b822b931bc01f8a531e2c9260582ba79560dbe47")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@2.4.1:", type=("build", "run"))
     depends_on("r@3.1.0:", type=("build", "run"), when="@0.6.16:")
     depends_on("r@3.3.0:", type=("build", "run"), when="@0.6.27:")

var/spack/repos/builtin/packages/r-dplyr/package.py

@@ -33,6 +33,9 @@ class RDplyr(RPackage):
     version("0.7.0", sha256="27b3593c09da5e99c0c4fb19ea826edd2cab619f8aaefd0cfd2a4140a0bd9410")
     version("0.5.0", sha256="93d3b829f1c2d38e14a4f2fa7d6398fc6c1a9e4189b3e78bc38a0eb0e864454f")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.1.2:", type=("build", "run"))
     depends_on("r@3.2.0:", type=("build", "run"), when="@0.8.1:")
     depends_on("r@3.3.0:", type=("build", "run"), when="@1.0.3:")

var/spack/repos/builtin/packages/r-fansi/package.py

@@ -27,4 +27,6 @@ class RFansi(RPackage):
     version("0.2.2", sha256="71dfdda467985a4d630ecf93d4bc60446a8a78d69dbd7ac24cc45822329d4bce")
     version("0.2.1", sha256="abe709d69ddd6610aaa24e049c7a97c16a2c2dbe0873d4e3b8af57e486ef05c5")
 
+    depends_on("c", type="build")
+
     depends_on("r@3.1.0:", type=("build", "run"))

var/spack/repos/builtin/packages/r-farver/package.py

@@ -25,3 +25,6 @@ class RFarver(RPackage):
     version("2.1.0", sha256="e5c8630607049f682fb3002b99ca4f5e7c6b94f8b2a4342df594e7853b77cef4")
     version("2.0.3", sha256="0e1590df79ec6078f10426411b96216b70568a4eaf3ffd84ca723add0ed8e5cc")
     version("2.0.1", sha256="71473e21727357084c6aec4bb9bb258a6797a0f676b4b27504a03f16aa2f4e54")
+
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")

var/spack/repos/builtin/packages/r-fastmap/package.py

@@ -23,3 +23,6 @@ class RFastmap(RPackage):
     version("1.1.1", sha256="3623809dd016ae8abd235200ba7834effc4b916915a059deb76044137c5c7173")
     version("1.1.0", sha256="9113e526b4c096302cfeae660a06de2c4c82ae4e2d3d6ef53af6de812d4c822b")
     version("1.0.1", sha256="4778b05dfebd356f8df980dfeff3b973a72bca14898f870e5c40c1d84db9faec")
+
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")

var/spack/repos/builtin/packages/r-fs/package.py

@@ -21,6 +21,9 @@ class RFs(RPackage):
     version("1.5.0", sha256="36df1653571de3c628a4f769c4627f6ac53d0f9e4106d9d476afb22ae9603897")
     version("1.3.1", sha256="d6934dca8f835d8173e3fb9fd4d5e2740c8c04348dd2bcc57df1b711facb46bc")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.1:", type=("build", "run"))
     depends_on("r@3.4:", type=("build", "run"), when="@1.6.2:")
     depends_on("r@3.6:", type=("build", "run"), when="@1.6.4:")

var/spack/repos/builtin/packages/r-glue/package.py

@@ -29,6 +29,9 @@ class RGlue(RPackage):
     version("1.3.0", sha256="789e5a44c3635c3d3db26666e635e88adcf61cd02b75465125d95d7a12291cee")
     version("1.2.0", sha256="19275b34ee6a1bcad05360b7eb996cebaa1402f189a5dfb084e695d423f2296e")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.1:", type=("build", "run"))
     depends_on("r@3.2:", type=("build", "run"), when="@1.4.2:")
     depends_on("r@3.4:", type=("build", "run"), when="@1.6.0:")

var/spack/repos/builtin/packages/r-htmltools/package.py

@@ -23,6 +23,9 @@ class RHtmltools(RPackage):
     version("0.3.6", sha256="44affb82f9c2fd76c9e2b58f9229adb003217932b68c3fdbf1327c8d74c868a2")
     version("0.3.5", sha256="29fb7e075744bbffdff8ba4fce3860076de66f39a59a100ee4cfb4fc00722b49")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@2.14.1:", type=("build", "run"))
     depends_on("r-digest", type=("build", "run"))
     depends_on("r-base64enc", type=("build", "run"), when="@0.5.1:")

var/spack/repos/builtin/packages/r-lattice/package.py

@@ -26,5 +26,8 @@ class RLattice(RPackage):
     version("0.20-35", sha256="0829ab0f4dec55aac6a73bc3411af68441ddb1b5b078d680a7c2643abeaa965d")
     version("0.20-34", sha256="4a1a1cafa9c6660fb9a433b3a51898b8ec8e83abf143c80f99e3e4cf92812518")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.0.0:", type=("build", "run"))
     depends_on("r@4.0.0:", type=("build", "run"), when="@0.21-8:")

var/spack/repos/builtin/packages/r-lubridate/package.py

@@ -29,6 +29,8 @@ class RLubridate(RPackage):
     version("1.7.1", sha256="898c3f482ab8f5e5b415eecd13d1238769c88faed19b63fcb074ffe5ff57fb5f")
     version("1.5.6", sha256="9b1627ba3212e132ce2b9a29d7513e250cc682ab9b4069f6788a22e84bf8d2c4")
 
+    depends_on("c", type="build")
+
     depends_on("r@3.0.0:", type=("build", "run"))
     depends_on("r@3.2:", type=("build", "run"), when="@1.7.9.2:")
     depends_on("r-generics", type=("build", "run"), when="@1.7.9.2:")

var/spack/repos/builtin/packages/r-mass/package.py

@@ -25,6 +25,9 @@ class RMass(RPackage):
     version("7.3-51.3", sha256="5b0e0e7704d43a94b08dcc4b3fe600b9723d1b3e446dd393e82d39ddf66608b6")
     version("7.3-47", sha256="ed44cdabe84fff3553122267ade61d5cc68071c435f7645d36c8f2e4e9f9c6bf")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.1.0:", type=("build", "run"))
     depends_on("r@3.3.0:", type=("build", "run"), when="@7.3-55:")
     depends_on("r@4.2.0:", type=("build", "run"), when="@7.3-59:")

var/spack/repos/builtin/packages/r-matrix/package.py

@@ -31,6 +31,9 @@ class RMatrix(RPackage):
     version("1.2-8", sha256="3cd2a187c45fc18a0766dc148b7f83dbf6f2163c256e887c41cbaa7c9a20dbb7")
     version("1.2-6", sha256="4b49b639b7bf612fa3d1c1b1c68125ec7859c8cdadae0c13f499f24099fd5f20")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.0.1:", type=("build", "run"))
     depends_on("r@3.2.0:", type=("build", "run"), when="@1.2-13:")
     depends_on("r@3.6.0:", type=("build", "run"), when="@1.3-2:")

var/spack/repos/builtin/packages/r-mgcv/package.py

@@ -37,6 +37,8 @@ class RMgcv(RPackage):
     version("1.8-16", sha256="9266a0cbd783717fc6130db4e0034e69465d177397687f35daf6a8ccdb0b435e")
     version("1.8-13", sha256="74bc819708ef59da94b777a446ef00d7f14b428eec843533e824017c29cc524b")
 
+    depends_on("c", type="build")
+
     depends_on("r@2.14.0:", type=("build", "run"))
     depends_on("r@3.6.0:", type=("build", "run"), when="@1.8.34:")
     depends_on("r-nlme@3.1-64:", type=("build", "run"))

var/spack/repos/builtin/packages/r-nlme/package.py

@@ -28,6 +28,10 @@ class RNlme(RPackage):
     version("3.1-131", sha256="79daa167eb9bc7d8dba506da4b24b5250665b051d4e0a51dfccbb0087fdb564c")
     version("3.1-130", sha256="ec576bd906ef2e1c79b6a4382743d425846f63be2a43de1cce6aa397b40e290e")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+    depends_on("fortran", type="build")
+
     depends_on("r@3.0.2:", type=("build", "run"))
     depends_on("r@3.3.0:", type=("build", "run"), when="@3.1-131.1")
     depends_on("r@3.5.0:", type=("build", "run"), when="@3.1-134:3.1-135")

var/spack/repos/builtin/packages/r-openssl/package.py

@@ -37,6 +37,8 @@ class ROpenssl(RPackage):
     version("0.9.6", sha256="6dd6d1cade4004962d516ad761fff0812beec0232318b385d286761423a5dc39")
     version("0.9.4", sha256="cb7349defa5428acc0907629a4f53f82d2519af219e5d6a41f852cf55b1feb66")
 
+    depends_on("c", type="build")
+
     depends_on("r-askpass", type=("build", "run"), when="@1.2:")
     depends_on("openssl@1.0.1:")
     depends_on("openssl@1.0.2:", when="@2.0.2:")

var/spack/repos/builtin/packages/r-pbdzmq/package.py

@@ -31,6 +31,9 @@ class RPbdzmq(RPackage):
     version("0.3-2", sha256="ece2a2881c662f77126e4801ba4e01c991331842b0d636ce5a2b591b9de3fc37")
     version("0.2-4", sha256="bfacac88b0d4156c70cf63fc4cb9969a950693996901a4fa3dcd59949ec065f6")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.0.0:", type=("build", "run"))
     depends_on("r@3.2.0:", type=("build", "run"), when="@0.2-6:")
     depends_on("r@3.5.0:", type=("build", "run"), when="@0.3-4:")

var/spack/repos/builtin/packages/r-processx/package.py

@@ -34,6 +34,9 @@ class RProcessx(RPackage):
     version("2.0.0.1", sha256="8f61b2952d0f2d13c74465bfba174ce11eee559475c2f7b9be6bcb9e2e1d827b")
     version("2.0.0", sha256="8325b56a60a276909228756281523cda9256bc754c5f3ca03b41c5c17cc398ad")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.4.0:", type=("build", "run"), when="@3.5.3:")
     depends_on("r-ps@1.2.0:", type=("build", "run"), when="@3.2.0:")
     depends_on("r-r6", type=("build", "run"))

var/spack/repos/builtin/packages/r-ps/package.py

@@ -27,5 +27,7 @@ class RPs(RPackage):
     version("1.1.0", sha256="5d5240d5bf1d48c721b3fdf47cfc9dbf878e388ea1f057b764db05bffdc4a9fe")
     version("1.0.0", sha256="9bdaf64aaa44ae11866868402eb75bf56c2e3022100476d9b9dcd16ca784ffd8")
 
+    depends_on("c", type="build")
+
     depends_on("r@3.1:", type=("build", "run"))
     depends_on("r@3.4:", type=("build", "run"), when="@1.7.0:")

var/spack/repos/builtin/packages/r-purrr/package.py

@@ -22,6 +22,9 @@ class RPurrr(RPackage):
     version("0.3.1", sha256="c2a3c9901192efd8a04976676f84885a005db88deb1432e4750900c7b3b7883b")
     version("0.2.4", sha256="ed8d0f69d29b95c2289ae52be08a0e65f8171abb6d2587de7b57328bf3b2eb71")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.1:", type=("build", "run"))
     depends_on("r@3.2:", type=("build", "run"), when="@0.3.3:")
     depends_on("r@3.4.0:", type=("build", "run"), when="@1.0.1:")

var/spack/repos/builtin/packages/r-ragg/package.py

@@ -22,6 +22,9 @@ class RRagg(RPackage):
     version("1.2.4", sha256="c547e5636a2eefaa0021a0d50fad1e813c2ce976ec0c9c3f796d38a110680dcd")
     version("1.2.3", sha256="976da0007ef0d4dbadda4734727b539671b65c1eff4ff392d734f4e2c846f2b2")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r-systemfonts@1.0.3:", type=("build", "run"))
     depends_on("r-textshaping@0.3.0:", type=("build", "run"))
     depends_on("freetype")

var/spack/repos/builtin/packages/r-readr/package.py

@@ -27,6 +27,9 @@ class RReadr(RPackage):
     version("1.3.1", sha256="33f94de39bb7f2a342fbb2bd4e5afcfec08798eac39672ee18042ac0b349e4f3")
     version("1.1.1", sha256="1a29b99009a06f2cee18d08bc6201fd4985b6d45c76cefca65084dcc1a2f7cb3")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.0.2:", type=("build", "run"))
     depends_on("r@3.1:", type=("build", "run"), when="@1.3.0:")
     depends_on("r@3.4:", type=("build", "run"), when="@2.1.3:")

var/spack/repos/builtin/packages/r-readxl/package.py

@@ -26,6 +26,9 @@ class RReadxl(RPackage):
     version("1.1.0", sha256="b63d21fc6510acb373e96deaec45e966a523ec75cbec75a089529297ed443116")
     version("1.0.0", sha256="fbd62f07fed7946363698a57be88f4ef3fa254ecf456ef292535849c787fc7ad")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.4:", type=("build", "run"), when="@1.4.0:")
     depends_on("r@3.5:", type=("build", "run"), when="@1.4.2:")
     depends_on("r@3.6:", type=("build", "run"), when="@1.4.3:")

var/spack/repos/builtin/packages/r-rlang/package.py

@@ -36,6 +36,8 @@ class RRlang(RPackage):
     version("0.1.2", sha256="90cfcd88cae6fff044fca64b24a8e6bdc09fc276163b518ff2d90268b0c785f9")
     version("0.1.1", sha256="5901f95d68728a7d9bb1c2373a20ce6e4ad222f66e397e7735e9eff987c73c3f")
 
+    depends_on("c", type="build")
+
     depends_on("r@3.1.0:", type=("build", "run"))
     depends_on("r@3.2.0:", type=("build", "run"), when="@0.4.0:")
     depends_on("r@3.3.0:", type=("build", "run"), when="@0.4.10:")

var/spack/repos/builtin/packages/r-rlas/package.py

@@ -24,3 +24,4 @@ class RRlas(RPackage):
     depends_on("r-rcpp", type=("build", "run"))
     depends_on("r-data-table", type=("build", "run"))
     depends_on("boost@:1.84+filesystem+program_options+numpy+python+regex+serialization+thread")
+    depends_on("cxx", type="build")

var/spack/repos/builtin/packages/r-sass/package.py

@@ -23,6 +23,9 @@ class RSass(RPackage):
     version("0.4.1", sha256="850fcb6bd49085d5afd25ac18da0744234385baf1f13d8c0a320f4da2de608bb")
     version("0.4.0", sha256="7d06ca15239142a49e88bb3be494515abdd8c75f00f3f1b0ee7bccb55019bc2b")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r-fs", type=("build", "run"))
     depends_on("r-fs@1.2.4:", type=("build", "run"), when="@0.4.7:")
     depends_on("r-rlang@0.4.10:", type=("build", "run"))

var/spack/repos/builtin/packages/r-stringi/package.py

@@ -34,6 +34,9 @@ class RStringi(RPackage):
     version("1.1.2", sha256="e50b7162ceb7ebae403475f6f8a76a39532a2abc82112db88661f48aa4b9218e")
     version("1.1.1", sha256="243178a138fe68c86384feb85ead8eb605e8230113d638da5650bca01e24e165")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@2.14:", type=("build", "run"))
     depends_on("r@3.1:", type=("build", "run"), when="@1.6.1:")
     depends_on("r@3.4:", type=("build", "run"), when="@1.8.1:")

var/spack/repos/builtin/packages/r-sys/package.py

@@ -23,6 +23,8 @@ class RSys(RPackage):
     version("3.4", sha256="17f88fbaf222f1f8fd07919461093dac0e7175ae3c3b3264b88470617afd0487")
     version("3.2", sha256="2819498461fe2ce83d319d1a47844e86bcea6d01d10861818dba289e7099bbcc")
 
+    depends_on("c", type="build")
+
     def flag_handler(self, name, flags):
         if name == "cflags":
             flags.append(self.compiler.c99_flag)

var/spack/repos/builtin/packages/r-systemfonts/package.py

@@ -25,6 +25,9 @@ class RSystemfonts(RPackage):
     version("1.0.3", sha256="647c99d5ea6f90a49768ea7b10b39816af6be85168475273369fd973a20dbbba")
     version("1.0.1", sha256="401db4d9e78e3a5e00b7a0b4fbad7fbb1c584734469b65fe5b7ebe1851c7a797")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.2.0:", type=("build", "run"))
     depends_on("r-cpp11@0.2.1:", type=("build", "run"))
     depends_on("r-lifecycle", type=("build", "run"), when="@1.1.0:")

var/spack/repos/builtin/packages/r-textshaping/package.py

@@ -20,6 +20,9 @@ class RTextshaping(RPackage):
     version("0.4.0", sha256="35e940786bb278560de61bb55d4f46f8c86c878d0461613ceb8c98ba9b239d7a")
     version("0.3.6", sha256="80e2c087962f55ce2811fbc798b09f5638c06c6b28c10cd3cb3827005b902ada")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.2.0:", type=("build", "run"))
     depends_on("r-cpp11@0.2.1:", type=("build", "run"))
     depends_on("r-lifecycle", type=("build", "run"), when="@0.4.0:")

var/spack/repos/builtin/packages/r-tidyr/package.py

@@ -31,6 +31,9 @@ class RTidyr(RPackage):
     version("0.7.2", sha256="062cea2e2b57fffd500e4ce31cba6d593e65684fc0897ea49ea38d257c76009c")
     version("0.5.1", sha256="dbab642ac7231cbfe3e2a0d4553fb4ffb3699c6d6b432be2bb5812dfbbdbdace")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.1:", type=("build", "run"))
     depends_on("r@3.4.0:", type=("build", "run"), when="@1.3.0:")
     depends_on("r@3.6:", type=("build", "run"), when="@1.3.1:")

var/spack/repos/builtin/packages/r-timechange/package.py

@@ -24,5 +24,8 @@ class RTimechange(RPackage):
     version("0.2.0", sha256="3d602008052123daef94a5c3f5154c5461b4ec0432ab70c37273d7ddd252f7f1")
     version("0.1.1", sha256="8503919d233d7d7b81fe47692f0f2d6742ff4cae7320a5522bf98f077f5d7f70")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.3:", type=("build", "run"))
     depends_on("r-cpp11@0.2.7:", type=("build", "run"))

var/spack/repos/builtin/packages/r-tzdb/package.py

@@ -26,6 +26,9 @@ class RTzdb(RPackage):
     version("0.3.0", sha256="6099f0ec1fba692b51b4360aa776902a39f10dae815933c31994b8e4d4277038")
     version("0.2.0", sha256="c335905d452b400af7ed54b916b5246cb3f47ede0602911a2bcb25a1cf56d5a9")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.3:", type=("build", "run"))
     depends_on("r@3.4.0:", type=("build", "run"), when="@0.3.0:")
     depends_on("r@3.5.0:", type=("build", "run"), when="@0.4.0:")

var/spack/repos/builtin/packages/r-utf8/package.py

@@ -25,4 +25,6 @@ class RUtf8(RPackage):
     version("1.1.0", sha256="6a8ae2c452859800c3ef12993a55892588fc35df8fa1360f3d182ed97244dc4f")
     version("1.0.0", sha256="7562a80262cbc2017eee76c0d3c9575f240fab291f868a11724fa04a116efb80")
 
+    depends_on("c", type="build")
+
     depends_on("r@2.10:", type=("build", "run"))

var/spack/repos/builtin/packages/r-uuid/package.py

@@ -22,4 +22,5 @@ class RUuid(RPackage):
     version("0.1-4", sha256="98e0249dda17434bfa209c2058e9911e576963d4599be9f7ea946e664f8ca93e")
     version("0.1-2", sha256="dd71704dc336b0857981b92a75ed9877d4ca47780b1682def28839304cd3b1be")
 
+    depends_on("c", type="build")
     depends_on("r@2.9.0:", type=("build", "run"))

var/spack/repos/builtin/packages/r-vroom/package.py

@@ -24,6 +24,9 @@ class RVroom(RPackage):
     version("1.5.7", sha256="d087cb148f71c222fc89199d03df2502689149873414a6d89c2f006d3a109fde")
     version("1.5.5", sha256="1d45688c08f162a3300eda532d9e87d144f4bc686769a521bf9a12e3d3b465fe")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.1:", type=("build", "run"))
     depends_on("r@3.4:", type=("build", "run"), when="@1.6.0:")
     depends_on("r@3.6:", type=("build", "run"), when="@1.6.4:")

var/spack/repos/builtin/packages/r-xfun/package.py

@@ -25,4 +25,6 @@ class RXfun(RPackage):
     version("0.20", sha256="284239d12a3d5ea7d1ef8b1382fb0a7a4661af54c85510501279681871da7c10")
     version("0.8", sha256="c2f8ecf8b57ddec02f9be7f417d9e22fc1ae2c7db8d70aa703fc62bf4a5c5416")
 
+    depends_on("c", type="build")
+
     depends_on("r@3.2.0:", when="@0.47:", type=("build", "run"))

var/spack/repos/builtin/packages/r-xml2/package.py

@@ -22,6 +22,9 @@ class RXml2(RPackage):
     version("1.2.1", sha256="5615bbc94607efc3bc192551992b349091df802ae34b855cfa817733f2690605")
     version("1.1.1", sha256="00f3e3b66b76760c19da5f6dddc98e6f30de36a96b211e59e1a3f4ff58763116")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("r@3.1.0:", type=("build", "run"))
     depends_on("r@3.6.0:", type=("build", "run"), when="@1.3.6:")
     depends_on("libxml2")

var/spack/repos/builtin/packages/r-yaml/package.py

@@ -25,3 +25,5 @@ class RYaml(RPackage):
     version("2.1.19", sha256="e5db035693ac765e4b5fe1fc2e9711f8ca73e398e3f2bf27cc60def59ccd7f11")
     version("2.1.14", sha256="41a559846f6d44cc2dbcb3fc0becbc50d2766d3dc2aad7cfb97c1f9759ec0875")
     version("2.1.13", sha256="26f69aa2008bcacf3b2f95ef82a4667eaec2f2da8487646f71f1e2635d2d7fa2")
+
+    depends_on("c", type="build")

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

@@ -16,6 +16,7 @@ class Rmgdft(CMakePackage, CudaPackage):
     tags = ["ecp", "ecp-apps"]
     version("master", branch="master")
     version("develop", branch="develop")
+    version("6.2.0", tag="v6.2.0", commit="c00f21741c40aacebf4767adb1f274c52bfc82ea")
     version("6.1.0", tag="v6.1.0", commit="4dd5862725006b35d3118705197f89f13b24b858")
     version("5.4.0", tag="v5.4.0", commit="471251b191abb5f6ffdca4333c1fcb2add3c52f2")
     version("5.3.1", tag="v5.3.1", commit="dd6217ed82a8fe335acd0c030023b539d1be920a")

var/spack/repos/builtin/packages/rust/detection_test.yaml

@@ -0,0 +1,55 @@
+paths:
+- layout:
+  - executables:
+    - "bin/rustc"
+    script: |
+      echo "rustc 1.75.0 (82e1608df 2023-12-21) (built from a source tarball)"
+  - executables:
+    - "bin/cargo"
+    script: |
+      echo "cargo 1.75.0"
+  platforms: ["darwin", "linux"]
+  results:
+  - spec: 'rust@1.75.0'
+    extra_attributes:
+      compilers:
+        rust: ".*/bin/rustc"
+      cargo: ".*/bin/cargo"
+# If rustc is missing, then we don't detect specs
+- layout:
+  - executables:
+    - "bin/cargo"
+    script: |
+      echo "cargo 1.75.0"
+  platforms: ["darwin", "linux"]
+  results: []
+# Check we can detect 2 different versions in the same folder
+- layout:
+  - executables:
+    - "bin/rustc"
+    script: |
+      echo "rustc 1.75.0 (82e1608df 2023-12-21) (built from a source tarball)"
+  - executables:
+    - "bin/rustc-1.80"
+    script: |
+      echo "rustc 1.80.1 (3f5fd8dd4 2024-08-06) (built from a source tarball)"
+  - executables:
+    - "bin/cargo"
+    script: |
+      echo "cargo 1.75.0"
+  - executables:
+    - "bin/cargo-1.80"
+    script: |
+      echo "cargo 1.80.1 (376290515 2024-07-16)"
+  platforms: ["darwin", "linux"]
+  results:
+  - spec: 'rust@1.75.0'
+    extra_attributes:
+      compilers:
+        rust: ".*/bin/rustc"
+      cargo: ".*/bin/cargo"
+  - spec: 'rust@1.80.1'
+    extra_attributes:
+      compilers:
+        rust: ".*/bin/rustc-1.80"
+      cargo: ".*/bin/cargo-1.80"

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

@@ -102,22 +102,36 @@ class Rust(Package):
     conflicts("%oneapi", msg="Rust not compatible with Intel oneAPI compilers")
 
     extendable = True
-    executables = ["^rustc$", "^cargo$"]
+    executables = [r"^rustc(-[\d.]*)?$", r"^cargo(-[\d.]*)?$"]
 
     phases = ["configure", "build", "install"]
 
     @classmethod
-    def determine_spec_details(cls, prefix, exes_in_prefix):
-        rustc_candidates = [x for x in exes_in_prefix if os.path.basename(x) == "rustc"]
-        cargo_candidates = [x for x in exes_in_prefix if os.path.basename(x) == "cargo"]
-        # Both rustc and cargo must be present
-        if not (rustc_candidates and cargo_candidates):
-            return
-        output = Executable(rustc_candidates[0])("--version", output=str, error=str)
-        match = re.match(r"rustc (\S+)", output)
-        if match:
-            version_str = match.group(1)
-            return Spec.from_detection(f"rust@{version_str}", external_path=prefix)
+    def determine_version(csl, exe):
+        output = Executable(exe)("--version", output=str, error=str)
+        match = re.match(r"(rustc|cargo) (\S+)", output)
+        return match.group(2) if match else None
+
+    @classmethod
+    def determine_variants(cls, exes, version_str):
+        rustc_candidates = [x for x in exes if "rustc" in os.path.basename(x)]
+        cargo_candidates = [x for x in exes if "cargo" in os.path.basename(x)]
+        extra_attributes = {}
+        if rustc_candidates:
+            extra_attributes.setdefault("compilers", {})["rust"] = rustc_candidates[0]
+
+        if cargo_candidates:
+            extra_attributes["cargo"] = cargo_candidates[0]
+
+        return "", extra_attributes
+
+    @classmethod
+    def validate_detected_spec(cls, spec, extra_attributes):
+        if "cargo" not in extra_attributes:
+            raise RuntimeError(f"discarding {spec} since 'cargo' is missing")
+
+        if not extra_attributes.get("compilers", {}).get("rust"):
+            raise RuntimeError(f"discarding {spec} since 'rustc' is missing")
 
     def setup_dependent_package(self, module, dependent_spec):
         module.cargo = Executable(os.path.join(self.spec.prefix.bin, "cargo"))

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

@@ -34,6 +34,9 @@ class Seacas(CMakePackage):
 
     # ###################### Versions ##########################
     version("master", branch="master")
+    version(
+        "2025-04-29", sha256="2a3a1533a1fbff8e8b78814a3a45f6fadfb3f05b5d9d10a4f0452c7bb4d1aa2f"
+    )
     version(
         "2025-04-14", sha256="7704fc27e4f0d283fd9272ea769dbeffd971315a982e265c0d7c99fc77186476"
     )

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

@@ -17,9 +17,12 @@ class Sleef(CMakePackage):
     license("BSL-1.0")
 
     version("master", branch="master")
+    version("3.7.0_2024-12-06", commit="56e1f79cb140fb9326d612d0be06b5250565cade")  # py-torch@2.7:
     version("3.7.0", commit="c5494730bf601599a55f4e77f357b51ba590585e", preferred=True)
     version("3.6.1", commit="6ee14bcae5fe92c2ff8b000d5a01102dab08d774")
-    version("3.6.0_2024-03-20", commit="60e76d2bce17d278b439d9da17177c8f957a9e9b")  # py-torch@2.4:
+    version(
+        "3.6.0_2024-03-20", commit="60e76d2bce17d278b439d9da17177c8f957a9e9b"
+    )  # py-torch@2.4:2.6
     version("3.6.0", commit="a99491afee2bae0b11e9ffbf3211349f43a5fd10")
     version(
         "3.5.1_2020-12-22", commit="e0a003ee838b75d11763aa9c3ef17bf71a725bff"

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

@@ -27,6 +27,9 @@ class Tecio(CMakePackage):
     depends_on("boost@1.69.0:+system", type="build")
     depends_on("mpi", when="+mpi")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     @property
     def root_cmakelists_dir(self):
         if self.spec.satisfies("+mpi"):

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

@@ -41,6 +41,7 @@ class Verilator(AutotoolsPackage):
 
     version("master", branch="master")
 
+    version("5.036", sha256="4199964882d56cf6a19ce80c6a297ebe3b0c35ea81106cd4f722342594337c47")
     version("5.034", sha256="002da98e316ca6eee40407f5deb7d7c43a0788847d39c90d4d31ddbbc03020e8")
     version("5.032", sha256="5a262564b10be8bdb31ff4fb67d77bcf5f52fc1b4e6c88d5ca3264fb481f1e41")
     version("5.030", sha256="b9e7e97257ca3825fcc75acbed792b03c3ec411d6808ad209d20917705407eac")