use neovim/deps as source for 0.3.2

lib/spack/spack/cmd/common/arguments.py

@@ -349,7 +349,7 @@ def install_status():
         "-I",
         "--install-status",
         action="store_true",
-        default=True,
+        default=False,
         help="show install status of packages. packages can be: "
         "installed [+], missing and needed by an installed package [-], "
         "installed in and upstream instance [^], "
@@ -357,17 +357,6 @@ def install_status():
     )
 
 
-@arg
-def no_install_status():
-    return Args(
-        "--no-install-status",
-        dest="install_status",
-        action="store_false",
-        default=True,
-        help="do not show install status annotations",
-    )
-
-
 @arg
 def no_checksum():
     return Args(

lib/spack/spack/cmd/solve.py

@@ -44,11 +44,7 @@ def setup_parser(subparser):
     )
 
     # Below are arguments w.r.t. spec display (like spack spec)
-    arguments.add_common_arguments(subparser, ["long", "very_long"])
-
-    install_status_group = subparser.add_mutually_exclusive_group()
-    arguments.add_common_arguments(install_status_group, ["install_status", "no_install_status"])
-
+    arguments.add_common_arguments(subparser, ["long", "very_long", "install_status"])
     subparser.add_argument(
         "-y",
         "--yaml",

lib/spack/spack/cmd/spec.py

@@ -31,11 +31,7 @@ def setup_parser(subparser):
 for further documentation regarding the spec syntax, see:
     spack help --spec
 """
-    arguments.add_common_arguments(subparser, ["long", "very_long"])
-
-    install_status_group = subparser.add_mutually_exclusive_group()
-    arguments.add_common_arguments(install_status_group, ["install_status", "no_install_status"])
-
+    arguments.add_common_arguments(subparser, ["long", "very_long", "install_status"])
     format_group = subparser.add_mutually_exclusive_group()
     format_group.add_argument(
         "-y",

lib/spack/spack/test/cmd/spec.py

@@ -157,7 +157,7 @@ def _parse_types(string):
 
 
 def test_spec_deptypes_nodes():
-    output = spec("--types", "--cover", "nodes", "--no-install-status", "dt-diamond")
+    output = spec("--types", "--cover", "nodes", "dt-diamond")
     types = _parse_types(output)
 
     assert types["dt-diamond"] == ["    "]
@@ -167,7 +167,7 @@ def test_spec_deptypes_nodes():
 
 
 def test_spec_deptypes_edges():
-    output = spec("--types", "--cover", "edges", "--no-install-status", "dt-diamond")
+    output = spec("--types", "--cover", "edges", "dt-diamond")
     types = _parse_types(output)
 
     assert types["dt-diamond"] == ["    "]

share/spack/spack-completion.bash

@@ -1695,7 +1695,7 @@ _spack_restage() {
 _spack_solve() {
     if $list_options
     then
-        SPACK_COMPREPLY="-h --help --show -l --long -L --very-long -I --install-status --no-install-status -y --yaml -j --json -c --cover -N --namespaces -t --types --timers --stats -U --fresh --reuse --reuse-deps"
+        SPACK_COMPREPLY="-h --help --show -l --long -L --very-long -I --install-status -y --yaml -j --json -c --cover -N --namespaces -t --types --timers --stats -U --fresh --reuse --reuse-deps"
     else
         _all_packages
     fi
@@ -1704,7 +1704,7 @@ _spack_solve() {
 _spack_spec() {
     if $list_options
     then
-        SPACK_COMPREPLY="-h --help -l --long -L --very-long -I --install-status --no-install-status -y --yaml -j --json --format -c --cover -N --namespaces -t --types -U --fresh --reuse --reuse-deps"
+        SPACK_COMPREPLY="-h --help -l --long -L --very-long -I --install-status -y --yaml -j --json --format -c --cover -N --namespaces -t --types -U --fresh --reuse --reuse-deps"
     else
         _all_packages
     fi

share/spack/templates/container/Dockerfile

@@ -37,7 +37,7 @@ RUN find -L {{ paths.view }}/* -type f -exec readlink -f '{}' \; | \
 
 # Modifications to the environment that are necessary to run
 RUN cd {{ paths.environment }} && \
-    spack env activate --sh -d . > activate.sh
+    spack env activate --sh -d . >> /etc/profile.d/z10_spack_environment.sh
 
 {% if extra_instructions.build %}
 {{ extra_instructions.build }}
@@ -53,13 +53,7 @@ COPY --from=builder {{ paths.environment }} {{ paths.environment }}
 COPY --from=builder {{ paths.store }} {{ paths.store }}
 COPY --from=builder {{ paths.hidden_view }} {{ paths.hidden_view }}
 COPY --from=builder {{ paths.view }} {{ paths.view }}
-
-RUN { \
-      echo '#!/bin/sh' \
-      && echo '.' {{ paths.environment }}/activate.sh \
-      && echo 'exec "$@"'; \
-    } > /entrypoint.sh \
-&&  chmod a+x /entrypoint.sh
+COPY --from=builder /etc/profile.d/z10_spack_environment.sh /etc/profile.d/z10_spack_environment.sh
 
 {% block final_stage %}
 
@@ -76,6 +70,6 @@ RUN {% if os_package_update %}{{ os_packages_final.update }} \
 {% for label, value in labels.items() %}
 LABEL "{{ label }}"="{{ value }}"
 {% endfor %}
-ENTRYPOINT [ "/entrypoint.sh" ]
+ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l", "-c", "$*", "--" ]
 CMD [ "/bin/bash" ]
 {% endif %}

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

@@ -27,8 +27,7 @@ class Abinit(AutotoolsPackage):
     homepage = "https://www.abinit.org/"
     url = "https://www.abinit.org/sites/default/files/packages/abinit-8.6.3.tar.gz"
 
-    version("9.8.4", sha256="a086d5045f0093b432e6a044d5f71f7edf5a41a62d67b3677cb0751d330c564a")
-    version("9.8.3", sha256="de823878aea2c20098f177524fbb4b60de9b1b5971b2e835ec244dfa3724589b")
+    version("9.8.3", sha256="65fb93217336a72d1554cc6991127203958cc7df59921782251a86569e33a357")
     version("9.6.1", sha256="b6a12760fd728eb4aacca431ae12150609565bedbaa89763f219fcd869f79ac6")
     version("9.4.2", sha256="d40886f5c8b138bb4aa1ca05da23388eb70a682790cfe5020ecce4db1b1a76bc")
     version("8.10.3", sha256="ed626424b4472b93256622fbb9c7645fa3ffb693d4b444b07d488771ea7eaa75")

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

@@ -159,10 +159,6 @@ class Comgr(CMakePackage):
 
     root_cmakelists_dir = join_path("lib", "comgr")
 
-    def cmake_args(self):
-        args = [self.define("BUILD_TESTING", self.run_tests)]
-        return args
-
     @classmethod
     def determine_version(cls, lib):
         match = re.search(r"lib\S*\.so\.\d+\.\d+\.(\d)(\d\d)(\d\d)", lib)

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

@@ -232,13 +232,6 @@ class Gromacs(CMakePackage, CudaPackage):
         for gmx_ver, plumed_vers in plumed_patches.items():
             depends_on("plumed@{0}".format(plumed_vers), when="@{0}+plumed".format(gmx_ver))
 
-    variant(
-        "intel_provided_gcc",
-        default=False,
-        description="Use this if Intel compiler is installed through spack."
-        + "The g++ location is written to icp{c,x}.cfg",
-    )
-
     depends_on("fftw-api@3")
     depends_on("cmake@2.8.8:3", type="build")
     depends_on("cmake@3.4.3:3", type="build", when="@2018:")
@@ -251,8 +244,7 @@ class Gromacs(CMakePackage, CudaPackage):
     depends_on("sycl", when="+sycl")
     depends_on("lapack", when="+lapack")
     depends_on("blas", when="+blas")
-    depends_on("gcc", when="%oneapi ~intel_provided_gcc")
-    depends_on("gcc", when="%intel ~intel_provided_gcc")
+    depends_on("gcc", when="%oneapi")
 
     depends_on("hwloc@1.0:1", when="+hwloc@2016:2018")
     depends_on("hwloc", when="+hwloc@2019:")
@@ -262,14 +254,6 @@ class Gromacs(CMakePackage, CudaPackage):
 
     depends_on("nvhpc", when="+cufftmp")
 
-    requires(
-        "%intel",
-        "%oneapi",
-        policy="one_of",
-        when="+intel_provided_gcc",
-        msg="Only attempt to find gcc libs for Intel compiler if Intel compiler is used.",
-    )
-
     patch("gmxDetectCpu-cmake-3.14.patch", when="@2018:2019.3^cmake@3.14.0:")
     patch("gmxDetectSimd-cmake-3.14.patch", when="@5.0:2017^cmake@3.14.0:")
 
@@ -447,16 +431,8 @@ def cmake_args(self):
         if self.spec.satisfies("@2020:"):
             options.append("-DGMX_INSTALL_LEGACY_API=ON")
 
-        if self.spec.satisfies("%oneapi") or self.spec.satisfies("%intel"):
-            # If intel-oneapi-compilers was installed through spack the gcc is added to the
-            # configuration file.
-            if self.spec.satisfies("+intel_provided_gcc") and os.path.exists(
-                ".".join([os.environ["SPACK_CXX"], "cfg"])
-            ):
-                with open(".".join([os.environ["SPACK_CXX"], "cfg"]), "r") as f:
-                    options.append("-DCMAKE_CXX_FLAGS={}".format(f.read()))
-            else:
-                options.append("-DGMX_GPLUSPLUS_PATH=%s/g++" % self.spec["gcc"].prefix.bin)
+        if self.spec.satisfies("%oneapi"):
+            options.append("-DGMX_GPLUSPLUS_PATH=%s/g++" % self.spec["gcc"].prefix.bin)
 
         if "+double" in self.spec:
             options.append("-DGMX_DOUBLE:BOOL=ON")

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

@@ -13,6 +13,11 @@ class Libvterm(MakefilePackage):
     homepage = "http://www.leonerd.org.uk/code/libvterm/"
     url = "http://www.leonerd.org.uk/code/libvterm/libvterm-0.1.3.tar.gz"
 
+    version(
+        "0.3.2",
+        sha256="91eb5088069f4e6edab69e14c4212f6da0192e65695956dc048016a0dab8bcf6",
+        url="https://github.com/neovim/deps/raw/6c0a5213d062f2210fd5fecb9524ac27ca018ef4/opt/libvterm-0.3.2.tar.gz",
+    )
     version("0.3.1", sha256="25a8ad9c15485368dfd0a8a9dca1aec8fea5c27da3fa74ec518d5d3787f0c397")
     version("0.3", sha256="61eb0d6628c52bdf02900dfd4468aa86a1a7125228bab8a67328981887483358")
     version("0.2", sha256="4c5150655438cfb8c57e7bd133041140857eb04defd0e544521c0e469258e105")

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

@@ -11,17 +11,15 @@ class Podman(Package):
 
     homepage = "https://podman.io"
     url = "https://github.com/containers/podman/archive/refs/tags/v4.3.1.tar.gz"
-    maintainers("alecbcs")
+    maintainers("bernhardkaindl")
 
-    version("4.5.1", sha256="ee2c8b02b7fe301057f0382637b995a9c6c74e8d530692d6918e4c509ade6e39")
     version("4.3.1", sha256="455c29c4ee78cd6365e5d46e20dd31a5ce4e6e1752db6774253d76bd3ca78813")
     version("3.4.7", sha256="4af6606dd072fe946960680611ba65201be435b43edbfc5cc635b2a01a899e6e")
     version("3.4.2", sha256="b0c4f9a11eb500b1d440d5e51a6c0c632aa4ac458e2dc0362f50f999eb7fbf31")
 
     # See <https://github.com/containers/podman/issues/16996> for the
     # respective issue and the suggested patch
-    # issue was fixed as of 4.4.0
-    patch("markdown-utf8.diff", when="@4:4.3.1")
+    patch("markdown-utf8.diff", when="@4:")
 
     depends_on("go", type="build")
     depends_on("go-md2man", type="build")

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

@@ -13,13 +13,10 @@ class PyCatalogue(PythonPackage):
     homepage = "https://github.com/explosion/catalogue"
     pypi = "catalogue/catalogue-2.0.0.tar.gz"
 
-    version("2.0.8", sha256="b325c77659208bfb6af1b0d93b1a1aa4112e1bb29a4c5ced816758a722f0e388")
     version("2.0.0", sha256="34f8416ec5e7ed08e55c10414416e67c3f4d66edf83bc67320c3290775293816")
     version("1.0.0", sha256="d74d1d856c6b36a37bf14aa6dbbc27d0582667b7ab979a6108e61a575e8723f5")
 
     depends_on("python@3.6:", when="@2:", type=("build", "run"))
     depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
-    depends_on("py-importlib-metadata@0.20:", when="@:2.0.0^python@:3.7", type=("build", "run"))
-    depends_on("py-zipp@0.5:", when="@2.0.8:^python@:3.7", type=("build", "run"))
-    depends_on("py-typing-extensions@3.6.4:", when="@2.0.8:^python@3.7", type=("build", "run"))
+    depends_on("py-importlib-metadata@0.20:", when="^python@:3.7", type=("build", "run"))

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

@@ -1,21 +0,0 @@
-# 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 PyTyper(PythonPackage):
-    """Typer, build great CLIs. Easy to code. Based on Python type hints."""
-
-    homepage = "https://github.com/tiangolo/typer"
-    pypi = "typer/typer-0.9.0.tar.gz"
-
-    version("0.9.0", sha256="50922fd79aea2f4751a8e0408ff10d2662bd0c8bbfa84755a699f3bada2978b2")
-    version("0.7.0", sha256="ff797846578a9f2a201b53442aedeb543319466870fbe1c701eab66dd7681165")
-
-    depends_on("python@3.6:", type=("build", "run"))
-    depends_on("py-flit-core@2.0:2", type="build")
-    depends_on("py-click@7.1.1:8", type=("build", "run"))
-    depends_on("py-typing-extensions@3.7.4.3:", type=("build", "run"), when="@0.9.0:")