diff options
| author | Alec Scott <hi@alecbcs.com> | 2024-05-15 11:04:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-15 11:04:52 -0700 |
| commit | d0589285f72bc6ec9b5f804612448954dcdf819c (patch) | |
| tree | e74f47e44b3106a80413cc015246ac80ed02ac22 /var | |
| parent | d079aaa08336d7805fc0361669e1d16b8d5de4bf (diff) | |
| download | spack-d0589285f72bc6ec9b5f804612448954dcdf819c.tar.gz spack-d0589285f72bc6ec9b5f804612448954dcdf819c.tar.bz2 spack-d0589285f72bc6ec9b5f804612448954dcdf819c.tar.xz spack-d0589285f72bc6ec9b5f804612448954dcdf819c.zip | |
unmaintained pkgs: bump versions 2024-05-10 (#44131)
* unmaintained pkgs: bump versions 2024-05-10
* openblas: fix satisfies syntax
* pixman: add autotools dependencies
* [@spackbot] updating style on behalf of alecbcs
* pixman: revert
* chapel: revert changes in favor of other PR
* openblas: revert due to failing tests
* Address review feedback for flint, biobam2, and pango
* pango: add version comment about v2.0
* numactl: revert changes due to ppc4le bug
* flint: remote duplicate configure arg
Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
* openvkl, rkcommon: remove commented maintainers template
* flint: fix style
---------
Co-authored-by: alecbcs <alecbcs@users.noreply.github.com>
Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
Diffstat (limited to 'var')
81 files changed, 224 insertions, 173 deletions
diff --git a/var/spack/repos/builtin/packages/axel/package.py b/var/spack/repos/builtin/packages/axel/package.py index 75990f4f94..eb57c69b89 100644 --- a/var/spack/repos/builtin/packages/axel/package.py +++ b/var/spack/repos/builtin/packages/axel/package.py @@ -14,14 +14,21 @@ class Axel(AutotoolsPackage): license("GPL-2.0-or-later WITH OpenSSL-Exception") + version("2.17.14", sha256="73f3aeafcb00b8101b212fcf47969a4962e7a1b50843306178b527a9942d8785") version("2.17.13", sha256="aedd5e0f22d6eda23eece483ce89be4adfdf1e16ba18d54fd6b743da9d49911b") version("2.17.10", sha256="c0d26eba6b94945cd98c5b69ca6df2744639d17bfd49047ef51a8a48f067de10") version("2.16.1", sha256="763066efc61e4f7be2eb59afa049bdbc520837e01c95a78f403e542ad82f2719") depends_on("pkgconfig", type="build") + # For systems not providing libintl APU in the system libc (glibc integrated it) depends_on("gettext") depends_on("openssl") - def installcheck(self): - Executable(self.prefix.bin.axel)("--version") + # check if we can run axel + @run_after("install") + @on_package_attributes(run_tests=True) + def check_version(self): + with working_dir(self.stage.source_path): + axel = Executable(self.prefix.bin.axel) + axel("--version") diff --git a/var/spack/repos/builtin/packages/biobambam2/package.py b/var/spack/repos/builtin/packages/biobambam2/package.py index 83f0293a2d..e0826724e3 100644 --- a/var/spack/repos/builtin/packages/biobambam2/package.py +++ b/var/spack/repos/builtin/packages/biobambam2/package.py @@ -27,7 +27,7 @@ class Biobambam2(AutotoolsPackage): test_src_dir = "test" def configure_args(self): - args = ["--with-libmaus2={0}".format(self.spec["libmaus2"].prefix)] + args = [f"--with-libmaus2={self.spec['libmaus2'].prefix}"] return args @run_after("install") diff --git a/var/spack/repos/builtin/packages/cjson/package.py b/var/spack/repos/builtin/packages/cjson/package.py index 937044baa5..bb20d0c3ae 100644 --- a/var/spack/repos/builtin/packages/cjson/package.py +++ b/var/spack/repos/builtin/packages/cjson/package.py @@ -15,4 +15,5 @@ class Cjson(CMakePackage): license("MIT") + version("1.7.17", sha256="51f3b07aece8d1786e74b951fd92556506586cb36670741b6bfb79bf5d484216") version("1.7.15", sha256="c55519316d940757ef93a779f1db1ca809dbf979c551861f339d35aaea1c907c") diff --git a/var/spack/repos/builtin/packages/clp/package.py b/var/spack/repos/builtin/packages/clp/package.py index f245a38657..491a94c8d3 100644 --- a/var/spack/repos/builtin/packages/clp/package.py +++ b/var/spack/repos/builtin/packages/clp/package.py @@ -13,16 +13,17 @@ class Clp(AutotoolsPackage): homepage = "https://projects.coin-or.org/Clp" url = "https://github.com/coin-or/Clp/archive/releases/1.17.6.tar.gz" - depends_on("pkgconfig", type="build") - depends_on("coinutils") - depends_on("osi") - depends_on("pkgconfig", type="build") - license("EPL-2.0") + version("1.17.9", sha256="b02109be54e2c9c6babc9480c242b2c3c7499368cfca8c0430f74782a694a49f") version("1.17.7", sha256="c4c2c0e014220ce8b6294f3be0f3a595a37bef58a14bf9bac406016e9e73b0f5") version("1.17.6", sha256="afff465b1620cfcbb7b7c17b5d331d412039650ff471c4160c7eb24ae01284c9") version("1.17.4", sha256="ef412cde00cb1313d9041115a700d8d59d4b8b8b5e4dde43e9deb5108fcfbea8") version("1.16.11", sha256="b525451423a9a09a043e6a13d9436e13e3ee7a7049f558ad41a110742fa65f39") + depends_on("pkgconfig", type="build") + depends_on("coinutils") + depends_on("osi") + depends_on("pkgconfig", type="build") + build_directory = "spack-build" diff --git a/var/spack/repos/builtin/packages/cmor/package.py b/var/spack/repos/builtin/packages/cmor/package.py index bb6e6b9689..87bc3ba348 100644 --- a/var/spack/repos/builtin/packages/cmor/package.py +++ b/var/spack/repos/builtin/packages/cmor/package.py @@ -17,6 +17,7 @@ class Cmor(AutotoolsPackage): license("BSD-3-Clause") + version("3.8.0", sha256="5f5a44e660104916dd0a3d0d942234db375d2a4ffb4f4113ec88cfdd93f99ef4") version("3.7.2", sha256="5e19a9be8e6a8bd18a2035772732c34b87b3448319bf0b8fa12ccd4a351b8e86") version("3.6.1", sha256="991035a41424f72ea6f0f85653fc13730eb035e63c7dff6ca740aa7a70976fb4") version("3.6.0", sha256="1608904a35106e83d365f27522209c325bd4bfc19d022b1a8abfb12cdf85fe20") @@ -46,22 +47,23 @@ class Cmor(AutotoolsPackage): @run_before("configure") def validate(self): - if "+fortran" in self.spec and not self.compiler.fc: + if self.spec.satisfies("+fortran") and not self.compiler.fc: msg = "cannot build a fortran variant without a fortran compiler" raise RuntimeError(msg) def configure_args(self): - extra_args = ["--disable-debug"] + spec = self.spec + args = ["--disable-debug"] - if "+fortran" in self.spec: - extra_args.append("--enable-fortran") + if spec.satisfies("+fortran"): + args.append("--enable-fortran") else: - extra_args.append("--disable-fortran") + args.append("--disable-fortran") - if "+python" in self.spec: - extra_args.append("--with-python={0}".format(self.spec["python"].prefix)) + if spec.satisfies("+python"): + args.append(f"--with-python={self.spec['python'].prefix}") - return extra_args + return args def check(self): """tests need downloaded files, testcases have manual instructions for that.""" @@ -70,6 +72,6 @@ class Cmor(AutotoolsPackage): def install(self, spec, prefix): make("install") - if "+python" in spec: + if spec.satisfies("+python"): args = std_pip_args + ["--prefix=" + prefix, "."] pip(*args) diff --git a/var/spack/repos/builtin/packages/cppad/package.py b/var/spack/repos/builtin/packages/cppad/package.py index dcc9e14cf9..2e8f779510 100644 --- a/var/spack/repos/builtin/packages/cppad/package.py +++ b/var/spack/repos/builtin/packages/cppad/package.py @@ -14,9 +14,15 @@ class Cppad(CMakePackage): git = "https://github.com/coin-or/CppAD.git" version("develop", branch="master") + version( + "20180000.0", sha256="1c355713e720fc5226ff3d6db2909922d46cd7ee0d36ee7985882f86905f655a" + ) version("20170114", sha256="fa3980a882be2a668a7522146273a1b4f1d8dabe66ad4aafa8964c8c1fd6f957") def cmake_args(self): # This package does not obey CMAKE_INSTALL_PREFIX - args = ["-Dcppad_prefix=%s" % (self.prefix), "-Dcmake_install_docdir=share/cppad/doc"] + args = [ + self.define("cppad_prefix", self.prefix), + self.define("cmake_install_docdir", "share/cppad/doc"), + ] return args diff --git a/var/spack/repos/builtin/packages/cryptopp/package.py b/var/spack/repos/builtin/packages/cryptopp/package.py index b065474038..8be5b47375 100644 --- a/var/spack/repos/builtin/packages/cryptopp/package.py +++ b/var/spack/repos/builtin/packages/cryptopp/package.py @@ -18,6 +18,7 @@ class Cryptopp(MakefilePackage): license("BSL-1.0") + version("8.9.0", sha256="4cc0ccc324625b80b695fcd3dee63a66f1a460d3e51b71640cdbfc4cd1a3779c") version("8.7.0", sha256="d0d3a28fcb5a1f6ed66b3adf57ecfaed234a7e194e42be465c2ba70c744538dd") version("7.0.0", sha256="a4bc939910edd3d29fb819a6fc0dfdc293f686fa62326f61c56d72d0a366ceb0") version("6.1.0", sha256="21289d2511101a9350c87c8eb1f4982d4a266e8037b19dab79a32cc13ea108c7") @@ -39,7 +40,7 @@ class Cryptopp(MakefilePackage): def build(self, spec, prefix): cxx_flags = [] - if "+shared" in spec: + if spec.satisfies("+shared"): cxx_flags.append(self.compiler.cxx_pic_flag) target = self.spec.target @@ -51,7 +52,7 @@ class Cryptopp(MakefilePackage): cxx_flags.append("-DCRYPTOPP_DISABLE_SSE2") make_target = "dynamic" if "+shared" in spec else "static" - make(make_target, "CXXFLAGS={0}".format(" ".join(cxx_flags))) + make(make_target, f"CXXFLAGS={' '.join(cxx_flags)}") def install(self, spec, prefix): - make("install", "PREFIX={0}".format(prefix)) + make("install", f"PREFIX={prefix}") diff --git a/var/spack/repos/builtin/packages/dlib/package.py b/var/spack/repos/builtin/packages/dlib/package.py index 355d793656..511081ca33 100644 --- a/var/spack/repos/builtin/packages/dlib/package.py +++ b/var/spack/repos/builtin/packages/dlib/package.py @@ -13,11 +13,12 @@ class Dlib(CMakePackage): url = "https://github.com/davisking/dlib/archive/v19.19.tar.gz" git = "https://github.com/davisking/dlib" - maintainer = ["robertu94"] + maintainers("robertu94") license("BSL-1.0") version("master", branch="master") + version("19.24.4", sha256="d881911d68972d11563bb9db692b8fcea0ac1b3fd2e3f03fa0b94fde6c739e43") version("19.22", sha256="5f44b67f762691b92f3e41dcf9c95dd0f4525b59cacb478094e511fdacb5c096") version("19.21", sha256="116f52e58be04b47dab52057eaad4b5c4d5c3032d927fe23d55b0741fc4107a0") version("19.20", sha256="fc3f0986350e8e53aceadf95a71d2f413f1eedc469abda99a462cb528741d411") @@ -34,7 +35,9 @@ class Dlib(CMakePackage): depends_on("libx11") def cmake_args(self): + spec = self.spec args = [] - if "+shared" in self.spec: - args.append("-DBUILD_SHARED_LIBS=ON") + if spec.satisfies("+shared"): + args.append(self.define("BUILD_SHARED_LIBS", "ON")) + return args diff --git a/var/spack/repos/builtin/packages/entt/package.py b/var/spack/repos/builtin/packages/entt/package.py index 073626ca95..5eb3cdb9b7 100644 --- a/var/spack/repos/builtin/packages/entt/package.py +++ b/var/spack/repos/builtin/packages/entt/package.py @@ -16,6 +16,7 @@ class Entt(CMakePackage): license("MIT") + version("3.13.2", sha256="cb556aa543d01177b62de41321759e02d96078948dda72705b3d7fe68af88489") version("3.13.1", sha256="a4f290b601a70333126abd2cec7b0c232c74a4f85dcf1e04d969e8122dae8652") version("3.11.1", sha256="0ac010f232d3089200c5e545bcbd6480cf68b705de6930d8ff7cdb0a29f5b47b") version("3.5.2", sha256="f9271293c44518386c402c9a2188627819748f66302df48af4f6d08e30661036") @@ -30,4 +31,4 @@ class Entt(CMakePackage): conflicts("%gcc@:7.1", msg=compiler_warning) def cmake_args(self): - return ["-DBUILD_DOCS=ON"] + return [self.define("BUILD_DOCS", "ON")] diff --git a/var/spack/repos/builtin/packages/flint/package.py b/var/spack/repos/builtin/packages/flint/package.py index 0c3560fb32..43969ff209 100644 --- a/var/spack/repos/builtin/packages/flint/package.py +++ b/var/spack/repos/builtin/packages/flint/package.py @@ -6,16 +6,20 @@ from spack.package import * -class Flint(Package): +class Flint(AutotoolsPackage): """FLINT (Fast Library for Number Theory).""" - homepage = "https://www.flintlib.org" - url = "https://mirrors.mit.edu/sage/spkg/upstream/flint/flint-2.5.2.tar.gz" - git = "https://github.com/wbhart/flint2.git" + homepage = "https://flintlib.org" + url = "https://flintlib.org/flint-3.1.2.tar.gz" + git = "https://github.com/flintlib/flint.git" + list_url = "https://flintlib.org/downloads.html" + list_depth = 0 license("LGPL-2.1-or-later") - version("develop", branch="trunk") + version("main", branch="main") + version("3.1.2", sha256="fdb3a431a37464834acff3bdc145f4fe8d0f951dd5327c4c6f93f4cbac5c2700") + version("3.0.1", sha256="7b311a00503a863881eb8177dbeb84322f29399f3d7d72f3b1a4c9ba1d5794b4") version("2.5.2", sha256="cbf1fe0034533c53c5c41761017065f85207a1b770483e98b2392315f6575e87") version("2.4.5", sha256="e489354df00f0d84976ccdd0477028693977c87ccd14f3924a89f848bb0e01e3") @@ -25,28 +29,9 @@ class Flint(Package): # variant('mpir', default=False, # description='Compile with the MPIR library') - # Build dependencies - depends_on("autoconf", type="build") - - # Other dependencies depends_on("gmp") # mpir is a drop-in replacement for this depends_on("mpfr") # Could also be built against mpir - def install(self, spec, prefix): - options = [] - options = [ - "--prefix=%s" % prefix, - "--with-gmp=%s" % spec["gmp"].prefix, - "--with-mpfr=%s" % spec["mpfr"].prefix, - ] - - # if '+mpir' in spec: - # options.extend([ - # "--with-mpir=%s" % spec['mpir'].prefix - # ]) - - configure(*options) - make() - if self.run_tests: - make("check") - make("install") + def configure_args(self): + spec = self.spec + return [f"--with-gmp={spec['gmp'].prefix}", f"--with-mpfr={spec['mpfr'].prefix}"] diff --git a/var/spack/repos/builtin/packages/fpocket/package.py b/var/spack/repos/builtin/packages/fpocket/package.py index 3b50ee6883..9fd1cb8647 100644 --- a/var/spack/repos/builtin/packages/fpocket/package.py +++ b/var/spack/repos/builtin/packages/fpocket/package.py @@ -17,7 +17,8 @@ class Fpocket(MakefilePackage): license("MIT") - version("4.1", "1a2af2d3f2df42de67301996db3b93c7eaff0375f866443c0468dcf4b1750688") + version("4.2", sha256="8aea4ccdf4243606110c8f6978b13dd90f9cae092660eca4c6970206011de4aa") + version("4.1", sha256="1a2af2d3f2df42de67301996db3b93c7eaff0375f866443c0468dcf4b1750688") depends_on("netcdf-c") depends_on("netcdf-cxx") diff --git a/var/spack/repos/builtin/packages/hisat2/package.py b/var/spack/repos/builtin/packages/hisat2/package.py index f4f2886fc7..6821930bb1 100644 --- a/var/spack/repos/builtin/packages/hisat2/package.py +++ b/var/spack/repos/builtin/packages/hisat2/package.py @@ -31,7 +31,12 @@ class Hisat2(MakefilePackage): url="https://cloud.biohpc.swmed.edu/index.php/s/hisat2-220-source/download", extension="zip", ) - version("2.1.0", sha256="89a276eed1fc07414b1601947bc9466bdeb50e8f148ad42074186fe39a1ee781") + version( + "2.1.0", + sha256="89a276eed1fc07414b1601947bc9466bdeb50e8f148ad42074186fe39a1ee781", + url="ftp://ftp.ccb.jhu.edu/pub/infphilo/hisat2/downloads/hisat2-2.1.0-source.zip", + extension="zip", + ) variant("sra", default=False, description="Add SRA (Sequence Read Archive) support") @@ -48,8 +53,8 @@ class Hisat2(MakefilePackage): def build(self, spec, prefix): make( "USE_SRA=1", - "NCBI_NGS_DIR={0}".format(spec["sra-tools"].prefix), - "NCBI_VDB_DIR={0}".format(spec["ncbi-vdb"].prefix), + f"NCBI_NGS_DIR={spec['sra-tools'].prefix}", + f"NCBI_VDB_DIR={spec['ncbi-vdb'].prefix}", ) def install(self, spec, prefix): @@ -59,7 +64,7 @@ class Hisat2(MakefilePackage): install_tree("example", prefix.example) install_tree("scripts", prefix.scripts) - if "@:2.2.0" in spec: + if spec.satisfies("@:2.2.0"): install_tree("hisatgenotype_modules", prefix.hisatgenotype_modules) install_tree("hisatgenotype_scripts", prefix.hisatgenotype_scripts) @@ -75,33 +80,33 @@ class Hisat2(MakefilePackage): install("hisat2-inspect-l", prefix.bin) install("*.py", prefix.bin) - if "@2.2:" in spec: + if spec.satisfies("@2.2:"): install("hisat2-repeat", prefix.bin) @run_after("install") def filter_sbang(self): with working_dir(self.prefix.bin): pattern = "^#!.*/usr/bin/env python" - repl = "#!{0}".format(self.spec["python"].command.path) + repl = f"#!{self.spec['python'].command.path}" files = ["hisat2-build", "hisat2-inspect"] for file in files: filter_file(pattern, repl, *files, backup=False) pattern = "^#!.*/usr/bin/env perl" - repl = "#!{0}".format(self.spec["perl"].command.path) + repl = f"#!{self.spec['perl'].command.path}" files = ["hisat2"] for file in files: filter_file(pattern, repl, *files, backup=False) pattern = "^#!.*/usr/bin/env python3" - repl = "#!{0}".format(self.spec["python"].command.path) + repl = f"#!{self.spec['python'].command.path}" files = glob.glob("*.py") for file in files: filter_file(pattern, repl, *files, backup=False) with working_dir(self.prefix.scripts): pattern = "^#!.*/usr/bin/perl" - repl = "#!{0}".format(self.spec["perl"].command.path) + repl = f"#!{self.spec['perl'].command.path}" files = glob.glob("*.pl") for file in files: filter_file(pattern, repl, *files, backup=False) diff --git a/var/spack/repos/builtin/packages/hw-probe/package.py b/var/spack/repos/builtin/packages/hw-probe/package.py index bbbff9af15..5a740bedc9 100644 --- a/var/spack/repos/builtin/packages/hw-probe/package.py +++ b/var/spack/repos/builtin/packages/hw-probe/package.py @@ -14,9 +14,10 @@ class HwProbe(MakefilePackage): license("LGPL-2.1-or-later OR BSD-4-Clause") + version("1.6", sha256="de048be6aef357d3142c9e2327d6f79d205a42aa3396ad381ed319115d1c9a22") version("1.5", sha256="8bb7d6ff272c1412e26fcfd86e9df5c3e34e1584552404b930c281b8498b25ea") version("1.4", sha256="90f3ea83bf641348b209e4a2a910f65d836ae7828c0be0f660236ea413bc46bb") version("1.3", sha256="820ada4f16cb827e0990eb918e75423845fef54a863fdd88aa5bd23127354229") def install(self, spec, prefix): - make("install", "prefix={0}".format(prefix)) + make("install", f"prefix={prefix}") diff --git a/var/spack/repos/builtin/packages/icu4c/package.py b/var/spack/repos/builtin/packages/icu4c/package.py index fc5dbb2101..f869e81997 100644 --- a/var/spack/repos/builtin/packages/icu4c/package.py +++ b/var/spack/repos/builtin/packages/icu4c/package.py @@ -16,6 +16,7 @@ class Icu4c(AutotoolsPackage): license("Unicode-TOU") + version("74.2", sha256="68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c") version("67.1", sha256="94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc") version("66.1", sha256="52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e") version("65.1", sha256="53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948") @@ -61,9 +62,7 @@ class Icu4c(AutotoolsPackage): if name == "cxxflags": # Control of the C++ Standard is via adding the required "-std" # flag to CXXFLAGS in env - flags.append( - getattr(self.compiler, "cxx{0}_flag".format(self.spec.variants["cxxstd"].value)) - ) + flags.append(getattr(self.compiler, f"cxx{self.spec.variants['cxxstd'].value}_flag")) return (None, flags, None) # Need to make sure that locale is UTF-8 in order to process source @@ -75,14 +74,14 @@ class Icu4c(AutotoolsPackage): def configure_args(self): args = [] - if "python" in self.spec: + if self.spec.satisfies("^python"): # Make sure configure uses Spack's python package # Without this, configure could pick a broken global installation - args.append("PYTHON={0}".format(self.spec["python"].command)) + args.append(f"PYTHON={self.spec['python'].command}") # The --enable-rpath option is only needed on MacOS, and it # breaks the build for xerces-c on Linux. - if "platform=darwin" in self.spec: + if self.spec.satisfies("platform=darwin"): args.append("--enable-rpath") return args diff --git a/var/spack/repos/builtin/packages/imath/package.py b/var/spack/repos/builtin/packages/imath/package.py index 1937e754fa..2a3957c3fb 100644 --- a/var/spack/repos/builtin/packages/imath/package.py +++ b/var/spack/repos/builtin/packages/imath/package.py @@ -17,6 +17,7 @@ class Imath(CMakePackage): license("BSD-3-Clause") + version("3.1.11", sha256="9057849585e49b8b85abe7cc1e76e22963b01bfdc3b6d83eac90c499cd760063") version("3.1.9", sha256="f1d8aacd46afed958babfced3190d2d3c8209b66da451f556abd6da94c165cf3") version("3.1.7", sha256="bff1fa140f4af0e7f02c6cb78d41b9a7d5508e6bcdfda3a583e35460eb6d4b47") version("3.1.5", sha256="1e9c7c94797cf7b7e61908aed1f80a331088cc7d8873318f70376e4aed5f25fb") diff --git a/var/spack/repos/builtin/packages/imgui/package.py b/var/spack/repos/builtin/packages/imgui/package.py index c233e4abe9..852f7d6dfb 100644 --- a/var/spack/repos/builtin/packages/imgui/package.py +++ b/var/spack/repos/builtin/packages/imgui/package.py @@ -18,6 +18,7 @@ class Imgui(Package): license("MIT") + version("1.90.6", sha256="70b4b05ac0938e82b4d5b8d59480d3e2ca63ca570dfb88c55023831f387237ad") version("1.85", sha256="7ed49d1f4573004fa725a70642aaddd3e06bb57fcfe1c1a49ac6574a3e895a77") def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/iniparser/package.py b/var/spack/repos/builtin/packages/iniparser/package.py index ba99ed31bc..9f3589a33f 100644 --- a/var/spack/repos/builtin/packages/iniparser/package.py +++ b/var/spack/repos/builtin/packages/iniparser/package.py @@ -15,6 +15,7 @@ class Iniparser(MakefilePackage): license("MIT") + version("4.2", sha256="dbcbaf3aedb4f88a9fc0df4b315737ddd10e6c37918e3d89f0ecc475333bde4d") version("4.1", sha256="960daa800dd31d70ba1bacf3ea2d22e8ddfc2906534bf328319495966443f3ae") version("4.0", sha256="e0bbd664bb3f0d64c21ac2d67a843b1c7a3a9710e96393344d170ab8b33e92ba") version("3.2", sha256="4a60b8e29d33d24b458749404e1ff2bcbfedd53ad800757daeed7955599fdce4") diff --git a/var/spack/repos/builtin/packages/libabigail/package.py b/var/spack/repos/builtin/packages/libabigail/package.py index 1d5cf3071f..979fdfae0e 100644 --- a/var/spack/repos/builtin/packages/libabigail/package.py +++ b/var/spack/repos/builtin/packages/libabigail/package.py @@ -16,6 +16,7 @@ class Libabigail(AutotoolsPackage): license("Apache-2.0 WITH LLVM-exception") version("master", branch="master") + version("2.1", sha256="4a6297d41d15d1936256117116bd61296e6b9bee23d54a0caf8d3f5ab8ddcc4c") version("2.0", sha256="3704ae97a56bf076ca08fb5dea6b21db998fbbf14c4f9de12824b78db53b6fda") version("1.8", sha256="1cbf260b894ccafc61b2673ba30c020c3f67dbba9dfa88dca3935dff661d665c") @@ -40,7 +41,7 @@ class Libabigail(AutotoolsPackage): def configure_args(self): spec = self.spec - config_args = ["CPPFLAGS=-I{0}/include".format(spec["libxml2"].prefix)] + config_args = [f"CPPFLAGS=-I{spec['libxml2'].prefix}/include"] config_args.append( "LDFLAGS=-L{0} -Wl,-rpath,{0}".format(spec["libxml2"].libs.directories[0]) ) diff --git a/var/spack/repos/builtin/packages/libbsd/package.py b/var/spack/repos/builtin/packages/libbsd/package.py index 5d7ad3ab71..568d387536 100644 --- a/var/spack/repos/builtin/packages/libbsd/package.py +++ b/var/spack/repos/builtin/packages/libbsd/package.py @@ -21,6 +21,7 @@ class Libbsd(AutotoolsPackage): license("BSD-3-Clause") + version("0.12.2", sha256="b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a14731014") version("0.12.1", sha256="d7747f8ec1baa6ff5c096a9dd587c061233dec90da0f1aedd66d830f6db6996a") version("0.11.7", sha256="9baa186059ebbf25c06308e9f991fda31f7183c0f24931826d83aa6abd8a0261") version("0.11.6", sha256="19b38f3172eaf693e6e1c68714636190c7e48851e45224d720b3b5bc0499b5df") diff --git a/var/spack/repos/builtin/packages/libcap/package.py b/var/spack/repos/builtin/packages/libcap/package.py index 6dedb75748..057250f520 100644 --- a/var/spack/repos/builtin/packages/libcap/package.py +++ b/var/spack/repos/builtin/packages/libcap/package.py @@ -17,6 +17,7 @@ class Libcap(MakefilePackage): license("BSD-3-Clause OR GPL-2.0-only") + version("2.69", sha256="3a99ec26452e328e0ea408efd67096ef914f4ee4788fa8e8e21f214e2bd670b9") version("2.68", sha256="046e55716e0643b565efcd1dab1d26c5625709fcd0b5c271290c7ea1524cf906") version("2.67", sha256="2d0b679a431c06afd8651a8ada906303eda8b3ac67c308e5fe1937eea5c018aa") version("2.66", sha256="5f65dc5b2e9f63a0748ea1b05be7965a38548db1cbfd53b30271ff02186b3a4a") @@ -33,7 +34,7 @@ class Libcap(MakefilePackage): "USE_GPERF=no", "SHARED=yes", "lib=lib", - "prefix={}".format(prefix), + f"prefix={prefix}", ] def build(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/libdmx/package.py b/var/spack/repos/builtin/packages/libdmx/package.py index 80122777e8..e718a27515 100644 --- a/var/spack/repos/builtin/packages/libdmx/package.py +++ b/var/spack/repos/builtin/packages/libdmx/package.py @@ -13,6 +13,7 @@ class Libdmx(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/lib/libdmx" xorg_mirror_path = "lib/libdmx-1.1.3.tar.gz" + version("1.1.5", sha256="070e82cc1daa1b21ee1339aef56a909eab04cbe7d430fabfbb01ecd21b2dd9f3") version("1.1.4", sha256="4d05bd5b248c1f46729fa1536b7a5e4d692567327ad41564c36742fb327af925") version("1.1.3", sha256="c4b24d7e13e5a67ead7a18f0b4cc9b7b5363c9d04cd01b83b5122ff92b3b4996") diff --git a/var/spack/repos/builtin/packages/libedit/package.py b/var/spack/repos/builtin/packages/libedit/package.py index 0353765a68..6d1d1aeb7d 100644 --- a/var/spack/repos/builtin/packages/libedit/package.py +++ b/var/spack/repos/builtin/packages/libedit/package.py @@ -43,7 +43,7 @@ class Libedit(AutotoolsPackage): def configure_args(self): args = ["ac_cv_lib_curses_tgetent=no", "ac_cv_lib_termcap_tgetent=no"] - if "+termlib" in self.spec["ncurses"]: + if self.spec["ncurses"].satisfies("+termlib"): args.append("ac_cv_lib_ncurses_tgetent=no") else: args.append("ac_cv_lib_tinfo_tgetent=no") diff --git a/var/spack/repos/builtin/packages/libfyaml/package.py b/var/spack/repos/builtin/packages/libfyaml/package.py index 9f19520e3e..f471cc1417 100644 --- a/var/spack/repos/builtin/packages/libfyaml/package.py +++ b/var/spack/repos/builtin/packages/libfyaml/package.py @@ -15,6 +15,7 @@ class Libfyaml(AutotoolsPackage): license("MIT") + version("0.9", sha256="7731edc5dfcc345d5c5c9f6ce597133991a689dabede393cd77bae89b327cd6d") version("0.8", sha256="dc4d4348eedca68e8e2394556d57f71410e7d61791a71cbe178302ebe5f26b99") version("0.7.12", sha256="485342c6920e9fdc2addfe75e5c3e0381793f18b339ab7393c1b6edf78bf8ca8") version("0.5.7", sha256="3221f31bb3feba97e544a82d0d5e4711ff0e4101cca63923dc5a1a001c187590") diff --git a/var/spack/repos/builtin/packages/libgit2/package.py b/var/spack/repos/builtin/packages/libgit2/package.py index cb721c9983..589916b422 100644 --- a/var/spack/repos/builtin/packages/libgit2/package.py +++ b/var/spack/repos/builtin/packages/libgit2/package.py @@ -16,6 +16,7 @@ class Libgit2(CMakePackage): homepage = "https://libgit2.github.com/" url = "https://github.com/libgit2/libgit2/archive/v0.26.0.tar.gz" + version("1.8.0", sha256="9e1d6a880d59026b675456fbb1593c724c68d73c34c0d214d6eb848e9bbd8ae4") version("1.7.2", sha256="de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f") version("1.7.0", sha256="d9d0f84a86bf98b73e68997f5c1543cc5067d0ca9c7a5acaba3e8d117ecefef3") version("1.6.4", sha256="d25866a4ee275a64f65be2d9a663680a5cf1ed87b7ee4c534997562c828e500d") diff --git a/var/spack/repos/builtin/packages/libnids/package.py b/var/spack/repos/builtin/packages/libnids/package.py index 9d8d2968bc..e9be0fff94 100644 --- a/var/spack/repos/builtin/packages/libnids/package.py +++ b/var/spack/repos/builtin/packages/libnids/package.py @@ -18,6 +18,7 @@ class Libnids(AutotoolsPackage): license("GPL-2.0-only") version("master", branch="master") + version("1.26", sha256="3f3e9f99a83cd37bc74af83d415c5e3a7505f5b190dfaf456b0849e0054f6733") version("1.25", sha256="47aa634bd0cdad81e092fac3aef6f12ee346c2f536a1eff4d3d5dacdb6dfcec1") depends_on("libpcap") diff --git a/var/spack/repos/builtin/packages/libyogrt/package.py b/var/spack/repos/builtin/packages/libyogrt/package.py index f63d1736b9..eece6899b5 100644 --- a/var/spack/repos/builtin/packages/libyogrt/package.py +++ b/var/spack/repos/builtin/packages/libyogrt/package.py @@ -16,6 +16,7 @@ class Libyogrt(AutotoolsPackage): license("LGPL-2.1-or-later") + version("1.35", sha256="a03b3d24da49af626351aaca9ab3eaff102ed41d5171f1bcb2ff26a561bd0cd6") version("1.33", sha256="797d20c49cdc4f6beae8660b4f41ba7ac13f7e93a0344b47f0bdc64f780d1398") version("1.27", sha256="c57ce60770b61aa20bc83fe34ff52b5e444964338df3786f282d0d9bcdd26138") version("1.24", sha256="36695030e72b24b1f22bfcfe42bfd1d3c87f9c0eea5e94ce0120782581ea522f") @@ -57,7 +58,7 @@ class Libyogrt(AutotoolsPackage): def url_for_version(self, version): if version < Version("1.21"): - return "https://github.com/LLNL/libyogrt/archive/%s.tar.gz" % version + return f"https://github.com/LLNL/libyogrt/archive/{version}.tar.gz" else: return "https://github.com/LLNL/libyogrt/releases/download/{0}/libyogrt-{0}.tar.gz".format( version @@ -82,11 +83,11 @@ class Libyogrt(AutotoolsPackage): args.append("--with-lsf") args.append("LIBS=-llsf -lrt -lnsl") elif sched == "flux": - args.append("--with-flux=%s" % (self.spec["flux-core"].prefix)) + args.append(f"--with-flux={self.spec['flux-core'].prefix}") elif sched != "system": - args.append("--with-%s=%s" % (sched, self.spec[sched].prefix)) + args.append(f"--with-{sched}={self.spec[sched].prefix}") - if "+static" in self.spec: + if self.spec.satisfies("+static"): args.append("--enable-static=yes") return args @@ -108,4 +109,4 @@ class Libyogrt(AutotoolsPackage): # create conf file to inform libyogrt about job scheduler with open(os.path.join(etcpath, "yogrt.conf"), "w+") as f: - f.write("backend=%s\n" % sched) + f.write(f"backend={sched}\n") diff --git a/var/spack/repos/builtin/packages/lizard/package.py b/var/spack/repos/builtin/packages/lizard/package.py index 60ce4e9cc4..0e83329e89 100644 --- a/var/spack/repos/builtin/packages/lizard/package.py +++ b/var/spack/repos/builtin/packages/lizard/package.py @@ -18,9 +18,10 @@ class Lizard(MakefilePackage): git = "https://github.com/inikep/lizard.git" version("develop", branch="lizard") + version("2.0", sha256="85456b7274c9f0e477ff8e3f06dbc2f8ee8619d737a73c730c8a1adacb45f6da") version("1.0", sha256="6f666ed699fc15dc7fdaabfaa55787b40ac251681b50c0d8df017c671a9457e6") patch("fix-install-decompress.patch", when="@1.0") def install(self, spec, prefix): - make("PREFIX=%s" % prefix, "install") + make(f"PREFIX={prefix}", "install") diff --git a/var/spack/repos/builtin/packages/lmod/package.py b/var/spack/repos/builtin/packages/lmod/package.py index b1b0fd4e15..430fe52b90 100644 --- a/var/spack/repos/builtin/packages/lmod/package.py +++ b/var/spack/repos/builtin/packages/lmod/package.py @@ -23,6 +23,7 @@ class Lmod(AutotoolsPackage): license("MIT") + version("8.7.37", sha256="171529152fedfbb3c45d27937b0eaa1ee62b5e5cdac3086f44a6d56e5d1d7da4") version("8.7.24", sha256="8451267652059b6507b652e1b563929ecf9b689ffb20830642085eb6a55bd539") version("8.7.20", sha256="c04deff7d2ca354610a362459a7aa9a1c642a095e45a4b0bb2471bb3254e85f4") version("8.7.18", sha256="b9912caca1557dd0c17113bceb1a4952e0ae75331d38df6361601db3f80366af") @@ -85,14 +86,15 @@ class Lmod(AutotoolsPackage): filter_file(r"^#!.*tclsh", "#!@path_to_tclsh@", tclscript) def configure_args(self): + spec = self.spec args = [] - if "+auto_swap" in self.spec: + if spec.satisfies("+auto_swap"): args.append("--with-autoSwap=yes") else: args.append("--with-autoSwap=no") - if "+redirect" in self.spec: + if spec.satisfies("+redirect"): args.append("--with-redirect=yes") else: args.append("--with-redirect=no") diff --git a/var/spack/repos/builtin/packages/lua-mpack/package.py b/var/spack/repos/builtin/packages/lua-mpack/package.py index da4cd89c4d..ea681569e8 100644 --- a/var/spack/repos/builtin/packages/lua-mpack/package.py +++ b/var/spack/repos/builtin/packages/lua-mpack/package.py @@ -17,6 +17,7 @@ class LuaMpack(LuaPackage): license("MIT") + version("1.0.12", sha256="06b662b1f14cfaf592ecb3fab425bef20e51439509b7a1736a790ecc929ef8bf") version("1.0.9", sha256="0fd07e709c3f6f201c2ffc9f77cef1b303b02c12413f0c15670a32bf6c959e9e") version("1.0.8", sha256="ed6b1b4bbdb56f26241397c1e168a6b1672f284989303b150f7ea8d39d1bc9e9") version("1.0.7", sha256="68565484a3441d316bd51bed1cacd542b7f84b1ecfd37a8bd18dd0f1a20887e8") diff --git a/var/spack/repos/builtin/packages/masurca/package.py b/var/spack/repos/builtin/packages/masurca/package.py index a81f957b53..9d8f4d6869 100644 --- a/var/spack/repos/builtin/packages/masurca/package.py +++ b/var/spack/repos/builtin/packages/masurca/package.py @@ -17,6 +17,7 @@ class Masurca(Package): license("GPL-3.0-only") + version("4.1.1", sha256="8758f6196bf7f57e24e08bda84abddfff08feb4cea204c0eb5e1cb9fe8198573") version("4.1.0", sha256="15078e24c79fe5aabe42748d64f95d15f3fbd7708e84d88fc07c4b7f2e4b0902") version("4.0.9", sha256="a31c2f786452f207c0b0b20e646b6c85b7357dcfd522b697c1009d902d3ed4cf") version("4.0.5", sha256="db525c26f2b09d6b359a2830fcbd4a3fdc65068e9a116c91076240fd1f5924ed") @@ -39,11 +40,11 @@ class Masurca(Package): filter_file("-minline-all-stringops", "", m) def setup_build_environment(self, env): - if "@4:" in self.spec: + if self.spec.satisfies("@4:"): env.set("DEST", self.prefix) def install(self, spec, prefix): installer = Executable("./install.sh") installer() - if "@:4" in self.spec: + if self.spec.satisfies("@:4"): install_tree(".", prefix) diff --git a/var/spack/repos/builtin/packages/mercurial/package.py b/var/spack/repos/builtin/packages/mercurial/package.py index df0fb44fec..94a0db300c 100644 --- a/var/spack/repos/builtin/packages/mercurial/package.py +++ b/var/spack/repos/builtin/packages/mercurial/package.py @@ -16,6 +16,7 @@ class Mercurial(PythonPackage): license("GPL-2.0-or-later") + version("6.7.3", sha256="00196944ea92738809317dc7a8ed7cb21287ca0a00a85246e66170955dcd9031") version("6.6.3", sha256="f75d6a4a75823a1b7d713a4967eca2f596f466e58fc6bc06d72642932fd7e307") version("6.4.5", sha256="b0b4b00b8b2639c8be387394796f0425beb339314df7e72937f8ddd2a41b1b8a") version("6.3.3", sha256="13c97ff589c7605e80a488f336852ce1d538c5d4143cfb33be69bdaddd9157bd") diff --git a/var/spack/repos/builtin/packages/metaphysicl/package.py b/var/spack/repos/builtin/packages/metaphysicl/package.py index d1c85e22a9..1442635dfd 100644 --- a/var/spack/repos/builtin/packages/metaphysicl/package.py +++ b/var/spack/repos/builtin/packages/metaphysicl/package.py @@ -15,6 +15,7 @@ class Metaphysicl(AutotoolsPackage): license("LGPL-2.1-or-later") + version("0.6.0", sha256="a1b8469de17ad9960b4c99a9dbe2db46b7da50f97c811467efce470585d3f7f2") version("0.5.0", sha256="dbba0590970a128ae2ae7064b621f78f95ca2303b70a12b079a51702573840a6") version("0.3.3", sha256="6581ec6512d3509bfca6f93052f7d47dd2d9e4b9f2b3580d778495ae381a0b0d") version("0.2.0", sha256="ff4f9fad870dcdc85d56fb1f8d94123fecbef9189f967d254ba9607624b5f32e") diff --git a/var/spack/repos/builtin/packages/miniamr/package.py b/var/spack/repos/builtin/packages/miniamr/package.py index 166ba379c0..6c00246b8e 100644 --- a/var/spack/repos/builtin/packages/miniamr/package.py +++ b/var/spack/repos/builtin/packages/miniamr/package.py @@ -21,6 +21,7 @@ class Miniamr(MakefilePackage): license("LGPL-3.0-only") version("master", branch="master") + version("1.7.0", sha256="f11aee04bc59f46c6894a07d365c9c3006c58739ac6abd2d9663843c01a8b62b") version("1.6.6", sha256="a7f79fae49e433ef8350cbd34cbf57c486089cf7ac0d1f1f3b23c820d3e5bb9f") version("1.6.5", sha256="c70f0f648c73ea4497817ceee158334eeb901fc5c32cf804deef3226cd9cf26a") version("1.6.4", sha256="807d50608b69fb1a61924718964be96c0a2f9fa2e37fdc027bc3f0f116544732") @@ -35,8 +36,8 @@ class Miniamr(MakefilePackage): @property def build_targets(self): targets = [] - targets.append("CC={0}".format(self.spec["mpi"].mpicc)) - targets.append("LD={0}".format(self.spec["mpi"].mpicc)) + targets.append(f"CC={self.spec['mpi'].mpicc}") + targets.append(f"LD={self.spec['mpi'].mpicc}") targets.append("LDLIBS=-lm") targets.append("--directory=ref") diff --git a/var/spack/repos/builtin/packages/mongo-cxx-driver/package.py b/var/spack/repos/builtin/packages/mongo-cxx-driver/package.py index b42b1827d7..4471a53d5a 100644 --- a/var/spack/repos/builtin/packages/mongo-cxx-driver/package.py +++ b/var/spack/repos/builtin/packages/mongo-cxx-driver/package.py @@ -16,6 +16,7 @@ class MongoCxxDriver(CMakePackage): license("Apache-2.0") + version("3.10.1", sha256="0297d9d1a513f09438cc05254b14baa49edd1fa64a6ce5d7a80a1eb7677cf2be") version("3.7.0", sha256="fb2da11178db728f63147fe4b0c7509eb49b1b02c5cb55f9bee5f927e451a0c7") version("3.6.7", sha256="2c58005d4fe46f1973352fba821f7bb37e818cefc922377ce979a9fd1bff38ac") version("3.6.6", sha256="d5906b9e308a8a353a2ef92b699c9b27ae28ec6b34fdda94e15d2981b27e64ca") @@ -36,10 +37,10 @@ class MongoCxxDriver(CMakePackage): version("3.2.1", sha256="d5e62797cbc48c6e5e18bc0a66c14556e78871d05db4bccc295074af51b8421e") version("3.2.0", sha256="e26edd44cf20bd6be91907403b6d63a065ce95df4c61565770147a46716aad8c") + depends_on("mongo-c-driver@1.9.2:") + def url_for_version(self, version): git_archive = self.git + "/archive/refs/tags/r{version}.tar.gz" release_url = self.git + "/releases/download/r{version}/mongo-cxx-driver-r{version}.tar.gz" - template_url = release_url if version >= Version("3.6.0") else git_archive + template_url = release_url if self.spec.satisfies("@3.6.0:") else git_archive return template_url.format(version=version) - - depends_on("mongo-c-driver@1.9.2:") diff --git a/var/spack/repos/builtin/packages/nghttp2/package.py b/var/spack/repos/builtin/packages/nghttp2/package.py index 5ca2856617..62faaafa73 100644 --- a/var/spack/repos/builtin/packages/nghttp2/package.py +++ b/var/spack/repos/builtin/packages/nghttp2/package.py @@ -15,6 +15,7 @@ class Nghttp2(AutotoolsPackage): license("MIT") + version("1.61.0", sha256="aa7594c846e56a22fbf3d6e260e472268808d3b49d5e0ed339f589e9cc9d484c") version("1.57.0", sha256="1e3258453784d3b7e6cc48d0be087b168f8360b5d588c66bfeda05d07ad39ffd") version("1.52.0", sha256="9877caa62bd72dde1331da38ce039dadb049817a01c3bdee809da15b754771b8") version("1.51.0", sha256="2a0bef286f65b35c24250432e7ec042441a8157a5b93519412d9055169d9ce54") diff --git a/var/spack/repos/builtin/packages/ninja/package.py b/var/spack/repos/builtin/packages/ninja/package.py index 5d9e7af81d..b4c2160fbf 100644 --- a/var/spack/repos/builtin/packages/ninja/package.py +++ b/var/spack/repos/builtin/packages/ninja/package.py @@ -26,6 +26,7 @@ class Ninja(Package): version("kitware", branch="features-for-fortran", git="https://github.com/Kitware/ninja.git") version("master", branch="master") + version("1.12.0", sha256="8b2c86cd483dc7fcb7975c5ec7329135d210099a89bc7db0590a07b0bbfe49a5") version("1.11.1", sha256="31747ae633213f1eda3842686f83c2aa1412e0f5691d1c14dbbcc67fe7400cea") version("1.11.0", sha256="3c6ba2e66400fe3f1ae83deb4b235faf3137ec20bd5b08c29bfc368db143e4c6") version("1.10.2", sha256="ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed") @@ -57,7 +58,7 @@ class Ninja(Package): @on_package_attributes(run_tests=True) def configure_test(self): ninja = Executable("./ninja") - ninja("-j{0}".format(make_jobs), "ninja_test") + ninja(f"-j{make_jobs}", "ninja_test") ninja_test = Executable("./ninja_test") ninja_test() diff --git a/var/spack/repos/builtin/packages/openimagedenoise/package.py b/var/spack/repos/builtin/packages/openimagedenoise/package.py index 7882f59ef1..9f90be97ee 100644 --- a/var/spack/repos/builtin/packages/openimagedenoise/package.py +++ b/var/spack/repos/builtin/packages/openimagedenoise/package.py @@ -15,8 +15,6 @@ class Openimagedenoise(CMakePackage): homepage = "https://www.openimagedenoise.org/" url = "https://github.com/OpenImageDenoise/oidn/releases/download/v1.4.3/oidn-1.4.3.src.tar.gz" - # maintainers("github_user1", "github_user2") - license("Apache-2.0") version("2.2.2", sha256="d26b75fa216165086f65bf48c80648290f2cfed7d3c4bfc1e86c247b46c96b7e") diff --git a/var/spack/repos/builtin/packages/openvkl/package.py b/var/spack/repos/builtin/packages/openvkl/package.py index c04f3f22db..164dedfd97 100644 --- a/var/spack/repos/builtin/packages/openvkl/package.py +++ b/var/spack/repos/builtin/packages/openvkl/package.py @@ -14,8 +14,6 @@ class Openvkl(CMakePackage): url = "https://www.github.com/OpenVKL/openvkl/archive/v1.0.0.tar.gz" git = "https://www.github.com/OpenVKL/openvkl.git" - # maintainers("github_user1", "github_user2") - license("Apache-2.0") version("2.0.1", sha256="0c7faa9582a93e93767afdb15a6c9c9ba154af7ee83a6b553705797be5f8af62") diff --git a/var/spack/repos/builtin/packages/pango/package.py b/var/spack/repos/builtin/packages/pango/package.py index 69ecc81f0d..03d445fad3 100644 --- a/var/spack/repos/builtin/packages/pango/package.py +++ b/var/spack/repos/builtin/packages/pango/package.py @@ -19,6 +19,10 @@ class Pango(MesonPackage): license("LGPL-2.1-or-later") + # Do not upgrade to v1.90.x. It is a development release in preparation for + # v2.0 that will break API and ABI compatibility. For more information see + # https://download.gnome.org/sources/pango/1.90/pango-1.90.0.news + version("1.52.2", sha256="d0076afe01082814b853deec99f9349ece5f2ce83908b8e58ff736b41f78a96b") version("1.50.13", sha256="5cdcf6d761d26a3eb9412b6cb069b32bd1d9b07abf116321167d94c2189299fd") version("1.50.7", sha256="0477f369a3d4c695df7299a6989dc004756a7f4de27eecac405c6790b7e3ad33") version("1.49.4", sha256="1fda6c03161bd1eacfdc349244d26828c586d25bfc600b9cfe2494902fdf56cf") @@ -28,31 +32,6 @@ class Pango(MesonPackage): version("1.45.5", sha256="f61dd911de2d3318b43bbc56bd271637a46f9118a1ee4378928c06df8a1c1705") version("1.44.6", sha256="3e1e41ba838737e200611ff001e3b304c2ca4cdbba63d200a20db0b0ddc0f86c") version("1.42.4", sha256="1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d") - version( - "1.42.0", - sha256="9924d88a3dcedff753f0763814a1605307c5c9c931413b8b47ea7267d1b19446", - deprecated=True, - ) - version( - "1.41.0", - sha256="1f76ef95953dc58ee5d6a53e5f1cb6db913f3e0eb489713ee9266695cae580ba", - deprecated=True, - ) - version( - "1.40.3", - sha256="abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3", - deprecated=True, - ) - version( - "1.40.1", - sha256="e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40", - deprecated=True, - ) - version( - "1.36.8", - sha256="18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07", - deprecated=True, - ) variant("X", default=False, description="Enable an X toolkit") @@ -97,16 +76,17 @@ class Pango(MesonPackage): return url.format(version.up_to(2), version) def meson_args(self): + spec = self.spec args = [] # xft is not a meson option, even when it is a configure option - if self.spec.satisfies("@1.49: +X"): + if spec.satisfies("@1.49: +X"): args.append("-Dxft=enabled") - elif self.spec.satisfies("@1.49: -X"): + elif spec.satisfies("@1.49: -X"): args.append("-Dxft=disabled") # disable building of gtk-doc files following #9885 and #9771 - if self.spec.satisfies("@1.44:"): + if spec.satisfies("@1.44:"): args.append("-Dgtk_doc=false") else: args.append("-Denable_docs=false") @@ -124,10 +104,10 @@ class Pango(MesonPackage): # disable building of gtk-doc files following #9885 and #9771 args.append("--disable-gtk-doc-html") true = which("true") - args.append("GTKDOC_CHECK={0}".format(true)) - args.append("GTKDOC_CHECK_PATH={0}".format(true)) - args.append("GTKDOC_MKPDF={0}".format(true)) - args.append("GTKDOC_REBASE={0}".format(true)) + args.append(f"GTKDOC_CHECK={true}") + args.append(f"GTKDOC_CHECK_PATH={true}") + args.append(f"GTKDOC_MKPDF={true}") + args.append(f"GTKDOC_REBASE={true}") return args diff --git a/var/spack/repos/builtin/packages/perl-dbd-pg/package.py b/var/spack/repos/builtin/packages/perl-dbd-pg/package.py index 7b6e708bc1..f7e9708715 100644 --- a/var/spack/repos/builtin/packages/perl-dbd-pg/package.py +++ b/var/spack/repos/builtin/packages/perl-dbd-pg/package.py @@ -15,6 +15,7 @@ class PerlDbdPg(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("3.18.0", sha256="92bbe8a363040f8ce6a3f1963f128132e245861a9b4dc5a84178b42d625a7807") version("3.16.1", sha256="8e917a746dacb1edce5832d8911e5938cc4863aeac4a52820382e7d174e9c3b9") version("3.10.0", sha256="e103268a63e2828e3d43659bdba5f743446cbbe047a766f843112eedae105f80") diff --git a/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py b/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py index 4b7c3184bc..11d7a409dd 100644 --- a/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-stacktrace/package.py @@ -14,5 +14,6 @@ class PerlDevelStacktrace(PerlPackage): license("Artistic-2.0") + version("2.05", sha256="63cb6196e986a7e578c4d28b3c780e7194835bfc78b68eeb8f00599d4444888c") version("2.04", sha256="cd3c03ed547d3d42c61fa5814c98296139392e7971c092e09a431f2c9f5d6855") version("2.02", sha256="cbbd96db0ecf194ed140198090eaea0e327d9a378a4aa15f9a34b3138a91931f") diff --git a/var/spack/repos/builtin/packages/perl-extutils-installpaths/package.py b/var/spack/repos/builtin/packages/perl-extutils-installpaths/package.py index cb583055ee..747ff747fa 100644 --- a/var/spack/repos/builtin/packages/perl-extutils-installpaths/package.py +++ b/var/spack/repos/builtin/packages/perl-extutils-installpaths/package.py @@ -14,6 +14,7 @@ class PerlExtutilsInstallpaths(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.013", sha256="65969d3ad8a3a2ea8ef5b4213ed5c2c83961bb5bd12f7ad35128f6bd5b684aa0") version("0.012", sha256="84735e3037bab1fdffa3c2508567ad412a785c91599db3c12593a50a1dd434ed") depends_on("perl-extutils-config", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py b/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py index 7463880ad4..143360fd20 100644 --- a/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py +++ b/var/spack/repos/builtin/packages/perl-io-socket-ssl/package.py @@ -16,6 +16,7 @@ class PerlIoSocketSsl(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.085", sha256="95b2f7c0628a7e246a159665fbf0620d0d7835e3a940f22d3fdd47c3aa799c2e") version("2.052", sha256="e4897a9b17cb18a3c44aa683980d52cef534cdfcb8063d6877c879bfa2f26673") depends_on("perl-net-ssleay", type=("build", "run")) @@ -31,4 +32,4 @@ class PerlIoSocketSsl(PerlPackage): f.writelines(config_answers) with open(config_answers_filename, "r") as f: - inspect.getmodule(self).perl("Makefile.PL", "INSTALL_BASE={0}".format(prefix), input=f) + inspect.getmodule(self).perl("Makefile.PL", f"INSTALL_BASE={prefix}", input=f) diff --git a/var/spack/repos/builtin/packages/perl-io-tty/package.py b/var/spack/repos/builtin/packages/perl-io-tty/package.py index 4be01b572c..af0da3ed9c 100644 --- a/var/spack/repos/builtin/packages/perl-io-tty/package.py +++ b/var/spack/repos/builtin/packages/perl-io-tty/package.py @@ -16,5 +16,6 @@ class PerlIoTty(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.20", sha256="b15309fc85623893289cb9b2b88dfa9ed1e69156b75f29938553a45be6d730af") version("1.17", sha256="a5f1a83020bc5b5dd6c1b570f48c7546e0a8f7fac10a068740b03925ad9e14e8") version("1.13_01", sha256="89798eba7c31d9c169ef2f38ff49490aa769b1d9a68033de365595cfaf9cc258") diff --git a/var/spack/repos/builtin/packages/perl-math-bigint/package.py b/var/spack/repos/builtin/packages/perl-math-bigint/package.py index 655ea9fe89..ec09e393dd 100644 --- a/var/spack/repos/builtin/packages/perl-math-bigint/package.py +++ b/var/spack/repos/builtin/packages/perl-math-bigint/package.py @@ -12,5 +12,6 @@ class PerlMathBigint(PerlPackage): homepage = "https://metacpan.org/pod/Math::BigInt" url = "https://cpan.metacpan.org/authors/id/P/PJ/PJACKLAM/Math-BigInt-1.999837.tar.gz" + version("2.003002", sha256="5ac1fd255cca29d7cf5cb9283e6bb8177cdb07c5bb97502a58084b1c6eace35c") version("1.999838", sha256="d3c2fb37d412ac8d126452caad5764f02193147261b59c56e652167c41d1e9d5") version("1.999837", sha256="038f9aad6318f20a84a7b1afe3087a1b02406c9988ce5919311a797f85a32962") diff --git a/var/spack/repos/builtin/packages/perl-module-build/package.py b/var/spack/repos/builtin/packages/perl-module-build/package.py index 62c1822d59..248c78789f 100644 --- a/var/spack/repos/builtin/packages/perl-module-build/package.py +++ b/var/spack/repos/builtin/packages/perl-module-build/package.py @@ -20,6 +20,7 @@ class PerlModuleBuild(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.4234", sha256="66aeac6127418be5e471ead3744648c766bd01482825c5b66652675f2bc86a8f") version("0.4232", sha256="67c82ee245d94ba06decfa25572ab75fdcd26a9009094289d8f45bc54041771b") version("0.4224", sha256="a6ca15d78244a7b50fdbf27f85c85f4035aa799ce7dd018a0d98b358ef7bc782") version("0.4220", sha256="fb1207c7e799366f7a8adda3f135bf8141c4d6068505650d4db2b2d3ce34b5a2") diff --git a/var/spack/repos/builtin/packages/perl-module-corelist/package.py b/var/spack/repos/builtin/packages/perl-module-corelist/package.py index b4b0a27cf1..3ff083a146 100644 --- a/var/spack/repos/builtin/packages/perl-module-corelist/package.py +++ b/var/spack/repos/builtin/packages/perl-module-corelist/package.py @@ -13,6 +13,9 @@ class PerlModuleCorelist(PerlPackage): url = "https://cpan.metacpan.org/authors/id/B/BI/BINGOS/Module-CoreList-5.20220820.tar.gz" version( + "5.20240420", sha256="ce3b4548774c6761d91b479cf5b80b10dc74b0c07054dcf3b6252c22639aee8d" + ) + version( "5.20230320", sha256="324a28f755bd10abc26e0e8b6564ae2623276ae99cbb28ee09ced647fa80f87b" ) version( diff --git a/var/spack/repos/builtin/packages/perl-moose/package.py b/var/spack/repos/builtin/packages/perl-moose/package.py index 234cc6167c..b7406a8fd3 100644 --- a/var/spack/repos/builtin/packages/perl-moose/package.py +++ b/var/spack/repos/builtin/packages/perl-moose/package.py @@ -14,6 +14,7 @@ class PerlMoose(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.2207", sha256="7c2daddc49754ded93f65b8ce9e3ac9b6d11ab27d111ec77f95a8528cf4ac409") version("2.2203", sha256="fa7814acf4073fa434c148d403cbbf8a7b62f73ad396fa8869f3036d6e3241a7") version("2.2010", sha256="af0905b69f18c27de1177c9bc7778ee495d4ec91be1f223e8ca8333af4de08c5") version("2.2009", sha256="63ba8a5e27dbcbdbac2cd8f4162fff50a31e9829d8955a196a5898240c02d194") diff --git a/var/spack/repos/builtin/packages/perl-path-tiny/package.py b/var/spack/repos/builtin/packages/perl-path-tiny/package.py index ec90934c53..19fbc6ba70 100644 --- a/var/spack/repos/builtin/packages/perl-path-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-path-tiny/package.py @@ -18,5 +18,6 @@ class PerlPathTiny(PerlPackage): license("Apache-2.0") + version("0.146", sha256="861ef09bca68254e9ab24337bb6ec9d58593a792e9d68a27ee6bec2150f06741") version("0.144", sha256="f6ea094ece845c952a02c2789332579354de8d410a707f9b7045bd241206487d") version("0.108", sha256="3c49482be2b3eb7ddd7e73a5b90cff648393f5d5de334ff126ce7a3632723ff5") diff --git a/var/spack/repos/builtin/packages/perl-test-warnings/package.py b/var/spack/repos/builtin/packages/perl-test-warnings/package.py index 27a4f34048..62e16d23f1 100644 --- a/var/spack/repos/builtin/packages/perl-test-warnings/package.py +++ b/var/spack/repos/builtin/packages/perl-test-warnings/package.py @@ -14,5 +14,6 @@ class PerlTestWarnings(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.033", sha256="b9c375719f2c61c5f97aa5ee6cf4c901a972347c415969379b0b51f67c48bbcb") version("0.031", sha256="1e542909fef305e45563e9878ea1c3b0c7cef1b28bb7ae07eba2e1efabec477b") version("0.026", sha256="ae2b68b1b5616704598ce07f5118efe42dc4605834453b7b2be14e26f9cc9a08") diff --git a/var/spack/repos/builtin/packages/perl-xml-parser/package.py b/var/spack/repos/builtin/packages/perl-xml-parser/package.py index 86e2027e0f..f199fd8073 100644 --- a/var/spack/repos/builtin/packages/perl-xml-parser/package.py +++ b/var/spack/repos/builtin/packages/perl-xml-parser/package.py @@ -14,6 +14,7 @@ class PerlXmlParser(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.47", sha256="ad4aae643ec784f489b956abe952432871a622d4e2b5c619e8855accbfc4d1d8") version("2.46", sha256="d331332491c51cccfb4cb94ffc44f9cd73378e618498d4a37df9e043661c515d") version("2.44", sha256="1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216") @@ -24,8 +25,8 @@ class PerlXmlParser(PerlPackage): args = [] p = self.spec["expat"].prefix.lib - args.append("EXPATLIBPATH={0}".format(p)) + args.append(f"EXPATLIBPATH={p}") p = self.spec["expat"].prefix.include - args.append("EXPATINCPATH={0}".format(p)) + args.append(f"EXPATINCPATH={p}") return args diff --git a/var/spack/repos/builtin/packages/planck-likelihood/package.py b/var/spack/repos/builtin/packages/planck-likelihood/package.py index 7315b7f9e2..323d905bbf 100644 --- a/var/spack/repos/builtin/packages/planck-likelihood/package.py +++ b/var/spack/repos/builtin/packages/planck-likelihood/package.py @@ -80,9 +80,9 @@ class PlanckLikelihood(Package): filter_file("^\t@", "\t", "Makefile") makeflags = [ - "PREFIX=%s" % prefix, + f"PREFIX={prefix}", "COLORS=0", - "CFITSIOPATH=%s" % spec["cfitsio"].prefix, + f"CFITSIOPATH={spec['cfitsio'].prefix}", "CC=cc", "FC=fc", "IFORTLIBPATH=", @@ -90,9 +90,9 @@ class PlanckLikelihood(Package): "GFORTRANLIBPATH=", "GFORTRANRUNTIME=-lgfortran -lgomp", "LAPACKLIBPATH=", - "LAPACK=%s" % (spec["lapack"].libs + spec["blas"].libs).ld_flags, - "COPENMP=%s" % self.compiler.openmp_flag, - "FOPENMP=%s" % self.compiler.openmp_flag, + f"LAPACK={(spec['lapack'].libs + spec['blas'].libs).ld_flags}", + f"COPENMP={self.compiler.openmp_flag}", + f"FOPENMP={self.compiler.openmp_flag}", ] # Build diff --git a/var/spack/repos/builtin/packages/postgresql/package.py b/var/spack/repos/builtin/packages/postgresql/package.py index fc13e3e1d5..9a979f6216 100644 --- a/var/spack/repos/builtin/packages/postgresql/package.py +++ b/var/spack/repos/builtin/packages/postgresql/package.py @@ -21,6 +21,7 @@ class Postgresql(AutotoolsPackage): license("PostgreSQL") + version("16.3", sha256="331963d5d3dc4caf4216a049fa40b66d6bcb8c730615859411b9518764e60585") version("15.2", sha256="99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7") version("14.0", sha256="ee2ad79126a7375e9102c4db77c4acae6ae6ffe3e082403b88826d96d927a122") version("13.1", sha256="12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f") @@ -69,37 +70,36 @@ class Postgresql(AutotoolsPackage): return Executable(self.prefix.bin.pg_config) def configure_args(self): - config_args = ["--with-openssl"] + spec = self.spec + args = ["--with-openssl"] - if "+threadsafe" in self.spec: - config_args.append("--enable-thread-safety") - else: - config_args.append("--disable-thread-safety") + if spec.satisfies("+threadsafe"): + args.append(self.enable_or_disable("thread-safety")) - if self.spec.variants["lineedit"].value == "libedit": - config_args.append("--with-libedit-preferred") - elif self.spec.variants["lineedit"].value == "none": - config_args.append("--without-readline") + if spec.variants["lineedit"].value == "libedit": + args.append("--with-libedit-preferred") + elif spec.variants["lineedit"].value == "none": + args.append("--without-readline") - if "+gssapi" in self.spec: - config_args.append("--with-gssapi") + if spec.satisfies("+gssapi"): + args.append("--with-gssapi") - if "+python" in self.spec: - config_args.append("--with-python") + if spec.satisfies("+python"): + args.append("--with-python") - if "+perl" in self.spec: - config_args.append("--with-perl") + if spec.satisfies("+perl"): + args.append("--with-perl") - if "+tcl" in self.spec: - config_args.append("--with-tcl") + if spec.satisfies("+tcl"): + args.append("--with-tcl") - if "+xml" in self.spec: - config_args.append("--with-libxml") + if spec.satisfies("+xml"): + args.append("--with-libxml") - return config_args + return args def install(self, spec, prefix): - if "+client_only" in self.spec: + if spec.satisfies("+client_only"): for subdir in ("bin", "include", "interfaces", "pl"): with working_dir(os.path.join("src", subdir)): make("install") @@ -109,31 +109,31 @@ class Postgresql(AutotoolsPackage): def setup_run_environment(self, env): spec = self.spec - if "+perl" in spec: + if spec.satisfies("+perl"): env.prepend_path("PERL5LIB", self.prefix.lib) - if "+tcl" in spec: + if spec.satisfies("+tcl"): env.prepend_path("TCLLIBPATH", self.prefix.lib) - if "+python" in spec: + if spec.satisfies("+python"): env.prepend_path("PYTHONPATH", self.prefix.lib) def setup_dependent_build_environment(self, env, dependent_spec): spec = self.spec - if "+perl" in spec: + if spec.satisfies("+perl"): env.prepend_path("PERL5LIB", self.prefix.lib) - if "+tcl" in spec: + if spec.satisfies("+tcp"): env.prepend_path("TCLLIBPATH", self.prefix.lib) - if "+python" in spec: + if spec.satisfies("+python"): env.prepend_path("PYTHONPATH", self.prefix.lib) def setup_dependent_run_environment(self, env, dependent_spec): spec = self.spec - if "+perl" in spec: + if spec.satisfies("+perl"): env.prepend_path("PERL5LIB", self.prefix.lib) - if "+tcl" in spec: + if spec.satisfies("+tcl"): env.prepend_path("TCLLIBPATH", self.prefix.lib) - if "+python" in spec: + if spec.satisfies("+python"): env.prepend_path("PYTHONPATH", self.prefix.lib) @property diff --git a/var/spack/repos/builtin/packages/pugixml/package.py b/var/spack/repos/builtin/packages/pugixml/package.py index 3cb7ae0e64..07d0cdfab8 100644 --- a/var/spack/repos/builtin/packages/pugixml/package.py +++ b/var/spack/repos/builtin/packages/pugixml/package.py @@ -15,6 +15,7 @@ class Pugixml(CMakePackage): license("MIT") + version("1.14", sha256="2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015") version("1.13", sha256="40c0b3914ec131485640fa57e55bf1136446026b41db91c1bef678186a12abbe") version("1.11.4", sha256="8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716") version("1.11", sha256="26913d3e63b9c07431401cf826df17ed832a20d19333d043991e611d23beaa2c") diff --git a/var/spack/repos/builtin/packages/qualimap/package.py b/var/spack/repos/builtin/packages/qualimap/package.py index bfa8af7060..69a327b552 100644 --- a/var/spack/repos/builtin/packages/qualimap/package.py +++ b/var/spack/repos/builtin/packages/qualimap/package.py @@ -17,6 +17,7 @@ class Qualimap(Package): license("GPL-2.0-or-later") + version("2.3", sha256="2a04dd864b712da30923cce3bc8dfc6ea59612118e8b0ff1a246fe43b8d34c40") version("2.2.1", sha256="08f1d66e49c83c76c56c4225c53aee44f41e0592c8bdc84b8c4ecd975700e045") depends_on("java", type="run") diff --git a/var/spack/repos/builtin/packages/rkcommon/package.py b/var/spack/repos/builtin/packages/rkcommon/package.py index 96865adfea..bd381ebdda 100644 --- a/var/spack/repos/builtin/packages/rkcommon/package.py +++ b/var/spack/repos/builtin/packages/rkcommon/package.py @@ -14,8 +14,6 @@ class Rkcommon(CMakePackage): url = "https://github.com/ospray/rkcommon/archive/v1.4.1.tar.gz" git = "https://github.com/ospray/rkcommon.git" - # maintainers("github_user1",o"github_user2") - license("Apache-2.0") version("1.13.0", sha256="8ae9f911420085ceeca36e1f16d1316a77befbf6bf6de2a186d65440ac66ff1f") diff --git a/var/spack/repos/builtin/packages/rsbench/package.py b/var/spack/repos/builtin/packages/rsbench/package.py index 449af96b28..6d8c2536d4 100644 --- a/var/spack/repos/builtin/packages/rsbench/package.py +++ b/var/spack/repos/builtin/packages/rsbench/package.py @@ -14,6 +14,7 @@ class Rsbench(MakefilePackage): homepage = "https://github.com/ANL-CESAR/RSBench" url = "https://github.com/ANL-CESAR/RSBench/archive/v2.tar.gz" + version("13", sha256="4ddba1fe2f657103e5e50199b7dd2eab62069ddf17350489c18238908dd73b61") version("12", sha256="2e437dbdaf7bf12bb9ade429d46a9e74fd519fc4686777a452770790d0546499") version("2", sha256="1e97a38a863836e98cedc5cc669f8fdcaed905fafdc921d2bce32319b3e157ff") version("0", sha256="95c06cf4cb6f396f9964d5e4b58a477bf9d7131cd39804480f1cb74e9310b271") @@ -31,24 +32,25 @@ class Rsbench(MakefilePackage): @property def build_targets(self): + spec = self.spec targets = [] cflags = "-std=gnu99 -O3" ldflags = "-lm" - if self.compiler.name == "gcc": + if spec.satisfies("%gcc"): cflags += " -ffast-math " - elif self.compiler.name == "intel": + elif spec.satisfies("%intel"): cflags += " -xhost -ansi-alias -no-prec-div " - elif self.compiler.name == "pgi" or self.compiler.name == "nvhpc": + elif spec.satisfies("%pgi") or spec.satisfies("%nvhpc"): cflags += " -fastsse " - elif self.compiler.name == "arm": + elif spec.satisfies("%arm"): cflags += " -ffast-math " cflags += self.compiler.openmp_flag - targets.append("CFLAGS={0}".format(cflags)) - targets.append("LDFLAGS={0}".format(ldflags)) + targets.append(f"CFLAGS={cflags}") + targets.append(f"LDFLAGS={ldflags}") return targets diff --git a/var/spack/repos/builtin/packages/samblaster/package.py b/var/spack/repos/builtin/packages/samblaster/package.py index 9191ab9ae0..ec46bb5c46 100644 --- a/var/spack/repos/builtin/packages/samblaster/package.py +++ b/var/spack/repos/builtin/packages/samblaster/package.py @@ -15,6 +15,7 @@ class Samblaster(MakefilePackage): license("MIT") + version("0.1.26", sha256="6b42a53d64a3ed340852028546693a24c860f236fd70e90c2b24fde9dcc4fd63") version("0.1.24", sha256="72c42e0a346166ba00152417c82179bd5139636fea859babb06ca855af93d11f") version("0.1.23", sha256="0d35ce629771946e3d6fc199025747054e5512bffa1ba4446ed81160fffee57a") diff --git a/var/spack/repos/builtin/packages/sdl2-image/package.py b/var/spack/repos/builtin/packages/sdl2-image/package.py index 4e94341aec..963b1a3f7f 100644 --- a/var/spack/repos/builtin/packages/sdl2-image/package.py +++ b/var/spack/repos/builtin/packages/sdl2-image/package.py @@ -15,6 +15,7 @@ class Sdl2Image(AutotoolsPackage): license("Zlib") + version("2.8.2", sha256="8f486bbfbcf8464dd58c9e5d93394ab0255ce68b51c5a966a918244820a76ddc") version("2.6.3", sha256="931c9be5bf1d7c8fae9b7dc157828b7eee874e23c7f24b44ba7eff6b4836312c") version("2.0.1", sha256="3a3eafbceea5125c04be585373bfd8b3a18f259bd7eae3efc4e6d8e60e0d7f64") diff --git a/var/spack/repos/builtin/packages/setxkbmap/package.py b/var/spack/repos/builtin/packages/setxkbmap/package.py index d68814690a..44d293cc34 100644 --- a/var/spack/repos/builtin/packages/setxkbmap/package.py +++ b/var/spack/repos/builtin/packages/setxkbmap/package.py @@ -16,6 +16,7 @@ class Setxkbmap(AutotoolsPackage, XorgPackage): license("MIT") + version("1.3.4", sha256="cc4113eab3cd70c28c986174aa30e62690e789723c874acc53e8d1f058d11f92") version("1.3.3", sha256="51ba28edf93a464a7444b53b154fd5e93dedd1e9bbcc85b636f4cf56986c4842") version("1.3.2", sha256="7e934afc55f161406f7dd99b5be8837e5d1478d8263776697b159d48461a1d3c") version("1.3.1", sha256="e24a73669007fa3b280eba4bdc7f75715aeb2e394bf2d63f5cc872502ddde264") diff --git a/var/spack/repos/builtin/packages/sheenbidi/package.py b/var/spack/repos/builtin/packages/sheenbidi/package.py index 5b9351b2a4..7d79df722e 100644 --- a/var/spack/repos/builtin/packages/sheenbidi/package.py +++ b/var/spack/repos/builtin/packages/sheenbidi/package.py @@ -16,4 +16,5 @@ class Sheenbidi(MesonPackage): license("Apache-2.0") + version("2.7", sha256="620f732141fd62354361f921a67ba932c44d94e73f127379a0c73ad40c7fa6e0") version("2.6", sha256="f538f51a7861dd95fb9e3f4ad885f39204b5c670867019b5adb7c4b410c8e0d9") diff --git a/var/spack/repos/builtin/packages/snptest/package.py b/var/spack/repos/builtin/packages/snptest/package.py index 1795b605e7..8146c3558c 100644 --- a/var/spack/repos/builtin/packages/snptest/package.py +++ b/var/spack/repos/builtin/packages/snptest/package.py @@ -13,8 +13,9 @@ class Snptest(Package): homepage = "https://mathgen.stats.ox.ac.uk/genetics_software/snptest/snptest.html" url = "https://www.well.ox.ac.uk/~gav/resources/snptest_v2.5.2_linux_x86_64_dynamic.tgz" + version("2.5.6", sha256="22582e49f4a16edf52fe44e8f5e6f3479871658ec1be6341275f6f15d9cbd301") version("2.5.2", sha256="1ffa3ebafa2c5db4866a38e01bb09f43df7973d053423ce67221cb3f8acb30f6") def install(self, spec, prefix): mkdirp(prefix.bin) - install("snptest_v{0}".format(self.version), prefix.bin) + install(f"snptest_v{self.version}", prefix.bin) diff --git a/var/spack/repos/builtin/packages/solr/package.py b/var/spack/repos/builtin/packages/solr/package.py index 5b7ff248e7..0a14f666a3 100644 --- a/var/spack/repos/builtin/packages/solr/package.py +++ b/var/spack/repos/builtin/packages/solr/package.py @@ -21,6 +21,7 @@ class Solr(Package): license("CC-BY-2.5") + version("8.11.3", sha256="178300ae095094c2060a1060cf475aa935f1202addfb5bacb38e8712ccb56455") version("8.11.2", sha256="54d6ebd392942f0798a60d50a910e26794b2c344ee97c2d9b50e678a7066d3a6") version("8.6.0", sha256="4519ccdb531619df770f1065db6adcedc052c7aa94b42806d541966550956aa5") version("8.5.2", sha256="c457d6c7243241cad141e1df34c6f669d58a6c60e537f4217d032616dd066dcf") diff --git a/var/spack/repos/builtin/packages/span-lite/package.py b/var/spack/repos/builtin/packages/span-lite/package.py index 0ea94646d6..e074289f08 100644 --- a/var/spack/repos/builtin/packages/span-lite/package.py +++ b/var/spack/repos/builtin/packages/span-lite/package.py @@ -20,6 +20,7 @@ class SpanLite(CMakePackage): license("BSL-1.0") + version("0.11.0", sha256="ef4e028e18ff21044da4b4641ca1bc8a2e2d656e2028322876c0e1b9b6904f9d") version("0.10.3", sha256="04ac8148760369f11d4cdbc7969d66cb3d372357b6b5c7744841a60551ccb50b") version("0.9.2", sha256="7562802aac9b78e0140c3d59933cf4dc5825c0712c63daad2f7fff8c67e62eb4") version("0.8.1", sha256="2136dba54988c16b03f7c652ea977205bf624bfde90c24331177027d6529386d") @@ -33,7 +34,7 @@ class SpanLite(CMakePackage): def cmake_args(self): return [ "-DSPAN_LITE_EXPORT_PACKAGE=ON", - "-DSPAN_LITE_OPT_BUILD_TESTS=%s" % ("ON" if self.run_tests else "OFF"), + f"-DSPAN_LITE_OPT_BUILD_TESTS={'ON' if self.run_tests else 'OFF'}", "-DSPAN_LITE_OPT_BUILD_EXAMPLES=OFF", ] diff --git a/var/spack/repos/builtin/packages/sse2neon/package.py b/var/spack/repos/builtin/packages/sse2neon/package.py index 9ac1f23a12..8251756f2b 100644 --- a/var/spack/repos/builtin/packages/sse2neon/package.py +++ b/var/spack/repos/builtin/packages/sse2neon/package.py @@ -18,6 +18,7 @@ class Sse2neon(Package): license("MIT") version("master", branch="master") + version("1.7.0", sha256="cee6d54922dbc9d4fa57749e3e4b46161b7f435a22e592db9da008051806812a") version("1.6.0", sha256="06f4693219deccb91b457135d836fc514a1c0a57e9fa66b143982901d2d19677") version("1.5.1", sha256="4001e2dfb14fcf3831211581ed83bcc83cf6a3a69f638dcbaa899044a351bb2a") version("1.5.0", sha256="92ab852aac6c8726a615f77438f2aa340f168f9f6e70c72033d678613e97b65a") diff --git a/var/spack/repos/builtin/packages/star/package.py b/var/spack/repos/builtin/packages/star/package.py index c72e1c0964..c0781d3b21 100644 --- a/var/spack/repos/builtin/packages/star/package.py +++ b/var/spack/repos/builtin/packages/star/package.py @@ -14,6 +14,7 @@ class Star(MakefilePackage): license("MIT") + version("2.7.11b", sha256="3f65305e4112bd154c7e22b333dcdaafc681f4a895048fa30fa7ae56cac408e7") version("2.7.11a", sha256="542457b1a4fee73f27a581b1776e9f73ad2b4d7e790388b6dc71147bd039f99a") version("2.7.10b", sha256="0d1b71de6c5be1c5d90b32130d2abcd5785a4fc7c1e9bf19cc391947f2dc46e5") version("2.7.10a", sha256="af0df8fdc0e7a539b3ec6665dce9ac55c33598dfbc74d24df9dae7a309b0426a") diff --git a/var/spack/repos/builtin/packages/storm/package.py b/var/spack/repos/builtin/packages/storm/package.py index d18dfd853e..2e7a971b6b 100644 --- a/var/spack/repos/builtin/packages/storm/package.py +++ b/var/spack/repos/builtin/packages/storm/package.py @@ -20,6 +20,7 @@ class Storm(Package): license("CC-BY-4.0") + version("2.6.2", sha256="640c2c54a593cdcffef9441336738774ae618830d3e63eb8e770c22d68beed30") version("2.3.0", sha256="49c2255b26633c6fd96399c520339e459fcda29a0e7e6d0c8775cefcff6c3636") version("2.2.0", sha256="f621163f349a8e85130bc3d2fbb34e3b08f9c039ccac5474f3724e47a3a38675") version("2.1.0", sha256="e279a495dda42af7d9051543989f74a1435a5bda53e795a1de4a1def32027fc4") diff --git a/var/spack/repos/builtin/packages/stow/package.py b/var/spack/repos/builtin/packages/stow/package.py index cec0871bd5..180c69920b 100644 --- a/var/spack/repos/builtin/packages/stow/package.py +++ b/var/spack/repos/builtin/packages/stow/package.py @@ -19,6 +19,7 @@ class Stow(AutotoolsPackage, GNUMirrorPackage): license("GPL-3.0-or-later") + version("2.4.0", sha256="a7bac673daa246cf54ffb48a113eadd204a615630e76b53b5f64d81a275b77b3") version("2.3.1", sha256="26a6cfdfdaca0eea742db5487798c15fcd01889dc86bc5aa62614ec9415a422f") version("2.2.2", sha256="a0022034960e47a8d23dffb822689f061f7a2d9101c9835cf11bf251597aa6fd") version("2.2.0", sha256="86bc30fe1d322a5c80ff3bd7580c2758149aad7c3bbfa18b48a9d95c25d66b05") diff --git a/var/spack/repos/builtin/packages/taskflow/package.py b/var/spack/repos/builtin/packages/taskflow/package.py index 1e00312654..78f8ed89db 100644 --- a/var/spack/repos/builtin/packages/taskflow/package.py +++ b/var/spack/repos/builtin/packages/taskflow/package.py @@ -18,6 +18,7 @@ class Taskflow(CMakePackage): license("MIT") version("master", branch="master") + version("3.7.0", sha256="788b88093fb3788329ebbf7c7ee05d1f8960d974985a301798df01e77e04233b") version("3.6.0", sha256="5a1cd9cf89f93a97fcace58fd73ed2fc8ee2053bcb43e047acb6bc121c3edf4c") version("2.7.0", sha256="bc2227dcabec86abeba1fee56bb357d9d3c0ef0184f7c2275d7008e8758dfc3e") diff --git a/var/spack/repos/builtin/packages/telegraf/package.py b/var/spack/repos/builtin/packages/telegraf/package.py index 92d4084bc0..2523852bd4 100644 --- a/var/spack/repos/builtin/packages/telegraf/package.py +++ b/var/spack/repos/builtin/packages/telegraf/package.py @@ -16,6 +16,7 @@ class Telegraf(MakefilePackage): license("MIT") + version("1.30.2", sha256="3514d870fe1899f20c5d1f1545233413cbe11061b23a0cafbd44b861a9295dc6") version("1.20.3", sha256="cf8fd4d38970648281101e8a71b1a48c5765c8aaa9d67619c00272c9192e9057") version("1.19.3", sha256="d2fb8a3519a5690c801e1221e22c3693ed95204f70f6c57eb13267ca1964c659") diff --git a/var/spack/repos/builtin/packages/tengine/package.py b/var/spack/repos/builtin/packages/tengine/package.py index 73412eb30d..e2a8cea321 100644 --- a/var/spack/repos/builtin/packages/tengine/package.py +++ b/var/spack/repos/builtin/packages/tengine/package.py @@ -12,6 +12,7 @@ class Tengine(AutotoolsPackage): homepage = "https://tengine.taobao.org/" url = "https://github.com/alibaba/tengine/archive/2.3.2.tar.gz" + version("3.1.0", sha256="64ed7155c0c904ce0fe7199c21b8eb6c2abfc267278fa8af832c0cb781e864dc") version("2.3.2", sha256="a65998a35739a59f8a16ec4c6090a59e569ba5a1a3f68fecad952057c1a18fea") version("2.3.1", sha256="3dd93f813b80ed7581a81079a2037df6e4777b7e760fd6635b4009d344a5ab1c") version("2.3.0", sha256="17cf1380d4faefb70707970437b3f8b66f6ff4530b5e6e61970b35f59b2e2624") diff --git a/var/spack/repos/builtin/packages/texinfo/package.py b/var/spack/repos/builtin/packages/texinfo/package.py index bc1bc5b64b..22b338b3b3 100644 --- a/var/spack/repos/builtin/packages/texinfo/package.py +++ b/var/spack/repos/builtin/packages/texinfo/package.py @@ -25,6 +25,7 @@ class Texinfo(AutotoolsPackage, GNUMirrorPackage): license("GPL-3.0-or-later") + version("7.1", sha256="dd5710b3a53ac002644677a06145748e260592a35be182dc830ebebb79c5d5a0") version("7.0.3", sha256="3cc5706fb086b895e1dc2b407aade9f95a3a233ff856273e2b659b089f117683") version("7.0", sha256="9261d4ee11cdf6b61895e213ffcd6b746a61a64fe38b9741a3aaa73125b35170") version("6.8", sha256="8e09cf753ad1833695d2bac0f57dc3bd6bcbbfbf279450e1ba3bc2d7fb297d08") @@ -61,7 +62,7 @@ class Texinfo(AutotoolsPackage, GNUMirrorPackage): def build_targets(self): targets = [] if self.spec.satisfies("@7.0:"): - targets.append("CFLAGS={}".format(self.compiler.c11_flag)) + targets.append(f"CFLAGS={self.compiler.c11_flag}") return targets def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/tig/package.py b/var/spack/repos/builtin/packages/tig/package.py index 04f93a8ece..112a775db3 100644 --- a/var/spack/repos/builtin/packages/tig/package.py +++ b/var/spack/repos/builtin/packages/tig/package.py @@ -14,6 +14,7 @@ class Tig(AutotoolsPackage): license("GPL-2.0-or-later") + version("2.5.10", sha256="f655cc1366fc10058a2bd505bb88ca78e653ff7526c1b81774c44b9d841210e3") version("2.5.8", sha256="b70e0a42aed74a4a3990ccfe35262305917175e3164330c0889bd70580406391") version("2.2.2", sha256="316214d87f7693abc0cbe8ebbb85decdf5e1b49d7ad760ac801af3dd73385e35") diff --git a/var/spack/repos/builtin/packages/tkrzw/package.py b/var/spack/repos/builtin/packages/tkrzw/package.py index 1b8f584b8c..5c86d5f06b 100644 --- a/var/spack/repos/builtin/packages/tkrzw/package.py +++ b/var/spack/repos/builtin/packages/tkrzw/package.py @@ -16,6 +16,7 @@ class Tkrzw(AutotoolsPackage): license("Apache-2.0") version("master", branch="master") + version("1.0.29", sha256="abaabd6fc89a19ed8a202ac3711bc3b0763d928bc3a8eeeea73a3679f7e7f790") version("0.9.44", sha256="088ac619fbf7fc22c110674b3f8fe8d8573a1d7088e5616b268fd9f68ba25650") version("0.9.43", sha256="60f7b579edb4f911ecaf35ff6c07f53b3d566424d8bf179b1991ade5071f0bbc") version("0.9.42", sha256="135fb404d5a1b0bcee717f8e648a6f5ff140ec30069fecfde3b380f611356535") diff --git a/var/spack/repos/builtin/packages/tpm2-tss/package.py b/var/spack/repos/builtin/packages/tpm2-tss/package.py index 1cbb0a7575..a53a20762b 100644 --- a/var/spack/repos/builtin/packages/tpm2-tss/package.py +++ b/var/spack/repos/builtin/packages/tpm2-tss/package.py @@ -14,6 +14,7 @@ class Tpm2Tss(AutotoolsPackage): license("BSD-2-Clause") + version("4.1.1", sha256="da5b09d5a82d381f7bbd2e1d2db494213f7148659cfaf1b9e423b4df62f48504") version("3.0.0", sha256="e88e91aeee2e01ccc45596fb8afcc3b521a660dcebe5a6e1b14ea5e9e5c15cf5") version("2.4.2", sha256="1cec5e834a6a750b138cabcd100b3fcd12b16cd21fa4f9103739914743511f75") version("2.4.1", sha256="cc6f0691307f3c65d5a1375e2cd22508cc72850dbc70eb820b892f0b3d0cbea2") diff --git a/var/spack/repos/builtin/packages/trompeloeil/package.py b/var/spack/repos/builtin/packages/trompeloeil/package.py index 1cd132278a..78887216a5 100644 --- a/var/spack/repos/builtin/packages/trompeloeil/package.py +++ b/var/spack/repos/builtin/packages/trompeloeil/package.py @@ -17,6 +17,7 @@ class Trompeloeil(CMakePackage): license("BSL-1.0") version("master", branch="master") + version("47", sha256="4a1d79260c1e49e065efe0817c8b9646098ba27eed1802b0c3ba7d959e4e5e84") version("45", sha256="124b0aa45d84415193719376b6557fc1f1180cbfebf4dc4f7ca247cb404d6bd8") version("44", sha256="004877db6ba22f24c7867e112e081eeb68858122f55ebe7c7dd9d8d9e3b46c88") version("43", sha256="86a0afa2e97347202a0a883ab43da78c1d4bfff0d6cb93205cfc433d0d9eb9eb") diff --git a/var/spack/repos/builtin/packages/util-linux-uuid/package.py b/var/spack/repos/builtin/packages/util-linux-uuid/package.py index d41a9a93ae..eb3e1a540f 100644 --- a/var/spack/repos/builtin/packages/util-linux-uuid/package.py +++ b/var/spack/repos/builtin/packages/util-linux-uuid/package.py @@ -16,6 +16,7 @@ class UtilLinuxUuid(AutotoolsPackage): license("GPL-2.0-or-later") + version("2.40.1", sha256="8e396eececae2b3b68db232c33b8810faa7c31f6df19f98f512739293d5829b7") version("2.38.1", sha256="0820eb8eea90408047e3715424bc6be771417047f683950fecb4bdd2e2cbbc6e") version("2.37.4", sha256="c8b7b4fa541f974cc32c1c6559d9bfca33651020a456ad6ee5fc9b0cacd00151") version("2.36.2", sha256="f5dbe79057e7d68e1a46fc04083fc558b26a49499b1b3f50e4f4893150970463") diff --git a/var/spack/repos/builtin/packages/valijson/package.py b/var/spack/repos/builtin/packages/valijson/package.py index 0b7f2ddf1b..ceaadd05a6 100644 --- a/var/spack/repos/builtin/packages/valijson/package.py +++ b/var/spack/repos/builtin/packages/valijson/package.py @@ -18,4 +18,5 @@ class Valijson(CMakePackage): license("BSD-2-Clause") version("master", branch="master") + version("1.0.2", sha256="35d86e54fc727f1265226434dc996e33000a570f833537a25c8b702b0b824431") version("1.0", sha256="6b9f0bc89880feb3fe09aa469cd81f6168897d2fbb4e715853da3b94afd3779a") diff --git a/var/spack/repos/builtin/packages/wxwidgets/package.py b/var/spack/repos/builtin/packages/wxwidgets/package.py index de62cbb39a..d47d63585b 100644 --- a/var/spack/repos/builtin/packages/wxwidgets/package.py +++ b/var/spack/repos/builtin/packages/wxwidgets/package.py @@ -23,6 +23,7 @@ class Wxwidgets(AutotoolsPackage): git = "https://github.com/wxWidgets/wxWidgets.git" version("develop", branch="master") + version("3.2.4", sha256="0640e1ab716db5af2ecb7389dbef6138d7679261fbff730d23845ba838ca133e") version("3.2.2.1", sha256="dffcb6be71296fff4b7f8840eb1b510178f57aa2eb236b20da41182009242c02") version("3.2.2", sha256="8edf18672b7bc0996ee6b7caa2bee017a9be604aad1ee471e243df7471f5db5d") version("3.1.0", sha256="e082460fb6bf14b7dd6e8ac142598d1d3d0b08a7b5ba402fdbf8711da7e66da8") diff --git a/var/spack/repos/builtin/packages/xbraid/package.py b/var/spack/repos/builtin/packages/xbraid/package.py index eb845dad60..1b95305693 100644 --- a/var/spack/repos/builtin/packages/xbraid/package.py +++ b/var/spack/repos/builtin/packages/xbraid/package.py @@ -13,6 +13,7 @@ class Xbraid(MakefilePackage): url = "https://github.com/XBraid/xbraid/archive/v2.2.0.tar.gz" tags = ["radiuss"] + version("3.1.0", sha256="3419b22918c65555e8c552b70a0837a251a74c471dac8e4a7b2272bf7d955c88") version("3.0.0", sha256="06988c0599cd100d3b3f3ebb183c9ad34a4021922e0896815cbedc659aaadce6") version("2.3.0", sha256="706f0acde201c7c336ade3604679759752a74e2cd6c2a29a8bf5676b6e54b704") version("2.2.0", sha256="082623b2ddcd2150b3ace65b96c1e00be637876ec6c94dc8fefda88743b35ba3") diff --git a/var/spack/repos/builtin/packages/xxhash/package.py b/var/spack/repos/builtin/packages/xxhash/package.py index 99661986c4..1d9605426e 100644 --- a/var/spack/repos/builtin/packages/xxhash/package.py +++ b/var/spack/repos/builtin/packages/xxhash/package.py @@ -19,6 +19,7 @@ class Xxhash(MakefilePackage): license("BSD-2-Clause") + version("0.8.2", sha256="baee0c6afd4f03165de7a4e67988d16f0f2b257b51d0e3cb91909302a26a79c4") version("0.8.1", sha256="3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c") version("0.8.0", sha256="7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f") version("0.7.4", sha256="4d9706c9da4fbdf901598f5e3b71db0eddd4ac962e827a73ebf75d66dfd820fe") |