diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst
index d7d63f634e..969da6de20 100644
--- a/lib/spack/docs/packaging_guide.rst
+++ b/lib/spack/docs/packaging_guide.rst
@@ -604,9 +604,9 @@ add a line like this in the package class:
 
        url = "http://example.com/foo-1.0.tar.gz"
 
-       version("8.2.1", "4136d7b4c04df68b686570afa26988ac")
-       version("8.2.0", "1c9f62f0778697a09d36121ead88e08e")
-       version("8.1.2", "d47dd09ed7ae6e7fd6f9a816d7f5fdf6")
+       version("8.2.1", md5="4136d7b4c04df68b686570afa26988ac")
+       version("8.2.0", md5="1c9f62f0778697a09d36121ead88e08e")
+       version("8.1.2", md5="d47dd09ed7ae6e7fd6f9a816d7f5fdf6")
 
 Versions should be listed in descending order, from newest to oldest.
 
@@ -695,7 +695,7 @@ of its versions, you can add an explicit URL for a particular version:
 
 .. code-block:: python
 
-   version("8.2.1", "4136d7b4c04df68b686570afa26988ac",
+   version("8.2.1", md5="4136d7b4c04df68b686570afa26988ac",
            url="http://example.com/foo-8.2.1-special-version.tar.gz")
 
 
@@ -757,7 +757,7 @@ executables and other custom archive types), you can add ``expand=False`` to a
 
 .. code-block:: python
 
-   version("8.2.1", "4136d7b4c04df68b686570afa26988ac",
+   version("8.2.1", md5="4136d7b4c04df68b686570afa26988ac",
            url="http://example.com/foo-8.2.1-special-version.sh", expand=False)
 
 When ``expand`` is set to ``False``, Spack sets the current working
@@ -955,10 +955,10 @@ file:
 .. code-block:: console
 
    ==> Checksummed new versions of libelf:
-       version("0.8.13", "4136d7b4c04df68b686570afa26988ac")
-       version("0.8.12", "e21f8273d9f5f6d43a59878dc274fec7")
-       version("0.8.11", "e931910b6d100f6caa32239849947fbf")
-       version("0.8.10", "9db4d36c283d9790d8fa7df1f4d7b4d9")
+       version("0.8.13", md5="4136d7b4c04df68b686570afa26988ac")
+       version("0.8.12", md5="e21f8273d9f5f6d43a59878dc274fec7")
+       version("0.8.11", md5="e931910b6d100f6caa32239849947fbf")
+       version("0.8.10", md5="9db4d36c283d9790d8fa7df1f4d7b4d9")
 
 By default, Spack will search for new tarball downloads by scraping
 the parent directory of the tarball you gave it.  So, if your tarball
@@ -1112,8 +1112,8 @@ class-level tarball URL and VCS. For example:
 
        version("develop", branch="develop")
        version("master",  branch="master")
-       version("12.12.1", "ecd4606fa332212433c98bf950a69cc7")
-       version("12.10.1", "667333dbd7c0f031d47d7c5511fd0810")
+       version("12.12.1", md5="ecd4606fa332212433c98bf950a69cc7")
+       version("12.10.1", md5="667333dbd7c0f031d47d7c5511fd0810")
        version("12.8.1",  "9f37f683ee2b427b5540db8a20ed6b15")
 
 If a package contains both a ``url`` and ``git`` class-level attribute,
@@ -1276,7 +1276,7 @@ checksum.
 
 .. code-block:: python
 
-       version("1.9.5.1.1", "d035e4bc704d136db79b43ab371b27d2",
+       version("1.9.5.1.1", md5="d035e4bc704d136db79b43ab371b27d2",
                url="https://www.github.com/jswhit/pyproj/tarball/0be612cc9f972e38b50a90c946a9b353e2ab140f")
 
 .. _hg-fetch:
@@ -2212,7 +2212,7 @@ looks like this:
        homepage = "http://www.openssl.org"
        url      = "http://www.openssl.org/source/openssl-1.0.1h.tar.gz"
 
-       version("1.0.1h", "8d6d684a9430d5cc98a62a5d8fbda8cf")
+       version("1.0.1h", md5="8d6d684a9430d5cc98a62a5d8fbda8cf")
        depends_on("zlib")
 
        parallel = False
@@ -2309,7 +2309,7 @@ Spack makes this relatively easy.  Let's take a look at the
        url      = "http://www.prevanders.net/libdwarf-20130729.tar.gz"
        list_url = homepage
 
-       version("20130729", "4cc5e48693f7b93b7aa0261e63c0e21d")
+       version("20130729", md5="4cc5e48693f7b93b7aa0261e63c0e21d")
        ...
 
        depends_on("libelf")
@@ -2808,7 +2808,7 @@ supplying a ``depends_on`` call in the package definition.  For example:
        homepage = "https://github.com/hpc/mpileaks"
        url = "https://github.com/hpc/mpileaks/releases/download/v1.0/mpileaks-1.0.tar.gz"
 
-       version("1.0", "8838c574b39202a57d7c2d68692718aa")
+       version("1.0", md5="8838c574b39202a57d7c2d68692718aa")
 
        depends_on("mpi")
        depends_on("adept-utils")
diff --git a/lib/spack/spack/cmd/create.py b/lib/spack/spack/cmd/create.py
index 8ee259c52d..3582877ee1 100644
--- a/lib/spack/spack/cmd/create.py
+++ b/lib/spack/spack/cmd/create.py
@@ -807,7 +807,7 @@ def get_versions(args, name):
     # Default version with hash
     hashed_versions = """\
     # FIXME: Add proper versions and checksums here.
-    # version("1.2.3", "0123456789abcdef0123456789abcdef")"""
+    # version("1.2.3", md5="0123456789abcdef0123456789abcdef")"""
 
     # Default version without hash
     unhashed_versions = """\
diff --git a/lib/spack/spack/directives.py b/lib/spack/spack/directives.py
index c4d5865d9e..341b8b2c1f 100644
--- a/lib/spack/spack/directives.py
+++ b/lib/spack/spack/directives.py
@@ -32,7 +32,7 @@ class OpenMpi(Package):
 import functools
 import os.path
 import re
-from typing import List, Set
+from typing import List, Optional, Set
 
 import llnl.util.lang
 import llnl.util.tty.color
@@ -317,34 +317,100 @@ def remove_directives(arg):
 
 
 @directive("versions")
-def version(ver, checksum=None, **kwargs):
+def version(
+    ver: str,
+    # this positional argument is deprecated, use sha256=... instead
+    checksum: Optional[str] = None,
+    *,
+    # generic version options
+    preferred: Optional[bool] = None,
+    deprecated: Optional[bool] = None,
+    no_cache: Optional[bool] = None,
+    # url fetch options
+    url: Optional[str] = None,
+    extension: Optional[str] = None,
+    expand: Optional[bool] = None,
+    fetch_options: Optional[dict] = None,
+    # url archive verification options
+    md5: Optional[str] = None,
+    sha1: Optional[str] = None,
+    sha224: Optional[str] = None,
+    sha256: Optional[str] = None,
+    sha384: Optional[str] = None,
+    sha512: Optional[str] = None,
+    # git fetch options
+    git: Optional[str] = None,
+    commit: Optional[str] = None,
+    tag: Optional[str] = None,
+    branch: Optional[str] = None,
+    get_full_repo: Optional[bool] = None,
+    submodules: Optional[bool] = None,
+    submodules_delete: Optional[bool] = None,
+    # other version control
+    svn: Optional[str] = None,
+    hg: Optional[str] = None,
+    cvs: Optional[str] = None,
+    revision: Optional[str] = None,
+    date: Optional[str] = None,
+):
     """Adds a version and, if appropriate, metadata for fetching its code.
 
     The ``version`` directives are aggregated into a ``versions`` dictionary
     attribute with ``Version`` keys and metadata values, where the metadata
     is stored as a dictionary of ``kwargs``.
 
-    The ``dict`` of arguments is turned into a valid fetch strategy for
+    The (keyword) arguments are turned into a valid fetch strategy for
     code packages later. See ``spack.fetch_strategy.for_package_version()``.
-
-    Keyword Arguments:
-        deprecated (bool): whether or not this version is deprecated
     """
 
     def _execute_version(pkg):
-        if checksum is not None:
-            if hasattr(pkg, "has_code") and not pkg.has_code:
-                raise VersionChecksumError(
-                    "{0}: Checksums not allowed in no-code packages"
-                    "(see '{1}' version).".format(pkg.name, ver)
-                )
+        if (
+            any((sha256, sha384, sha512, md5, sha1, sha224, checksum))
+            and hasattr(pkg, "has_code")
+            and not pkg.has_code
+        ):
+            raise VersionChecksumError(
+                "{0}: Checksums not allowed in no-code packages "
+                "(see '{1}' version).".format(pkg.name, ver)
+            )
 
-            kwargs["checksum"] = checksum
+        kwargs = {
+            key: value
+            for key, value in (
+                ("sha256", sha256),
+                ("sha384", sha384),
+                ("sha512", sha512),
+                ("preferred", preferred),
+                ("deprecated", deprecated),
+                ("expand", expand),
+                ("url", url),
+                ("extension", extension),
+                ("no_cache", no_cache),
+                ("fetch_options", fetch_options),
+                ("git", git),
+                ("svn", svn),
+                ("hg", hg),
+                ("cvs", cvs),
+                ("get_full_repo", get_full_repo),
+                ("branch", branch),
+                ("submodules", submodules),
+                ("submodules_delete", submodules_delete),
+                ("commit", commit),
+                ("tag", tag),
+                ("revision", revision),
+                ("date", date),
+                ("md5", md5),
+                ("sha1", sha1),
+                ("sha224", sha224),
+                ("checksum", checksum),
+            )
+            if value is not None
+        }
 
         # Store kwargs for the package to later with a fetch_strategy.
         version = Version(ver)
         if isinstance(version, GitVersion):
-            if not hasattr(pkg, "git") and "git" not in kwargs:
+            if git is None and not hasattr(pkg, "git"):
                 msg = "Spack version directives cannot include git hashes fetched from"
                 msg += " URLs. Error in package '%s'\n" % pkg.name
                 msg += "    version('%s', " % version.string
diff --git a/lib/spack/spack/test/cmd/pkg.py b/lib/spack/spack/test/cmd/pkg.py
index 4ae8b516c0..7c5aae590e 100644
--- a/lib/spack/spack/test/cmd/pkg.py
+++ b/lib/spack/spack/test/cmd/pkg.py
@@ -25,7 +25,7 @@ class {name}(Package):
     homepage = "http://www.example.com"
     url      = "http://www.example.com/test-1.0.tar.gz"
 
-    version('1.0', '0123456789abcdef0123456789abcdef')
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def install(self, spec, prefix):
         pass
diff --git a/var/spack/repos/builder.test/packages/callbacks/package.py b/var/spack/repos/builder.test/packages/callbacks/package.py
index 1aee7bd87d..1e5fa97ef2 100644
--- a/var/spack/repos/builder.test/packages/callbacks/package.py
+++ b/var/spack/repos/builder.test/packages/callbacks/package.py
@@ -14,8 +14,8 @@ class Callbacks(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("2.0", "abcdef0123456789abcdef0123456789")
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
 
 class GenericBuilder(spack.build_systems.generic.GenericBuilder):
diff --git a/var/spack/repos/builder.test/packages/custom-phases/package.py b/var/spack/repos/builder.test/packages/custom-phases/package.py
index aff6d819f3..cc63250a04 100644
--- a/var/spack/repos/builder.test/packages/custom-phases/package.py
+++ b/var/spack/repos/builder.test/packages/custom-phases/package.py
@@ -14,8 +14,8 @@ class CustomPhases(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("2.0", "abcdef0123456789abcdef0123456789")
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
 
 class GenericBuilder(spack.build_systems.generic.GenericBuilder):
diff --git a/var/spack/repos/builder.test/packages/gnuconfig/package.py b/var/spack/repos/builder.test/packages/gnuconfig/package.py
index 0cd1261626..ecf32e2137 100644
--- a/var/spack/repos/builder.test/packages/gnuconfig/package.py
+++ b/var/spack/repos/builder.test/packages/gnuconfig/package.py
@@ -11,5 +11,5 @@ class Gnuconfig(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("2.0", "abcdef0123456789abcdef0123456789")
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builder.test/packages/old-style-autotools/package.py b/var/spack/repos/builder.test/packages/old-style-autotools/package.py
index ad1ab92472..41be49b5ba 100644
--- a/var/spack/repos/builder.test/packages/old-style-autotools/package.py
+++ b/var/spack/repos/builder.test/packages/old-style-autotools/package.py
@@ -15,8 +15,8 @@ class OldStyleAutotools(AutotoolsPackage):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("2.0", "abcdef0123456789abcdef0123456789")
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def configure(self, spec, prefix):
         pass
diff --git a/var/spack/repos/builder.test/packages/old-style-custom-phases/package.py b/var/spack/repos/builder.test/packages/old-style-custom-phases/package.py
index fba15767fa..a2f2040d1f 100644
--- a/var/spack/repos/builder.test/packages/old-style-custom-phases/package.py
+++ b/var/spack/repos/builder.test/packages/old-style-custom-phases/package.py
@@ -15,8 +15,8 @@ class OldStyleCustomPhases(AutotoolsPackage):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("2.0", "abcdef0123456789abcdef0123456789")
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     phases = ["configure"]
 
diff --git a/var/spack/repos/builder.test/packages/old-style-derived/package.py b/var/spack/repos/builder.test/packages/old-style-derived/package.py
index 34c1d2b87a..159d0d4b13 100644
--- a/var/spack/repos/builder.test/packages/old-style-derived/package.py
+++ b/var/spack/repos/builder.test/packages/old-style-derived/package.py
@@ -14,8 +14,8 @@ class OldStyleDerived(spack.pkg.builder.test.old_style_autotools.OldStyleAutotoo
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("2.0", "abcdef0123456789abcdef0123456789")
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def configure_args(self):
         return ["--with-bar"] + super(OldStyleDerived, self).configure_args()
diff --git a/var/spack/repos/builtin.mock/packages/a/package.py b/var/spack/repos/builtin.mock/packages/a/package.py
index 52b02cbe64..ba6064bd59 100644
--- a/var/spack/repos/builtin.mock/packages/a/package.py
+++ b/var/spack/repos/builtin.mock/packages/a/package.py
@@ -12,8 +12,8 @@ class A(AutotoolsPackage):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
-    version("2.0", "abcdef0123456789abcdef0123456789")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
 
     variant(
         "foo", description="", values=any_combination_of("bar", "baz", "fee").with_default("bar")
diff --git a/var/spack/repos/builtin.mock/packages/archive-files/package.py b/var/spack/repos/builtin.mock/packages/archive-files/package.py
index cfc1b63348..6aba55cdbc 100644
--- a/var/spack/repos/builtin.mock/packages/archive-files/package.py
+++ b/var/spack/repos/builtin.mock/packages/archive-files/package.py
@@ -12,8 +12,8 @@ class ArchiveFiles(AutotoolsPackage):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
-    version("2.0", "abcdef0123456789abcdef0123456789")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
 
     @property
     def archive_files(self):
diff --git a/var/spack/repos/builtin.mock/packages/b/package.py b/var/spack/repos/builtin.mock/packages/b/package.py
index df26bbc368..06d8286085 100644
--- a/var/spack/repos/builtin.mock/packages/b/package.py
+++ b/var/spack/repos/builtin.mock/packages/b/package.py
@@ -12,7 +12,7 @@ class B(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/b-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
-    version("0.9", "abcd456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
+    version("0.9", md5="abcd456789abcdef0123456789abcdef")
 
     depends_on("test-dependency", type="test")
diff --git a/var/spack/repos/builtin.mock/packages/boost/package.py b/var/spack/repos/builtin.mock/packages/boost/package.py
index e00e62a76b..b0717a0dc8 100644
--- a/var/spack/repos/builtin.mock/packages/boost/package.py
+++ b/var/spack/repos/builtin.mock/packages/boost/package.py
@@ -12,7 +12,7 @@ class Boost(Package):
     homepage = "http://www.boost.org"
     url = "http://downloads.sourceforge.net/project/boost/boost/1.63.0/boost_1_63_0.tar.bz2"
 
-    version("1.63.0", "1c837ecd990bb022d07e7aab32b09847")
+    version("1.63.0", md5="1c837ecd990bb022d07e7aab32b09847")
 
     default_install_libs = set(
         [
diff --git a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py
index 284bcb0388..1366b99b37 100644
--- a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py
+++ b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-a/package.py
@@ -18,7 +18,7 @@ class BothLinkAndBuildDepA(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("both-link-and-build-dep-b", type="build")
     depends_on("both-link-and-build-dep-c", type="link")
diff --git a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py
index b395074a99..1636f27fb8 100644
--- a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py
+++ b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-b/package.py
@@ -18,6 +18,6 @@ class BothLinkAndBuildDepB(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("both-link-and-build-dep-c", type="link")
diff --git a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py
index 1bf4c25fd1..bfb33eac6d 100644
--- a/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py
+++ b/var/spack/repos/builtin.mock/packages/both-link-and-build-dep-c/package.py
@@ -18,4 +18,4 @@ class BothLinkAndBuildDepC(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/bowtie/package.py b/var/spack/repos/builtin.mock/packages/bowtie/package.py
index 8afc6b3c52..91a0d148bf 100644
--- a/var/spack/repos/builtin.mock/packages/bowtie/package.py
+++ b/var/spack/repos/builtin.mock/packages/bowtie/package.py
@@ -11,10 +11,10 @@ class Bowtie(Package):
     homepage = "http://www.example.org"
     url = "http://bowtie-1.2.2.tar.bz2"
 
-    version("1.4.0", "1c837ecd990bb022d07e7aab32b09847")
-    version("1.3.0", "1c837ecd990bb022d07e7aab32b09847")
-    version("1.2.2", "1c837ecd990bb022d07e7aab32b09847")
-    version("1.2.0", "1c837ecd990bb022d07e7aab32b09847")
+    version("1.4.0", md5="1c837ecd990bb022d07e7aab32b09847")
+    version("1.3.0", md5="1c837ecd990bb022d07e7aab32b09847")
+    version("1.2.2", md5="1c837ecd990bb022d07e7aab32b09847")
+    version("1.2.0", md5="1c837ecd990bb022d07e7aab32b09847")
 
     conflicts("%gcc@:4.5.0", when="@1.2.2")
     conflicts("%gcc@:10.2.1", when="@:1.3.0")
diff --git a/var/spack/repos/builtin.mock/packages/build-error/package.py b/var/spack/repos/builtin.mock/packages/build-error/package.py
index 2c9148ef35..29342bc5fc 100644
--- a/var/spack/repos/builtin.mock/packages/build-error/package.py
+++ b/var/spack/repos/builtin.mock/packages/build-error/package.py
@@ -12,7 +12,7 @@ class BuildError(Package):
     homepage = "http://www.example.com/trivial_install"
     url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def install(self, spec, prefix):
         with open("configure", "w") as f:
diff --git a/var/spack/repos/builtin.mock/packages/build-warnings/package.py b/var/spack/repos/builtin.mock/packages/build-warnings/package.py
index 352f4dd4d2..06026896e2 100644
--- a/var/spack/repos/builtin.mock/packages/build-warnings/package.py
+++ b/var/spack/repos/builtin.mock/packages/build-warnings/package.py
@@ -12,7 +12,7 @@ class BuildWarnings(Package):
     homepage = "http://www.example.com/trivial_install"
     url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def install(self, spec, prefix):
         with open("configure", "w") as f:
diff --git a/var/spack/repos/builtin.mock/packages/c/package.py b/var/spack/repos/builtin.mock/packages/c/package.py
index cc02f9e457..0ef4e2f80a 100644
--- a/var/spack/repos/builtin.mock/packages/c/package.py
+++ b/var/spack/repos/builtin.mock/packages/c/package.py
@@ -12,4 +12,4 @@ class C(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/c-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/callpath/package.py b/var/spack/repos/builtin.mock/packages/callpath/package.py
index cc4e6fcb68..02832fd74d 100644
--- a/var/spack/repos/builtin.mock/packages/callpath/package.py
+++ b/var/spack/repos/builtin.mock/packages/callpath/package.py
@@ -10,9 +10,9 @@ class Callpath(Package):
     homepage = "https://github.com/tgamblin/callpath"
     url = "http://github.com/tgamblin/callpath-1.0.tar.gz"
 
-    version(0.8, "0123456789abcdef0123456789abcdef")
-    version(0.9, "0123456789abcdef0123456789abcdef")
-    version(1.0, "0123456789abcdef0123456789abcdef")
+    version(0.8, md5="0123456789abcdef0123456789abcdef")
+    version(0.9, md5="0123456789abcdef0123456789abcdef")
+    version(1.0, md5="0123456789abcdef0123456789abcdef")
 
     depends_on("dyninst")
     depends_on("mpi")
diff --git a/var/spack/repos/builtin.mock/packages/canfail/package.py b/var/spack/repos/builtin.mock/packages/canfail/package.py
index 7c8feaee53..70125ec1cb 100644
--- a/var/spack/repos/builtin.mock/packages/canfail/package.py
+++ b/var/spack/repos/builtin.mock/packages/canfail/package.py
@@ -13,7 +13,7 @@ class Canfail(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def set_install_succeed(self):
         os.environ["CANFAIL_SUCCEED"] = "1"
diff --git a/var/spack/repos/builtin.mock/packages/cmake-client/package.py b/var/spack/repos/builtin.mock/packages/cmake-client/package.py
index 730978ce57..2ce5a98dd1 100644
--- a/var/spack/repos/builtin.mock/packages/cmake-client/package.py
+++ b/var/spack/repos/builtin.mock/packages/cmake-client/package.py
@@ -20,7 +20,7 @@ class CmakeClient(CMakePackage):
     homepage = "https://www.example.com"
     url = "https://www.example.com/cmake-client-1.0.tar.gz"
 
-    version("1.0", "4cb3ff35b2472aae70f542116d616e63")
+    version("1.0", md5="4cb3ff35b2472aae70f542116d616e63")
 
     variant(
         "multi",
diff --git a/var/spack/repos/builtin.mock/packages/cmake/package.py b/var/spack/repos/builtin.mock/packages/cmake/package.py
index 82e9c073d3..a9e21a63ee 100644
--- a/var/spack/repos/builtin.mock/packages/cmake/package.py
+++ b/var/spack/repos/builtin.mock/packages/cmake/package.py
@@ -23,12 +23,12 @@ class Cmake(Package):
 
     version(
         "3.23.1",
-        "4cb3ff35b2472aae70f542116d616e63",
+        md5="4cb3ff35b2472aae70f542116d616e63",
         url="https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz",
     )
     version(
         "3.4.3",
-        "4cb3ff35b2472aae70f542116d616e63",
+        md5="4cb3ff35b2472aae70f542116d616e63",
         url="https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz",
     )
 
diff --git a/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py b/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py
index 5c6dd85d36..76a1abd08f 100644
--- a/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py
+++ b/var/spack/repos/builtin.mock/packages/conditional-variant-pkg/package.py
@@ -12,8 +12,8 @@ class ConditionalVariantPkg(Package):
     homepage = "http://www.example.com/conditional-variant-pkg"
     url = "http://www.unit-test-should-replace-this-url/conditional-variant-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
-    version("2.0", "abcdef0123456789abcdef0123456789")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
 
     variant(
         "version_based",
diff --git a/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py b/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py
index f8f43b4b47..7c0b1f7d62 100644
--- a/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py
+++ b/var/spack/repos/builtin.mock/packages/conditionally-patch-dependency/package.py
@@ -14,6 +14,6 @@ class ConditionallyPatchDependency(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/patch-a-dependency-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
     variant("jasper", default=False)
     depends_on("libelf@0.8.10", patches=[patch("uuid.patch")], when="+jasper")
diff --git a/var/spack/repos/builtin.mock/packages/configure-warning/package.py b/var/spack/repos/builtin.mock/packages/configure-warning/package.py
index e2a4f490f5..9c4b349f6c 100644
--- a/var/spack/repos/builtin.mock/packages/configure-warning/package.py
+++ b/var/spack/repos/builtin.mock/packages/configure-warning/package.py
@@ -13,7 +13,7 @@ class ConfigureWarning(AutotoolsPackage):
     homepage = "http://www.example.com"
     url = "http://www.example.com/configure-warning-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     parallel = False
 
diff --git a/var/spack/repos/builtin.mock/packages/conflict-parent/package.py b/var/spack/repos/builtin.mock/packages/conflict-parent/package.py
index 53ca15d6bc..e922a22a2e 100644
--- a/var/spack/repos/builtin.mock/packages/conflict-parent/package.py
+++ b/var/spack/repos/builtin.mock/packages/conflict-parent/package.py
@@ -10,9 +10,9 @@ class ConflictParent(Package):
     homepage = "https://github.com/tgamblin/callpath"
     url = "http://github.com/tgamblin/callpath-1.0.tar.gz"
 
-    version(0.8, "0123456789abcdef0123456789abcdef")
-    version(0.9, "0123456789abcdef0123456789abcdef")
-    version(1.0, "0123456789abcdef0123456789abcdef")
+    version(0.8, md5="0123456789abcdef0123456789abcdef")
+    version(0.9, md5="0123456789abcdef0123456789abcdef")
+    version(1.0, md5="0123456789abcdef0123456789abcdef")
 
     depends_on("conflict")
 
diff --git a/var/spack/repos/builtin.mock/packages/conflict/package.py b/var/spack/repos/builtin.mock/packages/conflict/package.py
index d61a0b3ac0..041a175a7d 100644
--- a/var/spack/repos/builtin.mock/packages/conflict/package.py
+++ b/var/spack/repos/builtin.mock/packages/conflict/package.py
@@ -10,9 +10,9 @@ class Conflict(Package):
     homepage = "https://github.com/tgamblin/callpath"
     url = "http://github.com/tgamblin/callpath-1.0.tar.gz"
 
-    version(0.8, "0123456789abcdef0123456789abcdef")
-    version(0.9, "0123456789abcdef0123456789abcdef")
-    version(1.0, "0123456789abcdef0123456789abcdef")
+    version(0.8, md5="0123456789abcdef0123456789abcdef")
+    version(0.9, md5="0123456789abcdef0123456789abcdef")
+    version(1.0, md5="0123456789abcdef0123456789abcdef")
 
     variant("foo", default=True, description="")
 
diff --git a/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py b/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py
index 2778252378..c62144a09b 100644
--- a/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py
+++ b/var/spack/repos/builtin.mock/packages/conflicting-dependent/package.py
@@ -14,6 +14,6 @@ class ConflictingDependent(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("dependency-install@:1.0")
diff --git a/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py b/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py
index 46a1da9929..fc04be3c1d 100644
--- a/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py
+++ b/var/spack/repos/builtin.mock/packages/cumulative-vrange-bottom/package.py
@@ -14,7 +14,7 @@ class CumulativeVrangeBottom(Package):
     homepage = "https://www.example.org"
     url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz"
 
-    version("3.0", "4cb3ff35b2472aae70f542116d616e63")
-    version("2.2", "4cb3ff35b2472aae70f542116d616e63")
-    version("2.1", "4cb3ff35b2472aae70f542116d616e63")
-    version("2.0", "4cb3ff35b2472aae70f542116d616e63")
+    version("3.0", md5="4cb3ff35b2472aae70f542116d616e63")
+    version("2.2", md5="4cb3ff35b2472aae70f542116d616e63")
+    version("2.1", md5="4cb3ff35b2472aae70f542116d616e63")
+    version("2.0", md5="4cb3ff35b2472aae70f542116d616e63")
diff --git a/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py b/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py
index 0d5f5a39c8..b3deb4bda2 100644
--- a/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py
+++ b/var/spack/repos/builtin.mock/packages/cumulative-vrange-middle/package.py
@@ -14,6 +14,6 @@ class CumulativeVrangeMiddle(Package):
     homepage = "https://www.example.org"
     url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz"
 
-    version("1.0", "4cb3ff35b2472aae70f542116d616e63")
+    version("1.0", md5="4cb3ff35b2472aae70f542116d616e63")
 
     depends_on("cumulative-vrange-bottom@2.1:")
diff --git a/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py b/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py
index 78759ea252..95e4c7827c 100644
--- a/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py
+++ b/var/spack/repos/builtin.mock/packages/cumulative-vrange-root/package.py
@@ -14,7 +14,7 @@ class CumulativeVrangeRoot(Package):
     homepage = "https://www.example.org"
     url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz"
 
-    version("1.0", "4cb3ff35b2472aae70f542116d616e63")
+    version("1.0", md5="4cb3ff35b2472aae70f542116d616e63")
 
     depends_on("cumulative-vrange-middle")
     depends_on("cumulative-vrange-bottom@:2")
diff --git a/var/spack/repos/builtin.mock/packages/define-cmake-prefix-paths/package.py b/var/spack/repos/builtin.mock/packages/define-cmake-prefix-paths/package.py
index 4f2d159dc8..a3f68b6a3d 100644
--- a/var/spack/repos/builtin.mock/packages/define-cmake-prefix-paths/package.py
+++ b/var/spack/repos/builtin.mock/packages/define-cmake-prefix-paths/package.py
@@ -12,7 +12,7 @@ class DefineCmakePrefixPaths(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/definecmakeprefixpaths-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     @property
     def cmake_prefix_paths(self):
diff --git a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py
index c722f3ca36..0f2330584a 100644
--- a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py
+++ b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid1/package.py
@@ -21,7 +21,7 @@ class DepDiamondPatchMid1(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/patch-a-dependency-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     # single patch file in repo
     depends_on("patch", patches="mid1.patch")
diff --git a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py
index 660fd947cf..725897a78a 100644
--- a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py
+++ b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-mid2/package.py
@@ -21,7 +21,7 @@ class DepDiamondPatchMid2(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/patch-a-dependency-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     # single patch file in repo
     depends_on(
diff --git a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py
index 4e144e380f..58a8c4222c 100644
--- a/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py
+++ b/var/spack/repos/builtin.mock/packages/dep-diamond-patch-top/package.py
@@ -21,7 +21,7 @@ class DepDiamondPatchTop(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/patch-a-dependency-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     # single patch file in repo
     depends_on("patch", patches="top.patch")
diff --git a/var/spack/repos/builtin.mock/packages/depb/package.py b/var/spack/repos/builtin.mock/packages/depb/package.py
index 1aae9bd05a..1d9a12ad83 100644
--- a/var/spack/repos/builtin.mock/packages/depb/package.py
+++ b/var/spack/repos/builtin.mock/packages/depb/package.py
@@ -12,7 +12,7 @@ class Depb(AutotoolsPackage):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("b")
 
diff --git a/var/spack/repos/builtin.mock/packages/dependency-install/package.py b/var/spack/repos/builtin.mock/packages/dependency-install/package.py
index 828f8f7b11..790163b9a8 100644
--- a/var/spack/repos/builtin.mock/packages/dependency-install/package.py
+++ b/var/spack/repos/builtin.mock/packages/dependency-install/package.py
@@ -12,8 +12,8 @@ class DependencyInstall(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
-    version("2.0", "abcdef0123456789abcdef0123456789")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
 
     def install(self, spec, prefix):
         touch(join_path(prefix, "an_installation_file"))
diff --git a/var/spack/repos/builtin.mock/packages/dependent-install/package.py b/var/spack/repos/builtin.mock/packages/dependent-install/package.py
index 15d50f9456..c51ad7bd68 100644
--- a/var/spack/repos/builtin.mock/packages/dependent-install/package.py
+++ b/var/spack/repos/builtin.mock/packages/dependent-install/package.py
@@ -12,8 +12,8 @@ class DependentInstall(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
-    version("2.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
+    version("2.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("dependency-install@2.0", when="@2.0")
     depends_on("dependency-install@1.0", when="@1.0")
diff --git a/var/spack/repos/builtin.mock/packages/depends-on-define-cmake-prefix-paths/package.py b/var/spack/repos/builtin.mock/packages/depends-on-define-cmake-prefix-paths/package.py
index cb3c049532..51fec53990 100644
--- a/var/spack/repos/builtin.mock/packages/depends-on-define-cmake-prefix-paths/package.py
+++ b/var/spack/repos/builtin.mock/packages/depends-on-define-cmake-prefix-paths/package.py
@@ -12,6 +12,6 @@ class DependsOnDefineCmakePrefixPaths(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dependsonefinecmakeprefixpaths-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("define-cmake-prefix-paths")
diff --git a/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py b/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py
index eab087ac9c..8e5cd9d20a 100644
--- a/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py
+++ b/var/spack/repos/builtin.mock/packages/depends-on-run-env/package.py
@@ -14,7 +14,7 @@ class DependsOnRunEnv(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("modifies-run-env", type=("run",))
 
diff --git a/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py b/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py
index cef8352b27..1d0c562bc6 100644
--- a/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py
+++ b/var/spack/repos/builtin.mock/packages/deprecated-versions/package.py
@@ -11,5 +11,5 @@ class DeprecatedVersions(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/c-1.0.tar.gz"
 
-    version("1.1.0", "0123456789abcdef0123456789abcdef", deprecated=True)
-    version("1.0.0", "0123456789abcdef0123456789abcdef")
+    version("1.1.0", md5="0123456789abcdef0123456789abcdef", deprecated=True)
+    version("1.0.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/develop-branch-version/package.py b/var/spack/repos/builtin.mock/packages/develop-branch-version/package.py
index d3a6b63953..16d94ec34f 100644
--- a/var/spack/repos/builtin.mock/packages/develop-branch-version/package.py
+++ b/var/spack/repos/builtin.mock/packages/develop-branch-version/package.py
@@ -14,4 +14,4 @@ class DevelopBranchVersion(Package):
     git = "https://github.com/dummy/repo.git"
 
     version("develop", branch="develop")
-    version("0.2.15", "b1190f3d3471685f17cfd1ec1d252ac9")
+    version("0.2.15", md5="b1190f3d3471685f17cfd1ec1d252ac9")
diff --git a/var/spack/repos/builtin.mock/packages/develop-test/package.py b/var/spack/repos/builtin.mock/packages/develop-test/package.py
index 58083cf1b6..9d16657251 100644
--- a/var/spack/repos/builtin.mock/packages/develop-test/package.py
+++ b/var/spack/repos/builtin.mock/packages/develop-test/package.py
@@ -13,4 +13,4 @@ class DevelopTest(Package):
     url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz"
 
     version("develop", git="https://github.com/dummy/repo.git")
-    version("0.2.15", "b1190f3d3471685f17cfd1ec1d252ac9")
+    version("0.2.15", md5="b1190f3d3471685f17cfd1ec1d252ac9")
diff --git a/var/spack/repos/builtin.mock/packages/develop-test2/package.py b/var/spack/repos/builtin.mock/packages/develop-test2/package.py
index 4c9cfba6e4..81a299c58a 100644
--- a/var/spack/repos/builtin.mock/packages/develop-test2/package.py
+++ b/var/spack/repos/builtin.mock/packages/develop-test2/package.py
@@ -13,4 +13,4 @@ class DevelopTest2(Package):
     url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz"
 
     version("0.2.15.develop", git="https://github.com/dummy/repo.git")
-    version("0.2.15", "b1190f3d3471685f17cfd1ec1d252ac9")
+    version("0.2.15", md5="b1190f3d3471685f17cfd1ec1d252ac9")
diff --git a/var/spack/repos/builtin.mock/packages/diamond-link-bottom/package.py b/var/spack/repos/builtin.mock/packages/diamond-link-bottom/package.py
index b3f1640945..ba3d2d3397 100644
--- a/var/spack/repos/builtin.mock/packages/diamond-link-bottom/package.py
+++ b/var/spack/repos/builtin.mock/packages/diamond-link-bottom/package.py
@@ -12,4 +12,4 @@ class DiamondLinkBottom(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/diamond-link-bottom-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/diamond-link-left/package.py b/var/spack/repos/builtin.mock/packages/diamond-link-left/package.py
index 6b78feec0a..4d0f310d22 100644
--- a/var/spack/repos/builtin.mock/packages/diamond-link-left/package.py
+++ b/var/spack/repos/builtin.mock/packages/diamond-link-left/package.py
@@ -12,6 +12,6 @@ class DiamondLinkLeft(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/diamond-link-left-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("diamond-link-bottom", type="link")
diff --git a/var/spack/repos/builtin.mock/packages/diamond-link-right/package.py b/var/spack/repos/builtin.mock/packages/diamond-link-right/package.py
index 28e19f3d3d..f12213248c 100644
--- a/var/spack/repos/builtin.mock/packages/diamond-link-right/package.py
+++ b/var/spack/repos/builtin.mock/packages/diamond-link-right/package.py
@@ -12,6 +12,6 @@ class DiamondLinkRight(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/diamond-link-right-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("diamond-link-bottom", type="link")
diff --git a/var/spack/repos/builtin.mock/packages/diamond-link-top/package.py b/var/spack/repos/builtin.mock/packages/diamond-link-top/package.py
index eb8c6e5890..e40d70f5bc 100644
--- a/var/spack/repos/builtin.mock/packages/diamond-link-top/package.py
+++ b/var/spack/repos/builtin.mock/packages/diamond-link-top/package.py
@@ -12,7 +12,7 @@ class DiamondLinkTop(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/diamond-link-top-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("diamond-link-left", type="link")
     depends_on("diamond-link-right", type="link")
diff --git a/var/spack/repos/builtin.mock/packages/direct-mpich/package.py b/var/spack/repos/builtin.mock/packages/direct-mpich/package.py
index d7302b51a6..3a960bc830 100644
--- a/var/spack/repos/builtin.mock/packages/direct-mpich/package.py
+++ b/var/spack/repos/builtin.mock/packages/direct-mpich/package.py
@@ -10,6 +10,6 @@ class DirectMpich(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/direct_mpich-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("mpich")
diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py
index 0b26c5812d..18156fcfdc 100644
--- a/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py
+++ b/var/spack/repos/builtin.mock/packages/dt-diamond-bottom/package.py
@@ -12,4 +12,4 @@ class DtDiamondBottom(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dt-diamond-bottom-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py
index 606ab55e9e..5f8c494631 100644
--- a/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py
+++ b/var/spack/repos/builtin.mock/packages/dt-diamond-left/package.py
@@ -12,6 +12,6 @@ class DtDiamondLeft(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dt-diamond-left-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("dt-diamond-bottom", type="build")
diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py
index af97f229f8..676b4dda93 100644
--- a/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py
+++ b/var/spack/repos/builtin.mock/packages/dt-diamond-right/package.py
@@ -12,6 +12,6 @@ class DtDiamondRight(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dt-diamond-right-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("dt-diamond-bottom", type=("build", "link", "run"))
diff --git a/var/spack/repos/builtin.mock/packages/dt-diamond/package.py b/var/spack/repos/builtin.mock/packages/dt-diamond/package.py
index c270ffb68d..ad487e5f5e 100644
--- a/var/spack/repos/builtin.mock/packages/dt-diamond/package.py
+++ b/var/spack/repos/builtin.mock/packages/dt-diamond/package.py
@@ -12,7 +12,7 @@ class DtDiamond(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dt-diamond-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("dt-diamond-left")
     depends_on("dt-diamond-right")
diff --git a/var/spack/repos/builtin.mock/packages/dtbuild1/package.py b/var/spack/repos/builtin.mock/packages/dtbuild1/package.py
index c6af6d4aec..0ba47a6ffc 100644
--- a/var/spack/repos/builtin.mock/packages/dtbuild1/package.py
+++ b/var/spack/repos/builtin.mock/packages/dtbuild1/package.py
@@ -13,8 +13,8 @@ class Dtbuild1(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dtbuild1-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
-    version("0.5", "fedcba9876543210fedcba9876543210")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
+    version("0.5", md5="fedcba9876543210fedcba9876543210")
 
     depends_on("dtbuild2", type="build")
     depends_on("dtlink2")
diff --git a/var/spack/repos/builtin.mock/packages/dtbuild2/package.py b/var/spack/repos/builtin.mock/packages/dtbuild2/package.py
index ad2669d5bc..8a6bc689a4 100644
--- a/var/spack/repos/builtin.mock/packages/dtbuild2/package.py
+++ b/var/spack/repos/builtin.mock/packages/dtbuild2/package.py
@@ -12,4 +12,4 @@ class Dtbuild2(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dtbuild2-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/dtbuild3/package.py b/var/spack/repos/builtin.mock/packages/dtbuild3/package.py
index f18df5afb9..0d4bd4659c 100644
--- a/var/spack/repos/builtin.mock/packages/dtbuild3/package.py
+++ b/var/spack/repos/builtin.mock/packages/dtbuild3/package.py
@@ -12,4 +12,4 @@ class Dtbuild3(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dtbuild3-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/dtlink1/package.py b/var/spack/repos/builtin.mock/packages/dtlink1/package.py
index 836ca59e69..5cccc1e245 100644
--- a/var/spack/repos/builtin.mock/packages/dtlink1/package.py
+++ b/var/spack/repos/builtin.mock/packages/dtlink1/package.py
@@ -12,6 +12,6 @@ class Dtlink1(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dtlink1-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("dtlink3")
diff --git a/var/spack/repos/builtin.mock/packages/dtlink2/package.py b/var/spack/repos/builtin.mock/packages/dtlink2/package.py
index 6f49bcf6fc..c4f086f5fb 100644
--- a/var/spack/repos/builtin.mock/packages/dtlink2/package.py
+++ b/var/spack/repos/builtin.mock/packages/dtlink2/package.py
@@ -12,4 +12,4 @@ class Dtlink2(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dtlink2-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/dtlink3/package.py b/var/spack/repos/builtin.mock/packages/dtlink3/package.py
index 06b232f9dd..8a7f8c3285 100644
--- a/var/spack/repos/builtin.mock/packages/dtlink3/package.py
+++ b/var/spack/repos/builtin.mock/packages/dtlink3/package.py
@@ -12,7 +12,7 @@ class Dtlink3(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dtlink3-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("dtbuild2", type="build")
     depends_on("dtlink4")
diff --git a/var/spack/repos/builtin.mock/packages/dtlink4/package.py b/var/spack/repos/builtin.mock/packages/dtlink4/package.py
index 4e2d117ae7..c3d5a0d2bf 100644
--- a/var/spack/repos/builtin.mock/packages/dtlink4/package.py
+++ b/var/spack/repos/builtin.mock/packages/dtlink4/package.py
@@ -12,4 +12,4 @@ class Dtlink4(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dtlink4-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/dtlink5/package.py b/var/spack/repos/builtin.mock/packages/dtlink5/package.py
index 5f41381369..ec6c59e2e7 100644
--- a/var/spack/repos/builtin.mock/packages/dtlink5/package.py
+++ b/var/spack/repos/builtin.mock/packages/dtlink5/package.py
@@ -12,4 +12,4 @@ class Dtlink5(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dtlink5-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/dtrun1/package.py b/var/spack/repos/builtin.mock/packages/dtrun1/package.py
index dd040923c4..c11af01b1d 100644
--- a/var/spack/repos/builtin.mock/packages/dtrun1/package.py
+++ b/var/spack/repos/builtin.mock/packages/dtrun1/package.py
@@ -12,7 +12,7 @@ class Dtrun1(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dtrun1-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("dtlink5")
     depends_on("dtrun3", type="run")
diff --git a/var/spack/repos/builtin.mock/packages/dtrun2/package.py b/var/spack/repos/builtin.mock/packages/dtrun2/package.py
index 4a21097e8c..7bfb3c615b 100644
--- a/var/spack/repos/builtin.mock/packages/dtrun2/package.py
+++ b/var/spack/repos/builtin.mock/packages/dtrun2/package.py
@@ -12,4 +12,4 @@ class Dtrun2(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dtrun2-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/dtrun3/package.py b/var/spack/repos/builtin.mock/packages/dtrun3/package.py
index de0a665f07..c71724115a 100644
--- a/var/spack/repos/builtin.mock/packages/dtrun3/package.py
+++ b/var/spack/repos/builtin.mock/packages/dtrun3/package.py
@@ -12,6 +12,6 @@ class Dtrun3(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dtrun3-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("dtbuild3", type="build")
diff --git a/var/spack/repos/builtin.mock/packages/dttop/package.py b/var/spack/repos/builtin.mock/packages/dttop/package.py
index 30458ac596..64c088e779 100644
--- a/var/spack/repos/builtin.mock/packages/dttop/package.py
+++ b/var/spack/repos/builtin.mock/packages/dttop/package.py
@@ -12,7 +12,7 @@ class Dttop(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dttop-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("dtbuild1", type="build")
     depends_on("dtlink1")
diff --git a/var/spack/repos/builtin.mock/packages/dtuse/package.py b/var/spack/repos/builtin.mock/packages/dtuse/package.py
index 78e8b83953..0f3afb8d9f 100644
--- a/var/spack/repos/builtin.mock/packages/dtuse/package.py
+++ b/var/spack/repos/builtin.mock/packages/dtuse/package.py
@@ -12,6 +12,6 @@ class Dtuse(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/dtuse-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("dttop")
diff --git a/var/spack/repos/builtin.mock/packages/dyninst/package.py b/var/spack/repos/builtin.mock/packages/dyninst/package.py
index 5309a0231a..b3b36b6cfe 100644
--- a/var/spack/repos/builtin.mock/packages/dyninst/package.py
+++ b/var/spack/repos/builtin.mock/packages/dyninst/package.py
@@ -12,17 +12,17 @@ class Dyninst(Package):
 
     version(
         "8.2",
-        "0123456789abcdef0123456789abcdef",
+        md5="0123456789abcdef0123456789abcdef",
         url="http://www.paradyn.org/release8.2/DyninstAPI-8.2.tgz",
     )
     version(
         "8.1.2",
-        "fedcba9876543210fedcba9876543210",
+        md5="fedcba9876543210fedcba9876543210",
         url="http://www.paradyn.org/release8.1.2/DyninstAPI-8.1.2.tgz",
     )
     version(
         "8.1.1",
-        "123456789abcdef0123456789abcdef0",
+        md5="123456789abcdef0123456789abcdef0",
         url="http://www.paradyn.org/release8.1/DyninstAPI-8.1.1.tgz",
     )
 
diff --git a/var/spack/repos/builtin.mock/packages/e/package.py b/var/spack/repos/builtin.mock/packages/e/package.py
index 5fdd19f1b3..a1ed6834bd 100644
--- a/var/spack/repos/builtin.mock/packages/e/package.py
+++ b/var/spack/repos/builtin.mock/packages/e/package.py
@@ -12,4 +12,4 @@ class E(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/e-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/extendee/package.py b/var/spack/repos/builtin.mock/packages/extendee/package.py
index 3193ae3c13..b8531657d3 100644
--- a/var/spack/repos/builtin.mock/packages/extendee/package.py
+++ b/var/spack/repos/builtin.mock/packages/extendee/package.py
@@ -14,7 +14,7 @@ class Extendee(Package):
 
     extendable = True
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def install(self, spec, prefix):
         mkdirp(prefix.bin)
diff --git a/var/spack/repos/builtin.mock/packages/extends-spec/package.py b/var/spack/repos/builtin.mock/packages/extends-spec/package.py
index cc9363ece5..d5f3601051 100644
--- a/var/spack/repos/builtin.mock/packages/extends-spec/package.py
+++ b/var/spack/repos/builtin.mock/packages/extends-spec/package.py
@@ -12,6 +12,6 @@ class ExtendsSpec(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/example-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     extends("extendee@1:")
diff --git a/var/spack/repos/builtin.mock/packages/extension1/package.py b/var/spack/repos/builtin.mock/packages/extension1/package.py
index 20db01d409..3d2daf1ab8 100644
--- a/var/spack/repos/builtin.mock/packages/extension1/package.py
+++ b/var/spack/repos/builtin.mock/packages/extension1/package.py
@@ -16,8 +16,8 @@ class Extension1(Package):
 
     extends("extendee")
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
-    version("2.0", "abcdef0123456789abcdef0123456789")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
 
     def install(self, spec, prefix):
         mkdirp(prefix.bin)
diff --git a/var/spack/repos/builtin.mock/packages/extension2/package.py b/var/spack/repos/builtin.mock/packages/extension2/package.py
index 131e5dc9ef..749154f582 100644
--- a/var/spack/repos/builtin.mock/packages/extension2/package.py
+++ b/var/spack/repos/builtin.mock/packages/extension2/package.py
@@ -18,7 +18,7 @@ class Extension2(Package):
     extends("extendee")
     depends_on("extension1", type=("build", "run"))
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def install(self, spec, prefix):
         mkdirp(prefix.bin)
diff --git a/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py b/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py
index b973f3bed3..afedaadba3 100644
--- a/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py
+++ b/var/spack/repos/builtin.mock/packages/external-buildable-with-variant/package.py
@@ -10,8 +10,8 @@ class ExternalBuildableWithVariant(Package):
     homepage = "http://somewhere.com"
     url = "http://somewhere.com/module-1.0.tar.gz"
 
-    version("1.0", "1234567890abcdef1234567890abcdef")
-    version("0.9", "1234567890abcdef1234567890abcdef")
+    version("1.0", md5="1234567890abcdef1234567890abcdef")
+    version("0.9", md5="1234567890abcdef1234567890abcdef")
 
     variant("baz", default=False, description="nope")
 
diff --git a/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py b/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py
index e31db9a632..7d0976cf41 100644
--- a/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py
+++ b/var/spack/repos/builtin.mock/packages/external-common-gdbm/package.py
@@ -10,4 +10,4 @@ class ExternalCommonGdbm(Package):
     homepage = "http://www.gnu.org.ua/software/gdbm/gdbm.html"
     url = "https://ftpmirror.gnu.org/gdbm/gdbm-1.18.1.tar.gz"
 
-    version("1.18.1", "be78e48cdfc1a7ad90efff146dce6cfe")
+    version("1.18.1", md5="be78e48cdfc1a7ad90efff146dce6cfe")
diff --git a/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py b/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py
index bfcb9f3482..c0c40b04c8 100644
--- a/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py
+++ b/var/spack/repos/builtin.mock/packages/external-common-openssl/package.py
@@ -10,5 +10,5 @@ class ExternalCommonOpenssl(Package):
     homepage = "http://www.openssl.org"
     url = "http://www.openssl.org/source/openssl-1.1.1i.tar.gz"
 
-    version("1.1.1i", "be78e48cdfc1a7ad90efff146dce6cfe")
+    version("1.1.1i", md5="be78e48cdfc1a7ad90efff146dce6cfe")
     depends_on("external-common-perl")
diff --git a/var/spack/repos/builtin.mock/packages/external-common-perl/package.py b/var/spack/repos/builtin.mock/packages/external-common-perl/package.py
index 3745e4a017..fc3d92ff2d 100644
--- a/var/spack/repos/builtin.mock/packages/external-common-perl/package.py
+++ b/var/spack/repos/builtin.mock/packages/external-common-perl/package.py
@@ -10,5 +10,5 @@ class ExternalCommonPerl(Package):
     homepage = "http://www.perl.org"
     url = "http://www.cpan.org/src/5.0/perl-5.32.0.tar.gz"
 
-    version("5.32.0", "be78e48cdfc1a7ad90efff146dce6cfe")
+    version("5.32.0", md5="be78e48cdfc1a7ad90efff146dce6cfe")
     depends_on("external-common-gdbm")
diff --git a/var/spack/repos/builtin.mock/packages/external-common-python/package.py b/var/spack/repos/builtin.mock/packages/external-common-python/package.py
index 38da518056..54aa3529ba 100644
--- a/var/spack/repos/builtin.mock/packages/external-common-python/package.py
+++ b/var/spack/repos/builtin.mock/packages/external-common-python/package.py
@@ -10,6 +10,6 @@ class ExternalCommonPython(Package):
     homepage = "http://www.python.org"
     url = "http://www.python.org/ftp/python/3.8.7/Python-3.8.7.tgz"
 
-    version("3.8.7", "be78e48cdfc1a7ad90efff146dce6cfe")
+    version("3.8.7", md5="be78e48cdfc1a7ad90efff146dce6cfe")
     depends_on("external-common-openssl")
     depends_on("external-common-gdbm")
diff --git a/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py b/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py
index 4dea54e9bd..0d3baf6303 100644
--- a/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py
+++ b/var/spack/repos/builtin.mock/packages/external-non-default-variant/package.py
@@ -11,7 +11,7 @@ class ExternalNonDefaultVariant(Package):
     homepage = "http://www.python.org"
     url = "http://www.python.org/ftp/python/3.8.7/Python-3.8.7.tgz"
 
-    version("3.8.7", "be78e48cdfc1a7ad90efff146dce6cfe")
+    version("3.8.7", md5="be78e48cdfc1a7ad90efff146dce6cfe")
 
     variant("foo", default=True, description="just a variant")
     variant("bar", default=True, description="just a variant")
diff --git a/var/spack/repos/builtin.mock/packages/externalmodule/package.py b/var/spack/repos/builtin.mock/packages/externalmodule/package.py
index ae5894d62d..4ace7a4399 100644
--- a/var/spack/repos/builtin.mock/packages/externalmodule/package.py
+++ b/var/spack/repos/builtin.mock/packages/externalmodule/package.py
@@ -10,6 +10,6 @@ class Externalmodule(Package):
     homepage = "http://somewhere.com"
     url = "http://somewhere.com/module-1.0.tar.gz"
 
-    version("1.0", "1234567890abcdef1234567890abcdef")
+    version("1.0", md5="1234567890abcdef1234567890abcdef")
 
     depends_on("externalprereq")
diff --git a/var/spack/repos/builtin.mock/packages/externalprereq/package.py b/var/spack/repos/builtin.mock/packages/externalprereq/package.py
index 7d62c215db..15e5774a2c 100644
--- a/var/spack/repos/builtin.mock/packages/externalprereq/package.py
+++ b/var/spack/repos/builtin.mock/packages/externalprereq/package.py
@@ -10,4 +10,4 @@ class Externalprereq(Package):
     homepage = "http://somewhere.com"
     url = "http://somewhere.com/prereq-1.0.tar.gz"
 
-    version("1.4", "f1234567890abcdef1234567890abcde")
+    version("1.4", md5="f1234567890abcdef1234567890abcde")
diff --git a/var/spack/repos/builtin.mock/packages/externaltest/package.py b/var/spack/repos/builtin.mock/packages/externaltest/package.py
index fd0c65dfcd..da2fe7fcde 100644
--- a/var/spack/repos/builtin.mock/packages/externaltest/package.py
+++ b/var/spack/repos/builtin.mock/packages/externaltest/package.py
@@ -10,7 +10,7 @@ class Externaltest(Package):
     homepage = "http://somewhere.com"
     url = "http://somewhere.com/test-1.0.tar.gz"
 
-    version("1.0", "1234567890abcdef1234567890abcdef")
+    version("1.0", md5="1234567890abcdef1234567890abcdef")
 
     depends_on("stuff")
     depends_on("externaltool")
diff --git a/var/spack/repos/builtin.mock/packages/externaltool/package.py b/var/spack/repos/builtin.mock/packages/externaltool/package.py
index 0e49ecc528..7cb1ddf836 100644
--- a/var/spack/repos/builtin.mock/packages/externaltool/package.py
+++ b/var/spack/repos/builtin.mock/packages/externaltool/package.py
@@ -10,8 +10,8 @@ class Externaltool(Package):
     homepage = "http://somewhere.com"
     url = "http://somewhere.com/tool-1.0.tar.gz"
 
-    version("1.0", "1234567890abcdef1234567890abcdef")
-    version("0.9", "1234567890abcdef1234567890abcdef")
-    version("0.8.1", "1234567890abcdef1234567890abcdef")
+    version("1.0", md5="1234567890abcdef1234567890abcdef")
+    version("0.9", md5="1234567890abcdef1234567890abcdef")
+    version("0.8.1", md5="1234567890abcdef1234567890abcdef")
 
     depends_on("externalprereq")
diff --git a/var/spack/repos/builtin.mock/packages/externalvirtual/package.py b/var/spack/repos/builtin.mock/packages/externalvirtual/package.py
index 5aaaf0e58f..7019240eb0 100644
--- a/var/spack/repos/builtin.mock/packages/externalvirtual/package.py
+++ b/var/spack/repos/builtin.mock/packages/externalvirtual/package.py
@@ -10,9 +10,9 @@ class Externalvirtual(Package):
     homepage = "http://somewhere.com"
     url = "http://somewhere.com/stuff-1.0.tar.gz"
 
-    version("1.0", "1234567890abcdef1234567890abcdef")
-    version("2.0", "234567890abcdef1234567890abcdef1")
-    version("2.1", "34567890abcdef1234567890abcdef12")
-    version("2.2", "4567890abcdef1234567890abcdef123")
+    version("1.0", md5="1234567890abcdef1234567890abcdef")
+    version("2.0", md5="234567890abcdef1234567890abcdef1")
+    version("2.1", md5="34567890abcdef1234567890abcdef12")
+    version("2.2", md5="4567890abcdef1234567890abcdef123")
 
     provides("stuff", when="@1.0:")
diff --git a/var/spack/repos/builtin.mock/packages/fail-test-audit/package.py b/var/spack/repos/builtin.mock/packages/fail-test-audit/package.py
index 1a60b954b6..33c393bfee 100644
--- a/var/spack/repos/builtin.mock/packages/fail-test-audit/package.py
+++ b/var/spack/repos/builtin.mock/packages/fail-test-audit/package.py
@@ -11,8 +11,8 @@ class FailTestAudit(MakefilePackage):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
-    version("2.0", "abcdef0123456789abcdef0123456789")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
 
     build_time_test_callbacks = ["test"]
 
diff --git a/var/spack/repos/builtin.mock/packages/failing-build/package.py b/var/spack/repos/builtin.mock/packages/failing-build/package.py
index e0f74ae844..a94a65def1 100644
--- a/var/spack/repos/builtin.mock/packages/failing-build/package.py
+++ b/var/spack/repos/builtin.mock/packages/failing-build/package.py
@@ -12,7 +12,7 @@ class FailingBuild(Package):
     homepage = "http://www.example.com/trivial_install"
     url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def install(self, spec, prefix):
         raise InstallError("Expected failure.")
diff --git a/var/spack/repos/builtin.mock/packages/failing-empty-install/package.py b/var/spack/repos/builtin.mock/packages/failing-empty-install/package.py
index d87103a4dd..4be59a3325 100644
--- a/var/spack/repos/builtin.mock/packages/failing-empty-install/package.py
+++ b/var/spack/repos/builtin.mock/packages/failing-empty-install/package.py
@@ -11,7 +11,7 @@ class FailingEmptyInstall(Package):
     homepage = "http://www.example.com/trivial_install"
     url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def install(self, spec, prefix):
         pass
diff --git a/var/spack/repos/builtin.mock/packages/fake/package.py b/var/spack/repos/builtin.mock/packages/fake/package.py
index 97dd4c75d6..103e684b05 100644
--- a/var/spack/repos/builtin.mock/packages/fake/package.py
+++ b/var/spack/repos/builtin.mock/packages/fake/package.py
@@ -10,4 +10,4 @@ class Fake(Package):
     homepage = "http://www.fake-spack-example.org"
     url = "http://www.fake-spack-example.org/downloads/fake-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/fetch-options/package.py b/var/spack/repos/builtin.mock/packages/fetch-options/package.py
index 94611ad5f8..74a1215074 100644
--- a/var/spack/repos/builtin.mock/packages/fetch-options/package.py
+++ b/var/spack/repos/builtin.mock/packages/fetch-options/package.py
@@ -17,6 +17,6 @@ class FetchOptions(Package):
     timeout = {"timeout": 65}
     cookie = {"cookie": "baz"}
 
-    version("1.2", "00000000000000000000000000000012", fetch_options=cookie)
-    version("1.1", "00000000000000000000000000000011", fetch_options=timeout)
-    version("1.0", "00000000000000000000000000000010")
+    version("1.2", md5="00000000000000000000000000000012", fetch_options=cookie)
+    version("1.1", md5="00000000000000000000000000000011", fetch_options=timeout)
+    version("1.0", md5="00000000000000000000000000000010")
diff --git a/var/spack/repos/builtin.mock/packages/fftw/package.py b/var/spack/repos/builtin.mock/packages/fftw/package.py
index cec0bd2ce2..5e21902eb4 100644
--- a/var/spack/repos/builtin.mock/packages/fftw/package.py
+++ b/var/spack/repos/builtin.mock/packages/fftw/package.py
@@ -14,8 +14,8 @@ class Fftw(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/fftw-1.0.tar.gz"
 
-    version(2.0, "abcdef1234567890abcdef1234567890")
-    version(1.0, "1234567890abcdef1234567890abcdef")
+    version(2.0, md5="abcdef1234567890abcdef1234567890")
+    version(1.0, md5="1234567890abcdef1234567890abcdef")
 
     variant("mpi", default=False, description="Enable MPI")
 
diff --git a/var/spack/repos/builtin.mock/packages/find-externals1/package.py b/var/spack/repos/builtin.mock/packages/find-externals1/package.py
index d2997fa6ae..495657a807 100644
--- a/var/spack/repos/builtin.mock/packages/find-externals1/package.py
+++ b/var/spack/repos/builtin.mock/packages/find-externals1/package.py
@@ -14,7 +14,7 @@ class FindExternals1(AutotoolsPackage):
 
     url = "http://www.example.com/find-externals-1.0.tar.gz"
 
-    version("1.0", "abcdef1234567890abcdef1234567890")
+    version("1.0", md5="abcdef1234567890abcdef1234567890")
 
     @classmethod
     def determine_spec_details(cls, prefix, exes_in_prefix):
diff --git a/var/spack/repos/builtin.mock/packages/flatten-deps/package.py b/var/spack/repos/builtin.mock/packages/flatten-deps/package.py
index 157bfa9f6f..88dd965d9e 100644
--- a/var/spack/repos/builtin.mock/packages/flatten-deps/package.py
+++ b/var/spack/repos/builtin.mock/packages/flatten-deps/package.py
@@ -12,7 +12,7 @@ class FlattenDeps(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("dependency-install")
 
diff --git a/var/spack/repos/builtin.mock/packages/gcc/package.py b/var/spack/repos/builtin.mock/packages/gcc/package.py
index 1582e8e6bd..b1db22e7eb 100644
--- a/var/spack/repos/builtin.mock/packages/gcc/package.py
+++ b/var/spack/repos/builtin.mock/packages/gcc/package.py
@@ -12,9 +12,9 @@ class Gcc(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/gcc-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
-    version("2.0", "abcdef0123456789abcdef0123456789")
-    version("3.0", "def0123456789abcdef0123456789abc")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
+    version("3.0", md5="def0123456789abcdef0123456789abc")
 
     depends_on("conflict", when="@3.0")
 
diff --git a/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py
index fdc7407d9d..c7309595dd 100644
--- a/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py
+++ b/var/spack/repos/builtin.mock/packages/git-url-top-level/package.py
@@ -31,7 +31,7 @@ class GitUrlTopLevel(Package):
     # These resolve to URL fetchers
     version(
         "2.3",
-        "0000000000000000000000000000000000000000000000000000000000000023",
+        sha256="0000000000000000000000000000000000000000000000000000000000000023",
         url="https://www.example.com/foo2.3.tar.gz",
     )
     version(
@@ -40,7 +40,7 @@ class GitUrlTopLevel(Package):
         url="https://www.example.com/foo2.2.tar.gz",
     )
     version("2.1", sha256="0000000000000000000000000000000000000000000000000000000000000021")
-    version("2.0", "0000000000000000000000000000000000000000000000000000000000000020")
+    version("2.0", sha256="0000000000000000000000000000000000000000000000000000000000000020")
 
     # These result in a FetcherConflict b/c we can't tell what to use
     version(
@@ -55,4 +55,4 @@ class GitUrlTopLevel(Package):
         branch="releases/v1.2",
     )
     version("1.1", md5="00000000000000000000000000000011", tag="v1.1")
-    version("1.0", "00000000000000000000000000000011", tag="abc123")
+    version("1.0", md5="00000000000000000000000000000011", tag="abc123")
diff --git a/var/spack/repos/builtin.mock/packages/gmt/package.py b/var/spack/repos/builtin.mock/packages/gmt/package.py
index 03247d195e..ebd37eec48 100644
--- a/var/spack/repos/builtin.mock/packages/gmt/package.py
+++ b/var/spack/repos/builtin.mock/packages/gmt/package.py
@@ -9,7 +9,7 @@ class Gmt(Package):
     url = "http://www.example.com/"
     url = "http://www.example.com/2.0.tar.gz"
 
-    version("2.0", "abcdef1234567890abcdef1234567890")
-    version("1.0", "abcdef1234567890abcdef1234567890")
+    version("2.0", md5="abcdef1234567890abcdef1234567890")
+    version("1.0", md5="abcdef1234567890abcdef1234567890")
 
     depends_on("mvdefaults", when="@1.0")
diff --git a/var/spack/repos/builtin.mock/packages/hash-test1/package.py b/var/spack/repos/builtin.mock/packages/hash-test1/package.py
index 4127e41420..d59a5dbe3d 100644
--- a/var/spack/repos/builtin.mock/packages/hash-test1/package.py
+++ b/var/spack/repos/builtin.mock/packages/hash-test1/package.py
@@ -14,13 +14,13 @@ class HashTest1(Package):
     homepage = "http://www.hashtest1.org"
     url = "http://www.hashtest1.org/downloads/hashtest1-1.1.tar.bz2"
 
-    version("1.1", "a" * 32)
-    version("1.2", "b" * 32)
-    version("1.3", "c" * 32)
-    version("1.4", "d" * 32)
-    version("1.5", "d" * 32)
-    version("1.6", "e" * 32)
-    version("1.7", "f" * 32)
+    version("1.1", md5="a" * 32)
+    version("1.2", md5="b" * 32)
+    version("1.3", md5="c" * 32)
+    version("1.4", md5="d" * 32)
+    version("1.5", md5="d" * 32)
+    version("1.6", md5="e" * 32)
+    version("1.7", md5="f" * 32)
 
     patch("patch1.patch", when="@1.1")
     patch("patch2.patch", when="@1.4")
diff --git a/var/spack/repos/builtin.mock/packages/hash-test2/package.py b/var/spack/repos/builtin.mock/packages/hash-test2/package.py
index 96e7486469..ca4cf441d8 100644
--- a/var/spack/repos/builtin.mock/packages/hash-test2/package.py
+++ b/var/spack/repos/builtin.mock/packages/hash-test2/package.py
@@ -14,10 +14,10 @@ class HashTest2(Package):
     homepage = "http://www.hashtest2.org"
     url = "http://www.hashtest1.org/downloads/hashtest2-1.1.tar.bz2"
 
-    version("1.1", "a" * 32)
-    version("1.2", "b" * 32)
-    version("1.3", "c" * 31 + "x")  # Source hash differs from hash-test1@1.3
-    version("1.4", "d" * 32)
+    version("1.1", md5="a" * 32)
+    version("1.2", md5="b" * 32)
+    version("1.3", md5="c" * 31 + "x")  # Source hash differs from hash-test1@1.3
+    version("1.4", md5="d" * 32)
 
     patch("patch1.patch", when="@1.1")
 
diff --git a/var/spack/repos/builtin.mock/packages/hash-test3/package.py b/var/spack/repos/builtin.mock/packages/hash-test3/package.py
index 4010307237..0f56f5a5cb 100644
--- a/var/spack/repos/builtin.mock/packages/hash-test3/package.py
+++ b/var/spack/repos/builtin.mock/packages/hash-test3/package.py
@@ -14,11 +14,11 @@ class HashTest3(Package):
     homepage = "http://www.hashtest3.org"
     url = "http://www.hashtest1.org/downloads/hashtest3-1.1.tar.bz2"
 
-    version("1.2", "b" * 32)
-    version("1.3", "c" * 32)
-    version("1.5", "d" * 32)
-    version("1.6", "e" * 32)
-    version("1.7", "f" * 32)
+    version("1.2", md5="b" * 32)
+    version("1.3", md5="c" * 32)
+    version("1.5", md5="d" * 32)
+    version("1.6", md5="e" * 32)
+    version("1.7", md5="f" * 32)
 
     variant("variantx", default=False, description="Test variant X")
     variant("varianty", default=False, description="Test variant Y")
diff --git a/var/spack/repos/builtin.mock/packages/hash-test4/package.py b/var/spack/repos/builtin.mock/packages/hash-test4/package.py
index 8835d7b07a..2008fa143a 100644
--- a/var/spack/repos/builtin.mock/packages/hash-test4/package.py
+++ b/var/spack/repos/builtin.mock/packages/hash-test4/package.py
@@ -14,7 +14,7 @@ class HashTest4(Package):
     homepage = "http://www.hashtest4.org"
     url = "http://www.hashtest1.org/downloads/hashtest4-1.1.tar.bz2"
 
-    version("1.1", "a" * 32)
+    version("1.1", md5="a" * 32)
 
     def install(self, spec, prefix):
         pass
diff --git a/var/spack/repos/builtin.mock/packages/hdf5/package.py b/var/spack/repos/builtin.mock/packages/hdf5/package.py
index 301511a8d4..6213a285fe 100644
--- a/var/spack/repos/builtin.mock/packages/hdf5/package.py
+++ b/var/spack/repos/builtin.mock/packages/hdf5/package.py
@@ -11,7 +11,7 @@ class Hdf5(Package):
     homepage = "http://www.llnl.gov"
     url = "http://www.llnl.gov/hdf5-1.0.tar.gz"
 
-    version(2.3, "0123456789abcdef0123456789abcdef")
+    version(2.3, md5="0123456789abcdef0123456789abcdef")
 
     variant("mpi", default=True, description="Enable mpi")
 
diff --git a/var/spack/repos/builtin.mock/packages/hpcviewer/package.py b/var/spack/repos/builtin.mock/packages/hpcviewer/package.py
index 71f90e4d8e..0b761dbedd 100644
--- a/var/spack/repos/builtin.mock/packages/hpcviewer/package.py
+++ b/var/spack/repos/builtin.mock/packages/hpcviewer/package.py
@@ -11,7 +11,7 @@ class Hpcviewer(AutotoolsPackage):
     homepage = "http://www.spack.org"
     url = "http://www.spack.org/downloads/aml-1.0.tar.gz"
 
-    version("2019.02", "0123456789abcdef0123456789abcdef")
+    version("2019.02", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("java@11:", type=("build", "run"), when="@2021.0:")
     depends_on("java@8", type=("build", "run"), when="@:2020")
diff --git a/var/spack/repos/builtin.mock/packages/hypre/package.py b/var/spack/repos/builtin.mock/packages/hypre/package.py
index aea951cdf1..1e7bf744f1 100644
--- a/var/spack/repos/builtin.mock/packages/hypre/package.py
+++ b/var/spack/repos/builtin.mock/packages/hypre/package.py
@@ -14,7 +14,7 @@ class Hypre(Package):
     homepage = "http://www.openblas.net"
     url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz"
 
-    version("0.2.15", "b1190f3d3471685f17cfd1ec1d252ac9")
+    version("0.2.15", md5="b1190f3d3471685f17cfd1ec1d252ac9")
 
     depends_on("lapack")
     depends_on("blas")
diff --git a/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py b/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py
index 9f6c2713b0..9981527cef 100644
--- a/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py
+++ b/var/spack/repos/builtin.mock/packages/impossible-concretization/package.py
@@ -13,7 +13,7 @@ class ImpossibleConcretization(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/example-1.0.tar.gz"
 
-    version(1.0, "0123456789abcdef0123456789abcdef")
+    version(1.0, md5="0123456789abcdef0123456789abcdef")
 
     conflicts("target=x86_64:")
     conflicts("target=aarch64:")
diff --git a/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py
index 3e59dee807..5e1213c34e 100644
--- a/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py
+++ b/var/spack/repos/builtin.mock/packages/indirect-mpich/package.py
@@ -14,7 +14,7 @@ class IndirectMpich(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/indirect_mpich-1.0.tar.gz"
 
-    version(1.0, "0123456789abcdef0123456789abcdef")
+    version(1.0, md5="0123456789abcdef0123456789abcdef")
 
     depends_on("mpi")
     depends_on("direct-mpich")
diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py
index 568a95beaf..abb2fc6db6 100644
--- a/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py
+++ b/var/spack/repos/builtin.mock/packages/installed-deps-a/package.py
@@ -19,9 +19,9 @@ class InstalledDepsA(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("1", "0123456789abcdef0123456789abcdef")
-    version("2", "abcdef0123456789abcdef0123456789")
-    version("3", "def0123456789abcdef0123456789abc")
+    version("1", md5="0123456789abcdef0123456789abcdef")
+    version("2", md5="abcdef0123456789abcdef0123456789")
+    version("3", md5="def0123456789abcdef0123456789abc")
 
     depends_on("installed-deps-b", type=("build", "link"))
     depends_on("installed-deps-c", type=("build", "link"))
diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py
index e1f3e24f12..89f71efa67 100644
--- a/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py
+++ b/var/spack/repos/builtin.mock/packages/installed-deps-b/package.py
@@ -19,9 +19,9 @@ class InstalledDepsB(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/b-1.0.tar.gz"
 
-    version("1", "0123456789abcdef0123456789abcdef")
-    version("2", "abcdef0123456789abcdef0123456789")
-    version("3", "def0123456789abcdef0123456789abc")
+    version("1", md5="0123456789abcdef0123456789abcdef")
+    version("2", md5="abcdef0123456789abcdef0123456789")
+    version("3", md5="def0123456789abcdef0123456789abc")
 
     depends_on("installed-deps-d@3:", type=("build", "link"))
     depends_on("installed-deps-e", type=("build", "link"))
diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py
index 63522e5067..96c2ed0ff6 100644
--- a/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py
+++ b/var/spack/repos/builtin.mock/packages/installed-deps-c/package.py
@@ -19,9 +19,9 @@ class InstalledDepsC(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/c-1.0.tar.gz"
 
-    version("1", "0123456789abcdef0123456789abcdef")
-    version("2", "abcdef0123456789abcdef0123456789")
-    version("3", "def0123456789abcdef0123456789abc")
+    version("1", md5="0123456789abcdef0123456789abcdef")
+    version("2", md5="abcdef0123456789abcdef0123456789")
+    version("3", md5="def0123456789abcdef0123456789abc")
 
     depends_on("installed-deps-d@2", type="build")
     depends_on("installed-deps-e@2", type=("build", "link"))
diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py
index 411a35a34f..88b3666bbb 100644
--- a/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py
+++ b/var/spack/repos/builtin.mock/packages/installed-deps-d/package.py
@@ -19,6 +19,6 @@ class InstalledDepsD(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/d-1.0.tar.gz"
 
-    version("1", "0123456789abcdef0123456789abcdef")
-    version("2", "abcdef0123456789abcdef0123456789")
-    version("3", "def0123456789abcdef0123456789abc")
+    version("1", md5="0123456789abcdef0123456789abcdef")
+    version("2", md5="abcdef0123456789abcdef0123456789")
+    version("3", md5="def0123456789abcdef0123456789abc")
diff --git a/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py b/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py
index 93f1664403..07ecb9647f 100644
--- a/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py
+++ b/var/spack/repos/builtin.mock/packages/installed-deps-e/package.py
@@ -19,6 +19,6 @@ class InstalledDepsE(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/e-1.0.tar.gz"
 
-    version("1", "0123456789abcdef0123456789abcdef")
-    version("2", "abcdef0123456789abcdef0123456789")
-    version("3", "def0123456789abcdef0123456789abc")
+    version("1", md5="0123456789abcdef0123456789abcdef")
+    version("2", md5="abcdef0123456789abcdef0123456789")
+    version("3", md5="def0123456789abcdef0123456789abc")
diff --git a/var/spack/repos/builtin.mock/packages/intel-oneapi-compilers/package.py b/var/spack/repos/builtin.mock/packages/intel-oneapi-compilers/package.py
index a3cfaeb39d..35ad46fd96 100644
--- a/var/spack/repos/builtin.mock/packages/intel-oneapi-compilers/package.py
+++ b/var/spack/repos/builtin.mock/packages/intel-oneapi-compilers/package.py
@@ -14,9 +14,9 @@ class IntelOneapiCompilers(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/oneapi-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
-    version("2.0", "abcdef0123456789abcdef0123456789")
-    version("3.0", "def0123456789abcdef0123456789abc")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
+    version("3.0", md5="def0123456789abcdef0123456789abc")
 
     @property
     def compiler_search_prefix(self):
diff --git a/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py b/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py
index 457dc1557f..5799e334a1 100644
--- a/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py
+++ b/var/spack/repos/builtin.mock/packages/invalid-github-patch-url/package.py
@@ -12,7 +12,7 @@ class InvalidGithubPatchUrl(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/patch-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     patch(
         "https://github.com/spack/spack/commit/cc76c0f5f9f8021cfb7423a226bd431c00d791ce.patch",
diff --git a/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py b/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py
index e948cdfa78..6552c12fe8 100644
--- a/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py
+++ b/var/spack/repos/builtin.mock/packages/leaf-adds-virtual/package.py
@@ -9,7 +9,7 @@ class LeafAddsVirtual(Package):
     url = "http://www.example.com/"
     url = "http://www.example.com/2.0.tar.gz"
 
-    version("2.0", "abcdef1234567890abcdef1234567890")
-    version("1.0", "abcdef1234567890abcdef1234567890")
+    version("2.0", md5="abcdef1234567890abcdef1234567890")
+    version("1.0", md5="abcdef1234567890abcdef1234567890")
 
     depends_on("blas", when="@2.0")
diff --git a/var/spack/repos/builtin.mock/packages/libdwarf/package.py b/var/spack/repos/builtin.mock/packages/libdwarf/package.py
index ebfffa26f5..82406dad01 100644
--- a/var/spack/repos/builtin.mock/packages/libdwarf/package.py
+++ b/var/spack/repos/builtin.mock/packages/libdwarf/package.py
@@ -14,10 +14,10 @@ class Libdwarf(Package):
     url = "http://www.prevanders.net/libdwarf-20130729.tar.gz"
     list_url = homepage
 
-    version(20130729, "64b42692e947d5180e162e46c689dfbf")
-    version(20130207, "0123456789abcdef0123456789abcdef")
-    version(20111030, "0123456789abcdef0123456789abcdef")
-    version(20070703, "0123456789abcdef0123456789abcdef")
+    version(20130729, md5="64b42692e947d5180e162e46c689dfbf")
+    version(20130207, md5="0123456789abcdef0123456789abcdef")
+    version(20111030, md5="0123456789abcdef0123456789abcdef")
+    version(20070703, md5="0123456789abcdef0123456789abcdef")
 
     depends_on("libelf")
 
diff --git a/var/spack/repos/builtin.mock/packages/libelf/package.py b/var/spack/repos/builtin.mock/packages/libelf/package.py
index 19cf1b676b..51703ebfce 100644
--- a/var/spack/repos/builtin.mock/packages/libelf/package.py
+++ b/var/spack/repos/builtin.mock/packages/libelf/package.py
@@ -10,9 +10,9 @@ class Libelf(Package):
     homepage = "http://www.mr511.de/software/english.html"
     url = "http://www.mr511.de/software/libelf-0.8.13.tar.gz"
 
-    version("0.8.13", "4136d7b4c04df68b686570afa26988ac")
-    version("0.8.12", "e21f8273d9f5f6d43a59878dc274fec7")
-    version("0.8.10", "9db4d36c283d9790d8fa7df1f4d7b4d9")
+    version("0.8.13", md5="4136d7b4c04df68b686570afa26988ac")
+    version("0.8.12", md5="e21f8273d9f5f6d43a59878dc274fec7")
+    version("0.8.10", md5="9db4d36c283d9790d8fa7df1f4d7b4d9")
 
     patch("local.patch", when="@0.8.10")
 
diff --git a/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py b/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py
index 08b7f924b9..5b7bfc03c1 100644
--- a/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py
+++ b/var/spack/repos/builtin.mock/packages/low-priority-provider/package.py
@@ -12,7 +12,7 @@ class LowPriorityProvider(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     provides("lapack")
     provides("mpi")
diff --git a/var/spack/repos/builtin.mock/packages/maintainers-1/package.py b/var/spack/repos/builtin.mock/packages/maintainers-1/package.py
index 27cda62732..911bad5301 100644
--- a/var/spack/repos/builtin.mock/packages/maintainers-1/package.py
+++ b/var/spack/repos/builtin.mock/packages/maintainers-1/package.py
@@ -14,4 +14,4 @@ class Maintainers1(Package):
 
     maintainers("user1", "user2")
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/maintainers-2/package.py b/var/spack/repos/builtin.mock/packages/maintainers-2/package.py
index 71216e3725..e711cf9972 100644
--- a/var/spack/repos/builtin.mock/packages/maintainers-2/package.py
+++ b/var/spack/repos/builtin.mock/packages/maintainers-2/package.py
@@ -14,4 +14,4 @@ class Maintainers2(Package):
 
     maintainers("user2", "user3")
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/maintainers-3/package.py b/var/spack/repos/builtin.mock/packages/maintainers-3/package.py
index b2b5a0897b..d6911c0cec 100644
--- a/var/spack/repos/builtin.mock/packages/maintainers-3/package.py
+++ b/var/spack/repos/builtin.mock/packages/maintainers-3/package.py
@@ -14,4 +14,4 @@ class Maintainers3(Maintainers1):
 
     maintainers("user0", "user3")
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py b/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py
index 5a6f9cebeb..070adf60bc 100644
--- a/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py
+++ b/var/spack/repos/builtin.mock/packages/many-virtual-consumer/package.py
@@ -11,7 +11,7 @@ class ManyVirtualConsumer(Package):
     url = "http://www.example.com/"
     url = "http://www.example.com/2.0.tar.gz"
 
-    version("1.0", "abcdef1234567890abcdef1234567890")
+    version("1.0", md5="abcdef1234567890abcdef1234567890")
 
     depends_on("mpi")
     depends_on("lapack")
diff --git a/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py b/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py
index 07f9bf373e..0feb5e8001 100644
--- a/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py
+++ b/var/spack/repos/builtin.mock/packages/middle-adds-virtual/package.py
@@ -9,6 +9,6 @@ class MiddleAddsVirtual(Package):
     url = "http://www.example.com/"
     url = "http://www.example.com/2.0.tar.gz"
 
-    version("1.0", "abcdef1234567890abcdef1234567890")
+    version("1.0", md5="abcdef1234567890abcdef1234567890")
 
     depends_on("leaf-adds-virtual")
diff --git a/var/spack/repos/builtin.mock/packages/missing-dependency/package.py b/var/spack/repos/builtin.mock/packages/missing-dependency/package.py
index 4200ad24eb..668df13978 100644
--- a/var/spack/repos/builtin.mock/packages/missing-dependency/package.py
+++ b/var/spack/repos/builtin.mock/packages/missing-dependency/package.py
@@ -12,7 +12,7 @@ class MissingDependency(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/missing-dependency-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     # intentionally missing to test possible_dependencies()
     depends_on("this-is-a-missing-dependency")
diff --git a/var/spack/repos/builtin.mock/packages/mixedversions/package.py b/var/spack/repos/builtin.mock/packages/mixedversions/package.py
index 21eea950a2..d640b32e23 100644
--- a/var/spack/repos/builtin.mock/packages/mixedversions/package.py
+++ b/var/spack/repos/builtin.mock/packages/mixedversions/package.py
@@ -9,6 +9,6 @@
 class Mixedversions(Package):
     url = "http://www.fake-mixedversions.org/downloads/mixedversions-1.0.tar.gz"
 
-    version("2.0.1", "0000000000000000000000000000000c")
-    version("2.0", "0000000000000000000000000000000b")
-    version("1.0.1", "0000000000000000000000000000000a")
+    version("2.0.1", md5="0000000000000000000000000000000c")
+    version("2.0", md5="0000000000000000000000000000000b")
+    version("1.0.1", md5="0000000000000000000000000000000a")
diff --git a/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py b/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py
index 8cb1e5deba..7029cef38d 100644
--- a/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py
+++ b/var/spack/repos/builtin.mock/packages/modifies-run-env/package.py
@@ -12,7 +12,7 @@ class ModifiesRunEnv(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def setup_run_environment(self, env):
         env.set("DEPENDENCY_ENV_VAR", "1")
diff --git a/var/spack/repos/builtin.mock/packages/module-path-separator/package.py b/var/spack/repos/builtin.mock/packages/module-path-separator/package.py
index 65d6e7aded..4c99b32144 100644
--- a/var/spack/repos/builtin.mock/packages/module-path-separator/package.py
+++ b/var/spack/repos/builtin.mock/packages/module-path-separator/package.py
@@ -10,7 +10,7 @@ class ModulePathSeparator(Package):
     homepage = "http://www.llnl.gov"
     url = "http://www.llnl.gov/module-path-separator-1.0.tar.gz"
 
-    version(1.0, "0123456789abcdef0123456789abcdef")
+    version(1.0, md5="0123456789abcdef0123456789abcdef")
 
     def setup_run_environment(self, env):
         env.append_path("COLON", "foo")
diff --git a/var/spack/repos/builtin.mock/packages/mpich/package.py b/var/spack/repos/builtin.mock/packages/mpich/package.py
index 40fc97d125..1271419229 100644
--- a/var/spack/repos/builtin.mock/packages/mpich/package.py
+++ b/var/spack/repos/builtin.mock/packages/mpich/package.py
@@ -16,12 +16,12 @@ class Mpich(Package):
 
     variant("debug", default=False, description="Compile MPICH with debug flags.")
 
-    version("3.0.4", "9c5d5d4fe1e17dd12153f40bc5b6dbc0")
-    version("3.0.3", "0123456789abcdef0123456789abcdef")
-    version("3.0.2", "0123456789abcdef0123456789abcdef")
-    version("3.0.1", "0123456789abcdef0123456789abcdef")
-    version("3.0", "0123456789abcdef0123456789abcdef")
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("3.0.4", md5="9c5d5d4fe1e17dd12153f40bc5b6dbc0")
+    version("3.0.3", md5="0123456789abcdef0123456789abcdef")
+    version("3.0.2", md5="0123456789abcdef0123456789abcdef")
+    version("3.0.1", md5="0123456789abcdef0123456789abcdef")
+    version("3.0", md5="0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     provides("mpi@:3", when="@3:")
     provides("mpi@:1", when="@:1")
diff --git a/var/spack/repos/builtin.mock/packages/mpich2/package.py b/var/spack/repos/builtin.mock/packages/mpich2/package.py
index b38a9b7a99..9b800d122d 100644
--- a/var/spack/repos/builtin.mock/packages/mpich2/package.py
+++ b/var/spack/repos/builtin.mock/packages/mpich2/package.py
@@ -14,12 +14,12 @@ class Mpich2(Package):
 
     tags = ["tag1", "tag3"]
 
-    version("1.5", "9c5d5d4fe1e17dd12153f40bc5b6dbc0")
-    version("1.4", "0123456789abcdef0123456789abcdef")
-    version("1.3", "0123456789abcdef0123456789abcdef")
-    version("1.2", "0123456789abcdef0123456789abcdef")
-    version("1.1", "0123456789abcdef0123456789abcdef")
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.5", md5="9c5d5d4fe1e17dd12153f40bc5b6dbc0")
+    version("1.4", md5="0123456789abcdef0123456789abcdef")
+    version("1.3", md5="0123456789abcdef0123456789abcdef")
+    version("1.2", md5="0123456789abcdef0123456789abcdef")
+    version("1.1", md5="0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     provides("mpi@:2.0")
     provides("mpi@:2.1", when="@1.1:")
diff --git a/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py b/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py
index eec38c3aae..66ad7728be 100644
--- a/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py
+++ b/var/spack/repos/builtin.mock/packages/multi-provider-mpi/package.py
@@ -13,13 +13,13 @@ class MultiProviderMpi(Package):
     homepage = "http://www.spack-fake-mpi.org"
     url = "http://www.spack-fake-mpi.org/downloads/multi-mpi-1.0.tar.gz"
 
-    version("2.0.0", "0123456789abcdef0123456789abcdef")
-    version("1.10.3", "0123456789abcdef0123456789abcdef")
-    version("1.10.2", "0123456789abcdef0123456789abcdef")
-    version("1.10.1", "0123456789abcdef0123456789abcdef")
-    version("1.10.0", "0123456789abcdef0123456789abcdef")
-    version("1.8.8", "0123456789abcdef0123456789abcdef")
-    version("1.6.5", "0123456789abcdef0123456789abcdef")
+    version("2.0.0", md5="0123456789abcdef0123456789abcdef")
+    version("1.10.3", md5="0123456789abcdef0123456789abcdef")
+    version("1.10.2", md5="0123456789abcdef0123456789abcdef")
+    version("1.10.1", md5="0123456789abcdef0123456789abcdef")
+    version("1.10.0", md5="0123456789abcdef0123456789abcdef")
+    version("1.8.8", md5="0123456789abcdef0123456789abcdef")
+    version("1.6.5", md5="0123456789abcdef0123456789abcdef")
 
     provides("mpi@3.1", when="@2.0.0")
     provides("mpi@3.0", when="@1.10.3")
diff --git a/var/spack/repos/builtin.mock/packages/multimethod/package.py b/var/spack/repos/builtin.mock/packages/multimethod/package.py
index 1787398e00..d28b44c7fd 100644
--- a/var/spack/repos/builtin.mock/packages/multimethod/package.py
+++ b/var/spack/repos/builtin.mock/packages/multimethod/package.py
@@ -19,11 +19,11 @@ class Multimethod(MultimethodBase):
     homepage = "http://www.example.com/"
     url = "http://www.example.com/example-1.0.tar.gz"
 
-    version("5.0", "0123456789abcdef0123456789abcdef")
-    version("4.0", "0123456789abcdef0123456789abcdef")
-    version("3.0", "0123456789abcdef0123456789abcdef")
-    version("2.0", "0123456789abcdef0123456789abcdef")
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("5.0", md5="0123456789abcdef0123456789abcdef")
+    version("4.0", md5="0123456789abcdef0123456789abcdef")
+    version("3.0", md5="0123456789abcdef0123456789abcdef")
+    version("2.0", md5="0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     variant("mpi", default=False, description="")
 
diff --git a/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py b/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py
index 19aefa35d6..52838dfce0 100644
--- a/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py
+++ b/var/spack/repos/builtin.mock/packages/multimodule-inheritance/package.py
@@ -13,6 +13,6 @@ class MultimoduleInheritance(si.BaseWithDirectives):
     homepage = "http://www.example.com"
     url = "http://www.example.com/multimodule-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("openblas", when="+openblas")
diff --git a/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py b/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py
index 519f920784..0f7f4bfc06 100644
--- a/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py
+++ b/var/spack/repos/builtin.mock/packages/multivalue-variant/package.py
@@ -10,10 +10,10 @@ class MultivalueVariant(Package):
     homepage = "http://www.llnl.gov"
     url = "http://www.llnl.gov/mpileaks-1.0.tar.gz"
 
-    version(1.0, "0123456789abcdef0123456789abcdef")
-    version(2.1, "0123456789abcdef0123456789abcdef")
-    version(2.2, "0123456789abcdef0123456789abcdef")
-    version(2.3, "0123456789abcdef0123456789abcdef")
+    version(1.0, md5="0123456789abcdef0123456789abcdef")
+    version(2.1, md5="0123456789abcdef0123456789abcdef")
+    version(2.2, md5="0123456789abcdef0123456789abcdef")
+    version(2.3, md5="0123456789abcdef0123456789abcdef")
 
     variant("debug", default=False, description="Debug variant")
     variant(
diff --git a/var/spack/repos/builtin.mock/packages/mvapich2/package.py b/var/spack/repos/builtin.mock/packages/mvapich2/package.py
index a31420ba27..19e630acbc 100644
--- a/var/spack/repos/builtin.mock/packages/mvapich2/package.py
+++ b/var/spack/repos/builtin.mock/packages/mvapich2/package.py
@@ -9,7 +9,7 @@ class Mvapich2(Package):
     homepage = "http://www.homepage.org"
     url = "http://www.someurl"
 
-    version("1.5", "9c5d5d4fe1e17dd12153f40bc5b6dbc0")
+    version("1.5", md5="9c5d5d4fe1e17dd12153f40bc5b6dbc0")
 
     variant(
         "file_systems",
diff --git a/var/spack/repos/builtin.mock/packages/mvdefaults/package.py b/var/spack/repos/builtin.mock/packages/mvdefaults/package.py
index 232b0cf229..fa7d61a8f0 100644
--- a/var/spack/repos/builtin.mock/packages/mvdefaults/package.py
+++ b/var/spack/repos/builtin.mock/packages/mvdefaults/package.py
@@ -9,6 +9,6 @@ class Mvdefaults(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/mvdefaults-1.0.tar.gz"
 
-    version("1.0", "abcdef1234567890abcdef1234567890")
+    version("1.0", md5="abcdef1234567890abcdef1234567890")
 
     variant("foo", values=("a", "b", "c"), default=("a", "b", "c"), multi=True, description="")
diff --git a/var/spack/repos/builtin.mock/packages/needs-relocation/package.py b/var/spack/repos/builtin.mock/packages/needs-relocation/package.py
index 2ae347b5d3..8e0dbf351f 100644
--- a/var/spack/repos/builtin.mock/packages/needs-relocation/package.py
+++ b/var/spack/repos/builtin.mock/packages/needs-relocation/package.py
@@ -18,7 +18,7 @@ class NeedsRelocation(Package):
     homepage = "https://www.cmake.org"
     url = "https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz"
 
-    version("0.0.0", "12345678qwertyuiasdfghjkzxcvbnm0")
+    version("0.0.0", md5="12345678qwertyuiasdfghjkzxcvbnm0")
 
     def install(self, spec, prefix):
         mkdirp(prefix.bin)
diff --git a/var/spack/repos/builtin.mock/packages/needs-text-relocation/package.py b/var/spack/repos/builtin.mock/packages/needs-text-relocation/package.py
index 30a45b544c..f1dd4148c2 100644
--- a/var/spack/repos/builtin.mock/packages/needs-text-relocation/package.py
+++ b/var/spack/repos/builtin.mock/packages/needs-text-relocation/package.py
@@ -11,7 +11,7 @@ class NeedsTextRelocation(Package):
     homepage = "https://www.cmake.org"
     url = "https://cmake.org/files/v3.4/cmake-3.4.3.tar.gz"
 
-    version("0.0.0", "12345678qwertyuiasdfghjkzxcvbnm0")
+    version("0.0.0", md5="12345678qwertyuiasdfghjkzxcvbnm0")
 
     def install(self, spec, prefix):
         mkdirp(prefix.bin)
diff --git a/var/spack/repos/builtin.mock/packages/netlib-blas/package.py b/var/spack/repos/builtin.mock/packages/netlib-blas/package.py
index 1a8bd665d3..cf40c10fee 100644
--- a/var/spack/repos/builtin.mock/packages/netlib-blas/package.py
+++ b/var/spack/repos/builtin.mock/packages/netlib-blas/package.py
@@ -10,6 +10,6 @@ class NetlibBlas(Package):
     homepage = "http://www.netlib.org/lapack/"
     url = "http://www.netlib.org/lapack/lapack-3.5.0.tgz"
 
-    version("3.5.0", "b1d3e3e425b2e44a06760ff173104bdf")
+    version("3.5.0", md5="b1d3e3e425b2e44a06760ff173104bdf")
 
     provides("blas")
diff --git a/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py b/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py
index 5471ebb0bc..dd6a24ee5e 100644
--- a/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py
+++ b/var/spack/repos/builtin.mock/packages/netlib-lapack/package.py
@@ -10,7 +10,7 @@ class NetlibLapack(Package):
     homepage = "http://www.netlib.org/lapack/"
     url = "http://www.netlib.org/lapack/lapack-3.5.0.tgz"
 
-    version("3.5.0", "b1d3e3e425b2e44a06760ff173104bdf")
+    version("3.5.0", md5="b1d3e3e425b2e44a06760ff173104bdf")
 
     provides("lapack")
     depends_on("blas")
diff --git a/var/spack/repos/builtin.mock/packages/old-external/package.py b/var/spack/repos/builtin.mock/packages/old-external/package.py
index 91fd820a9d..db6419c17d 100644
--- a/var/spack/repos/builtin.mock/packages/old-external/package.py
+++ b/var/spack/repos/builtin.mock/packages/old-external/package.py
@@ -11,10 +11,10 @@ class OldExternal(Package):
     homepage = "https://www.example.com"
     url = "https://www.example.com/old-external.tar.gz"
 
-    version("1.2.0", "0123456789abcdef0123456789abcdef")
-    version("1.1.4", "0123456789abcdef0123456789abcdef")
-    version("1.1.3", "0123456789abcdef0123456789abcdef")
-    version("1.1.2", "0123456789abcdef0123456789abcdef")
-    version("1.1.1", "0123456789abcdef0123456789abcdef")
-    version("1.1.0", "0123456789abcdef0123456789abcdef")
-    version("1.0.0", "0123456789abcdef0123456789abcdef")
+    version("1.2.0", md5="0123456789abcdef0123456789abcdef")
+    version("1.1.4", md5="0123456789abcdef0123456789abcdef")
+    version("1.1.3", md5="0123456789abcdef0123456789abcdef")
+    version("1.1.2", md5="0123456789abcdef0123456789abcdef")
+    version("1.1.1", md5="0123456789abcdef0123456789abcdef")
+    version("1.1.0", md5="0123456789abcdef0123456789abcdef")
+    version("1.0.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/old-sbang/package.py b/var/spack/repos/builtin.mock/packages/old-sbang/package.py
index 7eba7d1bf7..c82696460d 100644
--- a/var/spack/repos/builtin.mock/packages/old-sbang/package.py
+++ b/var/spack/repos/builtin.mock/packages/old-sbang/package.py
@@ -13,7 +13,7 @@ class OldSbang(Package):
     homepage = "https://www.example.com"
     url = "https://www.example.com/old-sbang.tar.gz"
 
-    version("1.0.0", "0123456789abcdef0123456789abcdef")
+    version("1.0.0", md5="0123456789abcdef0123456789abcdef")
 
     def install(self, spec, prefix):
         mkdirp(prefix.bin)
diff --git a/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py b/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py
index 0a075b5456..0156085877 100644
--- a/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py
+++ b/var/spack/repos/builtin.mock/packages/openblas-with-lapack/package.py
@@ -12,7 +12,7 @@ class OpenblasWithLapack(Package):
     homepage = "http://www.openblas.net"
     url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz"
 
-    version("0.2.15", "b1190f3d3471685f17cfd1ec1d252ac9")
+    version("0.2.15", md5="b1190f3d3471685f17cfd1ec1d252ac9")
 
     provides("lapack")
     provides("blas")
diff --git a/var/spack/repos/builtin.mock/packages/openblas/package.py b/var/spack/repos/builtin.mock/packages/openblas/package.py
index 636ce38523..33a6e20d51 100644
--- a/var/spack/repos/builtin.mock/packages/openblas/package.py
+++ b/var/spack/repos/builtin.mock/packages/openblas/package.py
@@ -12,10 +12,10 @@ class Openblas(Package):
     homepage = "http://www.openblas.net"
     url = "http://github.com/xianyi/OpenBLAS/archive/v0.2.15.tar.gz"
 
-    version("0.2.16", "b1190f3d3471685f17cfd1ec1d252ac9")
-    version("0.2.15", "b1190f3d3471685f17cfd1ec1d252ac9")
-    version("0.2.14", "b1190f3d3471685f17cfd1ec1d252ac9")
-    version("0.2.13", "b1190f3d3471685f17cfd1ec1d252ac9")
+    version("0.2.16", md5="b1190f3d3471685f17cfd1ec1d252ac9")
+    version("0.2.15", md5="b1190f3d3471685f17cfd1ec1d252ac9")
+    version("0.2.14", md5="b1190f3d3471685f17cfd1ec1d252ac9")
+    version("0.2.13", md5="b1190f3d3471685f17cfd1ec1d252ac9")
 
     variant("shared", default=True, description="Build shared libraries")
 
diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py
index 5a38683f5a..8d94e50524 100644
--- a/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py
+++ b/var/spack/repos/builtin.mock/packages/optional-dep-test-2/package.py
@@ -12,7 +12,7 @@ class OptionalDepTest2(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/optional-dep-test-2-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     variant("odt", default=False)
     variant("mpi", default=False)
diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py
index 0a147d6a34..4b89ef6750 100644
--- a/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py
+++ b/var/spack/repos/builtin.mock/packages/optional-dep-test-3/package.py
@@ -12,7 +12,7 @@ class OptionalDepTest3(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/optional-dep-test-3-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     variant("var", default=False)
 
diff --git a/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py b/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py
index f7a0edad00..4037623cdd 100644
--- a/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py
+++ b/var/spack/repos/builtin.mock/packages/optional-dep-test/package.py
@@ -12,8 +12,8 @@ class OptionalDepTest(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/optional_dep_test-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
-    version("1.1", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
+    version("1.1", md5="0123456789abcdef0123456789abcdef")
 
     variant("a", default=False)
     variant("f", default=False)
diff --git a/var/spack/repos/builtin.mock/packages/othervirtual/package.py b/var/spack/repos/builtin.mock/packages/othervirtual/package.py
index 1f08d82f5f..0d661cc168 100644
--- a/var/spack/repos/builtin.mock/packages/othervirtual/package.py
+++ b/var/spack/repos/builtin.mock/packages/othervirtual/package.py
@@ -10,6 +10,6 @@ class Othervirtual(Package):
     homepage = "http://somewhere.com"
     url = "http://somewhere.com/stuff-1.0.tar.gz"
 
-    version("1.0", "67890abcdef1234567890abcdef12345")
+    version("1.0", md5="67890abcdef1234567890abcdef12345")
 
     provides("stuff")
diff --git a/var/spack/repos/builtin.mock/packages/override-context-templates/package.py b/var/spack/repos/builtin.mock/packages/override-context-templates/package.py
index 004104b26e..d6d79aabb0 100644
--- a/var/spack/repos/builtin.mock/packages/override-context-templates/package.py
+++ b/var/spack/repos/builtin.mock/packages/override-context-templates/package.py
@@ -15,7 +15,7 @@ class OverrideContextTemplates(Package):
     homepage = "http://www.fake-spack-example.org"
     url = "http://www.fake-spack-example.org/downloads/fake-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     tcl_template = "extension.tcl"
     tcl_context = {"sentence": "sentence from package"}
diff --git a/var/spack/repos/builtin.mock/packages/override-module-templates/package.py b/var/spack/repos/builtin.mock/packages/override-module-templates/package.py
index db0d1cbf65..77b3be8041 100644
--- a/var/spack/repos/builtin.mock/packages/override-module-templates/package.py
+++ b/var/spack/repos/builtin.mock/packages/override-module-templates/package.py
@@ -10,7 +10,7 @@ class OverrideModuleTemplates(Package):
     homepage = "http://www.fake-spack-example.org"
     url = "http://www.fake-spack-example.org/downloads/fake-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     tcl_template = "override.txt"
     lmod_template = "override.txt"
diff --git a/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py b/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py
index ed4280fe04..fb1c71033b 100644
--- a/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py
+++ b/var/spack/repos/builtin.mock/packages/patch-a-dependency/package.py
@@ -12,6 +12,6 @@ class PatchADependency(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/patch-a-dependency-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("libelf", patches=patch("libelf.patch"))
diff --git a/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py b/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py
index 1ca333d66c..f23a8e40a0 100644
--- a/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py
+++ b/var/spack/repos/builtin.mock/packages/patch-several-dependencies/package.py
@@ -12,8 +12,8 @@ class PatchSeveralDependencies(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/patch-a-dependency-1.0.tar.gz"
 
-    version("2.0", "0123456789abcdef0123456789abcdef")
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("2.0", md5="0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     variant("foo", default=False, description="Forces a version on libelf")
 
diff --git a/var/spack/repos/builtin.mock/packages/patch/package.py b/var/spack/repos/builtin.mock/packages/patch/package.py
index 55c7df87a7..56e735eea6 100644
--- a/var/spack/repos/builtin.mock/packages/patch/package.py
+++ b/var/spack/repos/builtin.mock/packages/patch/package.py
@@ -12,10 +12,10 @@ class Patch(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/patch-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
     version("1.0.1")
     version("1.0.2")
-    version("2.0", "0123456789abcdef0123456789abcdef")
+    version("2.0", md5="0123456789abcdef0123456789abcdef")
 
     patch("foo.patch")
     patch("bar.patch", when="@2:")
diff --git a/var/spack/repos/builtin.mock/packages/perl-extension/package.py b/var/spack/repos/builtin.mock/packages/perl-extension/package.py
index 7746634cd8..e5675ebe1f 100644
--- a/var/spack/repos/builtin.mock/packages/perl-extension/package.py
+++ b/var/spack/repos/builtin.mock/packages/perl-extension/package.py
@@ -13,8 +13,8 @@ class PerlExtension(PerlPackage):
     homepage = "http://www.example.com"
     url = "http://www.example.com/extension1-1.0.tar.gz"
 
-    version("1.0", "00000000000000000000000000000010")
-    version("2.0", "00000000000000000000000000000020")
+    version("1.0", md5="00000000000000000000000000000010")
+    version("2.0", md5="00000000000000000000000000000020")
 
     extends("perl")
 
diff --git a/var/spack/repos/builtin.mock/packages/perl/package.py b/var/spack/repos/builtin.mock/packages/perl/package.py
index 87fdceea30..1025efb2e9 100644
--- a/var/spack/repos/builtin.mock/packages/perl/package.py
+++ b/var/spack/repos/builtin.mock/packages/perl/package.py
@@ -13,4 +13,4 @@ class Perl(Package):
 
     extendable = True
 
-    version("0.0.0", "abcdef1234567890abcdef1234567890")
+    version("0.0.0", md5="abcdef1234567890abcdef1234567890")
diff --git a/var/spack/repos/builtin.mock/packages/printing-package/package.py b/var/spack/repos/builtin.mock/packages/printing-package/package.py
index aeaf13640e..6357c72bd6 100644
--- a/var/spack/repos/builtin.mock/packages/printing-package/package.py
+++ b/var/spack/repos/builtin.mock/packages/printing-package/package.py
@@ -15,7 +15,7 @@ class PrintingPackage(Package):
     homepage = "http://www.example.com/printing_package"
     url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def install(self, spec, prefix):
         print("BEFORE INSTALL")
diff --git a/var/spack/repos/builtin.mock/packages/py-extension1/package.py b/var/spack/repos/builtin.mock/packages/py-extension1/package.py
index f4674bbedf..8310500a48 100644
--- a/var/spack/repos/builtin.mock/packages/py-extension1/package.py
+++ b/var/spack/repos/builtin.mock/packages/py-extension1/package.py
@@ -15,8 +15,8 @@ class PyExtension1(PythonPackage):
 
     maintainers("user1", "user2")
 
-    version("1.0", "00000000000000000000000000000110")
-    version("2.0", "00000000000000000000000000000120")
+    version("1.0", md5="00000000000000000000000000000110")
+    version("2.0", md5="00000000000000000000000000000120")
 
     def install(self, spec, prefix):
         mkdirp(prefix.bin)
diff --git a/var/spack/repos/builtin.mock/packages/py-extension2/package.py b/var/spack/repos/builtin.mock/packages/py-extension2/package.py
index e84cc53b34..9c356427fd 100644
--- a/var/spack/repos/builtin.mock/packages/py-extension2/package.py
+++ b/var/spack/repos/builtin.mock/packages/py-extension2/package.py
@@ -20,7 +20,7 @@ class PyExtension2(PythonPackage):
     extends("python")
     depends_on("py-extension1", type=("build", "run"))
 
-    version("1.0", "00000000000000000000000000000210")
+    version("1.0", md5="00000000000000000000000000000210")
 
     def install(self, spec, prefix):
         mkdirp(prefix.bin)
diff --git a/var/spack/repos/builtin.mock/packages/py-extension3/package.py b/var/spack/repos/builtin.mock/packages/py-extension3/package.py
index 8b2c136851..936639b488 100644
--- a/var/spack/repos/builtin.mock/packages/py-extension3/package.py
+++ b/var/spack/repos/builtin.mock/packages/py-extension3/package.py
@@ -19,6 +19,6 @@ class PyExtension3(Package):
     depends_on("patchelf@0.9", when="@1.0:1.1 ^python@:2")
     depends_on("patchelf@0.10", when="@1.0:1.1 ^python@3:")
 
-    version("2.0", "00000000000000000000000000000320")
-    version("1.1", "00000000000000000000000000000311")
-    version("1.0", "00000000000000000000000000000310")
+    version("2.0", md5="00000000000000000000000000000320")
+    version("1.1", md5="00000000000000000000000000000311")
+    version("1.0", md5="00000000000000000000000000000310")
diff --git a/var/spack/repos/builtin.mock/packages/py-pip/package.py b/var/spack/repos/builtin.mock/packages/py-pip/package.py
index 7b408d096f..13a4aed9b7 100644
--- a/var/spack/repos/builtin.mock/packages/py-pip/package.py
+++ b/var/spack/repos/builtin.mock/packages/py-pip/package.py
@@ -12,4 +12,4 @@ class PyPip(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/pip-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/py-wheel/package.py b/var/spack/repos/builtin.mock/packages/py-wheel/package.py
index b2bd5d34c7..49fcf26a56 100644
--- a/var/spack/repos/builtin.mock/packages/py-wheel/package.py
+++ b/var/spack/repos/builtin.mock/packages/py-wheel/package.py
@@ -12,4 +12,4 @@ class PyWheel(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/wheel-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/python/package.py b/var/spack/repos/builtin.mock/packages/python/package.py
index b28457f124..0e440f33cb 100644
--- a/var/spack/repos/builtin.mock/packages/python/package.py
+++ b/var/spack/repos/builtin.mock/packages/python/package.py
@@ -14,9 +14,9 @@ class Python(Package):
 
     extendable = True
 
-    version("3.5.1", "be78e48cdfc1a7ad90efff146dce6cfe")
-    version("3.5.0", "a56c0c0b45d75a0ec9c6dee933c41c36")
-    version("2.7.11", "6b6076ec9e93f05dd63e47eb9c15728b", preferred=True)
-    version("2.7.10", "d7547558fd673bd9d38e2108c6b42521")
-    version("2.7.9", "5eebcaa0030dc4061156d3429657fb83")
-    version("2.7.8", "d4bca0159acb0b44a781292b5231936f")
+    version("3.5.1", md5="be78e48cdfc1a7ad90efff146dce6cfe")
+    version("3.5.0", md5="a56c0c0b45d75a0ec9c6dee933c41c36")
+    version("2.7.11", md5="6b6076ec9e93f05dd63e47eb9c15728b", preferred=True)
+    version("2.7.10", md5="d7547558fd673bd9d38e2108c6b42521")
+    version("2.7.9", md5="5eebcaa0030dc4061156d3429657fb83")
+    version("2.7.8", md5="d4bca0159acb0b44a781292b5231936f")
diff --git a/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py b/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py
index a82ade7ff0..8d5c0af757 100644
--- a/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py
+++ b/var/spack/repos/builtin.mock/packages/quantum-espresso/package.py
@@ -14,7 +14,7 @@ class QuantumEspresso(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/qe-1.0.tar.gz"
 
-    version(1.0, "1234567890abcdef1234567890abcdef")
+    version(1.0, md5="1234567890abcdef1234567890abcdef")
 
     variant("invino", default=True, description="?")
     variant("veritas", default=True, description="?")
diff --git a/var/spack/repos/builtin.mock/packages/raiser/package.py b/var/spack/repos/builtin.mock/packages/raiser/package.py
index 1eefa2e360..b80f0a579a 100644
--- a/var/spack/repos/builtin.mock/packages/raiser/package.py
+++ b/var/spack/repos/builtin.mock/packages/raiser/package.py
@@ -16,8 +16,8 @@ class Raiser(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
-    version("2.0", "abcdef0123456789abcdef0123456789")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
 
     variant(
         "exc_type",
diff --git a/var/spack/repos/builtin.mock/packages/requires-virtual/package.py b/var/spack/repos/builtin.mock/packages/requires-virtual/package.py
index 2df4b86688..a031977ae2 100644
--- a/var/spack/repos/builtin.mock/packages/requires-virtual/package.py
+++ b/var/spack/repos/builtin.mock/packages/requires-virtual/package.py
@@ -14,6 +14,6 @@ class RequiresVirtual(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("2.0", "abcdef0123456789abcdef0123456789")
+    version("2.0", md5="abcdef0123456789abcdef0123456789")
 
     depends_on("stuff")
diff --git a/var/spack/repos/builtin.mock/packages/root/package.py b/var/spack/repos/builtin.mock/packages/root/package.py
index 91669a83a5..d1a8016bea 100644
--- a/var/spack/repos/builtin.mock/packages/root/package.py
+++ b/var/spack/repos/builtin.mock/packages/root/package.py
@@ -9,6 +9,6 @@ class Root(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/root-1.0.tar.gz"
 
-    version("1.0", "abcdef0123456789abcdef0123456789")
+    version("1.0", md5="abcdef0123456789abcdef0123456789")
 
     depends_on("gmt")
diff --git a/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py b/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py
index a1f439de6e..a6676ba5dc 100644
--- a/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py
+++ b/var/spack/repos/builtin.mock/packages/simple-inheritance/package.py
@@ -25,7 +25,7 @@ class SimpleInheritance(BaseWithDirectives):
     homepage = "http://www.example.com"
     url = "http://www.example.com/simple-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("openblas", when="+openblas")
     provides("lapack", when="+openblas")
diff --git a/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py b/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py
index edd1fcec1b..3cb78cd25e 100644
--- a/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py
+++ b/var/spack/repos/builtin.mock/packages/simple-standalone-test/package.py
@@ -12,7 +12,7 @@ class SimpleStandaloneTest(Package):
     homepage = "http://www.example.com/simple_test"
     url = "http://www.unit-test-should-replace-this-url/simple_test-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def test(self):
         msg = "simple stand-alone test"
diff --git a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py
index 6ca3751aa0..67991f3ee6 100644
--- a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py
+++ b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent-type/package.py
@@ -14,6 +14,6 @@ class SinglevalueVariantDependentType(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/archive-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("singlevalue-variant fum=nope")
diff --git a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py
index 0e07223513..a78c9aac17 100644
--- a/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py
+++ b/var/spack/repos/builtin.mock/packages/singlevalue-variant-dependent/package.py
@@ -12,6 +12,6 @@ class SinglevalueVariantDependent(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/archive-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("multivalue-variant fee=baz")
diff --git a/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py b/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py
index d4f8c45de2..615551355b 100644
--- a/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py
+++ b/var/spack/repos/builtin.mock/packages/singlevalue-variant/package.py
@@ -11,7 +11,7 @@ class SinglevalueVariant(Package):
     homepage = "http://www.llnl.gov"
     url = "http://www.llnl.gov/mpileaks-1.0.tar.gz"
 
-    version(1.0, "0123456789abcdef0123456789abcdef")
+    version(1.0, md5="0123456789abcdef0123456789abcdef")
 
     variant(
         "fum",
diff --git a/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py b/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py
index 38cafb504b..33016bb815 100644
--- a/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py
+++ b/var/spack/repos/builtin.mock/packages/some-virtual-mv/package.py
@@ -12,7 +12,7 @@ class SomeVirtualMv(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/foo-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     provides("somevirtual")
 
diff --git a/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py b/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py
index a9ecbc4231..33e109fe9c 100644
--- a/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py
+++ b/var/spack/repos/builtin.mock/packages/some-virtual-preferred/package.py
@@ -12,6 +12,6 @@ class SomeVirtualPreferred(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/foo-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     provides("somevirtual")
diff --git a/var/spack/repos/builtin.mock/packages/splice-a/package.py b/var/spack/repos/builtin.mock/packages/splice-a/package.py
index a111127ab9..43ad6e3434 100644
--- a/var/spack/repos/builtin.mock/packages/splice-a/package.py
+++ b/var/spack/repos/builtin.mock/packages/splice-a/package.py
@@ -12,7 +12,7 @@ class SpliceA(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/splice-a-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789efghij")
+    version("1.0", md5="0123456789abcdef0123456789efghij")
 
     variant("foo", default=False, description="nope")
     variant("bar", default=False, description="nope")
diff --git a/var/spack/repos/builtin.mock/packages/splice-h/package.py b/var/spack/repos/builtin.mock/packages/splice-h/package.py
index b76a4b345e..0bc30aede1 100644
--- a/var/spack/repos/builtin.mock/packages/splice-h/package.py
+++ b/var/spack/repos/builtin.mock/packages/splice-h/package.py
@@ -12,7 +12,7 @@ class SpliceH(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/splice-h-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     variant("foo", default=False, description="nope")
     variant("bar", default=False, description="nope")
diff --git a/var/spack/repos/builtin.mock/packages/splice-t/package.py b/var/spack/repos/builtin.mock/packages/splice-t/package.py
index de3f0ce50a..f61e985b2e 100644
--- a/var/spack/repos/builtin.mock/packages/splice-t/package.py
+++ b/var/spack/repos/builtin.mock/packages/splice-t/package.py
@@ -12,7 +12,7 @@ class SpliceT(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/splice-t-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("splice-h")
     depends_on("splice-z")
diff --git a/var/spack/repos/builtin.mock/packages/splice-vh/package.py b/var/spack/repos/builtin.mock/packages/splice-vh/package.py
index 2bd901a660..729c541fe8 100644
--- a/var/spack/repos/builtin.mock/packages/splice-vh/package.py
+++ b/var/spack/repos/builtin.mock/packages/splice-vh/package.py
@@ -12,7 +12,7 @@ class SpliceVh(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/splice-vh-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     variant("foo", default=False, description="nope")
     variant("bar", default=False, description="nope")
diff --git a/var/spack/repos/builtin.mock/packages/splice-z/package.py b/var/spack/repos/builtin.mock/packages/splice-z/package.py
index 15078cfe0e..9143050547 100644
--- a/var/spack/repos/builtin.mock/packages/splice-z/package.py
+++ b/var/spack/repos/builtin.mock/packages/splice-z/package.py
@@ -12,7 +12,7 @@ class SpliceZ(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/splice-z-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     variant("foo", default=False, description="nope")
     variant("bar", default=False, description="nope")
diff --git a/var/spack/repos/builtin.mock/packages/sticky-variant/package.py b/var/spack/repos/builtin.mock/packages/sticky-variant/package.py
index 68829cc2a3..3a99e0436a 100644
--- a/var/spack/repos/builtin.mock/packages/sticky-variant/package.py
+++ b/var/spack/repos/builtin.mock/packages/sticky-variant/package.py
@@ -11,7 +11,7 @@ class StickyVariant(AutotoolsPackage):
     homepage = "http://www.example.com"
     url = "http://www.example.com/a-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     variant("allow-gcc", description="", default=False, sticky=True)
 
diff --git a/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py b/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py
index 1f9816fd9f..fa8e48c745 100644
--- a/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py
+++ b/var/spack/repos/builtin.mock/packages/test-build-callbacks/package.py
@@ -13,7 +13,7 @@ class TestBuildCallbacks(Package):
     homepage = "http://www.example.com/test-build-callbacks"
     url = "http://www.test-failure.test/test-build-callbacks-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
 
 class GenericBuilder(spack.build_systems.generic.GenericBuilder):
diff --git a/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py b/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py
index 203636a60e..aadd47e335 100644
--- a/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py
+++ b/var/spack/repos/builtin.mock/packages/test-dep-with-imposed-conditions/package.py
@@ -12,6 +12,6 @@ class TestDepWithImposedConditions(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/e-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("c@1.0", type="test")
diff --git a/var/spack/repos/builtin.mock/packages/test-dependency/package.py b/var/spack/repos/builtin.mock/packages/test-dependency/package.py
index ceeeaa6a2e..c6420f75fd 100644
--- a/var/spack/repos/builtin.mock/packages/test-dependency/package.py
+++ b/var/spack/repos/builtin.mock/packages/test-dependency/package.py
@@ -13,4 +13,4 @@ class TestDependency(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/tdep-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/test-error/package.py b/var/spack/repos/builtin.mock/packages/test-error/package.py
index a9188ff9e6..5128a265a4 100644
--- a/var/spack/repos/builtin.mock/packages/test-error/package.py
+++ b/var/spack/repos/builtin.mock/packages/test-error/package.py
@@ -12,7 +12,7 @@ class TestError(Package):
     homepage = "http://www.example.com/test-failure"
     url = "http://www.test-failure.test/test-failure-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def install(self, spec, prefix):
         mkdirp(prefix.bin)
diff --git a/var/spack/repos/builtin.mock/packages/test-fail/package.py b/var/spack/repos/builtin.mock/packages/test-fail/package.py
index 20786564d3..bcaa038e73 100644
--- a/var/spack/repos/builtin.mock/packages/test-fail/package.py
+++ b/var/spack/repos/builtin.mock/packages/test-fail/package.py
@@ -12,7 +12,7 @@ class TestFail(Package):
     homepage = "http://www.example.com/test-failure"
     url = "http://www.test-failure.test/test-failure-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def install(self, spec, prefix):
         mkdirp(prefix.bin)
diff --git a/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py b/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py
index 9f8bf240f9..ed31892658 100644
--- a/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py
+++ b/var/spack/repos/builtin.mock/packages/test-install-callbacks/package.py
@@ -13,7 +13,7 @@ class TestInstallCallbacks(Package):
     homepage = "http://www.example.com/test-install-callbacks"
     url = "http://www.test-failure.test/test-install-callbacks-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
 
 class GenericBuilder(spack.build_systems.generic.GenericBuilder):
diff --git a/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py b/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py
index cf5160ed84..608e5e9270 100644
--- a/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py
+++ b/var/spack/repos/builtin.mock/packages/trigger-external-non-default-variant/package.py
@@ -11,6 +11,6 @@ class TriggerExternalNonDefaultVariant(Package):
     homepage = "http://www.example.com"
     url = "http://www.someurl.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("external-non-default-variant")
diff --git a/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py b/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py
index 97beccebe4..4d984d22ab 100644
--- a/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py
+++ b/var/spack/repos/builtin.mock/packages/trivial-install-test-package/package.py
@@ -12,7 +12,7 @@ class TrivialInstallTestPackage(Package):
     homepage = "http://www.example.com/trivial_install"
     url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def install(self, spec, prefix):
         touch(join_path(prefix, "an_installation_file"))
diff --git a/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py b/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py
index ac35d3ad85..f8ab1ba7c4 100644
--- a/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py
+++ b/var/spack/repos/builtin.mock/packages/trivial-pkg-with-valid-hash/package.py
@@ -10,7 +10,9 @@ class TrivialPkgWithValidHash(Package):
     url = "http://www.unit-test-should-replace-this-url/trivial_install-1.0"
 
     version(
-        "1.0", "6ae8a75555209fd6c44157c0aed8016e763ff435a19cf186f76863140143ff72", expand=False
+        "1.0",
+        sha256="6ae8a75555209fd6c44157c0aed8016e763ff435a19cf186f76863140143ff72",
+        expand=False,
     )
 
     hashed_content = "test content"
diff --git a/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py b/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py
index c299d54788..694d682cff 100644
--- a/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py
+++ b/var/spack/repos/builtin.mock/packages/trivial-smoke-test/package.py
@@ -12,7 +12,7 @@ class TrivialSmokeTest(Package):
     homepage = "http://www.example.com/trivial_test"
     url = "http://www.unit-test-should-replace-this-url/trivial_test-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     test_source_filename = "cached_file.in"
 
diff --git a/var/spack/repos/builtin.mock/packages/url-list-test/package.py b/var/spack/repos/builtin.mock/packages/url-list-test/package.py
index ab400ee610..bf9d3dfcce 100644
--- a/var/spack/repos/builtin.mock/packages/url-list-test/package.py
+++ b/var/spack/repos/builtin.mock/packages/url-list-test/package.py
@@ -17,10 +17,10 @@ class UrlListTest(Package):
     list_url = "file://" + web_data_path + "/index.html"
     list_depth = 3
 
-    version("0.0.0", "00000000000000000000000000000000")
-    version("1.0.0", "00000000000000000000000000000100")
-    version("3.0", "00000000000000000000000000000030")
-    version("4.5", "00000000000000000000000000000450")
-    version("2.0.0b2", "000000000000000000000000000200b2")
-    version("3.0a1", "000000000000000000000000000030a1")
-    version("4.5-rc5", "000000000000000000000000000045c5")
+    version("0.0.0", md5="00000000000000000000000000000000")
+    version("1.0.0", md5="00000000000000000000000000000100")
+    version("3.0", md5="00000000000000000000000000000030")
+    version("4.5", md5="00000000000000000000000000000450")
+    version("2.0.0b2", md5="000000000000000000000000000200b2")
+    version("3.0a1", md5="000000000000000000000000000030a1")
+    version("4.5-rc5", md5="000000000000000000000000000045c5")
diff --git a/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py b/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py
index 8256e5a9ea..0e224515a7 100644
--- a/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py
+++ b/var/spack/repos/builtin.mock/packages/url-only-override-with-gaps/package.py
@@ -9,22 +9,22 @@
 class UrlOnlyOverrideWithGaps(Package):
     homepage = "http://www.example.com"
 
-    version("1.0.5", "abcdef0123456789abcdef0123456789")
+    version("1.0.5", md5="abcdef0123456789abcdef0123456789")
     version(
         "1.0.0",
-        "bcdef0123456789abcdef0123456789a",
+        md5="bcdef0123456789abcdef0123456789a",
         url="http://a.example.com/url_override-1.0.0.tar.gz",
     )
-    version("0.9.5", "cdef0123456789abcdef0123456789ab")
+    version("0.9.5", md5="cdef0123456789abcdef0123456789ab")
     version(
         "0.9.0",
-        "def0123456789abcdef0123456789abc",
+        md5="def0123456789abcdef0123456789abc",
         url="http://b.example.com/url_override-0.9.0.tar.gz",
     )
-    version("0.8.5", "ef0123456789abcdef0123456789abcd")
+    version("0.8.5", md5="ef0123456789abcdef0123456789abcd")
     version(
         "0.8.1",
-        "f0123456789abcdef0123456789abcde",
+        md5="f0123456789abcdef0123456789abcde",
         url="http://c.example.com/url_override-0.8.1.tar.gz",
     )
-    version("0.7.0", "0123456789abcdef0123456789abcdef")
+    version("0.7.0", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/url-only-override/package.py b/var/spack/repos/builtin.mock/packages/url-only-override/package.py
index e12fd70374..6f37b79e5a 100644
--- a/var/spack/repos/builtin.mock/packages/url-only-override/package.py
+++ b/var/spack/repos/builtin.mock/packages/url-only-override/package.py
@@ -11,16 +11,16 @@ class UrlOnlyOverride(Package):
 
     version(
         "1.0.0",
-        "0123456789abcdef0123456789abcdef",
+        md5="0123456789abcdef0123456789abcdef",
         url="http://a.example.com/url_override-1.0.0.tar.gz",
     )
     version(
         "0.9.0",
-        "fedcba9876543210fedcba9876543210",
+        md5="fedcba9876543210fedcba9876543210",
         url="http://b.example.com/url_override-0.9.0.tar.gz",
     )
     version(
         "0.8.1",
-        "0123456789abcdef0123456789abcdef",
+        md5="0123456789abcdef0123456789abcdef",
         url="http://c.example.com/url_override-0.8.1.tar.gz",
     )
diff --git a/var/spack/repos/builtin.mock/packages/url_override/package.py b/var/spack/repos/builtin.mock/packages/url_override/package.py
index cf79dcff02..f8e1382fdf 100644
--- a/var/spack/repos/builtin.mock/packages/url_override/package.py
+++ b/var/spack/repos/builtin.mock/packages/url_override/package.py
@@ -10,8 +10,10 @@ class UrlOverride(Package):
     homepage = "http://www.doesnotexist.org"
     url = "http://www.doesnotexist.org/url_override-1.0.0.tar.gz"
 
-    version("1.0.0", "0123456789abcdef0123456789abcdef")
+    version("1.0.0", md5="0123456789abcdef0123456789abcdef")
     version(
-        "0.9.0", "fedcba9876543210fedcba9876543210", url="http://www.anothersite.org/uo-0.9.0.tgz"
+        "0.9.0",
+        md5="fedcba9876543210fedcba9876543210",
+        url="http://www.anothersite.org/uo-0.9.0.tgz",
     )
-    version("0.8.1", "0123456789abcdef0123456789abcdef")
+    version("0.8.1", md5="0123456789abcdef0123456789abcdef")
diff --git a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py
index 32bd2eb233..556a2d0c1e 100644
--- a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py
+++ b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-a/package.py
@@ -16,6 +16,6 @@ class VariantOnDependencyConditionA(Package):
     homepage = "https://www.example.org"
     url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz"
 
-    version("1.0", "4cb3ff35b2472aae70f542116d616e63")
+    version("1.0", md5="4cb3ff35b2472aae70f542116d616e63")
 
     variant("x", default=True, description="?")
diff --git a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py
index ed3f3b9f86..1d5c84148c 100644
--- a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py
+++ b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-b/package.py
@@ -16,4 +16,4 @@ class VariantOnDependencyConditionB(Package):
     homepage = "https://www.example.org"
     url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz"
 
-    version("1.0", "4cb3ff35b2472aae70f542116d616e63")
+    version("1.0", md5="4cb3ff35b2472aae70f542116d616e63")
diff --git a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py
index ad5ff2001f..a573064cc6 100644
--- a/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py
+++ b/var/spack/repos/builtin.mock/packages/variant-on-dependency-condition-root/package.py
@@ -16,7 +16,7 @@ class VariantOnDependencyConditionRoot(Package):
     homepage = "https://www.example.org"
     url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz"
 
-    version("1.0", "4cb3ff35b2472aae70f542116d616e63")
+    version("1.0", md5="4cb3ff35b2472aae70f542116d616e63")
 
     depends_on("variant-on-dependency-condition-a")
     depends_on("variant-on-dependency-condition-b", when="^variant-on-dependency-condition-a+x")
diff --git a/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py b/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py
index d149424fb4..1bb50388b2 100644
--- a/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py
+++ b/var/spack/repos/builtin.mock/packages/vdefault-or-external-root/package.py
@@ -13,6 +13,6 @@ class VdefaultOrExternalRoot(Package):
     homepage = "https://www.example.org"
     url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz"
 
-    version("1.0", "4cb3ff35b2472aae70f542116d616e63")
+    version("1.0", md5="4cb3ff35b2472aae70f542116d616e63")
 
     depends_on("vdefault-or-external")
diff --git a/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py b/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py
index 62800220d5..74c35eb4bc 100644
--- a/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py
+++ b/var/spack/repos/builtin.mock/packages/vdefault-or-external/package.py
@@ -13,7 +13,7 @@ class VdefaultOrExternal(Package):
     homepage = "https://www.example.org"
     url = "https://example.org/files/v3.4/cmake-3.4.3.tar.gz"
 
-    version("1.0", "4cb3ff35b2472aae70f542116d616e63")
+    version("1.0", md5="4cb3ff35b2472aae70f542116d616e63")
 
     variant("external", default=False, description="nope")
 
diff --git a/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py b/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py
index ad598f4007..38b4b71b2f 100644
--- a/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py
+++ b/var/spack/repos/builtin.mock/packages/view-dir-dir/package.py
@@ -15,7 +15,7 @@ class ViewDirDir(Package):
     url = "http://www.spack.org/downloads/aml-1.0.tar.gz"
     has_code = False
 
-    version("0.1.0", sha256="cc89a8768693f1f11539378b21cdca9f0ce3fc5cb564f9b3e4154a051dcea69b")
+    version("0.1.0")
 
     def install(self, spec, prefix):
         os.mkdir(os.path.join(prefix, "bin"))
diff --git a/var/spack/repos/builtin.mock/packages/view-dir-file/package.py b/var/spack/repos/builtin.mock/packages/view-dir-file/package.py
index b2876bddf2..737b4f8397 100644
--- a/var/spack/repos/builtin.mock/packages/view-dir-file/package.py
+++ b/var/spack/repos/builtin.mock/packages/view-dir-file/package.py
@@ -15,7 +15,7 @@ class ViewDirFile(Package):
     url = "http://www.spack.org/downloads/aml-1.0.tar.gz"
     has_code = False
 
-    version("0.1.0", sha256="cc89a8768693f1f11539378b21cdca9f0ce3fc5cb564f9b3e4154a051dcea69b")
+    version("0.1.0")
 
     def install(self, spec, prefix):
         os.mkdir(os.path.join(prefix, "bin"))
diff --git a/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py b/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py
index a13635d062..a3ab6c699d 100644
--- a/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py
+++ b/var/spack/repos/builtin.mock/packages/view-dir-symlinked-dir/package.py
@@ -16,7 +16,7 @@ class ViewDirSymlinkedDir(Package):
     url = "http://www.spack.org/downloads/aml-1.0.tar.gz"
     has_code = False
 
-    version("0.1.0", sha256="cc89a8768693f1f11539378b21cdca9f0ce3fc5cb564f9b3e4154a051dcea69b")
+    version("0.1.0")
 
     def install(self, spec, prefix):
         os.mkdir(os.path.join(prefix, "bin"))
diff --git a/var/spack/repos/builtin.mock/packages/view-not-ignored/package.py b/var/spack/repos/builtin.mock/packages/view-not-ignored/package.py
index b41cb299b6..afe43c422b 100644
--- a/var/spack/repos/builtin.mock/packages/view-not-ignored/package.py
+++ b/var/spack/repos/builtin.mock/packages/view-not-ignored/package.py
@@ -15,7 +15,7 @@ class ViewNotIgnored(Package):
     url = "http://www.spack.org/downloads/aml-1.0.tar.gz"
     has_code = False
 
-    version("0.1.0", sha256="cc89a8768693f1f11539378b21cdca9f0ce3fc5cb564f9b3e4154a051dcea69b")
+    version("0.1.0")
 
     install_test_files = [
         "foo.spack",
diff --git a/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py b/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py
index 89c369efce..3ab20787a2 100644
--- a/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py
+++ b/var/spack/repos/builtin.mock/packages/virtual-with-versions/package.py
@@ -11,10 +11,10 @@ class VirtualWithVersions(AutotoolsPackage):
     homepage = "http://www.spack.org"
     url = "http://www.spack.org/downloads/aml-1.0.tar.gz"
 
-    version("17.0.1", "0123456789abcdef0123456789abcdef")
-    version("16.0.1", "0123456789abcdef0123456789abcdef")
-    version("11.0.1", "0123456789abcdef0123456789abcdef")
-    version("1.8.0", "0123456789abcdef0123456789abcdef")
+    version("17.0.1", md5="0123456789abcdef0123456789abcdef")
+    version("16.0.1", md5="0123456789abcdef0123456789abcdef")
+    version("11.0.1", md5="0123456789abcdef0123456789abcdef")
+    version("1.8.0", md5="0123456789abcdef0123456789abcdef")
 
     provides("java@17", when="@17.0:17.9")
     provides("java@16", when="@16.0:16.9")
diff --git a/var/spack/repos/builtin.mock/packages/when-directives-false/package.py b/var/spack/repos/builtin.mock/packages/when-directives-false/package.py
index 63a7319320..94ec3f7e30 100644
--- a/var/spack/repos/builtin.mock/packages/when-directives-false/package.py
+++ b/var/spack/repos/builtin.mock/packages/when-directives-false/package.py
@@ -12,7 +12,7 @@ class WhenDirectivesFalse(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/example-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     patch(
         "https://example.com/foo.patch",
diff --git a/var/spack/repos/builtin.mock/packages/when-directives-true/package.py b/var/spack/repos/builtin.mock/packages/when-directives-true/package.py
index 5e458a3bc3..7aa0047e2c 100644
--- a/var/spack/repos/builtin.mock/packages/when-directives-true/package.py
+++ b/var/spack/repos/builtin.mock/packages/when-directives-true/package.py
@@ -12,7 +12,7 @@ class WhenDirectivesTrue(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/example-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     patch(
         "https://example.com/foo.patch",
diff --git a/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py b/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py
index f43243d888..cf431ae5ec 100644
--- a/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py
+++ b/var/spack/repos/builtin.mock/packages/with-constraint-met/package.py
@@ -12,8 +12,8 @@ class WithConstraintMet(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/example-1.0.tar.gz"
 
-    version("2.0", "0123456789abcdef0123456789abcdef")
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("2.0", md5="0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     with when("@1.0"):
         depends_on("b")
diff --git a/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py b/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py
index 5278f1b427..1b88078ea9 100644
--- a/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py
+++ b/var/spack/repos/builtin.mock/packages/wrong-variant-in-conflicts/package.py
@@ -11,6 +11,6 @@ class WrongVariantInConflicts(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/b-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     conflicts("+foo", when="@1.0")
diff --git a/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py b/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py
index a5696398b2..8cb8b61508 100644
--- a/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py
+++ b/var/spack/repos/builtin.mock/packages/wrong-variant-in-depends-on/package.py
@@ -11,6 +11,6 @@ class WrongVariantInDependsOn(Package):
     homepage = "http://www.example.com"
     url = "http://www.example.com/b-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     depends_on("b+doesnotexist")
diff --git a/var/spack/repos/builtin.mock/packages/zmpi/package.py b/var/spack/repos/builtin.mock/packages/zmpi/package.py
index f6bb21a3a5..1e27b35c29 100644
--- a/var/spack/repos/builtin.mock/packages/zmpi/package.py
+++ b/var/spack/repos/builtin.mock/packages/zmpi/package.py
@@ -13,7 +13,7 @@ class Zmpi(Package):
     homepage = "http://www.spack-fake-zmpi.org"
     url = "http://www.spack-fake-zmpi.org/downloads/zmpi-1.0.tar.gz"
 
-    version("1.0", "0123456789abcdef0123456789abcdef")
+    version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     provides("mpi@:10.0")
     depends_on("fake")
diff --git a/var/spack/repos/builtin/packages/ace/package.py b/var/spack/repos/builtin/packages/ace/package.py
index e5387db20c..c152bbdeb6 100644
--- a/var/spack/repos/builtin/packages/ace/package.py
+++ b/var/spack/repos/builtin/packages/ace/package.py
@@ -17,10 +17,10 @@ class Ace(MakefilePackage):
     url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.1.tar.gz"
 
     version("7.1.0", sha256="d78d9f3f2dee6ccb46a8c296367369349054fd475dff3c5b36e2dff3dee0bf8f")
-    version("6.5.12", "de96c68a6262d6b9ba76b5057c02c7e6964c070b1328a63bf70259e9530a7996")
-    version("6.5.6", "7717cad84d4a9c3d6b2c47963eb555d96de0be657870bcab6fcef4c0423af0de")
-    version("6.5.1", "1f318adadb19da23c9be570a9c600a330056b18950fe0bf0eb1cf5cac8b72a32")
-    version("6.5.0", "b6f9ec922fbdcecb4348e16d851d0d1f135df1836dfe77d2e0b64295ddb83066")
+    version("6.5.12", sha256="de96c68a6262d6b9ba76b5057c02c7e6964c070b1328a63bf70259e9530a7996")
+    version("6.5.6", sha256="7717cad84d4a9c3d6b2c47963eb555d96de0be657870bcab6fcef4c0423af0de")
+    version("6.5.1", sha256="1f318adadb19da23c9be570a9c600a330056b18950fe0bf0eb1cf5cac8b72a32")
+    version("6.5.0", sha256="b6f9ec922fbdcecb4348e16d851d0d1f135df1836dfe77d2e0b64295ddb83066")
 
     def edit(self, spec, prefix):
         # Dictionary mapping: compiler-name : ACE config-label
diff --git a/var/spack/repos/builtin/packages/adf/package.py b/var/spack/repos/builtin/packages/adf/package.py
index 61a5f7b405..908cd5351f 100644
--- a/var/spack/repos/builtin/packages/adf/package.py
+++ b/var/spack/repos/builtin/packages/adf/package.py
@@ -16,7 +16,7 @@ class Adf(Package):
     homepage = "https://www.scm.com/product/adf/"
     manual_download = True
 
-    version("2017.113", "666ef15d253b74c707dd14da35e7cf283ca20e21e24ed43cb953fb9d1f2f1e15")
+    version("2017.113", sha256="666ef15d253b74c707dd14da35e7cf283ca20e21e24ed43cb953fb9d1f2f1e15")
 
     def url_for_version(self, version):
         return "file://{0}/adf/adf{1}.pc64_linux.openmpi.bin.tgz".format(os.getcwd(), version)
diff --git a/var/spack/repos/builtin/packages/aperture-photometry/package.py b/var/spack/repos/builtin/packages/aperture-photometry/package.py
index 1ed1bbc998..2d74720cbe 100644
--- a/var/spack/repos/builtin/packages/aperture-photometry/package.py
+++ b/var/spack/repos/builtin/packages/aperture-photometry/package.py
@@ -15,11 +15,11 @@ class AperturePhotometry(Package):
     url = "https://web.ipac.caltech.edu/staff/laher/apt/APT_v2.8.4.tar.gz"
     maintainers("snehring")
 
-    version("3.0.2", "8ac430079825ba274567fb998dd693bb6f99490f5b896d4746178ba796bfdead")
-    version("2.8.4", "28ae136c708a3ebcb83632230e119a03ca1a65499006ab69dc76e21b4921f465")
+    version("3.0.2", sha256="8ac430079825ba274567fb998dd693bb6f99490f5b896d4746178ba796bfdead")
+    version("2.8.4", sha256="28ae136c708a3ebcb83632230e119a03ca1a65499006ab69dc76e21b4921f465")
     version(
         "2.8.2",
-        "cb29eb39a630dc5d17c02fb824c69571fe1870a910a6acf9115c5f76fd89dd7e",
+        sha256="cb29eb39a630dc5d17c02fb824c69571fe1870a910a6acf9115c5f76fd89dd7e",
         deprecated=True,
     )
 
diff --git a/var/spack/repos/builtin/packages/aws-ofi-nccl/package.py b/var/spack/repos/builtin/packages/aws-ofi-nccl/package.py
index c227fa490f..30c6b6145e 100644
--- a/var/spack/repos/builtin/packages/aws-ofi-nccl/package.py
+++ b/var/spack/repos/builtin/packages/aws-ofi-nccl/package.py
@@ -17,7 +17,7 @@ class AwsOfiNccl(AutotoolsPackage):
 
     maintainers("bvanessen")
 
-    version("master", branch="master", default=True)
+    version("master", branch="master")
 
     variant("trace", default=False, description="Enable printing trace messages")
     variant("tests", default=False, description="Build tests")
diff --git a/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py b/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py
index 4bf14eb89a..76fab34439 100644
--- a/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py
+++ b/var/spack/repos/builtin/packages/aws-ofi-rccl/package.py
@@ -18,7 +18,7 @@ class AwsOfiRccl(AutotoolsPackage):
 
     maintainers("bvanessen")
 
-    version("cxi", branch="cxi", default=True)
+    version("cxi", branch="cxi", preferred=True)
     version("master", branch="master")
 
     variant("trace", default=False, description="Enable printing trace messages")
diff --git a/var/spack/repos/builtin/packages/berkeleygw/package.py b/var/spack/repos/builtin/packages/berkeleygw/package.py
index 148942b50e..4a2a0d15bd 100644
--- a/var/spack/repos/builtin/packages/berkeleygw/package.py
+++ b/var/spack/repos/builtin/packages/berkeleygw/package.py
@@ -18,19 +18,19 @@ class Berkeleygw(MakefilePackage):
 
     version(
         "3.0.1",
-        "7d8c2cc1ee679afb48efbdd676689d4d537226b50e13a049dbcb052aaaf3654f",
+        sha256="7d8c2cc1ee679afb48efbdd676689d4d537226b50e13a049dbcb052aaaf3654f",
         url="https://berkeley.box.com/shared/static/m1dgnhiemo47lhxczrn6si71bwxoxor8.gz",
         expand=False,
     )
     version(
         "3.0",
-        "ab411acead5e979fd42b8d298dbb0a12ce152e7be9eee0bb87e9e5a06a638e2a",
+        sha256="ab411acead5e979fd42b8d298dbb0a12ce152e7be9eee0bb87e9e5a06a638e2a",
         url="https://berkeley.box.com/shared/static/lp6hj4kxr459l5a6t05qfuzl2ucyo03q.gz",
         expand=False,
     )
     version(
         "2.1",
-        "31f3b643dd937350c3866338321d675d4a1b1f54c730b43ad74ae67e75a9e6f2",
+        sha256="31f3b643dd937350c3866338321d675d4a1b1f54c730b43ad74ae67e75a9e6f2",
         url="https://berkeley.box.com/shared/static/ze3azi5vlyw7hpwvl9i5f82kaiid6g0x.gz",
         expand=False,
     )
diff --git a/var/spack/repos/builtin/packages/bigdft-suite/package.py b/var/spack/repos/builtin/packages/bigdft-suite/package.py
index 974fa500c6..b4785b0e17 100644
--- a/var/spack/repos/builtin/packages/bigdft-suite/package.py
+++ b/var/spack/repos/builtin/packages/bigdft-suite/package.py
@@ -15,9 +15,9 @@ class BigdftSuite(BundlePackage):
     git = "https://gitlab.com/l_sim/bigdft-suite.git"
 
     version("develop", branch="devel")
-    version("1.9.2", sha256="dc9e49b68f122a9886fa0ef09970f62e7ba21bb9ab1b86be9b7d7e22ed8fbe0f")
-    version("1.9.1", sha256="3c334da26d2a201b572579fc1a7f8caad1cbf971e848a3e10d83bc4dc8c82e41")
-    version("1.9.0", sha256="4500e505f5a29d213f678a91d00a10fef9dc00860ea4b3edf9280f33ed0d1ac8")
+    version("1.9.2")
+    version("1.9.1")
+    version("1.9.0")
 
     depends_on("python@3.0:", type=("run"))
 
diff --git a/var/spack/repos/builtin/packages/cgdb/package.py b/var/spack/repos/builtin/packages/cgdb/package.py
index edf8da37f2..8632cfb3a1 100644
--- a/var/spack/repos/builtin/packages/cgdb/package.py
+++ b/var/spack/repos/builtin/packages/cgdb/package.py
@@ -14,7 +14,7 @@ class Cgdb(AutotoolsPackage):
     url = "https://cgdb.me/files/cgdb-0.7.1.tar.gz"
     git = "https://github.com/cgdb/cgdb.git"
 
-    version("master", branch="master", submodule=False, preferred=True)
+    version("master", branch="master", submodules=False, preferred=True)
     version("0.7.1", sha256="bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198")
     version("0.7.0", sha256="bf7a9264668db3f9342591b08b2cc3bbb08e235ba2372877b4650b70c6fb5423")
 
diff --git a/var/spack/repos/builtin/packages/chameleon/package.py b/var/spack/repos/builtin/packages/chameleon/package.py
index d5539e91f1..6b6e9af0cc 100644
--- a/var/spack/repos/builtin/packages/chameleon/package.py
+++ b/var/spack/repos/builtin/packages/chameleon/package.py
@@ -16,7 +16,7 @@ class Chameleon(CMakePackage, CudaPackage):
     maintainers("fpruvost")
 
     version("master", branch="master", submodules=True)
-    version("1.1.0", "e64d0438dfaf5effb3740e53f3ab017d12744b85a138b2ef702a81df559126df")
+    version("1.1.0", sha256="e64d0438dfaf5effb3740e53f3ab017d12744b85a138b2ef702a81df559126df")
 
     # cmake's specific
     variant("shared", default=True, description="Build chameleon as a shared library")
diff --git a/var/spack/repos/builtin/packages/chlorop/package.py b/var/spack/repos/builtin/packages/chlorop/package.py
index c1f4781164..c01f9af296 100644
--- a/var/spack/repos/builtin/packages/chlorop/package.py
+++ b/var/spack/repos/builtin/packages/chlorop/package.py
@@ -22,7 +22,7 @@ class Chlorop(Package):
     url = "file://{0}/chlorop-1.1.Linux.tar.gz".format(os.getcwd())
     manual_download = True
 
-    version("1.1", "eb0ba6b28dfa735163ad5fc70e30139e46e33f6ae27f87666a7167a4ac5f71d9")
+    version("1.1", sha256="eb0ba6b28dfa735163ad5fc70e30139e46e33f6ae27f87666a7167a4ac5f71d9")
 
     depends_on("awk", type="run")
     patch("chlorop.patch")
diff --git a/var/spack/repos/builtin/packages/compadre/package.py b/var/spack/repos/builtin/packages/compadre/package.py
index 0eea8095e4..cdc568e1ed 100644
--- a/var/spack/repos/builtin/packages/compadre/package.py
+++ b/var/spack/repos/builtin/packages/compadre/package.py
@@ -21,9 +21,9 @@ class Compadre(CMakePackage):
     maintainers("kuberry")
 
     version("master", branch="master")
-    version("1.5.0", "b7dd6020cc5a7969de817d5c7f6c5acceaad0f08dcfd3d7cacfa9f42e4c8b335")
-    version("1.4.1", "2e1e7d8e30953f76b6dc3a4c86ec8103d4b29447194cb5d5abb74b8e4099bdd9")
-    version("1.3.0", "f711a840fd921e84660451ded408023ec3bcfc98fd0a7dc4a299bfae6ab489c2")
+    version("1.5.0", sha256="b7dd6020cc5a7969de817d5c7f6c5acceaad0f08dcfd3d7cacfa9f42e4c8b335")
+    version("1.4.1", sha256="2e1e7d8e30953f76b6dc3a4c86ec8103d4b29447194cb5d5abb74b8e4099bdd9")
+    version("1.3.0", sha256="f711a840fd921e84660451ded408023ec3bcfc98fd0a7dc4a299bfae6ab489c2")
 
     depends_on("kokkos-kernels@3.3.01:3.6")
     depends_on("cmake@3.13:", type="build")
diff --git a/var/spack/repos/builtin/packages/cplex/package.py b/var/spack/repos/builtin/packages/cplex/package.py
index bab6143fd1..60d791d23f 100644
--- a/var/spack/repos/builtin/packages/cplex/package.py
+++ b/var/spack/repos/builtin/packages/cplex/package.py
@@ -21,10 +21,14 @@ class Cplex(Package):
     maintainers("robgics")
 
     version(
-        "12.10.0", "cd530eb9c6d446bd18b5dc5a3d61070bfad92c3efd6565d2d8e31a2acfb496f7", expand=False
+        "12.10.0",
+        sha256="cd530eb9c6d446bd18b5dc5a3d61070bfad92c3efd6565d2d8e31a2acfb496f7",
+        expand=False,
     )
     version(
-        "12.8.0", "ce8a597a11c73a0a3d49f3fa82930c47b6ac2adf7bc6779ad197ff0355023838", expand=False
+        "12.8.0",
+        sha256="ce8a597a11c73a0a3d49f3fa82930c47b6ac2adf7bc6779ad197ff0355023838",
+        expand=False,
     )
 
     phases = ["configure", "install"]
diff --git a/var/spack/repos/builtin/packages/cubist/package.py b/var/spack/repos/builtin/packages/cubist/package.py
index e05d13abe9..f058698b73 100644
--- a/var/spack/repos/builtin/packages/cubist/package.py
+++ b/var/spack/repos/builtin/packages/cubist/package.py
@@ -19,7 +19,7 @@ class Cubist(MakefilePackage):
     homepage = "https://www.rulequest.com"
     url = "https://www.rulequest.com/GPL/Cubist.tgz"
 
-    version("2.07", "f2b20807cd3275e775c42263a4efd3f50df6e495a8b6dc8989ea2d41b973ac1a")
+    version("2.07", sha256="f2b20807cd3275e775c42263a4efd3f50df6e495a8b6dc8989ea2d41b973ac1a")
 
     def edit(self, spec, prefix):
         makefile = FileFilter("Makefile")
diff --git a/var/spack/repos/builtin/packages/dftd4/package.py b/var/spack/repos/builtin/packages/dftd4/package.py
index ffa3f13e01..8fde62cc11 100644
--- a/var/spack/repos/builtin/packages/dftd4/package.py
+++ b/var/spack/repos/builtin/packages/dftd4/package.py
@@ -16,12 +16,12 @@ class Dftd4(MesonPackage):
     maintainers("awvwgk")
 
     version("main", branch="main")
-    version("3.5.0", "d2bab992b5ef999fd13fec8eb1da9e9e8d94b8727a2e624d176086197a00a46f")
-    version("3.4.0", "24fcb225cdd5c292ac26f7d3204ee3c4024174adb5272eeda9ae7bc57113ec8d")
-    version("3.3.0", "408720b8545532d5240dd743c05d57b140af983192dad6d965b0d79393d0a9ef")
-    version("3.2.0", "cef505e091469aa9b8f008ee1756545bb87b02760bb2c7ca54854e20ba8c590a")
-    version("3.1.0", "b652aa7cbf8d087c91bcf80f2d5801459ecf89c5d4176ebb39e963ee740ed54b")
-    version("3.0.0", "a7539d68d48d851bf37b79e37ea907c9da5eee908d0aa58a0a7dc15f04f8bc35")
+    version("3.5.0", sha256="d2bab992b5ef999fd13fec8eb1da9e9e8d94b8727a2e624d176086197a00a46f")
+    version("3.4.0", sha256="24fcb225cdd5c292ac26f7d3204ee3c4024174adb5272eeda9ae7bc57113ec8d")
+    version("3.3.0", sha256="408720b8545532d5240dd743c05d57b140af983192dad6d965b0d79393d0a9ef")
+    version("3.2.0", sha256="cef505e091469aa9b8f008ee1756545bb87b02760bb2c7ca54854e20ba8c590a")
+    version("3.1.0", sha256="b652aa7cbf8d087c91bcf80f2d5801459ecf89c5d4176ebb39e963ee740ed54b")
+    version("3.0.0", sha256="a7539d68d48d851bf37b79e37ea907c9da5eee908d0aa58a0a7dc15f04f8bc35")
 
     variant("openmp", default=True, description="Use OpenMP parallelisation")
     variant("python", default=False, description="Build Python extension module")
diff --git a/var/spack/repos/builtin/packages/epsic/package.py b/var/spack/repos/builtin/packages/epsic/package.py
index 636c51d87b..74284c631f 100644
--- a/var/spack/repos/builtin/packages/epsic/package.py
+++ b/var/spack/repos/builtin/packages/epsic/package.py
@@ -13,7 +13,7 @@ class Epsic(AutotoolsPackage):
     homepage = "https://github.com/straten/epsic"
     git = "https://github.com/straten/epsic.git"
 
-    version("develop", default=True)
+    version("develop")
 
     # Version to match
     # https://github.com/lwa-project/pulsar/blob/master/SoftwareStack.md
diff --git a/var/spack/repos/builtin/packages/fpm/package.py b/var/spack/repos/builtin/packages/fpm/package.py
index a262240c4e..9069d6652e 100644
--- a/var/spack/repos/builtin/packages/fpm/package.py
+++ b/var/spack/repos/builtin/packages/fpm/package.py
@@ -23,11 +23,11 @@ class Fpm(Package):
 
     maintainers("awvwgk")
 
-    version("0.7.0", "536dec7d4502221734683b15e6ff64a6ab3f9910df122d18f851c9a68711f91f")
-    version("0.6.0", "365516f66b116a112746af043e8eccb3d854d6feb1fad0507c570433dacbf7be")
-    version("0.5.0", "e4a06956d2300f9aa1d06bd3323670480e946549617582e32684ded6921a921e")
-    version("0.4.0", "cd9b80b7f40d9cf357ca8d5d4fe289fd32dfccb729bad7d2a68f245e4cdd0045")
-    version("0.3.0", "3368d1b17e2d1368559174c796ce0e184cb6bf79c939938c6d166fbd15959fa3")
+    version("0.7.0", sha256="536dec7d4502221734683b15e6ff64a6ab3f9910df122d18f851c9a68711f91f")
+    version("0.6.0", sha256="365516f66b116a112746af043e8eccb3d854d6feb1fad0507c570433dacbf7be")
+    version("0.5.0", sha256="e4a06956d2300f9aa1d06bd3323670480e946549617582e32684ded6921a921e")
+    version("0.4.0", sha256="cd9b80b7f40d9cf357ca8d5d4fe289fd32dfccb729bad7d2a68f245e4cdd0045")
+    version("0.3.0", sha256="3368d1b17e2d1368559174c796ce0e184cb6bf79c939938c6d166fbd15959fa3")
 
     variant("openmp", default=True, description="Use OpenMP parallelisation")
 
diff --git a/var/spack/repos/builtin/packages/gams/package.py b/var/spack/repos/builtin/packages/gams/package.py
index 0a09559fa1..d05c13820d 100644
--- a/var/spack/repos/builtin/packages/gams/package.py
+++ b/var/spack/repos/builtin/packages/gams/package.py
@@ -16,7 +16,7 @@ class Gams(Package):
     homepage = "https://www.gams.com/"
     manual_download = True
 
-    version("27.2", "4f3f3484a4389661e0522a4cfe0289fd", expand=False)
+    version("27.2", md5="4f3f3484a4389661e0522a4cfe0289fd", expand=False)
 
     def url_for_version(self, version):
         return "file://{0}/linux_x64_64_sfx.exe".format(os.getcwd())
diff --git a/var/spack/repos/builtin/packages/gapfiller/package.py b/var/spack/repos/builtin/packages/gapfiller/package.py
index 3c1ec8f66b..d6c8bad178 100644
--- a/var/spack/repos/builtin/packages/gapfiller/package.py
+++ b/var/spack/repos/builtin/packages/gapfiller/package.py
@@ -22,7 +22,7 @@ class Gapfiller(Package):
     homepage = "https://www.baseclear.com/genomics/bioinformatics/basetools/gapfiller"
     manual_download = True
 
-    version("1.10", "54d5e2ada131a1305a66e41c0d380382")
+    version("1.10", md5="54d5e2ada131a1305a66e41c0d380382")
 
     def url_for_version(self, version):
         return "file://{0}/39GapFiller_v{1}_linux-x86_64.tar.gz".format(
diff --git a/var/spack/repos/builtin/packages/gaussian-view/package.py b/var/spack/repos/builtin/packages/gaussian-view/package.py
index e4f872e7f0..dc4320c020 100644
--- a/var/spack/repos/builtin/packages/gaussian-view/package.py
+++ b/var/spack/repos/builtin/packages/gaussian-view/package.py
@@ -34,7 +34,7 @@ class GaussianView(Package):
 
     version(
         "6.0.16",
-        "5dd6a8df8c81763e43a308b3a18d2d3b825d3597e9628dcf43e563d1867b9638",
+        sha256="5dd6a8df8c81763e43a308b3a18d2d3b825d3597e9628dcf43e563d1867b9638",
         extension="tbz",
     )
 
diff --git a/var/spack/repos/builtin/packages/google-crc32c/package.py b/var/spack/repos/builtin/packages/google-crc32c/package.py
index d7fd05c366..a37b1d15b9 100644
--- a/var/spack/repos/builtin/packages/google-crc32c/package.py
+++ b/var/spack/repos/builtin/packages/google-crc32c/package.py
@@ -14,7 +14,7 @@ class GoogleCrc32c(CMakePackage):
 
     maintainers("marcusboden")
 
-    version("1.1.2", "ac07840513072b7fcebda6e821068aa04889018f24e10e46181068fb214d7e56")
+    version("1.1.2", sha256="ac07840513072b7fcebda6e821068aa04889018f24e10e46181068fb214d7e56")
 
     depends_on("cmake@3.1:", type="build")
 
diff --git a/var/spack/repos/builtin/packages/goshimmer/package.py b/var/spack/repos/builtin/packages/goshimmer/package.py
index ac1058b5c4..92304e9fd8 100644
--- a/var/spack/repos/builtin/packages/goshimmer/package.py
+++ b/var/spack/repos/builtin/packages/goshimmer/package.py
@@ -14,7 +14,7 @@ class Goshimmer(Package):
 
     maintainers("bernhardkaindl")
 
-    version("0.8.0", "ec515deebf0dd35ff76cd98addae9cfcbf4758ab9eb72eb0f6ff4654f2658980")
+    version("0.8.0", sha256="ec515deebf0dd35ff76cd98addae9cfcbf4758ab9eb72eb0f6ff4654f2658980")
 
     depends_on("go@1.16:", type="build")
     depends_on("snappy")
diff --git a/var/spack/repos/builtin/packages/gurobi/package.py b/var/spack/repos/builtin/packages/gurobi/package.py
index 48d7d1e7de..8a878f753b 100644
--- a/var/spack/repos/builtin/packages/gurobi/package.py
+++ b/var/spack/repos/builtin/packages/gurobi/package.py
@@ -29,7 +29,7 @@ class Gurobi(Package):
     version("9.5.2", sha256="95d8ca18b7f86116ba834a27fd6228c5b1708ae67927e7ea0e954c09374a2d0f")
     version("9.5.1", sha256="fa82859d33f08fb8aeb9da66b0fbd91718ed573c534f571aa52372c9deb891da")
     version("9.1.2", sha256="7f60bd675f79476bb2b32cd632aa1d470f8246f2b033b7652d8de86f6e7e429b")
-    version("7.5.2", "01f6dbb8d165838cca1664a1a14e4a85")
+    version("7.5.2", md5="01f6dbb8d165838cca1664a1a14e4a85")
 
     # Licensing
     license_required = True
diff --git a/var/spack/repos/builtin/packages/hal/package.py b/var/spack/repos/builtin/packages/hal/package.py
index 620adb7ee2..78d214df10 100644
--- a/var/spack/repos/builtin/packages/hal/package.py
+++ b/var/spack/repos/builtin/packages/hal/package.py
@@ -19,7 +19,7 @@ class Hal(MakefilePackage):
     homepage = "https://github.com/ComparativeGenomicsToolkit/hal"
     url = "https://github.com/ComparativeGenomicsToolkit/hal/archive/release-V2.1.tar.gz"
 
-    version("2.1", "540255be1af55abf390359fe034b82d7e61bdf6c3277df3cc01259cd450994e5")
+    version("2.1", sha256="540255be1af55abf390359fe034b82d7e61bdf6c3277df3cc01259cd450994e5")
 
     maintainers("ilbiondo")
 
diff --git a/var/spack/repos/builtin/packages/herwigpp/package.py b/var/spack/repos/builtin/packages/herwigpp/package.py
index 6c5db0978b..ff05945e61 100644
--- a/var/spack/repos/builtin/packages/herwigpp/package.py
+++ b/var/spack/repos/builtin/packages/herwigpp/package.py
@@ -16,7 +16,7 @@ class Herwigpp(AutotoolsPackage):
 
     tags = ["hep"]
 
-    version("2.7.1", "80a189376bb65f5ec4e64f42e76c00ea9102d8224010563a424fc11e619a6ad6")
+    version("2.7.1", sha256="80a189376bb65f5ec4e64f42e76c00ea9102d8224010563a424fc11e619a6ad6")
     patch("herwig++-2.7.1.patch", when="@2.7.1", level=0)
 
     depends_on("gsl")
diff --git a/var/spack/repos/builtin/packages/irep/package.py b/var/spack/repos/builtin/packages/irep/package.py
index 205507cd4f..b89df7fb90 100644
--- a/var/spack/repos/builtin/packages/irep/package.py
+++ b/var/spack/repos/builtin/packages/irep/package.py
@@ -16,6 +16,6 @@ class Irep(CMakePackage):
 
     maintainers("tomstitt", "kennyweiss")
 
-    version("1.0.0", "b84203ac92de824dbdc672de45cfdb9609373791c4ee84a5201fa6e4ccecc1a4")
+    version("1.0.0", sha256="b84203ac92de824dbdc672de45cfdb9609373791c4ee84a5201fa6e4ccecc1a4")
 
     depends_on("lua-lang")
diff --git a/var/spack/repos/builtin/packages/json-fortran/package.py b/var/spack/repos/builtin/packages/json-fortran/package.py
index ee8f538870..65557695fe 100644
--- a/var/spack/repos/builtin/packages/json-fortran/package.py
+++ b/var/spack/repos/builtin/packages/json-fortran/package.py
@@ -14,18 +14,18 @@ class JsonFortran(CMakePackage):
     git = "https://github.com/jacobwilliams"
 
     version("master", branch="master")
-    version("8.3.0", "5fe9ad709a726416cec986886503e0526419742e288c4e43f63c1c22026d1e8a")
-    version("8.2.5", "16eec827f64340c226ba9a8463f001901d469bc400a1e88b849f258f9ef0d100")
-    version("8.2.4", "7b4e0aecdb92705918f15e3094022325bb14c9ea620d7eba6a4facf9ef8f27f3")
-    version("8.2.3", "884ef4f955eecaf18d52e818738089ab3924981fb510ef3671ad3f62ac7c6af1")
-    version("8.2.2", "3228496c9a10aa01da7694196ec5cd8cd463099be734207dac93e2097ea5279d")
-    version("8.2.1", "428fb2e708cce3a29f9bbc84ce63f112a2eb44fd1b0d2a88d83c86583ca83ed4")
-    version("8.2.0", "df9986c4ecad996f3be3d6855397141e63721207fe90e1500ae0df587d46481f")
-    version("8.1.0", "4f4b3bf102d7e22327b0e4b8a3cadd8c3e453c969547ec21cd2429ed7d4c5404")
-    version("8.0.0", "2c9c62117a2548e2cddf55acf7b726b529c044ed0f1eefe14dc69910a54a7bfd")
-    version("7.1.0", "e7aa1f6e09b25ebacb17188147380c3f8c0a254754cd24869c001745fcecc9e6")
-    version("7.0.0", "9b5b6235489b27d572bbc7620ed8e039fa9d4d14d41b1581b279be9db499f32c")
-    version("6.11.0", "0ce38236a0debcd775108684b835f9f92ca9d6594da714c0025014fe9f03eec3")
+    version("8.3.0", sha256="5fe9ad709a726416cec986886503e0526419742e288c4e43f63c1c22026d1e8a")
+    version("8.2.5", sha256="16eec827f64340c226ba9a8463f001901d469bc400a1e88b849f258f9ef0d100")
+    version("8.2.4", sha256="7b4e0aecdb92705918f15e3094022325bb14c9ea620d7eba6a4facf9ef8f27f3")
+    version("8.2.3", sha256="884ef4f955eecaf18d52e818738089ab3924981fb510ef3671ad3f62ac7c6af1")
+    version("8.2.2", sha256="3228496c9a10aa01da7694196ec5cd8cd463099be734207dac93e2097ea5279d")
+    version("8.2.1", sha256="428fb2e708cce3a29f9bbc84ce63f112a2eb44fd1b0d2a88d83c86583ca83ed4")
+    version("8.2.0", sha256="df9986c4ecad996f3be3d6855397141e63721207fe90e1500ae0df587d46481f")
+    version("8.1.0", sha256="4f4b3bf102d7e22327b0e4b8a3cadd8c3e453c969547ec21cd2429ed7d4c5404")
+    version("8.0.0", sha256="2c9c62117a2548e2cddf55acf7b726b529c044ed0f1eefe14dc69910a54a7bfd")
+    version("7.1.0", sha256="e7aa1f6e09b25ebacb17188147380c3f8c0a254754cd24869c001745fcecc9e6")
+    version("7.0.0", sha256="9b5b6235489b27d572bbc7620ed8e039fa9d4d14d41b1581b279be9db499f32c")
+    version("6.11.0", sha256="0ce38236a0debcd775108684b835f9f92ca9d6594da714c0025014fe9f03eec3")
 
     depends_on("cmake@2.8.8:", type="build")
 
diff --git a/var/spack/repos/builtin/packages/libid3tag/package.py b/var/spack/repos/builtin/packages/libid3tag/package.py
index ca61a48e99..8da31bd278 100644
--- a/var/spack/repos/builtin/packages/libid3tag/package.py
+++ b/var/spack/repos/builtin/packages/libid3tag/package.py
@@ -15,7 +15,7 @@ class Libid3tag(AutotoolsPackage):
 
     maintainers("TheQueasle")
 
-    version("0.15.1b", "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151")
+    version("0.15.1b", sha256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151")
 
     depends_on("zlib")
     depends_on("gperf")
diff --git a/var/spack/repos/builtin/packages/libmicrohttpd/package.py b/var/spack/repos/builtin/packages/libmicrohttpd/package.py
index 0daa986c40..e1fbb9594d 100644
--- a/var/spack/repos/builtin/packages/libmicrohttpd/package.py
+++ b/var/spack/repos/builtin/packages/libmicrohttpd/package.py
@@ -16,8 +16,8 @@ class Libmicrohttpd(AutotoolsPackage):
 
     maintainers("hainest")
 
-    version("0.9.71", "e8f445e85faf727b89e9f9590daea4473ae00ead38b237cf1eda55172b89b182")
-    version("0.9.70", "90d0a3d396f96f9bc41eb0f7e8187796049285fabef82604acd4879590977307")
+    version("0.9.71", sha256="e8f445e85faf727b89e9f9590daea4473ae00ead38b237cf1eda55172b89b182")
+    version("0.9.70", sha256="90d0a3d396f96f9bc41eb0f7e8187796049285fabef82604acd4879590977307")
 
     variant("https", default=False, description="HTTPS support with GnuTLS")
 
diff --git a/var/spack/repos/builtin/packages/librdkafka/package.py b/var/spack/repos/builtin/packages/librdkafka/package.py
index 67bdc993b9..ce9c2bed6c 100644
--- a/var/spack/repos/builtin/packages/librdkafka/package.py
+++ b/var/spack/repos/builtin/packages/librdkafka/package.py
@@ -13,9 +13,9 @@ class Librdkafka(AutotoolsPackage):
     homepage = "https://github.com/edenhill/librdkafka"
     url = "https://github.com/edenhill/librdkafka/archive/v1.5.0.tar.gz"
 
-    version("1.5.0", "f7fee59fdbf1286ec23ef0b35b2dfb41031c8727c90ced6435b8cf576f23a656")
-    version("1.4.4", "0984ffbe17b9e04599fb9eceb16cfa189f525a042bef02474cd1bbfe1ea68416")
-    version("1.4.2", "3b99a36c082a67ef6295eabd4fb3e32ab0bff7c6b0d397d6352697335f4e57eb")
+    version("1.5.0", sha256="f7fee59fdbf1286ec23ef0b35b2dfb41031c8727c90ced6435b8cf576f23a656")
+    version("1.4.4", sha256="0984ffbe17b9e04599fb9eceb16cfa189f525a042bef02474cd1bbfe1ea68416")
+    version("1.4.2", sha256="3b99a36c082a67ef6295eabd4fb3e32ab0bff7c6b0d397d6352697335f4e57eb")
 
     depends_on("zstd")
     depends_on("lz4")
diff --git a/var/spack/repos/builtin/packages/librsb/package.py b/var/spack/repos/builtin/packages/librsb/package.py
index 6d71ff3d13..bf42228fd0 100644
--- a/var/spack/repos/builtin/packages/librsb/package.py
+++ b/var/spack/repos/builtin/packages/librsb/package.py
@@ -14,12 +14,12 @@ class Librsb(AutotoolsPackage):
     url = "http://download.sourceforge.net/librsb/librsb-1.3.0.1.tar.gz"
     list_url = "https://sourceforge.net/projects/librsb/files/"
 
-    version("1.3.0.1", "3fc024a410f94aca2a7139ae79f4d713b11fa83304293630c363786874c17db4")
-    version("1.3.0.0", "2ac8725d1f988f57df9383ae6b0bb2ed221ec935187d31ebb62ea95ee868a790")
-    version("1.2.0.11", "0686be29bbe277e227c6021de6bd0564e4fc83f996b787886437d28048057bc8")
-    version("1.2.0.10", "ec49f3f78a7c43fc9e10976593d100aa49b1863309ed8fa3ccbb7aad52d2f7b8")
-    version("1.2.0.9", "f421f5d572461601120933e3c1cfee2ca69e6ecc92cbb11baa4e86bdedd3d9fa")
-    version("1.2.0.8", "8bebd19a1866d80ade13eabfdd0f07ae7e8a485c0b975b5d15f531ac204d80cb")
+    version("1.3.0.1", sha256="3fc024a410f94aca2a7139ae79f4d713b11fa83304293630c363786874c17db4")
+    version("1.3.0.0", sha256="2ac8725d1f988f57df9383ae6b0bb2ed221ec935187d31ebb62ea95ee868a790")
+    version("1.2.0.11", sha256="0686be29bbe277e227c6021de6bd0564e4fc83f996b787886437d28048057bc8")
+    version("1.2.0.10", sha256="ec49f3f78a7c43fc9e10976593d100aa49b1863309ed8fa3ccbb7aad52d2f7b8")
+    version("1.2.0.9", sha256="f421f5d572461601120933e3c1cfee2ca69e6ecc92cbb11baa4e86bdedd3d9fa")
+    version("1.2.0.8", sha256="8bebd19a1866d80ade13eabfdd0f07ae7e8a485c0b975b5d15f531ac204d80cb")
 
     depends_on("zlib")
     depends_on("googletest", type="build", when="+googletest")
diff --git a/var/spack/repos/builtin/packages/libtomlc99/package.py b/var/spack/repos/builtin/packages/libtomlc99/package.py
index ecbf471b4c..b62e2bb272 100644
--- a/var/spack/repos/builtin/packages/libtomlc99/package.py
+++ b/var/spack/repos/builtin/packages/libtomlc99/package.py
@@ -21,7 +21,6 @@ class Libtomlc99(Package):
     version(
         "0.2019.05.02",
         commit="35118431263dec2a2a7b55e4dd717a5f54992e3e",
-        sha256sum="f131679131c1fcb012004a3334abb2b77a329490549c4d68455ba4ec55af9b10",
         git="https://github.com/obreitwi/tomlc99.git",
     )
     # Does not build shared libraries.
diff --git a/var/spack/repos/builtin/packages/mctc-lib/package.py b/var/spack/repos/builtin/packages/mctc-lib/package.py
index b9d4ba5301..fb086b258d 100644
--- a/var/spack/repos/builtin/packages/mctc-lib/package.py
+++ b/var/spack/repos/builtin/packages/mctc-lib/package.py
@@ -16,8 +16,8 @@ class MctcLib(MesonPackage):
     maintainers("awvwgk")
 
     version("main", branch="main")
-    version("0.3.1", "a5032a0bbbbacc952037c5215b71aa6b438767a84bafb60fda25ba43c8835513")
-    version("0.3.0", "81f3edbf322e6e28e621730a796278498b84af0f221f785c537a315312059bf0")
+    version("0.3.1", sha256="a5032a0bbbbacc952037c5215b71aa6b438767a84bafb60fda25ba43c8835513")
+    version("0.3.0", sha256="81f3edbf322e6e28e621730a796278498b84af0f221f785c537a315312059bf0")
 
     variant("json", default=False, description="Enable support for JSON")
 
diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py
index 3b07954872..24cf733d61 100644
--- a/var/spack/repos/builtin/packages/mfem/package.py
+++ b/var/spack/repos/builtin/packages/mfem/package.py
@@ -78,14 +78,14 @@ class Mfem(Package, CudaPackage, ROCmPackage):
 
     version(
         "4.2.0",
-        "4352a225b55948d2e73a5ee88cece0e88bdbe7ba6726a23d68b2736d3221a86d",
+        sha256="4352a225b55948d2e73a5ee88cece0e88bdbe7ba6726a23d68b2736d3221a86d",
         url="https://bit.ly/mfem-4-2",
         extension="tar.gz",
     )
 
     version(
         "4.1.0",
-        "4c83fdcf083f8e2f5b37200a755db843cdb858811e25a8486ad36b2cbec0e11d",
+        sha256="4c83fdcf083f8e2f5b37200a755db843cdb858811e25a8486ad36b2cbec0e11d",
         url="https://bit.ly/mfem-4-1",
         extension="tar.gz",
     )
@@ -95,7 +95,7 @@ class Mfem(Package, CudaPackage, ROCmPackage):
 
     version(
         "4.0.0",
-        "df5bdac798ea84a263979f6fbf79de9013e1c55562f95f98644c3edcacfbc727",
+        sha256="df5bdac798ea84a263979f6fbf79de9013e1c55562f95f98644c3edcacfbc727",
         url="https://bit.ly/mfem-4-0",
         extension="tar.gz",
     )
diff --git a/var/spack/repos/builtin/packages/mindthegap/package.py b/var/spack/repos/builtin/packages/mindthegap/package.py
index 7d49b04e1b..ad58c443ea 100644
--- a/var/spack/repos/builtin/packages/mindthegap/package.py
+++ b/var/spack/repos/builtin/packages/mindthegap/package.py
@@ -14,6 +14,6 @@ class Mindthegap(CMakePackage):
     homepage = "https://gatb.inria.fr/software/mind-the-gap/"
     git = "https://github.com/GATB/MindTheGap.git"
 
-    version("2.0.2", tags="v2.0.2", submodules=True)
+    version("2.0.2", tag="v2.0.2", submodules=True)
 
     depends_on("zlib")
diff --git a/var/spack/repos/builtin/packages/modylas/package.py b/var/spack/repos/builtin/packages/modylas/package.py
index a6a61252d7..dcc142ce95 100644
--- a/var/spack/repos/builtin/packages/modylas/package.py
+++ b/var/spack/repos/builtin/packages/modylas/package.py
@@ -20,7 +20,7 @@ class Modylas(AutotoolsPackage):
     url = "file://{0}/MODYLAS_1.0.4.tar.gz".format(os.getcwd())
     manual_download = True
 
-    version("1.0.4", "e0b5cccf8e363c1182eced37aa31b06b1c5b1526da7d449a6142424ac4ea6311")
+    version("1.0.4", sha256="e0b5cccf8e363c1182eced37aa31b06b1c5b1526da7d449a6142424ac4ea6311")
 
     variant("mpi", default=True, description="Enable MPI support")
 
diff --git a/var/spack/repos/builtin/packages/molcas/package.py b/var/spack/repos/builtin/packages/molcas/package.py
index c0ffa01c6d..175fccf5bf 100644
--- a/var/spack/repos/builtin/packages/molcas/package.py
+++ b/var/spack/repos/builtin/packages/molcas/package.py
@@ -18,7 +18,7 @@ class Molcas(CMakePackage):
     url = "file://{0}/molcas8.2.tar.gz".format(os.getcwd())
     manual_download = True
 
-    version("8.2", "25b5fb8e1338b458a3eaea0b3d3b5e58")
+    version("8.2", md5="25b5fb8e1338b458a3eaea0b3d3b5e58")
 
     # Licensing
     license_required = True
diff --git a/var/spack/repos/builtin/packages/motioncor2/package.py b/var/spack/repos/builtin/packages/motioncor2/package.py
index f6343c3315..03d987be43 100644
--- a/var/spack/repos/builtin/packages/motioncor2/package.py
+++ b/var/spack/repos/builtin/packages/motioncor2/package.py
@@ -25,18 +25,18 @@ class Motioncor2(Package):
     # None of the below are available for download
     version(
         "1.1.0",
-        "6e37e7ed63a9f0aab5d794b2604d5ba79333960bb9440a1a218630b03dbeaeac",
+        sha256="6e37e7ed63a9f0aab5d794b2604d5ba79333960bb9440a1a218630b03dbeaeac",
         deprecated=True,
     )
     version(
         "1.0.5",
-        "4efa55af25644bcff1ca7882419267b8c094c9cc6155b37d2c204b154c56f5a8",
+        sha256="4efa55af25644bcff1ca7882419267b8c094c9cc6155b37d2c204b154c56f5a8",
         url="http://msg.ucsf.edu/MotionCor2/MotionCor2-1.0.5.tar.gz",
         deprecated=True,
     )
     version(
         "1.0.4",
-        "c75738160ac18d3f27c33677e78e63313d8ec2b023b5a46173428c3fa0451a94",
+        sha256="c75738160ac18d3f27c33677e78e63313d8ec2b023b5a46173428c3fa0451a94",
         url="http://msg.ucsf.edu/MotionCor2/MotionCor2-1.0.4.tar.gz",
         deprecated=True,
     )
diff --git a/var/spack/repos/builtin/packages/mvapich/package.py b/var/spack/repos/builtin/packages/mvapich/package.py
index 3bcb3707d7..acf1dc3459 100644
--- a/var/spack/repos/builtin/packages/mvapich/package.py
+++ b/var/spack/repos/builtin/packages/mvapich/package.py
@@ -25,7 +25,7 @@ class Mvapich(AutotoolsPackage):
     executables = ["^mpiname$", "^mpichversion$"]
 
     # Prefer the latest stable release
-    version("3.0a", "71f6593bfbfe9a9f6f5c750904461f007bf74bec479544e4da375b7d4a56b2ac")
+    version("3.0a", sha256="71f6593bfbfe9a9f6f5c750904461f007bf74bec479544e4da375b7d4a56b2ac")
 
     provides("mpi")
     provides("mpi@:3.1")
diff --git a/var/spack/repos/builtin/packages/namd/package.py b/var/spack/repos/builtin/packages/namd/package.py
index c07c99a159..5fd5cd2430 100644
--- a/var/spack/repos/builtin/packages/namd/package.py
+++ b/var/spack/repos/builtin/packages/namd/package.py
@@ -32,8 +32,8 @@ class Namd(MakefilePackage, CudaPackage):
         sha256="34044d85d9b4ae61650ccdba5cda4794088c3a9075932392dd0752ef8c049235",
         preferred=True,
     )
-    version("2.13", "9e3323ed856e36e34d5c17a7b0341e38")
-    version("2.12", "2a1191909b1ab03bf0205971ad4d8ee9")
+    version("2.13", md5="9e3323ed856e36e34d5c17a7b0341e38")
+    version("2.12", md5="2a1191909b1ab03bf0205971ad4d8ee9")
 
     variant(
         "fftw",
diff --git a/var/spack/repos/builtin/packages/ncbi-vdb/package.py b/var/spack/repos/builtin/packages/ncbi-vdb/package.py
index 93c5542c27..e83ef97354 100644
--- a/var/spack/repos/builtin/packages/ncbi-vdb/package.py
+++ b/var/spack/repos/builtin/packages/ncbi-vdb/package.py
@@ -14,7 +14,7 @@ class NcbiVdb(CMakePackage):
     homepage = "https://github.com/ncbi/ncbi-vdb"
     git = "https://github.com/ncbi/ncbi-vdb.git"
 
-    version("3.0.0", tags="3.0.0")
+    version("3.0.0", tag="3.0.0")
 
     depends_on("openjdk")
     depends_on("flex@2.6:")
diff --git a/var/spack/repos/builtin/packages/nek5000/package.py b/var/spack/repos/builtin/packages/nek5000/package.py
index 9a2df44340..7d5284a516 100644
--- a/var/spack/repos/builtin/packages/nek5000/package.py
+++ b/var/spack/repos/builtin/packages/nek5000/package.py
@@ -30,8 +30,8 @@ class Nek5000(Package):
     ]
 
     version("develop", branch="master")
-    version("17.0", "4d8d4793ce3c926c54e09a5a5968fa959fe0ba46bd2e6b8043e099528ee35a60")
-    version("19.0", "db129877a10ff568d49edc77cf65f9e732eecb1fce10edbd91ffc5ac10c41ad6")
+    version("17.0", sha256="4d8d4793ce3c926c54e09a5a5968fa959fe0ba46bd2e6b8043e099528ee35a60")
+    version("19.0", sha256="db129877a10ff568d49edc77cf65f9e732eecb1fce10edbd91ffc5ac10c41ad6")
 
     # MPI, Profiling and Visit variants
     variant("mpi", default=True, description="Build with MPI.")
diff --git a/var/spack/repos/builtin/packages/nekbone/package.py b/var/spack/repos/builtin/packages/nekbone/package.py
index 984627e6e8..c0e09cbd4c 100644
--- a/var/spack/repos/builtin/packages/nekbone/package.py
+++ b/var/spack/repos/builtin/packages/nekbone/package.py
@@ -20,7 +20,7 @@ class Nekbone(Package):
     version("develop", branch="master")
     version(
         "17.0",
-        "ae361cc61368a924398a28a296f675b7f0c4a9516788a7f8fa3c09d787cdf69b",
+        sha256="ae361cc61368a924398a28a296f675b7f0c4a9516788a7f8fa3c09d787cdf69b",
         url="https://github.com/Nek5000/Nekbone/archive/v17.0.tar.gz",
         extension=".tar.gz",
     )
diff --git a/var/spack/repos/builtin/packages/nektools/package.py b/var/spack/repos/builtin/packages/nektools/package.py
index 6ac656a981..a1ecb8d6be 100644
--- a/var/spack/repos/builtin/packages/nektools/package.py
+++ b/var/spack/repos/builtin/packages/nektools/package.py
@@ -37,8 +37,8 @@ class Nektools(Package):
     ]
 
     version("develop", branch="master")
-    version("19.0", "db129877a10ff568d49edc77cf65f9e732eecb1fce10edbd91ffc5ac10c41ad6")
-    version("17.0", "4d8d4793ce3c926c54e09a5a5968fa959fe0ba46bd2e6b8043e099528ee35a60")
+    version("19.0", sha256="db129877a10ff568d49edc77cf65f9e732eecb1fce10edbd91ffc5ac10c41ad6")
+    version("17.0", sha256="4d8d4793ce3c926c54e09a5a5968fa959fe0ba46bd2e6b8043e099528ee35a60")
 
     # Variant for MAXNEL, we need to read this from user
     variant(
diff --git a/var/spack/repos/builtin/packages/nlopt/package.py b/var/spack/repos/builtin/packages/nlopt/package.py
index fbf94a2f67..1a23dea361 100644
--- a/var/spack/repos/builtin/packages/nlopt/package.py
+++ b/var/spack/repos/builtin/packages/nlopt/package.py
@@ -18,11 +18,11 @@ class Nlopt(CMakePackage):
 
     version("master", branch="master")
 
-    version("2.7.0", "b881cc2a5face5139f1c5a30caf26b7d3cb43d69d5e423c9d78392f99844499f")
-    version("2.6.2", "cfa5981736dd60d0109c534984c4e13c615314d3584cf1c392a155bfe1a3b17e")
-    version("2.6.1", "66d63a505187fb6f98642703bd0ef006fedcae2f9a6d1efa4f362ea919a02650")
-    version("2.6.0", "a13077cdf5f5f1127eaaac0bf1e06744bfe98d8a4a3430a15e0af50a69f451ab")
-    version("2.5.0", "c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae")
+    version("2.7.0", sha256="b881cc2a5face5139f1c5a30caf26b7d3cb43d69d5e423c9d78392f99844499f")
+    version("2.6.2", sha256="cfa5981736dd60d0109c534984c4e13c615314d3584cf1c392a155bfe1a3b17e")
+    version("2.6.1", sha256="66d63a505187fb6f98642703bd0ef006fedcae2f9a6d1efa4f362ea919a02650")
+    version("2.6.0", sha256="a13077cdf5f5f1127eaaac0bf1e06744bfe98d8a4a3430a15e0af50a69f451ab")
+    version("2.5.0", sha256="c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae")
 
     variant("shared", default=True, description="Enables the build of shared libraries")
     variant("python", default=True, description="Build python wrappers")
diff --git a/var/spack/repos/builtin/packages/octa/package.py b/var/spack/repos/builtin/packages/octa/package.py
index b10fde11bc..4df8138729 100644
--- a/var/spack/repos/builtin/packages/octa/package.py
+++ b/var/spack/repos/builtin/packages/octa/package.py
@@ -16,7 +16,7 @@ class Octa(AutotoolsPackage):
 
     version(
         "8.4",
-        "b76d25f333fef76601bfe8262e9a748154280d5408ea823fa6530a6f3f86b51b",
+        sha256="b76d25f333fef76601bfe8262e9a748154280d5408ea823fa6530a6f3f86b51b",
         extension="tar.gz",
     )
 
diff --git a/var/spack/repos/builtin/packages/openvdb/package.py b/var/spack/repos/builtin/packages/openvdb/package.py
index 2f3a433eb6..aabd5f5c5e 100644
--- a/var/spack/repos/builtin/packages/openvdb/package.py
+++ b/var/spack/repos/builtin/packages/openvdb/package.py
@@ -21,11 +21,11 @@ class Openvdb(CMakePackage):
     maintainers("eloop")
 
     version("develop", branch="develop")
-    version("10.0.0", "6d4f6b5ccd0f9d35a4886d9a51a98c97fa314f75bf9737c5121e91b706e2db70")
-    version("9.1.0", "914ee417b4607c75c95b53bc73a0599de4157c7d6a32e849e80f24e40fb64181")
-    version("8.2.0", "d2e77a0720db79e9c44830423bdb013c24a1cf50994dd61d570b6e0c3e0be699")
-    version("8.0.1", "a6845da7c604d2c72e4141c898930ac8a2375521e535f696c2cd92bebbe43c4f")
-    version("7.1.0", "0c3588c1ca6e647610738654ec2c6aaf41a203fd797f609fbeab1c9f7c3dc116")
+    version("10.0.0", sha256="6d4f6b5ccd0f9d35a4886d9a51a98c97fa314f75bf9737c5121e91b706e2db70")
+    version("9.1.0", sha256="914ee417b4607c75c95b53bc73a0599de4157c7d6a32e849e80f24e40fb64181")
+    version("8.2.0", sha256="d2e77a0720db79e9c44830423bdb013c24a1cf50994dd61d570b6e0c3e0be699")
+    version("8.0.1", sha256="a6845da7c604d2c72e4141c898930ac8a2375521e535f696c2cd92bebbe43c4f")
+    version("7.1.0", sha256="0c3588c1ca6e647610738654ec2c6aaf41a203fd797f609fbeab1c9f7c3dc116")
 
     # these variants were for 8.0.1 and probably could be updated...
     variant("shared", default=True, description="Build as a shared library.")
diff --git a/var/spack/repos/builtin/packages/ovito/package.py b/var/spack/repos/builtin/packages/ovito/package.py
index cabb104ca6..9f8f24ca87 100755
--- a/var/spack/repos/builtin/packages/ovito/package.py
+++ b/var/spack/repos/builtin/packages/ovito/package.py
@@ -17,7 +17,7 @@ class Ovito(Package):
     homepage = "https://www.ovito.org"
     url = "https://www.ovito.org/download/master/ovito-basic-3.6.0-x86_64.tar.xz"
 
-    version("3.6.0", "6ac43a3a39b1ec3cccab577602756a8b7010cc1f1f046c4f6a939590d12f0339")
+    version("3.6.0", sha256="6ac43a3a39b1ec3cccab577602756a8b7010cc1f1f046c4f6a939590d12f0339")
 
     def install(self, spec, prefix):
         # Once we've unpacked the tarball, copy it's contents to the prefix
diff --git a/var/spack/repos/builtin/packages/pastix/package.py b/var/spack/repos/builtin/packages/pastix/package.py
index 4e157fb7a1..871e7cb61e 100644
--- a/var/spack/repos/builtin/packages/pastix/package.py
+++ b/var/spack/repos/builtin/packages/pastix/package.py
@@ -17,8 +17,8 @@ class Pastix(CMakePackage, CudaPackage):
     maintainers("fpruvost", "mfaverge", "ramet")
 
     version("master", branch="master", submodules=True)
-    version("6.2.2", "cce9a1fe4678b5733c9f1a5a52f77b040eadc3e254418c6fb03d8ab37dede508")
-    version("6.2.1", "b680cbfc265df8cba18d3a7093fcc02e260198c4a2d6a86d1e684bb291e309dd")
+    version("6.2.2", sha256="cce9a1fe4678b5733c9f1a5a52f77b040eadc3e254418c6fb03d8ab37dede508")
+    version("6.2.1", sha256="b680cbfc265df8cba18d3a7093fcc02e260198c4a2d6a86d1e684bb291e309dd")
 
     # cmake's specific
     variant("shared", default=True, description="Build Pastix as a shared library")
diff --git a/var/spack/repos/builtin/packages/py-altgraph/package.py b/var/spack/repos/builtin/packages/py-altgraph/package.py
index b5e279f351..682a89878c 100644
--- a/var/spack/repos/builtin/packages/py-altgraph/package.py
+++ b/var/spack/repos/builtin/packages/py-altgraph/package.py
@@ -15,6 +15,6 @@ class PyAltgraph(PythonPackage):
 
     pypi = "altgraph/altgraph-0.16.1.tar.gz"
 
-    version("0.16.1", "ddf5320017147ba7b810198e0b6619bd7b5563aa034da388cea8546b877f9b0c")
+    version("0.16.1", sha256="ddf5320017147ba7b810198e0b6619bd7b5563aa034da388cea8546b877f9b0c")
 
     depends_on("py-setuptools", type="build")
diff --git a/var/spack/repos/builtin/packages/py-connectionpool/package.py b/var/spack/repos/builtin/packages/py-connectionpool/package.py
index b5a358ba50..6704cca3a5 100644
--- a/var/spack/repos/builtin/packages/py-connectionpool/package.py
+++ b/var/spack/repos/builtin/packages/py-connectionpool/package.py
@@ -13,7 +13,7 @@ class PyConnectionpool(PythonPackage):
     pypi = "connection_pool/connection_pool-0.0.3.tar.gz"
     maintainers("marcusboden")
 
-    version("0.0.3", "bf429e7aef65921c69b4ed48f3d48d3eac1383b05d2df91884705842d974d0dc")
+    version("0.0.3", sha256="bf429e7aef65921c69b4ed48f3d48d3eac1383b05d2df91884705842d974d0dc")
 
     depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
diff --git a/var/spack/repos/builtin/packages/py-datrie/package.py b/var/spack/repos/builtin/packages/py-datrie/package.py
index 6256b21c37..9089618919 100644
--- a/var/spack/repos/builtin/packages/py-datrie/package.py
+++ b/var/spack/repos/builtin/packages/py-datrie/package.py
@@ -12,7 +12,7 @@ class PyDatrie(PythonPackage):
     pypi = "datrie/datrie-0.8.2.tar.gz"
     maintainers("marcusboden")
 
-    version("0.8.2", "525b08f638d5cf6115df6ccd818e5a01298cd230b2dac91c8ff2e6499d18765d")
+    version("0.8.2", sha256="525b08f638d5cf6115df6ccd818e5a01298cd230b2dac91c8ff2e6499d18765d")
 
     depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
     depends_on("py-setuptools@40.8:", type=("build"))
diff --git a/var/spack/repos/builtin/packages/py-fits-tools/package.py b/var/spack/repos/builtin/packages/py-fits-tools/package.py
index f34e5c7c8e..7d95b1fdb8 100644
--- a/var/spack/repos/builtin/packages/py-fits-tools/package.py
+++ b/var/spack/repos/builtin/packages/py-fits-tools/package.py
@@ -22,7 +22,7 @@ class PyFitsTools(PythonPackage):
     version(
         "0.2",
         sha256="04c4b6eeb09298bca79b228175fcd209d4ca895ce5675f6684120e75928d2d97",
-        default=True,
+        preferred=True,
     )
     version("0.1", sha256="d128e49ff4ecc6a9bf9a050f8605bc457e028e10e48bb8d6fda4ca358298ec17")
 
diff --git a/var/spack/repos/builtin/packages/py-google-crc32c/package.py b/var/spack/repos/builtin/packages/py-google-crc32c/package.py
index e8cd72346c..0ae4b383bb 100644
--- a/var/spack/repos/builtin/packages/py-google-crc32c/package.py
+++ b/var/spack/repos/builtin/packages/py-google-crc32c/package.py
@@ -15,7 +15,7 @@ class PyGoogleCrc32c(PythonPackage):
 
     maintainers("marcusboden")
 
-    version("1.3.0", "276de6273eb074a35bc598f8efbc00c7869c5cf2e29c90748fccc8c898c244df")
+    version("1.3.0", sha256="276de6273eb074a35bc598f8efbc00c7869c5cf2e29c90748fccc8c898c244df")
 
     depends_on("py-setuptools", type="build")
     depends_on("google-crc32c", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-macholib/package.py b/var/spack/repos/builtin/packages/py-macholib/package.py
index 996adac8a9..a1e9cfcaf5 100644
--- a/var/spack/repos/builtin/packages/py-macholib/package.py
+++ b/var/spack/repos/builtin/packages/py-macholib/package.py
@@ -11,8 +11,8 @@ class PyMacholib(PythonPackage):
 
     pypi = "macholib/macholib-1.11.tar.gz"
 
-    version("1.16", "001bf281279b986a66d7821790d734e61150d52f40c080899df8fefae056e9f7")
-    version("1.11", "c4180ffc6f909bf8db6cd81cff4b6f601d575568f4d5dee148c830e9851eb9db")
+    version("1.16", sha256="001bf281279b986a66d7821790d734e61150d52f40c080899df8fefae056e9f7")
+    version("1.11", sha256="c4180ffc6f909bf8db6cd81cff4b6f601d575568f4d5dee148c830e9851eb9db")
 
     depends_on("py-setuptools", type=("build", "run"))
     depends_on("py-altgraph@0.15:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-mapbox-earcut/package.py b/var/spack/repos/builtin/packages/py-mapbox-earcut/package.py
index 3540a1d250..7deaa836fe 100644
--- a/var/spack/repos/builtin/packages/py-mapbox-earcut/package.py
+++ b/var/spack/repos/builtin/packages/py-mapbox-earcut/package.py
@@ -14,7 +14,7 @@ class PyMapboxEarcut(PythonPackage):
     pypi = "mapbox-earcut/mapbox_earcut-1.0.1.tar.gz"
     git = "https://github.com/skogler/mapbox_earcut_python"
 
-    version("1.0.1", "9f155e429a22e27387cfd7a6372c3a3865aafa609ad725e2c4465257f154a438")
+    version("1.0.1", sha256="9f155e429a22e27387cfd7a6372c3a3865aafa609ad725e2c4465257f154a438")
 
     depends_on("py-setuptools@42:", type="build")
     depends_on("py-pybind11@2.6:2", type="build")
diff --git a/var/spack/repos/builtin/packages/py-pulp/package.py b/var/spack/repos/builtin/packages/py-pulp/package.py
index 49382d6592..bc80b0a22d 100644
--- a/var/spack/repos/builtin/packages/py-pulp/package.py
+++ b/var/spack/repos/builtin/packages/py-pulp/package.py
@@ -16,7 +16,7 @@ class PyPulp(PythonPackage):
 
     maintainers("marcusboden")
 
-    version("2.6.0", "4b4f7e1e954453e1b233720be23aea2f10ff068a835ac10c090a93d8e2eb2e8d")
+    version("2.6.0", sha256="4b4f7e1e954453e1b233720be23aea2f10ff068a835ac10c090a93d8e2eb2e8d")
 
     depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
diff --git a/var/spack/repos/builtin/packages/py-pycollada/package.py b/var/spack/repos/builtin/packages/py-pycollada/package.py
index 54390bbae0..fdf0f82c48 100644
--- a/var/spack/repos/builtin/packages/py-pycollada/package.py
+++ b/var/spack/repos/builtin/packages/py-pycollada/package.py
@@ -13,7 +13,7 @@ class PyPycollada(PythonPackage):
     pypi = "pycollada/pycollada-0.7.2.tar.gz"
     git = "https://github.com/pycollada/pycollada"
 
-    version("0.7.2", "70a2630ed499bdab718c0e61a3e6ae3698130d7e4654e89cdecde51bfdaea56f")
+    version("0.7.2", sha256="70a2630ed499bdab718c0e61a3e6ae3698130d7e4654e89cdecde51bfdaea56f")
 
     depends_on("py-setuptools", type="build")
     depends_on("py-numpy", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-pytaridx/package.py b/var/spack/repos/builtin/packages/py-pytaridx/package.py
index c7f55c20e3..032b919408 100644
--- a/var/spack/repos/builtin/packages/py-pytaridx/package.py
+++ b/var/spack/repos/builtin/packages/py-pytaridx/package.py
@@ -17,7 +17,7 @@ class PyPytaridx(PythonPackage):
 
     maintainers("bhatiaharsh")
 
-    version("1.0.2", sha26="702c42ade13ae8688a56a8edfcd7e0e7512a489a22796c6cfdbcef677010ee47")
+    version("1.0.2", sha256="702c42ade13ae8688a56a8edfcd7e0e7512a489a22796c6cfdbcef677010ee47")
     version("master", branch="master")
 
     depends_on("python@3:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-ratelimiter/package.py b/var/spack/repos/builtin/packages/py-ratelimiter/package.py
index 6f83e0613b..80baf906b5 100644
--- a/var/spack/repos/builtin/packages/py-ratelimiter/package.py
+++ b/var/spack/repos/builtin/packages/py-ratelimiter/package.py
@@ -14,6 +14,8 @@ class PyRatelimiter(PythonPackage):
 
     maintainers("marcusboden")
 
-    version("1.2.0.post0", "5c395dcabdbbde2e5178ef3f89b568a3066454a6ddc223b76473dac22f89b4f7")
+    version(
+        "1.2.0.post0", sha256="5c395dcabdbbde2e5178ef3f89b568a3066454a6ddc223b76473dac22f89b4f7"
+    )
 
     depends_on("py-setuptools", type="build")
diff --git a/var/spack/repos/builtin/packages/py-scine-chemoton/package.py b/var/spack/repos/builtin/packages/py-scine-chemoton/package.py
index 1a8e0cc264..990611031b 100644
--- a/var/spack/repos/builtin/packages/py-scine-chemoton/package.py
+++ b/var/spack/repos/builtin/packages/py-scine-chemoton/package.py
@@ -14,7 +14,7 @@ class PyScineChemoton(PythonPackage):
     git = "https://github.com/qcscine/puffin.git"
 
     version("master", branch="master")
-    version("2.2.0", "cda4f9de1e1c00ecc5e0b2d9c17a5edb56b468d454022e3f4045ec116ba2ec45")
+    version("2.2.0", sha256="cda4f9de1e1c00ecc5e0b2d9c17a5edb56b468d454022e3f4045ec116ba2ec45")
 
     depends_on("python@3.6:", type=("build", "run"))
     depends_on("py-networkx", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-scine-puffin/package.py b/var/spack/repos/builtin/packages/py-scine-puffin/package.py
index fd8c504d57..2381847185 100644
--- a/var/spack/repos/builtin/packages/py-scine-puffin/package.py
+++ b/var/spack/repos/builtin/packages/py-scine-puffin/package.py
@@ -14,7 +14,7 @@ class PyScinePuffin(PythonPackage):
     git = "https://github.com/qcscine/puffin.git"
 
     version("master", branch="master")
-    version("1.1.0", "1a15232b1b472c36349e5534e4fdf9dd90bc554926cb42fba37eee8e60be8c44")
+    version("1.1.0", sha256="1a15232b1b472c36349e5534e4fdf9dd90bc554926cb42fba37eee8e60be8c44")
 
     depends_on("python@3.6:", type=("build", "run"))
     depends_on("py-gitpython", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-thirdorder/package.py b/var/spack/repos/builtin/packages/py-thirdorder/package.py
index f1770964ef..9c2e07ab67 100644
--- a/var/spack/repos/builtin/packages/py-thirdorder/package.py
+++ b/var/spack/repos/builtin/packages/py-thirdorder/package.py
@@ -15,7 +15,7 @@ class PyThirdorder(PythonPackage):
     # Deprecated because download doesn't work
     version(
         "1.1.1-8526f47",
-        "5e1cc8d6ffa7efdb7325c397ca236863ea8a9c5bed1c558acca68b140f89167e",
+        sha256="5e1cc8d6ffa7efdb7325c397ca236863ea8a9c5bed1c558acca68b140f89167e",
         deprecated=True,
     )
 
diff --git a/var/spack/repos/builtin/packages/py-toposort/package.py b/var/spack/repos/builtin/packages/py-toposort/package.py
index 024a40c4ed..f253525155 100644
--- a/var/spack/repos/builtin/packages/py-toposort/package.py
+++ b/var/spack/repos/builtin/packages/py-toposort/package.py
@@ -13,7 +13,7 @@ class PyToposort(PythonPackage):
 
     maintainers("marcusboden")
 
-    version("1.6", "a7428f56ef844f5055bb9e9e44b343983773ae6dce0fe5b101e08e27ffbd50ac")
+    version("1.6", sha256="a7428f56ef844f5055bb9e9e44b343983773ae6dce0fe5b101e08e27ffbd50ac")
 
     depends_on("python@2.7:2.8,3.3:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
diff --git a/var/spack/repos/builtin/packages/py-xtb/package.py b/var/spack/repos/builtin/packages/py-xtb/package.py
index 15fc679a72..d3487e9683 100644
--- a/var/spack/repos/builtin/packages/py-xtb/package.py
+++ b/var/spack/repos/builtin/packages/py-xtb/package.py
@@ -15,7 +15,7 @@ class PyXtb(PythonPackage):
 
     maintainers("awvwgk")
 
-    version("22.1", "7a59e7b783fc6e8b7328f55211de681e535a83991b07c4bab73494063f5e9018")
+    version("22.1", sha256="7a59e7b783fc6e8b7328f55211de681e535a83991b07c4bab73494063f5e9018")
 
     depends_on("pkgconfig", type="build")
     depends_on("python@3.7:", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/qbank/package.py b/var/spack/repos/builtin/packages/qbank/package.py
index b0c066ef80..b3af1bb6b7 100644
--- a/var/spack/repos/builtin/packages/qbank/package.py
+++ b/var/spack/repos/builtin/packages/qbank/package.py
@@ -25,7 +25,7 @@ class Qbank(Package):
     url = "file://{0}/qbank-2.10.4.tar.gz".format(os.getcwd())
     manual_download = True
 
-    version("2.10.4", "0820587353e63d32ddb49689dd4289e7")
+    version("2.10.4", md5="0820587353e63d32ddb49689dd4289e7")
 
     variant("doc", default=False, description="Build documentation")
 
diff --git a/var/spack/repos/builtin/packages/racket/package.py b/var/spack/repos/builtin/packages/racket/package.py
index 8a72c5433d..62bc8b7fa5 100644
--- a/var/spack/repos/builtin/packages/racket/package.py
+++ b/var/spack/repos/builtin/packages/racket/package.py
@@ -13,7 +13,7 @@ class Racket(MakefilePackage):
 
     maintainers("arjunguha", "elfprince13")
 
-    version("8.3", "3b963cd29ae119e1acc2c6dc4781bd9f25027979589caaae3fdfc021aac2324b")
+    version("8.3", sha256="3b963cd29ae119e1acc2c6dc4781bd9f25027979589caaae3fdfc021aac2324b")
 
     depends_on("libffi", type=("build", "link", "run"))
     depends_on("patchutils")
diff --git a/var/spack/repos/builtin/packages/rccl-tests/package.py b/var/spack/repos/builtin/packages/rccl-tests/package.py
index f1c5d1f6d5..8939db446a 100644
--- a/var/spack/repos/builtin/packages/rccl-tests/package.py
+++ b/var/spack/repos/builtin/packages/rccl-tests/package.py
@@ -17,7 +17,7 @@ class RcclTests(MakefilePackage):
 
     maintainers("bvanessen")
 
-    version("develop", branch="develop", default=True)
+    version("develop", branch="develop", preferred=True)
     version("master", branch="master")
 
     variant("mpi", default=True, description="with MPI support")
diff --git a/var/spack/repos/builtin/packages/scine-core/package.py b/var/spack/repos/builtin/packages/scine-core/package.py
index 88ed0b7b84..d11dd98792 100644
--- a/var/spack/repos/builtin/packages/scine-core/package.py
+++ b/var/spack/repos/builtin/packages/scine-core/package.py
@@ -16,7 +16,7 @@ class ScineCore(CMakePackage):
     git = "https://github.com/qcscine/core.git"
 
     version("master", branch="master")
-    version("4.0.2", "7181c6f93d71def22f1e0e5767afc7587c04b49abc03516f6926394868e7adc6")
+    version("4.0.2", sha256="7181c6f93d71def22f1e0e5767afc7587c04b49abc03516f6926394868e7adc6")
 
     resource(
         name="dev",
diff --git a/var/spack/repos/builtin/packages/scine-database/package.py b/var/spack/repos/builtin/packages/scine-database/package.py
index c62bf10c26..8d1449fbdf 100644
--- a/var/spack/repos/builtin/packages/scine-database/package.py
+++ b/var/spack/repos/builtin/packages/scine-database/package.py
@@ -16,7 +16,7 @@ class ScineDatabase(CMakePackage):
     git = "https://github.com/qcscine/database.git"
 
     version("master", branch="master")
-    version("1.1.0", "a9144631dfb90e06f6924cf58fc5db13719cf8577fcd3bbf788a135060a70c18")
+    version("1.1.0", sha256="a9144631dfb90e06f6924cf58fc5db13719cf8577fcd3bbf788a135060a70c18")
 
     resource(
         name="dev",
diff --git a/var/spack/repos/builtin/packages/scine-molassembler/package.py b/var/spack/repos/builtin/packages/scine-molassembler/package.py
index 14ffcd9c79..61e549fe54 100644
--- a/var/spack/repos/builtin/packages/scine-molassembler/package.py
+++ b/var/spack/repos/builtin/packages/scine-molassembler/package.py
@@ -16,7 +16,7 @@ class ScineMolassembler(CMakePackage):
     git = "https://github.com/qcscine/molassembler.git"
 
     version("master", branch="master")
-    version("1.2.1", "c9fea41d383b7f54cf8a3ed4dabebe9e942fe3ef5b47895e3533e8ce42dacd38")
+    version("1.2.1", sha256="c9fea41d383b7f54cf8a3ed4dabebe9e942fe3ef5b47895e3533e8ce42dacd38")
 
     resource(
         name="dev",
diff --git a/var/spack/repos/builtin/packages/scine-readuct/package.py b/var/spack/repos/builtin/packages/scine-readuct/package.py
index 0f77db749f..369cdb546f 100644
--- a/var/spack/repos/builtin/packages/scine-readuct/package.py
+++ b/var/spack/repos/builtin/packages/scine-readuct/package.py
@@ -17,7 +17,7 @@ class ScineReaduct(CMakePackage):
     homepage = "https://scine.ethz.ch/download/readuct"
     url = "https://github.com/qcscine/readuct/archive/refs/tags/4.1.0.tar.gz"
 
-    version("4.1.0", "9cec0192a444403d6a8fd096509798c49fbd1eec298ec7194aba915e31f50782")
+    version("4.1.0", sha256="9cec0192a444403d6a8fd096509798c49fbd1eec298ec7194aba915e31f50782")
 
     resource(
         name="dev",
diff --git a/var/spack/repos/builtin/packages/scine-serenity/package.py b/var/spack/repos/builtin/packages/scine-serenity/package.py
index 17b2d43e12..5e1dc57dc3 100644
--- a/var/spack/repos/builtin/packages/scine-serenity/package.py
+++ b/var/spack/repos/builtin/packages/scine-serenity/package.py
@@ -16,7 +16,7 @@ class ScineSerenity(CMakePackage):
     git = "https://github.com/qcscine/serenity_wrapper"
 
     version("master", branch="master")
-    version("1.0.1", "e2e5cc265a68ccab05f1bc934b957ca07c4f1c6004e662684023da451da69299")
+    version("1.0.1", sha256="e2e5cc265a68ccab05f1bc934b957ca07c4f1c6004e662684023da451da69299")
 
     resource(
         name="dev",
diff --git a/var/spack/repos/builtin/packages/scine-sparrow/package.py b/var/spack/repos/builtin/packages/scine-sparrow/package.py
index fc27ff8c61..eeec265e28 100644
--- a/var/spack/repos/builtin/packages/scine-sparrow/package.py
+++ b/var/spack/repos/builtin/packages/scine-sparrow/package.py
@@ -31,8 +31,8 @@ class ScineSparrow(CMakePackage):
     maintainers("frobnitzem")
 
     version("master", branch="master")
-    version("3.1.0", "91412de0f2670a1735c4ca76406db5bea04236eeac0bc1f93ccfe18104aa7ce4")
-    version("3.0.0", "70636871694c9363ae3fb2df5050bddb22667b71d875d5a7e9afd872f6a2b65d")
+    version("3.1.0", sha256="91412de0f2670a1735c4ca76406db5bea04236eeac0bc1f93ccfe18104aa7ce4")
+    version("3.0.0", sha256="70636871694c9363ae3fb2df5050bddb22667b71d875d5a7e9afd872f6a2b65d")
 
     resource(
         name="dev",
diff --git a/var/spack/repos/builtin/packages/scine-utilities/package.py b/var/spack/repos/builtin/packages/scine-utilities/package.py
index c4d3c266b1..93da28a8cf 100644
--- a/var/spack/repos/builtin/packages/scine-utilities/package.py
+++ b/var/spack/repos/builtin/packages/scine-utilities/package.py
@@ -16,8 +16,8 @@ class ScineUtilities(CMakePackage):
     git = "https://github.com/qcscine/utilities.git"
 
     version("master", branch="master")
-    version("6.0.0", "e4387d5562b7442a8e31e4dfc028bacfeb6d12e39f2d8aa6effc6db380863b4a")
-    version("5.0.0", "a304c89d9a196fe304f38610dea6b066d74590c0d434e4bd09a9796340700465")
+    version("6.0.0", sha256="e4387d5562b7442a8e31e4dfc028bacfeb6d12e39f2d8aa6effc6db380863b4a")
+    version("5.0.0", sha256="a304c89d9a196fe304f38610dea6b066d74590c0d434e4bd09a9796340700465")
 
     resource(
         name="dev",
diff --git a/var/spack/repos/builtin/packages/scine-xtb/package.py b/var/spack/repos/builtin/packages/scine-xtb/package.py
index b3d2c9fc83..b3184750ac 100644
--- a/var/spack/repos/builtin/packages/scine-xtb/package.py
+++ b/var/spack/repos/builtin/packages/scine-xtb/package.py
@@ -16,7 +16,7 @@ class ScineXtb(CMakePackage):
     git = "https://github.com/qcscine/xtb_wrapper.git"
 
     version("master", branch="master")
-    version("1.0.2", "9beb1103467f3cfd9ad33beb2f3ec650bc3e6dc7094876774be3cc4e6f210487")
+    version("1.0.2", sha256="9beb1103467f3cfd9ad33beb2f3ec650bc3e6dc7094876774be3cc4e6f210487")
 
     resource(
         name="dev",
diff --git a/var/spack/repos/builtin/packages/serenity-libint/package.py b/var/spack/repos/builtin/packages/serenity-libint/package.py
index 11b8a51efa..a9bf0f456b 100644
--- a/var/spack/repos/builtin/packages/serenity-libint/package.py
+++ b/var/spack/repos/builtin/packages/serenity-libint/package.py
@@ -12,7 +12,9 @@ class SerenityLibint(CMakePackage):
     homepage = "https://thclab.uni-muenster.de/serenity/libint"
     url = "https://thclab.uni-muenster.de/serenity/libint/-/raw/e3eb756c/libint-2.7.0-beta.6.tgz"
 
-    version("2.7.0-beta.6", "53af60c7be74374b2a2d893b3d2d37fa6a3078a72d98067bf71ba4ede4e807df")
+    version(
+        "2.7.0-beta.6", sha256="53af60c7be74374b2a2d893b3d2d37fa6a3078a72d98067bf71ba4ede4e807df"
+    )
 
     depends_on("boost")
     depends_on("eigen@3:")  # Probably overdepending?
diff --git a/var/spack/repos/builtin/packages/serenity/package.py b/var/spack/repos/builtin/packages/serenity/package.py
index 9b71f9896f..47e342aaff 100644
--- a/var/spack/repos/builtin/packages/serenity/package.py
+++ b/var/spack/repos/builtin/packages/serenity/package.py
@@ -14,7 +14,7 @@ class Serenity(CMakePackage):
     git = "https://github.com/qcserenity/serenity.git"
 
     version("master", branch="master")
-    version("1.4.0", "c7a87fc8e6f8ca21685a27e08d09d49824d9a1e9947fc6abb40d20fbba0cc6e8")
+    version("1.4.0", sha256="c7a87fc8e6f8ca21685a27e08d09d49824d9a1e9947fc6abb40d20fbba0cc6e8")
 
     variant("blas", default=True, description="Use BLAS library with Eigen")
     variant("lapack", default=True, description="Use Lapack library with Eigen")
diff --git a/var/spack/repos/builtin/packages/signalp/package.py b/var/spack/repos/builtin/packages/signalp/package.py
index e5075686fa..a72e3a4d5d 100644
--- a/var/spack/repos/builtin/packages/signalp/package.py
+++ b/var/spack/repos/builtin/packages/signalp/package.py
@@ -22,7 +22,7 @@ class Signalp(Package):
     url = "file://{0}/signalp-4.1f.Linux.tar.gz".format(os.getcwd())
     manual_download = True
 
-    version("4.1f", "a9aeb66259202649c959846f3f4d9744")
+    version("4.1f", md5="a9aeb66259202649c959846f3f4d9744")
 
     depends_on("perl", type=("build", "run"))
     depends_on("gnuplot")
diff --git a/var/spack/repos/builtin/packages/simple-dftd3/package.py b/var/spack/repos/builtin/packages/simple-dftd3/package.py
index ce7f0074c9..060fad6760 100644
--- a/var/spack/repos/builtin/packages/simple-dftd3/package.py
+++ b/var/spack/repos/builtin/packages/simple-dftd3/package.py
@@ -18,9 +18,9 @@ class SimpleDftd3(MesonPackage):
     maintainers("awvwgk")
 
     version("main", branch="main")
-    version("0.7.0", "5390b20102474a3c37240f38226f3a54a809b34bcb910317bdd109b8c2865f4e")
-    version("0.6.0", "c057361565f570cb128489c70131487f71b6891a40e5292dfe37041596810dfe")
-    version("0.5.1", "0411fdaebe438f652a970cb232ae3199c4cc840366ed05fda4c38e634632040d")
+    version("0.7.0", sha256="5390b20102474a3c37240f38226f3a54a809b34bcb910317bdd109b8c2865f4e")
+    version("0.6.0", sha256="c057361565f570cb128489c70131487f71b6891a40e5292dfe37041596810dfe")
+    version("0.5.1", sha256="0411fdaebe438f652a970cb232ae3199c4cc840366ed05fda4c38e634632040d")
 
     variant("openmp", default=True, description="Use OpenMP parallelisation")
     variant("python", default=False, description="Build Python extension module")
diff --git a/var/spack/repos/builtin/packages/sra-tools/package.py b/var/spack/repos/builtin/packages/sra-tools/package.py
index 7a3efc0bd2..9ba4ff1c51 100644
--- a/var/spack/repos/builtin/packages/sra-tools/package.py
+++ b/var/spack/repos/builtin/packages/sra-tools/package.py
@@ -13,8 +13,8 @@ class SraTools(CMakePackage):
     homepage = "https://github.com/ncbi/sra-tools"
     git = "https://github.com/ncbi/sra-tools.git"
 
-    version("3.0.3", tags="3.0.3")
-    version("3.0.0", tags="3.0.0")
+    version("3.0.3", tag="3.0.3")
+    version("3.0.0", tag="3.0.0")
 
     depends_on("openjdk")
     depends_on("flex@2.6:")
diff --git a/var/spack/repos/builtin/packages/sspace-longread/package.py b/var/spack/repos/builtin/packages/sspace-longread/package.py
index d8cc7a3bae..54d491631e 100644
--- a/var/spack/repos/builtin/packages/sspace-longread/package.py
+++ b/var/spack/repos/builtin/packages/sspace-longread/package.py
@@ -21,7 +21,7 @@ class SspaceLongread(Package):
     homepage = "https://www.baseclear.com/genomics/bioinformatics/basetools/SSPACE-longread"
     manual_download = True
 
-    version("1.1", "0bb5d8603d7ead4ff1596135a520cc26")
+    version("1.1", md5="0bb5d8603d7ead4ff1596135a520cc26")
 
     depends_on("perl", type=("build", "run"))
 
diff --git a/var/spack/repos/builtin/packages/sspace-standard/package.py b/var/spack/repos/builtin/packages/sspace-standard/package.py
index 89695b69cf..e7a095128b 100644
--- a/var/spack/repos/builtin/packages/sspace-standard/package.py
+++ b/var/spack/repos/builtin/packages/sspace-standard/package.py
@@ -23,7 +23,7 @@ class SspaceStandard(Package):
     url = "file://{0}/41SSPACE-STANDARD-3.0_linux-x86_64.tar.gz".format(os.getcwd())
     manual_download = True
 
-    version("3.0", "7e171b4861b9d514e80aafc3d9cdf554")
+    version("3.0", md5="7e171b4861b9d514e80aafc3d9cdf554")
 
     depends_on("perl+threads", type=("build", "run"))
     depends_on("perl-perl4-corelibs", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/star-ccm-plus/package.py b/var/spack/repos/builtin/packages/star-ccm-plus/package.py
index 7c37721d4e..a68430d47e 100644
--- a/var/spack/repos/builtin/packages/star-ccm-plus/package.py
+++ b/var/spack/repos/builtin/packages/star-ccm-plus/package.py
@@ -28,7 +28,7 @@ def url_for_version(self, version):
     version(
         "16.06.008_01", sha256="64577ec0e9a98d971114e68c4eec05bb746e061dfbf77b8d8919583c796c9e4b"
     )
-    version("11.06.010_02", "d349c6ac8293d8e6e7a53533d695588f")
+    version("11.06.010_02", md5="d349c6ac8293d8e6e7a53533d695588f")
 
     variant("doc", default=False, description="Install the documentation")
 
diff --git a/var/spack/repos/builtin/packages/stata/package.py b/var/spack/repos/builtin/packages/stata/package.py
index 5c4a8c0682..e4292590e1 100644
--- a/var/spack/repos/builtin/packages/stata/package.py
+++ b/var/spack/repos/builtin/packages/stata/package.py
@@ -29,8 +29,8 @@ class Stata(Package):
     manual_download = True
     # url      = "stata"
 
-    version("16", "a13a6a92558eeb3c6cb3013c458a6777e54c21af43599df6b0a924f5f5c2d5d2")
-    version("15", "2486f4c7db1e7b453004c7bd3f8da40ba1e30be150613065c7b82b1915259016")
+    version("16", sha256="a13a6a92558eeb3c6cb3013c458a6777e54c21af43599df6b0a924f5f5c2d5d2")
+    version("15", sha256="2486f4c7db1e7b453004c7bd3f8da40ba1e30be150613065c7b82b1915259016")
 
     depends_on("libpng@1.2.57", when="@15", type="run")
     depends_on("libpng@1.6.0:1.6", when="@16", type="run")
diff --git a/var/spack/repos/builtin/packages/suntans/package.py b/var/spack/repos/builtin/packages/suntans/package.py
index 1e71b0f8f6..2e6ca8e6f1 100644
--- a/var/spack/repos/builtin/packages/suntans/package.py
+++ b/var/spack/repos/builtin/packages/suntans/package.py
@@ -16,7 +16,7 @@ class Suntans(MakefilePackage):
 
     maintainers("ofringer", "zyaj", "mrayson", "jadelson", "lhxone")
 
-    version("3.1", "9b5d0dee5502a5650e37bf72f64b1124be86c084e7408aa517c214ddb25e36de")
+    version("3.1", sha256="9b5d0dee5502a5650e37bf72f64b1124be86c084e7408aa517c214ddb25e36de")
 
     depends_on("libx11@1.6.3")
     depends_on("mpi")
diff --git a/var/spack/repos/builtin/packages/supernova/package.py b/var/spack/repos/builtin/packages/supernova/package.py
index 5bc8d9c20d..0a96a5b2cb 100644
--- a/var/spack/repos/builtin/packages/supernova/package.py
+++ b/var/spack/repos/builtin/packages/supernova/package.py
@@ -30,7 +30,7 @@ class Supernova(Package):
     manual_download = True
 
     version("2.1.1", sha256="2f58eb66951e257b89359134ab8e35ad638c4ed51cb3fb8121625dfcc7761938")
-    version("2.0.1", "3697ce043c798fcb672fe0a66c56d6f0")
+    version("2.0.1", md5="3697ce043c798fcb672fe0a66c56d6f0")
 
     depends_on("bcl2fastq2")
 
diff --git a/var/spack/repos/builtin/packages/targetp/package.py b/var/spack/repos/builtin/packages/targetp/package.py
index 168aba35b7..7b37cca7a1 100644
--- a/var/spack/repos/builtin/packages/targetp/package.py
+++ b/var/spack/repos/builtin/packages/targetp/package.py
@@ -21,7 +21,7 @@ class Targetp(Package):
     url = "file://{0}/targetp-1.1b.Linux.tar.gz".format(os.getcwd())
     manual_download = True
 
-    version("1.1b", "80233d0056e11abfd22a4ce73d1808c6")
+    version("1.1b", md5="80233d0056e11abfd22a4ce73d1808c6")
 
     depends_on("perl", type="run")
     depends_on("awk", type="run")
diff --git a/var/spack/repos/builtin/packages/tblite/package.py b/var/spack/repos/builtin/packages/tblite/package.py
index 323b7e3de6..6e89a14748 100644
--- a/var/spack/repos/builtin/packages/tblite/package.py
+++ b/var/spack/repos/builtin/packages/tblite/package.py
@@ -15,7 +15,7 @@ class Tblite(MesonPackage):
 
     maintainers("awvwgk")
 
-    version("0.3.0", "46d77c120501ac55ed6a64dea8778d6593b26fb0653c591f8e8c985e35884f0a")
+    version("0.3.0", sha256="46d77c120501ac55ed6a64dea8778d6593b26fb0653c591f8e8c985e35884f0a")
 
     variant("openmp", default=True, description="Use OpenMP parallelisation")
     variant("python", default=False, description="Build Python extension module")
diff --git a/var/spack/repos/builtin/packages/tecplot/package.py b/var/spack/repos/builtin/packages/tecplot/package.py
index 14f6c29bba..4afe4669cd 100644
--- a/var/spack/repos/builtin/packages/tecplot/package.py
+++ b/var/spack/repos/builtin/packages/tecplot/package.py
@@ -20,11 +20,13 @@ class Tecplot(Package):
     maintainers("LRWeber")
 
     version(
-        "2022r2", "a93a740bd8a8aa6e8cac278793cd5881f5c530e12a535a882d9c5d4af02fd45c", expand=False
+        "2022r2",
+        sha256="a93a740bd8a8aa6e8cac278793cd5881f5c530e12a535a882d9c5d4af02fd45c",
+        expand=False,
     )
     # Deprecated versions
-    version("2018r2", "d3cf54a7555e0259b7ba0d82fef23bc3", expand=False, deprecated=True)
-    version("2017r1", "06a8057d33a519607720d4c621cd3f50", expand=False, deprecated=True)
+    version("2018r2", md5="d3cf54a7555e0259b7ba0d82fef23bc3", expand=False, deprecated=True)
+    version("2017r1", md5="06a8057d33a519607720d4c621cd3f50", expand=False, deprecated=True)
 
     # Licensing
     license_required = True
diff --git a/var/spack/repos/builtin/packages/tmhmm/package.py b/var/spack/repos/builtin/packages/tmhmm/package.py
index 14837ba94a..dd66b33950 100644
--- a/var/spack/repos/builtin/packages/tmhmm/package.py
+++ b/var/spack/repos/builtin/packages/tmhmm/package.py
@@ -21,7 +21,7 @@ class Tmhmm(Package):
     url = "file://{0}/tmhmm-2.0c.Linux.tar.gz".format(os.getcwd())
     manual_download = True
 
-    version("2.0c", "359db0c4ecf84d1ade5786abe844d54e")
+    version("2.0c", md5="359db0c4ecf84d1ade5786abe844d54e")
 
     depends_on("perl", type="run")
 
diff --git a/var/spack/repos/builtin/packages/toml-f/package.py b/var/spack/repos/builtin/packages/toml-f/package.py
index 5c179c941f..cc1de501c3 100644
--- a/var/spack/repos/builtin/packages/toml-f/package.py
+++ b/var/spack/repos/builtin/packages/toml-f/package.py
@@ -18,9 +18,9 @@ class TomlF(MesonPackage):
     maintainers("awvwgk")
 
     version("main", branch="main")
-    version("0.3.1", "7f40f60c8d9ffbb1b99fb051a3e6682c7dd04d7479aa1cf770eff8174b02544f")
-    version("0.3.0", "40ceca008091607165a09961b79312abfdbbda71cbb94a9dc2625b88c93ff45a")
-    version("0.2.4", "ebfeb1e201725b98bae3e656bde4eea2db90154efa8681de758f1389fec902cf")
-    version("0.2.3", "2dca7ff6d3e35415cd92454c31560d2b656c014af8236be09c54c13452e4539c")
+    version("0.3.1", sha256="7f40f60c8d9ffbb1b99fb051a3e6682c7dd04d7479aa1cf770eff8174b02544f")
+    version("0.3.0", sha256="40ceca008091607165a09961b79312abfdbbda71cbb94a9dc2625b88c93ff45a")
+    version("0.2.4", sha256="ebfeb1e201725b98bae3e656bde4eea2db90154efa8681de758f1389fec902cf")
+    version("0.2.3", sha256="2dca7ff6d3e35415cd92454c31560d2b656c014af8236be09c54c13452e4539c")
 
     depends_on("meson@0.57.2:", type="build")
diff --git a/var/spack/repos/builtin/packages/turbomole/package.py b/var/spack/repos/builtin/packages/turbomole/package.py
index f8465080ef..5bafb02ad0 100644
--- a/var/spack/repos/builtin/packages/turbomole/package.py
+++ b/var/spack/repos/builtin/packages/turbomole/package.py
@@ -25,7 +25,7 @@ class Turbomole(Package):
 
     version(
         "7.0.2",
-        "92b97e1e52e8dcf02a4d9ac0147c09d6",
+        md5="92b97e1e52e8dcf02a4d9ac0147c09d6",
         url="file://%s/turbolinux702.tar.gz" % os.getcwd(),
     )
 
diff --git a/var/spack/repos/builtin/packages/vacuumms/package.py b/var/spack/repos/builtin/packages/vacuumms/package.py
index 394a9403d6..c4e798a30a 100644
--- a/var/spack/repos/builtin/packages/vacuumms/package.py
+++ b/var/spack/repos/builtin/packages/vacuumms/package.py
@@ -26,7 +26,7 @@ class Vacuumms(CMakePackage):
     version("1.1.1", tag="v1.1.1")
     version(
         "1.0.0",
-        "c18fe52f5041880da7f50d3808d37afb3e9c936a56f80f67838d045bf7af372f",
+        sha256="c18fe52f5041880da7f50d3808d37afb3e9c936a56f80f67838d045bf7af372f",
         deprecated=True,
     )
 
diff --git a/var/spack/repos/builtin/packages/vizglow/package.py b/var/spack/repos/builtin/packages/vizglow/package.py
index d3a5da5355..7e0e28e090 100644
--- a/var/spack/repos/builtin/packages/vizglow/package.py
+++ b/var/spack/repos/builtin/packages/vizglow/package.py
@@ -24,7 +24,7 @@ class Vizglow(Package):
 
     version(
         "2.2alpha20",
-        "2bef890c66f3a44aaf96f7c96788c89e",
+        md5="2bef890c66f3a44aaf96f7c96788c89e",
         expand=False,
         url="file://{0}/VizGlow_v2.2alpha20-Linux-x86_64-R09December2016-Install".format(
             os.getcwd()
@@ -32,7 +32,7 @@ class Vizglow(Package):
     )
     version(
         "2.2alpha17",
-        "1de268564363e0ee86f9ffff1c3b82e1",
+        md5="1de268564363e0ee86f9ffff1c3b82e1",
         expand=False,
         url="file://{0}/VizGlow_v2.2alpha17-R21November2016-Linux-x86_64-Install".format(
             os.getcwd()
@@ -40,7 +40,7 @@ class Vizglow(Package):
     )
     version(
         "2.2alpha15",
-        "be2b5044f30f2b2c3bbe87a0037bf228",
+        md5="be2b5044f30f2b2c3bbe87a0037bf228",
         expand=False,
         url="file://{0}/VizGlow_v2.2alpha15-Linux-x86_64-R31October2016-Install".format(
             os.getcwd()
diff --git a/var/spack/repos/builtin/packages/xplor-nih/package.py b/var/spack/repos/builtin/packages/xplor-nih/package.py
index ec58b624eb..c86a8a3bec 100644
--- a/var/spack/repos/builtin/packages/xplor-nih/package.py
+++ b/var/spack/repos/builtin/packages/xplor-nih/package.py
@@ -20,7 +20,7 @@ class XplorNih(Package):
     homepage = "https://nmr.cit.nih.gov/xplor-nih/"
     manual_download = True
 
-    version("2.45", "ab3e046604beb0effc89a1adb7bab438")
+    version("2.45", md5="ab3e046604beb0effc89a1adb7bab438")
 
     depends_on("python", type=("build", "run"))
 
diff --git a/var/spack/repos/builtin/packages/xyce/package.py b/var/spack/repos/builtin/packages/xyce/package.py
index 1dba6aab59..333d406ec2 100644
--- a/var/spack/repos/builtin/packages/xyce/package.py
+++ b/var/spack/repos/builtin/packages/xyce/package.py
@@ -25,11 +25,11 @@ class Xyce(CMakePackage):
     maintainers("kuberry", "tbird2001")
 
     version("master", branch="master")
-    version("7.6.0", "fc25557e2edc82adbe0436a15fca2929a2f9ab08ddf91f1a47aab5e8b27ec88c")
-    version("7.5.0", "854d7d5e19e0ee2138d1f20f10f8f27f2bebb94ec81c157040955cff7250dacd")
-    version("7.4.0", "2d6bc1b7377834b2e0bf50131e96728c5be83dbb3548e765bb48911067c87c91")
-    version("7.3.0", "43869a70967f573ff6f00451db3f4642684834bdad1fd3926380e3789016b446")
-    version("7.2.0", "cf49705278ecda46373784bb24925cb97f9017b6adff49e4416de146bdd6a4b5")
+    version("7.6.0", sha256="fc25557e2edc82adbe0436a15fca2929a2f9ab08ddf91f1a47aab5e8b27ec88c")
+    version("7.5.0", sha256="854d7d5e19e0ee2138d1f20f10f8f27f2bebb94ec81c157040955cff7250dacd")
+    version("7.4.0", sha256="2d6bc1b7377834b2e0bf50131e96728c5be83dbb3548e765bb48911067c87c91")
+    version("7.3.0", sha256="43869a70967f573ff6f00451db3f4642684834bdad1fd3926380e3789016b446")
+    version("7.2.0", sha256="cf49705278ecda46373784bb24925cb97f9017b6adff49e4416de146bdd6a4b5")
 
     depends_on("cmake@3.13:", type="build")
     depends_on("flex")
diff --git a/var/spack/repos/builtin/packages/ycruncher/package.py b/var/spack/repos/builtin/packages/ycruncher/package.py
index 7c80861872..8519fadeff 100644
--- a/var/spack/repos/builtin/packages/ycruncher/package.py
+++ b/var/spack/repos/builtin/packages/ycruncher/package.py
@@ -17,7 +17,9 @@ class Ycruncher(Package):
     url = "http://www.numberworld.org/y-cruncher/y-cruncher%20v0.7.10.9513-static.tar.xz"
     maintainers("saqibkh")
 
-    version("0.7.10.9513", "292006496bba83bf0f8c354ceb1c2ea571f0c67b9fe46297701a8d387773db1b")
+    version(
+        "0.7.10.9513", sha256="292006496bba83bf0f8c354ceb1c2ea571f0c67b9fe46297701a8d387773db1b"
+    )
 
     depends_on("autoconf")
 
diff --git a/var/spack/repos/tutorial/packages/armadillo/package.py b/var/spack/repos/tutorial/packages/armadillo/package.py
index 77f4c68c62..a4885bcfdc 100644
--- a/var/spack/repos/tutorial/packages/armadillo/package.py
+++ b/var/spack/repos/tutorial/packages/armadillo/package.py
@@ -15,12 +15,12 @@ class Armadillo(CMakePackage):
     homepage = "http://arma.sourceforge.net/"
     url = "http://sourceforge.net/projects/arma/files/armadillo-7.200.1.tar.xz"
 
-    version("8.100.1", "d9762d6f097e0451d0cfadfbda295e7c")
-    version("7.950.1", "c06eb38b12cae49cab0ce05f96147147")
-    version("7.900.1", "5ef71763bd429a3d481499878351f3be")
-    version("7.500.0", "7d316fdf3c3c7ea92b64704180ae315d")
-    version("7.200.2", "b21585372d67a8876117fd515d8cf0a2")
-    version("7.200.1", "ed86d6df0058979e107502e1fe3e469e")
+    version("8.100.1", md5="d9762d6f097e0451d0cfadfbda295e7c")
+    version("7.950.1", md5="c06eb38b12cae49cab0ce05f96147147")
+    version("7.900.1", md5="5ef71763bd429a3d481499878351f3be")
+    version("7.500.0", md5="7d316fdf3c3c7ea92b64704180ae315d")
+    version("7.200.2", md5="b21585372d67a8876117fd515d8cf0a2")
+    version("7.200.1", md5="ed86d6df0058979e107502e1fe3e469e")
 
     variant("hdf5", default=False, description="Include HDF5 support")
 
diff --git a/var/spack/repos/tutorial/packages/elpa/package.py b/var/spack/repos/tutorial/packages/elpa/package.py
index 5906a3557b..fcfc6b0251 100644
--- a/var/spack/repos/tutorial/packages/elpa/package.py
+++ b/var/spack/repos/tutorial/packages/elpa/package.py
@@ -12,14 +12,14 @@ class Elpa(AutotoolsPackage):
     homepage = "http://elpa.mpcdf.mpg.de/"
     url = "http://elpa.mpcdf.mpg.de/elpa-2015.11.001.tar.gz"
 
-    version("2018.05.001.rc1", "ccd77bd8036988ee624f43c04992bcdd")
-    version("2017.11.001", "4a437be40cc966efb07aaab84c20cd6e", preferred=True)
-    version("2017.05.003", "7c8e5e58cafab212badaf4216695700f")
-    version("2017.05.002", "d0abc1ac1f493f93bf5e30ec8ab155dc")
-    version("2016.11.001.pre", "5656fd066cf0dcd071dbcaf20a639b37")
-    version("2016.05.004", "c0dd3a53055536fc3a2a221e78d8b376")
-    version("2016.05.003", "88a9f3f3bfb63e16509dd1be089dcf2c")
-    version("2015.11.001", "de0f35b7ee7c971fd0dca35c900b87e6")
+    version("2018.05.001.rc1", md5="ccd77bd8036988ee624f43c04992bcdd")
+    version("2017.11.001", md5="4a437be40cc966efb07aaab84c20cd6e", preferred=True)
+    version("2017.05.003", md5="7c8e5e58cafab212badaf4216695700f")
+    version("2017.05.002", md5="d0abc1ac1f493f93bf5e30ec8ab155dc")
+    version("2016.11.001.pre", md5="5656fd066cf0dcd071dbcaf20a639b37")
+    version("2016.05.004", md5="c0dd3a53055536fc3a2a221e78d8b376")
+    version("2016.05.003", md5="88a9f3f3bfb63e16509dd1be089dcf2c")
+    version("2015.11.001", md5="de0f35b7ee7c971fd0dca35c900b87e6")
 
     variant("openmp", default=False, description="Activates OpenMP support")
     variant("optflags", default=True, description="Build with optimization flags")
diff --git a/var/spack/repos/tutorial/packages/mpich/package.py b/var/spack/repos/tutorial/packages/mpich/package.py
index 657a9671aa..9d3592fdfd 100644
--- a/var/spack/repos/tutorial/packages/mpich/package.py
+++ b/var/spack/repos/tutorial/packages/mpich/package.py
@@ -19,14 +19,14 @@ class Mpich(AutotoolsPackage):
     list_depth = 1
 
     version("develop", submodules=True)
-    version("3.2.1", "e175452f4d61646a52c73031683fc375")
-    version("3.2", "f414cfa77099cd1fa1a5ae4e22db508a")
-    version("3.1.4", "2ab544607986486562e076b83937bba2")
-    version("3.1.3", "93cb17f91ac758cbf9174ecb03563778")
-    version("3.1.2", "7fbf4b81dcb74b07ae85939d1ceee7f1")
-    version("3.1.1", "40dc408b1e03cc36d80209baaa2d32b7")
-    version("3.1", "5643dd176499bfb7d25079aaff25f2ec")
-    version("3.0.4", "9c5d5d4fe1e17dd12153f40bc5b6dbc0")
+    version("3.2.1", md5="e175452f4d61646a52c73031683fc375")
+    version("3.2", md5="f414cfa77099cd1fa1a5ae4e22db508a")
+    version("3.1.4", md5="2ab544607986486562e076b83937bba2")
+    version("3.1.3", md5="93cb17f91ac758cbf9174ecb03563778")
+    version("3.1.2", md5="7fbf4b81dcb74b07ae85939d1ceee7f1")
+    version("3.1.1", md5="40dc408b1e03cc36d80209baaa2d32b7")
+    version("3.1", md5="5643dd176499bfb7d25079aaff25f2ec")
+    version("3.0.4", md5="9c5d5d4fe1e17dd12153f40bc5b6dbc0")
 
     variant("hydra", default=True, description="Build the hydra process manager")
     variant("pmi", default=True, description="Build with PMI support")
diff --git a/var/spack/repos/tutorial/packages/netlib-lapack/package.py b/var/spack/repos/tutorial/packages/netlib-lapack/package.py
index ff98d722e3..bfc134b5c7 100644
--- a/var/spack/repos/tutorial/packages/netlib-lapack/package.py
+++ b/var/spack/repos/tutorial/packages/netlib-lapack/package.py
@@ -23,15 +23,15 @@ class NetlibLapack(CMakePackage):
         "96591affdbf58c450d45c1daa540dbd2",
         url="http://www.netlib.org/lapack/lapack-3.8.0.tar.gz",
     )
-    version("3.7.1", "dcdeeed73de152c4643ccc5b1aeb453c")
-    version("3.7.0", "697bb8d67c7d336a0f339cc9dd0fa72f")
-    version("3.6.1", "421b2cb72e15f237e144428f9c460ee0")
-    version("3.6.0", "f2f6c67134e851fe189bb3ca1fbb5101")
-    version("3.5.0", "b1d3e3e425b2e44a06760ff173104bdf")
-    version("3.4.2", "61bf1a8a4469d4bdb7604f5897179478")
-    version("3.4.1", "44c3869c38c8335c2b9c2a8bb276eb55")
-    version("3.4.0", "02d5706ec03ba885fc246e5fa10d8c70")
-    version("3.3.1", "d0d533ec9a5b74933c2a1e84eedc58b4")
+    version("3.7.1", md5="dcdeeed73de152c4643ccc5b1aeb453c")
+    version("3.7.0", md5="697bb8d67c7d336a0f339cc9dd0fa72f")
+    version("3.6.1", md5="421b2cb72e15f237e144428f9c460ee0")
+    version("3.6.0", md5="f2f6c67134e851fe189bb3ca1fbb5101")
+    version("3.5.0", md5="b1d3e3e425b2e44a06760ff173104bdf")
+    version("3.4.2", md5="61bf1a8a4469d4bdb7604f5897179478")
+    version("3.4.1", md5="44c3869c38c8335c2b9c2a8bb276eb55")
+    version("3.4.0", md5="02d5706ec03ba885fc246e5fa10d8c70")
+    version("3.3.1", md5="d0d533ec9a5b74933c2a1e84eedc58b4")
 
     variant("shared", default=True, description="Build shared library version")
     variant("external-blas", default=False, description="Build lapack with an external blas")