diff options
92 files changed, 166 insertions, 73 deletions
diff --git a/var/spack/repos/builtin/packages/ace/package.py b/var/spack/repos/builtin/packages/ace/package.py index 0b18d4f0da..03b8d78bf1 100644 --- a/var/spack/repos/builtin/packages/ace/package.py +++ b/var/spack/repos/builtin/packages/ace/package.py @@ -18,6 +18,7 @@ class Ace(MakefilePackage): license("DOC") + version("7.1.4", sha256="a2bc358401178dd8175f4d826e60d23d901bfe38bc2fa0ac9275d01d7fda34bc") version("7.1.3", sha256="4cb82d8daf83f3abe50ac460b4fac9a8da2512f08d8efb4d327dcacd0b3929b3") version("7.1.0", sha256="d78d9f3f2dee6ccb46a8c296367369349054fd475dff3c5b36e2dff3dee0bf8f") version("6.5.12", sha256="de96c68a6262d6b9ba76b5057c02c7e6964c070b1328a63bf70259e9530a7996") diff --git a/var/spack/repos/builtin/packages/armadillo/package.py b/var/spack/repos/builtin/packages/armadillo/package.py index 3d33b0d381..8d5e99bd10 100644 --- a/var/spack/repos/builtin/packages/armadillo/package.py +++ b/var/spack/repos/builtin/packages/armadillo/package.py @@ -16,6 +16,7 @@ class Armadillo(CMakePackage): license("Apache-2.0") + version("12.8.2", sha256="03b62f8c09e4f5d74643b478520741b8e27b55e7e4525978fcae2f5d791ac3bf") version("12.8.1", sha256="2781dd3a6cc5f9a49c91a4519dde2b1c24335a5bfe0cc1c9881b6363142452b4") version("12.4.0", sha256="9905282781ced3f99769b0e45a705ecb50192ca1622300707b3302ea167dc883") version("12.2.0", sha256="b0dce042297e865add3351dad77f78c2c7638d6632f58357b015e50edcbd2186") diff --git a/var/spack/repos/builtin/packages/asciidoc/package.py b/var/spack/repos/builtin/packages/asciidoc/package.py index 2492052f57..5e31e98cd9 100644 --- a/var/spack/repos/builtin/packages/asciidoc/package.py +++ b/var/spack/repos/builtin/packages/asciidoc/package.py @@ -18,6 +18,7 @@ class Asciidoc(AutotoolsPackage): license("GPL-2.0-only", checked_by="tgamblin") version("master", branch="master") + version("10.2.0", sha256="684ea53c1f5b71d6d1ac6086bbc96906b1f709ecc7ab536615b0f0c9e1baa3cc") version("9.1.0", sha256="5056c20157349f8dc74f005b6e88ccbf1078c4e26068876f13ca3d1d7d045fe7") version("9.0.5", sha256="edc8328c3682a8568172656f6fc309b189f65219a49517966c7ea144cb25f8b2") version("9.0.4", sha256="fb0e683ae6a4baf34a8969c3af764ca729526196576729ee9275b9f39fd8b79c") diff --git a/var/spack/repos/builtin/packages/audit-userspace/package.py b/var/spack/repos/builtin/packages/audit-userspace/package.py index b38e3aee29..aa9877a293 100644 --- a/var/spack/repos/builtin/packages/audit-userspace/package.py +++ b/var/spack/repos/builtin/packages/audit-userspace/package.py @@ -14,6 +14,7 @@ class AuditUserspace(AutotoolsPackage): license("LGPL-2.1-or-later") + version("4.0.1", sha256="f964610dc0c1e68075d5ae4b14d6280d1164b6eca3a4a13721d1a711681403d9") version("3.1.1", sha256="6a97cc472920639d736e9927353be05e323f351067fcf6e5d34439cafa0e9006") version("2.8.5", sha256="835ffdd65056ba0c26509dbf48882713b00dbe70e1d8cf25d538501136c2e3e9") version("2.8.4", sha256="089dfdceb38edf056202a6de4892fd0c9aaa964c08bd7806c5d0c7c33f09e18d") diff --git a/var/spack/repos/builtin/packages/c-ares/package.py b/var/spack/repos/builtin/packages/c-ares/package.py index 34beec24ba..378077f64c 100644 --- a/var/spack/repos/builtin/packages/c-ares/package.py +++ b/var/spack/repos/builtin/packages/c-ares/package.py @@ -16,6 +16,7 @@ class CAres(CMakePackage): license("MIT") version("master", branch="master") + version("1.28.1", sha256="e520d971415e48e607819c2f4b377b0aa69044ef6619160bb41bdba15ab4d545") version("1.27.0", sha256="de6a839d47b93174ba260187a084027ea681a91ffe12f2d5f20645652eae246c") version("1.15.0", sha256="7deb7872cbd876c29036d5f37e30c4cbc3cc068d59d8b749ef85bb0736649f04") version("1.13.0", sha256="7c48c57706a38691041920e705d2a04426ad9c68d40edd600685323f214b2d57") diff --git a/var/spack/repos/builtin/packages/cfitsio/package.py b/var/spack/repos/builtin/packages/cfitsio/package.py index e8d89e46ae..6c87ebf15a 100644 --- a/var/spack/repos/builtin/packages/cfitsio/package.py +++ b/var/spack/repos/builtin/packages/cfitsio/package.py @@ -16,6 +16,7 @@ class Cfitsio(AutotoolsPackage): license("custom") + version("4.4.0", sha256="95900cf95ae760839e7cb9678a7b2fad0858d6ac12234f934bd1cb6bfc246ba9") version("4.3.0", sha256="fdadc01d09cf9f54253802c5ec87eb10de51ce4130411415ae88c30940621b8b") version("4.2.0", sha256="eba53d1b3f6e345632bb09a7b752ec7ced3d63ec5153a848380f3880c5d61889") version("4.1.0", sha256="b367c695d2831958e7166921c3b356d5dfa51b1ecee505b97416ba39d1b6c17a") @@ -45,7 +46,7 @@ class Cfitsio(AutotoolsPackage): spec = self.spec extra_args = [] if "+bzip2" in spec: - extra_args.append("--with-bzip2=%s" % spec["bzip2"].prefix), + extra_args.append(f"--with-bzip2={spec['bzip2'].prefix}"), return extra_args @property diff --git a/var/spack/repos/builtin/packages/dcm2niix/package.py b/var/spack/repos/builtin/packages/dcm2niix/package.py index 97bf5a422e..b92f1b0e73 100644 --- a/var/spack/repos/builtin/packages/dcm2niix/package.py +++ b/var/spack/repos/builtin/packages/dcm2niix/package.py @@ -16,6 +16,9 @@ class Dcm2niix(CMakePackage): license("Zlib") version( + "1.0.20240202", sha256="ad8e4a5b97a682c32ef1d88283c15c7cb767c4092cb1754119f8e8b3d940fe91" + ) + version( "1.0.20220720", sha256="a095545d6d70c5ce2efd90dcd58aebe536f135410c12165a9f231532ddab8991" ) version( diff --git a/var/spack/repos/builtin/packages/distcc/package.py b/var/spack/repos/builtin/packages/distcc/package.py index 629cd3fc0a..4bedadec9f 100644 --- a/var/spack/repos/builtin/packages/distcc/package.py +++ b/var/spack/repos/builtin/packages/distcc/package.py @@ -15,6 +15,7 @@ class Distcc(AutotoolsPackage): license("GPL-2.0-or-later") + version("3.4", sha256="37a34c9555498a1168fea026b292ab07e7bb394715d87d8403e0c33b16d2d008") version("3.3.5", sha256="13a4b3ce49dfc853a3de550f6ccac583413946b3a2fa778ddf503a9edc8059b0") version("3.3.3", sha256="b7f37d314704fbaf006d747514ff6e4d0d722102ef7d2aea132f97cf170f5169") diff --git a/var/spack/repos/builtin/packages/dnsmasq/package.py b/var/spack/repos/builtin/packages/dnsmasq/package.py index 4149405f2f..e52445450c 100644 --- a/var/spack/repos/builtin/packages/dnsmasq/package.py +++ b/var/spack/repos/builtin/packages/dnsmasq/package.py @@ -14,6 +14,7 @@ class Dnsmasq(MakefilePackage): license("GPL-2.0-or-later") + version("2.90", sha256="8f6666b542403b5ee7ccce66ea73a4a51cf19dd49392aaccd37231a2c51b303b") version("2.89", sha256="8651373d000cae23776256e83dcaa6723dee72c06a39362700344e0c12c4e7e4") version("2.81", sha256="3c28c68c6c2967c3a96e9b432c0c046a5df17a426d3a43cffe9e693cf05804d0") version("2.80", sha256="9e4a58f816ce0033ce383c549b7d4058ad9b823968d352d2b76614f83ea39adc") diff --git a/var/spack/repos/builtin/packages/earlyoom/package.py b/var/spack/repos/builtin/packages/earlyoom/package.py index 09cc0d1fad..9c1886c583 100644 --- a/var/spack/repos/builtin/packages/earlyoom/package.py +++ b/var/spack/repos/builtin/packages/earlyoom/package.py @@ -14,6 +14,7 @@ class Earlyoom(MakefilePackage): license("MIT") + version("1.8", sha256="bbb050a2294e60dafc0b129fcec705ef95d9d27f4c9dae1d3b4f25e4f698ae41") version("1.6.1", sha256="bcd3fab4da5e1dddec952a0974c866ec90c5f9159c995f9162c45488c4d03340") version("1.6", sha256="b81804fc4470f996014d52252a87a1cf3b43d3d8754140035b10dcee349302b8") diff --git a/var/spack/repos/builtin/packages/eprosima-fastcdr/package.py b/var/spack/repos/builtin/packages/eprosima-fastcdr/package.py index d5b096e490..3f7e1b8f72 100644 --- a/var/spack/repos/builtin/packages/eprosima-fastcdr/package.py +++ b/var/spack/repos/builtin/packages/eprosima-fastcdr/package.py @@ -16,5 +16,6 @@ class EprosimaFastcdr(CMakePackage): license("Apache-2.0") + version("2.2.1", sha256="11079a534cda791a8fc28d93ecb518bbd3804c0d4e9ca340ab24dcc21ad69a04") version("2.2.0", sha256="8a75ee3aed59f495e95208050920d2c2146df92f073809505a3bd29011c21f20") version("1.0.27", sha256="a9bc8fd31a2c2b95e6d2fb46e6ce1ad733e86dc4442f733479e33ed9cdc54bf6") diff --git a/var/spack/repos/builtin/packages/fio/package.py b/var/spack/repos/builtin/packages/fio/package.py index ba5f513726..fee8698066 100644 --- a/var/spack/repos/builtin/packages/fio/package.py +++ b/var/spack/repos/builtin/packages/fio/package.py @@ -21,6 +21,7 @@ class Fio(AutotoolsPackage): license("GPL-2.0-only") + version("3.37", sha256="b59099d42d5c62a8171974e54466a688c8da6720bf74a7f16bf24fb0e51ff92d") version("3.36", sha256="b34b8f3c5cd074c09ea487ffe3f444e95565c214b34a73042f35b00cbaab0e17") version("3.34", sha256="42ea28c78d269c4cc111b7516213f4d4b32986797a710b0ff364232cc7a3a0b7") version("3.33", sha256="f48b2547313ffd1799c58c6a170175176131bbd42bc847b5650784eaf6d914b3") @@ -46,8 +47,9 @@ class Fio(AutotoolsPackage): def configure_args(self): config_args = [] + spec = self.spec - if "+gui" in self.spec: + if spec.satisfies("+gui"): config_args.append("--enable-gfio") return config_args diff --git a/var/spack/repos/builtin/packages/flatcc/package.py b/var/spack/repos/builtin/packages/flatcc/package.py index ae0fdd2fca..1a685e7f85 100644 --- a/var/spack/repos/builtin/packages/flatcc/package.py +++ b/var/spack/repos/builtin/packages/flatcc/package.py @@ -21,6 +21,7 @@ class Flatcc(CMakePackage): license("Apache-2.0") + version("0.6.1", sha256="2533c2f1061498499f15acc7e0937dcf35bc68e685d237325124ae0d6c600c2b") version("0.5.3", sha256="d7519a97569ebdc9d12b162be0f9861fdc2724244f68595264a411ac48e4e983") version("0.5.2", sha256="02dac93d3daf8d0a290aa8711a9b8a53f047436ec5331adb1972389061ec6615") version("0.5.1", sha256="8c4560ca32e3c555716d9363bed469e2c60e0f443ec32bc08e7abfe681e25ca9") @@ -42,7 +43,7 @@ class Flatcc(CMakePackage): # allow flatcc to be built with more compilers args.append("-DFLATCC_ALLOW_WERROR=OFF") - if "+shared" in spec: + if spec.satisfies("+shared"): args.append("-DBUILD_SHARED_LIBS=ON") args.append("-DFLATCC_INSTALL=ON") else: diff --git a/var/spack/repos/builtin/packages/font-util/package.py b/var/spack/repos/builtin/packages/font-util/package.py index 8dddef8645..4ba5cbcc8e 100644 --- a/var/spack/repos/builtin/packages/font-util/package.py +++ b/var/spack/repos/builtin/packages/font-util/package.py @@ -14,6 +14,7 @@ class FontUtil(AutotoolsPackage, XorgPackage): license("custom") + version("1.4.1", sha256="f029ae80cdd75d89bee7f7af61c21e07982adfb9f72344a158b99f91f77ef5ed") version("1.4.0", sha256="30b90fe52347916be9b08f95f717f17c9c1f58bef8cabb49014d0fdd2b0df643") version("1.3.2", sha256="f115a3735604de1e852a4bf669be0269d8ce8f21f8e0e74ec5934b31dadc1e76") version("1.3.1", sha256="34ebb0c9c14e0a392cdd5ea055c92489ad88d55ae148b2f1cfded0f3f63f2b5b") @@ -244,9 +245,9 @@ class FontUtil(AutotoolsPackage, XorgPackage): def font_install(self): autoconf_args = ["-ifv"] p = join_path(self.spec["util-macros"].prefix, "share", "aclocal") - autoconf_args.append("--include={0}".format(p)) + autoconf_args.append(f"--include={p}") p = join_path(self.spec.prefix, "share", "aclocal") - autoconf_args.append("--include={0}".format(p)) + autoconf_args.append(f"--include={p}") fonts = self.spec.variants["fonts"].value autoreconf = which("autoreconf") @@ -255,5 +256,5 @@ class FontUtil(AutotoolsPackage, XorgPackage): with working_dir(fontroot[0]): autoreconf(*autoconf_args) configure = Executable("./configure") - configure("--prefix={0}".format(self.prefix)) + configure(f"--prefix={self.prefix}") make("install") diff --git a/var/spack/repos/builtin/packages/fox/package.py b/var/spack/repos/builtin/packages/fox/package.py index 98e4497473..554f919720 100644 --- a/var/spack/repos/builtin/packages/fox/package.py +++ b/var/spack/repos/builtin/packages/fox/package.py @@ -19,6 +19,8 @@ class Fox(AutotoolsPackage): license("LGPL-3.0-or-later") + # Stable releases (even numbers, preferred) + version("1.7.84", sha256="bdb1fe785605488b58addc95f6091a75873e8a3bea7b83caecfb7f4b0827b34e") version("1.7.67", sha256="7e511685119ef096fa90d334da46f0e50cfed8d414df32d80a7850442052f57d") version( "1.6.57", @@ -48,6 +50,6 @@ class Fox(AutotoolsPackage): def configure_args(self): # Make the png link flags explicit or it will try to pick up libpng15 # from system - args = ["LDFLAGS={0}".format(self.spec["libpng"].libs.search_flags)] + args = [f"LDFLAGS={self.spec['libpng'].libs.search_flags}"] args += self.with_or_without("opengl") return args diff --git a/var/spack/repos/builtin/packages/ftxui/package.py b/var/spack/repos/builtin/packages/ftxui/package.py index 92b72c0c26..4041e58f49 100644 --- a/var/spack/repos/builtin/packages/ftxui/package.py +++ b/var/spack/repos/builtin/packages/ftxui/package.py @@ -15,6 +15,7 @@ class Ftxui(CMakePackage): license("MIT") + version("5.0.0", sha256="a2991cb222c944aee14397965d9f6b050245da849d8c5da7c72d112de2786b5b") version("4.1.1", sha256="9009d093e48b3189487d67fc3e375a57c7b354c0e43fc554ad31bec74a4bc2dd") version("4.0.0", sha256="7276e4117429ebf8e34ea371c3ea4e66eb99e0f234cb4c5c85fca17174a53dfa") version("2.0.0", sha256="d891695ef22176f0c09f8261a37af9ad5b262dd670a81e6b83661a23abc2c54f") diff --git a/var/spack/repos/builtin/packages/glm/package.py b/var/spack/repos/builtin/packages/glm/package.py index bd5921c61b..3904efb2f4 100644 --- a/var/spack/repos/builtin/packages/glm/package.py +++ b/var/spack/repos/builtin/packages/glm/package.py @@ -19,12 +19,14 @@ class Glm(CMakePackage): license("MIT") version("develop", branch="master") + version("1.0.1", sha256="9f3174561fd26904b23f0db5e560971cbf9b3cbda0b280f04d5c379d03bf234c") version("0.9.9.8", sha256="7d508ab72cb5d43227a3711420f06ff99b0a0cb63ee2f93631b162bfe1fe9592") version("0.9.9.3", sha256="fba9fd177073a36c5a7798c74b28e79ba6deb8f4bb0d2dbfc0e207c27da7e12c") version("0.9.7.1", sha256="285a0dc8f762b4e523c8710fbd97accaace0c61f45bc8be2bdb0deed07b0e6f3") depends_on("cmake@2.6:", type="build") depends_on("cmake@3.2:", type="build", when="@0.9.9.0:") + depends_on("cmake@3.6:", type="build", when="@1:") # CMake install target was removed in version 0.9.9.6 @when("@0.9.9.6:0.9.9.8") diff --git a/var/spack/repos/builtin/packages/gmsh/package.py b/var/spack/repos/builtin/packages/gmsh/package.py index 7049cd2772..453ebf85ff 100644 --- a/var/spack/repos/builtin/packages/gmsh/package.py +++ b/var/spack/repos/builtin/packages/gmsh/package.py @@ -23,6 +23,7 @@ class Gmsh(CMakePackage): license("GPL-2.0-or-later") version("master", branch="master") + version("4.13.0", sha256="0208110adb1792d1c59dcbcbea5d5ecb1272dfef63f69ceedb91923c40e1a652") version("4.12.2", sha256="13e09d9ca8102e5c40171d6ee150c668742b98c3a6ca57f837f7b64e1e2af48f") version("4.12.0", sha256="2a6007872ba85abd9901914826f6986a2437ab7104f564ccefa1b7a3de742c17") version("4.10.3", sha256="a87d59ccea596d493d375b0d6bc380079a5e5a4baebf0d3383018b0cd6bd8e33") @@ -141,37 +142,37 @@ class Gmsh(CMakePackage): ] # Use system versions of contrib libraries, when possible: - if "+external" in spec: + if spec.satisfies("+external"): options.append(self.define("ENABLE_SYSTEM_CONTRIB", True)) # Make sure native file dialogs are used options.append("-DENABLE_NATIVE_FILE_CHOOSER=ON") - options.append("-DCMAKE_INSTALL_NAME_DIR:PATH=%s" % self.prefix.lib) + options.append(f"-DCMAKE_INSTALL_NAME_DIR:PATH={self.prefix.lib}") # Prevent GMsh from using its own strange directory structure on OSX options.append("-DENABLE_OS_SPECIFIC_INSTALL=OFF") # Make sure GMSH picks up correct BlasLapack by providing linker flags - if "~eigen" in spec: + if spec.satisfies("~eigen"): options.append("-DENABLE_BLAS_LAPACK=ON") blas_lapack = spec["lapack"].libs + spec["blas"].libs - options.append("-DBLAS_LAPACK_LIBRARIES={0}".format(blas_lapack.ld_flags)) + options.append(f"-DBLAS_LAPACK_LIBRARIES={blas_lapack.ld_flags}") - if "+oce" in spec: + if spec.satisfies("+oce"): options.append("-DENABLE_OCC=ON") - elif "+opencascade" in spec: + elif spec.satisfies("+opencascade"): options.append("-DENABLE_OCC=ON") else: options.append("-DENABLE_OCC=OFF") - if "@:3.0.6" in spec: + if spec.satisfies("@:3.0.6"): options.append(self.define_from_variant("ENABLE_TETGEN", "tetgen")) - if "@:4.6" in spec: + if spec.satisfies("@:4.6"): options.append(self.define_from_variant("ENABLE_MMG3D", "mmg")) - if "+shared" in spec: + if spec.satisfies("+shared"): # Builds dynamic executable and installs shared library options.append(self.define("ENABLE_BUILD_SHARED", True)) options.append(self.define("ENABLE_BUILD_DYNAMIC", True)) @@ -179,7 +180,7 @@ class Gmsh(CMakePackage): # Builds and installs static library options.append(self.define("ENABLE_BUILD_LIB", True)) - if "+compression" in spec: + if spec.satisfies("+compression"): options.append(self.define("ENABLE_COMPRESSED_IO", True)) return options diff --git a/var/spack/repos/builtin/packages/go-md2man/package.py b/var/spack/repos/builtin/packages/go-md2man/package.py index ba0eb166c5..48656e6810 100644 --- a/var/spack/repos/builtin/packages/go-md2man/package.py +++ b/var/spack/repos/builtin/packages/go-md2man/package.py @@ -14,6 +14,7 @@ class GoMd2man(GoPackage): license("MIT") + version("2.0.4", sha256="b0a4c7c077ede56967deef6ab7e7696c0f46124b0b3360fd05564ec5a536f11f") version("2.0.3", sha256="7ca3a04bb4ab83387538235decc42a535097a05d2fb9f2266d0c47b33119501f") version("2.0.2", sha256="2f52e37101ea2734b02f2b54a53c74305b95b3a9a27792fdac962b5354aa3e4a") version("1.0.10", sha256="76aa56849123b99b95fcea2b15502fd886dead9a5c35be7f78bdc2bad6be8d99") diff --git a/var/spack/repos/builtin/packages/haproxy/package.py b/var/spack/repos/builtin/packages/haproxy/package.py index b887c3d090..e682b9728f 100644 --- a/var/spack/repos/builtin/packages/haproxy/package.py +++ b/var/spack/repos/builtin/packages/haproxy/package.py @@ -15,6 +15,7 @@ class Haproxy(MakefilePackage): homepage = "https://www.haproxy.org" url = "https://www.haproxy.org/download/2.1/src/haproxy-2.1.0.tar.gz" + version("2.1.12", sha256="acebbf932f2703ee287d6e945bd845cde8c9db9a13f7cbb2a99671499c558056") version("2.1.1", sha256="57e75c1a380fc6f6aa7033f71384370899443c7f4e8a4ba289b5d4350bc76d1a") version("2.1.0", sha256="f268efb360a0e925137b4b8ed431f2f8f3b68327efb2c418b266e535d8e335a0") diff --git a/var/spack/repos/builtin/packages/harfbuzz/package.py b/var/spack/repos/builtin/packages/harfbuzz/package.py index e0b6e39141..08b76b3dce 100644 --- a/var/spack/repos/builtin/packages/harfbuzz/package.py +++ b/var/spack/repos/builtin/packages/harfbuzz/package.py @@ -20,6 +20,7 @@ class Harfbuzz(MesonPackage, AutotoolsPackage): license("MIT") + version("8.4.0", sha256="af4ea73e25ab748c8c063b78c2f88e48833db9b2ac369e29bd115702e789755e") version("8.3.0", sha256="109501eaeb8bde3eadb25fab4164e993fbace29c3d775bcaa1c1e58e2f15f847") version("7.3.0", sha256="20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb") version("7.2.0", sha256="fc5560c807eae0efd5f95b5aa4c65800c7a8eed6642008a6b1e7e3ffff7873cc") @@ -91,7 +92,7 @@ class Harfbuzz(MesonPackage, AutotoolsPackage): ) def url_for_version(self, version): - if version > Version("2.3.1"): + if self.spec.satisfies("@2.3.2:"): url = "https://github.com/harfbuzz/harfbuzz/releases/download/{0}/harfbuzz-{0}.tar.xz" else: url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-{0}.tar.bz2" diff --git a/var/spack/repos/builtin/packages/hpcc/package.py b/var/spack/repos/builtin/packages/hpcc/package.py index 56674ae0c5..6e89f61b8b 100644 --- a/var/spack/repos/builtin/packages/hpcc/package.py +++ b/var/spack/repos/builtin/packages/hpcc/package.py @@ -54,7 +54,7 @@ class Hpcc(MakefilePackage): depends_on("fftw@2+mpi", when="fft=fftw2") depends_on("mkl", when="fft=mkl") - arch = "{0}-{1}".format(platform.system(), platform.processor()) + arch = f"{platform.system()}-{platform.processor()}" config = { "@SHELL@": "/bin/sh", @@ -94,7 +94,7 @@ class Hpcc(MakefilePackage): """write make.arch file""" with working_dir("hpl"): # copy template make.arch file - make_arch_filename = "Make.{0}".format(self.arch) + make_arch_filename = f"Make.{self.arch}" copy(join_path("setup", "Make.UNKNOWN.in"), make_arch_filename) # fill template with values @@ -123,7 +123,7 @@ class Hpcc(MakefilePackage): and spec["fftw-api"].name in INTEL_MATH_LIBRARIES ): mklroot = env["MKLROOT"] - self.config["@LAINC@"] += " -I{0}".format(join_path(mklroot, "include/fftw")) + self.config["@LAINC@"] += f" -I{join_path(mklroot, 'include/fftw')}" libfftw2x_cdft = join_path( mklroot, "lib", "intel64", "libfftw2x_cdft_DOUBLE_ilp64.a" ) @@ -153,19 +153,19 @@ class Hpcc(MakefilePackage): self.config["@LALIB@"] = " ".join(lin_alg_libs) # Compilers / linkers - Optimization flags - self.config["@CC@"] = "{0}".format(spec["mpi"].mpicc) + self.config["@CC@"] = f"{spec['mpi'].mpicc}" # Compiler flags for CPU architecture optimizations if spec.satisfies("%intel"): # with intel-parallel-studio+mpi the '-march' arguments # are not passed to icc arch_opt = spec.architecture.target.optimization_flags(spec.compiler) - self.config["@CCFLAGS@"] = "-O3 -restrict -ansi-alias -ip {0}".format(arch_opt) + self.config["@CCFLAGS@"] = f"-O3 -restrict -ansi-alias -ip {arch_opt}" self.config["@CCNOOPT@"] = "-restrict" self._write_make_arch(spec, prefix) def build(self, spec, prefix): - make("arch={0}".format(self.arch)) + make(f"arch={self.arch}") def check(self): """Simple check that compiled binary is working: diff --git a/var/spack/repos/builtin/packages/httpd/package.py b/var/spack/repos/builtin/packages/httpd/package.py index 435c504b1a..ae7a78d0c7 100644 --- a/var/spack/repos/builtin/packages/httpd/package.py +++ b/var/spack/repos/builtin/packages/httpd/package.py @@ -15,6 +15,7 @@ class Httpd(AutotoolsPackage): license("Apache-2.0") + version("2.4.59", sha256="ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e321323") version("2.4.55", sha256="11d6ba19e36c0b93ca62e47e6ffc2d2f2884942694bce0f23f39c71bdc5f69ac") # https://nvd.nist.gov/vuln/detail/CVE-2022-31813 @@ -50,7 +51,7 @@ class Httpd(AutotoolsPackage): def configure_args(self): spec = self.spec config_args = [ - "--with-apr={0}".format(spec["apr"].prefix), - "--with-apr-util={0}".format(spec["apr-util"].prefix), + f"--with-apr={spec['apr'].prefix}", + f"--with-apr-util={spec['apr-util'].prefix}", ] return config_args diff --git a/var/spack/repos/builtin/packages/hydra/package.py b/var/spack/repos/builtin/packages/hydra/package.py index e02c54a110..87bf987b12 100644 --- a/var/spack/repos/builtin/packages/hydra/package.py +++ b/var/spack/repos/builtin/packages/hydra/package.py @@ -19,6 +19,7 @@ class Hydra(AutotoolsPackage): license("AGPL-3.0-or-later") + version("4.2.1", sha256="eb0f33f702aaf1ba54a4892a67b344cd815e0c51d1767327a675824490ab4b51") version("4.2.0", sha256="d7159353d9d0576effba632668a3e6defde2067530ac5db4bae0a85a23dfda5a") version("4.1.1", sha256="d4b915ccab426cd8368bbb2ee9d933fe07bea01493901fb56880b338a7f0b97e") version("3.2", sha256="f7a67ec91a773d95cbbd479a80e926d44bee1ff9fc70a8d1df075ea53ea33889") diff --git a/var/spack/repos/builtin/packages/imake/package.py b/var/spack/repos/builtin/packages/imake/package.py index f209554cd3..13a8437a50 100644 --- a/var/spack/repos/builtin/packages/imake/package.py +++ b/var/spack/repos/builtin/packages/imake/package.py @@ -14,6 +14,7 @@ class Imake(AutotoolsPackage, XorgPackage): license("custom") + version("1.0.10", sha256="9bbe76b6bb39caf34a437f50010f58a13d7dd6d512e00e765a2b7883e6ae613c") version("1.0.9", sha256="ca53ad18c683091490596d72fee8dbee4c6ddb7693709e25f26da140d29687c1") version("1.0.7", sha256="6bda266a07eb33445d513f1e3c82a61e4822ccb94d420643d58e1be5f881e5cb") @@ -24,5 +25,5 @@ class Imake(AutotoolsPackage, XorgPackage): def configure_args(self): args = [] cfgdir = self.spec["xorg-cf-files"].prefix.lib.X11.config - args.append("--with-config-dir={0}".format(cfgdir)) + args.append(f"--with-config-dir={cfgdir}") return args diff --git a/var/spack/repos/builtin/packages/itensor/package.py b/var/spack/repos/builtin/packages/itensor/package.py index 037050af2c..c60ec4c98e 100644 --- a/var/spack/repos/builtin/packages/itensor/package.py +++ b/var/spack/repos/builtin/packages/itensor/package.py @@ -17,6 +17,7 @@ class Itensor(MakefilePackage): license("Apache-2.0") + version("3.2.0", sha256="cb2b041514857639cf9e7c326bfeef152d45228b26243dbb9d1a0f82189f1014") version("3.1.11", sha256="bc6c48d34c4d4281d15116d7d95d7e6e2b6878b9a60ce33372b8967a96826e95") version("3.1.10", sha256="68c149e23a1ab936ef8175ea11fedc0ec64031c3686ede93c3a5ab0c893774f6") version("3.1.9", sha256="4dd71b251b63fb7775ef854212df6f1d5d3ac4d6d1905dc03b1e6d2a0a620a17") @@ -62,7 +63,7 @@ class Itensor(MakefilePackage): copy("options.mk.sample", mf) # 1.CCCOM - ccopts = "CCCOM={0}{1}".format(spack_cxx, self.getcopts(spec)) + ccopts = f"CCCOM={spack_cxx}{self.getcopts(spec)}" filter_file(r"^CCCOM.+", ccopts, mf) # 2.BLAS/LAPACK @@ -90,7 +91,7 @@ class Itensor(MakefilePackage): # 3.HDF5 if "+hdf5" in spec: - hdf5p = "HDF5_PREFIX={0}".format(spec["hdf5"].prefix.lib) + hdf5p = f"HDF5_PREFIX={spec['hdf5'].prefix.lib}" filter_file("^#HDF5.+", hdf5p, mf) # 4.openmp @@ -99,7 +100,7 @@ class Itensor(MakefilePackage): filter_file("-fopenmp", self.compiler.openmp_flag, mf) # 5.prefix - filter_file(r"^PREFIX.+", "PREFIX={0}".format(os.getcwd()), mf) + filter_file(r"^PREFIX.+", f"PREFIX={os.getcwd()}", mf) # 5.shared if "+shared" in spec: @@ -111,7 +112,7 @@ class Itensor(MakefilePackage): copy(mf, "options.mk.build") # 1.CCCOM - ccopts = "CCCOM={0}".format(self.compiler.cxx) + ccopts = f"CCCOM={self.compiler.cxx}" ccopts += " " + " ".join(spec.compiler_flags["cxxflags"]) if spec.satisfies("%fj"): ccopts += " " + env["FCC_ENV"] @@ -125,10 +126,10 @@ class Itensor(MakefilePackage): filter_file(r"^BLAS_LAPACK_LIBFLAGS=", vlib, mf) # 3.prefix - filter_file(r"^PREFIX.+", "PREFIX={0}".format(prefix), mf) + filter_file(r"^PREFIX.+", f"PREFIX={prefix}", mf) # tutorial/project_template/Makefile mf2 = join_path("tutorial", "project_template", "Makefile") - filter_file(r"^LIBRARY_DIR.+", "LIBRARY_DIR={0}".format(prefix), mf2) + filter_file(r"^LIBRARY_DIR.+", f"LIBRARY_DIR={prefix}", mf2) install_tree(".", prefix) diff --git a/var/spack/repos/builtin/packages/jellyfish/package.py b/var/spack/repos/builtin/packages/jellyfish/package.py index 6bd9df9924..d6c62be341 100644 --- a/var/spack/repos/builtin/packages/jellyfish/package.py +++ b/var/spack/repos/builtin/packages/jellyfish/package.py @@ -15,6 +15,7 @@ class Jellyfish(AutotoolsPackage): license("GPL-3.0-only") + version("2.3.1", sha256="ee032b57257948ca0f0610883099267572c91a635eecbd88ae5d8974c2430fcd") version("2.3.0", sha256="e195b7cf7ba42a90e5e112c0ed27894cd7ac864476dc5fb45ab169f5b930ea5a") version( "2.2.7", diff --git a/var/spack/repos/builtin/packages/kokkos-legacy/package.py b/var/spack/repos/builtin/packages/kokkos-legacy/package.py index 54548c0ae1..fb1a005a70 100644 --- a/var/spack/repos/builtin/packages/kokkos-legacy/package.py +++ b/var/spack/repos/builtin/packages/kokkos-legacy/package.py @@ -14,6 +14,8 @@ class KokkosLegacy(Package): url = "https://github.com/kokkos/kokkos/archive/2.03.00.tar.gz" git = "https://github.com/kokkos/kokkos.git" + # This package has been archived. All new versions of Kokkos should go into + # the kokkos package itself. version( "2.9.00", sha256="e0621197791ed3a381b4f02c78fa529f3cff3abb74d52157b4add17e8aa04bc4", @@ -197,7 +199,7 @@ class KokkosLegacy(Package): # without specifying CUDA for p in gpu_values: conflicts( - "gpu_arch={0}".format(p), + f"gpu_arch={p}", when="~cuda", msg="Must specify CUDA backend to use a GPU architecture.", ) @@ -235,7 +237,7 @@ class KokkosLegacy(Package): def install(self, spec, prefix): generate = which(join_path(self.stage.source_path, "generate_makefile.bash")) with working_dir("build", create=True): - g_args = ["--prefix=%s" % prefix, "--with-hwloc=%s" % spec["hwloc"].prefix] + g_args = [f"--prefix={prefix}", f"--with-hwloc={spec['hwloc'].prefix}"] arch_args = [] kokkos_options_args = [] cuda_options_args = [] @@ -247,7 +249,7 @@ class KokkosLegacy(Package): # C++ standard cxxstandard = spec.variants["cxxstd"].value if cxxstandard != "none": - g_args.append("--cxxstandard=%s" % cxxstandard) + g_args.append(f"--cxxstandard={cxxstandard}") # Build Debug if "+debug" in spec: @@ -261,9 +263,9 @@ class KokkosLegacy(Package): if "+pthreads" in spec: g_args.append("--with-pthread") if "+qthreads" in spec: - g_args.append("--with-qthreads=%s" % spec["qthreads"].prefix) + g_args.append(f"--with-qthreads={spec['qthreads'].prefix}") if "+cuda" in spec: - g_args.append("--with-cuda=%s" % spec["cuda"].prefix) + g_args.append(f"--with-cuda={spec['cuda'].prefix}") # Host architectures host_arch = spec.variants["host_arch"].value # GPU architectures @@ -274,7 +276,7 @@ class KokkosLegacy(Package): arch_args.append(gpu_arch) # Combined architecture flags if arch_args: - g_args.append("--arch={0}".format(",".join(arch_args))) + g_args.append(f"--arch={','.join(arch_args)}") # CUDA options if "+force_uvm" in spec: @@ -286,7 +288,7 @@ class KokkosLegacy(Package): if "+enable_lambda" in spec: cuda_options_args.append("enable_lambda") if cuda_options_args: - g_args.append("--with-cuda-options={0}".format(",".join(cuda_options_args))) + g_args.append(f"--with-cuda-options={','.join(cuda_options_args)}") # Kokkos options if "+aggressive_vectorization" in spec: @@ -304,7 +306,7 @@ class KokkosLegacy(Package): if "+enable_eti" in spec: kokkos_options_args.append("enable_eti") if kokkos_options_args: - g_args.append("--with-options={0}".format(",".join(kokkos_options_args))) + g_args.append(f"--with-options={','.join(kokkos_options_args)}") generate(*g_args) make() diff --git a/var/spack/repos/builtin/packages/krb5/package.py b/var/spack/repos/builtin/packages/krb5/package.py index d32f86991e..d53fdab882 100644 --- a/var/spack/repos/builtin/packages/krb5/package.py +++ b/var/spack/repos/builtin/packages/krb5/package.py @@ -18,6 +18,7 @@ class Krb5(AutotoolsPackage): license("MIT") + version("1.21.2", sha256="9560941a9d843c0243a71b17a7ac6fe31c7cebb5bce3983db79e52ae7e850491") version("1.20.1", sha256="704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851") version("1.19.4", sha256="41f5981c5a4de0a26b3937e679a116cd5b3739641fd253124aac91f7179b54eb") version("1.19.3", sha256="56d04863cfddc9d9eb7af17556e043e3537d41c6e545610778676cf551b9dcd0") @@ -73,19 +74,20 @@ class Krb5(AutotoolsPackage): ) def configure_args(self): + spec = self.spec args = ["--without-system-verto"] - if "~shared" in self.spec: + if spec.satisfies("~shared"): args.append("--enable-static") args.append("--disable-shared") else: args.append("--disable-static") # https://github.com/spack/spack/issues/34193 - if "%gcc@10:" in self.spec: + if spec.satisfies("%gcc@10:"): args.append("CFLAGS=-fcommon") - if self.spec["openssl"].satisfies("~shared"): + if spec["openssl"].satisfies("~shared"): pkgconf = which("pkg-config") ssllibs = pkgconf("--static", "--libs", "openssl", output=str) args.append(f"LDFLAGS={ssllibs}") diff --git a/var/spack/repos/builtin/packages/leptonica/package.py b/var/spack/repos/builtin/packages/leptonica/package.py index 2f941a289f..14e8e144f3 100644 --- a/var/spack/repos/builtin/packages/leptonica/package.py +++ b/var/spack/repos/builtin/packages/leptonica/package.py @@ -15,6 +15,7 @@ class Leptonica(CMakePackage): license("custom") + version("1.84.1", sha256="ecd7a868403b3963c4e33623595d77f2c87667e2cfdd9b370f87729192061bef") version("1.83.1", sha256="4289d0a4224b614010072253531c0455a33a4d7c7a0017fe7825ed382290c0da") version("1.81.0", sha256="70ebc04ff8b9684205bd1d01843c635a8521255b74813bf7cce9a33368f7952c") version("1.80.0", sha256="3952b974ec057d24267aae48c54bca68ead8275604bf084a73a4b953ff79196e") @@ -30,6 +31,6 @@ class Leptonica(CMakePackage): depends_on("openjpeg") def cmake_args(self): - args = ["-DBUILD_SHARED_LIBS=ON"] + args = [self.define("BUILD_SHARED_LIBS", "ON")] return args diff --git a/var/spack/repos/builtin/packages/libatomic-ops/package.py b/var/spack/repos/builtin/packages/libatomic-ops/package.py index f03e958862..824ab870a9 100644 --- a/var/spack/repos/builtin/packages/libatomic-ops/package.py +++ b/var/spack/repos/builtin/packages/libatomic-ops/package.py @@ -15,6 +15,7 @@ class LibatomicOps(AutotoolsPackage): license("GPL-2.0-only") + version("7.8.2", sha256="d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51") version("7.8.0", sha256="15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31") version("7.6.14", sha256="390f244d424714735b7050d056567615b3b8f29008a663c262fb548f1802d292") version("7.6.12", sha256="f0ab566e25fce08b560e1feab6a3db01db4a38e5bc687804334ef3920c549f3e") diff --git a/var/spack/repos/builtin/packages/libharu/package.py b/var/spack/repos/builtin/packages/libharu/package.py index baebd257b7..d0706935ae 100644 --- a/var/spack/repos/builtin/packages/libharu/package.py +++ b/var/spack/repos/builtin/packages/libharu/package.py @@ -41,8 +41,8 @@ class Libharu(AutotoolsPackage): spec = self.spec args = [] - args.append("--with-zlib={0}".format(spec["zlib-api"].prefix)) - args.append("--with-png={0}".format(spec["libpng"].prefix)) + args.append(f"--with-zlib={spec['zlib-api'].prefix}") + args.append(f"--with-png={spec['libpng'].prefix}") return args diff --git a/var/spack/repos/builtin/packages/libical/package.py b/var/spack/repos/builtin/packages/libical/package.py index f75326a9a6..12000ad630 100644 --- a/var/spack/repos/builtin/packages/libical/package.py +++ b/var/spack/repos/builtin/packages/libical/package.py @@ -14,6 +14,7 @@ class Libical(CMakePackage): license("LGPL-2.1-only OR MPL-2.0") + version("3.0.18", sha256="72b7dc1a5937533aee5a2baefc990983b66b141dd80d43b51f80aced4aae219c") version("3.0.17", sha256="bcda9a6db6870240328752854d1ea475af9bbc6356e6771018200e475e5f781b") version("3.0.11", sha256="1e6c5e10c5a48f7a40c68958055f0e2759d9ab3563aca17273fe35a5df7dbbf1") version("3.0.8", sha256="09fecacaf75ba5a242159e3a9758a5446b5ce4d0ab684f98a7040864e1d1286f") @@ -26,4 +27,4 @@ class Libical(CMakePackage): depends_on("libxml2@2.7.3:") def cmake_args(self): - return ["-DENABLE_GTK_DOC=OFF"] + return [self.define("ENABLE_GTK_DOC", "OFF")] diff --git a/var/spack/repos/builtin/packages/libisal/package.py b/var/spack/repos/builtin/packages/libisal/package.py index e812129e6e..1c978931a3 100644 --- a/var/spack/repos/builtin/packages/libisal/package.py +++ b/var/spack/repos/builtin/packages/libisal/package.py @@ -15,6 +15,7 @@ class Libisal(AutotoolsPackage): license("BSD-3-Clause") + version("2.31.0", sha256="e218b7b2e241cfb8e8b68f54a6e5eed80968cc387c4b1af03708b54e9fb236f1") version("2.29.0", sha256="832d9747ef3f0c8c05d39e3d7fd6ee5299a844e1ee7382fc8c8b52a268f36eda") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/libnet/package.py b/var/spack/repos/builtin/packages/libnet/package.py index 99a3d4c3db..6d2699197b 100644 --- a/var/spack/repos/builtin/packages/libnet/package.py +++ b/var/spack/repos/builtin/packages/libnet/package.py @@ -16,6 +16,7 @@ class Libnet(AutotoolsPackage): license("BSD-2-Clause") + version("1.3", sha256="44e28a4e5a9256ce74d96fd1ad8ac2e3f300f55dc70c93bb81851183a21d7d3a") version("1.2", sha256="b7a371a337d242c017f3471d70bea2963596bec5bd3bd0e33e8517550e2311ef") depends_on("autoconf", type="build") diff --git a/var/spack/repos/builtin/packages/libpmemobj-cpp/package.py b/var/spack/repos/builtin/packages/libpmemobj-cpp/package.py index d4e43270ca..6703c08e86 100644 --- a/var/spack/repos/builtin/packages/libpmemobj-cpp/package.py +++ b/var/spack/repos/builtin/packages/libpmemobj-cpp/package.py @@ -14,6 +14,7 @@ class LibpmemobjCpp(CMakePackage): git = "https://github.com/pmem/libpmemobj-cpp.git" version("develop", branch="master") + version("1.13.0", sha256="1fd204303b86ff9974e39d6cdb4037556402df981bebcc824a9125e12bf48c80") version("1.12", sha256="5a7e082a862affbd87ff174b790be7db77f7d85d4c583acc34011f1104bc54a9") version("1.11", sha256="2818f3ce23c861222d2765c377e6d4ccf8a2e2f66e4d23e4e2c35f4246f4a403") version("1.10", sha256="bba31d9a1c21b38c20cbe2d2b152effef7e2debfa89a87e0c32de616c31d9191") diff --git a/var/spack/repos/builtin/packages/librsvg/package.py b/var/spack/repos/builtin/packages/librsvg/package.py index 93ec2e7146..29b6193392 100644 --- a/var/spack/repos/builtin/packages/librsvg/package.py +++ b/var/spack/repos/builtin/packages/librsvg/package.py @@ -18,6 +18,7 @@ class Librsvg(AutotoolsPackage): version("2.51.0", sha256="89d32e38445025e1b1d9af3dd9d3aeb9f6fce527aeecbecf38b369b34c80c038") version("2.50.2", sha256="6211f271ce4cd44a7318190d36712e9cea384a933d3e3570004edeb210a056d3") version("2.50.0", sha256="b3fadba240f09b9c9898ab20cb7311467243e607cf8f928b7c5f842474ee3df4") + version("2.44.17", sha256="91bea64669203c677d5efbe21175aabbadf36754c7e7a1d1dc016dff4425273b") version("2.44.14", sha256="6a85a7868639cdd4aa064245cc8e9d864dad8b8e9a4a8031bb09a4796bc4e303") version("2.40.21", sha256="f7628905f1cada84e87e2b14883ed57d8094dca3281d5bcb24ece4279e9a92ba") diff --git a/var/spack/repos/builtin/packages/libuv/package.py b/var/spack/repos/builtin/packages/libuv/package.py index a994fbc3e7..9b6d31c9a1 100644 --- a/var/spack/repos/builtin/packages/libuv/package.py +++ b/var/spack/repos/builtin/packages/libuv/package.py @@ -15,6 +15,7 @@ class Libuv(AutotoolsPackage): license("MIT") + version("1.48.0", sha256="c593139feb9061699fdd2f7fde47bb6c1ca77761ae9ec04f052083f1ef46c13b") version("1.46.0", sha256="94f101111ef3209340d7f09c2aa150ddb4feabd2f9d87d47d9f5bded835b8094") version("1.45.0", sha256="3793d8c0d6fa587721d010d0555b7e82443fd4e8b3c91e529eb6607592f52b87") version("1.44.2", sha256="8ff28f6ac0d6d2a31d2eeca36aff3d7806706c7d3f5971f5ee013ddb0bdd2e9e") @@ -32,7 +33,7 @@ class Libuv(AutotoolsPackage): version("1.9.0", sha256="d595b2725abcce851c76239aab038adc126c58714cfb572b2ebb2d21b3593842") def url_for_version(self, version): - if version < Version("1.44.0"): + if self.spec.satisfies("@:1.43"): url = "https://dist.libuv.org/dist/v{0}/libuv-v{0}.tar.gz" else: # From 1.44 on, the `-dist` download includes a configure script diff --git a/var/spack/repos/builtin/packages/linux-headers/package.py b/var/spack/repos/builtin/packages/linux-headers/package.py index 703e783352..d45c123f94 100644 --- a/var/spack/repos/builtin/packages/linux-headers/package.py +++ b/var/spack/repos/builtin/packages/linux-headers/package.py @@ -18,6 +18,7 @@ class LinuxHeaders(Package): license("GPL-2.0-only") + version("6.8.9", sha256="f905f1238ea7a8e85314bacf283302e8097006010d25fcea726d0de0ea5bc9b6") version("6.5.2", sha256="2027e14057d568ad3ddc100dadf4c8853a49b031270478a61d88f6011572650f") version("6.2.8", sha256="fed0ad87d42f83a70ce019ff2800bc30a855e672e72bf6d54a014d98d344f665") version("4.9.10", sha256="bd6e05476fd8d9ea4945e11598d87bc97806bbc8d03556abbaaf809707661525") diff --git a/var/spack/repos/builtin/packages/lucene/package.py b/var/spack/repos/builtin/packages/lucene/package.py index 04991b6b8f..784084835b 100644 --- a/var/spack/repos/builtin/packages/lucene/package.py +++ b/var/spack/repos/builtin/packages/lucene/package.py @@ -19,6 +19,7 @@ class Lucene(Package): license("BSD-2-Clause") + version("9.10.0", sha256="c57b75ee0ea12b54337967b7854ebd12af3d7bad27245c1dc12a167ce2b1f8a7") version("9.5.0", sha256="547277a2b6ce283422eccd14e9ee7ffb28b1af3975936959716c9b4d85843555") version("8.3.1", sha256="acd61ad458d16f3c98b9dd4653c6a34dd666a965842e461f7cdf8947fa041e1a") version("8.3.0", sha256="67c4f8081f24ff9f4eb4f2b999ac19f7a639b416e5b6f1c1c74e0524a481fc7e") diff --git a/var/spack/repos/builtin/packages/makedepend/package.py b/var/spack/repos/builtin/packages/makedepend/package.py index ec6fc74c2a..b1eecff632 100644 --- a/var/spack/repos/builtin/packages/makedepend/package.py +++ b/var/spack/repos/builtin/packages/makedepend/package.py @@ -14,6 +14,7 @@ class Makedepend(AutotoolsPackage, XorgPackage): license("MIT-open-group") + version("1.0.9", sha256="bc94ffda6cd4671603a69c39dbe8f96b317707b9185b2aaa3b54b5d134b41884") version("1.0.8", sha256="275f0d2b196bfdc740aab9f02bb48cb7a97e4dfea011a7b468ed5648d0019e54") version("1.0.5", sha256="503903d41fb5badb73cb70d7b3740c8b30fe1cc68c504d3b6a85e6644c4e5004") diff --git a/var/spack/repos/builtin/packages/mc/package.py b/var/spack/repos/builtin/packages/mc/package.py index 890efee8c5..01429c3d75 100644 --- a/var/spack/repos/builtin/packages/mc/package.py +++ b/var/spack/repos/builtin/packages/mc/package.py @@ -14,6 +14,7 @@ class Mc(AutotoolsPackage): license("GPL-3.0-or-later") + version("4.8.31", sha256="f42f4114ed42f6cf9995f1d896fa6c797ccb36dac57760dda8dd9f78ac462841") version("4.8.28", sha256="6bb47533d7a55bb21e46292d2f94786c9037bd7a70bf02b6a3c48adb0c9ce20c") version("4.8.26", sha256="9d6358d0a351a455a1410aab57f33b6b48b0fcf31344b9a10b0ff497595979d1") version("4.8.23", sha256="238c4552545dcf3065359bd50753abbb150c1b22ec5a36eaa02c82808293267d") @@ -33,7 +34,7 @@ class Mc(AutotoolsPackage): def configure_args(self): args = [ - "CFLAGS={0}".format(self.compiler.c99_flag), + f"CFLAGS={self.compiler.c99_flag}", "--disable-debug", "--disable-dependency-tracking", "--disable-silent-rules", diff --git a/var/spack/repos/builtin/packages/msgpack-c/package.py b/var/spack/repos/builtin/packages/msgpack-c/package.py index f8a041fbc7..b297eb7d1f 100644 --- a/var/spack/repos/builtin/packages/msgpack-c/package.py +++ b/var/spack/repos/builtin/packages/msgpack-c/package.py @@ -23,8 +23,8 @@ class MsgpackC(CMakePackage): def cmake_args(self): args = [ - "-DCMAKE_CXX_FLAGS=-Wno-implicit-fallthrough", - "-DCMAKE_C_FLAGS=-Wno-implicit-fallthrough", + self.define("CMAKE_CXX_FLAGS", "-Wno-implicit-fallthrough"), + self.define("CMAKE_C_FLAGS", "-Wno-implicit-fallthrough"), self.define("MSGPACK_BUILD_TESTS", self.run_tests), ] return args diff --git a/var/spack/repos/builtin/packages/nco/package.py b/var/spack/repos/builtin/packages/nco/package.py index 2f84bb1a30..72e1fcf96f 100644 --- a/var/spack/repos/builtin/packages/nco/package.py +++ b/var/spack/repos/builtin/packages/nco/package.py @@ -15,6 +15,7 @@ class Nco(AutotoolsPackage): license("BSD-3-Clause") + version("5.2.4", sha256="44efa9151825487fa0562fa5c6d68837624059a8e2da9d15c83ceb4d498f7902") version("5.1.9", sha256="9cd90345c1e3860a690b53fd6c08b721d631a646d169431927884c99841c34e9") version("5.1.8", sha256="f22c63a3cbe1947fbf06160a6ed7b6d1934aa242fbe3feeb8d1964eef266b7d5") version("5.1.7", sha256="2b068558a605e30a465870166747e1d37726849814a5cfe41a000764b30e2ba1") @@ -60,7 +61,7 @@ class Nco(AutotoolsPackage): def configure_args(self): spec = self.spec - return ["--{0}-doc".format("enable" if "+doc" in spec else "disable")] + return [f"--{'enable' if '+doc' in spec else 'disable'}-doc"] def setup_build_environment(self, env): spec = self.spec diff --git a/var/spack/repos/builtin/packages/nginx/package.py b/var/spack/repos/builtin/packages/nginx/package.py index 2f41d3e199..55af399eb1 100644 --- a/var/spack/repos/builtin/packages/nginx/package.py +++ b/var/spack/repos/builtin/packages/nginx/package.py @@ -16,6 +16,7 @@ class Nginx(AutotoolsPackage): license("BSD-2-Clause") + version("1.26.0", sha256="d2e6c8439d6c6db5015d8eaab2470ab52aef85a7bf363182879977e084370497") version("1.24.0", sha256="77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d") version("1.23.4", sha256="d43300e36bb249a7e6edc60bca1b0fc372a0bafce2f346d76acfb677a8790fc0") version("1.23.3", sha256="75cb5787dbb9fae18b14810f91cc4343f64ce4c24e27302136fb52498042ba54") diff --git a/var/spack/repos/builtin/packages/ninja-fortran/package.py b/var/spack/repos/builtin/packages/ninja-fortran/package.py index 9cc2cbeb41..02daabf9da 100644 --- a/var/spack/repos/builtin/packages/ninja-fortran/package.py +++ b/var/spack/repos/builtin/packages/ninja-fortran/package.py @@ -76,7 +76,7 @@ class NinjaFortran(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/oniguruma/package.py b/var/spack/repos/builtin/packages/oniguruma/package.py index de5be77f75..784e28b8b4 100644 --- a/var/spack/repos/builtin/packages/oniguruma/package.py +++ b/var/spack/repos/builtin/packages/oniguruma/package.py @@ -14,6 +14,7 @@ class Oniguruma(AutotoolsPackage): license("BSD-2-Clause") + version("6.9.9", sha256="60162bd3b9fc6f4886d4c7a07925ffd374167732f55dce8c491bfd9cd818a6cf") version("6.9.8", sha256="28cd62c1464623c7910565fb1ccaaa0104b2fe8b12bcd646e81f73b47535213e") version("6.9.4", sha256="4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f0e6d53") version("6.1.3", sha256="480c850cd7c7f2fcaad0942b4a488e2af01fbb8e65375d34908f558b432725cf") diff --git a/var/spack/repos/builtin/packages/openipmi/package.py b/var/spack/repos/builtin/packages/openipmi/package.py index 7f4aea4d7e..b70d0aa9e1 100644 --- a/var/spack/repos/builtin/packages/openipmi/package.py +++ b/var/spack/repos/builtin/packages/openipmi/package.py @@ -14,6 +14,7 @@ class Openipmi(AutotoolsPackage): homepage = "https://sourceforge.net/projects/openipmi/" url = "https://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/OpenIPMI-2.0.29.tar.gz" + version("2.0.35", sha256="b059114f6299d73f04ff6e76a0857a0ab81aa362dee99644d256b223872437ad") version("2.0.29", sha256="2244124579afb14e569f34393e9ac61e658a28b6ffa8e5c0d2c1c12a8ce695cd") version("2.0.28", sha256="8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996") version("2.0.27", sha256="f3b1fafaaec2e2bac32fec5a86941ad8b8cb64543470bd6d819d7b166713d20b") diff --git a/var/spack/repos/builtin/packages/openmm/package.py b/var/spack/repos/builtin/packages/openmm/package.py index 1d9f96ffab..6412fab474 100644 --- a/var/spack/repos/builtin/packages/openmm/package.py +++ b/var/spack/repos/builtin/packages/openmm/package.py @@ -17,6 +17,7 @@ class Openmm(CMakePackage, CudaPackage): homepage = "https://openmm.org/" url = "https://github.com/openmm/openmm/archive/7.4.1.tar.gz" + version("8.1.1", sha256="347ad9f04dd88a673f7871127d9f23a75caf2c1a460a3f21f3328a24dc6547d0") version("8.0.0", sha256="dc63d7b47c8bb7b169c409cfd63d909ed0ce1ae114d37c627bf7a4231acf488e") version("7.7.0", sha256="51970779b8dc639ea192e9c61c67f70189aa294575acb915e14be1670a586c25") version("7.6.0", sha256="5a99c491ded9ba83ecc3fb1d8d22fca550f45da92e14f64f25378fda0048a89d") @@ -49,7 +50,7 @@ class Openmm(CMakePackage, CudaPackage): ) def patch(self): - install_string = 'set(PYTHON_SETUP_COMMAND "install ' '--prefix={0}")'.format(self.prefix) + install_string = f'set(PYTHON_SETUP_COMMAND "install --prefix={self.prefix}")' filter_file( r"set\(PYTHON_SETUP_COMMAND \"install.*", diff --git a/var/spack/repos/builtin/packages/opus/package.py b/var/spack/repos/builtin/packages/opus/package.py index 2b5531566e..f839f67202 100644 --- a/var/spack/repos/builtin/packages/opus/package.py +++ b/var/spack/repos/builtin/packages/opus/package.py @@ -14,6 +14,7 @@ class Opus(AutotoolsPackage): license("BSD-3-Clause") + version("1.5.2", sha256="65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1") version("1.5.1", sha256="b84610959b8d417b611aa12a22565e0a3732097c6389d19098d844543e340f85") version("1.5", sha256="d8230bbeb99e6d558645aaad25d79de8f4f28fdcc55f8af230050586d62c4f2c") version("1.4", sha256="c9b32b4253be5ae63d1ff16eea06b94b5f0f2951b7a02aceef58e3a3ce49c51f") diff --git a/var/spack/repos/builtin/packages/pcl/package.py b/var/spack/repos/builtin/packages/pcl/package.py index f0df251e5f..e6a720a178 100644 --- a/var/spack/repos/builtin/packages/pcl/package.py +++ b/var/spack/repos/builtin/packages/pcl/package.py @@ -16,6 +16,7 @@ class Pcl(CMakePackage): license("BSD-3-Clause") + version("1.14.1", sha256="cc3dc26a9ea176cb588fb1f182324399dbaf11e5ba1bea95c7d39005b7a5d352") version("1.13.1", sha256="be4d499c066203a3c296e2f7e823d6209be5983415f2279310ed1c9abb361d30") version("1.13.0", sha256="bd110789f6a7416ed1c58da302afbdb80f8d297a9e23cc02fd78ab78b4762698") version("1.12.1", sha256="a9573efad5e024c02f2cc9180bb8f82605c3772c62463efbe25c5d6e634b91dc") diff --git a/var/spack/repos/builtin/packages/perl-bignum/package.py b/var/spack/repos/builtin/packages/perl-bignum/package.py index 828fc8578b..3ddd4e8ec8 100644 --- a/var/spack/repos/builtin/packages/perl-bignum/package.py +++ b/var/spack/repos/builtin/packages/perl-bignum/package.py @@ -12,6 +12,7 @@ class PerlBignum(PerlPackage): homepage = "https://github.com/pjacklam/p5-bignum" url = "https://cpan.metacpan.org/authors/id/P/PJ/PJACKLAM/bignum-0.66.tar.gz" + version("0.67", sha256="1c9a824ab323e3e58d9808011c10ad27589dba1202806278215012ca7f522875") version("0.66", sha256="26d48fb4b63a4b738ab84b577f9de7cdec164fe5f8a7089010a1ec17e127ed97") depends_on("perl@5.6.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-db-file/package.py b/var/spack/repos/builtin/packages/perl-db-file/package.py index c28ff8ad00..6efe63ec0b 100644 --- a/var/spack/repos/builtin/packages/perl-db-file/package.py +++ b/var/spack/repos/builtin/packages/perl-db-file/package.py @@ -17,6 +17,7 @@ class PerlDbFile(PerlPackage): homepage = "https://metacpan.org/pod/DB_File" url = "https://cpan.metacpan.org/authors/id/P/PM/PMQS/DB_File-1.840.tar.gz" + version("1.859", sha256="5674e0d2cd0b060c4d1253670ea022c64d842a55257f9eb8edb19c0f53e2565c") version("1.858", sha256="ceb7a2868bd71f87b31e8b7c38d6f8cc0a31fb0322a377ee448994f094d0a7f6") version("1.840", sha256="b7864707fad0f2d1488c748c4fa08f1fb8bcfd3da247c36909fd42f20bfab2c4") diff --git a/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py b/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py index 36f8bfce69..d7fc41403a 100644 --- a/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py +++ b/var/spack/repos/builtin/packages/perl-dbd-sqlite/package.py @@ -14,6 +14,7 @@ class PerlDbdSqlite(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.74", sha256="8994997d84b9feb4547795f78746c661fb72e3cb6a25dbdd789b731f5688a4dd") version("1.72", sha256="5ca41e61eb52b52bd862a3088b912a75fe70910ac789b9a9983e0a449e94f551") version("1.59_01", sha256="b6f331e4054688572c2010e72c355f7ba3f30d86051e50d9925d34d9df1001e2") version("1.58", sha256="7120dd99d0338dea2802fda8bfe3fbf10077d5af559f6c67ae35e9270d1a1d3b") diff --git a/var/spack/repos/builtin/packages/perl-devel-cover/package.py b/var/spack/repos/builtin/packages/perl-devel-cover/package.py index 0734d38345..dd5704ffd3 100644 --- a/var/spack/repos/builtin/packages/perl-devel-cover/package.py +++ b/var/spack/repos/builtin/packages/perl-devel-cover/package.py @@ -14,4 +14,5 @@ class PerlDevelCover(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.42", sha256="cb9c45dee359f3d259856450389df270e2ecea1b49f5f8800fdb972ff50bbebb") version("1.40", sha256="26e2f431fbcf7bff3851f352f83b84067c09ff206f40ab975cad8d2bafe711a8") diff --git a/var/spack/repos/builtin/packages/perl-gd/package.py b/var/spack/repos/builtin/packages/perl-gd/package.py index be7651d7ae..0bb317073f 100644 --- a/var/spack/repos/builtin/packages/perl-gd/package.py +++ b/var/spack/repos/builtin/packages/perl-gd/package.py @@ -14,6 +14,7 @@ class PerlGd(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("2.81", sha256="21df5d9c5ced9971f661a69d1c80312bc59d27afdba17a242ac2e8c870b635d5") version("2.77", sha256="b56c88b8ef3be016ce29bb62dd1f1b6f6b5fbcaa57fea59e9468af6901016fb5") version("2.53", sha256="d05d01fe95e581adb3468cf05ab5d405db7497c0fb3ec7ecf23d023705fab7aa") diff --git a/var/spack/repos/builtin/packages/perl-html-tagset/package.py b/var/spack/repos/builtin/packages/perl-html-tagset/package.py index c9061bc57e..38dbf56dcb 100644 --- a/var/spack/repos/builtin/packages/perl-html-tagset/package.py +++ b/var/spack/repos/builtin/packages/perl-html-tagset/package.py @@ -14,4 +14,5 @@ class PerlHtmlTagset(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("3.24", sha256="eb89e145a608ed1f8f141a57472ee5f69e67592a432dcd2e8b1dbb445f2b230b") version("3.20", sha256="adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2") diff --git a/var/spack/repos/builtin/packages/perl-http-message/package.py b/var/spack/repos/builtin/packages/perl-http-message/package.py index 202080cd03..e548cd55ea 100644 --- a/var/spack/repos/builtin/packages/perl-http-message/package.py +++ b/var/spack/repos/builtin/packages/perl-http-message/package.py @@ -14,6 +14,7 @@ class PerlHttpMessage(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("6.45", sha256="01cb8406612a3f738842d1e97313ae4d874870d1b8d6d66331f16000943d4cbe") version("6.44", sha256="398b647bf45aa972f432ec0111f6617742ba32fc773c6612d21f64ab4eacbca1") version("6.13", sha256="f25f38428de851e5661e72f124476494852eb30812358b07f1c3a289f6f5eded") diff --git a/var/spack/repos/builtin/packages/perl-ipc-run/package.py b/var/spack/repos/builtin/packages/perl-ipc-run/package.py index c951d3b315..b7256ba707 100644 --- a/var/spack/repos/builtin/packages/perl-ipc-run/package.py +++ b/var/spack/repos/builtin/packages/perl-ipc-run/package.py @@ -18,6 +18,9 @@ class PerlIpcRun(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") version( + "20231003.0", sha256="eb25bbdf5913d291797ef1bfe998f15130b455d3ed02aacde6856f0b25e4fe57" + ) + version( "20220807.0", sha256="277d781dbbc98af18e979c7ef36f222513d7361742c52507c3348b265f6f5e69" ) version( diff --git a/var/spack/repos/builtin/packages/perl-mce/package.py b/var/spack/repos/builtin/packages/perl-mce/package.py index 7ca21f4107..ca6497a2da 100644 --- a/var/spack/repos/builtin/packages/perl-mce/package.py +++ b/var/spack/repos/builtin/packages/perl-mce/package.py @@ -21,5 +21,6 @@ class PerlMce(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("1.889", sha256="db6153e474d046fc253050bf53c54002d84cd4ca77d21c2b9df56feeb809bbed") version("1.884", sha256="c830c0e548094f19c620049e744258be2c121d4a86cf7c94a37599ad016daf33") version("1.874", sha256="d809e3018475115ad7eccb8bef49bde3bf3e75abbbcd80564728bbcfab86d3d0") diff --git a/var/spack/repos/builtin/packages/perl-module-build-tiny/package.py b/var/spack/repos/builtin/packages/perl-module-build-tiny/package.py index e7475e213b..333c7448ef 100644 --- a/var/spack/repos/builtin/packages/perl-module-build-tiny/package.py +++ b/var/spack/repos/builtin/packages/perl-module-build-tiny/package.py @@ -14,6 +14,7 @@ class PerlModuleBuildTiny(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.048", sha256="79a73e506fb7badabdf79137a45c6c5027daaf6f9ac3dcfb9d4ffcce92eb36bd") version("0.044", sha256="cb053a3049cb717dbf4fd7f3c7ab7c0cb1015b22e2d93f38b1ffc47c078322fd") version("0.039", sha256="7d580ff6ace0cbe555bf36b86dc8ea232581530cbeaaea09bccb57b55797f11c") diff --git a/var/spack/repos/builtin/packages/perl-perl-version/package.py b/var/spack/repos/builtin/packages/perl-perl-version/package.py index f81f02b846..c65fe2763b 100644 --- a/var/spack/repos/builtin/packages/perl-perl-version/package.py +++ b/var/spack/repos/builtin/packages/perl-perl-version/package.py @@ -12,6 +12,7 @@ class PerlPerlVersion(PerlPackage): homepage = "https://metacpan.org/pod/Perl::Version" url = "http://search.cpan.org/CPAN/authors/id/B/BD/BDFOY/Perl-Version-1.013_03.tar.gz" + version("1.017", sha256="3d85283bc5411af0f71fd75284a0b2e1ff3a7ec13f16464046f1fd77aa8647e4") version("1.013_03", sha256="6b5978f598dcdf8a304500c1b7bcdce967ca05e7b38673cebfdb4237531c2ff9") depends_on("perl-file-slurp-tiny", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/perl-sub-name/package.py b/var/spack/repos/builtin/packages/perl-sub-name/package.py index db7125162b..95cd7be1ab 100644 --- a/var/spack/repos/builtin/packages/perl-sub-name/package.py +++ b/var/spack/repos/builtin/packages/perl-sub-name/package.py @@ -14,5 +14,6 @@ class PerlSubName(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.27", sha256="ecf36fba1c47ca93e1daa394968ed39c4186867459d9cd173c421e2b972043e8") version("0.26", sha256="2d2f2d697d516c89547e7c4307f1e79441641cae2c7395e7319b306d390df105") version("0.21", sha256="bd32e9dee07047c10ae474c9f17d458b6e9885a6db69474c7a494ccc34c27117") diff --git a/var/spack/repos/builtin/packages/perl-test-differences/package.py b/var/spack/repos/builtin/packages/perl-test-differences/package.py index 177aece837..6c3d2d5b93 100644 --- a/var/spack/repos/builtin/packages/perl-test-differences/package.py +++ b/var/spack/repos/builtin/packages/perl-test-differences/package.py @@ -14,6 +14,7 @@ class PerlTestDifferences(PerlPackage): license("GPL-1.0-or-later OR Artistic-1.0-Perl") + version("0.71", sha256="cac16a56cd843b0809e5b49199d60d75a8dbad7ca9a08380dbf3f5cc3aaa38d9") version("0.69", sha256="18f644fdd4a1fef93ef3f7f67df8e95b593d811899f34bcbbaba4d717222f58f") version("0.64", sha256="9f459dd9c2302a0a73e2f5528a0ce7d09d6766f073187ae2c69e603adf2eb276") diff --git a/var/spack/repos/builtin/packages/pestpp/package.py b/var/spack/repos/builtin/packages/pestpp/package.py index 9f9f4786c7..e99dba98de 100644 --- a/var/spack/repos/builtin/packages/pestpp/package.py +++ b/var/spack/repos/builtin/packages/pestpp/package.py @@ -16,6 +16,7 @@ class Pestpp(CMakePackage): homepage = "https://pesthomepage.org" url = "https://github.com/usgs/pestpp/archive/5.0.5.tar.gz" + version("5.2.9", sha256="401db5eec509c6771cd509a43c1710ac76b1ebe533f4cbaa1df26375aa167e60") version("5.2.3", sha256="6b86a7db863a034e730480046a4b7b4a8dc7cc798658a5404a961be379c05dc3") version("5.0.5", sha256="b9695724758f69c1199371608b01419973bd1475b1788039a2fab6313f6ed67c") diff --git a/var/spack/repos/builtin/packages/phylobayesmpi/package.py b/var/spack/repos/builtin/packages/phylobayesmpi/package.py index dadbb37a42..1ff3894d8b 100644 --- a/var/spack/repos/builtin/packages/phylobayesmpi/package.py +++ b/var/spack/repos/builtin/packages/phylobayesmpi/package.py @@ -15,6 +15,7 @@ class Phylobayesmpi(MakefilePackage): license("GPL-2.0-only") + version("1.9", sha256="567d8db995f23b2b0109c1e6088a7e5621e38fec91d6b2f27abd886b90ea31ce") version("1.8b", sha256="7ff017bf492c1d8b42bfff3ee8e998ba1c50f4e4b3d9d6125647b91738017324") depends_on("mpi") diff --git a/var/spack/repos/builtin/packages/pkgconf/package.py b/var/spack/repos/builtin/packages/pkgconf/package.py index 302c75bf83..3447a6bfd4 100644 --- a/var/spack/repos/builtin/packages/pkgconf/package.py +++ b/var/spack/repos/builtin/packages/pkgconf/package.py @@ -72,5 +72,5 @@ class Pkgconf(AutotoolsPackage): @run_after("install") def link_pkg_config(self): - symlink("pkgconf", "{0}/pkg-config".format(self.prefix.bin)) - symlink("pkgconf.1", "{0}/pkg-config.1".format(self.prefix.share.man.man1)) + symlink("pkgconf", f"{self.prefix.bin}/pkg-config") + symlink("pkgconf.1", f"{self.prefix.share.man.man1}/pkg-config.1") diff --git a/var/spack/repos/builtin/packages/predixy/package.py b/var/spack/repos/builtin/packages/predixy/package.py index 4b62b48698..834cdf2b52 100644 --- a/var/spack/repos/builtin/packages/predixy/package.py +++ b/var/spack/repos/builtin/packages/predixy/package.py @@ -15,6 +15,7 @@ class Predixy(MakefilePackage): license("BSD-3-Clause") + # Predixy is no longer open source starting with @7: releases. version("1.0.5", sha256="0670d0b80f991b415a6dc6df107e5f223e3b41dc5d6b18bf73e26578178dd9e0") version("1.0.4", sha256="30a7dd44ce507a7a2f8a570c59c9133df239a7f8bad14ef1b97df92b2ee96d40") version("1.0.3", sha256="d815d0ffcd33b16bfee76fe5523bdd47cf9acca0419eaa284d5ccda4cf62b828") diff --git a/var/spack/repos/builtin/packages/raptor2/package.py b/var/spack/repos/builtin/packages/raptor2/package.py index 5c9bf22a46..af93102de0 100644 --- a/var/spack/repos/builtin/packages/raptor2/package.py +++ b/var/spack/repos/builtin/packages/raptor2/package.py @@ -14,6 +14,7 @@ class Raptor2(AutotoolsPackage): license("LGPL-2.1-or-later") + version("2.0.16", sha256="089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680") version("2.0.15", sha256="ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed") depends_on("libxml2") diff --git a/var/spack/repos/builtin/packages/ross/package.py b/var/spack/repos/builtin/packages/ross/package.py index 53910e4039..2135c25442 100644 --- a/var/spack/repos/builtin/packages/ross/package.py +++ b/var/spack/repos/builtin/packages/ross/package.py @@ -17,6 +17,7 @@ class Ross(CMakePackage): version("develop", branch="develop") version("master", branch="master") + version("8.0.0", sha256="5339c9afcf77821fb6ebbcd93b8a1e651c7883e94dff250528815a08f84f1694") version("7.2.0", sha256="c937f4c7baa1918b6cd08f4eafae8cab44eddcd4aaa1175c23ff8562583ad726") version("7.1.1", sha256="550e3288cefedcbc7e6ca16cfbee0477b70399d63e94f554b60b32d714029722") version("7.1.0", sha256="478063f36d96466faef3db3cc15e1c0e1a8b60b9152fcce0eedf367be8252733") @@ -32,8 +33,8 @@ class Ross(CMakePackage): args = [] args.append("-DBUILD_SHARED_LIBS=ON") - args.append("-DARCH=%s" % self.spec.target) - args.append("-DCMAKE_C_COMPILER=%s" % self.spec["mpi"].mpicc) - args.append("-DCMAKE_CXX_COMPILER=%s" % self.spec["mpi"].mpicxx) + args.append(f"-DARCH={self.spec.target}") + args.append(f"-DCMAKE_C_COMPILER={self.spec['mpi'].mpicc}") + args.append(f"-DCMAKE_CXX_COMPILER={self.spec['mpi'].mpicxx}") return args diff --git a/var/spack/repos/builtin/packages/scc/package.py b/var/spack/repos/builtin/packages/scc/package.py index c6d70053b3..a37be14bb8 100644 --- a/var/spack/repos/builtin/packages/scc/package.py +++ b/var/spack/repos/builtin/packages/scc/package.py @@ -19,4 +19,5 @@ class Scc(GoPackage): license("MIT") + version("3.3.2", sha256="2bbfed4cf34bbe50760217b479331cf256285335556a0597645b7250fb603388") version("3.1.0", sha256="bffea99c7f178bc48bfba3c64397d53a20a751dfc78221d347aabdce3422fd20") diff --git a/var/spack/repos/builtin/packages/scine-core/package.py b/var/spack/repos/builtin/packages/scine-core/package.py index b006e324f8..cef9ef4081 100644 --- a/var/spack/repos/builtin/packages/scine-core/package.py +++ b/var/spack/repos/builtin/packages/scine-core/package.py @@ -18,6 +18,7 @@ class ScineCore(CMakePackage): license("BSD-3-Clause") version("master", branch="master") + version("6.0.0", sha256="6e47e49694002f9d847507c9aacfe53b2befbff5aa380f8860468afdfe880461") version("4.0.2", sha256="7181c6f93d71def22f1e0e5767afc7587c04b49abc03516f6926394868e7adc6") resource( diff --git a/var/spack/repos/builtin/packages/scons/package.py b/var/spack/repos/builtin/packages/scons/package.py index 77cd015bea..1295ed6a90 100644 --- a/var/spack/repos/builtin/packages/scons/package.py +++ b/var/spack/repos/builtin/packages/scons/package.py @@ -17,6 +17,7 @@ class Scons(PythonPackage): license("MIT") + version("4.7.0", sha256="d8b617f6610a73e46509de70dcf82f76861b79762ff602d546f4e80918ec81f3") version("4.5.2", sha256="813360b2bce476bc9cc12a0f3a22d46ce520796b352557202cb07d3e402f5458") version("4.5.1", sha256="9daeabe4d87ba2bd4ea15410765fc1ed2d931b723e4dc730a487a3911b9a1738") version("4.4.0", sha256="7703c4e9d2200b4854a31800c1dbd4587e1fa86e75f58795c740bcfa7eca7eaa") @@ -41,7 +42,7 @@ class Scons(PythonPackage): def url_for_version(self, version): url = "https://files.pythonhosted.org/packages/source/{0}/{1}/{1}-{2}.tar.gz" - if version >= Version("4.0.0"): + if self.spec.satisfies("@4.0.0:"): name = "SCons" else: name = "scons" diff --git a/var/spack/repos/builtin/packages/sigcpp/package.py b/var/spack/repos/builtin/packages/sigcpp/package.py index b4afc0f1b3..d485cd9f83 100644 --- a/var/spack/repos/builtin/packages/sigcpp/package.py +++ b/var/spack/repos/builtin/packages/sigcpp/package.py @@ -17,6 +17,7 @@ class Sigcpp(CMakePackage): license("LGPL-3.0-only") + version("3.6.0", sha256="bbe81e4f6d8acb41a9795525a38c0782751dbc4af3d78a9339f4a282e8a16c38") version("3.2.0", sha256="f9c36331b5d5ac7a1651477288f47eec51394c03ade8bb1a05d1c46eac5f77e7") version("3.0.7", sha256="063b6ab86e4d8703ea65d894d78e8482b1fc34b92be8849f82ce1c5b05cf2b8d") diff --git a/var/spack/repos/builtin/packages/spdlog/package.py b/var/spack/repos/builtin/packages/spdlog/package.py index 43be6c7ec5..ca3af5887b 100644 --- a/var/spack/repos/builtin/packages/spdlog/package.py +++ b/var/spack/repos/builtin/packages/spdlog/package.py @@ -14,6 +14,7 @@ class Spdlog(CMakePackage): license("MIT") + version("1.14.1", sha256="1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b") version("1.13.0", sha256="534f2ee1a4dcbeb22249856edfb2be76a1cf4f708a20b0ac2ed090ee24cfdbc9") version("1.12.0", sha256="4dccf2d10f410c1e2feaff89966bfc49a1abb29ef6f08246335b110e001e09a9") version("1.11.0", sha256="ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb") @@ -70,7 +71,7 @@ class Spdlog(CMakePackage): def cmake_args(self): args = [] - if self.spec.version >= Version("1.4.0"): + if self.spec.satisfies("@1.4.0:"): args.extend( [ self.define_from_variant("SPDLOG_BUILD_SHARED", "shared"), diff --git a/var/spack/repos/builtin/packages/spot/package.py b/var/spack/repos/builtin/packages/spot/package.py index d5aa234e98..223035eb56 100644 --- a/var/spack/repos/builtin/packages/spot/package.py +++ b/var/spack/repos/builtin/packages/spot/package.py @@ -16,6 +16,7 @@ class Spot(AutotoolsPackage): license("MIT") + version("2.11.6", sha256="a692794f89c0db3956ba5919bdd5313e372e0de34000a9022f29e1c6e91c538a") version("2.11.5", sha256="3acfd5cd112d00576ac234baeb34e1c6adf8c03155d4cda973e6317ac8bd1774") version("2.11.4", sha256="91ecac6202819ea1de4534902ce457ec6eec0573d730584d6494d06b0bcaa0b4") version("2.9.4", sha256="e11208323baabe9b5f98098d4b9bb39803fb102a68abbbaf900f1fcd578f0f85") diff --git a/var/spack/repos/builtin/packages/talloc/package.py b/var/spack/repos/builtin/packages/talloc/package.py index 567950dcdc..2235cecc7b 100644 --- a/var/spack/repos/builtin/packages/talloc/package.py +++ b/var/spack/repos/builtin/packages/talloc/package.py @@ -15,6 +15,7 @@ class Talloc(AutotoolsPackage): license("LGPL-3.0-or-later") + version("2.4.2", sha256="85ecf9e465e20f98f9950a52e9a411e14320bc555fa257d87697b7e7a9b1d8a6") version("2.4.0", sha256="6df36862c42466ef88f360444513870ef46934f9016c84383cc4008a7d0c46ba") version("2.3.1", sha256="ef4822d2fdafd2be8e0cabc3ec3c806ae29b8268e932c5e9a4cd5585f37f9f77") version("2.3.0", sha256="75d5bcb34482545a82ffb06da8f6c797f963a0da450d0830c669267b14992fc6") diff --git a/var/spack/repos/builtin/packages/tskit/package.py b/var/spack/repos/builtin/packages/tskit/package.py index 54445ec562..b32195f43d 100644 --- a/var/spack/repos/builtin/packages/tskit/package.py +++ b/var/spack/repos/builtin/packages/tskit/package.py @@ -15,6 +15,7 @@ class Tskit(PythonPackage): license("MIT") + version("0.5.6", sha256="ddfe213f1cb063cdb6982177230a2805ecd7dfc7ccd73026e13878abffd2ce46") version("0.3.1", sha256="b9c5a9b2fb62a615e389036946345ef8a35b09f1ffee541995b16f97fedb3d36") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/utf8proc/package.py b/var/spack/repos/builtin/packages/utf8proc/package.py index 1ab8b537e1..af154fdc95 100644 --- a/var/spack/repos/builtin/packages/utf8proc/package.py +++ b/var/spack/repos/builtin/packages/utf8proc/package.py @@ -13,6 +13,7 @@ class Utf8proc(CMakePackage): homepage = "https://juliastrings.github.io/utf8proc/" url = "https://github.com/JuliaStrings/utf8proc/archive/v2.4.0.tar.gz" + version("2.9.0", sha256="18c1626e9fc5a2e192311e36b3010bfc698078f692888940f1fa150547abb0c1") version("2.8.0", sha256="a0a60a79fe6f6d54e7d411facbfcc867a6e198608f2cd992490e46f04b1bcecc") version("2.7.0", sha256="4bb121e297293c0fd55f08f83afab6d35d48f0af4ecc07523ad8ec99aa2b12a1") version("2.6.1", sha256="4c06a9dc4017e8a2438ef80ee371d45868bda2237a98b26554de7a95406b283b") diff --git a/var/spack/repos/builtin/packages/vardictjava/package.py b/var/spack/repos/builtin/packages/vardictjava/package.py index e48185dca3..967ca0b938 100644 --- a/var/spack/repos/builtin/packages/vardictjava/package.py +++ b/var/spack/repos/builtin/packages/vardictjava/package.py @@ -16,6 +16,7 @@ class Vardictjava(Package): "https://github.com/AstraZeneca-NGS/VarDictJava/releases/download/v1.5.1/VarDict-1.5.1.tar" ) + version("1.8.3", sha256="020a84d6718531097a05207a59d85d80803b0eda074ea6c0a3d1842cc84f2daf") version("1.5.1", sha256="f1d710d238e8ab41b02a99fa8698baeee8c8668635a847b826913dd03a9176b9") depends_on("java@8:", type="run") diff --git a/var/spack/repos/builtin/packages/vt/package.py b/var/spack/repos/builtin/packages/vt/package.py index 9a4d34449c..3f4027de7a 100644 --- a/var/spack/repos/builtin/packages/vt/package.py +++ b/var/spack/repos/builtin/packages/vt/package.py @@ -12,6 +12,7 @@ class Vt(MakefilePackage): homepage = "https://genome.sph.umich.edu/wiki/vt" url = "https://github.com/atks/vt/archive/0.577.tar.gz" + version("0.57721", sha256="8f06d464ec5458539cfa30f81a034f47fe7f801146fe8ca80c14a3816b704e17") version("0.5772", sha256="b147520478a2f7c536524511e48133d0360e88282c7159821813738ccbda97e7") version("0.577", sha256="009e2592e787ab37e471b4e8a66520141bb2791ca78142ca1767d27036f460d0") diff --git a/var/spack/repos/builtin/packages/xconsole/package.py b/var/spack/repos/builtin/packages/xconsole/package.py index 2a8b3fecc4..c9c395449f 100644 --- a/var/spack/repos/builtin/packages/xconsole/package.py +++ b/var/spack/repos/builtin/packages/xconsole/package.py @@ -13,6 +13,7 @@ class Xconsole(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xconsole" xorg_mirror_path = "app/xconsole-1.0.6.tar.gz" + version("1.1.0", sha256="fe5d2ba99b754909b2a04ce4abf054cd1e3134a830d69aea82e8465cc9f73942") version("1.0.8", sha256="1897be35738489f92ef511caef189db8d5079469374021dc09b59e89992b7c29") version("1.0.7", sha256="91bc7327643b1ca57800a37575930af16fbea485d426a96d8f465de570aa6eb3") version("1.0.6", sha256="28151453a0a687462516de133bac0287b488a2ff56da78331fee34bc1bf3e7d5") diff --git a/var/spack/repos/builtin/packages/xdm/package.py b/var/spack/repos/builtin/packages/xdm/package.py index 7b811992ae..183ac75305 100644 --- a/var/spack/repos/builtin/packages/xdm/package.py +++ b/var/spack/repos/builtin/packages/xdm/package.py @@ -14,6 +14,7 @@ class Xdm(AutotoolsPackage, XorgPackage): license("MIT") + version("1.1.16", sha256="931013642b7fab893f374eb1aa6f9ad043c88b654802fc51f841cea76aff44e0") version("1.1.14", sha256="bcc543c3c120094d58d9cc9837958d4303693c2116ba342ba3dd9440137b4026") version("1.1.13", sha256="2f05aa58c205dcf10443ba414d27535b74ec11466dc95228343b0ce4f0c2a307") version("1.1.12", sha256="8ea737945f69e172afbbc8b5060e4c7ea8079f402eb0a458572197c907020bb4") diff --git a/var/spack/repos/builtin/packages/xev/package.py b/var/spack/repos/builtin/packages/xev/package.py index e6c418d4c7..d0f04600e1 100644 --- a/var/spack/repos/builtin/packages/xev/package.py +++ b/var/spack/repos/builtin/packages/xev/package.py @@ -20,6 +20,7 @@ class Xev(AutotoolsPackage, XorgPackage): license("MIT") + version("1.2.6", sha256="e2e3527023017af3a9bfbef0a90f8e46ac354c506b51f0ee3834b30823e43b25") version("1.2.5", sha256="a948974ede621a8402ed9ea64f1ec83992285aa4fbb9d40b52985156c61a358a") version("1.2.4", sha256="6b1f94813f008a4ba45e0a2d4e1b64deaab1def56fabd7fac3621106cbaa3383") version("1.2.3", sha256="a3c5fbf339f43ba625a6d84e52ab1a7170581505ef498be6aa4e7bdfbd8d5cef") diff --git a/var/spack/repos/builtin/packages/xkbutils/package.py b/var/spack/repos/builtin/packages/xkbutils/package.py index ab80af7039..734386b6ba 100644 --- a/var/spack/repos/builtin/packages/xkbutils/package.py +++ b/var/spack/repos/builtin/packages/xkbutils/package.py @@ -13,6 +13,7 @@ class Xkbutils(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xkbutils" xorg_mirror_path = "app/xkbutils-1.0.4.tar.gz" + version("1.0.6", sha256="d747d4ce5c390223e3bfdb13a1f673d3e19ae46ded25838cb8b28b1bafe1b9bd") version("1.0.5", sha256="b87072f0d7e75f56ee04455e1feab92bb5847aee4534b18c2e08b926150279ff") version("1.0.4", sha256="cf31303cbdd6a86c34cab46f4b6e0c7acd2e84578593b334a146142894529bca") diff --git a/var/spack/repos/builtin/packages/xload/package.py b/var/spack/repos/builtin/packages/xload/package.py index 7c6b24fcde..bee0e4037e 100644 --- a/var/spack/repos/builtin/packages/xload/package.py +++ b/var/spack/repos/builtin/packages/xload/package.py @@ -15,6 +15,7 @@ class Xload(AutotoolsPackage, XorgPackage): license("MIT") + version("1.2.0", sha256="0d3b84d22d2d85e9c3c152e48871e490dfcaad420f8836333f1323c5a690d55f") version("1.1.4", sha256="4e3d240ab63e02f2ddac8182519d94bea82bda4887e3e364dd8832a04ca8436a") version("1.1.3", sha256="9952e841d25ab2fd0ce5e27ba91858331c3f97575d726481772d4deb89432483") version("1.1.2", sha256="4863ad339d22c41a0ca030dc5886404f5ae8b8c47cd5e09f0e36407edbdbe769") diff --git a/var/spack/repos/builtin/packages/xmh/package.py b/var/spack/repos/builtin/packages/xmh/package.py index e751b144d8..9f58477531 100644 --- a/var/spack/repos/builtin/packages/xmh/package.py +++ b/var/spack/repos/builtin/packages/xmh/package.py @@ -14,6 +14,7 @@ class Xmh(AutotoolsPackage, XorgPackage): homepage = "https://cgit.freedesktop.org/xorg/app/xmh" xorg_mirror_path = "app/xmh-1.0.3.tar.gz" + version("1.0.5", sha256="3ab74096031ba89bcc88a46dbfa652837c4aeb6a36168ff9799782efe88128b8") version("1.0.4", sha256="2034f24fb3181b6e07ebf7235d2845a7ebb18d533aa405dbc99235eec4ab410f") version("1.0.3", sha256="f90baf2615a4e1e01232c50cfd36ee4d50ad2fb2f76b8b5831fb796661f194d2") diff --git a/var/spack/repos/builtin/packages/xorg-cf-files/package.py b/var/spack/repos/builtin/packages/xorg-cf-files/package.py index 578c10e7f4..0c9b7b9d33 100644 --- a/var/spack/repos/builtin/packages/xorg-cf-files/package.py +++ b/var/spack/repos/builtin/packages/xorg-cf-files/package.py @@ -17,6 +17,7 @@ class XorgCfFiles(AutotoolsPackage, XorgPackage): license("custom") + version("1.0.8", sha256="c6f1c9ffce96278a9d7c72d081e508d81c219dec69ae0dbaf8ae88f4bc9ef977") version("1.0.6", sha256="6d56094e5d1a6c7d7a9576ac3a0fc2c042344509ea900d59f4b23df668b96c7a") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/xprop/package.py b/var/spack/repos/builtin/packages/xprop/package.py index b426118a02..b4e25b86f0 100644 --- a/var/spack/repos/builtin/packages/xprop/package.py +++ b/var/spack/repos/builtin/packages/xprop/package.py @@ -15,6 +15,7 @@ class Xprop(AutotoolsPackage, XorgPackage): license("MIT") + version("1.2.7", sha256="11c06a876b0aa0bfac6cbfe4b3ebe1f5062f8b39b9b1b6c136a8629265f134b6") version("1.2.6", sha256="58ee5ee0c47fa454d3b16312e778c3f549605a8ad0fd0daafc70d2d6174b116d") version("1.2.5", sha256="b7bf6b6be6cf23e7966a153fc84d5901c14f01ee952fbd9d930aa48e2385d670") version("1.2.4", sha256="dddb6e208ffa515e68f001c22077a465f1365a4bcf91d9b37f336a6c0d15400d") diff --git a/var/spack/repos/builtin/packages/xrefresh/package.py b/var/spack/repos/builtin/packages/xrefresh/package.py index d9fa199988..21800da5fb 100644 --- a/var/spack/repos/builtin/packages/xrefresh/package.py +++ b/var/spack/repos/builtin/packages/xrefresh/package.py @@ -14,6 +14,7 @@ class Xrefresh(AutotoolsPackage, XorgPackage): license("MIT") + version("1.1.0", sha256="cbf0d3ed80f03188841a96ceb20e615b40a006e3928be2e179d9d5a0ded639b2") version("1.0.7", sha256="f2817920f119bd9146ed3cde223b8a4ab17cb72da4ece7bddde35e18b31aa337") version("1.0.6", sha256="0dda726365d341c00aed0f9cfebf3d2cfaa0c661212c73c0114cbb4ce92f357e") version("1.0.5", sha256="b373cc1ecd37c3d787e7074ce89a8a06ea173d7ba9e73fa48de973c759fbcf38") diff --git a/var/spack/repos/builtin/packages/xwininfo/package.py b/var/spack/repos/builtin/packages/xwininfo/package.py index 57f8308b5d..7fb046f5f5 100644 --- a/var/spack/repos/builtin/packages/xwininfo/package.py +++ b/var/spack/repos/builtin/packages/xwininfo/package.py @@ -15,6 +15,7 @@ class Xwininfo(AutotoolsPackage, XorgPackage): license("MIT") + version("1.1.6", sha256="2d52151de9d2808343c715c480e7d37f88958c8b7fcd090178b097436d987c2b") version("1.1.5", sha256="aaa915909bb509320c3c775c79babaccc063fd3edc39e520a3c0352e265e9f58") version("1.1.4", sha256="3561f6c37eec416ad306f41ff24172b86cbed00854dff8912915e97d2cc17c34") version("1.1.3", sha256="784f8b9c9ddab24ce4faa65fde6430a8d7cf3c0564573582452cc99c599bd941") diff --git a/var/spack/repos/builtin/packages/yambo/package.py b/var/spack/repos/builtin/packages/yambo/package.py index d554b0bbbc..7df990c6f4 100644 --- a/var/spack/repos/builtin/packages/yambo/package.py +++ b/var/spack/repos/builtin/packages/yambo/package.py @@ -22,6 +22,7 @@ class Yambo(AutotoolsPackage): license("GPL-2.0-or-later") + version("5.2.1", sha256="0ac362854313927d75bbf87be98ff58447f3805f79724c38dc79df07f03a7046") version("5.1.1", sha256="c85036ca60507e627c47b6c6aee8241830349e88110e1ce9132ef03ab2c4e9f6") version("4.2.2", sha256="86b4ebe679387233266aba49948246c85a32b1e6840d024f162962bd0112448c") version("4.2.1", sha256="8ccd0ca75cc32d9266d4a37edd2a7396cf5038f3a68be07c0f0f77d1afc72bdc") @@ -94,7 +95,7 @@ class Yambo(AutotoolsPackage): # As of version 4.2.1 there are hard-coded paths that make # the build process fail if the target prefix is not the # configure directory - "--prefix={0}".format(self.stage.source_path), + f"--prefix={self.stage.source_path}", "--disable-keep-objects", "--with-editor=none", ] @@ -111,7 +112,7 @@ class Yambo(AutotoolsPackage): args.extend(self.enable_or_disable("openmp")) # LAPACK - if "+mpi" in spec: + if spec.satisfies("+mpi"): args.append( "--with-scalapack-libs={0}".format( spec["scalapack"].libs + spec["lapack"].libs + spec["blas"].libs @@ -119,10 +120,7 @@ class Yambo(AutotoolsPackage): ) args.extend( - [ - "--with-blas-libs={0}".format(spec["blas"].libs), - "--with-lapack-libs={0}".format(spec["lapack"].libs), - ] + [f"--with-blas-libs={spec['blas'].libs}", f"--with-lapack-libs={spec['lapack'].libs}"] ) # Netcdf @@ -130,17 +128,17 @@ class Yambo(AutotoolsPackage): [ "--enable-netcdf-hdf5", "--enable-hdf5-compression", - "--with-hdf5-libs={0}".format(spec["hdf5"].libs), - "--with-netcdf-path={0}".format(spec["netcdf-c"].prefix), - "--with-netcdff-path={0}".format(spec["netcdf-fortran"].prefix), + f"--with-hdf5-libs={spec['hdf5'].libs}", + f"--with-netcdf-path={spec['netcdf-c'].prefix}", + f"--with-netcdff-path={spec['netcdf-fortran'].prefix}", ] ) args.extend(self.enable_or_disable("io")) # Other dependencies - args.append("--with-fft-path={0}".format(spec["fftw"].prefix)) - args.append("--with-libxc-path={0}".format(spec["libxc"].prefix)) + args.append(f"--with-fft-path={spec['fftw'].prefix}") + args.append(f"--with-libxc-path={spec['libxc'].prefix}") return args |