apple clang package

* py-argcomplete: add 3.0.8

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

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* [@spackbot] updating style on behalf of manuelakuhn

---------

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

CHANGELOG.md

@@ -1,3 +1,221 @@
+# v0.20.0 (2023-05-21)
+
+`v0.20.0` is a major feature release.
+
+## Features in this release
+
+1. **`requires()` directive and enhanced package requirements**
+
+   We've added some more enhancements to requirements in Spack (#36286).
+
+   There is a new `requires()` directive for packages. `requires()` is the opposite of
+   `conflicts()`. You can use it to impose constraints on this package when certain
+   conditions are met:
+
+   ```python
+   requires(
+       "%apple-clang",
+       when="platform=darwin",
+       msg="This package builds only with clang on macOS"
+   )
+   ```
+
+   More on this in [the docs](
+     https://spack.rtfd.io/en/latest/packaging_guide.html#conflicts-and-requirements).
+
+   You can also now add a `when:` clause to `requires:` in your `packages.yaml`
+   configuration or in an environment:
+
+   ```yaml
+   packages:
+     openmpi:
+       require:
+       - any_of: ["%gcc"]
+         when: "@:4.1.4"
+         message: "Only OpenMPI 4.1.5 and up can build with fancy compilers"
+   ```
+
+   More details can be found [here](
+     https://spack.readthedocs.io/en/latest/build_settings.html#package-requirements)
+
+2. **Exact versions**
+
+   Spack did not previously have a way to distinguish a version if it was a prefix of
+   some other version. For example, `@3.2` would match `3.2`, `3.2.1`, `3.2.2`, etc. You
+   can now match *exactly* `3.2` with `@=3.2`. This is useful, for example, if you need
+   to patch *only* the `3.2` version of a package. The new syntax is described in [the docs](
+     https://spack.readthedocs.io/en/latest/basic_usage.html#version-specifier).
+
+   Generally, when writing packages, you should prefer to use ranges like `@3.2` over
+   the specific versions, as this allows the concretizer more leeway when selecting
+   versions of dependencies. More details and recommendations are in the [packaging guide](
+     https://spack.readthedocs.io/en/latest/packaging_guide.html#ranges-versus-specific-versions).
+
+   See #36273 for full details on the version refactor.
+
+3. **New testing interface**
+
+   Writing package tests is now much simpler with a new [test interface](
+     https://spack.readthedocs.io/en/latest/packaging_guide.html#stand-alone-tests).
+
+   Writing a test is now as easy as adding a method that starts with `test_`:
+
+   ```python
+   class MyPackage(Package):
+       ...
+
+       def test_always_fails(self):
+           """use assert to always fail"""
+           assert False
+
+       def test_example(self):
+           """run installed example"""
+           example = which(self.prefix.bin.example)
+           example()
+    ```
+
+    You can use Python's native `assert` statement to implement your checks -- no more
+    need to fiddle with `run_test` or other test framework methods. Spack will
+    introspect the class and run `test_*` methods when you run `spack test`,
+
+4. **More stable concretization**
+
+   * Now, `spack concretize` will *only* concretize the new portions of the environment
+     and will not change existing parts of an environment unless you specify `--force`.
+     This has always been true for `unify:false`, but not for `unify:true` and
+     `unify:when_possible` environments. Now it is true for all of them (#37438, #37681).
+
+   * The concretizer has a new `--reuse-deps` argument that *only* reuses dependencies.
+     That is, it will always treat the *roots* of your environment as it would with
+     `--fresh`. This allows you to upgrade just the roots of your environment while
+     keeping everything else stable (#30990).
+
+5. **Weekly develop snapshot releases**
+
+   Since last year, we have maintained a buildcache of `develop` at
+   https://binaries.spack.io/develop, but the cache can grow to contain so many builds
+   as to be unwieldy. When we get a stable `develop` build, we snapshot the release and
+   add a corresponding tag the Spack repository. So, you can use a stack from a specific
+   day. There are now tags in the spack repository like:
+
+   * `develop-2023-05-14`
+   * `develop-2023-05-18`
+
+   that correspond to build caches like:
+
+   * https://binaries.spack.io/develop-2023-05-14/e4s
+   * https://binaries.spack.io/develop-2023-05-18/e4s
+
+   We plan to store these snapshot releases weekly.
+
+6. **Specs in buildcaches can be referenced by hash.**
+
+   * Previously, you could run `spack buildcache list` and see the hashes in
+     buildcaches, but referring to them by hash would fail.
+   * You can now run commands like `spack spec` and `spack install` and refer to
+     buildcache hashes directly, e.g. `spack install /abc123` (#35042)
+
+7. **New package and buildcache index websites**
+
+   Our public websites for searching packages have been completely revamped and updated.
+   You can check them out here:
+
+   * *Package Index*: https://packages.spack.io
+   * *Buildcache Index*: https://cache.spack.io
+
+   Both are searchable and more interactive than before. Currently major releases are
+   shown; UI for browsing `develop` snapshots is coming soon.
+
+8. **Default CMake and Meson build types are now Release**
+
+   Spack has historically defaulted to building with optimization and debugging, but
+   packages like `llvm` can be enormous with debug turned on. Our default build type for
+   all Spack packages is now `Release` (#36679, #37436). This has a number of benefits:
+
+   * much smaller binaries;
+   * higher default optimization level; and
+   * defining `NDEBUG` disables assertions, which may lead to further speedups.
+
+   You can still get the old behavior back through requirements and package preferences.
+
+## Other new commands and directives
+
+* `spack checksum` can automatically add new versions to package (#24532)
+* new command: `spack pkg grep` to easily search package files (#34388)
+* New `maintainers` directive (#35083)
+* Add `spack buildcache push` (alias to `buildcache create`) (#34861)
+* Allow using `-j` to control the parallelism of concretization (#37608)
+* Add `--exclude` option to 'spack external find' (#35013)
+
+## Other new features of note
+
+* editing: add higher-precedence `SPACK_EDITOR` environment variable
+* Many YAML formatting improvements from updating `ruamel.yaml` to the latest version
+  supporting Python 3.6. (#31091, #24885, #37008).
+* Requirements and preferences should not define (non-git) versions (#37687, #37747)
+* Environments now store spack version/commit in `spack.lock` (#32801)
+* User can specify the name of the `packages` subdirectory in repositories (#36643)
+* Add container images supporting RHEL alternatives (#36713)
+* make version(...) kwargs explicit (#36998)
+
+## Notable refactors
+
+* buildcache create: reproducible tarballs (#35623)
+* Bootstrap most of Spack dependencies using environments (#34029)
+* Split `satisfies(..., strict=True/False)` into two functions (#35681)
+* spack install: simplify behavior when inside environments (#35206)
+
+## Binary cache and stack updates
+
+* Major simplification of CI boilerplate in stacks (#34272, #36045)
+* Many improvements to our CI pipeline's reliability
+
+## Removals, Deprecations, and disablements
+* Module file generation is disabled by default; you'll need to enable it to use it (#37258)
+* Support for Python 2 was deprecated in `v0.19.0` and has been removed. `v0.20.0` only
+  supports Python 3.6 and higher.
+* Deprecated target names are no longer recognized by Spack. Use generic names instead:
+  * `graviton` is now `cortex_a72`
+  * `graviton2` is now `neoverse_n1`
+  * `graviton3` is now `neoverse_v1`
+* `blacklist` and `whitelist` in module configuration were deprecated in `v0.19.0` and are
+  removed in this release. Use `exclude` and `include` instead.
+* The `ignore=` parameter of the `extends()` directive has been removed. It was not used by
+  any builtin packages and is no longer needed to avoid conflicts in environment views (#35588).
+* Support for the old YAML buildcache format has been removed. It was deprecated in `v0.19.0` (#34347).
+* `spack find --bootstrap` has been removed. It was deprecated in `v0.19.0`. Use `spack
+  --bootstrap find` instead (#33964).
+* `spack bootstrap trust` and `spack bootstrap untrust` are now removed, having been
+  deprecated in `v0.19.0`. Use `spack bootstrap enable` and `spack bootstrap disable`.
+* The `--mirror-name`, `--mirror-url`, and `--directory` options to buildcache and
+  mirror commands were deprecated in `v0.19.0` and have now been removed. They have been
+  replaced by positional arguments (#37457).
+* Deprecate `env:` as top level environment key (#37424)
+* deprecate buildcache create --rel, buildcache install --allow-root (#37285)
+* Support for very old perl-like spec format strings (e.g., `$_$@$%@+$+$=`) has been
+  removed (#37425). This was deprecated in in `v0.15` (#10556).
+
+## Notable Bugfixes
+
+* bugfix: don't fetch package metadata for unknown concrete specs (#36990)
+* Improve package source code context display on error  (#37655)
+* Relax environment manifest filename requirements and lockfile identification criteria (#37413)
+* `installer.py`: drop build edges of installed packages by default (#36707)
+* Bugfix: package requirements with git commits (#35057, #36347)
+* Package requirements: allow single specs in requirement lists (#36258)
+* conditional variant values: allow boolean (#33939)
+* spack uninstall: follow run/link edges on --dependents (#34058)
+
+## Spack community stats
+
+* 7,179 total packages, 499 new since `v0.19.0`
+    * 329 new Python packages
+    * 31 new R packages
+* 336 people contributed to this release
+    * 317 committers to packages
+    * 62 committers to core
+
+
 # v0.19.1 (2023-02-07)
 
 ### Spack Bugfixes

lib/spack/external/__init__.py

@@ -18,7 +18,7 @@
 
 * Homepage: https://pypi.python.org/pypi/archspec
 * Usage: Labeling, comparison and detection of microarchitectures
-* Version: 0.2.1 (commit 4b1f21802a23b536bbcce73d3c631a566b20e8bd)
+* Version: 0.2.1 (commit 9e1117bd8a2f0581bced161f2a2e8d6294d0300b)
 
 astunparse
 ----------------

lib/spack/external/archspec/json/cpu/microarchitectures.json

@@ -2803,7 +2803,7 @@
                   "flags" : "-march=armv8.2-a+fp16+dotprod+crypto -mtune=cortex-a72"
               },
               {
-                  "versions": "10.2",
+                  "versions": "10.2:10.2.99",
                   "flags" : "-mcpu=zeus"
               },
               {

lib/spack/spack/build_environment.py

@@ -589,7 +589,6 @@ def set_module_variables_for_package(pkg):
 
     # TODO: make these build deps that can be installed if not found.
     m.make = MakeExecutable("make", jobs)
-    m.gmake = MakeExecutable("gmake", jobs)
     m.ninja = MakeExecutable("ninja", jobs, supports_jobserver=False)
     # TODO: johnwparent: add package or builder support to define these build tools
     # for now there is no entrypoint for builders to define these on their

lib/spack/spack/cmd/__init__.py

@@ -347,7 +347,7 @@ def iter_groups(specs, indent, all_headers):
             spack.spec.architecture_color,
             architecture if architecture else "no arch",
             spack.spec.compiler_color,
-            f"{compiler}" if compiler else "no compiler",
+            f"{compiler.display_str}" if compiler else "no compiler",
         )
 
         # Sometimes we want to display specs that are not yet concretized.

lib/spack/spack/cmd/compiler.py

@@ -98,7 +98,7 @@ def compiler_find(args):
         config = spack.config.config
         filename = config.get_config_filename(args.scope, "compilers")
         tty.msg("Added %d new compiler%s to %s" % (n, s, filename))
-        colify(reversed(sorted(c.spec for c in new_compilers)), indent=4)
+        colify(reversed(sorted(c.spec.display_str for c in new_compilers)), indent=4)
     else:
         tty.msg("Found no new compilers")
     tty.msg("Compilers are defined in the following files:")
@@ -112,13 +112,13 @@ def compiler_remove(args):
         tty.die("No compilers match spec %s" % cspec)
     elif not args.all and len(compilers) > 1:
         tty.error("Multiple compilers match spec %s. Choose one:" % cspec)
-        colify(reversed(sorted([c.spec for c in compilers])), indent=4)
+        colify(reversed(sorted([c.spec.display_str for c in compilers])), indent=4)
         tty.msg("Or, use `spack compiler remove -a` to remove all of them.")
         sys.exit(1)
 
     for compiler in compilers:
         spack.compilers.remove_compiler_from_config(compiler.spec, scope=args.scope)
-        tty.msg("Removed compiler %s" % compiler.spec)
+        tty.msg("Removed compiler %s" % compiler.spec.display_str)
 
 
 def compiler_info(args):
@@ -130,7 +130,7 @@ def compiler_info(args):
         tty.die("No compilers match spec %s" % cspec)
     else:
         for c in compilers:
-            print(str(c.spec) + ":")
+            print(c.spec.display_str + ":")
             print("\tpaths:")
             for cpath in ["cc", "cxx", "f77", "fc"]:
                 print("\t\t%s = %s" % (cpath, getattr(c, cpath, None)))
@@ -188,7 +188,7 @@ def compiler_list(args):
             os_str += "-%s" % target
         cname = "%s{%s} %s" % (spack.spec.compiler_color, name, os_str)
         tty.hline(colorize(cname), char="-")
-        colify(reversed(sorted(c.spec for c in compilers)))
+        colify(reversed(sorted(c.spec.display_str for c in compilers)))
 
 
 def compiler(parser, args):

lib/spack/spack/cmd/env.py

@@ -302,7 +302,7 @@ def env_create(args):
         # the environment should not include a view.
         with_view = None
 
-    _env_create(
+    env = _env_create(
         args.create_env,
         init_file=args.envfile,
         dir=args.dir,
@@ -310,6 +310,9 @@ def env_create(args):
         keep_relative=args.keep_relative,
     )
 
+    # Generate views, only really useful for environments created from spack.lock files.
+    env.regenerate_views()
+
 
 def _env_create(name_or_path, *, init_file=None, dir=False, with_view=None, keep_relative=False):
     """Create a new environment, with an optional yaml description.

lib/spack/spack/compilers/__init__.py

@@ -233,38 +233,25 @@ def find_compilers(path_hints=None):
         path_hints = get_path("PATH")
     default_paths = fs.search_paths_for_executables(*path_hints)
 
-    # To detect the version of the compilers, we dispatch a certain number
-    # of function calls to different workers. Here we construct the list
-    # of arguments for each call.
-    arguments = []
-    for o in all_os_classes():
-        search_paths = getattr(o, "compiler_search_paths", default_paths)
-        arguments.extend(arguments_to_detect_version_fn(o, search_paths))
+    pkg_cls_to_check = [spack.repo.path.get_pkg_class(pkg) for pkg in ["apple-clang"]]
+    detected_compilers = spack.detection.by_executable(pkg_cls_to_check, path_hints=default_paths)
 
-    # Here we map the function arguments to the corresponding calls
-    tp = multiprocessing.pool.ThreadPool()
-    try:
-        detected_versions = tp.map(detect_version, arguments)
-    finally:
-        tp.close()
+    platform = spack.platforms.host()
+    operating_system = platform.operating_system("default_os")
+    target = platform.target("default_target")
 
-    def valid_version(item):
-        value, error = item
-        if error is None:
-            return True
-        try:
-            # This will fail on Python 2.6 if a non ascii
-            # character is in the error
-            tty.debug(error)
-        except UnicodeEncodeError:
-            pass
-        return False
+    compilers = []
+    for name, detected in detected_compilers.items():
+        for entry in detected:
+            compiler_cls = spack.compilers.class_for_compiler_name(name)
+            spec = spack.spec.CompilerSpec(entry.spec.name, f"={entry.spec.versions}")
+            paths = [
+                entry.spec.extra_attributes["compilers"].get(x, None)
+                for x in ("c", "cxx", "f77", "fc")
+            ]
+            compilers.append(compiler_cls(spec, str(operating_system), str(target), paths))
 
-    def remove_errors(item):
-        value, _ = item
-        return value
-
-    return make_compiler_list(map(remove_errors, filter(valid_version, detected_versions)))
+    return compilers
 
 
 def find_new_compilers(path_hints=None, scope=None):

lib/spack/spack/modules/lmod.py

@@ -7,7 +7,7 @@
 import itertools
 import os.path
 import posixpath
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 import llnl.util.lang as lang
 
@@ -56,7 +56,7 @@ def make_context(spec, module_set_name, explicit):
     return LmodContext(conf)
 
 
-def guess_core_compilers(name, store=False):
+def guess_core_compilers(name, store=False) -> List[spack.spec.CompilerSpec]:
     """Guesses the list of core compilers installed in the system.
 
     Args:
@@ -64,21 +64,19 @@ def guess_core_compilers(name, store=False):
             modules.yaml configuration file
 
     Returns:
-        List of core compilers, if found, or None
+        List of found core compilers
     """
     core_compilers = []
-    for compiler_config in spack.compilers.all_compilers_config():
+    for compiler in spack.compilers.all_compilers():
         try:
-            compiler = compiler_config["compiler"]
             # A compiler is considered to be a core compiler if any of the
             # C, C++ or Fortran compilers reside in a system directory
             is_system_compiler = any(
-                os.path.dirname(x) in spack.util.environment.SYSTEM_DIRS
-                for x in compiler["paths"].values()
-                if x is not None
+                os.path.dirname(getattr(compiler, x, "")) in spack.util.environment.SYSTEM_DIRS
+                for x in ("cc", "cxx", "f77", "fc")
             )
             if is_system_compiler:
-                core_compilers.append(str(compiler["spec"]))
+                core_compilers.append(compiler.spec)
         except (KeyError, TypeError, AttributeError):
             continue
 
@@ -89,10 +87,10 @@ def guess_core_compilers(name, store=False):
         modules_cfg = spack.config.get(
             "modules:" + name, {}, scope=spack.config.default_modify_scope()
         )
-        modules_cfg.setdefault("lmod", {})["core_compilers"] = core_compilers
+        modules_cfg.setdefault("lmod", {})["core_compilers"] = [str(x) for x in core_compilers]
         spack.config.set("modules:" + name, modules_cfg, scope=spack.config.default_modify_scope())
 
-    return core_compilers or None
+    return core_compilers
 
 
 class LmodConfiguration(BaseConfiguration):
@@ -104,7 +102,7 @@ class LmodConfiguration(BaseConfiguration):
     default_projections = {"all": posixpath.join("{name}", "{version}")}
 
     @property
-    def core_compilers(self):
+    def core_compilers(self) -> List[spack.spec.CompilerSpec]:
         """Returns the list of "Core" compilers
 
         Raises:
@@ -112,14 +110,18 @@ def core_compilers(self):
                 specified in the configuration file or the sequence
                 is empty
         """
-        value = configuration(self.name).get("core_compilers") or guess_core_compilers(
-            self.name, store=True
-        )
+        compilers = [
+            spack.spec.CompilerSpec(c) for c in configuration(self.name).get("core_compilers", [])
+        ]
 
-        if not value:
+        if not compilers:
+            compilers = guess_core_compilers(self.name, store=True)
+
+        if not compilers:
             msg = 'the key "core_compilers" must be set in modules.yaml'
             raise CoreCompilersNotFoundError(msg)
-        return value
+
+        return compilers
 
     @property
     def core_specs(self):
@@ -283,16 +285,18 @@ def token_to_path(self, name, value):
 
         # If we are dealing with a core compiler, return 'Core'
         core_compilers = self.conf.core_compilers
-        if name == "compiler" and str(value) in core_compilers:
+        if name == "compiler" and any(
+            spack.spec.CompilerSpec(value).satisfies(c) for c in core_compilers
+        ):
             return "Core"
 
-        # CompilerSpec does not have an hash, as we are not allowed to
+        # CompilerSpec does not have a hash, as we are not allowed to
         # use different flavors of the same compiler
         if name == "compiler":
             return path_part_fmt.format(token=value)
 
         # In case the hierarchy token refers to a virtual provider
-        # we need to append an hash to the version to distinguish
+        # we need to append a hash to the version to distinguish
         # among flavors of the same library (e.g. openblas~openmp vs.
         # openblas+openmp)
         path = path_part_fmt.format(token=value)

lib/spack/spack/package.py

@@ -108,6 +108,5 @@
 # These are just here for editor support; they will be replaced when the build env
 # is set up.
 make = MakeExecutable("make", jobs=1)
-gmake = MakeExecutable("gmake", jobs=1)
 ninja = MakeExecutable("ninja", jobs=1)
 configure = Executable(join_path(".", "configure"))

lib/spack/spack/spec.py

@@ -679,6 +679,16 @@ def from_dict(d):
         d = d["compiler"]
         return CompilerSpec(d["name"], vn.VersionList.from_dict(d))
 
+    @property
+    def display_str(self):
+        """Equivalent to {compiler.name}{@compiler.version} for Specs, without extra
+        @= for readability."""
+        if self.concrete:
+            return f"{self.name}@{self.version}"
+        elif self.versions != vn.any_version:
+            return f"{self.name}@{self.versions}"
+        return self.name
+
     def __str__(self):
         out = self.name
         if self.versions and self.versions != vn.any_version:
@@ -1730,14 +1740,14 @@ def traverse_edges(self, **kwargs):
     def short_spec(self):
         """Returns a version of the spec with the dependencies hashed
         instead of completely enumerated."""
-        spec_format = "{name}{@version}{%compiler}"
+        spec_format = "{name}{@version}{%compiler.name}{@compiler.version}"
         spec_format += "{variants}{arch=architecture}{/hash:7}"
         return self.format(spec_format)
 
     @property
     def cshort_spec(self):
         """Returns an auto-colorized version of ``self.short_spec``."""
-        spec_format = "{name}{@version}{%compiler}"
+        spec_format = "{name}{@version}{%compiler.name}{@compiler.version}"
         spec_format += "{variants}{arch=architecture}{/hash:7}"
         return self.cformat(spec_format)
 

lib/spack/spack/test/cmd/compiler.py

@@ -204,8 +204,8 @@ def test_compiler_find_mixed_suffixes(no_compilers_yaml, working_env, clangdir):
     os.environ["PATH"] = str(clangdir)
     output = compiler("find", "--scope=site")
 
-    assert "clang@=11.0.0" in output
-    assert "gcc@=8.4.0" in output
+    assert "clang@11.0.0" in output
+    assert "gcc@8.4.0" in output
 
     config = spack.compilers.get_compiler_config("site", False)
     clang = next(c["compiler"] for c in config if c["compiler"]["spec"] == "clang@=11.0.0")
@@ -246,8 +246,8 @@ def test_compiler_find_prefer_no_suffix(no_compilers_yaml, working_env, clangdir
     os.environ["PATH"] = str(clangdir)
     output = compiler("find", "--scope=site")
 
-    assert "clang@=11.0.0" in output
-    assert "gcc@=8.4.0" in output
+    assert "clang@11.0.0" in output
+    assert "gcc@8.4.0" in output
 
     config = spack.compilers.get_compiler_config("site", False)
     clang = next(c["compiler"] for c in config if c["compiler"]["spec"] == "clang@=11.0.0")

lib/spack/spack/test/cmd/env.py

@@ -3299,3 +3299,22 @@ def test_environment_created_in_users_location(mutable_config, tmpdir):
     assert dir_name in out
     assert env_dir in ev.root(dir_name)
     assert os.path.isdir(os.path.join(env_dir, dir_name))
+
+
+def test_environment_created_from_lockfile_has_view(mock_packages, tmpdir):
+    """When an env is created from a lockfile, a view should be generated for it"""
+    env_a = str(tmpdir.join("a"))
+    env_b = str(tmpdir.join("b"))
+
+    # Create an environment and install a package in it
+    env("create", "-d", env_a)
+    with ev.Environment(env_a):
+        add("libelf")
+        install("--fake")
+
+    # Create another environment from the lockfile of the first environment
+    env("create", "-d", env_b, os.path.join(env_a, "spack.lock"))
+
+    # Make sure the view was created
+    with ev.Environment(env_b) as e:
+        assert os.path.isdir(e.view_path_default)

lib/spack/spack/test/data/modules/lmod/complex_hierarchy.yaml

@@ -4,7 +4,7 @@ lmod:
   hash_length: 0
 
   core_compilers:
-    - 'clang@3.3'
+    - 'clang@12.0.0'
 
   core_specs:
     - 'mpich@3.0.1'

lib/spack/spack/test/data/modules/lmod/core_compilers.yaml

@@ -0,0 +1,5 @@
+enable:
+  - lmod
+lmod:
+  core_compilers:
+    - 'clang@12.0.0'

lib/spack/spack/test/data/modules/lmod/core_compilers_at_equal.yaml

@@ -0,0 +1,5 @@
+enable:
+  - lmod
+lmod:
+  core_compilers:
+    - 'clang@=12.0.0'

lib/spack/spack/test/modules/lmod.py

@@ -45,6 +45,18 @@ def provider(request):
 
 @pytest.mark.usefixtures("config", "mock_packages")
 class TestLmod(object):
+    @pytest.mark.regression("37788")
+    @pytest.mark.parametrize("modules_config", ["core_compilers", "core_compilers_at_equal"])
+    def test_layout_for_specs_compiled_with_core_compilers(
+        self, modules_config, module_configuration, factory
+    ):
+        """Tests that specs compiled with core compilers are in the 'Core' folder. Also tests that
+        we can use both ``compiler@version`` and ``compiler@=version`` to specify a core compiler.
+        """
+        module_configuration(modules_config)
+        module, spec = factory("libelf%clang@12.0.0")
+        assert "Core" in module.layout.available_path_parts
+
     def test_file_layout(self, compiler, provider, factory, module_configuration):
         """Tests the layout of files in the hierarchy is the one expected."""
         module_configuration("complex_hierarchy")
@@ -61,7 +73,7 @@ def test_file_layout(self, compiler, provider, factory, module_configuration):
         # is transformed to r"Core" if the compiler is listed among core
         # compilers
         # Check that specs listed as core_specs are transformed to "Core"
-        if compiler == "clang@=3.3" or spec_string == "mpich@3.0.1":
+        if compiler == "clang@=12.0.0" or spec_string == "mpich@3.0.1":
             assert "Core" in layout.available_path_parts
         else:
             assert compiler.replace("@=", "/") in layout.available_path_parts

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

@@ -31,6 +31,7 @@ class Aml(AutotoolsPackage):
     # version string is generated from git tags, requires entire repo
     version("master", branch="master", submodules=True, get_full_repo=True)
 
+    version("0.2.1", sha256="bae49e89ed0f2a2ad3547430e79b7e4c018d6228c6ed951a12d59afd0b35f71c")
     version("0.2.0", sha256="2044a2f3f1d7a19827dd9c0726172b690189b4d3fe938656c4160c022468cc4a")
     version(
         "0.1.0",
@@ -45,10 +46,12 @@ class Aml(AutotoolsPackage):
     variant("ze", default=False, description="Support for memory operations on top of Level Zero.")
     variant("hip", default=False, description="Support for memory operations on top of HIP.")
     variant("cuda", default=False, description="Support for memory operations on top of CUDA.")
-    variant("hwloc", default=False, description="Enable feature related to topology management")
+    variant("hwloc", default=True, description="Enable feature related to topology management")
     variant(
         "hip-platform",
-        values=disjoint_sets(("amd", "nvidia")),
+        values=("none", conditional("amd", when="+hip"), conditional("nvidia", when="+cuda")),
+        default="none",
+        multi=False,
         description="HIP backend platform.",
     )
 
@@ -68,6 +71,10 @@ class Aml(AutotoolsPackage):
     depends_on("hwloc@2.1:", when="+hwloc")
     # - ocl-icd >= 2.1 becomes a dependency when +opencl variant is used.
     depends_on("ocl-icd@2.1:", when="+opencl")
+    # Required on master for autoconf pull the right pkg.m4 macros,
+    # and on other builds to detect dependencies
+    # Note: This does NOT work with pkg-config but requires pkgconf!
+    depends_on("pkgconf", type="build")
 
     # when on master, we need all the autotools and extras to generate files.
     with when("@master"):
@@ -75,9 +82,6 @@ class Aml(AutotoolsPackage):
         depends_on("autoconf", type="build")
         depends_on("automake", type="build")
         depends_on("libtool", type="build")
-        # Required to have pkg config macros in configure.
-        # Note: This does NOT work with pkg-config but requires pkgconf!
-        depends_on("pkgconf", type="build")
         # Required to generate AML version in configure.
         depends_on("git", type="build")
 
@@ -91,9 +95,9 @@ def configure_args(self):
             config_args.extend(self.with_or_without(b))
         if self.spec.satisfies("%oneapi"):
             config_args += ["--with-openmp-flags=-fiopenmp -fopenmp-targets=spir64"]
-        if "hip-platform=amd" in self.spec:
+        if self.spec.variants["hip-platform"].value == "amd":
             config_args += ["--with-hip-platform=amd"]
-        if "hip-platform=nvidia" in self.spec:
+        if self.spec.variants["hip-platform"].value == "nvidia":
             config_args += ["--with-hip-platform=nvidia"]
         return config_args
 

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

@@ -17,6 +17,7 @@ class AmqpCpp(CMakePackage):
 
     maintainers("lpottier")
 
+    version("4.3.24", sha256="c3312f8af813cacabf6c257dfaf41bf9e66606bbf7d62d085a9b7da695355245")
     version("4.3.19", sha256="ca29bb349c498948576a4604bed5fd3c27d87240b271a4441ccf04ba3797b31d")
 
     variant(

var/spack/repos/builtin/packages/apple-clang/package.py

@@ -0,0 +1,38 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+import os
+
+from spack.package import *
+import spack.compilers.apple_clang
+
+
+class AppleClang(Package):
+    def install(self, spec, prefix):
+        raise NotImplementedError
+
+    executables = [r"^clang\+\+", r"^clang"]
+
+    @classmethod
+    def determine_version(cls, exe):
+        try:
+            output = spack.compiler.get_compiler_version_output(exe, "--version")
+        except Exception:
+            output = ""
+
+        version = spack.compilers.apple_clang.AppleClang.extract_version_from_output(output)
+        if version == "unknown":
+            return None
+        return version
+
+    @classmethod
+    def determine_variants(cls, exes, version_str):
+        compilers = {}
+        for exe in exes:
+            basename = os.path.basename(exe)
+            if basename == "clang":
+                compilers["c"] = exe
+            elif basename == "clang++":
+                compilers["cxx"] = exe
+        return "", {"compilers": compilers}

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

@@ -25,7 +25,8 @@ class Babelstream(CMakePackage, CudaPackage, ROCmPackage):
     version("4.0", sha256="a9cd39277fb15d977d468435eb9b894f79f468233f0131509aa540ffda4f5953")
     version("main", branch="main")
     version("develop", branch="develop")
-    maintainers("tomdeakin", "kaanolgu" "tom91136", "robj0nes")
+
+    maintainers("tomdeakin", "kaanolgu", "tom91136", "robj0nes")
 
     # Languages
     # Also supported variants are cuda and rocm (for HIP)

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

@@ -106,7 +106,7 @@ def edit(self, spec, prefix):
 
     def build(self, spec, prefix):
         with working_dir("lib"):
-            gmake("all")
+            make("all")
 
     def install(self, spec, prefix):
         with working_dir("lib"):

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

@@ -43,6 +43,7 @@ class Conduit(CMakePackage):
     # is to bridge any spack dependencies that are still using the name master
     version("master", branch="develop", submodules=True)
     # note: 2021-05-05 latest tagged release is now preferred instead of develop
+    version("0.8.8", sha256="99811e9c464b6f841f52fcd47e982ae47cbb01cba334cff43eabe13eea58c0df")
     version("0.8.7", sha256="f3bf44d860783f4e0d61517c5e280c88144af37414569f4cf86e2d29b3ba5293")
     version("0.8.6", sha256="8ca5d37033143ed7181c7286dd25a3f6126ba0358889066f13a2b32f68fc647e")
     version("0.8.5", sha256="b4a6f269a81570a4597e2565927fd0ed2ac45da0a2500ce5a71c26f7c92c5483")

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

@@ -20,6 +20,7 @@ class Dlb(AutotoolsPackage):
     maintainers("vlopezh")
 
     version("main", branch="main")
+    version("3.3.1", sha256="1b245acad80b03eb83e815fd59dcfc598cfddd899de4504cf6a9572fe5359f40")
     version("3.3", sha256="55b87aea14f3954d8878912f3134938db235e6984fae26fdf5134148007eb722")
     version("3.2", sha256="b1c65ce3179b5275cfdf0bf921c0565a4a3ebcfdab72d7cef014957c17136c7e")
     version("3.1", sha256="d63ee89429fdb54af5510ed956f86d11561911a7860b46324f25200d32d0d333")

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

@@ -20,6 +20,7 @@ class FluxSecurity(AutotoolsPackage):
     maintainers("grondo")
 
     version("master", branch="master")
+    version("0.9.0", sha256="2258120c6f32ca0b5b13b166bae56d9bd82a44c6eeaa6bc6187e4a4419bdbcc0")
     version("0.8.0", sha256="9963628063b4abdff6bece03208444c8f23fbfda33c20544c48b21e9f4819ce2")
 
     # Need autotools when building on master:

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

@@ -14,6 +14,8 @@ class Formetis(CMakePackage):
 
     maintainers("sethrj")
 
+    test_requires_compiler = True
+
     version("0.0.2", sha256="0067c03ca822f4a3955751acb470f21eed489256e2ec5ff24741eb2b638592f1")
 
     variant("mpi", default=False, description="Enable ParMETIS support")
@@ -53,8 +55,8 @@ def cached_tests_work_dir(self):
         """The working directory for cached test sources."""
         return join_path(self.test_suite.current_test_cache_dir, self.examples_src_dir)
 
-    def test(self):
-        """Perform stand-alone/smoke tests on the installed package."""
+    def test_metis(self):
+        """build and run metis"""
         cmake_args = [
             self.define("CMAKE_PREFIX_PATH", self.prefix),
             self.define("CMAKE_Fortran_COMPILER", self.compiler.fc),
@@ -63,20 +65,11 @@ def test(self):
         if "+mpi" in self.spec:
             cmake_args.append(self.define("ParMETIS_ROOT", self.spec["parmetis"].prefix))
         cmake_args.append(self.cached_tests_work_dir)
+        cmake = which(self.spec["cmake"].prefix.bin.cmake)
+        make = which("make")
 
-        self.run_test(
-            "cmake", cmake_args, purpose="test: calling cmake", work_dir=self.cached_tests_work_dir
-        )
-
-        self.run_test(
-            "make", [], purpose="test: building the tests", work_dir=self.cached_tests_work_dir
-        )
-
-        self.run_test(
-            "metis",
-            [],
-            [],
-            purpose="test: checking the installation",
-            installed=False,
-            work_dir=self.cached_tests_work_dir,
-        )
+        with working_dir(self.cached_tests_work_dir):
+            cmake(*cmake_args)
+            make()
+            metis = which("metis")
+            metis()

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

@@ -91,27 +91,20 @@ def setup_smoke_tests(self):
         install test subdirectory for use during `spack test run`."""
         self.cache_extra_test_sources([self.examples_src_dir])
 
-    def test(self):
-        """Perform stand-alone/smoke tests using installed package."""
+    def test_installation(self):
+        """build and run ctest against the installed software"""
         cmake_args = [
             self.define("CMAKE_PREFIX_PATH", self.prefix),
             self.define("CMAKE_CXX_COMPILER", self.compiler.cxx),
             self.define("CMAKE_Fortran_COMPILER", self.compiler.fc),
             self.cached_tests_work_dir,
         ]
-        self.run_test(
-            "cmake", cmake_args, purpose="test: calling cmake", work_dir=self.cached_tests_work_dir
-        )
+        cmake = which(self.spec["cmake"].prefix.bin.cmake)
+        ctest = which("ctest")
+        make = which("make")
 
-        self.run_test(
-            "make", [], purpose="test: calling make", work_dir=self.cached_tests_work_dir
-        )
-
-        self.run_test(
-            "ctest",
-            ["-V"],
-            ["100% tests passed"],
-            installed=False,
-            purpose="test: testing the installation",
-            work_dir=self.cached_tests_work_dir,
-        )
+        with working_dir(self.cached_tests_work_dir, create=True):
+            cmake(*cmake_args)
+            make()
+            out = ctest("-V", output=str.split, error=str.split)
+            assert "100% tests passed" in out

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

@@ -2,9 +2,7 @@
 # Spack Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
-import os
 import re
-import shutil
 
 from spack.package import *
 
@@ -15,38 +13,30 @@ class Fzf(MakefilePackage):
     homepage = "https://github.com/junegunn/fzf"
     url = "https://github.com/junegunn/fzf/archive/0.17.5.tar.gz"
 
+    maintainers("alecbcs")
+
     executables = ["^fzf$"]
 
-    version("0.22.0", sha256="3090748bb656333ed98490fe62133760e5da40ba4cd429a8142b4a0b69d05586")
-    version("0.17.5", sha256="de3b39758e01b19bbc04ee0d5107e14052d3a32ce8f40d4a63d0ed311394f7ee")
-    version("0.17.4", sha256="a4b009638266b116f422d159cd1e09df64112e6ae3490964db2cd46636981ff0")
-    version("0.17.3", sha256="e843904417adf926613431e4403fded24fade56269446e92aac6ff1db86af81e")
-    version("0.17.1", sha256="9c881e55780c0f56b5a30b87df756634d853bfd3938e7e53cb2df6ed63aa84a7")
-    version("0.17.0-2", sha256="a084415231b452b92a6b8aa87a69c0c02ee59bfe95774bf0d4fcc9a6251ece20")
-    version("0.17.0", sha256="23569faf64cd6831c09aad7030c8b4bace0eb7a979c580b33cc4e4f9ff303e29")
-    version("0.16.11", sha256="e3067d4ad58d7be51eba9a35c06518cd7145c0cc297882796c7e40285f268a99")
-    version("0.16.10", sha256="a6b9d8abcba4239d30201cc7911e9c305a5cd750081ce5cd389f8e7425f4dc93")
-    version("0.16.9", sha256="dd9434576c68313481613a5bd52dbf623eee37a5c87f7bb66ca71ac8add5ff94")
-    version("0.16.8", sha256="daef99f67cff3dad261dbcf2aef995bb78b360bcc7098d7230cb11674e1ee1d4")
+    version("0.40.0", sha256="9597f297a6811d300f619fff5aadab8003adbcc1566199a43886d2ea09109a65")
 
-    depends_on("go@1.11:", type="build")
+    depends_on("go@1.17:", type="build")
 
     variant("vim", default=False, description="Install vim plugins for fzf")
 
-    patch("github_mirrors.patch", when="@:0.17.5")
-
     @classmethod
     def determine_version(cls, exe):
-        candidate = Executable(exe)("--version", output=str, error=str)
-        match = re.match(r"(^[\d.]+)", candidate)
+        output = Executable(exe)("--version", output=str, error=str)
+        match = re.match(r"(^[\d.]+)", output)
         return match.group(1) if match else None
 
-    @when("@:0.17.5")
-    def patch(self):
-        glide_home = os.path.join(self.build_directory, "glide_home")
-        os.environ["GLIDE_HOME"] = glide_home
-        shutil.rmtree(glide_home, ignore_errors=True)
-        os.mkdir(glide_home)
+    def setup_build_environment(self, env):
+        # Point GOPATH at the top of the staging dir for the build step.
+        env.prepend_path("GOPATH", self.stage.path)
+
+        # Set required environment variables since we
+        # are not using git to pull down the repository.
+        env.set("FZF_VERSION", self.spec.version)
+        env.set("FZF_REVISION", "tarball")
 
     def install(self, spec, prefix):
         make("install")
@@ -54,6 +44,9 @@ def install(self, spec, prefix):
         mkdir(prefix.bin)
         install("bin/fzf", prefix.bin)
 
+        mkdirp(prefix.share.fzf.shell)
+        install_tree("shell", prefix.share.fzf.shell)
+
     @run_after("install")
     def post_install(self):
         if "+vim" in self.spec:

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

@@ -56,7 +56,7 @@ class Gmake(AutotoolsPackage, GNUMirrorPackage):
 
     tags = ["build-tools"]
 
-    executables = ["^g?make$"]
+    executables = ["^make$"]
 
     @classmethod
     def determine_version(cls, exe):
@@ -84,6 +84,3 @@ def setup_dependent_package(self, module, dspec):
         module.make = MakeExecutable(
             self.spec.prefix.bin.make, determine_number_of_jobs(parallel=dspec.package.parallel)
         )
-        module.gmake = MakeExecutable(
-            self.spec.prefix.bin.gmake, determine_number_of_jobs(parallel=dspec.package.parallel)
-        )

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

@@ -18,13 +18,10 @@ class Harfbuzz(MesonPackage, AutotoolsPackage):
         conditional("autotools", when="@:2.9"), conditional("meson", when="@3:"), default="meson"
     )
 
+    version("7.3.0", sha256="20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb")
     version("7.2.0", sha256="fc5560c807eae0efd5f95b5aa4c65800c7a8eed6642008a6b1e7e3ffff7873cc")
     version("6.0.0", sha256="1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4")
-    version(
-        "5.3.1",
-        sha256="4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d",
-        preferred=True,
-    )
+    version("5.3.1", sha256="4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d")
     version("5.1.0", sha256="2edb95db668781aaa8d60959d21be2ff80085f31b12053cdd660d9a50ce84f05")
     version("4.2.1", sha256="bd17916513829aeff961359a5ccebba6de2f4bf37a91faee3ac29c120e3d7ee1")
     version("4.1.0", sha256="f7984ff4241d4d135f318a93aa902d910a170a8265b7eaf93b5d9a504eed40c8")

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

@@ -24,10 +24,12 @@ class Hipsycl(CMakePackage):
     provides("sycl")
 
     version("stable", branch="stable", submodules=True)
+    version("0.9.4", commit="99d9e24d462b35e815e0e59c1b611936c70464ae", submodules=True)
     version("0.9.3", commit="51507bad524c33afe8b124804091b10fa25618dc", submodules=True)
     version("0.9.2", commit="49fd02499841ae884c61c738610e58c27ab51fdb", submodules=True)
     version("0.9.1", commit="fe8465cd5399a932f7221343c07c9942b0fe644c", submodules=True)
     version("0.8.0", commit="2daf8407e49dd32ebd1c266e8e944e390d28b22a", submodules=True)
+    version("develop", branch="develop", submodules=True)
 
     variant("cuda", default=False, description="Enable CUDA backend for SYCL kernels")
 
@@ -37,6 +39,8 @@ class Hipsycl(CMakePackage):
     depends_on("python@3:")
     depends_on("llvm@8: +clang", when="~cuda")
     depends_on("llvm@9: +clang", when="+cuda")
+    # https://github.com/OpenSYCL/OpenSYCL/pull/918 was introduced after 0.9.4
+    conflicts("llvm@16:", when="@:0.9.4")
     # LLVM PTX backend requires cuda7:10.1 (https://tinyurl.com/v82k5qq)
     depends_on("cuda@9:10.1", when="@0.8.1: +cuda ^llvm@9")
     depends_on("cuda@9:", when="@0.8.1: +cuda ^llvm@10:")

var/spack/repos/builtin/packages/intel-xed/libxed-ild.patch

@@ -0,0 +1,32 @@
+Fixes a bug where libxed-ild didn't understand some instructions.
+
+https://github.com/intelxed/xed/issues/298
+
+
+diff --git a/src/dec/xed-ild.c b/src/dec/xed-ild.c
+index 8bf7cbe..0ab90ac 100644
+--- a/src/dec/xed-ild.c
++++ b/src/dec/xed-ild.c
+@@ -1385,6 +1385,7 @@ void xed_ild_lookup_init(void) {
+ void xed_ild_init(void) {
+     init_prefix_table();
+     xed_ild_lookup_init();
++    xed_init_chip_model_info();
+ #if defined(XED_EXTENSION_XOP_DEFINED) 
+     xed_ild_chip_init();
+ #endif
+diff --git a/xed_mbuild.py b/xed_mbuild.py
+index db34179..5a7842c 100755
+--- a/xed_mbuild.py
++++ b/xed_mbuild.py
+@@ -1081,7 +1081,8 @@ def build_xed_ild_library(env, lib_env, lib_dag, sources_to_replace):
+                        'xed-ild-disp-l3.c',         # generated
+                        'xed-ild-eosz.c',            # generated
+                        'xed-ild-easz.c',            # generated
+-                       'xed-ild-imm-l3.c']          # generated
++                       'xed-ild-imm-l3.c',          # generated
++                       'xed-error-enum.c',]         # generated
+     common_objs = lib_env.make_obj(common_sources)
+     
+     ild_objs += xbc.build_dir_join(lib_env, common_objs)
+

var/spack/repos/builtin/packages/intel-xed/package.py

@@ -21,6 +21,7 @@ class IntelXed(Package):
 
     # Current versions now have actual releases and tags.
     version("main", branch="main")
+    version("2023.04.16", tag="v2023.04.16")
     version("2022.10.11", tag="v2022.10.11")
     version("2022.08.11", tag="v2022.08.11")
     version("2022.04.17", tag="v2022.04.17")
@@ -28,30 +29,31 @@ class IntelXed(Package):
     version("11.2.0", tag="11.2.0")
 
     # The old 2019.03.01 version (before there were tags).
-    version("10.2019.03", commit="b7231de4c808db821d64f4018d15412640c34113")
+    version("10.2019.03", commit="b7231de4c808db821d64f4018d15412640c34113", deprecated=True)
 
-    resource(name="mbuild", placement="mbuild", git=mbuild_git, branch="main", when="@main")
+    # XED wants the mbuild directory adjacent to xed in the same directory.
+    mdir = join_path("..", "mbuild")
 
+    resource(name="mbuild", placement=mdir, git=mbuild_git, branch="main", when="@main")
+
+    # Match xed more closely with the version of mbuild at the time.
     resource(
-        name="mbuild",
-        placement="mbuild",
-        git=mbuild_git,
-        commit="09b6654be0c52bf1df44e88c88b411a67b624cbd",
-        when="@:9999",
+        name="mbuild", placement=mdir, git=mbuild_git, tag="v2022.07.28", when="@2022.07:9999"
     )
 
+    resource(name="mbuild", placement=mdir, git=mbuild_git, tag="v2022.04.17", when="@:2022.06")
+
     variant("debug", default=False, description="Enable debug symbols")
     variant("pic", default=False, description="Compile with position independent code.")
 
     # The current mfile uses python3 by name.
-    depends_on("python@3.4:", type="build")
+    depends_on("python@3.6:", type="build")
 
     patch("1201-segv.patch", when="@12.0.1")
     patch("2019-python3.patch", when="@10.2019.03")
+    patch("libxed-ild.patch", when="@12.0:2022.12")
 
-    conflicts("target=ppc64:", msg="intel-xed only runs on x86")
-    conflicts("target=ppc64le:", msg="intel-xed only runs on x86")
-    conflicts("target=aarch64:", msg="intel-xed only runs on x86")
+    requires("target=x86_64:", msg="intel-xed only runs on x86/x86_64")
 
     mycflags = []  # type: List[str]
 
@@ -67,10 +69,19 @@ def flag_handler(self, name, flags):
 
     def install(self, spec, prefix):
         # XED needs PYTHONPATH to find the mbuild directory.
-        mbuild_dir = join_path(self.stage.source_path, "mbuild")
+        mbuild_dir = join_path(self.stage.source_path, "..", "mbuild")
         python_path = os.getenv("PYTHONPATH", "")
         os.environ["PYTHONPATH"] = mbuild_dir + ":" + python_path
 
+        # In 2023.04.16, the xed source directory must be exactly 'xed',
+        # so add a symlink, but don't fail if the link already exists.
+        # See: https://github.com/intelxed/xed/issues/300
+        try:
+            lname = join_path(self.stage.source_path, "..", "xed")
+            os.symlink("spack-src", lname)
+        except OSError:
+            pass
+
         mfile = Executable(join_path(".", "mfile.py"))
 
         args = ["-j", str(make_jobs), "--cc=%s" % spack_cc, "--no-werror"]

var/spack/repos/builtin/packages/legion/hip-offload-arch.patch

@@ -0,0 +1,24 @@
+diff -ruN spack-src/CMakeLists.txt spack-src-patched/CMakeLists.txt
+--- spack-src/CMakeLists.txt	2023-05-18 14:18:00.897162488 -0400
++++ spack-src-patched/CMakeLists.txt	2023-05-18 14:20:09.532413649 -0400
+@@ -495,7 +495,7 @@
+     if("${Legion_HIP_ARCH}" STREQUAL "")
+       set(HIP_GENCODE "")
+     else()
+-      set(HIP_GENCODE "--offload-target=${Legion_HIP_ARCH}")
++      set(HIP_GENCODE "--offload-arch=${Legion_HIP_ARCH}")
+     endif()
+   endif()
+ 
+diff -ruN spack-src/runtime/runtime.mk spack-src-patched/runtime/runtime.mk
+--- spack-src/runtime/runtime.mk	2023-05-18 14:18:00.969164248 -0400
++++ spack-src-patched/runtime/runtime.mk	2023-05-18 14:20:51.317470176 -0400
+@@ -499,7 +499,7 @@
+       HIPCC_FLAGS	+= -O2
+     endif
+     ifneq ($(strip $(HIP_ARCH)),)
+-      HIPCC_FLAGS	+= --offload-target=$(HIP_ARCH)
++      HIPCC_FLAGS	+= --offload-arch=$(HIP_ARCH)
+     endif
+     LEGION_LD_FLAGS	+= -lm -L$(HIP_PATH)/lib -lamdhip64
+   else ifeq ($(strip $(HIP_TARGET)),CUDA)

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

@@ -70,6 +70,9 @@ class Legion(CMakePackage, ROCmPackage):
     depends_on("kokkos@3.3.01:~cuda", when="+kokkos~cuda")
     depends_on("kokkos@3.3.01:~cuda+openmp", when="+kokkos+openmp")
 
+    # https://github.com/spack/spack/issues/37232#issuecomment-1553376552
+    patch("hip-offload-arch.patch", when="@23.03.0 +rocm")
+
     # HIP specific
     variant(
         "hip_hijack",

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

@@ -15,6 +15,7 @@ class Libjwt(AutotoolsPackage):
 
     maintainers("bollig")
 
+    version("1.15.3", sha256="cb2fd95123689e7d209a3a8c060e02f68341c9a5ded524c0cd881a8cd20d711f")
     version("1.15.2", sha256="a366531ad7d5d559b1f8c982e7bc7cece7eaefacf7e91ec36d720609c01dc410")
     version("1.13.1", sha256="4df55ac89c6692adaf3badb43daf3241fd876612c9ab627e250dfc4bb59993d9")
     version("1.12.1", sha256="d29e4250d437340b076350e910e69fd5539ef8b92528d0306745cec0e343cc17")

var/spack/repos/builtin/packages/libpressio-nvcomp/package.py

@@ -15,6 +15,8 @@ class LibpressioNvcomp(CMakePackage, CudaPackage):
 
     maintainers("robertu94")
 
+    version("0.0.5", sha256="2f2a2567c77db550badaf594cda824fa313470b143f69bcef308eeb80b4876c2")
+    version("0.0.4", sha256="6ff7d0f3167dead7584c994a6a11782f20eb3dd4844307e4ee8b2aebcd8571e9")
     version("0.0.3", sha256="21409d34f9281bfd7b83b74f5f8fc6d34794f3161391405538c060fb59534597")
     version("0.0.2", commit="38d7aa7c283681cbe5b7f17b900f72f9f25be51c")
 

var/spack/repos/builtin/packages/libpressio-opt/package.py

@@ -17,6 +17,8 @@ class LibpressioOpt(CMakePackage):
 
     version("develop", branch="develop")
     version("sdr-develop", branch="develop", git="git@github.com:szcompressor/SDRFramework")
+    version("0.15.0", sha256="0f092ae287e555c890d0ab77df83a7acf619a2b05ab104cef8647df4f886d759")
+    version("0.14.0", sha256="1e8d348f9777f3d49764b22b1f2abefd4b972cb9b1fa27c867373d32c8f1c57d")
     version("0.13.5", sha256="cc0e6a46335aa3552b8ab57757d39855f4fba71e661f706ec99519cb2c8a2f3c")
     version("0.13.4", sha256="e9f715d11fe3558a31e1d9a939150209449ec8636ded047cb0adcd3db07569ae")
     version("0.13.3", sha256="98436b7fa6a53dd9cc09a9b978dc81c299501930cb8b844713080fc42d39d173")
@@ -28,6 +30,8 @@ class LibpressioOpt(CMakePackage):
     version("0.11.0", sha256="cebbc512fcaa537d2af1a6919d6e0400cdc13595d71d9b90b74ad3eb865c9767")
 
     depends_on("libpressio+libdistributed+mpi")
+    depends_on("libpressio@0.93.0:", when="@0.14.0:")
+    depends_on("libpressio@0.95.0:", when="@0.15.0:")
     depends_on("libpressio@0.88.0:", when="@0.13.5:")
     depends_on("libpressio@0.85.0:", when="@0.13.3:")
     depends_on("libpressio@0.66.1:", when="@:0.13.2")

var/spack/repos/builtin/packages/libpressio-rmetric/package.py

@@ -17,6 +17,7 @@ class LibpressioRmetric(CMakePackage):
 
     version("master", branch="master")
     # note versions <= 0.0.3 do not build with spack
+    version("0.0.7", sha256="b01df5102076412064849335c2c928a4a5ba23e1f1f515062d9166b0a7531179")
     version("0.0.6", sha256="b23a79448cd32b51a7301d6cebf4e228289712dd77dd76d86821741467e9af46")
     version("0.0.5", sha256="51eb192314ef083790dd0779864cab527845bd8de699b3a33cd065c248eae24c")
     version("0.0.4", sha256="166af5e84d7156c828a3f0dcc5bf531793ea4ec44bbf468184fbab96e1f0a91f")

var/spack/repos/builtin/packages/libpressio-sperr/package.py

@@ -21,5 +21,6 @@ class LibpressioSperr(CMakePackage):
     depends_on("pkgconfig", type="build")
 
     version("master", branch="master")
+    version("0.0.3", sha256="e0d1fd083419aaaa243cbf780b7de17aeb96533000071088aa21ec238d358ecc")
     version("0.0.2", sha256="61995d687f9e7e798e17ec7238d19d917890dc0ff5dec18293b840c4d6f8c115")
     version("0.0.1", sha256="e2c164822708624b97654046b42abff704594cba6537d6d0646d485bdf2d03ca")

var/spack/repos/builtin/packages/libpressio-tools/package.py

@@ -17,6 +17,8 @@ class LibpressioTools(CMakePackage):
     tags = ["e4s"]
 
     version("master", branch="master")
+    version("0.3.0", sha256="2f309557df3e8df9e492691213933865a5dbfb051c03404e33918f4765223025")
+    version("0.2.0", sha256="75048950f0dfa0e20f2651991875822f36fceb84bdda12d1c0361d49912392b8")
     version("0.1.6", sha256="a67a364f46dea29ff1b3e5c52c0a5abf2d9d53412fb8d424f6bd71252bfa7792")
     version("0.1.5", sha256="b35f495fae53df87dd2abf58c0c51ed17710b16aaa2d0842a543fddd3b2a8035")
     version("0.1.4", sha256="39adc4b09a63548a416ee4b1dcc87ec8578b15a176a11a2845c276c6c211f2d0")
@@ -43,6 +45,7 @@ class LibpressioTools(CMakePackage):
     depends_on("boost")
 
     # 0.1.0 changed a bunch of things in the build system, make sure everything is up to date
+    depends_on("libpressio@0.89.0:", when="@0.2.0:")
     depends_on("libpressio@0.88.0:", when="@0.1.6:")
     depends_on("libpressio@0.85.0:", when="@0.1.0:0.1.5")
     depends_on("libpressio-opt@0.13.3:", when="@0.1.0:+opt")

var/spack/repos/builtin/packages/libpressio-tthresh/package.py

@@ -16,6 +16,7 @@ class LibpressioTthresh(CMakePackage):
     maintainers("robertu94")
 
     version("main", branch="main")
+    version("0.0.7", sha256="5e364ef72dd1ed1cf786d2b7aef89624fdcf1a0ca845777ce54c365b35a75be2")
     version("0.0.6", sha256="e9dc4754421d892a86516c6bb892f6ff582e9ea3c242c1c052104e4f6944cbec")
     version("0.0.5", sha256="af47c90e9c16825312e390a7fb30d9d128847afb69ad6c2f6608bd80f60bae23")
     version("0.0.3", sha256="b0b0a4876d3362deafc2bb326be33882132e3d1666e0c5f916fd6fad74a18688")

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

@@ -20,6 +20,12 @@ class Libpressio(CMakePackage, CudaPackage):
     tests_require_compiler = True
     version("master", branch="master")
     version("develop", branch="develop")
+    version("0.95.1", sha256="c2e4f81d1491781cd47f2baba64acfbba9a7d6203c9b01369f8b1a8f94e0bb2b")
+    version("0.94.0", sha256="4250597cdd54043a7d5009ffc3feea3eac9496cdd38ea3f61f9727b7acd09add")
+    version("0.93.0", sha256="1da5940aaf0190a810988dcd8f415b9c8db53bbbdfcb627d899921c89170d990")
+    version("0.92.0", sha256="e9cab155deb07aabdca4ece2c826be905ed33f16c95f82f24eb01d181fce6109")
+    version("0.91.1", sha256="35cd4b93e410a83c626c9c168d59ade3bf26a453bcbf50dfd77b6d141184b97c")
+    version("0.91.0", sha256="6220988dc964c36cdffdbc5e055261ac7a0189ad80b67a962189683648209d2e")
     version("0.90.2", sha256="1fe3f4073952a96bda1b3d7c237bc5d64d1f7bf13bfe1830074852ea33006bf9")
     version("0.88.3", sha256="b2df2ed11f77eb2e07206f7bdfa4754017559017235c3324820021ef451fd48b")
     version("0.88.2", sha256="f5de6aff5ff906b164d6b2199ada10a8e32fb1e2a6295da3f0b79d9626661a46")
@@ -329,6 +335,7 @@ def cmake_args(self):
             args.append("-DLIBPRESSIO_HAS_SZ3=ON")
         if "+cuda" in self.spec:
             args.append("-DLIBPRESSIO_HAS_CUFILE=ON")
+            args.append("-DLIBPRESSIO_HAS_CUDA=ON")
         if "+mgardx" in self.spec:
             args.append("-DLIBPRESSIO_HAS_MGARDx=ON")
         if "+bzip2" in self.spec:

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

@@ -16,6 +16,8 @@ class Libstdcompat(CMakePackage):
     maintainers("robertu94")
 
     version("master", branch="master")
+    version("0.0.17", sha256="8c8a3f2727dd28c51ab10e02a1114e39b683d6d9ea119d5c2a953f8c41d6bedd")
+    version("0.0.16", sha256="1287251b694adb80210536ab6eb75c1ff2c4ed8b77023208a757ae27c9dae0bb")
     version("0.0.15", sha256="af374a8883a32d874f6cd18cce4e4344e32f9d60754be403a5ac7114feca2a28")
     version("0.0.14", sha256="9a794d43a1d79aec3350b89d8c06689b8b32cf75e2742cdfa9dc0e3f2be6f04e")
     version("0.0.13", sha256="460656189e317e108a489af701fa8f33f13a93d96380788e692a1c68100e0388")

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

@@ -111,6 +111,7 @@ def patch(self):
 class CMakeBuilder(CMakeBuilder):
     def cmake_args(self):
         args = [self.define_from_variant(var) for var in VARIANTS]
+        args.append("-Dsphinx=OFF")
 
         # Remove empty strings
         args = [arg for arg in args if arg]
@@ -123,5 +124,6 @@ def configure_args(self):
         args = []
         for var in VARIANTS:
             args.extend(self.enable_or_disable(var))
+        args.append("--disable-sphinx")
 
         return args

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

@@ -35,6 +35,7 @@ class Llvm(CMakePackage, CudaPackage):
     family = "compiler"  # Used by lmod
 
     version("main", branch="main")
+    version("16.0.3", sha256="0bd71bc687a4e5a250c40afb0decefc50c85178fcce726137b682039de63919b")
     version("16.0.2", sha256="97c3c6aafb53c4bb0ed2781a18d6f05e75445e24bb1dc57a32b74f8d710ac19f")
     version("16.0.1", sha256="b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271")
     version("16.0.0", sha256="cba969a0782a3a398658d439f047b5e548ea04724f4fbfdbe17cfc946f4cd3ed")

var/spack/repos/builtin/packages/mochi-margo/mochi-margo-pthreads.patch

@@ -0,0 +1,563 @@
+diff --git a/configure.ac b/configure.ac
+index 4da931a3..90a49cab 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,6 +53,18 @@ AC_REQUIRE_CPP
+ 
+ AC_CHECK_SIZEOF([long int])
+ 
++dnl
++dnl margo relies on pthreads because of prio_pool implementation and
++dnl argobots profiling shim
++dnl
++AX_PTHREAD([],
++    [AC_MSG_ERROR([Could not find working pthreads])])
++LIBS="$PTHREAD_LIBS $LIBS"
++CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++dnl subst for .pc file generation
++AC_SUBST([PTHREAD_LIBS], ["$PTHREAD_LIBS"])
++AC_SUBST([PTHREAD_CFLAGS], ["$PTHREAD_CFLAGS"])
++
+ dnl
+ dnl Verify pkg-config
+ dnl
+diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
+new file mode 100644
+index 00000000..9f35d139
+--- /dev/null
++++ b/m4/ax_pthread.m4
+@@ -0,0 +1,522 @@
++# ===========================================================================
++#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
++#
++# DESCRIPTION
++#
++#   This macro figures out how to build C programs using POSIX threads. It
++#   sets the PTHREAD_LIBS output variable to the threads library and linker
++#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
++#   flags that are needed. (The user can also force certain compiler
++#   flags/libs to be tested by setting these environment variables.)
++#
++#   Also sets PTHREAD_CC and PTHREAD_CXX to any special C compiler that is
++#   needed for multi-threaded programs (defaults to the value of CC
++#   respectively CXX otherwise). (This is necessary on e.g. AIX to use the
++#   special cc_r/CC_r compiler alias.)
++#
++#   NOTE: You are assumed to not only compile your program with these flags,
++#   but also to link with them as well. For example, you might link with
++#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
++#   $PTHREAD_CXX $CXXFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
++#
++#   If you are only building threaded programs, you may wish to use these
++#   variables in your default LIBS, CFLAGS, and CC:
++#
++#     LIBS="$PTHREAD_LIBS $LIBS"
++#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++#     CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
++#     CC="$PTHREAD_CC"
++#     CXX="$PTHREAD_CXX"
++#
++#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
++#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
++#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
++#
++#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
++#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
++#   PTHREAD_CFLAGS.
++#
++#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
++#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
++#   is not found. If ACTION-IF-FOUND is not specified, the default action
++#   will define HAVE_PTHREAD.
++#
++#   Please let the authors know if this macro fails on any platform, or if
++#   you have any other suggestions or comments. This macro was based on work
++#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
++#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
++#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
++#   grateful for the helpful feedback of numerous users.
++#
++#   Updated for Autoconf 2.68 by Daniel Richard G.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
++#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
++#   Copyright (c) 2019 Marc Stevens <marc.stevens@cwi.nl>
++#
++#   This program is free software: you can redistribute it and/or modify it
++#   under the terms of the GNU General Public License as published by the
++#   Free Software Foundation, either version 3 of the License, or (at your
++#   option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++#   Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License along
++#   with this program. If not, see <https://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright owner
++#   gives unlimited permission to copy, distribute and modify the configure
++#   scripts that are the output of Autoconf when processing the Macro. You
++#   need not follow the terms of the GNU General Public License when using
++#   or distributing such scripts, even though portions of the text of the
++#   Macro appear in them. The GNU General Public License (GPL) does govern
++#   all other use of the material that constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the Autoconf
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 31
++
++AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
++AC_DEFUN([AX_PTHREAD], [
++AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([AC_PROG_CC])
++AC_REQUIRE([AC_PROG_SED])
++AC_LANG_PUSH([C])
++ax_pthread_ok=no
++
++# We used to check for pthread.h first, but this fails if pthread.h
++# requires special compiler flags (e.g. on Tru64 or Sequent).
++# It gets checked for in the link test anyway.
++
++# First of all, check if the user has set any of the PTHREAD_LIBS,
++# etcetera environment variables, and if threads linking works using
++# them:
++if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
++        ax_pthread_save_CC="$CC"
++        ax_pthread_save_CFLAGS="$CFLAGS"
++        ax_pthread_save_LIBS="$LIBS"
++        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
++        AS_IF([test "x$PTHREAD_CXX" != "x"], [CXX="$PTHREAD_CXX"])
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
++        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
++        AC_MSG_RESULT([$ax_pthread_ok])
++        if test "x$ax_pthread_ok" = "xno"; then
++                PTHREAD_LIBS=""
++                PTHREAD_CFLAGS=""
++        fi
++        CC="$ax_pthread_save_CC"
++        CFLAGS="$ax_pthread_save_CFLAGS"
++        LIBS="$ax_pthread_save_LIBS"
++fi
++
++# We must check for the threads library under a number of different
++# names; the ordering is very important because some systems
++# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
++# libraries is broken (non-POSIX).
++
++# Create a list of thread flags to try. Items with a "," contain both
++# C compiler flags (before ",") and linker flags (after ","). Other items
++# starting with a "-" are C compiler flags, and remaining items are
++# library names, except for "none" which indicates that we try without
++# any flags at all, and "pthread-config" which is a program returning
++# the flags for the Pth emulation library.
++
++ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
++
++# The ordering *is* (sometimes) important.  Some notes on the
++# individual items follow:
++
++# pthreads: AIX (must check this before -lpthread)
++# none: in case threads are in libc; should be tried before -Kthread and
++#       other compiler flags to prevent continual compiler warnings
++# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
++# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
++#           (Note: HP C rejects this with "bad form for `-t' option")
++# -pthreads: Solaris/gcc (Note: HP C also rejects)
++# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
++#      doesn't hurt to check since this sometimes defines pthreads and
++#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
++#      is present but should not be used directly; and before -mthreads,
++#      because the compiler interprets this as "-mt" + "-hreads")
++# -mthreads: Mingw32/gcc, Lynx/gcc
++# pthread: Linux, etcetera
++# --thread-safe: KAI C++
++# pthread-config: use pthread-config program (for GNU Pth library)
++
++case $host_os in
++
++        freebsd*)
++
++        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
++        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
++
++        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
++        ;;
++
++        hpux*)
++
++        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
++        # multi-threading and also sets -lpthread."
++
++        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
++        ;;
++
++        openedition*)
++
++        # IBM z/OS requires a feature-test macro to be defined in order to
++        # enable POSIX threads at all, so give the user a hint if this is
++        # not set. (We don't define these ourselves, as they can affect
++        # other portions of the system API in unpredictable ways.)
++
++        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
++            [
++#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
++             AX_PTHREAD_ZOS_MISSING
++#            endif
++            ],
++            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
++        ;;
++
++        solaris*)
++
++        # On Solaris (at least, for some versions), libc contains stubbed
++        # (non-functional) versions of the pthreads routines, so link-based
++        # tests will erroneously succeed. (N.B.: The stubs are missing
++        # pthread_cleanup_push, or rather a function called by this macro,
++        # so we could check for that, but who knows whether they'll stub
++        # that too in a future libc.)  So we'll check first for the
++        # standard Solaris way of linking pthreads (-mt -lpthread).
++
++        ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags"
++        ;;
++esac
++
++# Are we compiling with Clang?
++
++AC_CACHE_CHECK([whether $CC is Clang],
++    [ax_cv_PTHREAD_CLANG],
++    [ax_cv_PTHREAD_CLANG=no
++     # Note that Autoconf sets GCC=yes for Clang as well as GCC
++     if test "x$GCC" = "xyes"; then
++        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
++            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
++#            if defined(__clang__) && defined(__llvm__)
++             AX_PTHREAD_CC_IS_CLANG
++#            endif
++            ],
++            [ax_cv_PTHREAD_CLANG=yes])
++     fi
++    ])
++ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
++
++
++# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
++
++# Note that for GCC and Clang -pthread generally implies -lpthread,
++# except when -nostdlib is passed.
++# This is problematic using libtool to build C++ shared libraries with pthread:
++# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
++# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333
++# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555
++# To solve this, first try -pthread together with -lpthread for GCC
++
++AS_IF([test "x$GCC" = "xyes"],
++      [ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags"])
++
++# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first
++
++AS_IF([test "x$ax_pthread_clang" = "xyes"],
++      [ax_pthread_flags="-pthread,-lpthread -pthread"])
++
++
++# The presence of a feature test macro requesting re-entrant function
++# definitions is, on some systems, a strong hint that pthreads support is
++# correctly enabled
++
++case $host_os in
++        darwin* | hpux* | linux* | osf* | solaris*)
++        ax_pthread_check_macro="_REENTRANT"
++        ;;
++
++        aix*)
++        ax_pthread_check_macro="_THREAD_SAFE"
++        ;;
++
++        *)
++        ax_pthread_check_macro="--"
++        ;;
++esac
++AS_IF([test "x$ax_pthread_check_macro" = "x--"],
++      [ax_pthread_check_cond=0],
++      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
++
++
++if test "x$ax_pthread_ok" = "xno"; then
++for ax_pthread_try_flag in $ax_pthread_flags; do
++
++        case $ax_pthread_try_flag in
++                none)
++                AC_MSG_CHECKING([whether pthreads work without any flags])
++                ;;
++
++                *,*)
++                PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"`
++                PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"`
++                AC_MSG_CHECKING([whether pthreads work with "$PTHREAD_CFLAGS" and "$PTHREAD_LIBS"])
++                ;;
++
++                -*)
++                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
++                PTHREAD_CFLAGS="$ax_pthread_try_flag"
++                ;;
++
++                pthread-config)
++                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
++                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
++                PTHREAD_CFLAGS="`pthread-config --cflags`"
++                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
++                ;;
++
++                *)
++                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
++                PTHREAD_LIBS="-l$ax_pthread_try_flag"
++                ;;
++        esac
++
++        ax_pthread_save_CFLAGS="$CFLAGS"
++        ax_pthread_save_LIBS="$LIBS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++
++        # Check for various functions.  We must include pthread.h,
++        # since some functions may be macros.  (On the Sequent, we
++        # need a special flag -Kthread to make this header compile.)
++        # We check for pthread_join because it is in -lpthread on IRIX
++        # while pthread_create is in libc.  We check for pthread_attr_init
++        # due to DEC craziness with -lpthreads.  We check for
++        # pthread_cleanup_push because it is one of the few pthread
++        # functions on Solaris that doesn't have a non-functional libc stub.
++        # We try pthread_create on general principles.
++
++        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
++#                       if $ax_pthread_check_cond
++#                        error "$ax_pthread_check_macro must be defined"
++#                       endif
++                        static void *some_global = NULL;
++                        static void routine(void *a)
++                          {
++                             /* To avoid any unused-parameter or
++                                unused-but-set-parameter warning.  */
++                             some_global = a;
++                          }
++                        static void *start_routine(void *a) { return a; }],
++                       [pthread_t th; pthread_attr_t attr;
++                        pthread_create(&th, 0, start_routine, 0);
++                        pthread_join(th, 0);
++                        pthread_attr_init(&attr);
++                        pthread_cleanup_push(routine, 0);
++                        pthread_cleanup_pop(0) /* ; */])],
++            [ax_pthread_ok=yes],
++            [])
++
++        CFLAGS="$ax_pthread_save_CFLAGS"
++        LIBS="$ax_pthread_save_LIBS"
++
++        AC_MSG_RESULT([$ax_pthread_ok])
++        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
++
++        PTHREAD_LIBS=""
++        PTHREAD_CFLAGS=""
++done
++fi
++
++
++# Clang needs special handling, because older versions handle the -pthread
++# option in a rather... idiosyncratic way
++
++if test "x$ax_pthread_clang" = "xyes"; then
++
++        # Clang takes -pthread; it has never supported any other flag
++
++        # (Note 1: This will need to be revisited if a system that Clang
++        # supports has POSIX threads in a separate library.  This tends not
++        # to be the way of modern systems, but it's conceivable.)
++
++        # (Note 2: On some systems, notably Darwin, -pthread is not needed
++        # to get POSIX threads support; the API is always present and
++        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
++        # -pthread does define _REENTRANT, and while the Darwin headers
++        # ignore this macro, third-party headers might not.)
++
++        # However, older versions of Clang make a point of warning the user
++        # that, in an invocation where only linking and no compilation is
++        # taking place, the -pthread option has no effect ("argument unused
++        # during compilation").  They expect -pthread to be passed in only
++        # when source code is being compiled.
++        #
++        # Problem is, this is at odds with the way Automake and most other
++        # C build frameworks function, which is that the same flags used in
++        # compilation (CFLAGS) are also used in linking.  Many systems
++        # supported by AX_PTHREAD require exactly this for POSIX threads
++        # support, and in fact it is often not straightforward to specify a
++        # flag that is used only in the compilation phase and not in
++        # linking.  Such a scenario is extremely rare in practice.
++        #
++        # Even though use of the -pthread flag in linking would only print
++        # a warning, this can be a nuisance for well-run software projects
++        # that build with -Werror.  So if the active version of Clang has
++        # this misfeature, we search for an option to squash it.
++
++        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
++            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
++            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
++             # Create an alternate version of $ac_link that compiles and
++             # links in two steps (.c -> .o, .o -> exe) instead of one
++             # (.c -> exe), because the warning occurs only in the second
++             # step
++             ax_pthread_save_ac_link="$ac_link"
++             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
++             ax_pthread_link_step=`AS_ECHO(["$ac_link"]) | sed "$ax_pthread_sed"`
++             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
++             ax_pthread_save_CFLAGS="$CFLAGS"
++             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
++                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
++                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
++                ac_link="$ax_pthread_save_ac_link"
++                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
++                    [ac_link="$ax_pthread_2step_ac_link"
++                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
++                         [break])
++                    ])
++             done
++             ac_link="$ax_pthread_save_ac_link"
++             CFLAGS="$ax_pthread_save_CFLAGS"
++             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
++             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
++            ])
++
++        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
++                no | unknown) ;;
++                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
++        esac
++
++fi # $ax_pthread_clang = yes
++
++
++
++# Various other checks:
++if test "x$ax_pthread_ok" = "xyes"; then
++        ax_pthread_save_CFLAGS="$CFLAGS"
++        ax_pthread_save_LIBS="$LIBS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++
++        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
++        AC_CACHE_CHECK([for joinable pthread attribute],
++            [ax_cv_PTHREAD_JOINABLE_ATTR],
++            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
++             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
++                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
++                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
++                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
++                                [])
++             done
++            ])
++        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
++               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
++               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
++              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
++                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
++                                  [Define to necessary symbol if this constant
++                                   uses a non-standard name on your system.])
++               ax_pthread_joinable_attr_defined=yes
++              ])
++
++        AC_CACHE_CHECK([whether more special flags are required for pthreads],
++            [ax_cv_PTHREAD_SPECIAL_FLAGS],
++            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
++             case $host_os in
++             solaris*)
++             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
++             ;;
++             esac
++            ])
++        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
++               test "x$ax_pthread_special_flags_added" != "xyes"],
++              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
++               ax_pthread_special_flags_added=yes])
++
++        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
++            [ax_cv_PTHREAD_PRIO_INHERIT],
++            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
++                                             [[int i = PTHREAD_PRIO_INHERIT;
++                                               return i;]])],
++                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
++                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
++            ])
++        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
++               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
++              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
++               ax_pthread_prio_inherit_defined=yes
++              ])
++
++        CFLAGS="$ax_pthread_save_CFLAGS"
++        LIBS="$ax_pthread_save_LIBS"
++
++        # More AIX lossage: compile with *_r variant
++        if test "x$GCC" != "xyes"; then
++            case $host_os in
++                aix*)
++                AS_CASE(["x/$CC"],
++                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
++                    [#handle absolute path differently from PATH based program lookup
++                     AS_CASE(["x$CC"],
++                         [x/*],
++                         [
++			   AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])
++			   AS_IF([test "x${CXX}" != "x"], [AS_IF([AS_EXECUTABLE_P([${CXX}_r])],[PTHREAD_CXX="${CXX}_r"])])
++			 ],
++                         [
++			   AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])
++			   AS_IF([test "x${CXX}" != "x"], [AC_CHECK_PROGS([PTHREAD_CXX],[${CXX}_r],[$CXX])])
++			 ]
++                     )
++                    ])
++                ;;
++            esac
++        fi
++fi
++
++test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
++test -n "$PTHREAD_CXX" || PTHREAD_CXX="$CXX"
++
++AC_SUBST([PTHREAD_LIBS])
++AC_SUBST([PTHREAD_CFLAGS])
++AC_SUBST([PTHREAD_CC])
++AC_SUBST([PTHREAD_CXX])
++
++# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
++if test "x$ax_pthread_ok" = "xyes"; then
++        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
++        :
++else
++        ax_pthread_ok=no
++        $2
++fi
++AC_LANG_POP
++])dnl AX_PTHREAD
+diff --git a/maint/margo.pc.in b/maint/margo.pc.in
+index fd82d3cb..0f65cbbe 100644
+--- a/maint/margo.pc.in
++++ b/maint/margo.pc.in
+@@ -8,5 +8,5 @@ Description: Argobots bindings for Mercury RPC library
+ Version: @PACKAGE_VERSION@
+ URL: https://xgitlab.cels.anl.gov/sds/margo
+ Requires: @PC_REQUIRES@
+-Libs: -L${libdir} -lmargo
+-Cflags: -I${includedir}
++Libs: -L${libdir} -lmargo @PTHREAD_LIBS@
++Cflags: -I${includedir} @PTHREAD_CFLAGS@

var/spack/repos/builtin/packages/mochi-margo/package.py

@@ -65,6 +65,10 @@ class MochiMargo(AutotoolsPackage):
     depends_on("mercury@1.0.0:", type=("build", "link", "run"), when="@:0.5.1")
     depends_on("mercury@2.0.0:", type=("build", "link", "run"), when="@0.5.2:")
 
+    # Fix pthread detection
+    # https://github.com/mochi-hpc/mochi-margo/pull/177
+    patch("mochi-margo-pthreads.patch", when="@0.9,0.9.1:0.9.7")
+
     def autoreconf(self, spec, prefix):
         sh = which("sh")
         sh("./prepare.sh")

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

@@ -17,6 +17,8 @@ class Nccl(MakefilePackage, CudaPackage):
     maintainers("adamjstewart")
     libraries = ["libnccl.so"]
 
+    version("2.18.1-1", sha256="0e4ede5cf8df009bff5aeb3a9f194852c03299ae5664b5a425b43358e7a9eef2")
+    version("2.17.1-1", sha256="1311a6fd7cd44ad6d4523ba03065ce694605843fd30a5c0f77aa3d911abe706d")
     version("2.16.2-1", sha256="7f7c738511a8876403fc574d13d48e7c250d934d755598d82e14bab12236fc64")
     version("2.15.5-1", sha256="f4ac3c74d469c9cd718f82e1477759785db9b9f8cc9d9ecc103485805b8394a3")
     version("2.14.3-1", sha256="0fffb6f91e029ea4d95efabd7bddc6eecf8bf136e4f46bf812bff7d8eee53c79")

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

@@ -12,7 +12,9 @@ class PyAlabaster(PythonPackage):
 
     homepage = "https://alabaster.readthedocs.io/"
     pypi = "alabaster/alabaster-0.7.10.tar.gz"
+    git = "https://github.com/sphinx-doc/alabaster.git"
 
+    version("0.7.13", sha256="a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2")
     version("0.7.12", sha256="a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02")
     version("0.7.10", sha256="37cdcb9e9954ed60912ebc1ca12a9d12178c26637abdf124e3cde2341c257fe0")
     version("0.7.9", sha256="47afd43b08a4ecaa45e3496e139a193ce364571e7e10c6a87ca1a4c57eb7ea08")

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

@@ -13,6 +13,7 @@ class PyAnyio(PythonPackage):
     homepage = "https://github.com/agronholm/anyio"
     pypi = "anyio/anyio-3.2.1.tar.gz"
 
+    version("3.6.2", sha256="25ea0d673ae30af41a0c442f81cf3b38c7e79fdc7b60335a4c14e05eb0947421")
     version("3.6.1", sha256="413adf95f93886e442aea925f3ee43baa5a765a64a0f52c6081894f9992fdd0b")
     version("3.5.0", sha256="a0aeffe2fb1fdf374a8e4b471444f0f3ac4fb9f5a5b542b48824475e0042a5a6")
     version("3.3.4", sha256="67da67b5b21f96b9d3d65daa6ea99f5d5282cb09f50eb4456f8fb51dffefc3ff")
@@ -20,8 +21,9 @@ class PyAnyio(PythonPackage):
 
     depends_on("python@3.6.2:", type=("build", "run"))
     depends_on("py-setuptools@42:", type="build")
-    depends_on("py-setuptools-scm+toml@3.4:", type="build")
     depends_on("py-wheel@0.29:", type="build")
+    depends_on("py-setuptools-scm+toml@3.4:", type="build")
+
     depends_on("py-idna@2.8:", type=("build", "run"))
     depends_on("py-sniffio@1.1:", type=("build", "run"))
     depends_on("py-typing-extensions", when="^python@:3.7", type=("build", "run"))

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

@@ -12,14 +12,17 @@ class PyArgcomplete(PythonPackage):
     homepage = "https://github.com/kislyuk/argcomplete"
     pypi = "argcomplete/argcomplete-1.12.0.tar.gz"
 
+    version("3.0.8", sha256="b9ca96448e14fa459d7450a4ab5a22bbf9cee4ba7adddf03e65c398b5daeea28")
     version("2.0.0", sha256="6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20")
     version("1.12.3", sha256="2c7dbffd8c045ea534921e63b0be6fe65e88599990d8dc408ac8c542b72a5445")
     version("1.12.0", sha256="2fbe5ed09fd2c1d727d4199feca96569a5b50d44c71b16da9c742201f7cc295c")
     version("1.1.1", sha256="cca45b5fe07000994f4f06a0b95bd71f7b51b04f81c3be0b4ea7b666e4f1f084")
 
-    depends_on("python@3.6:", when="@2:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
-    depends_on("py-importlib-metadata@0.23:4", when="@1.12.3: ^python@:3.7", type=("build", "run"))
+    depends_on("py-importlib-metadata@0.23:6", when="@3.0.6: ^python@:3.7", type=("build", "run"))
+    depends_on(
+        "py-importlib-metadata@0.23:4", when="@1.12.3:2 ^python@:3.7", type=("build", "run")
+    )
     depends_on("py-importlib-metadata@0.23:3", when="@1.12.2 ^python@:3.7", type=("build", "run"))
     depends_on("py-importlib-metadata@0.23:2", when="@1.12.1 ^python@:3.7", type=("build", "run"))
     depends_on("py-importlib-metadata@0.23:1", when="@1.12.0 ^python@:3.7", type=("build", "run"))

var/spack/repos/builtin/packages/py-jarvis-util/package.py

@@ -0,0 +1,24 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyJarvisUtil(PythonPackage):
+    """Jarvis-util is a library which contains various utilities to aid with
+    creating shell scripts within Python. This library contains wrappers
+    for executing shell commands locally, SSH, SCP, MPI, argument parsing,
+    and various other random utilities."""
+
+    homepage = "https://github.com/scs-lab/jarvis-util"
+    git = "https://github.com/scs-lab/jarvis-util.git"
+    url = "https://github.com/scs-lab/jarvis-util/archive/refs/tags/v0.0.1.tar.gz"
+    maintainers("lukemartinlogan", "hyoklee")
+
+    version("0.0.1", sha256="1c5fbbfec410f1df8dc28edc87dd4421c3708f5bd22bf7ef010138d5c4a1ff8f")
+
+    depends_on("py-setuptools", type="build")
+    depends_on("py-psutil", type=("build", "run"))
+    depends_on("py-pyaml", type=("build", "run"))

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

@@ -14,7 +14,7 @@ class PyJedi(PythonPackage):
 
     version("0.18.1", sha256="74137626a64a99c8eb6ae5832d99b3bdd7d29a3850fe2aa80a4126b2a7d949ab")
     version("0.18.0", sha256="92550a404bad8afed881a137ec9a461fed49eca661414be45059329614ed0707")
-    version("0.17.2", sha256="08d43addcbd656ed07e929631f8071eec567092bf16f2c19fc7bc272a97a77ef")
+    version("0.17.2", sha256="86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20")
     version("0.17.1", sha256="807d5d4f96711a2bcfdd5dfa3b1ae6d09aa53832b182090b222b5efb81f52f63")
     version("0.15.1", sha256="ba859c74fa3c966a22f2aeebe1b74ee27e2a462f56d3f5f7ca4a59af61bfe42e")
     version("0.15.0", sha256="9f16cb00b2aee940df2efc1d7d7c848281fd16391536a3d4561f5aea49db1ee6")

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

@@ -14,14 +14,19 @@ class PyNltk(PythonPackage):
     homepage = "https://www.nltk.org/"
     pypi = "nltk/nltk-3.5.zip"
 
+    version("3.8.1", sha256="1834da3d0682cba4f2cede2f9aad6b0fafb6461ba451db0efb6f9c39798d64d3")
     version("3.5", sha256="845365449cd8c5f9731f7cb9f8bd6fd0767553b9d53af9eb1b3abf7700936b35")
 
+    maintainers("meyersbs")
+
     variant("data", default=False, description="Download the NLTK data")
 
+    depends_on("python@3.7:", when="@3.8.1:", type=("build", "run"))
     depends_on("python@3.5:", type=("build", "run"))
-    depends_on("py-setuptools", type=("build", "run"))
+    depends_on("py-setuptools", type="build")
     depends_on("py-joblib", type=("build", "run"))
     depends_on("py-click", type=("build", "run"))
+    depends_on("py-regex@2021.8.3:", when="@3.8.1:", type=("build", "run"))
     depends_on("py-regex", type=("build", "run"))
     depends_on("py-tqdm", type=("build", "run"))
 
@@ -33,6 +38,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/misc",
         placement="perluniprops",
     )
+
     resource(
         name="mwa_ppdb",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/misc/mwa_ppdb.zip",
@@ -41,14 +47,16 @@ class PyNltk(PythonPackage):
         destination="nltk_data/misc",
         placement="mwa_ppdb",
     )
+
     resource(
         name="punkt",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/tokenizers/punkt.zip",
         when="+data",
-        sha256="9a74e3cc0057021b12984c07cc5e46cb746385cf90f49b7d6fe806fb71610144",
+        sha256="51c3078994aeaf650bfc8e028be4fb42b4a0d177d41c012b6a983979653660ec",
         destination="nltk_data/tokenizers",
         placement="punkt",
     )
+
     resource(
         name="rslp",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/stemmers/rslp.zip",
@@ -57,6 +65,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/stemmers",
         placement="rslp",
     )
+
     resource(
         name="porter_test",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/stemmers/porter_test.zip",
@@ -65,6 +74,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/stemmers",
         placement="porter_test",
     )
+
     resource(
         name="snowball_data",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/stemmers/snowball_data.zip",
@@ -73,6 +83,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/stemmers",
         placement="snowball_data",
     )
+
     resource(
         name="maxent_ne_chunker",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/chunkers/maxent_ne_chunker.zip",
@@ -81,6 +92,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/chunkers",
         placement="maxent_ne_chunker",
     )
+
     resource(
         name="moses_sample",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/models/moses_sample.zip",
@@ -89,6 +101,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/models",
         placement="moses_sample",
     )
+
     resource(
         name="bllip_wsj_no_aux",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/models/bllip_wsj_no_aux.zip",
@@ -97,6 +110,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/models",
         placement="bllip_wsj_no_aux",
     )
+
     resource(
         name="word2vec_sample",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/models/word2vec_sample.zip",
@@ -105,6 +119,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/models",
         placement="word2vec_sample",
     )
+
     resource(
         name="wmt15_eval",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/models/wmt15_eval.zip",
@@ -113,6 +128,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/models",
         placement="wmt15_eval",
     )
+
     resource(
         name="spanish_grammars",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/grammars/spanish_grammars.zip",
@@ -121,6 +137,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/grammars",
         placement="spanish_grammars",
     )
+
     resource(
         name="sample_grammars",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/grammars/sample_grammars.zip",
@@ -129,6 +146,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/grammars",
         placement="sample_grammars",
     )
+
     resource(
         name="large_grammars",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/grammars/large_grammars.zip",
@@ -137,6 +155,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/grammars",
         placement="large_grammars",
     )
+
     resource(
         name="book_grammars",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/grammars/book_grammars.zip",
@@ -145,6 +164,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/grammars",
         placement="book_grammars",
     )
+
     resource(
         name="basque_grammars",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/grammars/basque_grammars.zip",
@@ -153,6 +173,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/grammars",
         placement="basque_grammars",
     )
+
     resource(
         name="maxent_treebank_pos_tagger",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/taggers/maxent_treebank_pos_tagger.zip",
@@ -161,6 +182,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/taggers",
         placement="maxent_treebank_pos_tagger",
     )
+
     resource(
         name="averaged_perceptron_tagger",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/taggers/averaged_perceptron_tagger.zip",
@@ -169,6 +191,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/taggers",
         placement="averaged_perceptron_tagger",
     )
+
     resource(
         name="averaged_perceptron_tagger_ru",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/taggers/averaged_perceptron_tagger_ru.zip",
@@ -177,14 +200,16 @@ class PyNltk(PythonPackage):
         destination="nltk_data/taggers",
         placement="averaged_perceptron_tagger_ru",
     )
+
     resource(
         name="universal_tagset",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/taggers/universal_tagset.zip",
         when="+data",
-        sha256="fb3b295a7b636d3f50e2bd3f9bd4c84eb99eaf36ff475ea406bdecd247f8f962",
+        sha256="d490e1ae8f5625dcdfdda04be15c22a2aade8c2561a36a61edcdf0c7d6aa8352",
         destination="nltk_data/taggers",
         placement="universal_tagset",
     )
+
     resource(
         name="vader_lexicon",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/sentiment/vader_lexicon.zip",
@@ -193,6 +218,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/sentiment",
         placement="vader_lexicon",
     )
+
     resource(
         name="lin_thesaurus",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/lin_thesaurus.zip",
@@ -201,6 +227,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="lin_thesaurus",
     )
+
     resource(
         name="movie_reviews",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/movie_reviews.zip",
@@ -209,6 +236,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="movie_reviews",
     )
+
     resource(
         name="problem_reports",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/problem_reports.zip",
@@ -217,6 +245,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="problem_reports",
     )
+
     resource(
         name="pros_cons",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/pros_cons.zip",
@@ -225,6 +254,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="pros_cons",
     )
+
     resource(
         name="masc_tagged",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/masc_tagged.zip",
@@ -233,6 +263,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="masc_tagged",
     )
+
     resource(
         name="sentence_polarity",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/sentence_polarity.zip",
@@ -241,6 +272,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="sentence_polarity",
     )
+
     resource(
         name="webtext",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/webtext.zip",
@@ -249,6 +281,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="webtext",
     )
+
     resource(
         name="nps_chat",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/nps_chat.zip",
@@ -257,6 +290,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="nps_chat",
     )
+
     resource(
         name="city_database",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/city_database.zip",
@@ -265,6 +299,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="city_database",
     )
+
     resource(
         name="europarl_raw",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/europarl_raw.zip",
@@ -273,6 +308,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="europarl_raw",
     )
+
     resource(
         name="biocreative_ppi",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/biocreative_ppi.zip",
@@ -281,6 +317,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="biocreative_ppi",
     )
+
     resource(
         name="verbnet3",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/verbnet3.zip",
@@ -289,6 +326,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="verbnet3",
     )
+
     resource(
         name="pe08",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/pe08.zip",
@@ -297,6 +335,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="pe08",
     )
+
     resource(
         name="pil",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/pil.zip",
@@ -305,6 +344,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="pil",
     )
+
     resource(
         name="crubadan",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/crubadan.zip",
@@ -313,6 +353,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="crubadan",
     )
+
     resource(
         name="gutenberg",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/gutenberg.zip",
@@ -321,6 +362,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="gutenberg",
     )
+
     resource(
         name="propbank",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/propbank.zip",
@@ -329,6 +371,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="propbank",
     )
+
     resource(
         name="machado",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/machado.zip",
@@ -337,6 +380,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="machado",
     )
+
     resource(
         name="state_union",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/state_union.zip",
@@ -345,6 +389,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="state_union",
     )
+
     resource(
         name="twitter_samples",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/twitter_samples.zip",
@@ -353,6 +398,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="twitter_samples",
     )
+
     resource(
         name="semcor",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/semcor.zip",
@@ -361,6 +407,25 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="semcor",
     )
+
+    resource(
+        name="wordnet31",
+        url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/wordnet31.zip",
+        when="+data",
+        sha256="2a9e7da7d0c17ad875e4171a4d28ae17ab6969c7d67f1cf0f59d65c66d0fdd37",
+        destination="nltk_data/corpora",
+        placement="wordnet31",
+    )
+
+    resource(
+        name="extended_omw",
+        url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/extended_omw.zip",
+        when="+data",
+        sha256="c59b90f2902c351eeb0ce97a49a1b7cf73d4e2f5b05cbda0e903eb20b5ee168a",
+        destination="nltk_data/corpora",
+        placement="extended_omw",
+    )
+
     resource(
         name="names",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/names.zip",
@@ -369,6 +434,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="names",
     )
+
     resource(
         name="ptb",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/ptb.zip",
@@ -377,6 +443,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="ptb",
     )
+
     resource(
         name="nombank.1.0",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/nombank.1.0.zip",
@@ -385,6 +452,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="nombank.1.0",
     )
+
     resource(
         name="floresta",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/floresta.zip",
@@ -393,6 +461,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="floresta",
     )
+
     resource(
         name="comtrans",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/comtrans.zip",
@@ -401,6 +470,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="comtrans",
     )
+
     resource(
         name="knbc",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/knbc.zip",
@@ -409,6 +479,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="knbc",
     )
+
     resource(
         name="mac_morpho",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/mac_morpho.zip",
@@ -417,6 +488,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="mac_morpho",
     )
+
     resource(
         name="swadesh",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/swadesh.zip",
@@ -425,6 +497,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="swadesh",
     )
+
     resource(
         name="rte",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/rte.zip",
@@ -433,6 +506,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="rte",
     )
+
     resource(
         name="toolbox",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/toolbox.zip",
@@ -441,6 +515,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="toolbox",
     )
+
     resource(
         name="jeita",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/jeita.zip",
@@ -449,6 +524,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="jeita",
     )
+
     resource(
         name="product_reviews_1",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/product_reviews_1.zip",
@@ -457,6 +533,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="product_reviews_1",
     )
+
     resource(
         name="omw",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/omw.zip",
@@ -465,6 +542,16 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="omw",
     )
+
+    resource(
+        name="wordnet2022",
+        url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/wordnet2022.zip",
+        when="+data",
+        sha256="5ccbb3382b9d147d4acac12645b3d6f375d1f5e4cd037fedadef74d069a8ee3f",
+        destination="nltk_data/corpora",
+        placement="wordnet2022",
+    )
+
     resource(
         name="sentiwordnet",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/sentiwordnet.zip",
@@ -473,6 +560,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="sentiwordnet",
     )
+
     resource(
         name="product_reviews_2",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/product_reviews_2.zip",
@@ -481,6 +569,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="product_reviews_2",
     )
+
     resource(
         name="abc",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/abc.zip",
@@ -489,6 +578,16 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="abc",
     )
+
+    resource(
+        name="wordnet2021",
+        url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/wordnet2021.zip",
+        when="+data",
+        sha256="d7ef7d289da4dd0f33f07d9745856adc74689a53a8fa9be5dcfd3c87c5da24db",
+        destination="nltk_data/corpora",
+        placement="wordnet2021",
+    )
+
     resource(
         name="udhr2",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/udhr2.zip",
@@ -497,6 +596,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="udhr2",
     )
+
     resource(
         name="senseval",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/senseval.zip",
@@ -505,6 +605,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="senseval",
     )
+
     resource(
         name="words",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/words.zip",
@@ -513,6 +614,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="words",
     )
+
     resource(
         name="framenet_v15",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/framenet_v15.zip",
@@ -521,6 +623,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="framenet_v15",
     )
+
     resource(
         name="unicode_samples",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/unicode_samples.zip",
@@ -529,6 +632,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="unicode_samples",
     )
+
     resource(
         name="kimmo",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/kimmo.zip",
@@ -537,6 +641,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="kimmo",
     )
+
     resource(
         name="framenet_v17",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/framenet_v17.zip",
@@ -545,6 +650,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="framenet_v17",
     )
+
     resource(
         name="chat80",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/chat80.zip",
@@ -553,6 +659,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="chat80",
     )
+
     resource(
         name="qc",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/qc.zip",
@@ -561,14 +668,16 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="qc",
     )
+
     resource(
         name="inaugural",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/inaugural.zip",
         when="+data",
-        sha256="a6c099af7f5b5ad2a03f1e4ea3f5ff7699779b9d4327152110af462da210bd1f",
+        sha256="7c5fb5793e31fbeae12bf1aa0ffda5336468f07cedb50654c6d31ca384e2046b",
         destination="nltk_data/corpora",
         placement="inaugural",
     )
+
     resource(
         name="wordnet",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/wordnet.zip",
@@ -577,14 +686,16 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="wordnet",
     )
+
     resource(
         name="stopwords",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/stopwords.zip",
         when="+data",
-        sha256="3fc8d3d4c6e3d5ba6e23a66920dd3fde611cc3edf6e1fd80159a7965f47bea09",
+        sha256="15c94179887425ca1bedc265608cab9f27d650211f709bb929e320990a4b01d1",
         destination="nltk_data/corpora",
         placement="stopwords",
     )
+
     resource(
         name="verbnet",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/verbnet.zip",
@@ -593,6 +704,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="verbnet",
     )
+
     resource(
         name="shakespeare",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/shakespeare.zip",
@@ -601,6 +713,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="shakespeare",
     )
+
     resource(
         name="ycoe",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/ycoe.zip",
@@ -609,6 +722,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="ycoe",
     )
+
     resource(
         name="ieer",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/ieer.zip",
@@ -617,6 +731,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="ieer",
     )
+
     resource(
         name="cess_cat",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/cess_cat.zip",
@@ -625,6 +740,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="cess_cat",
     )
+
     resource(
         name="switchboard",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/switchboard.zip",
@@ -633,6 +749,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="switchboard",
     )
+
     resource(
         name="comparative_sentences",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/comparative_sentences.zip",
@@ -641,6 +758,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="comparative_sentences",
     )
+
     resource(
         name="subjectivity",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/subjectivity.zip",
@@ -649,6 +767,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="subjectivity",
     )
+
     resource(
         name="udhr",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/udhr.zip",
@@ -657,6 +776,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="udhr",
     )
+
     resource(
         name="pl196x",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/pl196x.zip",
@@ -665,6 +785,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="pl196x",
     )
+
     resource(
         name="paradigms",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/paradigms.zip",
@@ -673,6 +794,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="paradigms",
     )
+
     resource(
         name="gazetteers",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/gazetteers.zip",
@@ -681,6 +803,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="gazetteers",
     )
+
     resource(
         name="timit",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/timit.zip",
@@ -689,6 +812,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="timit",
     )
+
     resource(
         name="treebank",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/treebank.zip",
@@ -697,14 +821,16 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="treebank",
     )
+
     resource(
         name="sinica_treebank",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/sinica_treebank.zip",
         when="+data",
-        sha256="5506ddf646d5c3fb0a5fffdb53330ec8465f6468499f08d86f77d2df01d5b35e",
+        sha256="395958a28f06d92ce1de0f0cf1bb17dc4a5cc882d27487447252ad615641e9ba",
         destination="nltk_data/corpora",
         placement="sinica_treebank",
     )
+
     resource(
         name="opinion_lexicon",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/opinion_lexicon.zip",
@@ -713,6 +839,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="opinion_lexicon",
     )
+
     resource(
         name="ppattach",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/ppattach.zip",
@@ -721,6 +848,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="ppattach",
     )
+
     resource(
         name="dependency_treebank",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/dependency_treebank.zip",
@@ -729,6 +857,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="dependency_treebank",
     )
+
     resource(
         name="reuters",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/reuters.zip",
@@ -737,6 +866,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="reuters",
     )
+
     resource(
         name="genesis",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/genesis.zip",
@@ -745,6 +875,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="genesis",
     )
+
     resource(
         name="cess_esp",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/cess_esp.zip",
@@ -753,6 +884,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="cess_esp",
     )
+
     resource(
         name="conll2007",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/conll2007.zip",
@@ -761,6 +893,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="conll2007",
     )
+
     resource(
         name="nonbreaking_prefixes",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/nonbreaking_prefixes.zip",
@@ -769,6 +902,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="nonbreaking_prefixes",
     )
+
     resource(
         name="dolch",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/dolch.zip",
@@ -777,6 +911,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="dolch",
     )
+
     resource(
         name="smultron",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/smultron.zip",
@@ -785,6 +920,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="smultron",
     )
+
     resource(
         name="alpino",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/alpino.zip",
@@ -793,6 +929,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="alpino",
     )
+
     resource(
         name="wordnet_ic",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/wordnet_ic.zip",
@@ -801,6 +938,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="wordnet_ic",
     )
+
     resource(
         name="brown",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/brown.zip",
@@ -809,6 +947,16 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="brown",
     )
+
+    resource(
+        name="bcp47",
+        url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/bcp47.zip",
+        when="+data",
+        sha256="435d986fd9de0ae540a34e0978dbbaf5d1db7576b2bc7571da71cf6a01c8dfaa",
+        destination="nltk_data/corpora",
+        placement="bcp47",
+    )
+
     resource(
         name="panlex_swadesh",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/panlex_swadesh.zip",
@@ -817,6 +965,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="panlex_swadesh",
     )
+
     resource(
         name="conll2000",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/conll2000.zip",
@@ -825,6 +974,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="conll2000",
     )
+
     resource(
         name="universal_treebanks_v20",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/universal_treebanks_v20.zip",
@@ -833,6 +983,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="universal_treebanks_v20",
     )
+
     resource(
         name="brown_tei",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/brown_tei.zip",
@@ -841,6 +992,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="brown_tei",
     )
+
     resource(
         name="cmudict",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/cmudict.zip",
@@ -849,6 +1001,16 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="cmudict",
     )
+
+    resource(
+        name="omw-1.4",
+        url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/omw-1.4.zip",
+        when="+data",
+        sha256="3b941e664852f3297b6040236626065796a2aaf7d7f9eec8779a3beaa1096c2d",
+        destination="nltk_data/corpora",
+        placement="omw-1.4",
+    )
+
     resource(
         name="mte_teip5",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/mte_teip5.zip",
@@ -857,6 +1019,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="mte_teip5",
     )
+
     resource(
         name="indian",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/indian.zip",
@@ -865,6 +1028,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="indian",
     )
+
     resource(
         name="conll2002",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/corpora/conll2002.zip",
@@ -873,6 +1037,7 @@ class PyNltk(PythonPackage):
         destination="nltk_data/corpora",
         placement="conll2002",
     )
+
     resource(
         name="tagsets",
         url="https://raw.githubusercontent.com/nltk/nltk_data/gh-pages/packages/help/tagsets.zip",

var/spack/repos/builtin/packages/py-scikit-tensor-py3/package.py

@@ -0,0 +1,22 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyScikitTensorPy3(PythonPackage):
+    """A python module for multilinear algebra and tensor factorizations."""
+
+    homepage = "http://github.com/evertrol/scikit-tensor-py3"
+    pypi = "scikit-tensor-py3/scikit-tensor-py3-0.4.1.tar.gz"
+
+    maintainers("meyersbs")
+
+    version("0.4.1", sha256="b45de97ebd57e0213f54e891bf9a0549957eb2387f4df9f3dc3f7a50f8818b0a")
+
+    depends_on("python@3.5:", type=("build", "run"))
+    depends_on("py-setuptools", type="build")
+    depends_on("py-numpy@1.16:1.16", type=("build", "run"))
+    depends_on("py-scipy@1.3:1.3", type=("build", "run"))

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

@@ -16,6 +16,7 @@ class PySlepc4py(PythonPackage):
     maintainers("joseeroman", "balay")
 
     version("main", branch="main")
+    version("3.19.1", sha256="68303f4acef8efc0542ab288a19159d0e6cdf313726f573e0bea2edb3d2c9595")
     version("3.19.0", sha256="ae84d33cce259c1d6ff64308b2f819d1c0f7b018e048f9049ec6d5be15614ba5")
     version("3.18.3", sha256="93c978f115683900a575026111ff2abe6f3ce4de8c21eec53c07dfd97ea43c85")
     version("3.18.2", sha256="402297fd8e583ed2618d2cba05e5cae8e9d0a2c3943812a1a138f431ef3479b3")
@@ -40,6 +41,7 @@ class PySlepc4py(PythonPackage):
     depends_on("py-cython@0.29.32:", when="^python@3.11:", type="build")
     depends_on("py-cython@0.24:", type="build")
     depends_on("py-setuptools", type="build")
+    depends_on("py-numpy", type=("build", "run"))
 
     depends_on("py-petsc4py", type=("build", "run"))
     depends_on("py-petsc4py@main", when="@main", type=("build", "run"))

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

@@ -0,0 +1,25 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyTensorly(PythonPackage):
+    """TensorLy is a Python library that aims at making tensor learning simple
+    and accessible. It allows to easily perform tensor decomposition, tensor
+    learning and tensor algebra. Its backend system allows to seamlessly perform
+    computation with NumPy, PyTorch, JAX, MXNet, TensorFlow or CuPy, and run
+    methods at scale on CPU or GPU."""
+
+    homepage = "https://github.com/tensorly/tensorly"
+    pypi = "tensorly/tensorly-0.8.1.tar.gz"
+
+    maintainers("meyersbs")
+
+    version("0.8.1", sha256="cf78e4ffe612feca3510214002845c6831b267b1f2c1181154d41430310b237d")
+
+    depends_on("py-setuptools", type="build")
+    depends_on("py-numpy", type=("build", "run"))
+    depends_on("py-scipy", type=("build", "run"))

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

@@ -13,12 +13,14 @@ class Qoz(CMakePackage):
     homepage = git
 
     version("2022.04.26", commit="d28a7a8c9f703075441b700202b8a1ee185ded00")
+    version("2023.03.09", commit="537f6a52a39396f9c05e16a12ab160d8dc8b9d56")
 
     maintainers("disheng222")
 
     depends_on("zstd")
     depends_on("gsl")
     depends_on("pkgconfig")
+    depends_on("py-pybind11", when="@2023.03.09:")
 
     def cmake_args(self):
         args = ["-DQoZ_USE_BUNDLED_ZSTD=OFF", "-DQoZ_DEBUG_TIMINGS=OFF"]

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

@@ -19,6 +19,7 @@ class RAde4(RPackage):
 
     cran = "ade4"
 
+    version("1.7-22", sha256="007df54e83a2a6cb8d6da8006f0aace011e7eaa7744dc5f8230ac2c002b393b4")
     version("1.7-20", sha256="ddc75788b55902f17dabda209eb67c378aa0233767697e00fa3f8fc85e4bad7b")
     version("1.7-19", sha256="c85111881ff93a261ca34a5b5ef313d1c0ff9b84f0b23596bc56cfa696f165ef")
     version("1.7-18", sha256="ecb6f4c42c60f39702aa96f454bb536a333049c9608ee2b6bdf8795e059cc525")
@@ -31,5 +32,7 @@ class RAde4(RPackage):
     depends_on("r-mass", type=("build", "run"))
     depends_on("r-pixmap", type=("build", "run"), when="@1.7-16:")
     depends_on("r-sp", type=("build", "run"), when="@1.7-16:")
+    depends_on("r-rcpp", type=("build", "run"), when="@1.7-22:")
+    depends_on("r-rcpparmadillo", type=("build", "run"), when="@1.7-22:")
 
     depends_on("r-progress", type=("build", "run"), when="@1.7-16")

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

@@ -21,6 +21,7 @@ class RAdegenet(RPackage):
 
     cran = "adegenet"
 
+    version("2.1.10", sha256="ab62780ac1dd575d01f3e0869b34728a74b2ca2eaeeccb2f520007e9a578b163")
     version("2.1.8", sha256="80d72c3eefe077723dec91c98b7d46815b9659ab7196581d18b6e9d6c27f5025")
     version("2.1.6", sha256="7823de4933634cb887481fe4b12cf2faacbaa1b4b66939584d10fcb7ce2da26b")
     version("2.1.5", sha256="e4eee8c41dae6cb0841db74ec6f9adb2580873f3e313471f37df58324c1857f2")

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

@@ -15,6 +15,7 @@ class RAdegraphics(RPackage):
 
     cran = "adegraphics"
 
+    version("1.0-18", sha256="8fe07fc0f73e9917e098de2ee8e6fdb3e07775446683b6222692a3298e4d563c")
     version("1.0-16", sha256="7ba59ce9aeefe1c25b4b118d08ef458ffd34115412c147cc428629e72a82ec3a")
     version("1.0-15", sha256="87bbcd072e9a898955f5ede4315e82365086a50a2887bf5bd2e94bbb4d3f678a")
 

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

@@ -17,6 +17,7 @@ class RAdespatial(RPackage):
 
     cran = "adespatial"
 
+    version("0.3-21", sha256="4ff65f9bc05892a2d37d34ab2b77dbd24f980adc891f5f94f8e56aec771ea79f")
     version("0.3-20", sha256="f88e009563087c52af5be490bd111cc38b0b70437bbfa189e846080a069b64eb")
     version("0.3-19", sha256="db50f1c42961e40bcef6d714a89a09b1345dab2dd013cea8e2122fdf99d5d223")
     version("0.3-16", sha256="987bd6e0bc6a32ac8e678338ffbbd88580007c4916129b51da681c331818a821")

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

@@ -24,6 +24,7 @@ class RAfex(RPackage):
 
     cran = "afex"
 
+    version("1.3-0", sha256="f8e276a1070288c54b83db1d1214fd88fe8d8b8698cf0c2743ef2a45f61e1933")
     version("1.2-1", sha256="e3a8cecd46db9521039275a5bf27937afb3ec4021644cc4fac94096cc585aacb")
     version("1.2-0", sha256="8b57ffb8ba2f6354185fc79c8b0cab2703d753b89a100f4325bb2e4c7a3531c2")
     version("1.1-1", sha256="66011599b193ebbb3bd241eb7200bd68ac4b5d2d1df84e63e9fdd72fb4110427")

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

@@ -27,10 +27,12 @@ class RAmelia(RPackage):
 
     cran = "Amelia"
 
+    version("1.8.1", sha256="120ce62a2acfc845dbeb155ce3f33b41ebad324bc73693a918a95194a9fc47e4")
     version("1.8.0", sha256="3ec1d5a68dac601b354227916aa8ec72fa1216b603dd887aae2b24cb69b5995e")
     version("1.7.6", sha256="63c08d374aaf78af46c34dc78da719b3085e58d9fabdc76c6460d5193a621bea")
 
     depends_on("r@3.0.2:", type=("build", "run"))
     depends_on("r-rcpp@0.11:", type=("build", "run"))
     depends_on("r-foreign", type=("build", "run"))
+    depends_on("r-rlang", type=("build", "run"), when="@1.8.1:")
     depends_on("r-rcpparmadillo", type=("build", "run"))

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

@@ -27,6 +27,7 @@ class RApe(RPackage):
 
     cran = "ape"
 
+    version("5.7-1", sha256="8b09c71218d8aa629e43bc807b433a4e30a61847d91b2810e31c366f0fe5057a")
     version("5.6-2", sha256="9b62450a0390a1f07df007d348ad4cedcd814d42cb11c5a300ed33550fd41257")
     version("5.6-1", sha256="25401e036576eed1200e15bf68879ccd85611303a3508b989e15164cd4c0f7f7")
     version("5.4-1", sha256="f0316c8e74ce900053e8b3e8c9322b9d10e7730f3be2150365f74630bee7eee4")
@@ -37,6 +38,8 @@ class RApe(RPackage):
     version("4.1", sha256="935af5ddadcba832d3f9cc032a80fc1a2e627a7ed54ef5f3773f87e06374a924")
 
     depends_on("r@3.2:", type=("build", "run"))
+    depends_on("r@3.2.0:", type=("build", "run"), when="@5.7-1:")
     depends_on("r-nlme", type=("build", "run"))
     depends_on("r-lattice", type=("build", "run"))
     depends_on("r-rcpp@0.12.0:", type=("build", "run"))
+    depends_on("r-digest", type=("build", "run"), when="@5.7-1:")

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

@@ -18,6 +18,7 @@ class RAplot(RPackage):
 
     cran = "aplot"
 
+    version("0.1.10", sha256="d937768241f887628b88bb3b49dd6cbe9b7dae39ae7054e7380a9836721a67d1")
     version("0.1.8", sha256="d931d7769dc7ce4bc938e8c068973721e89da0aa5f40a04f8a9119621b33459c")
     version("0.1.7", sha256="f6250f5f6d1addc8d5717be80a92c569bfd83d35bce2e3dbeb251c9ae1be8616")
     version("0.1.6", sha256="7d69d1968bc613d8ceccc05c53362b0f62b632e1c6ef5100c91b65b15afa200c")
@@ -26,6 +27,7 @@ class RAplot(RPackage):
 
     depends_on("r-ggfun@0.0.4:", type=("build", "run"), when="@0.1.2:")
     depends_on("r-ggfun@0.0.6:", type=("build", "run"), when="@0.1.4:")
+    depends_on("r-ggfun@0.0.9:", type=("build", "run"), when="@0.1.10:")
     depends_on("r-ggplot2", type=("build", "run"))
     depends_on("r-ggplotify", type=("build", "run"))
     depends_on("r-patchwork", type=("build", "run"))

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

@@ -31,6 +31,7 @@ class RBayesm(RPackage):
 
     cran = "bayesm"
 
+    version("3.1-5", sha256="f223074ca41ede293b48350eac77a565e034f0f8cf3dd72d0e1d126cc58047a2")
     version("3.1-4", sha256="061b216c62bc72eab8d646ad4075f2f78823f9913344a781fa53ea7cf4a48f94")
     version("3.1-3", sha256="51e4827eca8cd4cf3626f3c2282543df7c392b3ffb843f4bfb386fe104642a10")
     version("3.1-2", sha256="a332f16e998ab10b17a2b1b9838d61660c36e914fe4d2e388a59f031d52ad736")

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

@@ -26,6 +26,7 @@ class RBh(RPackage):
 
     cran = "BH"
 
+    version("1.81.0-1", sha256="f51c8badd6f181e06353314e1d15a6ec1495cc498ee74b6fa4ea8aba6e97ff64")
     version("1.78.0-0", sha256="3b9e9d07682013e0c06a396dda176b405eab99a7273eca6c40d1b4c4110e8cb3")
     version("1.75.0-0", sha256="ae4c10992607dd697663f60675a46a5770851da159330bb63c4a68890bdd6f5a")
     version("1.72.0-3", sha256="888ec1a3316bb69e1ba749b08ba7e0903ebc4742e3a185de8d148c13cddac8ab")

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

@@ -18,5 +18,6 @@ class RBiasedurn(RPackage):
 
     cran = "BiasedUrn"
 
+    version("2.0.9", sha256="bac62bbbc3e2417772f8784996a6c2d0857adb42e86e46b1a9703b187a406b09")
     version("2.0.8", sha256="205e7f8da8fba76fbf4bd9d12a027599b685dedecc818aad39de5c51dc47b856")
     version("1.07", sha256="2377c2e59d68e758a566452d7e07e88663ae61a182b9ee455d8b4269dda3228e")

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

@@ -13,11 +13,11 @@ class RBibtex(RPackage):
 
     cran = "bibtex"
 
+    version("0.5.1", sha256="f3c1a0a4e666c4addd73ff13ce8ce073d73d10ebca36d333328ade8a0b493ed1")
     version("0.5.0", sha256="ec81b4ee5b43f2114afd18d266f4633451abe20013422eb03848f00924b79167")
     version("0.4.2.3", sha256="7bad194920b412781ac9754ad41058d52d3cd7186e1851c2bce3640490e9bc6d")
     version("0.4.2", sha256="1f06ab3660c940405230ad16ff6e4ba38d4418a59cd9b16d78a4349f8b488372")
 
     depends_on("r@3.0.2:", type=("build", "run"))
     depends_on("r-backports@1.4.0:", type=("build", "run"), when="@0.5.0:")
-    depends_on("r-stringr", type=("build", "run"))
-    depends_on("r-stringr", when="@:0.4.2.3")
+    depends_on("r-stringr", type=("build", "run"), when="@:0.4.2.3")

var/spack/repos/builtin/packages/r-bigmemory-sri/package.py

@@ -14,4 +14,5 @@ class RBigmemorySri(RPackage):
 
     cran = "bigmemory.sri"
 
+    version("0.1.6", sha256="3bfa6ac966ce0ea93283f5856a853d0ee5ff85aedd7a7d1ca8a93d0aa642860c")
     version("0.1.3", sha256="55403252d8bae9627476d1f553236ea5dc7aa6e54da6980526a6cdc66924e155")

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

@@ -24,3 +24,4 @@ class RBigmemory(RPackage):
     depends_on("r-rcpp", type=("build", "run"))
     depends_on("r-uuid@1.0-2:", type=("build", "run"), when="@4.6.1:")
     depends_on("r-bh", type=("build", "run"))
+    depends_on("uuid", when="@4.6.1:")

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

@@ -32,3 +32,4 @@ class RBio3d(RPackage):
 
     depends_on("r@3.1.0:", type=("build", "run"))
     depends_on("r-rcpp", type=("build", "run"))
+    depends_on("zlib")

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

@@ -13,6 +13,7 @@ class RBiocmanager(RPackage):
 
     cran = "BiocManager"
 
+    version("1.30.20", sha256="b9e72d7687abbd785a69fecb530ec86ad92257a6be95b8e15953b193a516d5ea")
     version("1.30.19", sha256="6897ab1c58ab2fa3108e22d70bc4150c683bb4ac29355ba7886b88acc30c18e2")
     version("1.30.18", sha256="f763126b45614e1b83260da5311923eac50db24002f3c22fa5f667434a5b5c35")
     version("1.30.16", sha256="75a754a55192ef6aa6ac9b054fd5381ff03fe6bb8b2e033eb8143da930ef3855")

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

@@ -16,6 +16,7 @@ class RBlavaan(RPackage):
 
     cran = "blavaan"
 
+    version("0.4-7", sha256="43577264a1faff3cf98fce2c03b729816b40a82d36846458b8026b62da3008c3")
     version("0.4-3", sha256="a9f9f7b32aab7e7f179340c9f0f9d154b5fac51352c4fd590d317c201fe81b74")
     version("0.4-1", sha256="afb077d72f84ef0b6f45ef2ccb8335358042943c32a3472a9ca239ebca1c4aa4")
     version("0.3-18", sha256="373960a22fc741c765e2ad2e0d99c1d4b2162f5f2a230ef314778ef8f433e865")
@@ -25,6 +26,7 @@ class RBlavaan(RPackage):
     depends_on("r-lavaan@0.6-5:", type=("build", "run"))
     depends_on("r-lavaan@0.6-7:", type=("build", "run"), when="@0.3-18:")
     depends_on("r-lavaan@0.6-10:", type=("build", "run"), when="@0.4-1:")
+    depends_on("r-lavaan@0.6-14:", type=("build", "run"), when="@0.4-7:")
     depends_on("r-rcpp@0.12.15:", type=("build", "run"))
     depends_on("r-coda", type=("build", "run"))
     depends_on("r-mnormt", type=("build", "run"))

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

@@ -15,6 +15,7 @@ class RBoot(RPackage):
 
     cran = "boot"
 
+    version("1.3-28.1", sha256="d4cde76fcc8ccc7ffa329de69147b66a6a93a10188e89342fd18207b1d02ff53")
     version("1.3-28", sha256="9f7158fd2714659f590c3955651893dc24bd8f39196bc5a4cc35b0b031744a32")
     version("1.3-25", sha256="464835fcb453072346ce49e4ae318e04c9dba682349be49db616623b6088fbbe")
     version("1.3-23", sha256="79236a5a770dc8bf5ce25d9aa303c5dc0574d94aa043fd00b8b4c8ccc877357f")

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

@@ -15,6 +15,7 @@ class RBoruta(RPackage):
 
     cran = "Boruta"
 
+    version("8.0.0", sha256="38e75b1ebc8b2d1c54b3373a42529b819c7b4773fd4932f57bc9701d1e3e3dc7")
     version("7.0.0", sha256="6ff520d27d68637058c33a34c547a656bb44d5e351b7cc7afed6cd4216275c78")
     version("6.0.0", sha256="1c9a7aabe09f040e147f6c614f5fe1d0b951d3b0f0024161fbb4c31da8fae8de")
 

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

@@ -27,6 +27,7 @@ class RBrms(RPackage):
 
     cran = "brms"
 
+    version("2.19.0", sha256="0e146842c7acfcc6b8273df536eabb5279fb3bf2ae27ce1696f7d838d94fe5c1")
     version("2.18.0", sha256="63914be03cd1c4e6333317d22d7827ba2dc0414cb0dc88337cf74763ba07e111")
     version("2.17.0", sha256="24e5a3a40b81bea558e8f660d0de7fd1a4c2080c7553baac98f34dd2682ece71")
     version("2.16.3", sha256="68302b10b5264f72d163d01c17792c002306cf37f0ee778dcec4c7e118f923e1")
@@ -46,6 +47,7 @@ class RBrms(RPackage):
     depends_on("r-shinystan@2.4.0:", type=("build", "run"))
     depends_on("r-bridgesampling@0.3-0:", type=("build", "run"))
     depends_on("r-glue@1.3.0:", type=("build", "run"))
+    depends_on("r-rlang@1.0.0:", type=("build", "run"), when="@2.19.0:")
     depends_on("r-future@1.19.0:", type=("build", "run"))
     depends_on("r-matrixstats", type=("build", "run"))
     depends_on("r-nleqslv", type=("build", "run"))

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

@@ -20,6 +20,7 @@ class RBroom(RPackage):
 
     cran = "broom"
 
+    version("1.0.4", sha256="1d5f11b509786a8a45ffdd137243e24d6445f2944947cbd62a0734a06add0ad6")
     version("1.0.1", sha256="4b5e5aa485f0e23ed993088fc84159e31a00087e3a12327071dda25193382892")
     version("0.8.0", sha256="66a1095d4430450dc810a5cea61cd7e7bee0e23739dcf5ddc5b57c9894fcf999")
     version("0.7.12", sha256="04fac12b2546689603a474fb92a0572f4241ae87b51b21b0808814a489227bd9")
@@ -32,12 +33,14 @@ class RBroom(RPackage):
     version("0.4.2", sha256="9f409413623cf25e7110452e6215353af5114f7044d73af182bd6c10971c5a44")
 
     depends_on("r@3.1:", type=("build", "run"))
+    depends_on("r@3.5:", type=("build", "run"), when="@1.0.4:")
     depends_on("r-backports", type=("build", "run"), when="@0.5.0:")
     depends_on("r-dplyr", type=("build", "run"))
     depends_on("r-dplyr@1.0.0:", type=("build", "run"), when="@0.7.3:")
     depends_on("r-ellipsis", type=("build", "run"), when="@0.7.3:")
     depends_on("r-generics@0.0.2:", type=("build", "run"), when="@0.5.1:")
     depends_on("r-glue", type=("build", "run"), when="@0.7.3:")
+    depends_on("r-lifecycle", type=("build", "run"), when="@1.0.4:")
     depends_on("r-purrr", type=("build", "run"), when="@0.5.0:")
     depends_on("r-rlang", type=("build", "run"), when="@0.7.3:")
     depends_on("r-stringr", type=("build", "run"))
@@ -45,9 +48,9 @@ class RBroom(RPackage):
     depends_on("r-tibble@3.0.0:", type=("build", "run"), when="@0.7.3:")
     depends_on("r-tidyr", type=("build", "run"))
     depends_on("r-tidyr@1.0.0:", type=("build", "run"), when="@0.7.3:")
-    depends_on("r-ggplot2", type=("build", "run"), when="@0.7.10:")
 
     depends_on("r-plyr", type=("build", "run"), when="@:0.4.2")
     depends_on("r-psych", type=("build", "run"), when="@:0.4.2")
     depends_on("r-reshape2", type=("build", "run"), when="@:0.5.2")
     depends_on("r-nlme", type=("build", "run"), when="@:0.5.2")
+    depends_on("r-ggplot2", type=("build", "run"), when="@0.7.10:1.0.1")

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

@@ -16,16 +16,20 @@ class RBslib(RPackage):
 
     cran = "bslib"
 
+    version("0.4.2", sha256="9a40b7a1bbe409af273e1e940d921ab198ea576548f06f055f552f70ff822f19")
     version("0.4.1", sha256="4ebd1fc84cd19b414e8f8c13fb95270fc28ede125b6e58b08c574ca8c9e0e62f")
     version("0.4.0", sha256="fbea4ecec726f23618e825624f1d9c03939f765ca5a490b171ebf95b815475c2")
     version("0.3.1", sha256="5f5cb56e5cab9039a24cd9d70d73b69c2cab5b2f5f37afc15f71dae0339d9849")
 
     depends_on("r@2.10:", type=("build", "run"))
     depends_on("r-htmltools@0.5.2:", type=("build", "run"))
+    depends_on("r-htmltools@0.5.4:", type=("build", "run"), when="@0.4.2:")
     depends_on("r-jsonlite", type=("build", "run"))
     depends_on("r-sass@0.4.0:", type=("build", "run"))
     depends_on("r-jquerylib@0.1.3:", type=("build", "run"))
     depends_on("r-rlang", type=("build", "run"))
     depends_on("r-memoise", type=("build", "run"), when="@0.4.0:")
     depends_on("r-memoise@2.0.1:", type=("build", "run"), when="@0.4.1:")
+    depends_on("r-mime", type=("build", "run"), when="@0.4.2:")
+    depends_on("r-base64enc", type=("build", "run"), when="@0.4.2:")
     depends_on("r-cachem", type=("build", "run"), when="@0.4.0:")

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

@@ -15,6 +15,7 @@ class RC50(RPackage):
 
     cran = "C50"
 
+    version("0.1.8", sha256="bbd1bd5ed0ed5257529396697bea2a5841c8159470ba09d2066411d4aeda9c15")
     version("0.1.6", sha256="cc20c0e2656287e6ca76ea341a703c816798b212ea4658f249ec047dbbf18cb4")
     version("0.1.5", sha256="f0c17b4830371832ca64f5fcc702351a394ee90b384e0865307de9447f3f16d7")
     version("0.1.3.1", sha256="0b151ba8deef50ab2e2ad8469d87f54f0c6ab862f5c790ed8bb16cb3b8027546")

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

@@ -14,6 +14,7 @@ class RCar(RPackage):
 
     cran = "car"
 
+    version("3.1-2", sha256="89263491977ac8e9406b2f4b1638bf06c7ddd1b0e0e3ecda4be61420474674c8")
     version("3.1-1", sha256="8fc55815eed7e46a32b54da9e0bfa4b74a8d082d73d896e3372f2a413b6bd2bc")
     version("3.1-0", sha256="bd52b4eaea46ce828fccd93445301d06ebd265e2ffff796064875a8c0f0aea21")
     version("3.0-13", sha256="d35ae8da80284c9e4471ff13e7100c3cdc1809fd06f813cd223a3958e29e47eb")
@@ -39,5 +40,4 @@ class RCar(RPackage):
     depends_on("r-lme4@1.1-27.1:", type=("build", "run"), when="@3.0-11:")
     depends_on("r-nlme", type=("build", "run"), when="@3.0:")
     depends_on("r-scales", type=("build", "run"), when="@3.1-1:")
-    depends_on("r-maptools", type=("build", "run"), when="@3.0:")
-    depends_on("r-maptools", when="@:3.1-0")
+    depends_on("r-maptools", type=("build", "run"), when="@3.0:3.1-0")

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

@@ -15,6 +15,7 @@ class RCaracas(RPackage):
 
     cran = "caracas"
 
+    version("2.0.0", sha256="9271239bf7457787371cbd44be74cb9909d67ab7c975b1744d8cf60d8b044b95")
     version("1.1.2", sha256="9c726c77508617e74d1a11ac6e276973df42e1ad81145db455cc6e420526c757")
     version("1.1.1", sha256="e14487c9492417cf5c7d7373c37dbb4fea4d91180a1a03154e51eaa7878b2769")
     version("1.0.1", sha256="2482dd7b77791243b8174cb41b80b735c3ebd7db837bbf991127514f492af594")
@@ -22,5 +23,7 @@ class RCaracas(RPackage):
 
     depends_on("r@3.0:", type=("build", "run"))
     depends_on("r-reticulate@1.14:", type=("build", "run"))
+    depends_on("r-doby@4.6.15:", type=("build", "run"), when="@2.0.0:")
+    depends_on("r-matrix", type=("build", "run"), when="@2.0.0:")
     depends_on("r-magrittr", type=("build", "run"), when="@1.1.1:")
     depends_on("python@3.6:", type=("build", "run"))

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

@@ -14,6 +14,7 @@ class RCaret(RPackage):
 
     cran = "caret"
 
+    version("6.0-94", sha256="2715e83ca260bb739cd926a55b0d2da1e3f6308b17b56862466e738d930d29a8")
     version("6.0-93", sha256="4c156b88879d390436a54779ea19ffbae3f476533d83caaf30400d76130c4a07")
     version("6.0-92", sha256="1d814a2a921a23ad8b9a7da6f788e6abc06f5668b3918bd440d4355bc4b81511")
     version("6.0-90", sha256="e851a4ed7d939c665e57e3551a5464b09fe4285e7c951236efdd890b0da866bc")
@@ -34,7 +35,7 @@ class RCaret(RPackage):
     depends_on("r-nlme", type=("build", "run"))
     depends_on("r-plyr", type=("build", "run"))
     depends_on("r-proc", type=("build", "run"), when="@6.0-86:")
-    depends_on("r-recipes@0.1.4:", type=("build", "run"), when="@6.0-83:6.0-84")
+    depends_on("r-recipes@0.1.4:", type=("build", "run"), when="@6.0-83:")
     depends_on("r-recipes@0.1.10:", type=("build", "run"), when="@6.0-86:")
     depends_on("r-reshape2", type=("build", "run"))
     depends_on("r-withr@2.0.0:", type=("build", "run"), when="@6.0-83:")

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

@@ -22,7 +22,9 @@ class RCaroline(RPackage):
 
     cran = "caroline"
 
+    version("0.9.0", sha256="7231daacf2f0e89d9363ea919071f8352ae487011f56e84a4054de11a9243ac8")
     version("0.8.0", sha256="58f464711f7279ca2aa173e6ce29d3308e01db37dccefbbf14cd7720c0231976")
     version("0.7.6", sha256="e7ba948f7d87f091b498dd0eec2ca4fdad7af4e2bbb67e0945c2f0d3f2eadda9")
 
     depends_on("r@1.8.0:", type=("build", "run"))
+    depends_on("r@2.0.0:", type=("build", "run"), when="@0.9.0:")

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

@@ -13,6 +13,7 @@ class RChron(RPackage):
 
     cran = "chron"
 
+    version("2.3-60", sha256="0e0675cec55b6cea87fc5776846215e0445442554684120079e66013067491ee")
     version("2.3-58", sha256="057fc628cde330c22b9d20365316d3632c2d217f4f2f97d39b1d1a2c93f766d0")
     version("2.3-57", sha256="9645d86a84d1afc12a0accf4f826fdd40e6d050a313424ad70f8085e8f19c232")
     version("2.3-56", sha256="863ecbb951a3da994761ea9062fa96d34e94e19fbc4122521ac179274dfa3f5d")

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

@@ -14,6 +14,7 @@ class RClass(RPackage):
 
     cran = "class"
 
+    version("7.3-21", sha256="0c19404aa4d2da61a62495e788b07c8e429c4c5ee64486ea5e6dd347bcaecddf")
     version("7.3-20", sha256="e65b046bc72b312ff0c5dc7feba4fa3e9bc63387274d44911493782b85f65483")
     version("7.3-19", sha256="7820ae94b22009561a69ed1f8b2ca2a3814be6a656e9884738206997caecbe37")
     version("7.3-17", sha256="be1f85b6df7556db93f50cb08106aac6620d4b5bb3fee846422863a022461313")

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

@@ -14,6 +14,7 @@ class RClassint(RPackage):
 
     cran = "classInt"
 
+    version("0.4-9", sha256="5b11af7d08f8793c7b47ee7c68b8e371cb23027165d30abddbd8b2abcc20e1c3")
     version("0.4-8", sha256="6ae9617f5b71bbecfa204a4f36b5972808bafd060d87a4a5bac17f3ad2ca59b3")
     version("0.4-3", sha256="9ede7a2a7a6b6c114919a3315a884fb592e33b037a50a4fe45cbd4fe2fc434ac")
     version("0.4-1", sha256="39c63f8e37b379033d73d57929b5b8ea41b0023626cc1cec648d66bade5d0103")

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

@@ -18,6 +18,7 @@ class RCli(RPackage):
 
     cran = "cli"
 
+    version("3.6.1", sha256="be3006cec7e67f9ae25e21b4658c4bec680038c2ef7467df5f14da3311a05e36")
     version("3.4.1", sha256="1c585efbfd8b8685c66fac34bcb60f28c351691bb4b9931df214e6e47fd9744e")
     version("3.3.0", sha256="c3a9ebbcb9017fb9aeda4f7df5ca981e42b169cbd7ce13e592cda2cd74250d63")
     version("3.2.0", sha256="cd5a1b754d09de33f088f25ecdb0494100f9a42bc0a66622bfd7d8ec5498e862")
@@ -36,6 +37,5 @@ class RCli(RPackage):
     depends_on("r-assertthat", type=("build", "run"), when="@:2.3")
     depends_on("r-crayon@1.3.4:", type=("build", "run"), when="@:2.2")
     depends_on("r-fansi", type=("build", "run"), when="@2:2.2")
-    depends_on("r-glue", type=("build", "run"), when="@2:")
-    depends_on("r-glue@1.6.0:", type=("build", "run"), when="@3.3.0:")
-    depends_on("r-glue", when="@:3.3.0")
+    depends_on("r-glue", type=("build", "run"), when="@2:3.4.1")
+    depends_on("r-glue@1.6.0:", type=("build", "run"), when="@3.3.0")

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

@@ -0,0 +1,27 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class RClock(RPackage):
+    """Date-Time Types and Tools.
+
+    Provides a comprehensive library for date-time manipulations using a new
+    family of orthogonal date-time classes (durations, time points,
+    zoned-times, and calendars) that partition responsibilities so that the
+    complexities of time zones are only considered when they are really needed.
+    Capabilities include: date-time parsing, formatting, arithmetic, extraction
+    and updating of components, and rounding."""
+
+    cran = "clock"
+
+    version("0.6.1", sha256="f80c385fd8229538968ffb71d7de53ddc82bfcec6641f8e76f299546c43c1702")
+
+    depends_on("r@3.4:", type=("build", "run"))
+    depends_on("r-rlang@1.0.4:", type=("build", "run"))
+    depends_on("r-tzdb@0.3.0:", type=("build", "run"))
+    depends_on("r-vctrs@0.4.1:", type=("build", "run"))
+    depends_on("r-cpp11@0.4.2:", type=("build", "run"))

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

@@ -11,6 +11,7 @@ class RClue(RPackage):
 
     cran = "clue"
 
+    version("0.3-64", sha256="f45cb7a84c87ddca2b9f7c2ea9505016d002e6fda23322e6d57466c7a4de28af")
     version("0.3-62", sha256="575a3fa2c4aa1ae5c7e35f4462f2f331d291d87916aa12f0d11f61988d5e1ed2")
     version("0.3-61", sha256="71311b16ce380fd9a8834be95b55b3d1b47e4ee2b8acb35b8d481138c314dc31")
     version("0.3-60", sha256="6d21ddfd0d621ed3bac861890c600884b6ed5ff7d2a36c9778b892636dbbef2a")

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

@@ -11,6 +11,7 @@ class RCodetools(RPackage):
 
     cran = "codetools"
 
+    version("0.2-19", sha256="c4b7e567c87f33dad85de92f79641e5e5b5deede6d19a9dfa47133d191782dab")
     version("0.2-18", sha256="1a9ea6b9792dbd1688078455929385acc3a5e4bef945c77bec1261fa4a084c28")
     version("0.2-16", sha256="c276757c3adabaf700f2ea25835892b09bc1bd438ebd17c805ea9073ed8a74b6")
     version("0.2-15", sha256="4e0798ed79281a614f8cdd199e25f2c1bd8f35ecec902b03016544bd7795fa40")

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

@@ -27,6 +27,7 @@ class RColorspace(RPackage):
 
     cran = "colorspace"
 
+    version("2.1-0", sha256="04078abb6b54119c90dc7085d62916bf292ccb163e213f9ea70567d1be82614c")
     version("2.0-3", sha256="e75681cc4dd6e4b70303fd96a6d4597065dc6bffcaa4ae4244b73ff19016857f")
     version("2.0-2", sha256="b891cd2ec129ed5f116429345947bcaadc33969758a108521eb0cf36bd12183a")
     version("2.0-0", sha256="4e6a53af9918db282cefdc71eaa30f507d4d1d682bcfb74cb0dd68a0b282018e")

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

@@ -18,6 +18,7 @@ class RCommonmark(RPackage):
 
     cran = "commonmark"
 
+    version("1.9.0", sha256="6dd01a5a26c8d436486abf69c2f6ad0f8dd1c811f575c31983aeb4dbd376548f")
     version("1.8.1", sha256="96adcb093de3d2e48811af402da70e7222a313b97f1e979e0cbe84dd59bd5cbe")
     version("1.8.0", sha256="7d07e72937b1cf158e69f183722bf79dbb91b8967a9dd29f4fa145500c2be668")
     version("1.7", sha256="d14a767a3ea9778d6165f44f980dd257423ca6043926e3cd8f664f7171f89108")

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

@@ -0,0 +1,25 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class RConflicted(RPackage):
+    """An Alternative Conflict Resolution Strategy.
+
+    R's default conflict management system gives the most recently loaded
+    package precedence. This can make it hard to detect conflicts, particularly
+    when they arise because a package update creates ambiguity that did not
+    previously exist. 'conflicted' takes a different approach, making every
+    conflict an error and forcing you to choose which function to use."""
+
+    cran = "conflicted"
+
+    version("1.2.0", sha256="c99b86bb52da3e7d1f4d96d70c77304d0434db5bd906edd8d743e89ac9223088")
+
+    depends_on("r@3.2:", type=("build", "run"))
+    depends_on("r-cli@3.4.0:", type=("build", "run"))
+    depends_on("r-memoise", type=("build", "run"))
+    depends_on("r-rlang@1.0.0:", type=("build", "run"))

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

@@ -18,6 +18,7 @@ class RConstruct(RPackage):
 
     cran = "conStruct"
 
+    version("1.0.5", sha256="4d953073bd1f374a91655b4889ab1b65d92a1c89ea39eb3dac5cd852a42b8a7c")
     version("1.0.4", sha256="4e585b718a361061bc1432cea46fc65f802fb0ef58e4516d33e1af99bbfe90ce")
     version("1.0.3", sha256="b449c133a944ad05a28f84f312ed4ccbc1574c4659aa09c678618d2ae9008310")
 
@@ -33,4 +34,5 @@ class RConstruct(RPackage):
     depends_on("r-stanheaders@2.18.0:", type=("build", "run"))
     depends_on("r-bh@1.66.0:", type=("build", "run"))
     depends_on("r-rcppeigen@0.3.3.3.0:", type=("build", "run"))
+    depends_on("r-rcppparallel@5.0.1:", type=("build", "run"), when="@1.0.5:")
     depends_on("gmake", type="build")

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

@@ -24,6 +24,7 @@ class RCopula(RPackage):
 
     cran = "copula"
 
+    version("1.1-2", sha256="88f9454d25e4dcdf53d8ca5156daf48e664769f5e13b1e835ed64f37251587d3")
     version("1.1-0", sha256="9ab76e6256534db2a18d3880143b8c67e385767010de861bbde25212aa75d924")
     version("1.0-1", sha256="d09b2ccffc7379e48b00952aa6b282baf502feebaf55cc44e93f881d7b909742")
     version("0.999-20", sha256="7d3d47bce2dacb05b94a772f84dbf3d83c99ac2ac11e5f1b4b03d50d9d5c0fb0")
@@ -31,6 +32,7 @@ class RCopula(RPackage):
     depends_on("r@3.2.0:", type=("build", "run"))
     depends_on("r@3.5.0:", type=("build", "run"), when="@1.0-1:")
     depends_on("r-matrix", type=("build", "run"))
+    depends_on("r-matrix@1.5-0:", type=("build", "run"), when="@1.1-2:")
     depends_on("r-lattice", type=("build", "run"))
     depends_on("r-colorspace", type=("build", "run"))
     depends_on("r-gsl", type=("build", "run"))

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

@@ -18,6 +18,7 @@ class RCubature(RPackage):
 
     cran = "cubature"
 
+    version("2.0.4.6", sha256="330c9dc2be9bf6815473fd40efa8c2de47c1ed286cb097d0ff846b56c9e9f95a")
     version("2.0.4.5", sha256="a81f118e5b7950a4a29e5509f8a40d7b87544fb25783917242000561379c9023")
     version("2.0.4.4", sha256="087b3b2c4f25d873fa95e9d38766a17a7201d03a6f4960f1e080a8db8b67d569")
     version("2.0.4.2", sha256="605bdd9d90fb6645359cccd1b289c5afae235b46360ef5bdd2001aa307a7694e")

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

@@ -13,6 +13,7 @@ class RCubist(RPackage):
 
     cran = "Cubist"
 
+    version("0.4.2.1", sha256="f07afed59019a3febc04acc3e58728e42b42910940a1d529f9fc482931d09157")
     version("0.4.0", sha256="3a1f74d44300e3a38a10e3693fc019cfcca221d62d7c416abebb20811e965578")
     version("0.3.0", sha256="88a76e7f858a8e978a73a97ce6a3504201d889517b39ce862cef734dcf9eb263")
     version("0.2.3", sha256="19845f585e073f316bb4bdf74b28a624e839561faeedd40ef5548960c5b1e1f4")