Merge branch 'master' into awscli

2025-05-26 08:59:18 +02:00
parent f2fef41a37 9b7f5dc4eb
commit 0663d3ff5a
315 changed files with 6730 additions and 1058 deletions
--- a/Tools/ANSYS/build
+++ b/Tools/ANSYS/build
@@ -1,7 +1,5 @@
 #!/usr/bin/env modbuild

-pbuild::add_to_group 'Tools'
-
 pbuild::prep() {
 	:
 }
--- a/Tools/ANSYS/files/config.yaml
+++ b/Tools/ANSYS/files/config.yaml
@@ -0,0 +1,28 @@
+format: 1
+ANSYS:
+  defaults:
+    group: Tools
+    relstage: stable
+  shasums:
+  versions:
+    2024R2:
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          relstage: stable
+          overlay: merlin
+          use_overlays: [PSI]
+          use_flags: [merlin7]
+    2023R2:
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          relstage: unstable
+          overlay: merlin
+          use_overlays: [PSI]
+          use_flags: [merlin7]
+    2022R2:
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          relstage: stable
+          overlay: merlin
+          use_overlays: [PSI]
+          use_flags: [merlin7]
--- a/Tools/ANSYS/files/variants.overlay_alps
+++ b/Tools/ANSYS/files/variants.overlay_alps
@@ -0,0 +1,2 @@
+ANSYS/2022R2    stable
+ANSYS/2024R1    stable
--- a/Tools/ANSYS/variants/variants.overlay_merlin
+++ b/Tools/ANSYS/variants/variants.overlay_merlin
@@ -3,4 +3,5 @@ ANSYS/2020R2    stable
 ANSYS/2021R1    stable
 ANSYS/2021R2    stable
 ANSYS/2022R1    stable
-ANSYS/2022R2    unstable
+ANSYS/2022R2    stable
+ANSYS/2023R2    stable
--- a/Tools/ANSYS/files/variants.rhel7
+++ b/Tools/ANSYS/files/variants.rhel7
--- a/Tools/ANSYS/modulefile
+++ b/Tools/ANSYS/modulefile
@@ -32,6 +32,8 @@ prepend-path    PATH    $PREFIX/$version/polyflow/bin
 prepend-path    PATH    $PREFIX/$version/RSM/bin
 prepend-path    PATH    $PREFIX/$version/SystemCoupling/bin
 prepend-path    PATH    $PREFIX/$version/TurboGrid/bin
+# 20.09.2023 add lumerical bin
+prepend-path    PATH    $PREFIX/$version/lumerical/$version/bin
 # 07.04.2020
 prepend-path    PATH    $PREFIX/$version/Electronics/Linux64
 prepend-path    PATH    $PREFIX/$version/Framework/bin/Linux64
@@ -50,5 +52,8 @@ prepend-path    LD_LIBRARY_PATH  $PREFIX/$version/CFX/tools/qwt-6.1.2/linx64/lib
 prepend-path    LD_LIBRARY_PATH  $PREFIX/$version/CFX/tools/qwtpolar-1.1.1/linx64/lib
 prepend-path    LD_LIBRARY_PATH  $PREFIX/$version/CFX/tools/xerces-3.2.2/linx64/lib

+# Lumerical
+prepend-path    LD_LIBRARY_PATH  $PREFIX/$version/lumerical/$version/lib/
+
 # RSM
 prepend-path    PATH    $PREFIX/$version/RSM/Config/tools/linux
--- a/Tools/ANSYS/variants/variants.rhel7
+++ b/Tools/ANSYS/variants/variants.rhel7
@@ -1,6 +0,0 @@
-ANSYS/2019R3    stable
-ANSYS/2020R1    stable
-ANSYS/2020R1-1  stable
-ANSYS/2020R2    stable
-ANSYS/2021R1    stable
-ANSYS/2021R2    stable
--- a/Tools/GAMS/README.md
+++ b/Tools/GAMS/README.md
@@ -0,0 +1,40 @@
+# How To Install GAMS
+
+## Download the proper GAMS version
+
+Download the proper GAMS version from https://www.gams.com/latest/ (notice that older versions are found in the `Previous Distributions` box).
+Notice that the **GNU/Linux Systems** version is required for HPC systems.
+
+## Manual installation of GAMS
+
+GAMS is shipped through an executable file, which will expand all files into a single directory.
+
+1. Create a directory for the new version. Example for version 42.3.0:
+```bash
+mkdir -p /opt/psi/Tools/GAMS/42.3.0
+```
+2. Copy the executable to the new created directory
+```bash
+mv linux_x64_64_sfx.exe /opt/psi/Tools/GAMS/42.3.0/
+```
+3. Change permissions of the executable accordingly
+```bash
+chmod +x /opt/psi/Tools/GAMS/42.3.0/linux_x64_64_sfx.exe
+```
+4. Execute it to install the software
+```bash
+cd /opt/psi/Tools/GAMS/42.3.0
+./linux_x64_64_sfx.exe
+```
+5. The created subdirectory is created with the pattern: `gams${v_MAJOR}.${V_MINOR}_linux_x64_64_sfx`. Examples:
+```bash
+/opt/psi/Tools/GAMS/31.1.1/gams31.1_linux_x64_64_sfx
+/opt/psi/Tools/GAMS/42.3.0/gams42.3_linux_x64_64_sfx
+```
+6. Add the proper version in the variants file and run the build file
+```bash
+cd ~/buildblocks/Tools/GAMS
+echo "GAMS/42.3.0   unstable" >> files/variants.rhel7
+./build 42.3.0
+```
+
--- a/Tools/GAMS/build
+++ b/Tools/GAMS/build
@@ -0,0 +1,20 @@
+#!/usr/bin/env modbuild
+
+pbuild::add_to_group 'Tools'
+
+pbuild::prep() {
+	:
+}
+
+pbuild::configure() {
+	:
+}
+
+pbuild::compile() {
+	:
+}
+
+pbuild::install() {
+	:
+}
+
--- a/Tools/GAMS/files/variants.rhel7
+++ b/Tools/GAMS/files/variants.rhel7
@@ -0,0 +1,3 @@
+GAMS/30.3.0   deprecated
+GAMS/31.1.1   stable   
+GAMS/42.3.0   unstable 
--- a/Tools/GAMS/modulefile
+++ b/Tools/GAMS/modulefile
@@ -0,0 +1,21 @@
+#%Module1.0
+
+module-whatis		"The General Algebraic Modeling System (GAMS)"
+module-url		"https://www.gams.com"
+module-license		"https://www.gams.com/fileadmin/GAMS_EULA.pdf"
+module-maintainer       "Marc Caubet Serrabou <marc.caubet@psi.ch>"
+
+module-help	"
+
+The General Algebraic Modeling System (GAMS) is a high-level modeling 
+system for mathematical programming and optimization. It consists of a
+language compiler and a stable of integrated high-performance solvers.
+GAMS is tailored for complex, large scale modeling applications, and
+allows you to build large maintainable models that can be adapted 
+quickly to new situations. GAMS is specifically designed for modeling 
+linear, nonlinear and mixed integer optimization problems.
+"
+
+prepend-path    PATH             $PREFIX/gams${V_MAJOR}.${V_MINOR}_linux_x64_64_sfx
+prepend-path    LD_LIBRARY_PATH  $PREFIX/gams${V_MAJOR}.${V_MINOR}_linux_x64_64_sfx
+
--- a/Tools/VSCode/build
+++ b/Tools/VSCode/build
@@ -0,0 +1,12 @@
+#!/usr/bin/env modbuild
+
+pbuild::install() {
+	:
+	cd "${PREFIX}"
+	tar --strip-components=1 -xvf "${PMODULES_DISTFILESDIR}/VSCode-${V_PKG}.tar.gz"
+}
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
--- a/Tools/VSCode/files/config.yaml
+++ b/Tools/VSCode/files/config.yaml
@@ -0,0 +1,27 @@
+---
+format: 1
+VSCode:
+  defaults:
+    group: Tools
+    overlay: base
+    relstage: stable
+    systems: [.*]
+    build_functions:
+      configure: []
+      compile: []
+    urls:
+      - url: https://update.code.visualstudio.com/${V_PKG}/linux-x64/stable
+        name: VSCode-${V_PKG}.tar.gz
+        unpacker: none
+  shasums:
+    VSCode-1.100.2.tar.gz: 5c2cbbeaa08b92340dce899a78d66be8d92c09b4d75313bfdfc46fb3bddca5c0
+  versions:
+    1.100.2:
+      config:
+        relstage: unstable
+    1.87.0:
+      config:
+        relstage: stable
+    1.38.1_rhel7;1.73.1:
+      config:
+        relstage: deprecated
--- a/Tools/VSCode/modulefile
+++ b/Tools/VSCode/modulefile
@@ -0,0 +1,16 @@
+#%Module1.0
+
+module-whatis		"lightweight but powerful source code editor"
+module-url		"https://code.visualstudio.com/docs"
+module-license		"See: https://code.visualstudio.com/license"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help	"
+Visual Studio Code is a lightweight but powerful source code editor
+which runs on your desktop and is available for Windows, macOS and
+Linux. It comes with built-in support for JavaScript, TypeScript
+and Node.js and has a rich ecosystem of extensions for other languages
+(such as C++, C#, Java, Python, PHP, Go) and runtimes (such as .NET
+and Unity). Begin your journey with VS Code with these introductory
+videos: https://code.visualstudio.com/docs/introvideos/overview
+"
--- a/Tools/asciidoctor/build
+++ b/Tools/asciidoctor/build
@@ -0,0 +1,6 @@
+#!/usr/bin/env modbuild
+
+pbuild::install(){
+	/usr/bin/which gem
+	"${RUBY_DIR}/bin/gem" install --install-dir="${PREFIX}" asciidoctor -v "${V_PKG}"
+}
--- a/Tools/asciidoctor/files/config.yaml
+++ b/Tools/asciidoctor/files/config.yaml
@@ -0,0 +1,16 @@
+---
+format: 1
+asciidoctor:
+  defaults:
+    group: Tools
+    relstage: stable
+    docfiles:
+    configure_args:
+    build_functions:
+      prep: []
+      configure: []
+      compile: []
+  versions:
+    2.0.23:
+      config:
+        build_requires: [ruby/3.4.4]
--- a/Tools/asciidoctor/modulefile
+++ b/Tools/asciidoctor/modulefile
@@ -0,0 +1,11 @@
+#%Module1.0
+
+module-whatis		"Ruby-based text processor for parsing AsciiDoc"
+module-url		"https://asciidoctor.org"
+module-license		"MIT"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help	"
+"
+
+prepend-path GEM_PATH	$PREFIX
--- a/Tools/curl/build
+++ b/Tools/curl/build
@@ -0,0 +1,7 @@
+#!/usr/bin/env modbuild
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
--- a/Tools/curl/files/config.yaml
+++ b/Tools/curl/files/config.yaml
@@ -0,0 +1,21 @@
+---
+format: 1
+curl:
+  defaults:
+    group: Tools
+    overlay: base
+    relstage: stable
+    configure_args:
+      - --with-openssl
+    docfiles: []
+    urls:
+      - url: https://curl.se/download/$P-${V_PKG}.tar.gz
+  shasums:
+
+  versions:
+    8.13.0:
+      config:
+        build_requires: [libpsl/0.21.5, openssl/3.4.1]
+    8.11.0:
+      config:
+        build_requires: [libpsl/0.21.5, openssl/1.1.1w]
--- a/Tools/curl/modulefile
+++ b/Tools/curl/modulefile
@@ -0,0 +1,15 @@
+#%Pmodule
+
+module-whatis		"command line tool and library for transferring data with URLs"
+module-url		"https://curl.se"
+module-license		"See \$PREFIX/share/doc/curl/curl.txt"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help		"
+curl is used in command lines or scripts to transfer data. curl is also
+libcurl, used in cars, television sets, routers, printers, audio equipment,
+mobile phones, tablets, medical devices, settop boxes, computer games,
+media players and is the Internet transfer engine for countless software
+applications in over twenty billion installations.
+"
+
--- a/Tools/datacatalog/README.md
+++ b/Tools/datacatalog/README.md
@@ -4,6 +4,18 @@

 This module provides tools to interface with the Data Catalog (discovery.psi.ch).

+## Version Numbers
+
+Prior to version 2, each command had its own version. The pmodule version
+roughly tracked the datasetIngestor version. However, some pmodules were
+updated manually with more recent binaries, so in general there is no way to
+check the versions contained in older pmodules other than running each command
+and parsing the output.
+
+From v2.2.0 all CLI commands share a common version, and the pmodules will
+reflect this. The SciCat GUI is still versioned independently, but this is
+planned to be brought in sync with the CLI and pmodule soon.
+
 ## Installation

 Run `./build <VERSION>` to install the latest version. This downloads the
@@ -18,3 +30,18 @@ the conda module is not activated. See
 Programming/anaconda/2019.07/conda-env-defs/scicat_client for environment
 installation details.

+### SciCat GUI
+
+The SciCat GUI is installed manually to `bin`. As of 2.2.0, no standard release
+cycle is used for the GUI. It should be built from source in the [rollout
+repo](https://git.psi.ch/MELANIE/rollout/-/tree/master/Software/00-General/SciCatArchiverGUI)
+and manually coppied.
+
+An issue in 2.2.0 and earlier prevents the GUI from running on RHEL 8. This was
+fixed with a manual wrapper script which produces an error on RHEL 8.
+
+# TODO
+
+- [ ] SciCat should be downloaded and installed in the build script. (This is
+      planned after the GUI is migrated to github and CI/CD implemented.)
+
--- a/Tools/datacatalog/build
+++ b/Tools/datacatalog/build
@@ -1,32 +1,22 @@
 #!/usr/bin/env modbuild

 pbuild::add_to_group 'Tools'
-
-pbuild::prep() {
-    :
-}
+pbuild::set_download_url https://github.com/paulscherrerinstitute/scicat-cli/releases/download/v${V_PKG}/scicat-cli_v${V_PKG}_Linux_x86_64.tar.gz

 pbuild::configure() {
-    :
+  :
 }

 pbuild::compile() {
-    :
+  :
 }

 pbuild::install() {
-   mkdir -p "$PREFIX/bin"
+  mkdir -p "$PREFIX/bin"

-   /usr/bin/curl -o "$PREFIX/bin/datasetIngestor" https://intranet.psi.ch/pub/Daas/WebHome/datasetIngestor
-   chmod +x "$PREFIX/bin/datasetIngestor"
+  cp $SRC_DIR/dataset{Ingestor,Retriever,Archiver} "$PREFIX/bin"

-   /usr/bin/curl -o "$PREFIX/bin/datasetRetriever" https://intranet.psi.ch/pub/Daas/WebHome/datasetRetriever
-   chmod +x "$PREFIX/bin/datasetRetriever"
-
-   /usr/bin/curl -o "$PREFIX/bin/datasetArchiver" https://intranet.psi.ch/pub/Daas/WebHome/datasetArchiver
-   chmod +x "$PREFIX/bin/datasetArchiver"
-
-   # Hardcoded; could be made version-specific in the future if needed
-   ln -s "${PMODULES_ROOT}/Programming/anaconda/2019.07/conda/envs/scicat_client-0.1.0/bin/scicat_client" "$PREFIX/bin/scicat_client"
+  # Hardcoded; could be made version-specific in the future if needed
+  ln -s "${PMODULES_ROOT}/Programming/anaconda/2019.07/conda/envs/scicat_client-0.1.0/bin/scicat_client" "$PREFIX/bin/scicat_client"
 }

--- a/Tools/datacatalog/files/variants.Linux
+++ b/Tools/datacatalog/files/variants.Linux
@@ -1,7 +1,10 @@
-datacatalog/1.1.10	stable
-datacatalog/1.1.9	removed
-datacatalog/1.1.15	removed
 datacatalog/1.1.3	removed
 datacatalog/1.1.4	removed
-datacatalog/1.1.7	removed
-datacatalog/1.1.8	removed
+datacatalog/1.1.7	deprecated
+datacatalog/1.1.8	deprecated
+datacatalog/1.1.9	deprecated
+datacatalog/1.1.15	removed
+datacatalog/1.1.10	deprecated
+datacatalog/1.1.11	deprecated
+datacatalog/2.2.0	stable
+datacatalog/2.2.1	stable
--- a/Tools/datacatalog/modulefile
+++ b/Tools/datacatalog/modulefile
@@ -1,11 +1,16 @@
 #%Module1.0

 module-whatis		"SciCat datacatalog related tools"
-module-url		"https://melanie.gitpages.psi.ch/SciCatPages/"
-module-license		"GPL-V3"
-module-maintainer	"Stephan Egli <stephan.egli@psi.ch>"
+module-url		"https://scicatproject.github.io/documentation/Ingestor/ingestManual.html"
+module-license		"BSD 3"
+module-maintainer	"Spencer Bliven <scicat-help@lists.psi.ch>"

 module-help		"
 Data catalog ingest and retrieve tools.
-"

+Source code for the command line tools (datasetIngestor and datasetRetreiver)
+is available at https://github.com/paulscherrerinstitute/scicat-cli.  Source
+code for the SciCat GUI is available from PSI at
+https://git.psi.ch/MELANIE/rollout 
+
+"
--- a/Tools/emacs/build-xml
+++ b/Tools/emacs/build-xml
@@ -0,0 +1,34 @@
+#!/usr/bin/env modbuild
+
+CC=''
+CXX=''
+eval $(modulecmd bash use System)
+
+pbuild::pre_configure() {
+	case ${OS} in
+	Darwin )
+		pbuild::add_configure_args '--with-ns' '--with-jpeg=no'
+		;;
+	Linux )
+		# with 24.5 configure complains about missing libjpeg even it
+		# is installed!
+		pbuild::add_configure_args '--with-jpeg=no'
+		;;
+	*)
+		;;
+	esac
+	install -m 0755 -d "${PREFIX}"
+}
+
+pbuild::post_install() {
+	mkdir -p "${PREFIX}/bin"
+	install -m 0755 "${BUILDBLOCK_DIR}/Emacs" "${PREFIX}/bin"
+	install -m 0755 "${BUILDBLOCK_DIR}/Emacsclient" "${PREFIX}/bin"
+	#cp -a "${GNUTLS_LIBRARY_DIR}"/libgnutls.so.* "${PREFIX}/lib"
+	#cp -a "${NETTLE_LIBRARY_DIR}"/libnettle.so.* "${PREFIX}/lib"
+}
+
+pbuild::post_install_Darwin() {
+	cp -a "${BUILD_DIR}/nextstep/Emacs.app" "${PREFIX}"
+}
+
--- a/Tools/emacs/files/config.yaml
+++ b/Tools/emacs/files/config.yaml
@@ -0,0 +1,16 @@
+format: 1
+emacs:
+  defaults:
+    group: Tools
+    relstage: stable
+    docfiles:
+    urls:
+      - url: https://ftp.gnu.org/gnu/emacs/$P-${V_PKG}.tar.xz
+  shasums:
+    emacs-29.1.tar.xz: d2f881a5cc231e2f5a03e86f4584b0438f83edd7598a09d24a21bd8d003e2e01
+  versions:
+    29.1:
+      config:
+        relstage: unstable
+        runtime_deps: [gnutls/3.5.19]
+        build_requires: [libidn2/2.3.4, libungif/4.1.4, tiff/4.0.9, nettle/3.4]
--- a/Tools/emacs/files/variants
+++ b/Tools/emacs/files/variants
@@ -3,3 +3,4 @@ emacs/25.3	stable	b:libungif/4.1.4 b:tiff/4.0.9
 emacs/26.1	stable	b:libungif/4.1.4 b:tiff/4.0.9 b:nettle/3.4 gnutls/3.5.19
 emacs/26.3	stable	b:libungif/4.1.4 b:tiff/4.0.9 b:nettle/3.4 gnutls/3.5.19
 emacs/27.2	stable	b:libungif/4.1.4 b:tiff/4.0.9 b:nettle/3.4 gnutls/3.5.19
+emacs/29.1	unstable	b:libungif/4.1.4 b:tiff/4.0.9 b:nettle/3.4 gnutls/3.5.19
--- a/Tools/fpart/build
+++ b/Tools/fpart/build
@@ -0,0 +1,6 @@
+#!/usr/bin/env modbuild
+
+# we need to generate the configure file
+pbuild::post_prep() {
+  autoreconf -i
+}
--- a/Tools/fpart/files/config.yaml
+++ b/Tools/fpart/files/config.yaml
@@ -0,0 +1,18 @@
+---
+format: 1
+fpart:
+  defaults:
+    group: Tools
+    overlay: base
+    relstage: stable
+    configure_with: autotools
+    build_variants: first_match
+    target_cpus: [x86_64]
+    systems: [rhel8]
+    docfiles: [COPYING, README.md, Changelog.md]
+    urls:                                               
+      - url: https://github.com/martymac/$P/archive/refs/tags/$P-${V_PKG}.tar.gz
+  shasums:                                              
+    fpart-1.7.0.tar.gz: e5f82dd90001ed53200b2383bcfd520b1d8ee06d6a2a75b39d37d68daef20c88
+  versions:
+    1.7.0:
--- a/Tools/fpart/modulefile
+++ b/Tools/fpart/modulefile
@@ -0,0 +1,12 @@
+#%Module1.0
+
+module-whatis		"Fpart is a Filesystem partitioner"
+module-url		"https://www.fpart.org/"
+module-license	 	"BSD 2 Clause"
+module-maintainer	"Hans-Nikolai Viessmann <hans-nikolai.viessmann@psi.ch"
+
+module-help	"
+Fpart is a Filesystem partitioner. It helps you sort file trees and pack them into bags (called partitions). It is developed in C and available under the BSD license.
+
+Fpsync, a powerful file-migration tool is also provided. See https://www.fpart.org/ for more details and examples.
+"
--- a/Tools/git/build
+++ b/Tools/git/build
@@ -1,23 +1,16 @@
 #!/usr/bin/env modbuild

-pbuild::set_download_url \
-	"http://www.kernel.org/pub/software/scm/$P/$P-${V_PKG}.tar.gz"
-pbuild::add_to_group 'Tools'
-
-pbuild::compile_in_sourcetree
-pbuild::install_docfiles 'COPYING' 'README.md'
-
 pbuild::pre_configure_Darwin() {
 	export NO_APPLE_COMMON_CRYPTO=1
 }

-
 pbuild::pre_configure() {
 	#pbuild::add_configure_args "LIBS=-lintl"
+	#pbuild::add_configure_args "LDFLAGS=-lintl"
 	pbuild::add_configure_args "--with-tcltk"
 	pbuild::add_configure_args "--with-iconv=${GETTEXT_PREFIX}"
 	pbuild::add_configure_args "--with-perl=${PERL_PREFIX}/bin/perl"
-	:
+	make configure
 }

 pbuild::post_compile() {
@@ -25,9 +18,9 @@ pbuild::post_compile() {
 }

 pbuild::post_install() {
-        make install-doc V=1 XMLTO_EXTRA='--skip-validation'
-	make -C contrib/subtree prefix="${PREFIX}" install
-	make -C contrib/subtree prefix="${PREFIX}" install-doc XMLTO="xmlto --skip-validation"
+        make install-doc V=1 USE_ASCIIDOCTOR=1 XMLTO_EXTRA='--skip-validation'
+	make -C contrib/subtree prefix="${PREFIX}" install USE_ASCIIDOCTOR=1 
+	make -C contrib/subtree prefix="${PREFIX}" install-doc USE_ASCIIDOCTOR=1 XMLTO="xmlto --skip-validation"
 }

 # Local Variables:
--- a/Tools/git/build-git-lfs
+++ b/Tools/git/build-git-lfs
@@ -0,0 +1,15 @@
+#!/usr/bin/env modbuild
+
+pbuild::install(){
+	install -m 0755 git-lfs "${PREFIX}/bin"
+	install -m 0755 -d  "${PREFIX}/share/man/man{1,5,7}"
+	install -m 0644 man/man1/* "${PREFIX}/share/man/man1"
+	install -m 0644 man/man5/* "${PREFIX}/share/man/man5"
+	install -m 0644 man/man7/* "${PREFIX}/share/man/man7"
+}
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
--- a/Tools/git/build-legacy
+++ b/Tools/git/build-legacy
@@ -0,0 +1,36 @@
+#!/usr/bin/env modbuild
+
+pbuild::set_download_url \
+	"http://www.kernel.org/pub/software/scm/$P/$P-${V_PKG}.tar.gz"
+pbuild::add_to_group 'Tools'
+
+pbuild::compile_in_sourcetree
+pbuild::install_docfiles 'COPYING' 'README.md'
+
+pbuild::pre_configure_Darwin() {
+	export NO_APPLE_COMMON_CRYPTO=1
+}
+
+pbuild::pre_configure() {
+	#pbuild::add_configure_args "LIBS=-lintl"
+	pbuild::add_configure_args "--with-tcltk"
+	pbuild::add_configure_args "--with-iconv=${GETTEXT_PREFIX}"
+	pbuild::add_configure_args "--with-perl=${PERL_PREFIX}/bin/perl"
+	:
+}
+
+pbuild::post_compile() {
+	make -C contrib/subtree prefix="${PREFIX}"
+}
+
+pbuild::post_install() {
+        make install-doc V=1 XMLTO_EXTRA='--skip-validation'
+	make -C contrib/subtree prefix="${PREFIX}" install
+	make -C contrib/subtree prefix="${PREFIX}" install-doc XMLTO="xmlto --skip-validation"
+}
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
--- a/Tools/git/files/config.yaml
+++ b/Tools/git/files/config.yaml
@@ -1,36 +1,59 @@
-overlay: base
-relstage: stable
-group: Tools
-shasums:
-  git/2.37.0: fc3ffe6c65c1f7c681a1ce6bb91703866e432c762731d4b57c566d696f6d62c3
-  git/2.33.1: 02047f8dc8934d57ff5e02aadd8a2fe8e0bcf94a7158da375e48086cc46fce1d
-  git/2.30.0: d24c4fa2a658318c2e66e25ab67cc30038a35696d2d39e6b12ceccf024de1e5e
-  git/2.22.0: a4b7e4365bee43caa12a38d646d2c93743d755d1cea5eab448ffb40906c9da0b
-  git/2.21.0: 85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee
-  git/2.8.1: e6626b43ba4bc63ad4918df4c275f50bd7f8af2ab54bde60496ad75e91e927fc
-  git/2.3.3: c189e4a48d8805482f450db666330c79bcefae37e0d035c7717517126ddf4305
+---
+# yamllint disable rule:line-length
+format: 1
+git:
+  defaults:
+    group: Tools
+    overlay: base
+    relstage: stable
+    compile_in_sourcetree: true
+    urls:
+      - url: https://mirrors.edge.kernel.org/pub/software/scm/git/git-${V_PKG}.tar.xz
+  shasums:
+    git-2.39.1.tar.gz: ae8d3427e4ccd677abc931f16183c0ec953e3bfcd866493601351e04a2b97398
+    git-2.37.2.tar.gz: 4c428908e3a2dca4174df6ef49acc995a4fdb1b45205a2c79794487a33bc06e5
+    git-2.37.0.tar.gz: fc3ffe6c65c1f7c681a1ce6bb91703866e432c762731d4b57c566d696f6d62c3
+    git-2.33.1.tar.gz: 02047f8dc8934d57ff5e02aadd8a2fe8e0bcf94a7158da375e48086cc46fce1d
+    git-2.30.0.tar.xz: 4c428908e3a2dca4174df6ef49acc995a4fdb1b45205a2c79794487a33bc06e5
+    git-2.22.0.tar.gz: a4b7e4365bee43caa12a38d646d2c93743d755d1cea5eab448ffb40906c9da0b
+    git-2.21.0.tar.gz: 85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee
+    git-2.8.1.tar.xz: e6626b43ba4bc63ad4918df4c275f50bd7f8af2ab54bde60496ad75e91e927fc
+    git-2.3.3.tar.gz: c189e4a48d8805482f450db666330c79bcefae37e0d035c7717517126ddf4305
+  versions:
+    2.49.0;2.46.4;2.45.3;2.43.6;2.42.4:
+      config:
+        runtime_deps: [TclTk/8.6.16, openssl/3.4.1]
+        build_requires: [gcc/10.4.0, curl/8.13.0, perl/5.40.2, asciidoctor/2.0.23, gettext/0.19.8, xmlto/0.0.28]
+        docfiles: [COPYING, README.md]
+        configure_args:
+          - --with-tcltk
+          - --with-iconv=${GETTEXT_PREFIX}
+          - --with-perl=${PERL_PREFIX}/bin/perl
+        sub_packages:
+          - name: git-lfs
+            version: 3.5.1
+            build_args:
+    2.39.1;2.37.2;2.37.0;2.33.1;2.30.0;2.22.0;2.21.0:
+      config:
+        runtime_deps: [TclTk/8.6.9]
+        build_requires: [gcc/10.4., perl/5.30.0, asciidoc/8.6.9-1, xmlto/0.0.28, gettext/0.19.8]
+    2.3.3;2.8.1:
+      config:
+        runtime_deps: [Tcl/8.6.9, Tk/8.6.9]

-git/2.37.2:
- - dependencies: TclTk/8.6.9
-   build_requires: go/1.19 perl/5.30.0 asciidoc/8.6.9-1 xmlto/0.0.28 gettext/0.19.8
-   overlay: devel
-   relstage: unstable
-git/2.37.0:
- - dependencies: TclTk/8.6.9
-   build_requires: perl/5.30.0 asciidoc/8.6.9-1 xmlto/0.0.28 gettext/0.19.8
-git/2.33.1:
- - dependencies: TclTk/8.6.9
-   build_requires: perl/5.30.0 asciidoc/8.6.9-1 xmlto/0.0.28 gettext/0.19.8
-git/2.30.0:
- - dependencies: TclTk/8.6.9
-   build_requires: perl/5.30.0 asciidoc/8.6.9-1 xmlto/0.0.28 gettext/0.19.8
-git/2.22.0:
- - dependencies: TclTk/8.6.9
-   build_requires: perl/5.30.0 asciidoc/8.6.9-1 xmlto/0.0.28 gettext/0.19.8
-git/2.21.0:
- - dependencies: TclTk/8.6.9
-   build_requires: perl/5.30.0 asciidoc/8.6.9-1 xmlto/0.0.28 gettext/0.19.8
-git/2.8.1:
- - dependencies: Tcl/8.6.4 Tk/8.6.4
-git/2.3.3:
- - dependencies: Tcl/8.6.4 Tk/8.6.4
+git-lfs:
+  type: sub_package
+  defaults:
+    compile_in_sourcetree: true
+  versions:
+    3.5.1:
+      config:
+      variants:
+        -
+          kernels: [Linux]
+          target_cpus: [x86_64]
+          urls:
+            - url: https://github.com/git-lfs/git-lfs/releases/download/v3.5.1/git-lfs-linux-amd64-v3.5.1.tar.gz
+          build_functions:
+            configure: []
+            compile: []
--- a/Tools/gnuplot/build
+++ b/Tools/gnuplot/build
@@ -1,16 +1,5 @@
 #!/usr/bin/env modbuild

-pbuild::set_download_url \
-	"https://sourceforge.net/projects/gnuplot/files/$P/$V/$P-$V.tar.gz"
-pbuild::set_sha256sum 'gnuplot-5.2.4.tar.gz:1515f000bd373aaa53b16183f274189d4f5e0ae47d22f434857933d16a4770cb'
-pbuild::install_docfiles 'Copyright' 'NEWS' 'README'
-
-pbuild::add_to_group 'Tools'
-
-pbuild::pre_configure() {
-	pbuild::add_configure_args '--with-latex=no'
-	pbuild::add_configure_args '--with-qt=no'
-}
 # Local Variables:
 # mode: sh
 # sh-basic-offset: 8
--- a/Tools/gnuplot/files/config.yaml
+++ b/Tools/gnuplot/files/config.yaml
@@ -1,33 +1,43 @@
-overlay: base 
-relstage: stable
-group: Tools
-shasums:
-  gnuplot/5.4.4: 372300b7867f5b3538b25fc5d0ac7734af6e3fe0d202b6db926e4369913f0902
-  gnuplot/5.4.3: 51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84
-  gnuplot/5.4.2: e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba
-  gnuplot/5.4.1: 6b690485567eaeb938c26936e5e0681cf70c856d273cc2c45fabf64d8bc6590e
-  gnuplot/5.4.0: eb4082f03a399fd1e9e2b380cf7a4f785e77023d8dcc7e17570c1b5570a49c47
-  gnuplot/5.2.8: 60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37
-  gnuplot/5.2.7: 97fe503ff3b2e356fe2ae32203fc7fd2cf9cef1f46b60fe46dc501a228b9f4ed
-  gnuplot/5.2.6: 35dd8f013139e31b3028fac280ee12d4b1346d9bb5c501586d1b5a04ae7a94ee
-  gnuplot/5.2.4: 1515f000bd373aaa53b16183f274189d4f5e0ae47d22f434857933d16a4770cb
-  gnuplot/5.0.0: 417d4bc5bc914a60409bb75cf18dd14f48b07f53c6ad3c4a4d3cd9a8d7370faf
-  gnuplot/4.6.3: df5ffafa25fb32b3ecc0206a520f6bca8680e6dcc961efd30df34c0a1b7ea7f5
-
-gnuplot/5.4.5:
-    systems: rhel7 rhel6
-gnuplot/5.4.4:
-    systems: rhel7 rhel6
-gnuplot/5.4.3:
-gnuplot/5.4.2:       
-gnuplot/5.4.1:       
-gnuplot/5.4.0:       
-gnuplot/5.2.8:       
-gnuplot/5.2.7:       
-gnuplot/5.2.6:
-gnuplot/5.2.4:       
-gnuplot/5.2.0:       
-gnuplot/5.0.0:        
-gnuplot/4.6.3:
-
+---
+format: 1
+gnuplot:
+  defaults:
+    group: Tools
+    overlay: base
+    relstage: stable
+    systems: [rhel8, rhel7, rhel6]
+    docfiles: [Copyright, NEWS, README]
+    urls:
+      - url: https://sourceforge.net/projects/gnuplot/files/$P/$V/$P-${V_PKG}.tar.gz
+  shasums:
+    gnuplot-6.0.1.tar.gz: e85a660c1a2a1808ff24f7e69981ffcbac66a45c9dcf711b65610b26ea71379a
+    gnuplot-6.0.0.tar.gz: 635a28f0993f6ab0d1179e072ad39b8139d07f51237f841d93c6c2ff4b1758ec
+    gnuplot-5.4.10.tar.gz: 975d8c1cc2c41c7cedc4e323aff035d977feb9a97f0296dd2a8a66d197a5b27c
+    gnuplot-5.4.9.tar.gz: a328a021f53dc05459be6066020e9a71e8eab6255d3381e22696120d465c6a97
+    gnuplot-5.4.8.tar.gz: 931279c7caad1aff7d46cb4766f1ff41c26d9be9daf0bcf0c79deeee3d91f5cf
+    gnuplot-5.4.5.tar.gz: 66f679115dd30559e110498fc94d926949d4d370b4999a042e724b8e910ee478
+    gnuplot-5.4.4.tar.gz: 372300b7867f5b3538b25fc5d0ac7734af6e3fe0d202b6db926e4369913f0902
+    gnuplot-5.4.3.tar.gz: 51f89bbab90f96d3543f95235368d188eb1e26eda296912256abcd3535bd4d84
+    gnuplot-5.4.2.tar.gz: e57c75e1318133951d32a83bcdc4aff17fed28722c4e71f2305cfc2ae1cae7ba
+    gnuplot-5.4.1.tar.gz: 6b690485567eaeb938c26936e5e0681cf70c856d273cc2c45fabf64d8bc6590e
+    gnuplot-5.4.0.tar.gz: eb4082f03a399fd1e9e2b380cf7a4f785e77023d8dcc7e17570c1b5570a49c47
+    gnuplot-5.2.8.tar.gz: 60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37
+    gnuplot-5.2.7.tar.gz: 97fe503ff3b2e356fe2ae32203fc7fd2cf9cef1f46b60fe46dc501a228b9f4ed
+    gnuplot-5.2.6.tar.gz: 35dd8f013139e31b3028fac280ee12d4b1346d9bb5c501586d1b5a04ae7a94ee
+    gnuplot-5.2.4.tar.gz: 1515f000bd373aaa53b16183f274189d4f5e0ae47d22f434857933d16a4770cb
+    gnuplot-5.0.0.tar.gz: 417d4bc5bc914a60409bb75cf18dd14f48b07f53c6ad3c4a4d3cd9a8d7370faf
+    gnuplot-4.6.3.tar.gz: df5ffafa25fb32b3ecc0206a520f6bca8680e6dcc961efd30df34c0a1b7ea7f5
+  versions:
+    6.0.1;6.0.0:
+      config:
+        relstage: stable
+        systems: [rhel*, sles*]
+        configure_args: ['--with-latex=no', '--with-qt=no']
+    5.4.{0,1,2,3,4,5,8,9,10}:
+      config:
+        relstage: stable
+        systems: [rhel*, sles*]
+    5.2.{0,4,6,7,8};5.0.0:
+      config:
+        relstage: deprecated

--- a/Tools/gnutls/build-xml
+++ b/Tools/gnutls/build-xml
@@ -0,0 +1,8 @@
+#!/usr/bin/env modbuild
+
+#module use 'Libraries'
+
+pbuild::add_configure_args "--with-included-unistring"
+pbuild::add_configure_args "--with-included-libtasn1"
+pbuild::add_configure_args "--without-p11-kit"
+
--- a/Tools/gnutls/files/config.yaml
+++ b/Tools/gnutls/files/config.yaml
@@ -0,0 +1,17 @@
+format: 1
+gnutls:
+  defaults:
+    group: Tools
+    relstage: stable
+    docfiles:
+    urls:
+      - url: https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-${V_PKG}.tar.xz
+  shasums:
+    gnutls-3.5.19.tar.xz: 1936eb64f03aaefd6eb16cef0567457777618573826b94d03376bb6a4afadc44
+  versions:
+    3.5.19:
+    3.7.10:
+      config:
+        relstage: unstable
+        build_requires: [nettle/3.9.1, gmp/6.1.2-1]
+   
--- a/Tools/gnutls/modulefile
+++ b/Tools/gnutls/modulefile
@@ -1,18 +1,21 @@
 #%Module1.0

-module-whatis		"Toolkit for the TLS and SSL protocol"
-module-url		"https://openssl.org/"
-module-license		"Apache style"
+module-whatis		"secure communications library implementing the SSL, TLS and DTLS protocols"
+module-url		"https://www.gnutls.org"
+module-license		"GNU Lesser General Public License version 2.1"
 module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"

 module-help	"
-OpenSSL is an open source project that provides a robust, commercial-grade,
-and full-featured toolkit for the Transport Layer Security (TLS) and Secure
-Sockets Layer (SSL) protocols. It is also a general-purpose cryptography
-library. For more information about the team and community around the
-project, or to start making your own contributions, start with the community
-page. To get the latest news, download the source, and so on, please see the
-sidebar or the buttons at the top of every page.
+GnuTLS is a secure communications library implementing the SSL, TLS and
+DTLS protocols and technologies around them. It provides a simple C
+language application programming interface (API) to access the secure
+communications protocols as well as APIs to parse and write X.509,
+PKCS #12, and other required structures.
+
+The project strives to provide a secure communications back-end, simple
+to use and integrated with the rest of the base Linux libraries. A back-
+end designed to work and be secure out of the box, keeping the complexity
+of TLS and PKI out of application code.
 "

-append-path	PKG_CONFIG_PATH	$PREFIX/lib/pkgconfig
+#append-path	PKG_CONFIG_PATH	$PREFIX/lib/pkgconfig
--- a/Tools/moreutils/build
+++ b/Tools/moreutils/build
@@ -0,0 +1,31 @@
+#!/usr/bin/env modbuild
+
+pbuild::set_download_url \
+        "$P-${V_PKG}.tar.bz2"
+#pbuild::install_docfiles \
+#	COPYING \
+#	COPYING.LIB \
+#	COPYING3 \
+#	COPYING3.LIB \
+#	ChangeLog \
+#	MAINTAINERS \
+#	README \
+#	README-maintainer-mode
+
+pbuild::add_to_group 'Tools'
+pbuild::compile_in_sourcetree
+
+pbuild::configure(){ :; }
+pbuild::compile(){
+	make DOCBOOKXSL=/usr/share/sgml/docbook/xsl-stylesheets/
+}
+
+pbuild::install(){
+	make PREFIX="${PREFIX}" install
+}
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
--- a/Tools/moreutils/files/variants
+++ b/Tools/moreutils/files/variants
@@ -0,0 +1 @@
+moreutils/0.67	stable
--- a/Tools/moreutils/modulefile
+++ b/Tools/moreutils/modulefile
@@ -0,0 +1,28 @@
+#%Pmodule
+
+module-whatis		"collection of the unix tools"
+module-url		"https://joeyh.name/code/moreutils/"
+module-license		"GNU GPL v2"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help		"
+moreutils is a collection of the unix tools that nobody thought to write
+long ago when unix was young.
+
+- chronic: runs a command quietly unless it fails
+- combine: combine the lines in two files using boolean operations
+- errno: look up errno names and descriptions
+- ifdata: get network interface info without parsing ifconfig output
+- ifne: run a program if the standard input is not empty
+- isutf8: check if a file or standard input is utf-8
+- lckdo: execute a program with a lock held
+- mispipe: pipe two commands, returning the exit status of the first
+- parallel: run multiple jobs at once
+- pee: tee standard input to pipes
+- sponge: soak up standard input and write to a file
+- ts: timestamp standard input
+- vidir: edit a directory in your text editor
+- vipe: insert a text editor into a pipe
+- zrun: automatically uncompress arguments to command
+"
+
--- a/Tools/nvim/build
+++ b/Tools/nvim/build
@@ -0,0 +1,14 @@
+#!/usr/bin/env modbuild
+
+pbuild::install_linux_x86_64() {
+	cd "${PREFIX}"
+	tar --strip-components=1 -xvf "${PMODULES_DISTFILESDIR}/${P}-${V_PKG}-linux-x86_64.tar.gz"
+}
+
+}
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
--- a/Tools/nvim/files/config.yaml
+++ b/Tools/nvim/files/config.yaml
@@ -0,0 +1,20 @@
+---
+format: 1
+nvim:
+  defaults:
+    group: Tools
+    relstage: stable
+  shasums:
+    nvim-0.11.1-linux-x86_64.tar.gz: 92ecb2dbdfbd0c6d79b522e07c879f7743c5d395d0a4f13b0d4f668f8565527a
+  versions:
+    0.11.1:
+      config:
+        target_cpus: [x86_64]
+        urls:
+          - url: https://github.com/neovim/neovim/releases/download/v${V_PKG}/${P}-linux-x86_64.tar.gz
+            name: ${P}-${V_PKG}-linux-x86_64.tar.gz
+            unpacker: none
+        build_functions:
+          configure: []
+          compile: []
+          install: [pbuild::install_linux_x86_64]
--- a/Tools/nvim/modulefile
+++ b/Tools/nvim/modulefile
@@ -0,0 +1,11 @@
+#%Pmodule
+
+module-whatis		"hyperextensible Vim-based text editor"
+module-url		"https://neovim.io"
+module-license		"iApache License Version 2.0"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help		"
+hyperextensible Vim-based text editor
+"
+
--- a/Tools/openssl/build
+++ b/Tools/openssl/build
@@ -1,24 +1,13 @@
 #!/usr/bin/env modbuild

-pbuild::set_download_url "https://www.openssl.org/source/$P-$V.tar.gz"
-
 # use system gcc to compile
-declare -rx CC=gcc
+#declare -rx CC=gcc

-pbuild::add_to_group 'Tools'
-pbuild::compile_in_sourcetree
-
-pbuild::pre_configure_Darwin() {
-	pbuild::add_configure_args 'darwin64-x86_64-cc'
-}
-
-pbuild::pre_configure_Linux() {
-	pbuild::add_configure_args 'linux-x86_64'
-}
-
-pbuild::configure() {
+pbuild::configure(){
 	export CFLAGS='-fPIC'
-	"${SRC_DIR}"/Configure shared --prefix="${PREFIX}" "${CONFIGURE_ARGS[@]}" \
+	local -r os=$(uname -s)
+	local -r machine=$(uname -m)
+	"${SRC_DIR}"/Configure shared --prefix="${PREFIX}" "${os,,}-${machine}" \
 		|| exit 1
 }

--- a/Tools/openssl/files/config.yaml
+++ b/Tools/openssl/files/config.yaml
@@ -0,0 +1,43 @@
+---
+format: 1
+openssl:
+  defaults:
+    group: Tools
+    overlay: base
+    relstage: stable
+    compile_in_sourcetree: true
+    urls:
+      - url: https://www.openssl.org/source/$P-$V.tar.gz
+  shasums:
+  versions:
+    3.4.1:
+      config:
+        docfiles:
+          - ACKNOWLEDGEMENTS.md
+          - AUTHORS.md
+          - CHANGES.md
+          - CODE-OF-CONDUCT.md
+          - CONTRIBUTING.md
+          - HACKING.md
+          - INSTALL.md
+          - LICENSE.txt
+          - NEWS.md
+          - NOTES-ANDROID.md
+          - NOTES-ANSI.md
+          - NOTES-DJGPP.md
+          - NOTES-NONSTOP.md
+          - NOTES-PERL.md
+          - NOTES-POSIX.md
+          - NOTES-UNIX.md
+          - NOTES-VALGRIND.md
+          - NOTES-VMS.md
+          - NOTES-WINDOWS.md
+          - README-ENGINES.md
+          - README-FIPS.md
+          - README-PROVIDERS.md
+          - README-QUIC.md
+          - README.md
+          - SUPPORT.md
+        build_requires:
+          - perl/5.40.1
+
--- a/Tools/openssl/files/variants.rhel7
+++ b/Tools/openssl/files/variants.rhel7
@@ -0,0 +1,11 @@
+openssl/1.0.2h deprecated
+openssl/1.0.2j stable
+openssl/1.0.2m stable
+openssl/1.0.2o stable
+openssl/1.0.2r stable
+openssl/1.1.1g stable
+openssl/1.1.1k stable
+openssl/1.1.1l stable
+openssl/1.1.1m stable
+openssl/1.1.1v stable
+openssl/1.1.1w stable
--- a/Tools/parallel/build
+++ b/Tools/parallel/build
@@ -0,0 +1,21 @@
+#!/usr/bin/env modbuild
+
+pbuild::set_download_url \
+	"https://ftp.gnu.org/gnu/$P/$P-${V_PKG}.tar.bz2"
+pbuild::install_docfiles \
+	CITATION \
+	CITATION.cff \
+	CREDITS \
+	LICENSES/CC-BY-SA-4.0.txt \
+	LICENSES/GFDL-1.3-or-later.txt \
+	LICENSES/GPL-3.0-or-later.txt \
+	NEWS \
+	README
+
+pbuild::add_to_group 'Tools'
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
--- a/Tools/parallel/files/variants
+++ b/Tools/parallel/files/variants
@@ -0,0 +1 @@
+parallel/20230422	stable
--- a/Tools/parallel/modulefile
+++ b/Tools/parallel/modulefile
@@ -0,0 +1,16 @@
+#%Pmodule
+
+module-whatis		"shell tool for executing jobs in parallel"
+module-url		"https://www.gnu.org/software/parallel/"
+module-license		"GNU GPL v3 and others"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help		"
+GNU parallel is a shell tool for executing jobs in parallel using one or
+more computers. A job can be a single command or a small script that has
+to be run for each of the lines in the input. The typical input is a list
+of files, a list of hosts, a list of users, a list of URLs, or a list of
+tables. A job can also be a command that reads from a pipe. GNU parallel
+can then split the input and pipe it into commands in parallel. 
+"
+
--- a/Tools/redis/build
+++ b/Tools/redis/build
@@ -0,0 +1,31 @@
+#!/usr/bin/env modbuild
+
+pbuild::add_to_group 'Tools'
+
+pbuild::set_download_url \
+	"https://github.com/redis/redis/archive/${V_PKG}.tar.gz"
+
+pbuild::compile_in_sourcetree
+pbuild::install_docfiles \
+	00-RELEASENOTES \
+	BUGS \
+	CODE_OF_CONDUCT.md \
+	CONTRIBUTING.md \
+	COPYING \
+	INSTALL \
+	MANIFESTO \
+	README.md \
+	SECURITY.md \
+	TLS.md
+
+pbuild::configure() { :; }
+
+pbuild::install() {
+	make PREFIX="${PREFIX}" install
+}
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
--- a/Tools/redis/files/variants
+++ b/Tools/redis/files/variants
@@ -0,0 +1,2 @@
+redis/7.0.12	stable
+
--- a/Tools/redis/modulefile
+++ b/Tools/redis/modulefile
@@ -0,0 +1,16 @@
+#%Pmodule
+
+module-whatis		"open source, in-memory data store"
+module-url		"https://redis.io"
+module-license		"GNUPLOT_DIR/share/doc/redis/COPYING"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help		"
+Redis is an open source (BSD licensed), in-memory data structure store used
+as a database, cache, message broker, and streaming engine. Redis provides
+data structures such as strings, hashes, lists, sets, sorted sets with range
+queries, bitmaps, hyperloglogs, geospatial indexes, and streams. Redis has
+built-in replication, Lua scripting, LRU eviction, transactions, and different
+levels of on-disk persistence, and provides high availability via Redis
+Sentinel and automatic partitioning with Redis Cluster.
+"
--- a/Tools/restic/build
+++ b/Tools/restic/build
@@ -0,0 +1,11 @@
+#!/usr/bin/env modbuild
+
+pbuild::install() {
+	install -m 0755 -d "${PREFIX}/bin"
+	install -m 0755 "${SRC_DIR}/restic_${V_PKG}_linux_amd64" "${PREFIX}/bin/restic"
+}
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
--- a/Tools/restic/files/config.yaml
+++ b/Tools/restic/files/config.yaml
@@ -0,0 +1,20 @@
+format: 1
+restic:
+  defaults:
+    group: Tools
+    overlay: base 
+    relstage: stable
+    systems: [.*]
+    docfiles: []
+    build_functions:
+      configure: []
+      compile: []
+  shasums:
+    restic_0.18.0_linux_amd64.bz2: 98f6dd8bf5b59058d04bfd8dab58e196cc2a680666ccee90275a3b722374438e
+  versions:
+    0.18.0:
+      config:
+        target_cpus: [x86_64]
+        urls:
+          - url: https://github.com/restic/restic/releases/download/v${V_PKG}/restic_${V_PKG}_linux_amd64.bz2
+            unpacker: 7z
--- a/Tools/restic/modulefile
+++ b/Tools/restic/modulefile
@@ -0,0 +1,13 @@
+#%Pmodule
+
+module-whatis		"fast and secure backup program"
+module-url		"https://restic.readthedocs.io/en/stable/index.html"
+module-license		"BSD 2-Clause License"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help		"
+Restic is a fast and secure backup program. In the following sections, we
+will present typical workflows, starting with installing, preparing a new
+repository, and making the first backup.
+"
+
--- a/Tools/vim/build
+++ b/Tools/vim/build
@@ -1,6 +1,6 @@
 #!/usr/bin/env modbuild

-pbuild::set_download_url "ftp://ftp.vim.org/pub/vim/unix/$P-$V.tar.bz2"
+pbuild::set_download_url "http://ftp.vim.org/pub/vim/unix/$P-$V.tar.bz2"

 pbuild::add_to_group 'Tools'
 pbuild::compile_in_sourcetree
--- a/Tools/vim/files/variants
+++ b/Tools/vim/files/variants
@@ -1 +1,2 @@
 vim/8.0.586	stable	b:Python/2.7.14
+vim/9.0		stable	b:Python/3.8.12
--- a/Tools/xz/build
+++ b/Tools/xz/build
@@ -1,24 +1,12 @@
 #!/usr/bin/env modbuild

-pbuild::add_to_group 'Tools'
-
-pbuild::set_download_url \
-        "https://sourceforge.net/projects/lzmautils/files/$P-${V_PKG}.tar.gz"
-
-pbuild::set_sha256sum 'xz-5.2.4.tar.gz:b512f3b726d3b37b6dc4c8570e137b9311e7552e8ccbab4d39d47ce5f4177145'
-pbuild::install_docfiles \
-	AUTHORS \
-	COPYING \
-	COPYING.GPLv2 \
-	COPYING.GPLv3 \
-	COPYING.LGPLv2.1 \
-	ChangeLog \
-	NEWS \
-	PACKAGERS \
-	README \
-	THANKS \
-	TODO
-
+pbuild::post_prep(){
+	# autogen.sh exits with an error if po4a
+	# is not installed. For now we ignore this.
+	# :FIXME:
+	# build a po4a module 
+	./autogen.sh || :
+}
 # Local Variables:
 # mode: sh
 # sh-basic-offset: 8
--- a/Tools/xz/files/config.yaml
+++ b/Tools/xz/files/config.yaml
@@ -0,0 +1,26 @@
+---
+format: 1
+xz:
+  defaults:
+    group: Tools
+    overlay: base
+    relstage: stable
+    docfiles:
+      - AUTHORS
+      - COPYING
+      - COPYING.GPLv2
+      - COPYING.GPLv3
+      - COPYING.LGPLv2.1
+      - ChangeLog
+      - NEWS
+      - PACKAGERS
+      - README
+      - THANKS
+      - TODO
+    urls:
+      - url: https://sourceforge.net/projects/lzmautils/files/$P-${V_PKG}.tar.gz
+  shasums:
+  versions:
+    5.8.0:
+      config:
+