mdb: Add new package with dependencies (#46800)

* update package py-pexpect

* add py-termgraph package

* add py-sphinx-click package

* add mdb package

* add py-sphinx-click maintainer

* add py-termgraph maintainer

* add py-pexpect license and maintainer

.codecov.yml

@@ -5,7 +5,7 @@ coverage:
   status:
     project:
       default:
-        threshold: 0.2%
+        threshold: 2.0%
 
 ignore:
   - lib/spack/spack/test/.*

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

@@ -17,8 +17,15 @@ class Activemq(Package):
 
     license("Apache-2.0")
 
-    version("5.17.3", sha256="a4cc4c3a2f136707c2c696f3bb3ee2a86dbeff1b9eb5e237b14edc0c5e5a328f")
+    version("6.1.3", sha256="cad14e816e990f1312709ebfc228f42895d8c54c652d3cd56f0b5145635dc794")
+    version("5.18.6", sha256="b1363696e4e014423f6ab22f1ece4bf14ee32b80bfa5bdbae7dd4026a47ff03a")
 
+    # https://nvd.nist.gov/vuln/detail/CVE-2023-46604
+    version(
+        "5.17.3",
+        sha256="a4cc4c3a2f136707c2c696f3bb3ee2a86dbeff1b9eb5e237b14edc0c5e5a328f",
+        deprecated=True,
+    )
     # https://nvd.nist.gov/vuln/detail/CVE-2018-11775
     version(
         "5.14.0",
@@ -29,6 +36,9 @@ class Activemq(Package):
     depends_on("cxx", type="build")  # generated
 
     depends_on("java")
+    depends_on("java@8:", when="@5.15:")
+    depends_on("java@11:", when="@5.17:")
+    depends_on("java@17:", when="@6:")
 
     def install(self, spec, prefix):
         install_tree(".", prefix)

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

@@ -41,6 +41,7 @@ class Actsvg(CMakePackage):
 
     variant("examples", default=False, description="Build the example applications")
     variant("meta", default=True, description="Build the meta level interface")
+    variant("python", default=True, when="@0.4.39:", description="Build the python bindings")
     variant(
         "web", default=True, when="@0.4.36:", description="Build the webpage builder interface"
     )
@@ -48,11 +49,13 @@ class Actsvg(CMakePackage):
     depends_on("boost +program_options", type="test")
     depends_on("boost +program_options", when="+examples")
     depends_on("googletest", when="+examples")
+    depends_on("python@3.8:", when="+python")
 
     def cmake_args(self):
         args = [
             self.define_from_variant("ACTSVG_BUILD_EXAMPLES", "examples"),
             self.define_from_variant("ACTSVG_BUILD_META", "meta"),
+            self.define_from_variant("ACTSVG_BUILD_PYTHON_BINDINGS", "python"),
             self.define_from_variant("ACTSVG_BUILD_WEB", "web"),
             self.define("ACTSVG_BUILD_TESTING", self.run_tests),
         ]

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

@@ -48,14 +48,6 @@ class Armadillo(CMakePackage):
     # platform's compiler is adding `#define linux 1`.
     patch("undef_linux.patch", when="platform=linux")
 
-    def flag_handler(self, name, flags):
-        spec = self.spec
-        if name == "ldflags":
-            if spec.satisfies("%apple-clang@15:"):
-                flags.append("-Wl,-ld_classic")
-
-        return (flags, None, None)
-
     def patch(self):
         # Do not include Find{BLAS_type} because we are specifying the
         # BLAS/LAPACK libraries explicitly.

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

@@ -16,6 +16,7 @@ class Busybox(MakefilePackage):
 
     license("GPL-2.0-only")
 
+    version("1.37.0", sha256="3311dff32e746499f4df0d5df04d7eb396382d7e108bb9250e7b519b837043a4")
     version("1.36.1", sha256="b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314")
     version("1.36.0", sha256="542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5")
     version("1.31.1", sha256="d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998")

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

@@ -18,6 +18,9 @@ class Clinfo(MakefilePackage):
 
     license("CC0-1.0")
 
+    version(
+        "3.0.23.01.25", sha256="6dcdada6c115873db78c7ffc62b9fc1ee7a2d08854a3bccea396df312e7331e3"
+    )
     version(
         "3.0.21.02.21", sha256="e52f5c374a10364999d57a1be30219b47fb0b4f090e418f2ca19a0c037c1e694"
     )

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

@@ -0,0 +1,17 @@
+# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class Cubature(CMakePackage):
+    """multi-dimensional adaptive integration (cubature) in C"""
+
+    url = "https://github.com/stevengj/cubature/archive/refs/tags/v1.0.4.tar.gz"
+    git = "https://github.com/stevengj/cubature"
+
+    license("GPL-2")
+
+    version("1.0.4", sha256="cd4899de0b047a9d220cfb751a8bdbb8fd0c97c1c894d07523b75168e6426f60")

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

@@ -181,7 +181,6 @@ def headers(self):
 
     @when("@:6.0 %apple-clang@15:")
     def setup_build_environment(self, env):
-        env.append_flags("LDFLAGS", "-Wl,-ld_classic")
         if self.spec.satisfies("@:3"):
             env.append_flags("CFLAGS", "-Wno-error=incompatible-function-pointer-types")
 

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

@@ -30,6 +30,7 @@ class Gawk(AutotoolsPackage, GNUMirrorPackage):
 
     license("GPL-3.0-or-later")
 
+    version("5.3.1", sha256="694db764812a6236423d4ff40ceb7b6c4c441301b72ad502bb5c27e00cd56f78")
     version("5.3.0", sha256="ca9c16d3d11d0ff8c69d79dc0b47267e1329a69b39b799895604ed447d3ca90b")
     version("5.2.2", sha256="3c1fce1446b4cbee1cd273bd7ec64bc87d89f61537471cd3e05e33a965a250e9")
     version("5.2.1", sha256="673553b91f9e18cc5792ed51075df8d510c9040f550a6f74e09c9add243a7e4f")

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

@@ -17,6 +17,7 @@ class Gdbm(AutotoolsPackage, GNUMirrorPackage):
 
     license("GPL-3.0-or-later")
 
+    version("1.24", sha256="695e9827fdf763513f133910bc7e6cfdb9187943a4fec943e57449723d2b8dbf")
     version("1.23", sha256="74b1081d21fff13ae4bd7c16e5d6e504a4c26f7cde1dca0d963a484174bbcacd")
     version("1.22", sha256="f366c823a6724af313b6bbe975b2809f9a157e5f6a43612a72949138d161d762")
     version("1.21", sha256="b0b7dbdefd798de7ddccdd8edf6693a30494f7789777838042991ef107339cc2")

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

@@ -30,7 +30,14 @@ class Gdrcopy(MakefilePackage, CudaPackage):
 
     # Don't call ldconfig: https://github.com/NVIDIA/gdrcopy/pull/229
     patch("ldconfig.patch", when="@2.0:2.3")
+    # Allow tests to build against libcuda.so stub
+    patch(
+        "https://github.com/NVIDIA/gdrcopy/commit/508dd6179dcb04ba7720e2da5124b77bbdb615b0.patch?full_index=1",
+        sha256="cc18b13b6ea5512959464a85a43cdfda0bee5522a471e98ca76ba379bf582b5a",
+        when="@2.0:2.3",
+    )
 
+    depends_on("pkgconfig", type="build", when="@2.0:2.3")
     depends_on("check")
     requires("+cuda")
 

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

@@ -38,6 +38,9 @@ class Gnutls(AutotoolsPackage):
 
     variant("zlib", default=True, description="Enable zlib compression support")
     variant("guile", default=False, description="Enable Guile bindings")
+    variant(
+        "brotli", default=True, description="Enable brotli compression support", when="@3.7.4:"
+    )
 
     # gnutls+guile is currently broken on MacOS.  See Issue #11668
     conflicts("+guile", when="platform=darwin")
@@ -54,6 +57,7 @@ class Gnutls(AutotoolsPackage):
     depends_on("libidn2@:2.0", when="@:3.5")
     depends_on("libidn2")
     depends_on("zlib-api", when="+zlib")
+    depends_on("brotli", when="+brotli")
     depends_on("gettext")
 
     depends_on("pkgconfig", type="build")
@@ -79,15 +83,9 @@ def configure_args(self):
             args.append("--with-included-unistring")
             args.append("--without-p11-kit")  # p11-kit@0.23.1: ...
 
-        if spec.satisfies("+zlib"):
-            args.append("--with-zlib")
-        else:
-            args.append("--without-zlib")
-
-        if spec.satisfies("+guile"):
-            args.append("--enable-guile")
-        else:
-            args.append("--disable-guile")
+        args += self.with_or_without("zlib")
+        args += self.with_or_without("brotli")
+        args += self.enable_or_disable("guile")
 
         if self.run_tests:
             args.extend(["--enable-tests", "--enable-valgrind-tests", "--enable-full-test-suite"])

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

@@ -19,6 +19,9 @@ class Gradle(Package):
 
     license("Apache-2.0", checked_by="wdconinc")
 
+    version("8.10.2", sha256="2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6")
+    version("8.10.1", sha256="fdfca5dbc2834f0ece5020465737538e5ba679deeff5ab6c09621d67f8bb1a15")
+    version("8.10", sha256="682b4df7fe5accdca84a4d1ef6a3a6ab096b3efd5edf7de2bd8c758d95a93703")
     version("8.9", sha256="258e722ec21e955201e31447b0aed14201765a3bfbae296a46cf60b70e66db70")
     version("8.8", sha256="f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961")
     version("8.7", sha256="194717442575a6f96e1c1befa2c30e9a4fc90f701d7aee33eb879b79e7ff05c0")

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

@@ -70,6 +70,7 @@ class Gtkplus(MesonPackage):
     depends_on("fixesproto", when="@3:")
     depends_on("gettext", when="@3:")
     depends_on("cups", when="+cups")
+    depends_on("libxfixes", when="@:2")
 
     patch("no-demos.patch", when="@2.0:2")
 

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

@@ -315,13 +315,9 @@ def flag_handler(self, name, flags):
                 cmake_flags.append(self.compiler.cc_pic_flag)
             if spec.satisfies("@1.8.21 %oneapi@2023.0.0"):
                 cmake_flags.append("-Wno-error=int-conversion")
-            if spec.satisfies("%apple-clang@15:"):
-                cmake_flags.append("-Wl,-ld_classic")
         elif name == "cxxflags":
             if spec.satisfies("@:1.8.12+cxx~shared"):
                 cmake_flags.append(self.compiler.cxx_pic_flag)
-            if spec.satisfies("%apple-clang@15:"):
-                cmake_flags.append("-Wl,-ld_classic")
         elif name == "fflags":
             if spec.satisfies("%cce+fortran"):
                 # Cray compiler generates module files with uppercase names by

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

@@ -179,6 +179,7 @@ class Hpctoolkit(AutotoolsPackage, MesonPackage):
     depends_on("xz", type="link")
     depends_on("xz+pic libs=static", type="link", when="@:2023.08")
     depends_on("yaml-cpp@0.7.0: +shared", when="@2022.10:")
+    depends_on("googletest@1.8.1: +gmock", type="test", when="@develop")
 
     depends_on("zlib-api")
     depends_on("zlib+shared", when="^[virtuals=zlib-api] zlib")
@@ -409,6 +410,9 @@ def meson_args(self):
             "-Dgtpin=" + ("enabled" if spec.satisfies("+gtpin") else "disabled"),
         ]
 
+        if spec.satisfies("@develop"):
+            args.append("-Dtests=" + ("enabled" if self.pkg.run_tests else "disabled"))
+
         if spec.satisfies("@:2024.01"):
             args.append(f"--native-file={self.gen_prefix_file()}")
 

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

@@ -19,6 +19,7 @@ class Libdrm(AutotoolsPackage, MesonPackage):
 
     license("MIT")
 
+    version("2.4.123", sha256="a2b98567a149a74b0f50e91e825f9c0315d86e7be9b74394dae8b298caadb79e")
     version("2.4.122", sha256="d9f5079b777dffca9300ccc56b10a93588cdfbc9dde2fae111940dfb6292f251")
     version("2.4.121", sha256="909084a505d7638887f590b70791b3bbd9069c710c948f5d1f1ce6d080cdfcab")
     version("2.4.120", sha256="3bf55363f76c7250946441ab51d3a6cc0ae518055c0ff017324ab76cdefb327a")

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

@@ -30,6 +30,7 @@ class Libdwarf(CMakePackage, Package):
 
     license("LGPL-2.1-only")
 
+    version("0.11.0", sha256="846071fb220ac1952f9f15ebbac6c7831ef50d0369b772c07a8a8139a42e07d2")
     version("0.10.1", sha256="b511a2dc78b98786064889deaa2c1bc48a0c70115c187900dd838474ded1cc19")
     with default_args(deprecated=True):
         version(

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

@@ -19,6 +19,7 @@ class Libfirefly(CMakePackage):
 
     version("master", branch="master")
     version("2.1.0", sha256="4de4b216c73199a1826de7a0d45205b401603315347d7947d8b5950d3e6b893d")
+    version("3.0.0", sha256="af7477962bf052452f4ba906ee85d55c1bbfaad6fc8e03403ed265b264ca209a")
 
     depends_on("cxx", type="build")  # generated
 
@@ -26,6 +27,7 @@ class Libfirefly(CMakePackage):
         "double-precision",
         description="Enables double type instead of float when enabled",
         default=True,
+        when="@2.1.0",
     )
 
     def cmake_args(self):

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

@@ -19,9 +19,16 @@ class Libwmf(AutotoolsPackage):
 
     license("LGPL-2.0-or-later")
 
+    version("0.2.13", sha256="18ba69febd2f515d98a2352de284a8051896062ac9728d2ead07bc39ea75a068")
     version("0.2.12", sha256="464ff63605d7eaf61a4a12dbd420f7a41a4d854675d8caf37729f5bc744820e2")
     version("0.2.11", sha256="e2a2664afd5abc71a42be7ad3c200f64de2b8889bf088eac1d32e205ce843803")
 
+    patch(
+        "https://github.com/caolanm/libwmf/commit/1f87c35bc2a36fdca760a4577761d30d9cc876e2.patch?full_index=1",
+        sha256="80ae84a904baa21e1566e3d2bca1c6aaa0a2a30f684fe50f25e7e5751ef3ec93",
+        when="@:0.2.13",
+    )
+
     depends_on("c", type="build")  # generated
 
     depends_on("pkgconfig", type="build")

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

@@ -16,6 +16,8 @@ class Lis(AutotoolsPackage):
     homepage = "https://www.ssisc.org/lis/index.en.html"
     url = "https://www.ssisc.org/lis/dl/lis-2.0.27.zip"
 
+    version("2.1.6", sha256="7e2c4c5a1b96d2aa21fe799c073d7ca3cd5be79f350593d83102e37ca9780821")
+    version("2.1.5", sha256="4b78335cf85c327976536b8ac584f258dc9ae085e91b5d4a40879422b3e71543")
     version("2.1.4", sha256="d94d634db49fff2368bb615225ee4fdde919c63b7a9bc1f81f7d166a8c105f92")
     version("2.1.3", sha256="2ca0682198c2cdb6beb7866bd2b25071dc8964c6f76d8962477f848f39ff57ea")
     version("2.1.1", sha256="e1b227fb9c88be4d897be4211198e1e9e8258eb75127848d35b67a0182bf4538")

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

@@ -25,22 +25,18 @@ class Madgraph5amc(MakefilePackage):
     timeout = {"timeout": 60}
 
     with default_args(fetch_options=timeout):
-        version("3.5.5", sha256="3b4262024cefb8a06082faa9a7ba43484b27a3f2b940a06fbe49c640c5b7ebd7")
+        version("3.5.6", sha256="d4f336196303df748074ac92f251db8e6592fca37b3059c2e0f2a764c7e50975")
         version(
             "2.9.20",
             sha256="09a70e2e8b52e504bcaaa6527d3cec9641b043f5f853f2d11fa3c9970b7efae9",
-            url="https://launchpad.net/mg5amcnlo/lts/2.9.x/+download/MG5_aMC_v2.9.20.tar.gz",
+            preferred=True,
         )
         with default_args(deprecated=True):
             version(
-                "2.9.19",
-                sha256="ec95d40ec8845e57682400ef24a3b769a4d0542e3a849b7c5e10105d0a0f8e61",
-                url="https://launchpad.net/mg5amcnlo/lts/2.9.x/+download/MG5_aMC_v2.9.19.tar.gz",
+                "2.9.19", sha256="ec95d40ec8845e57682400ef24a3b769a4d0542e3a849b7c5e10105d0a0f8e61"
             )
             version(
-                "2.9.17",
-                sha256="6781c515ccc2005a953c35dcf9238632b761a937f1832bdfaa5514510b8c5a17",
-                url="https://launchpad.net/mg5amcnlo/lts/2.9.x/+download/MG5_aMC_v2.9.17.tar.gz",
+                "2.9.17", sha256="6781c515ccc2005a953c35dcf9238632b761a937f1832bdfaa5514510b8c5a17"
             )
             # Older versions have been removed, only the latest LTS versions are available:
             version(

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

@@ -0,0 +1,51 @@
+# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class Mdb(PythonPackage):
+    """mdb is a command line debugger aimed at parallel programs using the MPI
+    programming paradigm."""
+
+    homepage = "https://mdb.readthedocs.io/en/latest"
+    pypi = "mdb_debugger/mdb_debugger-1.0.3.tar.gz"
+
+    maintainers("tommelt")
+
+    license("MIT", checked_by="tommelt")
+
+    version("1.0.3", sha256="c45cffb320a51274519753b950b7b72cd91a8a5804941556120ed41bb8b491d8")
+
+    depends_on("python@3.10: +tkinter", type=("build", "run"))
+    depends_on("py-pip", type=("build", "run"))
+    depends_on("py-setuptools", type="build")
+
+    depends_on("py-click@8.1.7", type=("build", "run"))
+    depends_on("py-pexpect@4.9:", type=("build", "run"))
+    depends_on("py-typing-extensions", type=("build", "run"))
+    depends_on("py-matplotlib@3.8.3 backend=qt5agg", type=("build", "run"))
+    depends_on("py-pyqt5", type=("build", "run"))
+
+    depends_on("mpi", type=("run"))
+
+    variant("manpage", default=False, description="build and install manpage")
+    variant("termgraph", default=True, description="build with termgraph support")
+
+    with when("+termgraph"):
+        depends_on("py-termgraph", type=("build", "run"))
+
+    with when("+manpage"):
+        depends_on("py-sphinx", type=("build"))
+        depends_on("py-sphinx-rtd-theme", type=("build"))
+        depends_on("py-sphinx-click", type=("build"))
+
+    @run_after("install")
+    def build_docs(self):
+        if self.spec.satisfies("+manpage"):
+            make("-C", "docs", "man")
+
+            mkdirp(prefix.share.man.man1)
+            copy("docs/build/man/mdb.1", prefix.share.man.man1)

var/spack/repos/builtin/packages/ocl-icd/package.py

@@ -16,6 +16,7 @@ class OclIcd(AutotoolsPackage):
 
     license("BSD-2-Clause")
 
+    version("2.3.2", sha256="ec47d7dcd961ea06695b067e8b7edb82e420ddce03e0081a908c62fd0b8535c5")
     version("2.3.1", sha256="a32b67c2d52ffbaf490be9fc18b46428ab807ab11eff7664d7ff75e06cfafd6d")
     version("2.3.0", sha256="469f592ccd9b0547fb7212b17e1553b203d178634c20d3416640c0209e3ddd50")
     version("2.2.14", sha256="46df23608605ad548e80b11f4ba0e590cef6397a079d2f19adf707a7c2fbfe1b")

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

@@ -1003,7 +1003,7 @@ def configure_args(self):
 
         # Work around incompatibility with new apple-clang linker
         # https://github.com/open-mpi/ompi/issues/12427
-        if spec.satisfies("@5: %apple-clang@15:"):
+        if spec.satisfies("@:4.1.6,5.0.0:5.0.3 %apple-clang@15:"):
             config_args.append("--with-wrapper-fcflags=-Wl,-ld_classic")
 
         # All rpath flags should be appended with self.compiler.cc_rpath_arg.

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

@@ -19,15 +19,32 @@ class Php(AutotoolsPackage):
 
     license("PHP-3.01")
 
-    version("7.4.1", sha256="4d9d7c5681bec3af38a935d033657dce09a9913498f8022d7ca163a7f2f493a7")
-    version("7.4.0", sha256="91d34b48025ab9789216df89e247b6904912eeeaeff38c300ef314bdda8920b0")
-    version("7.3.13", sha256="e68b8d9e659f2993eee912f05860e546fdc18e459f31cd2771f404df21285f0b")
-    version("7.3.12", sha256="d0672ea84c0ab184f636acff3230d376d89a2067d59a87a2f1842361ee1f97d6")
-    version("7.3.11", sha256="4d861b2f3bc640ded8b591ce87250161392a6244a3c84042da0c06fd8c500eb2")
-    version("7.2.26", sha256="da132a836cec8021c00f22952e6044d91628ee3d2ef92a95d65cf91bad810600")
-    version("7.2.25", sha256="049b2d291c45cb889d15fcd2bac6da7d15ca5d535d272d2f8879fb834bbf276e")
-    version("7.2.24", sha256="334c9915733f6a29e1462f64038b1b4b1b21cb18f4f5f980add86792b5550ab3")
-    version("7.1.33", sha256="f80a795a09328a9441bae4a8a60fa0d6d43ec5adc98f5aa5f51d06f4522c07fe")
+    version("8.3.12", sha256="d5d4e6ffc6d6b2f02a87c45741623e08045ec6509ade44a1033e0f8bbb374119")
+    version("7.4.33", sha256="dfbb2111160589054768a37086bda650a0041c89878449d078684d70d6a0e411")
+    with default_args(deprecated=True):
+        version("7.4.1", sha256="4d9d7c5681bec3af38a935d033657dce09a9913498f8022d7ca163a7f2f493a7")
+        version("7.4.0", sha256="91d34b48025ab9789216df89e247b6904912eeeaeff38c300ef314bdda8920b0")
+        version(
+            "7.3.13", sha256="e68b8d9e659f2993eee912f05860e546fdc18e459f31cd2771f404df21285f0b"
+        )
+        version(
+            "7.3.12", sha256="d0672ea84c0ab184f636acff3230d376d89a2067d59a87a2f1842361ee1f97d6"
+        )
+        version(
+            "7.3.11", sha256="4d861b2f3bc640ded8b591ce87250161392a6244a3c84042da0c06fd8c500eb2"
+        )
+        version(
+            "7.2.26", sha256="da132a836cec8021c00f22952e6044d91628ee3d2ef92a95d65cf91bad810600"
+        )
+        version(
+            "7.2.25", sha256="049b2d291c45cb889d15fcd2bac6da7d15ca5d535d272d2f8879fb834bbf276e"
+        )
+        version(
+            "7.2.24", sha256="334c9915733f6a29e1462f64038b1b4b1b21cb18f4f5f980add86792b5550ab3"
+        )
+        version(
+            "7.1.33", sha256="f80a795a09328a9441bae4a8a60fa0d6d43ec5adc98f5aa5f51d06f4522c07fe"
+        )
 
     depends_on("c", type="build")  # generated
     depends_on("cxx", type="build")  # generated
@@ -39,10 +56,13 @@ class Php(AutotoolsPackage):
     depends_on("pkgconfig", type="build")
     depends_on("bison", type="build")
     depends_on("re2c", type="build")
+    depends_on("bash", type="build")
+    depends_on("libiconv", when="@8:")
     depends_on("libxml2")
     depends_on("sqlite")
 
-    patch("sbang.patch")
+    patch("sbang-7.patch", when="@7")
+    patch("sbang-8.patch", when="@8")
 
     def patch(self):
         """
@@ -68,3 +88,8 @@ def patch(self):
     def autoreconf(self, spec, prefix):
         bash = which("bash")
         bash("./buildconf", "--force")
+
+    @when("@8:")
+    def configure_args(self):
+        args = [f"--with-iconv={self.spec['libiconv'].prefix}"]
+        return args

var/spack/repos/builtin/packages/php/sbang-8.patch

@@ -0,0 +1,42 @@
+--- a/ext/phar/phar/pharcommand.inc.org
++++ b/ext/phar/phar/pharcommand.inc
+@@ -68,6 +68,12 @@ class PharCommand extends CLICommand
+                 'inf' => '<bang>   Hash-bang line to start the archive (e.g. #!/usr/bin/php). The hash '
+                          .'         mark itself \'#!\' and the newline character are optional.'
+             ),
++            'z' => array(
++                'typ' => 'any',
++                'val' => NULL,
++                'inf' => '<bang>   Hash-bang line to start the archive for spack. The hash '
++                         .'         mark itself \'#!\' and the newline character are optional.'
++            ),
+             'c' => array(
+                 'typ' => 'compalg',
+                 'val' => NULL,
+@@ -467,7 +473,7 @@ class PharCommand extends CLICommand
+      */
+     static function cli_cmd_arg_pack()
+     {
+-        $args = self::phar_args('abcFhilpsxy', 'pharnew');
++        $args = self::phar_args('azbcFhilpsxy', 'pharnew');
+ 
+         $args[''] = array(
+             'typ'     => 'any',
+@@ -572,6 +578,7 @@ class PharCommand extends CLICommand
+         }
+ 
+         $alias    = $this->args['a']['val'];
++        $spack_hb = $this->args['z']['val'];
+         $hashbang = $this->args['b']['val'];
+         $archive  = $this->args['f']['val'];
+         $hash     = $this->args['h']['val'];
+@@ -583,6 +590,9 @@ class PharCommand extends CLICommand
+         $invregex = $this->args['x']['val'];
+         $input    = $this->args['']['val'];
+ 
++        if (isset($spack_hb)) {
++                $hashbang = "$spack_hb\n<?php #!$hashbang ?>";
++        }
+         $hash = self::phar_check_hash($hash, $privkey);
+ 
+         $phar  = new Phar($archive, 0, $alias);

var/spack/repos/builtin/packages/py-gevent/cython.patch

@@ -0,0 +1,9 @@
+--- a/src/gevent/_gevent_cqueue.pxd
++++ b/src/gevent/_gevent_cqueue.pxd
+@@ -75,7 +75,6 @@ cdef class ItemWaiter(Waiter):
+     cdef readonly Queue queue
+ 
+ 
+-@cython.final
+ cdef class UnboundQueue(Queue):
+     pass

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

@@ -41,16 +41,13 @@ class PyGevent(PythonPackage):
 
     # https://github.com/gevent/gevent/issues/1599
     conflicts("^py-cython@3:", when="@:20.5.0")
-    # https://github.com/gevent/gevent/issues/2031
-    conflicts(
-        "^py-cython@3.0.10",
-        when="@:23.9.0",
-        msg="py-gevent fails to build when using cython@3.0.10",
-    )
 
     # Deprecated compiler options. upstream PR: https://github.com/gevent/gevent/pull/1896
     patch("icc.patch", when="@:21.12.0 %intel")
 
+    # https://github.com/gevent/gevent/issues/2031
+    patch("cython.patch", when="@:24.2.1^py-cython@3.0.10:3.0.11")
+
     @run_before("install")
     def recythonize(self):
         # Clean pre-generated cython files -- we've seen issues with Python 3.8 due to

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

@@ -15,11 +15,13 @@ class PyGssapi(PythonPackage):
 
     maintainers("wdconinc")
 
+    version("1.9.0", sha256="f468fac8f3f5fca8f4d1ca19e3cd4d2e10bd91074e7285464b22715d13548afe")
     version("1.8.3", sha256="aa3c8d0b1526f52559552bb2c9d2d6be013d76a8e5db00b39a1db5727e93b0b0")
     version("1.8.2", sha256="b78e0a021cc91158660e4c5cc9263e07c719346c35a9c0f66725e914b235c89a")
 
     depends_on("py-cython@0.29.29:2", type="build", when="@:1.8.2")
     depends_on("py-cython@0.29.29:3", type="build", when="@1.8.3:")
+    depends_on("py-cython@3.0.3:3", type="build", when="@1.9.0:")
     depends_on("py-setuptools@40.6.0:", type="build")
 
     depends_on("py-decorator", type=("build", "run"))

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

@@ -14,6 +14,9 @@ class PyIncremental(PythonPackage):
 
     license("MIT")
 
+    version("24.7.2", sha256="fb4f1d47ee60efe87d4f6f0ebb5f70b9760db2b2574c59c8e8912be4ebd464c9")
     version("21.3.0", sha256="02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57")
 
     depends_on("py-setuptools", type="build")
+    depends_on("py-setuptools@61.0:", type="build", when="@24.7:")
+    depends_on("py-tomli", type=("build", "run"), when="@24.7: ^python@:3.10")

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

@@ -10,12 +10,15 @@ class PyNetcdf4(PythonPackage):
     """Python interface to the netCDF Library."""
 
     homepage = "https://github.com/Unidata/netcdf4-python"
-    pypi = "netCDF4/netCDF4-1.2.7.tar.gz"
+    pypi = "netCDF4/netcdf4-1.2.7.tar.gz"
 
     maintainers("skosukhin")
 
     license("MIT")
 
+    version(
+        "1.7.1.post2", sha256="37d557e36654889d7020192bfb56f9d5f93894cb32997eb837ae586c538fd7b6"
+    )
     version("1.6.5", sha256="824881d0aacfde5bd982d6adedd8574259c85553781e7b83e0ce82b890bfa0ef")
     version("1.6.2", sha256="0382b02ff6a288419f6ffec85dec40f451f41b8755547154c575ddd9f0f4ae53")
     version("1.5.8", sha256="ca3d468f4812c0999df86e3f428851fb0c17ac34ce0827115c246b0b690e4e84")
@@ -30,6 +33,7 @@ class PyNetcdf4(PythonPackage):
     depends_on("py-setuptools@61:", when="@1.6.5:", type="build")
     depends_on("py-setuptools@41.2:", when="@1.6.2:", type="build")
     depends_on("py-setuptools@18:", when="@1.4.2:1.5.8", type="build")
+    depends_on("py-setuptools-scm@3.4:+toml", when="@1.7:", type="build")
     depends_on("py-cftime", type=("build", "run"))
     depends_on("py-certifi", when="@1.6.5:", type=("build", "run"))
     depends_on("py-numpy", when="@1.6.5:", type=("build", "link", "run"))
@@ -57,6 +61,14 @@ class PyNetcdf4(PythonPackage):
         when="@1.6: %gcc@14:",
     )
 
+    def url_for_version(self, version):
+        url = "https://files.pythonhosted.org/packages/source/n/netCDF4/{}-{}.tar.gz"
+        if version >= Version("1.7"):
+            name = "netcdf4"
+        else:
+            name = "netCDF4"
+        return url.format(name, version)
+
     def flag_handler(self, name, flags):
         if name == "cflags":
             if self.spec.satisfies("%oneapi") or self.spec.satisfies("%apple-clang@15:"):

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

@@ -22,6 +22,7 @@ class PyNumpy(PythonPackage):
     license("BSD-3-Clause")
 
     version("main", branch="main")
+    version("2.1.2", sha256="13532a088217fa624c99b843eeb54640de23b3414b14aa66d023805eb731066c")
     version("2.1.1", sha256="d0cf7d55b1051387807405b3898efafa862997b4cba8aa5dbe657be794afeafd")
     version("2.1.0", sha256="7dc90da0081f7e1da49ec4e398ede6a8e9cc4f5ebe5f9e06b443ed889ee9aaa2")
     version("2.0.2", sha256="883c987dee1880e2a864ab0dc9892292582510604156762362d9326444636e78")
@@ -413,10 +414,7 @@ def set_blas_lapack(self):
 
     @when("@1.26:")
     def setup_build_environment(self, env):
-        if self.spec.satisfies("%apple-clang@15:"):
-            # https://github.com/scipy/scipy/issues/19357
-            env.append_flags("LDFLAGS", "-Wl,-ld_classic")
-        elif self.spec.satisfies("%msvc"):
+        if self.spec.satisfies("%msvc"):
             # For meson build system, compiler paths must be in quotes
             # to prevent paths from being split by spaces.
             env.set("CC", f'"{self.compiler.cc}"')

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

@@ -9,8 +9,14 @@
 class PyPexpect(PythonPackage):
     """Pexpect allows easy control of interactive console applications."""
 
+    homepage = "https://pexpect.readthedocs.io/en/stable/"
     pypi = "pexpect/pexpect-4.2.1.tar.gz"
 
+    maintainers("TomMelt")
+
+    license("ISC", checked_by="tommelt")
+
+    version("4.9.0", sha256="ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f")
     version("4.8.0", sha256="fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c")
     version("4.7.0", sha256="9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb")
     version("4.6.0", sha256="2a8e88259839571d1251d278476f3eec5db26deb73a70be5ed5dc5435e418aba")

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

@@ -218,10 +218,6 @@ def setup_build_environment(self, env):
         if self.spec.satisfies("@:1.8"):
             self.spec["py-numpy"].package.setup_build_environment(env)
 
-        # https://github.com/scipy/scipy/issues/19357
-        if self.spec.satisfies("%apple-clang@15:"):
-            env.append_flags("LDFLAGS", "-Wl,-ld_classic")
-
     @when("@1.9:")
     def config_settings(self, spec, prefix):
         blas, lapack = self.spec["py-numpy"].package.blas_lapack_pkg_config()

var/spack/repos/builtin/packages/py-sphinx-click/package.py

@@ -0,0 +1,27 @@
+# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PySphinxClick(PythonPackage):
+    """Sphinx plugin that allows you to automatically extract documentation
+    from a Click-based application and include it in your docs"""
+
+    homepage = "https://sphinx-click.readthedocs.io/en/latest"
+    pypi = "sphinx_click/sphinx_click-6.0.0.tar.gz"
+
+    maintainers("TomMelt")
+
+    license("MIT", checked_by="tommelt")
+
+    version("6.0.0", sha256="f5d664321dc0c6622ff019f1e1c84e58ce0cecfddeb510e004cf60c2a3ab465b")
+
+    depends_on("py-setuptools", type="build")
+
+    depends_on("py-click@8:", type=("build", "run"))
+    depends_on("py-sphinx@4:", type=("build", "run"))
+    depends_on("py-docutils", type=("build", "run"))
+    depends_on("py-pbr", type=("build", "run"))

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

@@ -0,0 +1,23 @@
+# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyTermgraph(PythonPackage):
+    """Command-line tool that draws basic graphs in the terminal, written in
+    Python."""
+
+    homepage = "https://github.com/mkaz/termgraph"
+    pypi = "termgraph/termgraph-0.5.3.tar.gz"
+
+    maintainers("TomMelt")
+
+    license("MIT", checked_by="tommelt")
+
+    version("0.5.3", sha256="36ff2098e41eeab1e7cdda7366dc3e5b514ea799fa3e77537564492a7edefdd5")
+
+    depends_on("py-setuptools", type="build")
+    depends_on("py-colorama", type=("build", "run"))

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

@@ -679,10 +679,6 @@ def enable_or_disable(variant, keyword="USE", var=None):
         else:
             env.set("BUILD_CUSTOM_PROTOBUF", "OFF")
 
-        # https://github.com/pytorch/pytorch/issues/111086
-        if self.spec.satisfies("%apple-clang@15:"):
-            env.append_flags("LDFLAGS", "-Wl,-ld_classic")
-
     def setup_run_environment(self, env):
         self.torch_cuda_arch_list(env)
 

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

@@ -10,36 +10,58 @@ class PyTwisted(PythonPackage):
     """An asynchronous networking framework written in Python"""
 
     homepage = "https://twistedmatrix.com/"
-    pypi = "Twisted/Twisted-21.7.0.tar.gz"
+    pypi = "Twisted/twisted-21.7.0.tar.gz"
 
     license("Unlicense")
 
-    version("21.7.0", sha256="2cd652542463277378b0d349f47c62f20d9306e57d1247baabd6d1d38a109006")
-    version("15.4.0", sha256="78862662fa9ae29654bc2b9d349c3f1d887e6b2ed978512c4442d53ea861f05c")
-    version("15.3.0", sha256="025729751cf898842262375a40f70ae1d246daea88369eab9f6bb96e528bf285")
+    version("24.7.0", sha256="5a60147f044187a127ec7da96d170d49bcce50c6fd36f594e60f4587eff4d394")
+    version("22.10.0", sha256="32acbd40a94f5f46e7b42c109bfae2b302250945561783a8b7a059048f2d4d31")
+    with default_args(deprecated=True):
+        # https://nvd.nist.gov/vuln/detail/CVE-2022-24801
+        version(
+            "21.7.0", sha256="2cd652542463277378b0d349f47c62f20d9306e57d1247baabd6d1d38a109006"
+        )
+        version(
+            "15.4.0", sha256="78862662fa9ae29654bc2b9d349c3f1d887e6b2ed978512c4442d53ea861f05c"
+        )
+        version(
+            "15.3.0", sha256="025729751cf898842262375a40f70ae1d246daea88369eab9f6bb96e528bf285"
+        )
 
     depends_on("python@3.6.7:", type=("build", "run"), when="@21.7.0:")
+    depends_on("python@3.7.1:", type=("build", "run"), when="@22.8.0:")
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-setuptools@35.0.2:", type="build", when="@21.7.0:")
+    with when("@:22.10"):
+        depends_on("py-setuptools", type="build")
+        depends_on("py-setuptools@35.0.2:", type="build", when="@21.7.0:")
+    with when("@23.8.0:"):
+        depends_on("py-hatchling@1.10.0:", type="build")
+        depends_on("py-hatch-fancy-pypi-readme@22.5.0:", type="build")
+        depends_on("py-incremental@22.10.0:", type="build")
 
     depends_on("py-zope-interface@4.0.2:", type=("build", "run"))
     depends_on("py-zope-interface@4.4.2:", type=("build", "run"), when="@21.7.0:")
+    depends_on("py-zope-interface@5:", type=("build", "run"), when="@23.8.0:")
 
     depends_on("py-incremental@21.3.0:", type=("build", "run"), when="@21.7.0:")
+    depends_on("py-incremental@22.10.0:", type=("build", "run"), when="@23.8.0:")
     depends_on("py-constantly@15.1:", type=("build", "run"), when="@21.7.0:")
     depends_on("py-automat@0.8.0:", type=("build", "run"), when="@21.7.0:")
     depends_on("py-hyperlink@17.1.1:", type=("build", "run"), when="@21.7.0:")
     depends_on("py-attrs@19.2.0:", type=("build", "run"), when="@21.7.0:")
+    depends_on("py-attrs@21.3.0:", type=("build", "run"), when="@23.8.0:")
     depends_on("py-typing-extensions@3.6.5:", type=("build", "run"), when="@21.7.0:")
+    depends_on("py-typing-extensions@3.10.0:", type=("build", "run"), when="@23.8.0:")
 
     def url_for_version(self, version):
         url = "https://pypi.io/packages/source/T/Twisted/"
 
         if version <= Version("20.3.0"):
             url += "Twisted-{0}.tar.bz2"
-        else:
+        elif version <= Version("22.10.0"):
             url += "Twisted-{0}.tar.gz"
+        else:
+            url += "twisted-{0}.tar.gz"
 
         url = url.format(version)
         return url

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

@@ -14,7 +14,8 @@ class PyValidators(PythonPackage):
 
     license("MIT")
 
+    version("0.34.0", sha256="647fe407b45af9a74d245b943b18e6a816acf4926974278f6dd617778e1e781f")
     version("0.20.0", sha256="24148ce4e64100a2d5e267233e23e7afeb55316b47d30faae7eb6e7292bc226a")
 
     depends_on("py-setuptools", type="build")
-    depends_on("py-decorator@3.4:", type=("build", "run"))
+    depends_on("py-decorator@3.4:", type=("build", "run"), when="@:0.20.7")

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

@@ -34,6 +34,7 @@ class Root(CMakePackage):
     version("develop", branch="master")
 
     # Production version
+    version("6.32.06", sha256="3fc032d93fe848dea5adb1b47d8f0a86279523293fee0aa2b3cd52a1ffab7247")
     version("6.32.04", sha256="132f126aae7d30efbccd7dcd991b7ada1890ae57980ef300c16421f9d4d07ea8")
     version("6.32.02", sha256="3d0f76bf05857e1807ccfb2c9e014f525bcb625f94a2370b455f4b164961602d")
     version("6.32.00", sha256="12f203681a59041c474ce9523761e6f0e8861b3bee78df5f799a8db55189e5d2")
@@ -457,6 +458,10 @@ class Root(CMakePackage):
     if sys.platform == "darwin" and macos_version() >= Version("13"):
         conflicts("@:6.26.09", msg="macOS 13 support was added in root 6.26.10")
 
+    # See https://github.com/root-project/root/issues/16219
+    if sys.platform == "darwin" and macos_version() >= Version("15"):
+        conflicts("@:6.32.05", msg="macOS 15 support was added in root 6.32.06")
+
     # ROOT <6.14 is incompatible with Python >=3.7, which is the minimum supported by spack
     conflicts("+python", when="@:6.13", msg="Spack wants python >=3.7, too new for ROOT <6.14")
 

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

@@ -10,7 +10,7 @@ class Sleef(CMakePackage):
     """SIMD Library for Evaluating Elementary Functions, vectorized libm and DFT."""
 
     homepage = "https://sleef.org"
-    url = "https://github.com/shibatch/sleef/archive/3.6.1.tar.gz"
+    url = "https://github.com/shibatch/sleef/archive/3.7.tar.gz"
     git = "https://github.com/shibatch/sleef.git"
 
     maintainers("blapie")
@@ -18,7 +18,8 @@ class Sleef(CMakePackage):
     license("BSL-1.0")
 
     version("master", branch="master")
-    version("3.6.1", commit="6ee14bcae5fe92c2ff8b000d5a01102dab08d774", preferred=True)
+    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", commit="a99491afee2bae0b11e9ffbf3211349f43a5fd10")
     version(

var/spack/repos/builtin/packages/suite-sparse/package.py

@@ -127,32 +127,44 @@ def symbol_suffix_blas(self, spec, args):
             return
 
         symbols = (
-            "dtrsv_",
-            "dgemv_",
-            "dtrsm_",
+            "cgemm_",
+            "cgemv_",
+            "cherk_",
+            "cpotrf_",
+            "ctrsm_",
+            "ctrsv_",
             "dgemm_",
-            "dsyrk_",
+            "dgemv_",
             "dger_",
-            "dscal_",
-            "dpotrf_",
-            "ztrsv_",
-            "zgemv_",
-            "ztrsm_",
-            "zgemm_",
-            "zherk_",
-            "zgeru_",
-            "zscal_",
-            "zpotrf_",
-            "dnrm2_",
             "dlarf_",
+            "dlarfb_",
             "dlarfg_",
             "dlarft_",
-            "dlarfb_",
+            "dnrm2_",
+            "dpotrf_",
+            "dscal_",
+            "dsyrk_",
+            "dtrsm_",
+            "dtrsv_",
             "dznrm2_",
+            "sgemm_",
+            "sgemv_",
+            "spotrf_",
+            "ssyrk_",
+            "strsm_",
+            "strsv_",
+            "zgemm_",
+            "zgemv_",
+            "zgeru_",
+            "zherk_",
             "zlarf_",
+            "zlarfb_",
             "zlarfg_",
             "zlarft_",
-            "zlarfb_",
+            "zpotrf_",
+            "zscal_",
+            "ztrsm_",
+            "ztrsv_",
         )
 
         for symbol in symbols:

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

@@ -17,8 +17,16 @@ class Sysstat(AutotoolsPackage):
 
     license("GPL-2.0-or-later")
 
-    version("12.4.5", sha256="4e35abdd9eaf766ecdab55786f459093f3e1c350db23e57a15561afda417ff0d")
-    version("12.2.0", sha256="614ab9fe8e7937a3edb7b2b6760792a3764ea3a7310ac540292dd0e3dfac86a6")
+    version("12.7.6", sha256="dc77a08871f8e8813448ea31048833d4acbab7276dd9a456cd2526c008bd5301")
+    with default_args(deprecated=True):
+        # https://nvd.nist.gov/vuln/detail/CVE-2023-33204
+        # https://nvd.nist.gov/vuln/detail/CVE-2022-39377
+        version(
+            "12.4.5", sha256="4e35abdd9eaf766ecdab55786f459093f3e1c350db23e57a15561afda417ff0d"
+        )
+        version(
+            "12.2.0", sha256="614ab9fe8e7937a3edb7b2b6760792a3764ea3a7310ac540292dd0e3dfac86a6"
+        )
 
     depends_on("c", type="build")  # generated
 

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

@@ -14,13 +14,14 @@ class YamlCpp(CMakePackage):
     """A YAML parser and emitter in C++"""
 
     homepage = "https://github.com/jbeder/yaml-cpp"
-    url = "https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.5.3.tar.gz"
+    url = "https://github.com/jbeder/yaml-cpp/archive/0.8.0.tar.gz"
     git = "https://github.com/jbeder/yaml-cpp.git"
     maintainers("eschnett")
 
     license("MIT")
 
     version("develop", branch="master")
+    version("0.8.0", sha256="fbe74bbdcee21d656715688706da3c8becfd946d92cd44705cc6098bb23b3a16")
     version("0.7.0", sha256="43e6a9fcb146ad871515f0d0873947e5d497a1c9c60c58cb102a97b47208b7c3")
     version("0.6.3", sha256="77ea1b90b3718aa0c324207cb29418f5bced2354c2e483a9523d98c3460af1ed")
     version("0.6.2", sha256="e4d8560e163c3d875fd5d9e5542b5fd5bec810febdcba61481fe5fc4e6b1fd05")
@@ -86,8 +87,10 @@ def cmake_args(self):
         return options
 
     def url_for_version(self, version):
-        url = "https://github.com/jbeder/yaml-cpp/archive/{0}-{1}.tar.gz"
+        url = "https://github.com/jbeder/yaml-cpp/archive/{0}.tar.gz"
         if version < Version("0.5.3"):
-            return url.format("release", version)
+            return url.format(f"release-{version}")
+        elif version < Version("0.8.0"):
+            return url.format(f"yaml-cpp-{version}")
         else:
-            return url.format("yaml-cpp", version)
+            return url.format(version)