spack: bump package (#39184)

1 files changed, 39 insertions, 10 deletions

diff --git a/var/spack/repos/builtin/packages/spack/package.py b/var/spack/repos/builtin/packages/spack/package.py
index 01acba8705..e656f8656b 100644
--- a/var/spack/repos/builtin/packages/spack/package.py
+++ b/var/spack/repos/builtin/packages/spack/package.py
@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack.package import *
+from spack.variant import DisjointSetsOfValues
 
 
 class Spack(Package):
@@ -21,6 +22,11 @@ class Spack(Package):
     maintainers("haampie")
 
     version("develop", branch="develop")
+    version("0.20.1", sha256="141be037b56e4b095840a95ac51c428c29dad078f7f88140ae6355b2a1b32dc3")
+    version("0.20.0", sha256="a189b4e8173eefdf76617445125b329d912f730767048846c38c8a2637396a7d")
+    version("0.19.2", sha256="4978b37da50f5690f4e1aa0cfe3975a89ccef85d96c68d417ea0716a8ce3aa98")
+    version("0.19.1", sha256="c9666f0b22ccf3cbda2736104d5d4e3b9cad5b4b4f01874a501e97d2c9477452")
+    version("0.19.0", sha256="b4225daf4f365a15caa58ef465d125b0d108ac5430b74d53ca4e807777943daf")
     version("0.18.1", sha256="d1491374ce280653ee0bc48cd80527d06860b886af8b0d4a7cf1d0a2309191b7")
     version("0.18.0", sha256="7b8d1e6bb49cd4f46f79a93fa577e00336dafeb5452712e36efeafd02711d38e")
     version("0.17.3", sha256="e9bf38917fa3b5231a65930aa657ef19fd380bebcc9ee44204167b1593f6fa06")
@@ -32,7 +38,28 @@ class Spack(Package):
     version("0.16.1", sha256="8d893036b24d9ee0feee41ac33dd66e4fc68d392918f346f8a7a36a69c567567")
     version("0.16.0", sha256="064b2532c70916c7684d4c7c973416ac32dd2ea15f5c392654c75258bfc8c6c2")
 
-    variant("development_tools", default=True, description="Build development dependencies")
+    variant("development_tools", default=False, description="Build development dependencies")
+    variant(
+        "fetchers",
+        # TODO: make Spack support default=... with any_combination_of :(
+        values=DisjointSetsOfValues(
+            ("none",), ("curl", "git", "mercurial", "subversion", "s3")
+        ).with_default("git"),
+        description="Fetchers for sources and binaries. "
+        "By default, urllib is used since Spack 0.17",
+    )
+    variant(
+        "modules",
+        # TODO: make Spack support default=... with any_combination_of :(
+        values=DisjointSetsOfValues(("none",), ("environment-modules", "lmod")).with_default(
+            "environment-modules,lmod"
+        ),
+        description="This variant makes Spack install the specified module system; "
+        "notice that Spack can still generate module files even if modules=none is selected.",
+    )
+
+    # This should be read as "require at least curl", not "require curl".
+    requires("fetchers=curl", when="@:0.16", msg="Curl is required for Spack < 0.17")
 
     # Python (with spack python -i ipython support)
     depends_on("python@2.6.0:2.7,3.5:", type="run")
@@ -59,16 +86,19 @@ class Spack(Package):
     depends_on("ccache", type="run")
 
     # Fetchers
-    depends_on("curl", type="run")
-    depends_on("git", type="run")
-    depends_on("mercurial", type="run")
-    depends_on("subversion", type="run")
+    depends_on("curl", type="run", when="fetchers=curl")
+    depends_on("git", type="run", when="fetchers=git")
+    depends_on("mercurial", type="run", when="fetchers=mercurial")
+    depends_on("subversion", type="run", when="fetchers=subversion")
+    depends_on("py-boto3", type="run", when="fetchers=s3")
 
     # Modules
-    depends_on("tcl", type="run")
-    depends_on("lmod", type="run")
-    # Spack 0.18 uses lmod's depends_on function, which was introduced in v7.5.12
-    depends_on("lmod@7.5.12:", type="run", when="@0.18:")
+    depends_on("environment-modules", type="run", when="modules=environment-modules")
+
+    with when("modules=lmod"):
+        depends_on("lmod", type="run")
+        # Spack 0.18 uses lmod's depends_on function, which was introduced in v7.5.12
+        depends_on("lmod@7.5.12:", type="run", when="@0.18:")
 
     # Buildcache
     # We really just need the 'strings' from binutils for older versions of spack
@@ -76,7 +106,6 @@ class Spack(Package):
     depends_on("gnupg", type="run")
     depends_on("patchelf", type="run", when="platform=linux")
     depends_on("patchelf", type="run", when="platform=cray")
-    depends_on("py-boto3", type="run")
 
     # See https://github.com/spack/spack/pull/24686
     # and #25595, #25726, #25853, #25923, #25924 upstream in python/cpython