From 0725e430e245ff3ca8a28b4131a030638b564921 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Fri, 24 May 2024 15:58:42 +0200
Subject: [PATCH 01/90] maintainers: add uku3lig

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2dd8f636e90b..df8f40063cc2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21156,6 +21156,13 @@
     githubId = 12422133;
     name = "Chromo-residuum-opec";
   };
+  uku3lig = {
+    name = "uku";
+    email = "hi@uku.moe";
+    matrix = "@uku:m.uku.moe";
+    github = "uku3lig";
+    githubId = 61147779;
+  };
   ulrikstrid = {
     email = "ulrik.strid@outlook.com";
     github = "ulrikstrid";

From ba654492e57f31043e49a4b60cbdc1231540bee1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 Aug 2024 07:24:21 +0000
Subject: [PATCH 02/90] sublime-merge-dev: 2095 -> 2099

---
 .../version-management/sublime-merge/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix
index 490a0c464404..72dd93f5d33f 100644
--- a/pkgs/applications/version-management/sublime-merge/default.nix
+++ b/pkgs/applications/version-management/sublime-merge/default.nix
@@ -11,9 +11,9 @@ in
   } { };
 
   sublime-merge-dev = common {
-    buildVersion = "2095";
+    buildVersion = "2099";
     dev = true;
-    aarch64sha256 = "FmXz8VAWS7e0bB9NeXbihnhdhWMyNJJs6PNt+K2G0Bk=";
-    x64sha256 = "83Hw27RgGPgugpf4eMuWT6/MSQ2Q2VBCbaXoSGFtTPI=";
+    aarch64sha256 = "6rfUwzSBCJ3CRrL5E4+wBQ3FuB3PaAUCwh5pDtAbNKE=";
+    x64sha256 = "qIXDlsdaxY8wvky/ClwhZykZTVrUShsV56utb6BRCWQ=";
   } { };
 }

From e03a930dc3747085123a1043b99995852b79b08f Mon Sep 17 00:00:00 2001
From: DarkOnion0 <darkonion0@clapot.org>
Date: Tue, 13 Aug 2024 22:12:28 +0200
Subject: [PATCH 03/90] appflowy: 0.6.6 -> 0.6.7

https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.6.7
---
 pkgs/applications/office/appflowy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix
index 1df4815b6a28..f92652c1df30 100644
--- a/pkgs/applications/office/appflowy/default.nix
+++ b/pkgs/applications/office/appflowy/default.nix
@@ -17,11 +17,11 @@ let
     rec {
       x86_64-linux = {
         urlSuffix = "linux-x86_64.tar.gz";
-        hash = "sha256-2v7LF53UmVxFzoNHwv+B2zN7I6pSP66x32OplcIR7Fk=";
+        hash = "sha256-jEroFIe21sbqTlQoVw7HXJqv6BFKIx5ABF+CwKLDPZU=";
       };
       x86_64-darwin = {
         urlSuffix = "macos-universal.zip";
-        hash = "sha256-73Do2Jhso6GJsyDiSz3ACN8pEmZbuPNW3vjW3BFLhY4=";
+        hash = "sha256-o/4HeQIn6XfWA2tFqaSaenOKFYaCqeQK6SmHpNX70x0=";
       };
       aarch64-darwin = x86_64-darwin;
     }
@@ -29,7 +29,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "appflowy";
-  version = "0.6.6";
+  version = "0.6.7";
 
   src = fetchzip {
     url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";

From 3887cb35500376e54a65aa76f6448a336f3fd71b Mon Sep 17 00:00:00 2001
From: DarkOnion0 <darkonion0@clapot.org>
Date: Thu, 15 Aug 2024 10:17:58 +0200
Subject: [PATCH 04/90] appflowy: 0.6.7 -> 0.6.7.1

https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.6.7.1
---
 pkgs/applications/office/appflowy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix
index f92652c1df30..697655beea5d 100644
--- a/pkgs/applications/office/appflowy/default.nix
+++ b/pkgs/applications/office/appflowy/default.nix
@@ -17,11 +17,11 @@ let
     rec {
       x86_64-linux = {
         urlSuffix = "linux-x86_64.tar.gz";
-        hash = "sha256-jEroFIe21sbqTlQoVw7HXJqv6BFKIx5ABF+CwKLDPZU=";
+        hash = "sha256-i4MJMGANi4wIS+I2P1MvfqW6ln88kfwZt818ky64cAk=";
       };
       x86_64-darwin = {
         urlSuffix = "macos-universal.zip";
-        hash = "sha256-o/4HeQIn6XfWA2tFqaSaenOKFYaCqeQK6SmHpNX70x0=";
+        hash = "sha256-0umUD+dkG+sutA5qJ4YP1ZmsccJxz1TgRbzZ/yC6rFg=";
       };
       aarch64-darwin = x86_64-darwin;
     }
@@ -29,7 +29,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "appflowy";
-  version = "0.6.7";
+  version = "0.6.7.1";
 
   src = fetchzip {
     url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";

From cebbbf33c4a4bb90932f7f1fae0fa12ece9b95d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 Aug 2024 08:10:34 +0000
Subject: [PATCH 05/90] azure-static-sites-client: 1.0.026911 ->
 19449a00c0269fefc8f29a6d01801c4b19308181

---
 .../azure-static-sites-client/versions.json   | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json
index c2bd3989b8bc..8b5595ae40e7 100644
--- a/pkgs/development/tools/azure-static-sites-client/versions.json
+++ b/pkgs/development/tools/azure-static-sites-client/versions.json
@@ -1,25 +1,44 @@
 [
   {
     "version": "latest",
-    "buildId": "1.0.026911",
-    "publishDate": "2024-05-15T19:23:23.3973684Z",
+    "buildId": "19449a00c0269fefc8f29a6d01801c4b19308181",
+    "publishDate": "2024-08-06T04:39:59.0569065Z",
     "files": {
       "linux-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/linux/StaticSitesClient",
-        "sha": "e1d9e033c973a35f64b7e41b6a114bd8e48022c9c3f7676e79047e87245a874d"
+        "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/linux/StaticSitesClient",
+        "sha": "87b0852f6a839fcf8e7d76df78aea1d36b803bb4cc4610fa9cd9531ff53175f0"
       },
       "win-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/windows/StaticSitesClient.exe",
-        "sha": "c67e5eed2b28fcf5c98348732653d1e2b37d842e6dde9a6b30322832c5d86fc7"
+        "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/windows/StaticSitesClient.exe",
+        "sha": "8d21e065a68a9aa983fdf95f6965b76f19286dba3dcc159d9af212b3fea31126"
       },
       "osx-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/macOS/StaticSitesClient",
-        "sha": "18ca42a1b13db9b8b6db6bd8c77e65def56fa7bf3ce3fb1184e890d8cd7dd033"
+        "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/macOS/StaticSitesClient",
+        "sha": "a8d40d343d4135ccca4ebfd754d0e5c0d71821786a4d7c1b0d42c1b2679c80c1"
       }
     }
   },
   {
     "version": "stable",
+    "buildId": "19449a00c0269fefc8f29a6d01801c4b19308181",
+    "publishDate": "2024-08-06T04:39:59.0569065Z",
+    "files": {
+      "linux-x64": {
+        "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/linux/StaticSitesClient",
+        "sha": "87b0852f6a839fcf8e7d76df78aea1d36b803bb4cc4610fa9cd9531ff53175f0"
+      },
+      "win-x64": {
+        "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/windows/StaticSitesClient.exe",
+        "sha": "8d21e065a68a9aa983fdf95f6965b76f19286dba3dcc159d9af212b3fea31126"
+      },
+      "osx-x64": {
+        "url": "https://swalocaldeploy.azureedge.net/downloads/19449a00c0269fefc8f29a6d01801c4b19308181/macOS/StaticSitesClient",
+        "sha": "a8d40d343d4135ccca4ebfd754d0e5c0d71821786a4d7c1b0d42c1b2679c80c1"
+      }
+    }
+  },
+  {
+    "version": "backup",
     "buildId": "1.0.026911",
     "publishDate": "2024-05-15T19:23:23.3973684Z",
     "files": {
@@ -36,24 +55,5 @@
         "sha": "18ca42a1b13db9b8b6db6bd8c77e65def56fa7bf3ce3fb1184e890d8cd7dd033"
       }
     }
-  },
-  {
-    "version": "backup",
-    "buildId": "1.0.026792",
-    "publishDate": "2024-05-03T18:31:36.0288058Z",
-    "files": {
-      "linux-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026792/linux/StaticSitesClient",
-        "sha": "a9dcd998d22a3476fb97fe1c446e83cc7f060a3a36cdb6757b828d0facc42347"
-      },
-      "win-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026792/windows/StaticSitesClient.exe",
-        "sha": "15f03e3f91208db2ea4015c4fce0623a692da1a289f23a782578ab7bc8a810e2"
-      },
-      "osx-x64": {
-        "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026792/macOS/StaticSitesClient",
-        "sha": "454b10f0351694ec3475a3d85b8746356932b2061a5be7e7fc093a6509cf000c"
-      }
-    }
   }
 ]

From bf28f8492d3f02f1d71ed85181c0356763d62a19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 00:34:19 +0000
Subject: [PATCH 06/90] moon: 1.27.6 -> 1.27.10

---
 pkgs/development/tools/build-managers/moon/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix
index 849724b80148..9c3c2f532308 100644
--- a/pkgs/development/tools/build-managers/moon/default.nix
+++ b/pkgs/development/tools/build-managers/moon/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "moon";
-  version = "1.27.6";
+  version = "1.27.10";
 
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-oadbF1bXDaJPp6R7C6Ozm5NgFPmvPwgiPIDuRiNrWg8=";
+    hash = "sha256-RAOPF47uUgF8ORECr04YcngWacaKQrMlQaG9YnECVdc=";
   };
 
-  cargoHash = "sha256-p3CBjdWOutEWIQMWS5nAYAsE9BQf2MViyoLIOD1OE/s=";
+  cargoHash = "sha256-pQvto1G0XptEaAStbOKd2q4nlt4sKpIYu7K9lqakkTk=";
 
   env = {
     RUSTFLAGS = "-C strip=symbols";

From 4fd353c08facc5b04a883a37c63e0de88e1db4eb Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Mon, 26 Aug 2024 17:36:13 -0400
Subject: [PATCH 07/90] yarg: init at 0.12.6

---
 pkgs/by-name/ya/yarg/package.nix | 126 +++++++++++++++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 pkgs/by-name/ya/yarg/package.nix

diff --git a/pkgs/by-name/ya/yarg/package.nix b/pkgs/by-name/ya/yarg/package.nix
new file mode 100644
index 000000000000..47c179af860f
--- /dev/null
+++ b/pkgs/by-name/ya/yarg/package.nix
@@ -0,0 +1,126 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  autoPatchelfHook,
+  alsa-lib,
+  gtk3,
+  zlib,
+  dbus,
+  hidapi,
+  libGL,
+  libXcursor,
+  libXext,
+  libXi,
+  libXinerama,
+  libxkbcommon,
+  libXrandr,
+  libXScrnSaver,
+  libXxf86vm,
+  udev,
+  vulkan-loader,
+  wayland, # (not used by default, enable with SDL_VIDEODRIVER=wayland - doesn't support HiDPI)
+  makeDesktopItem,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "yarg";
+  version = "0.12.6";
+
+  src = fetchzip {
+    url = "https://github.com/YARC-Official/YARG/releases/download/v${finalAttrs.version}/YARG_v${finalAttrs.version}-Linux-x86_64.zip";
+    stripRoot = false;
+    hash = "sha256-Za+CnuSTfJZVdW0pWvGDnKcbhZsgtNPRWYj1qOA8+Zs=";
+  };
+
+  nativeBuildInputs = [ autoPatchelfHook ];
+
+  buildInputs = [
+    # Load-time libraries (loaded from DT_NEEDED section in ELF binary)
+    alsa-lib
+    gtk3
+    stdenv.cc.cc.lib
+    zlib
+
+    # Run-time libraries (loaded with dlopen)
+    dbus
+    hidapi
+    libGL
+    libXcursor
+    libXext
+    libXi
+    libXinerama
+    libxkbcommon
+    libXrandr
+    libXScrnSaver
+    libXxf86vm
+    udev
+    vulkan-loader
+    wayland
+  ];
+
+  desktopItem = makeDesktopItem {
+    name = "yarg";
+    desktopName = "YARG";
+    comment = finalAttrs.meta.description;
+    icon = "yarg";
+    exec = "yarg";
+    categories = [ "Game" ];
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 YARG "$out/bin/yarg"
+    install -Dm644 UnityPlayer.so "$out/libexec/yarg/UnityPlayer.so"
+
+    mkdir -p "$out/share/pixmaps"
+    cp -r YARG_Data "$out/share/yarg"
+    ln -s "$out/share/yarg" "$out/bin/yarg_Data"
+    ln -s "$out/share/yarg/Resources/UnityPlayer.png" "$out/share/pixmaps/yarg.png"
+    install -Dm644 "$desktopItem/share/applications/yarg.desktop" "$out/share/applications/yarg.desktop"
+
+    runHook postInstall
+  '';
+
+  # Patch required run-time libraries as load-time libraries
+  #
+  # Libraries found with:
+  # > strings UnityPlayer.so | grep '\.so'
+  # and:
+  # > LD_DEBUG=libs yarg
+  postFixup = ''
+    patchelf \
+      --add-needed libasound.so.2 \
+      --add-needed libdbus-1.so.3 \
+      --add-needed libGL.so.1 \
+      --add-needed libhidapi-hidraw.so.0 \
+      --add-needed libpthread.so.0 \
+      --add-needed libudev.so.1 \
+      --add-needed libvulkan.so.1 \
+      --add-needed libwayland-client.so.0 \
+      --add-needed libwayland-cursor.so.0 \
+      --add-needed libwayland-egl.so.1 \
+      --add-needed libX11.so.6 \
+      --add-needed libXcursor.so.1 \
+      --add-needed libXext.so.6 \
+      --add-needed libXi.so.6 \
+      --add-needed libXinerama.so.1 \
+      --add-needed libxkbcommon.so.0 \
+      --add-needed libXrandr.so.2 \
+      --add-needed libXss.so.1 \
+      --add-needed libXxf86vm.so.1 \
+      "$out/libexec/yarg/UnityPlayer.so"
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "Free, open-source, plastic guitar game";
+    homepage = "https://yarg.in";
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ kira-bruneau ];
+    platforms = [ "x86_64-linux" ];
+  };
+})

From f50034b1bb304341f1e8dd85d2e0f4988de24ea1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 Aug 2024 04:34:01 +0000
Subject: [PATCH 08/90] vcpkg: 2024.07.12 -> 2024.08.23

---
 pkgs/by-name/vc/vcpkg/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix
index 98c040af0d25..703ff4d0600d 100644
--- a/pkgs/by-name/vc/vcpkg/package.nix
+++ b/pkgs/by-name/vc/vcpkg/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "vcpkg";
-  version = "2024.07.12";
+  version = "2024.08.23";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vcpkg";
     rev = finalAttrs.version;
-    hash = "sha256-WE+BeF9BYR9/Gmi60g6ApXsWQ2vch2N6XhH1A9HAHsc=";
+    hash = "sha256-cJOy7DG5Ea5cpnHvUiv70FV2ULrevs64Bu5eBJi9BLs=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"

From f1705382585bb9d6fde673a6ce0d243b528127ca Mon Sep 17 00:00:00 2001
From: DarkOnion0 <darkonion0@clapot.org>
Date: Wed, 21 Aug 2024 10:03:11 +0200
Subject: [PATCH 09/90] appflowy: 0.6.7.1 -> 0.6.7.2

https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.6.7.2
---
 pkgs/applications/office/appflowy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix
index 697655beea5d..132c894507cb 100644
--- a/pkgs/applications/office/appflowy/default.nix
+++ b/pkgs/applications/office/appflowy/default.nix
@@ -17,11 +17,11 @@ let
     rec {
       x86_64-linux = {
         urlSuffix = "linux-x86_64.tar.gz";
-        hash = "sha256-i4MJMGANi4wIS+I2P1MvfqW6ln88kfwZt818ky64cAk=";
+        hash = "sha256-2hrrK3ACYPzkSDxhjOevO8yykwWjS9gARz3A0er7SO4=";
       };
       x86_64-darwin = {
         urlSuffix = "macos-universal.zip";
-        hash = "sha256-0umUD+dkG+sutA5qJ4YP1ZmsccJxz1TgRbzZ/yC6rFg=";
+        hash = "sha256-07u1KUfbYTBDFbmZK9ZHgutnhLMlcqQCg5l+z3ChTn0=";
       };
       aarch64-darwin = x86_64-darwin;
     }
@@ -29,7 +29,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "appflowy";
-  version = "0.6.7.1";
+  version = "0.6.7.2";
 
   src = fetchzip {
     url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";

From 8719eb45524dc38d0324b730e87edb4cb45c44ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 8 Aug 2024 05:15:46 -0700
Subject: [PATCH 10/90] python312Packages.blis: 0.7.11 -> 1.0.0

Diff: https://github.com/explosion/cython-blis/compare/v0.7.11...release-v1.0.0

Changelog: https://github.com/explosion/cython-blis/releases/tag/release-v1.0.0
---
 .../python-modules/blis/default.nix           | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix
index f6075a7e5bc6..cda35bcb9370 100644
--- a/pkgs/development/python-modules/blis/default.nix
+++ b/pkgs/development/python-modules/blis/default.nix
@@ -3,33 +3,41 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
-  cython_0,
+  cython,
   hypothesis,
   numpy,
   pytestCheckHook,
   pythonOlder,
+  blis,
+  numpy_2,
   gitUpdater,
 }:
 
 buildPythonPackage rec {
   pname = "blis";
-  version = "0.7.11";
+  version = "1.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "explosion";
     repo = "cython-blis";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-p8pzGZc5OiiGTvXULDgzsBC3jIhovTKUq3RtPnQ/+to=";
+    rev = "refs/tags/release-v${version}";
+    hash = "sha256-XS6h2c+8BJ9pAvIX8340C4vRZEBRmEZc6/6tH7ooqNU=";
   };
 
   postPatch = ''
+    # The commit pinning numpy to version 2 doesn't have any functional changes:
+    # https://github.com/explosion/cython-blis/pull/108
+    # BLIS should thus work with numpy and numpy_2.
+    substituteInPlace pyproject.toml setup.py \
+      --replace-fail "numpy>=2.0.0,<3.0.0" numpy
+
     # See https://github.com/numpy/numpy/issues/21079
     # has no functional difference as the name is only used in log output
     substituteInPlace blis/benchmark.py \
-      --replace 'numpy.__config__.blas_ilp64_opt_info["libraries"]' '["dummy"]'
+      --replace-fail 'numpy.__config__.blas_ilp64_opt_info["libraries"]' '["dummy"]'
   '';
 
   preCheck = ''
@@ -37,12 +45,13 @@ buildPythonPackage rec {
     rm -rf ./blis
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
-    cython_0
+    cython
+    numpy
   ];
 
-  propagatedBuildInputs = [ numpy ];
+  dependencies = [ numpy ];
 
   nativeCheckInputs = [
     hypothesis
@@ -52,16 +61,18 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "blis" ];
 
   passthru = {
-    # Do not update to BLIS 0.9.x until the following issue is resolved:
-    # https://github.com/explosion/thinc/issues/771#issuecomment-1255825935
-    skipBulkUpdate = true;
+    tests = {
+      numpy_2 = blis.overridePythonAttrs (old: {
+        numpy = numpy_2;
+      });
+    };
     updateScript = gitUpdater {
-      rev-prefix = "v";
-      ignoredVersions = "0\.9\..*";
+      rev-prefix = "release-v";
     };
   };
 
   meta = with lib; {
+    changelog = "https://github.com/explosion/cython-blis/releases/tag/release-v${version}";
     description = "BLAS-like linear algebra library";
     homepage = "https://github.com/explosion/cython-blis";
     license = licenses.bsd3;

From 1f03dd265f9277d7e21e01c8abba1ba0f4a907f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 1 Sep 2024 16:40:20 -0700
Subject: [PATCH 11/90] python312Packages.thinc: 8.2.3 -> 8.3.0

Changelog: https://github.com/explosion/thinc/releases/tag/v8.2.4
           https://github.com/explosion/thinc/releases/tag/v8.2.5
           https://github.com/explosion/thinc/releases/tag/v8.3.0
---
 .../python-modules/thinc/default.nix          | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index 86700bd0aed2..b0754a32de76 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -16,7 +16,6 @@
   mock,
   murmurhash,
   numpy,
-  plac,
   preshed,
   pydantic,
   pytestCheckHook,
@@ -24,51 +23,59 @@
   pythonOlder,
   setuptools,
   srsly,
-  tqdm,
   typing-extensions,
   wasabi,
 }:
 
 buildPythonPackage rec {
   pname = "thinc";
-  version = "8.2.3";
-  format = "setuptools";
+  version = "8.3.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9a/FIikSqAvai9zslYNiorpTjXAn3I22FUhF0oWdynY=";
+    hash = "sha256-6zvtVPXADsmt2qogjFHM+gWUg9cxQM1RWqMzc3Fcblk=";
   };
 
   postPatch = ''
+    # As per https://github.com/explosion/thinc/releases/tag/release-v8.3.0 no
+    # code changes were required for NumPy 2.0. Thus Thinc should be compatible
+    # with NumPy 1.0 and 2.0.
+    substituteInPlace pyproject.toml setup.cfg \
+      --replace-fail "numpy>=2.0.0,<2.1.0" numpy
     substituteInPlace setup.cfg \
-      --replace "preshed>=3.0.2,<3.1.0" "preshed"
+      --replace-fail "numpy>=2.0.1,<2.1.0" numpy
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [
+    blis
+    cymem
+    cython_0
+    murmurhash
+    numpy
+    preshed
+    setuptools
+  ];
 
-  buildInputs =
-    [ cython_0 ]
-    ++ lib.optionals stdenv.isDarwin [
-      Accelerate
-      CoreFoundation
-      CoreGraphics
-      CoreVideo
-    ];
+  buildInputs = lib.optionals stdenv.isDarwin [
+    Accelerate
+    CoreFoundation
+    CoreGraphics
+    CoreVideo
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     blis
     catalogue
     confection
     cymem
     murmurhash
     numpy
-    plac
     preshed
     pydantic
     srsly
-    tqdm
     wasabi
   ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
 
@@ -78,10 +85,7 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  # Add native extensions.
   preCheck = ''
-    export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
-
     # avoid local paths, relative imports wont resolve correctly
     mv thinc/tests tests
     rm -r thinc

From 275871df0ecb11bfc422ce8da2601b51e508b146 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Sep 2024 13:20:00 +0000
Subject: [PATCH 12/90] kuttl: 0.18.0 -> 0.19.0

---
 pkgs/applications/networking/cluster/kuttl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix
index c6402dbb103b..88b8cfc73a33 100644
--- a/pkgs/applications/networking/cluster/kuttl/default.nix
+++ b/pkgs/applications/networking/cluster/kuttl/default.nix
@@ -2,17 +2,17 @@
 
 buildGoModule rec {
   pname = "kuttl";
-  version = "0.18.0";
+  version = "0.19.0";
   cli = "kubectl-kuttl";
 
   src = fetchFromGitHub {
     owner = "kudobuilder";
     repo = "kuttl";
     rev = "v${version}";
-    sha256 = "sha256-wTnBMNgwHqK8PdpEa3RAsVJemnGw/ymn6GJciPFsYrU=";
+    sha256 = "sha256-7fcVmLvRbKYuWuqwqZWlQf08YEyowcTxrp5RteV8qyU=";
   };
 
-  vendorHash = "sha256-RKQM1JxyZA1HwqRjCULY4X3jZK9SgclW55/qXp395cQ=";
+  vendorHash = "sha256-E6gzr9gCLbRaoJU/pYA2cAy0rv5SUVmwf0m34lchF+M=";
 
   subPackages = [ "cmd/kubectl-kuttl" ];
 

From 83c48b4d47f5d3486370bf6e5d6fe52f23146fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 2 Sep 2024 13:03:54 -0700
Subject: [PATCH 13/90] python311Packages.spacy: unpin thinc

---
 pkgs/development/python-modules/spacy/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 9842e22c92d9..5467d1da05b1 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -50,6 +50,13 @@ buildPythonPackage rec {
     hash = "sha256-pkjGy/Ksx6Vaae6ef6TyK99pqoKKWHobxc//CM88LdM=";
   };
 
+  postPatch = ''
+    # thinc version 8.3.0 had no functional changes
+    # also see https://github.com/explosion/spaCy/issues/13607
+    substituteInPlace pyproject.toml setup.cfg \
+      --replace-fail "thinc>=8.2.2,<8.3.0" "thinc>=8.2.2,<8.4.0"
+  '';
+
   pythonRelaxDeps = [
     "smart-open"
     "typer"

From d3f0837c958c414a08f4198dd8ecd5a9677d905e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 2 Sep 2024 12:17:28 -0700
Subject: [PATCH 14/90] python311Packages.spacy: 3.7.5 -> 3.7.6

Changelog: https://github.com/explosion/spaCy/releases/tag/release-v3.7.6
---
 .../python-modules/spacy/default.nix          | 29 +++++++------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 5467d1da05b1..51d20b3f2498 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -10,13 +10,11 @@
   fetchPypi,
   hypothesis,
   jinja2,
-  jsonschema,
   langcodes,
   mock,
   murmurhash,
   numpy,
   packaging,
-  pathy,
   preshed,
   pydantic,
   pytestCheckHook,
@@ -29,7 +27,6 @@
   thinc,
   tqdm,
   typer,
-  typing-extensions,
   wasabi,
   weasel,
   writeScript,
@@ -40,14 +37,14 @@
 
 buildPythonPackage rec {
   pname = "spacy";
-  version = "3.7.5";
+  version = "3.7.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pkjGy/Ksx6Vaae6ef6TyK99pqoKKWHobxc//CM88LdM=";
+    hash = "sha256-9AZcCqxcSLv7L/4ZHVXMszv7AFN2r71MzW1ek0FRTjQ=";
   };
 
   postPatch = ''
@@ -57,26 +54,22 @@ buildPythonPackage rec {
       --replace-fail "thinc>=8.2.2,<8.3.0" "thinc>=8.2.2,<8.4.0"
   '';
 
-  pythonRelaxDeps = [
-    "smart-open"
-    "typer"
-  ];
-
-  nativeBuildInputs = [
+  build-system = [
+    cymem
     cython_0
+    murmurhash
+    numpy
+    thinc
   ];
 
-  propagatedBuildInputs = [
-    blis
+  dependencies = [
     catalogue
     cymem
     jinja2
-    jsonschema
     langcodes
     murmurhash
     numpy
     packaging
-    pathy
     preshed
     pydantic
     requests
@@ -89,7 +82,7 @@ buildPythonPackage rec {
     typer
     wasabi
     weasel
-  ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ];
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
@@ -97,8 +90,6 @@ buildPythonPackage rec {
     mock
   ];
 
-  doCheck = true;
-
   # Fixes ModuleNotFoundError when running tests on Cythonized code. See #255262
   preCheck = ''
     cd $out
@@ -139,7 +130,7 @@ buildPythonPackage rec {
     description = "Industrial-strength Natural Language Processing (NLP)";
     mainProgram = "spacy";
     homepage = "https://github.com/explosion/spaCy";
-    changelog = "https://github.com/explosion/spaCy/releases/tag/v${version}";
+    changelog = "https://github.com/explosion/spaCy/releases/tag/release-v${version}";
     license = licenses.mit;
     maintainers = [ ];
   };

From 3187df8bac83508df1acf944b74ac895b8b70999 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Sep 2024 01:07:32 +0000
Subject: [PATCH 15/90] fast-float: 6.1.4 -> 6.1.5

---
 pkgs/by-name/fa/fast-float/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix
index b6270a6eaa73..6b24b668013f 100644
--- a/pkgs/by-name/fa/fast-float/package.nix
+++ b/pkgs/by-name/fa/fast-float/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fast-float";
-  version = "6.1.4";
+  version = "6.1.5";
 
   src = fetchFromGitHub {
     owner = "fastfloat";
     repo = "fast_float";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-0eVovauN7SnO3nSIWBRWAJ4dR7q5beZrIGUZ18M2pao=";
+    hash = "sha256-tFHrvwZKZkNkJM5VEpWRPD+yDMH1seuNDR/Rd9pCqBg=";
   };
 
   nativeBuildInputs = [ cmake ];

From a513b7c8088f8b645e599908f296d4dea600dac1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Sep 2024 05:07:05 +0000
Subject: [PATCH 16/90] xpipe: 11.0 -> 11.1

---
 pkgs/applications/networking/xpipe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/applications/networking/xpipe/default.nix
index ab7fe6bdb2cf..652c0c4f6d66 100644
--- a/pkgs/applications/networking/xpipe/default.nix
+++ b/pkgs/applications/networking/xpipe/default.nix
@@ -33,14 +33,14 @@ let
   }.${system} or throwSystem;
 
   hash = {
-    x86_64-linux = "sha256-l67oq9Jj2mmxcLsEMI4t+85cKD65xxMNkTNJrrRrwJQ=";
+    x86_64-linux = "sha256-DoN6I1lk4WpOZ+jC+od7jum3lxBHFppea5QFTuqY5nk=";
   }.${system} or throwSystem;
 
   displayname = "XPipe";
 
 in stdenvNoCC.mkDerivation rec {
   pname = "xpipe";
-  version = "11.0";
+  version = "11.1";
 
   src = fetchzip {
     url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz";

From 941e3ccbc418133f031a157e4a28c1870a685173 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 3 Sep 2024 15:14:35 +0200
Subject: [PATCH 17/90] k3s_1_28: 1.28.12+k3s1 -> 1.28.13+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.28.13%2Bk3s1
---
 .../cluster/k3s/1_28/images-versions.json        | 16 ++++++++--------
 .../networking/cluster/k3s/1_28/versions.nix     | 12 ++++++------
 pkgs/top-level/all-packages.nix                  |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json
index f5e27995f056..04c0f6616107 100644
--- a/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "0dhzkn5y3ng7blyxj4bwrhbq5qvl3hq1hzg0h9633h8swv0xbsss"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "1v3vyrb86xijyvljs0s0skhxpjbarjqg2sx9m40332dfq9din7xq"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "1225nqsfg7p6iq7a7qibzf3d0r7iwn53hnd9w6l189dxqna97015"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "0yifpx6vix5bjzkz81i5rsn89hkpp0rhk77ndl1lgy66pq4csbmm"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "1lic564naj9323dkkq0z0y10n3j3yfmhixargqqs60syanfvj2p7"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "1p8zf47pghhjqhrcvmzdbcfxxy78pjpqwvmhm3wdidsa8xyy375a"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-images.txt",
-    "sha256": "1my3lfs5rfazcnnpsc9dj84dfnxx88xydrl86z6yw5n5p84x4nif"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-images.txt",
+    "sha256": "1f1d33jn4g5b6zmzdzzm4ffwfrmjwh60v9gnph0ysxjwsq1k0pxp"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix
index a6149c0d6e51..9128fbda8dfb 100644
--- a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix
@@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.28.12+k3s1";
-  k3sCommit = "4717e2a58e04f0ba3d9f43d574a7eff01dea9146";
-  k3sRepoSha256 = "02wywlqqna0dj9cam6q3ykb3p5mi96f6lclrg5yhjky7jdvkffds";
-  k3sVendorHash = "sha256-RyUlaGQnfrCm4cB5FRs9IAeF+zn4LzAXmIViU3o30Z4=";
+  k3sVersion = "1.28.13+k3s1";
+  k3sCommit = "47737e1c4c941325574e8aa14e4a3af2e596f696";
+  k3sRepoSha256 = "1x66n36lxcvi5d9bdz0f1w2p24493rh3vbk1pskqd1f3v3fbv7kn";
+  k3sVendorHash = "sha256-/knBr0l7dZ6lX9QpohyPNrFEi4WQpNM01zOE5bCIB2E=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.0";
   k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl";
   k3sCNIVersion = "1.4.0-k3s2";
   k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa";
-  containerdVersion = "1.7.17-k3s1.28";
-  containerdSha256 = "0nhhx932j551ran3kkvyp4nmsg5c71mq0g6jrcbs2j4nn7yqdkhm";
+  containerdVersion = "1.7.20-k3s2.28";
+  containerdSha256 = "0jqqa9202d94qd7g8d5zy161snlsc42cdjpmp50w4j3pnp2i1cki";
   criCtlVersion = "1.26.0-rc.0-k3s1";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5886f745ff6d..4610c81d0744 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31091,8 +31091,8 @@ with pkgs;
   inherit (callPackage ../applications/networking/cluster/k3s {
     buildGoModule = buildGo121Module;
     go = go_1_21;
-  }) k3s_1_28 k3s_1_29;
-  inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_30;
+  }) k3s_1_29;
+  inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_28 k3s_1_30;
   k3s = k3s_1_30;
 
   k3sup = callPackage ../applications/networking/cluster/k3sup { };

From 864f4c22766313c860b3d3f2cf2c1762d1459793 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 3 Sep 2024 15:31:25 +0200
Subject: [PATCH 18/90] k3s_1_29: 1.29.7+k3s2 -> 1.29.8+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.29.8%2Bk3s1
---
 .../cluster/k3s/1_29/images-versions.json        | 16 ++++++++--------
 .../networking/cluster/k3s/1_29/versions.nix     | 12 ++++++------
 pkgs/top-level/all-packages.nix                  |  6 +-----
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json
index 39b6faf17a46..ac4b6556128d 100644
--- a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "1dyh107ygnlv9gyq2f9jdgrwjiyg25a61id69z48vc60gq480888"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "1v3vyrb86xijyvljs0s0skhxpjbarjqg2sx9m40332dfq9din7xq"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "16l6d1ix3ri1l2wr2k5brg11a1snbkqhqasrk69wrix6diddklrn"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "0yifpx6vix5bjzkz81i5rsn89hkpp0rhk77ndl1lgy66pq4csbmm"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "0pg4nzh1rf28003yxhl3jklxs41vjjgldviybvnqqp146ib6hy0r"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "1p8zf47pghhjqhrcvmzdbcfxxy78pjpqwvmhm3wdidsa8xyy375a"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.7%2Bk3s1/k3s-images.txt",
-    "sha256": "1my3lfs5rfazcnnpsc9dj84dfnxx88xydrl86z6yw5n5p84x4nif"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-images.txt",
+    "sha256": "1f1d33jn4g5b6zmzdzzm4ffwfrmjwh60v9gnph0ysxjwsq1k0pxp"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix
index f27ea9030173..fd5654980afd 100644
--- a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix
@@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.29.7+k3s1";
-  k3sCommit = "f246bbc390a05f45431e49617b58013fe06a460d";
-  k3sRepoSha256 = "0fv628rxxavqmb2gv0ncsx4m8ghn3v6ddn2n06x8q4ar27d9gijg";
-  k3sVendorHash = "sha256-pAOyGgEaO6ewNv+6yhDt83NZl95rmLseFUs4vlXNH6Q=";
+  k3sVersion = "1.29.8+k3s1";
+  k3sCommit = "33fdc35dd67cf6c07989327e992fd26ed89b2449";
+  k3sRepoSha256 = "0ky5f039nkhdj6y5v9yr6lk875l29c67j6kqc2dzdb3iqbwskcbr";
+  k3sVendorHash = "sha256-VxVGBvpeKf/nuw09Llf85d4P8oCD2GvD1f0Mxt6fMj8=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.0";
   k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl";
   k3sCNIVersion = "1.4.0-k3s2";
   k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa";
-  containerdVersion = "1.7.17-k3s1";
-  containerdSha256 = "1j61mbgx346ydvnjd8b07wf7nmvvplx28wi5jjdzi1k688r2hxpf";
+  containerdVersion = "1.7.20-k3s1";
+  containerdSha256 = "12ihr3z8vcglv5b0v9ris29zkkkdvjbcp3bf7ym71a0xdbg83s8i";
   criCtlVersion = "1.29.0-k3s1";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4610c81d0744..4431be64a3f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31088,11 +31088,7 @@ with pkgs;
 
   jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };
 
-  inherit (callPackage ../applications/networking/cluster/k3s {
-    buildGoModule = buildGo121Module;
-    go = go_1_21;
-  }) k3s_1_29;
-  inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_28 k3s_1_30;
+  inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_28 k3s_1_29 k3s_1_30;
   k3s = k3s_1_30;
 
   k3sup = callPackage ../applications/networking/cluster/k3sup { };

From de4b0a02bcfabc596c60c63e50f52e6940ac2b5d Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 3 Sep 2024 15:41:49 +0200
Subject: [PATCH 19/90] k3s_1_30: 1.30.3+k3s1 -> 1.30.4+k3s1

https://github.com/k3s-io/k3s/releases/tag/v1.30.4%2Bk3s1
---
 .../cluster/k3s/1_30/images-versions.json        | 16 ++++++++--------
 .../networking/cluster/k3s/1_30/versions.nix     | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
index e65329390325..cc2e2498d644 100644
--- a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
+++ b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json
@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "1ym7cdm3a2f05wgh4vba2g7q1zihrfvvm2zngcs0gm8djj7hy4d9"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "145sj4gpwdjvfv3bphpdg6db1d83bbwl0shbnsqpjizsm3ifvmm9"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "15mj949msrd30xhqryhpsvx1bi3pywm1z5bmi0h40qyzc1mcfvjk"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "0sdkfsjxxi5sq0nxjw7g7r1p7711l74r39y5ss12q85q4sla0m7l"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "1k2q6rzczajnrkj57p97fdr7lgmrfv7x54by2syngfwb5in8fhd5"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "1kw85g79rywk6n3wda7ffvjhf030wwj8g3x8n73rgiprvksw4p7j"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.3%2Bk3s1/k3s-images.txt",
-    "sha256": "1my3lfs5rfazcnnpsc9dj84dfnxx88xydrl86z6yw5n5p84x4nif"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-images.txt",
+    "sha256": "1f1d33jn4g5b6zmzdzzm4ffwfrmjwh60v9gnph0ysxjwsq1k0pxp"
   }
 }
diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix
index 31b14892bab6..40e7386b38b2 100644
--- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix
+++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix
@@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.30.3+k3s1";
-  k3sCommit = "f646604010affc6a1d3233a8a0870bca46bf80cf";
-  k3sRepoSha256 = "1sqa4cx5rihrqcnriq7if7sm4hx73ma975yyr5k9nvhg71dvlig3";
-  k3sVendorHash = "sha256-HMlYdWDUoELpwsfCtyCxVIcFULdvu5gna83lc79AUWc=";
+  k3sVersion = "1.30.4+k3s1";
+  k3sCommit = "98262b5dee29fe5ac849a0cef90b5d50292b020b";
+  k3sRepoSha256 = "1iwg7j0divbh41dx40kz69qkvscvppqb37dqvxayw3ha1yja4sq6";
+  k3sVendorHash = "sha256-EovTZ3DvDqWFR9vxhtjgcZcPXVk1C0PYNCxEV5XA6wg=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.0";
   k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl";
   k3sCNIVersion = "1.4.0-k3s2";
   k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa";
-  containerdVersion = "1.7.17-k3s1";
-  containerdSha256 = "1j61mbgx346ydvnjd8b07wf7nmvvplx28wi5jjdzi1k688r2hxpf";
+  containerdVersion = "1.7.20-k3s1";
+  containerdSha256 = "12ihr3z8vcglv5b0v9ris29zkkkdvjbcp3bf7ym71a0xdbg83s8i";
   criCtlVersion = "1.29.0-k3s1";
 }

From 8c507882d3c99855e042c7b2c1e66a57d578beec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93lafur=20Bjarki=20Bogason?=
 <olafur@genkiinstruments.com>
Date: Tue, 3 Sep 2024 18:28:11 +0100
Subject: [PATCH 20/90] make age-plugin-fido2-hmac work on darwin

---
 .../ag/age-plugin-fido2-hmac/package.nix      | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix
index 209bc1a24728..eec840ef2197 100644
--- a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix
+++ b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix
@@ -1,10 +1,27 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, libfido2
-, stdenv
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  stdenv,
+  libfido2,
+  openssl,
+  libcbor
 }:
+let
+  darwin_arch = if stdenv.hostPlatform.system == "aarch64-darwin" then "arm64" else "amd64";
+  darwin_configure = ''
+    chmod -R +w vendor/github.com/keys-pub/go-libfido2
+    cat << EOF > vendor/github.com/keys-pub/go-libfido2/fido2_static_${darwin_arch}.go
+    package libfido2
 
+    /*
+    #cgo darwin LDFLAGS: -framework CoreFoundation -framework IOKit -L${lib.getLib openssl}/lib -L${lib.getLib libcbor}/lib -lfido2
+    #cgo darwin CFLAGS: -I${libfido2.dev}/include -I${openssl.dev}/include
+    */
+    import "C"
+    EOF
+  '';
+in
 buildGoModule rec {
   pname = "age-plugin-fido2-hmac";
   version = "0.2.3";
@@ -18,11 +35,11 @@ buildGoModule rec {
 
   vendorHash = "sha256-h4/tyq9oZt41IfRJmmsLHUpJiPJ7YuFu59ccM7jHsFo=";
 
-  ldflags = [ "-s" "-w" ];
+  ldflags = [ "-s" "-w" "-X main.version=v${version}" ];
 
-  buildInputs = [
-    libfido2
-  ];
+  buildInputs = [ libfido2 ];
+
+  postConfigure = lib.optional stdenv.isDarwin darwin_configure;
 
   meta = with lib; {
     description = "Age plugin to encrypt files with fido2 tokens using the hmac-secret extension and non-discoverable credentials";
@@ -30,6 +47,5 @@ buildGoModule rec {
     license = licenses.mit;
     maintainers = with maintainers; [ matthewcroughan ];
     mainProgram = "age-plugin-fido2-hmac";
-    broken = stdenv.isDarwin;
   };
 }

From d3da7528fa20430bde26c09e040ce825b301d2b0 Mon Sep 17 00:00:00 2001
From: Robert Rose <robert.rose@mailbox.org>
Date: Tue, 3 Sep 2024 16:28:13 +0200
Subject: [PATCH 21/90] k3s_1_31: init 1.31.0+k3s1

Release: https://github.com/k3s-io/k3s/releases/tag/v1.31.0%2Bk3s1
---
 .../cluster/k3s/1_31/chart-versions.nix        | 10 ++++++++++
 .../cluster/k3s/1_31/images-versions.json      | 18 ++++++++++++++++++
 .../networking/cluster/k3s/1_31/versions.nix   | 15 +++++++++++++++
 .../networking/cluster/k3s/builder.nix         |  2 +-
 .../networking/cluster/k3s/default.nix         | 10 ++++++++++
 .../networking/cluster/k3s/update-script.sh    |  8 +++++++-
 pkgs/top-level/all-packages.nix                |  9 +++++++--
 7 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix
 create mode 100644 pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
 create mode 100644 pkgs/applications/networking/cluster/k3s/1_31/versions.nix

diff --git a/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix
new file mode 100644
index 000000000000..aaaa3d4c2970
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix
@@ -0,0 +1,10 @@
+{
+  traefik-crd = {
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz";
+    sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw";
+  };
+  traefik = {
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz";
+    sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if";
+  };
+}
diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
new file mode 100644
index 000000000000..099ff7e3609b
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json
@@ -0,0 +1,18 @@
+{
+  "airgap-images-amd64": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "13pakr8nxlbqhqcz40gyjncw4bghk7x7ryb2ynmr5airspqcdrl6"
+  },
+  "airgap-images-arm": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "0vc2v89qy9gbzfbmfrdb0l5yzyprk7yma5ps0yfj60jd9av07qvh"
+  },
+  "airgap-images-arm64": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "10ffa45pm1scavcd5cimdaw29rlc55c9i40qzh3n3451g1yqlmmk"
+  },
+  "images-list": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-images.txt",
+    "sha256": "0y4x02fj1iysghq6s88wsiqfpsajrrwrg89m59qk431cii23nrza"
+  }
+}
diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix
new file mode 100644
index 000000000000..74f2f1de0569
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix
@@ -0,0 +1,15 @@
+{
+  k3sVersion = "1.31.0+k3s1";
+  k3sCommit = "34be6d96d17d8d65fda86272b62b752cb0e9c45e";
+  k3sRepoSha256 = "16yzsx56jmca07jdnzjvy4pcfrvvibv987l1mzdaws1vkm3xqfnw";
+  k3sVendorHash = "sha256-1uYlvGkW6n4aiUVX/2OjppczdobY/fk1ZaK6j3AEwvM=";
+  chartVersions = import ./chart-versions.nix;
+  imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
+  k3sRootVersion = "0.14.0";
+  k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl";
+  k3sCNIVersion = "1.4.0-k3s2";
+  k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa";
+  containerdVersion = "1.7.20-k3s1";
+  containerdSha256 = "12ihr3z8vcglv5b0v9ris29zkkkdvjbcp3bf7ym71a0xdbg83s8i";
+  criCtlVersion = "1.31.0-k3s2";
+}
diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index e0288c21fc99..1fb10c82dcc1 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -211,7 +211,7 @@ let
     sed --quiet '/# --- run the install process --/q;p' ${k3sRepo}/install.sh > install.sh
 
     # Let killall expect "containerd-shim" in the Nix store
-    to_replace="k3s/data/\[\^/\]\*/bin/containerd-shim"
+    to_replace="/data/\[\^/\]\*/bin/containerd-shim"
     replacement="/nix/store/.*k3s-containerd.*/bin/containerd-shim"
     changes=$(sed -i "s|$to_replace|$replacement| w /dev/stdout" install.sh)
     if [ -z "$changes" ]; then
diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix
index c8e3fbc92696..59fd6b1be344 100644
--- a/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/default.nix
@@ -43,4 +43,14 @@ in
       ];
     }
   ) extraArgs;
+
+  k3s_1_31 = common (
+    (import ./1_31/versions.nix)
+    // {
+      updateScript = [
+        ./update-script.sh
+        "31"
+      ];
+    }
+  ) extraArgs;
 }
diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh
index 9eab8ce08f81..ac451806ff66 100755
--- a/pkgs/applications/networking/cluster/k3s/update-script.sh
+++ b/pkgs/applications/networking/cluster/k3s/update-script.sh
@@ -107,7 +107,13 @@ CONTAINERD_VERSION=$(grep github.com/containerd/containerd ${FILE_GO_MOD} \
 CONTAINERD_SHA256=$(nix-prefetch-url --quiet --unpack \
     "https://github.com/k3s-io/containerd/archive/refs/tags/v${CONTAINERD_VERSION}.tar.gz")
 
-CRI_CTL_VERSION=$(grep github.com/kubernetes-sigs/cri-tools ${FILE_GO_MOD} \
+# The repository of "cri-tools" changes for 1.31.x, this can likely be removed in future releases
+if [ "$MINOR_VERSION" -gt 30 ]; then
+    CRI_CTL_REPO=sigs.k8s.io
+else
+    CRI_CTL_REPO=github.com/kubernetes-sigs
+fi
+CRI_CTL_VERSION=$(grep "$CRI_CTL_REPO/cri-tools" ${FILE_GO_MOD} \
     | head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//')
 
 setKV () {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4431be64a3f4..3472fac9adfd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31088,8 +31088,13 @@ with pkgs;
 
   jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };
 
-  inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_28 k3s_1_29 k3s_1_30;
-  k3s = k3s_1_30;
+  inherit (callPackage ../applications/networking/cluster/k3s { })
+    k3s_1_28
+    k3s_1_29
+    k3s_1_30
+    k3s_1_31
+    ;
+  k3s = k3s_1_31;
 
   k3sup = callPackage ../applications/networking/cluster/k3sup { };
 

From db3f2172c40c4005ee0a06511001decf953e4feb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Sep 2024 09:51:48 +0200
Subject: [PATCH 22/90] python312Packages.asyncssh: 2.15.0 -> 2.17.0

Changelog: https://github.com/ronf/asyncssh/blob/v2.17.0/docs/changes.rst
---
 pkgs/development/python-modules/asyncssh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
index 427178dfa037..bcbb85e7dca9 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "asyncssh";
-  version = "2.15.0";
+  version = "2.17.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ChOkOBb0bPCEZX+wVZaCO5PVtI5173djyKdW7BIXg3o=";
+    hash = "sha256-OxWcEFqjiMHiJFxPr0g/VArajK2ZQCKBEZEAFm5e2zw=";
   };
 
   build-system = [ setuptools ];

From 4dd8774555f2e1e756f6e88d4958b98c3d0fbc1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Sep 2024 11:22:56 +0000
Subject: [PATCH 23/90] spicedb-zed: 0.21.0 -> 0.21.1

---
 pkgs/servers/spicedb/zed.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix
index 1046c94c115f..dc82ca52fd7f 100644
--- a/pkgs/servers/spicedb/zed.nix
+++ b/pkgs/servers/spicedb/zed.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "zed";
-  version = "0.21.0";
+  version = "0.21.1";
 
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "zed";
     rev = "v${version}";
-    hash = "sha256-jHKugGQ3tta9vGjMtVEyTrLrmivLc41VFYVqAjH/IGQ=";
+    hash = "sha256-X8kZjPjFGMUfSQLdS6/XA1eNRQH6n/FffgbC19r1WRU=";
   };
 
-  vendorHash = "sha256-nYf/ruU1IPDOcumhQz6LGEpKLyAxgASgxjPT7qz0N8c=";
+  vendorHash = "sha256-Q8OW9aBs1fcUdKin6uX1s6oD289eCUffmAK5nr3xn0s=";
 
   ldflags = [
     "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.rev}'"

From d558554243bc22db645792ab6f597d92a700334b Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 4 Sep 2024 11:35:44 +0200
Subject: [PATCH 24/90] initrd: use the new tmpfiles options to create tmpfiles
 config

Otherwise we get a clash when generating the initrd since the initrd tmpfiles
options create a symlink at /etc/tmpfiles.d/ and any subsequent writes inside
this directory because of initrd.systemd.contents will cause a permission denied
error.
---
 nixos/modules/system/boot/resolved.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index b658a7a2dc05..65c00b694e0f 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -205,11 +205,12 @@ in
 
       boot.initrd.systemd = {
         contents = {
-          "/etc/tmpfiles.d/resolv.conf".text =
-            "L /etc/resolv.conf - - - - /run/systemd/resolve/stub-resolv.conf";
           "/etc/systemd/resolved.conf".text = resolvedConf;
         };
 
+        tmpfiles.settings.systemd-resolved-stub."/etc/resolv.conf".L.argument =
+          "/run/systemd/resolve/stub-resolv.conf";
+
         additionalUpstreamUnits = ["systemd-resolved.service"];
         users.systemd-resolve = {};
         groups.systemd-resolve = {};

From 85bbba4a182609170fe7f97ba7aa84cad3592616 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Sep 2024 14:49:06 +0200
Subject: [PATCH 25/90] python312Packages.ctypesgen: init at 1.1.1

Pure-python wrapper generator for ctypes

https://github.com/ctypesgen/ctypesgen
---
 .../python-modules/ctypesgen/default.nix      | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/ctypesgen/default.nix

diff --git a/pkgs/development/python-modules/ctypesgen/default.nix b/pkgs/development/python-modules/ctypesgen/default.nix
new file mode 100644
index 000000000000..7eea6b726717
--- /dev/null
+++ b/pkgs/development/python-modules/ctypesgen/default.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  unittestCheckHook,
+  pythonOlder,
+  setuptools-scm,
+  setuptools,
+  toml,
+  wheel,
+}:
+
+buildPythonPackage rec {
+  pname = "ctypesgen";
+  version = "1.1.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
+
+  src = fetchFromGitHub {
+    owner = "ctypesgen";
+    repo = "ctypesgen";
+    rev = "refs/tags/${version}";
+    hash = "sha256-TwIWPellmjMpTGQ+adJBLNMdAqB0kLOMl4YAubvXKqo=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+    toml
+    wheel
+  ];
+
+  # Various compiler errors
+  doCheck = false;
+
+  pythonImportsCheck = [ "ctypesgen" ];
+
+  meta = with lib; {
+    description = "Pure-python wrapper generator for ctypes";
+    homepage = "https://github.com/ctypesgen/ctypesgen";
+    changelog = "https://github.com/ctypesgen/ctypesgen/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 53d67680d8da..c0c58de9c748 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2700,6 +2700,8 @@ self: super: with self; {
     ctranslate2-cpp = pkgs.ctranslate2;
   };
 
+  ctypesgen = callPackage ../development/python-modules/ctypesgen { };
+
   cu2qu = callPackage ../development/python-modules/cu2qu { };
 
   customtkinter = callPackage ../development/python-modules/customtkinter { };

From e80cd707c4b26ef11e5877bee5f5bac87c7babdd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Sep 2024 19:37:34 +0200
Subject: [PATCH 26/90] matrix-appservice-irc: 2.0.1 -> 3.0.0

https://github.com/matrix-org/matrix-appservice-irc/releases/tag/3.0.0
---
 .../matrix-synapse/matrix-appservice-irc/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
index 993fa909b1a8..86be2ddb41f8 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
@@ -13,19 +13,19 @@
 
 let
   pname = "matrix-appservice-irc";
-  version = "2.0.1";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-ue3fOkrEBRI/NRE+uKFR+NaqP8QvzVVeX3LUh4aZYJA=";
+    hash = "sha256-ZT8ugev+Tgu47KLuVVo5sFfiGtWLDc6JW5NZvsQ1mA8=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     name = "${pname}-${version}-offline-cache";
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-hapEbdjvvzeZHfrpYRW9W3vXkQVNyGZ0qydO34+mQqQ=";
+    hash = "sha256-13OUcxZOlW1pp4uB1aRmqlzKf6rTgyP/nMnLmksXV3w=";
   };
 
 in

From a4e033f90ce58031f324432b8bf0ca3b4bcf155c Mon Sep 17 00:00:00 2001
From: DarkOnion0 <darkonion0@clapot.org>
Date: Tue, 3 Sep 2024 10:56:17 +0200
Subject: [PATCH 27/90] appflowy: 0.6.7.2 -> 0.6.8

https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.6.8
---
 pkgs/applications/office/appflowy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix
index 132c894507cb..a7a979ed82d3 100644
--- a/pkgs/applications/office/appflowy/default.nix
+++ b/pkgs/applications/office/appflowy/default.nix
@@ -17,11 +17,11 @@ let
     rec {
       x86_64-linux = {
         urlSuffix = "linux-x86_64.tar.gz";
-        hash = "sha256-2hrrK3ACYPzkSDxhjOevO8yykwWjS9gARz3A0er7SO4=";
+        hash = "sha256-sQ3dxwPWHLUoWgnR9+oHaFoDzXxtwKRiBvz2wkFB01g=";
       };
       x86_64-darwin = {
         urlSuffix = "macos-universal.zip";
-        hash = "sha256-07u1KUfbYTBDFbmZK9ZHgutnhLMlcqQCg5l+z3ChTn0=";
+        hash = "sha256-4bU/qecZBrTr34SZAjDDgwpXAAHDITz6lV6mJGjElko=";
       };
       aarch64-darwin = x86_64-darwin;
     }
@@ -29,7 +29,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "appflowy";
-  version = "0.6.7.2";
+  version = "0.6.8";
 
   src = fetchzip {
     url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}";

From d3df4119133bb6a79d80077213b9a61d42b40bcc Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Sep 2024 20:35:02 +0200
Subject: [PATCH 28/90] nixos/matrix-appservice-irc: media proxying support

Adds required options for serving authenticated media and the key
generation logic.
---
 .../services/matrix/appservice-irc.nix        | 35 +++++++++++++++++++
 nixos/tests/matrix/appservice-irc.nix         | 17 +++++----
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/matrix/appservice-irc.nix b/nixos/modules/services/matrix/appservice-irc.nix
index 55a04059abe4..df12998ab156 100644
--- a/nixos/modules/services/matrix/appservice-irc.nix
+++ b/nixos/modules/services/matrix/appservice-irc.nix
@@ -137,6 +137,37 @@ in {
                   type = submodule { freeformType = jsonType; };
                   description = "IRC servers to connect to";
                 };
+
+                mediaProxy = {
+                  signingKeyPath = lib.mkOption {
+                    type = path;
+                    default = "/var/lib/matrix-appservice-irc/media-signingkey.jwk";
+                    description = ''
+                      Path to the signing key file for authenticated media.
+                    '';
+                  };
+                  ttlSeconds = lib.mkOption {
+                    type = ints.positive;
+                    default = 3600;
+                    description = ''
+                      Lifetime in seconds, that generated URLs stay valid.
+                    '';
+                  };
+                  bindPort = lib.mkOption {
+                    type = port;
+                    default = 11111;
+                    description = ''
+                      Port that the media proxy binds to.
+                    '';
+                  };
+                  publicUrl = lib.mkOption {
+                    type = str;
+                    example = "https://matrix.example.com/media";
+                    description = ''
+                      URL under which the media proxy is publicly acccessible.
+                    '';
+                  };
+                };
               };
             };
           };
@@ -144,6 +175,7 @@ in {
       };
     };
   };
+
   config = lib.mkIf cfg.enable {
     systemd.services.matrix-appservice-irc = {
       description = "Matrix-IRC bridge";
@@ -181,6 +213,9 @@ in {
           sed -i "s/^hs_token:.*$/$hs_token/g" ${registrationFile}
           sed -i "s/^as_token:.*$/$as_token/g" ${registrationFile}
         fi
+        if ! [ -f "${cfg.settings.ircService.mediaProxy.signingKeyPath}"]; then
+          ${lib.getExe pkgs.nodejs} ${pkg}/lib/generate-signing-key.js > "${cfg.settings.ircService.mediaProxy.signingKeyPath}"
+        fi
         # Allow synapse access to the registration
         if ${pkgs.getent}/bin/getent group matrix-synapse > /dev/null; then
           chgrp matrix-synapse ${registrationFile}
diff --git a/nixos/tests/matrix/appservice-irc.nix b/nixos/tests/matrix/appservice-irc.nix
index 78c53024ca6c..23e0a00436d3 100644
--- a/nixos/tests/matrix/appservice-irc.nix
+++ b/nixos/tests/matrix/appservice-irc.nix
@@ -75,13 +75,16 @@ import ../make-test-python.nix ({ pkgs, ... }:
             homeserver.url = homeserverUrl;
             homeserver.domain = "homeserver";
 
-            ircService.servers."ircd" = {
-              name = "IRCd";
-              port = 6667;
-              dynamicChannels = {
-                enabled = true;
-                aliasTemplate = "#irc_$CHANNEL";
+            ircService = {
+              servers."ircd" = {
+                name = "IRCd";
+                port = 6667;
+                dynamicChannels = {
+                  enabled = true;
+                  aliasTemplate = "#irc_$CHANNEL";
+                };
               };
+              mediaProxy.publicUrl = "http://localhost:11111/media";
             };
           };
         };
@@ -203,6 +206,8 @@ import ../make-test-python.nix ({ pkgs, ... }:
       with subtest("start the appservice"):
           appservice.wait_for_unit("matrix-appservice-irc.service")
           appservice.wait_for_open_port(8009)
+          appservice.wait_for_file("/var/lib/matrix-appservice-irc/media-signingkey.jwk")
+          appservice.wait_for_open_port(11111)
 
       with subtest("copy the registration file"):
           appservice.copy_from_vm("/var/lib/matrix-appservice-irc/registration.yml")

From de396087e9e7e0aff63229788ea00a2f7a96c20c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 4 Sep 2024 20:35:52 +0200
Subject: [PATCH 29/90] nixos/tests/matrix-appservice-irc: modernize

---
 nixos/tests/all-tests.nix             | 2 +-
 nixos/tests/matrix/appservice-irc.nix | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 76c70e2c3fc8..f8e0eb190bf5 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -570,7 +570,7 @@ in {
   mate-wayland = handleTest ./mate-wayland.nix {};
   matter-server = handleTest ./matter-server.nix {};
   matomo = handleTest ./matomo.nix {};
-  matrix-appservice-irc = handleTest ./matrix/appservice-irc.nix {};
+  matrix-appservice-irc = runTest ./matrix/appservice-irc.nix;
   matrix-conduit = handleTest ./matrix/conduit.nix {};
   matrix-synapse = handleTest ./matrix/synapse.nix {};
   matrix-synapse-workers = handleTest ./matrix/synapse-workers.nix {};
diff --git a/nixos/tests/matrix/appservice-irc.nix b/nixos/tests/matrix/appservice-irc.nix
index 23e0a00436d3..2c556ec37fc5 100644
--- a/nixos/tests/matrix/appservice-irc.nix
+++ b/nixos/tests/matrix/appservice-irc.nix
@@ -1,4 +1,4 @@
-import ../make-test-python.nix ({ pkgs, ... }:
+{ pkgs, ... }:
   let
     homeserverUrl = "http://homeserver:8008";
   in
@@ -9,7 +9,7 @@ import ../make-test-python.nix ({ pkgs, ... }:
     };
 
     nodes = {
-      homeserver = { pkgs, ... }: {
+      homeserver = {
         # We'll switch to this once the config is copied into place
         specialisation.running.configuration = {
           services.matrix-synapse = {
@@ -46,7 +46,7 @@ import ../make-test-python.nix ({ pkgs, ... }:
         };
       };
 
-      ircd = { pkgs, ... }: {
+      ircd = {
         services.ngircd = {
           enable = true;
           config = ''
@@ -227,4 +227,4 @@ import ../make-test-python.nix ({ pkgs, ... }:
       with subtest("ensure messages can be exchanged"):
           client.succeed("do_test ${homeserverUrl} >&2")
     '';
-  })
+  }

From 03a0f9debeb081e8689b8330964db74af5494eae Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Fri, 30 Aug 2024 00:46:31 +0200
Subject: [PATCH 30/90] nixos/security.acme: remove `with lib;`

---
 nixos/modules/security/acme/default.nix | 275 ++++++++++++------------
 1 file changed, 137 insertions(+), 138 deletions(-)

diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix
index 83581d02840e..21f1ea50d7f2 100644
--- a/nixos/modules/security/acme/default.nix
+++ b/nixos/modules/security/acme/default.nix
@@ -1,5 +1,4 @@
 { config, lib, pkgs, options, ... }:
-with lib;
 let
 
 
@@ -8,11 +7,11 @@ let
   user = if cfg.useRoot then "root" else "acme";
 
   # Used to calculate timer accuracy for coalescing
-  numCerts = length (builtins.attrNames cfg.certs);
+  numCerts = lib.length (builtins.attrNames cfg.certs);
   _24hSecs = 60 * 60 * 24;
 
   # Used to make unique paths for each cert/account config set
-  mkHash = with builtins; val: substring 0 20 (hashString "sha256" val);
+  mkHash = with builtins; val: lib.substring 0 20 (hashString "sha256" val);
   mkAccountHash = acmeServer: data: mkHash "${toString acmeServer} ${data.keyType} ${data.email}";
   accountDirRoot = "/var/lib/acme/.lego/accounts/";
 
@@ -29,7 +28,7 @@ let
     else
       [{ fst = head workingBaseList; snd = head needAssignmentList;}] ++
       _rrCycler origBaseList (if (tail workingBaseList == []) then origBaseList else tail workingBaseList) (tail needAssignmentList);
-  attrsToList = mapAttrsToList (attrname: attrval: {name = attrname; value = attrval;});
+  attrsToList = lib.mapAttrsToList (attrname: attrval: {name = attrname; value = attrval;});
   # for an AttrSet `funcsAttrs` having functions as values, apply single arguments from
   # `argsList` to them in a round-robin manner.
   # Returns an attribute set with the applied functions as values.
@@ -57,7 +56,7 @@ let
   commonServiceConfig = {
     Type = "oneshot";
     User = user;
-    Group = mkDefault "acme";
+    Group = lib.mkDefault "acme";
     UMask = "0022";
     StateDirectoryMode = "750";
     ProtectSystem = "strict";
@@ -136,8 +135,8 @@ let
   userMigrationService = let
     script = with builtins; ''
       chown -R ${user} .lego/accounts
-    '' + (concatStringsSep "\n" (mapAttrsToList (cert: data: ''
-      for fixpath in ${escapeShellArg cert} .lego/${escapeShellArg cert}; do
+    '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList (cert: data: ''
+      for fixpath in ${lib.escapeShellArg cert} .lego/${lib.escapeShellArg cert}; do
         if [ -d "$fixpath" ]; then
           chmod -R u=rwX,g=rX,o= "$fixpath"
           chown -R ${user}:${data.group} "$fixpath"
@@ -166,7 +165,7 @@ let
 
     # ensure all required lock files exist, but none more
     script = ''
-      GLOBIGNORE="${concatStringsSep ":" concurrencyLockfiles}"
+      GLOBIGNORE="${lib.concatStringsSep ":" concurrencyLockfiles}"
       rm -f *
       unset GLOBIGNORE
 
@@ -186,7 +185,7 @@ let
     useDns = data.dnsProvider != null;
     useDnsOrS3 = useDns || data.s3Bucket != null;
     destPath = "/var/lib/acme/${cert}";
-    selfsignedDeps = optionals (cfg.preliminarySelfsigned) [ "acme-selfsigned-${cert}.service" ];
+    selfsignedDeps = lib.optionals (cfg.preliminarySelfsigned) [ "acme-selfsigned-${cert}.service" ];
 
     # Minica and lego have a "feature" which replaces * with _. We need
     # to make this substitution to reference the output files from both programs.
@@ -196,7 +195,7 @@ let
     # FIXME when mkChangedOptionModule supports submodules, change to that.
     # This is a workaround
     extraDomains = data.extraDomainNames ++ (
-      optionals
+      lib.optionals
       (data.extraDomains != "_mkMergedOptionModule")
       (builtins.attrNames data.extraDomains)
     );
@@ -204,22 +203,22 @@ let
     # Create hashes for cert data directories based on configuration
     # Flags are separated to avoid collisions
     hashData = with builtins; ''
-      ${concatStringsSep " " data.extraLegoFlags} -
-      ${concatStringsSep " " data.extraLegoRunFlags} -
-      ${concatStringsSep " " data.extraLegoRenewFlags} -
+      ${lib.concatStringsSep " " data.extraLegoFlags} -
+      ${lib.concatStringsSep " " data.extraLegoRunFlags} -
+      ${lib.concatStringsSep " " data.extraLegoRenewFlags} -
       ${toString acmeServer} ${toString data.dnsProvider}
       ${toString data.ocspMustStaple} ${data.keyType}
     '';
     certDir = mkHash hashData;
     # TODO remove domainHash usage entirely. Waiting on go-acme/lego#1532
-    domainHash = mkHash "${concatStringsSep " " extraDomains} ${data.domain}";
+    domainHash = mkHash "${lib.concatStringsSep " " extraDomains} ${data.domain}";
     accountHash = (mkAccountHash acmeServer data);
     accountDir = accountDirRoot + accountHash;
 
     protocolOpts = if useDns then (
       [ "--dns" data.dnsProvider ]
-      ++ optionals (!data.dnsPropagationCheck) [ "--dns.disable-cp" ]
-      ++ optionals (data.dnsResolver != null) [ "--dns.resolvers" data.dnsResolver ]
+      ++ lib.optionals (!data.dnsPropagationCheck) [ "--dns.disable-cp" ]
+      ++ lib.optionals (data.dnsResolver != null) [ "--dns.resolvers" data.dnsResolver ]
     ) else if data.s3Bucket != null then [ "--http" "--http.s3-bucket" data.s3Bucket ]
     else if data.listenHTTP != null then [ "--http" "--http.port" data.listenHTTP ]
     else [ "--http" "--http.webroot" data.webroot ];
@@ -231,22 +230,22 @@ let
       "--email" data.email
       "--key-type" data.keyType
     ] ++ protocolOpts
-      ++ optionals (acmeServer != null) [ "--server" acmeServer ]
-      ++ concatMap (name: [ "-d" name ]) extraDomains
+      ++ lib.optionals (acmeServer != null) [ "--server" acmeServer ]
+      ++ lib.concatMap (name: [ "-d" name ]) extraDomains
       ++ data.extraLegoFlags;
 
     # Although --must-staple is common to both modes, it is not declared as a
     # mode-agnostic argument in lego and thus must come after the mode.
-    runOpts = escapeShellArgs (
+    runOpts = lib.escapeShellArgs (
       commonOpts
       ++ [ "run" ]
-      ++ optionals data.ocspMustStaple [ "--must-staple" ]
+      ++ lib.optionals data.ocspMustStaple [ "--must-staple" ]
       ++ data.extraLegoRunFlags
     );
-    renewOpts = escapeShellArgs (
+    renewOpts = lib.escapeShellArgs (
       commonOpts
       ++ [ "renew" "--no-random-sleep" ]
-      ++ optionals data.ocspMustStaple [ "--must-staple" ]
+      ++ lib.optionals data.ocspMustStaple [ "--must-staple" ]
       ++ data.extraLegoRenewFlags
     );
 
@@ -286,8 +285,8 @@ let
 
     selfsignService = lockfileName: {
       description = "Generate self-signed certificate for ${cert}";
-      after = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ] ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service";
-      requires = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ] ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service";
+      after = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ] ++ lib.optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service";
+      requires = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ] ++ lib.optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service";
 
       path = with pkgs; [ minica ];
 
@@ -315,7 +314,7 @@ let
         minica \
           --ca-key ca/key.pem \
           --ca-cert ca/cert.pem \
-          --domains ${escapeShellArg (builtins.concatStringsSep "," ([ data.domain ] ++ extraDomains))}
+          --domains ${lib.escapeShellArg (builtins.concatStringsSep "," ([ data.domain ] ++ extraDomains))}
 
         # Create files to match directory layout for real certificates
         cd '${keyName}'
@@ -334,11 +333,11 @@ let
 
     renewService = lockfileName: {
       description = "Renew ACME certificate for ${cert}";
-      after = [ "network.target" "network-online.target" "acme-fixperms.service" "nss-lookup.target" ] ++ selfsignedDeps ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service";
-      wants = [ "network-online.target" "acme-fixperms.service" ] ++ selfsignedDeps ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service";
+      after = [ "network.target" "network-online.target" "acme-fixperms.service" "nss-lookup.target" ] ++ selfsignedDeps ++ lib.optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service";
+      wants = [ "network-online.target" "acme-fixperms.service" ] ++ selfsignedDeps ++ lib.optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service";
 
       # https://github.com/NixOS/nixpkgs/pull/81371#issuecomment-605526099
-      wantedBy = optionals (!config.boot.isContainer) [ "multi-user.target" ];
+      wantedBy = lib.optionals (!config.boot.isContainer) [ "multi-user.target" ];
 
       path = with pkgs; [ lego coreutils diffutils openssl ];
 
@@ -368,33 +367,33 @@ let
           "/var/lib/acme/.lego/${cert}/${certDir}:/tmp/certificates"
         ];
 
-        EnvironmentFile = mkIf useDnsOrS3 data.environmentFile;
+        EnvironmentFile = lib.mkIf useDnsOrS3 data.environmentFile;
 
-        Environment = mkIf useDnsOrS3
-          (mapAttrsToList (k: v: ''"${k}=%d/${k}"'') data.credentialFiles);
+        Environment = lib.mkIf useDnsOrS3
+          (lib.mapAttrsToList (k: v: ''"${k}=%d/${k}"'') data.credentialFiles);
 
-        LoadCredential = mkIf useDnsOrS3
-          (mapAttrsToList (k: v: "${k}:${v}") data.credentialFiles);
+        LoadCredential = lib.mkIf useDnsOrS3
+          (lib.mapAttrsToList (k: v: "${k}:${v}") data.credentialFiles);
 
         # Run as root (Prefixed with +)
         ExecStartPost = "+" + (pkgs.writeShellScript "acme-postrun" ''
-          cd /var/lib/acme/${escapeShellArg cert}
+          cd /var/lib/acme/${lib.escapeShellArg cert}
           if [ -e renewed ]; then
             rm renewed
             ${data.postRun}
-            ${optionalString (data.reloadServices != [])
-                "systemctl --no-block try-reload-or-restart ${escapeShellArgs data.reloadServices}"
+            ${lib.optionalString (data.reloadServices != [])
+                "systemctl --no-block try-reload-or-restart ${lib.escapeShellArgs data.reloadServices}"
             }
           fi
         '');
-      } // optionalAttrs (data.listenHTTP != null && toInt (last (splitString ":" data.listenHTTP)) < 1024) {
+      } // lib.optionalAttrs (data.listenHTTP != null && lib.toInt (lib.last (lib.splitString ":" data.listenHTTP)) < 1024) {
         CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
         AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
       };
 
       # Working directory will be /tmp
       script = (if (lockfileName == null) then lib.id else wrapInFlock "${lockdir}${lockfileName}") ''
-        ${optionalString data.enableDebugLogs "set -x"}
+        ${lib.optionalString data.enableDebugLogs "set -x"}
         set -euo pipefail
 
         # This reimplements the expiration date check, but without querying
@@ -425,7 +424,7 @@ let
           [[ $expiration_days -gt ${toString data.validMinDays} ]]
         }
 
-        ${optionalString (data.webroot != null) ''
+        ${lib.optionalString (data.webroot != null) ''
           # Ensure the webroot exists. Fixing group is required in case configuration was changed between runs.
           # Lego will fail if the webroot does not exist at all.
           (
@@ -461,7 +460,7 @@ let
           # Produce a nice error for those doing their first nixos-rebuild with these certs
           echo Failed to fetch certificates. \
             This may mean your DNS records are set up incorrectly. \
-            ${optionalString (cfg.preliminarySelfsigned) "Selfsigned certs are in place and dependant services will still start."}
+            ${lib.optionalString (cfg.preliminarySelfsigned) "Selfsigned certs are in place and dependant services will still start."}
           # Exit 10 so that users can potentially amend SuccessExitStatus to ignore this error.
           # High number to avoid Systemd reserved codes.
           exit 10
@@ -490,7 +489,7 @@ let
     };
   };
 
-  certConfigs = mapAttrs certToConfig cfg.certs;
+  certConfigs = lib.mapAttrs certToConfig cfg.certs;
 
   # These options can be specified within
   # security.acme.defaults or security.acme.certs.<name>
@@ -504,22 +503,22 @@ let
       # stay constant. Though notably it wouldn't matter much, because to get
       # the option information, a submodule with name `<name>` is evaluated
       # without any definitions.
-      defaultText = if isDefaults then default else literalExpression "config.security.acme.defaults.${name}";
+      defaultText = if isDefaults then default else lib.literalExpression "config.security.acme.defaults.${name}";
     };
   in {
     imports = [
-      (mkRenamedOptionModule [ "credentialsFile" ] [ "environmentFile" ])
+      (lib.mkRenamedOptionModule [ "credentialsFile" ] [ "environmentFile" ])
     ];
 
     options = {
-      validMinDays = mkOption {
-        type = types.int;
+      validMinDays = lib.mkOption {
+        type = lib.types.int;
         inherit (defaultAndText "validMinDays" 30) default defaultText;
         description = "Minimum remaining validity before renewal in days.";
       };
 
-      renewInterval = mkOption {
-        type = types.str;
+      renewInterval = lib.mkOption {
+        type = lib.types.str;
         inherit (defaultAndText "renewInterval" "daily") default defaultText;
         description = ''
           Systemd calendar expression when to check for renewal. See
@@ -527,12 +526,12 @@ let
         '';
       };
 
-      enableDebugLogs = mkEnableOption "debug logging for this certificate" // {
+      enableDebugLogs = lib.mkEnableOption "debug logging for this certificate" // {
         inherit (defaultAndText "enableDebugLogs" true) default defaultText;
       };
 
-      webroot = mkOption {
-        type = types.nullOr types.str;
+      webroot = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         inherit (defaultAndText "webroot" null) default defaultText;
         example = "/var/lib/acme/acme-challenge";
         description = ''
@@ -544,8 +543,8 @@ let
         '';
       };
 
-      server = mkOption {
-        type = types.nullOr types.str;
+      server = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         inherit (defaultAndText "server" "https://acme-v02.api.letsencrypt.org/directory") default defaultText;
         example = "https://acme-staging-v02.api.letsencrypt.org/directory";
         description = ''
@@ -556,8 +555,8 @@ let
         '';
       };
 
-      email = mkOption {
-        type = types.nullOr types.str;
+      email = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         inherit (defaultAndText "email" null) default defaultText;
         description = ''
           Email address for account creation and correspondence from the CA.
@@ -566,14 +565,14 @@ let
         '';
       };
 
-      group = mkOption {
-        type = types.str;
+      group = lib.mkOption {
+        type = lib.types.str;
         inherit (defaultAndText "group" "acme") default defaultText;
         description = "Group running the ACME client.";
       };
 
-      reloadServices = mkOption {
-        type = types.listOf types.str;
+      reloadServices = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
         inherit (defaultAndText "reloadServices" []) default defaultText;
         description = ''
           The list of systemd services to call `systemctl try-reload-or-restart`
@@ -581,8 +580,8 @@ let
         '';
       };
 
-      postRun = mkOption {
-        type = types.lines;
+      postRun = lib.mkOption {
+        type = lib.types.lines;
         inherit (defaultAndText "postRun" "") default defaultText;
         example = "cp full.pem backup.pem";
         description = ''
@@ -593,8 +592,8 @@ let
         '';
       };
 
-      keyType = mkOption {
-        type = types.str;
+      keyType = lib.mkOption {
+        type = lib.types.str;
         inherit (defaultAndText "keyType" "ec256") default defaultText;
         description = ''
           Key type to use for private keys.
@@ -603,8 +602,8 @@ let
         '';
       };
 
-      dnsProvider = mkOption {
-        type = types.nullOr types.str;
+      dnsProvider = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         inherit (defaultAndText "dnsProvider" null) default defaultText;
         example = "route53";
         description = ''
@@ -613,8 +612,8 @@ let
         '';
       };
 
-      dnsResolver = mkOption {
-        type = types.nullOr types.str;
+      dnsResolver = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         inherit (defaultAndText "dnsResolver" null) default defaultText;
         example = "1.1.1.1:53";
         description = ''
@@ -624,8 +623,8 @@ let
         '';
       };
 
-      environmentFile = mkOption {
-        type = types.nullOr types.path;
+      environmentFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
         inherit (defaultAndText "environmentFile" null) default defaultText;
         description = ''
           Path to an EnvironmentFile for the cert's service containing any required and
@@ -636,8 +635,8 @@ let
         example = "/var/src/secrets/example.org-route53-api-token";
       };
 
-      credentialFiles = mkOption {
-        type = types.attrsOf (types.path);
+      credentialFiles = lib.mkOption {
+        type = lib.types.attrsOf (lib.types.path);
         inherit (defaultAndText "credentialFiles" {}) default defaultText;
         description = ''
           Environment variables suffixed by "_FILE" to set for the cert's service
@@ -647,15 +646,15 @@ let
           This allows to securely pass credential files to lego by leveraging systemd
           credentials.
         '';
-        example = literalExpression ''
+        example = lib.literalExpression ''
           {
             "RFC2136_TSIG_SECRET_FILE" = "/run/secrets/tsig-secret-example.org";
           }
         '';
       };
 
-      dnsPropagationCheck = mkOption {
-        type = types.bool;
+      dnsPropagationCheck = lib.mkOption {
+        type = lib.types.bool;
         inherit (defaultAndText "dnsPropagationCheck" true) default defaultText;
         description = ''
           Toggles lego DNS propagation check, which is used alongside DNS-01
@@ -663,8 +662,8 @@ let
         '';
       };
 
-      ocspMustStaple = mkOption {
-        type = types.bool;
+      ocspMustStaple = lib.mkOption {
+        type = lib.types.bool;
         inherit (defaultAndText "ocspMustStaple" false) default defaultText;
         description = ''
           Turns on the OCSP Must-Staple TLS extension.
@@ -675,24 +674,24 @@ let
         '';
       };
 
-      extraLegoFlags = mkOption {
-        type = types.listOf types.str;
+      extraLegoFlags = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
         inherit (defaultAndText "extraLegoFlags" []) default defaultText;
         description = ''
           Additional global flags to pass to all lego commands.
         '';
       };
 
-      extraLegoRenewFlags = mkOption {
-        type = types.listOf types.str;
+      extraLegoRenewFlags = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
         inherit (defaultAndText "extraLegoRenewFlags" []) default defaultText;
         description = ''
           Additional flags to pass to lego renew.
         '';
       };
 
-      extraLegoRunFlags = mkOption {
-        type = types.listOf types.str;
+      extraLegoRunFlags = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
         inherit (defaultAndText "extraLegoRunFlags" []) default defaultText;
         description = ''
           Additional flags to pass to lego run.
@@ -704,40 +703,40 @@ let
   certOpts = { name, config, ... }: {
     options = {
       # user option has been removed
-      user = mkOption {
+      user = lib.mkOption {
         visible = false;
         default = "_mkRemovedOptionModule";
       };
 
       # allowKeysForGroup option has been removed
-      allowKeysForGroup = mkOption {
+      allowKeysForGroup = lib.mkOption {
         visible = false;
         default = "_mkRemovedOptionModule";
       };
 
       # extraDomains was replaced with extraDomainNames
-      extraDomains = mkOption {
+      extraDomains = lib.mkOption {
         visible = false;
         default = "_mkMergedOptionModule";
       };
 
-      directory = mkOption {
-        type = types.str;
+      directory = lib.mkOption {
+        type = lib.types.str;
         readOnly = true;
         default = "/var/lib/acme/${name}";
         description = "Directory where certificate and other state is stored.";
       };
 
-      domain = mkOption {
-        type = types.str;
+      domain = lib.mkOption {
+        type = lib.types.str;
         default = name;
         description = "Domain to fetch certificate for (defaults to the entry name).";
       };
 
-      extraDomainNames = mkOption {
-        type = types.listOf types.str;
+      extraDomainNames = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
         default = [];
-        example = literalExpression ''
+        example = lib.literalExpression ''
           [
             "example.org"
             "mydomain.org"
@@ -751,8 +750,8 @@ let
       # This setting must be different for each configured certificate, otherwise
       # two or more renewals may fail to bind to the address. Hence, it is not in
       # the inheritableOpts.
-      listenHTTP = mkOption {
-        type = types.nullOr types.str;
+      listenHTTP = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         default = null;
         example = ":1360";
         description = ''
@@ -762,8 +761,8 @@ let
         '';
       };
 
-      s3Bucket = mkOption {
-        type = types.nullOr types.str;
+      s3Bucket = lib.mkOption {
+        type = lib.types.nullOr lib.types.str;
         default = null;
         example = "acme";
         description = ''
@@ -771,7 +770,7 @@ let
         '';
       };
 
-      inheritDefaults = mkOption {
+      inheritDefaults = lib.mkOption {
         default = true;
         example = true;
         description = "Whether to inherit values set in `security.acme.defaults` or not.";
@@ -784,8 +783,8 @@ in {
 
   options = {
     security.acme = {
-      preliminarySelfsigned = mkOption {
-        type = types.bool;
+      preliminarySelfsigned = lib.mkOption {
+        type = lib.types.bool;
         default = true;
         description = ''
           Whether a preliminary self-signed certificate should be generated before
@@ -797,8 +796,8 @@ in {
         '';
       };
 
-      acceptTerms = mkOption {
-        type = types.bool;
+      acceptTerms = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Accept the CA's terms of service. The default provider is Let's Encrypt,
@@ -806,8 +805,8 @@ in {
         '';
       };
 
-      useRoot = mkOption {
-        type = types.bool;
+      useRoot = lib.mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Whether to use the root user when generating certs. This is not recommended
@@ -818,8 +817,8 @@ in {
         '';
       };
 
-      defaults = mkOption {
-        type = types.submodule (inheritableModule true);
+      defaults = lib.mkOption {
+        type = lib.types.submodule (inheritableModule true);
         description = ''
           Default values inheritable by all configured certs. You can
           use this to define options shared by all your certs. These defaults
@@ -828,9 +827,9 @@ in {
         '';
       };
 
-      certs = mkOption {
+      certs = lib.mkOption {
         default = { };
-        type = with types; attrsOf (submodule [ (inheritableModule false) certOpts ]);
+        type = with lib.types; attrsOf (submodule [ (inheritableModule false) certOpts ]);
         description = ''
           Attribute set of certificates to get signed and renewed. Creates
           `acme-''${cert}.{service,timer}` systemd units for
@@ -838,7 +837,7 @@ in {
           to those units if they rely on the certificates being present,
           or trigger restarts of the service if certificates get renewed.
         '';
-        example = literalExpression ''
+        example = lib.literalExpression ''
           {
             "example.com" = {
               webroot = "/var/lib/acme/acme-challenge/";
@@ -852,9 +851,9 @@ in {
           }
         '';
       };
-      maxConcurrentRenewals = mkOption {
+      maxConcurrentRenewals = lib.mkOption {
         default = 5;
-        type = types.int;
+        type = lib.types.int;
         description = ''
           Maximum number of concurrent certificate generation or renewal jobs. All other
           jobs will queue and wait running jobs to finish. Reduces the system load of
@@ -867,39 +866,39 @@ in {
   };
 
   imports = [
-    (mkRemovedOptionModule [ "security" "acme" "production" ] ''
+    (lib.mkRemovedOptionModule [ "security" "acme" "production" ] ''
       Use security.acme.server to define your staging ACME server URL instead.
 
       To use the let's encrypt staging server, use security.acme.server =
       "https://acme-staging-v02.api.letsencrypt.org/directory".
     '')
-    (mkRemovedOptionModule [ "security" "acme" "directory" ] "ACME Directory is now hardcoded to /var/lib/acme and its permissions are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.")
-    (mkRemovedOptionModule [ "security" "acme" "preDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
-    (mkRemovedOptionModule [ "security" "acme" "activationDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
-    (mkChangedOptionModule [ "security" "acme" "validMin" ] [ "security" "acme" "defaults" "validMinDays" ] (config: config.security.acme.validMin / (24 * 3600)))
-    (mkChangedOptionModule [ "security" "acme" "validMinDays" ] [ "security" "acme" "defaults" "validMinDays" ] (config: config.security.acme.validMinDays))
-    (mkChangedOptionModule [ "security" "acme" "renewInterval" ] [ "security" "acme" "defaults" "renewInterval" ] (config: config.security.acme.renewInterval))
-    (mkChangedOptionModule [ "security" "acme" "email" ] [ "security" "acme" "defaults" "email" ] (config: config.security.acme.email))
-    (mkChangedOptionModule [ "security" "acme" "server" ] [ "security" "acme" "defaults" "server" ] (config: config.security.acme.server))
-    (mkChangedOptionModule [ "security" "acme" "enableDebugLogs" ] [ "security" "acme" "defaults" "enableDebugLogs" ] (config: config.security.acme.enableDebugLogs))
+    (lib.mkRemovedOptionModule [ "security" "acme" "directory" ] "ACME Directory is now hardcoded to /var/lib/acme and its permissions are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.")
+    (lib.mkRemovedOptionModule [ "security" "acme" "preDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
+    (lib.mkRemovedOptionModule [ "security" "acme" "activationDelay" ] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
+    (lib.mkChangedOptionModule [ "security" "acme" "validMin" ] [ "security" "acme" "defaults" "validMinDays" ] (config: config.security.acme.validMin / (24 * 3600)))
+    (lib.mkChangedOptionModule [ "security" "acme" "validMinDays" ] [ "security" "acme" "defaults" "validMinDays" ] (config: config.security.acme.validMinDays))
+    (lib.mkChangedOptionModule [ "security" "acme" "renewInterval" ] [ "security" "acme" "defaults" "renewInterval" ] (config: config.security.acme.renewInterval))
+    (lib.mkChangedOptionModule [ "security" "acme" "email" ] [ "security" "acme" "defaults" "email" ] (config: config.security.acme.email))
+    (lib.mkChangedOptionModule [ "security" "acme" "server" ] [ "security" "acme" "defaults" "server" ] (config: config.security.acme.server))
+    (lib.mkChangedOptionModule [ "security" "acme" "enableDebugLogs" ] [ "security" "acme" "defaults" "enableDebugLogs" ] (config: config.security.acme.enableDebugLogs))
   ];
 
-  config = mkMerge [
-    (mkIf (cfg.certs != { }) {
+  config = lib.mkMerge [
+    (lib.mkIf (cfg.certs != { }) {
 
       # FIXME Most of these custom warnings and filters for security.acme.certs.* are required
       # because using mkRemovedOptionModule/mkChangedOptionModule with attrsets isn't possible.
-      warnings = filter (w: w != "") (mapAttrsToList (cert: data: optionalString (data.extraDomains != "_mkMergedOptionModule") ''
+      warnings = lib.filter (w: w != "") (lib.mapAttrsToList (cert: data: lib.optionalString (data.extraDomains != "_mkMergedOptionModule") ''
         The option definition `security.acme.certs.${cert}.extraDomains` has changed
         to `security.acme.certs.${cert}.extraDomainNames` and is now a list of strings.
         Setting a custom webroot for extra domains is not possible, instead use separate certs.
       '') cfg.certs);
 
       assertions = let
-        certs = attrValues cfg.certs;
+        certs = lib.attrValues cfg.certs;
       in [
         {
-          assertion = cfg.defaults.email != null || all (certOpts: certOpts.email != null) certs;
+          assertion = cfg.defaults.email != null || lib.all (certOpts: certOpts.email != null) certs;
           message = ''
             You must define `security.acme.certs.<name>.email` or
             `security.acme.defaults.email` to register with the CA. Note that using
@@ -914,7 +913,7 @@ in {
             to `true`. For Let's Encrypt's ToS see https://letsencrypt.org/repository/
           '';
         }
-      ] ++ (builtins.concatLists (mapAttrsToList (cert: data: [
+      ] ++ (builtins.concatLists (lib.mapAttrsToList (cert: data: [
         {
           assertion = data.user == "_mkRemovedOptionModule";
           message = ''
@@ -936,7 +935,7 @@ in {
         # referencing them as a user quite weird too. Best practice is to use
         # the domain option.
         {
-          assertion = ! hasInfix "*" cert;
+          assertion = ! lib.hasInfix "*" cert;
           message = ''
             The cert option path `security.acme.certs.${cert}.dnsProvider`
             cannot contain a * character.
@@ -959,7 +958,7 @@ in {
           '';
         })
         {
-          assertion = all (hasSuffix "_FILE") (attrNames data.credentialFiles);
+          assertion = lib.all (lib.hasSuffix "_FILE") (lib.attrNames data.credentialFiles);
           message = ''
             Option `security.acme.certs.${cert}.credentialFiles` can only be
             used for variables suffixed by "_FILE".
@@ -982,27 +981,27 @@ in {
       ];
 
       systemd.services = let
-        renewServiceFunctions = mapAttrs' (cert: conf: nameValuePair "acme-${cert}" conf.renewService) certConfigs;
+        renewServiceFunctions = lib.mapAttrs' (cert: conf: lib.nameValuePair "acme-${cert}" conf.renewService) certConfigs;
         renewServices =  if cfg.maxConcurrentRenewals > 0
           then roundRobinApplyAttrs renewServiceFunctions concurrencyLockfiles
-          else mapAttrs (_: f: f null) renewServiceFunctions;
-        selfsignServiceFunctions = mapAttrs' (cert: conf: nameValuePair "acme-selfsigned-${cert}" conf.selfsignService) certConfigs;
+          else lib.mapAttrs (_: f: f null) renewServiceFunctions;
+        selfsignServiceFunctions = lib.mapAttrs' (cert: conf: lib.nameValuePair "acme-selfsigned-${cert}" conf.selfsignService) certConfigs;
         selfsignServices = if cfg.maxConcurrentRenewals > 0
           then roundRobinApplyAttrs selfsignServiceFunctions concurrencyLockfiles
-          else mapAttrs (_: f: f null) selfsignServiceFunctions;
+          else lib.mapAttrs (_: f: f null) selfsignServiceFunctions;
         in
         { "acme-fixperms" = userMigrationService; }
-        // (optionalAttrs (cfg.maxConcurrentRenewals > 0) {"acme-lockfiles" = lockfilePrepareService; })
+        // (lib.optionalAttrs (cfg.maxConcurrentRenewals > 0) {"acme-lockfiles" = lockfilePrepareService; })
         // renewServices
-        // (optionalAttrs (cfg.preliminarySelfsigned) ({
+        // (lib.optionalAttrs (cfg.preliminarySelfsigned) ({
         "acme-selfsigned-ca" = selfsignCAService;
       } // selfsignServices));
 
-      systemd.timers = mapAttrs' (cert: conf: nameValuePair "acme-${cert}" conf.renewTimer) certConfigs;
+      systemd.timers = lib.mapAttrs' (cert: conf: lib.nameValuePair "acme-${cert}" conf.renewTimer) certConfigs;
 
       systemd.targets = let
         # Create some targets which can be depended on to be "active" after cert renewals
-        finishedTargets = mapAttrs' (cert: conf: nameValuePair "acme-finished-${cert}" {
+        finishedTargets = lib.mapAttrs' (cert: conf: lib.nameValuePair "acme-finished-${cert}" {
           wantedBy = [ "default.target" ];
           requires = [ "acme-${cert}.service" ];
           after = [ "acme-${cert}.service" ];
@@ -1017,15 +1016,15 @@ in {
         # Using a target here is fine - account creation is a one time event. Even if
         # systemd clean --what=state is used to delete the account, so long as the user
         # then runs one of the cert services, there won't be any issues.
-        accountTargets = mapAttrs' (hash: confs: let
+        accountTargets = lib.mapAttrs' (hash: confs: let
           leader = "acme-${(builtins.head confs).cert}.service";
           dependantServices = map (conf: "acme-${conf.cert}.service") (builtins.tail confs);
-        in nameValuePair "acme-account-${hash}" {
+        in lib.nameValuePair "acme-account-${hash}" {
           requiredBy = dependantServices;
           before = dependantServices;
           requires = [ leader ];
           after = [ leader ];
-        }) (groupBy (conf: conf.accountHash) (attrValues certConfigs));
+        }) (lib.groupBy (conf: conf.accountHash) (lib.attrValues certConfigs));
       in finishedTargets // accountTargets;
     })
   ];

From 80d8881fc7ff4840e86ab8f47ee1ec2503ab1518 Mon Sep 17 00:00:00 2001
From: Hentioe <meow.i5.br@gmail.com>
Date: Thu, 5 Sep 2024 09:41:27 +0800
Subject: [PATCH 31/90] mise: 2024.8.15 -> 2024.9.0

---
 pkgs/tools/misc/mise/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/mise/default.nix b/pkgs/tools/misc/mise/default.nix
index 42ebefe7e9de..473d7a308f23 100644
--- a/pkgs/tools/misc/mise/default.nix
+++ b/pkgs/tools/misc/mise/default.nix
@@ -17,13 +17,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mise";
-  version = "2024.8.15";
+  version = "2024.9.0";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "mise";
     rev = "v${version}";
-    hash = "sha256-E4eS4wPExW4R7vb1lKBbxxwCzIcL3kut3U2c6n9cs3s=";
+    hash = "sha256-q515JEpws1UnZm1b8zgGxPvudH846XV+Ct4qKN2mNMQ=";
 
     # registry is not needed for compilation nor for tests.
     # contains files with the same name but different case, which cause problems with hash on darwin
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  cargoHash = "sha256-oQbjR0nsyKQh232Ga5sPEfBd24ty0Om5vc742tVkCt4=";
+  cargoHash = "sha256-jGqaGbue+AEK0YjhHMlm84XBgA20p8Um03TjctjXVz0=";
 
   nativeBuildInputs = [ installShellFiles pkg-config ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

From 617a699d598bfa904cba9384954eb2de8c90d110 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 02:10:21 +0000
Subject: [PATCH 32/90] python312Packages.catppuccin: 2.3.0 -> 2.3.1

---
 pkgs/development/python-modules/catppuccin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/catppuccin/default.nix b/pkgs/development/python-modules/catppuccin/default.nix
index 2726aa4f98de..a8007f932b16 100644
--- a/pkgs/development/python-modules/catppuccin/default.nix
+++ b/pkgs/development/python-modules/catppuccin/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "catppuccin";
-  version = "2.3.0";
+  version = "2.3.1";
 
   pyproject = true;
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "catppuccin";
     repo = "python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1CPNs+n9S7fV+EvhFWBwnv6/N3UWQ/jiyRcn4XKzmd8=";
+    hash = "sha256-MIxhl9D6nur26ZrbcXAwH8xO9YZlBvVKlB82qKX3Tx0=";
   };
 
   build-system = [

From 994d909ac9a9bea8021099914a508e64e899cd94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 02:23:46 +0000
Subject: [PATCH 33/90] python312Packages.pykdtree: 1.3.12 -> 1.3.13

---
 pkgs/development/python-modules/pykdtree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix
index 8e09b744ff8a..f169201b2cc5 100644
--- a/pkgs/development/python-modules/pykdtree/default.nix
+++ b/pkgs/development/python-modules/pykdtree/default.nix
@@ -17,12 +17,12 @@
 
 buildPythonPackage rec {
   pname = "pykdtree";
-  version = "1.3.12";
+  version = "1.3.13";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zCCypnxkBWSFoxTSwrbbo1SvfuHI+42uG+byk2o3Q0E=";
+    hash = "sha256-Osz4UulGZT45nD1Nu+EZ28bT9yz9LVqVyr8L8Mf5JP4=";
   };
 
   postPatch = ''

From 9410d98452b1bf45b57fbd41a7906cef06a8f402 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 02:46:42 +0000
Subject: [PATCH 34/90] scaleway-cli: 2.32.1 -> 2.33.0

---
 pkgs/tools/admin/scaleway-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix
index 3b9ffe581afd..2693aa1f7d3a 100644
--- a/pkgs/tools/admin/scaleway-cli/default.nix
+++ b/pkgs/tools/admin/scaleway-cli/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "scaleway-cli";
-  version = "2.32.1";
+  version = "2.33.0";
 
   src = fetchFromGitHub {
     owner = "scaleway";
     repo = "scaleway-cli";
     rev = "v${version}";
-    sha256 = "sha256-+zSUgwh3CKyvBzRY4NevkoSINfvMNOfw8rvs48O0yJw=";
+    sha256 = "sha256-6mmjIrG81uaNfRAXW0YORZfviFwJd1QyORfvMucNWdI=";
   };
 
-  vendorHash = "sha256-iEPBTM+hVAGs0TF30onHR0lWAALQbsA164OTkYuOdwc=";
+  vendorHash = "sha256-PWjcQD64DEJylRdSUA55iCcKHMdyMh5PrfWnhZz3LOg=";
 
   ldflags = [
     "-w"

From a4ef1d4a785b201468c54a066aa7a4019b5c9104 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 02:56:22 +0000
Subject: [PATCH 35/90] python312Packages.mizani: 0.12.1 -> 0.12.2

---
 pkgs/development/python-modules/mizani/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix
index dd134c9d4c1d..92ced96774e0 100644
--- a/pkgs/development/python-modules/mizani/default.nix
+++ b/pkgs/development/python-modules/mizani/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "mizani";
-  version = "0.12.1";
+  version = "0.12.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "has2k1";
     repo = "mizani";
     rev = "refs/tags/v${version}";
-    hash = "sha256-a/+yZ7oUZG0fKgBUMwIf3XHUjac8Gsh3AosDVuUVoJU=";
+    hash = "sha256-aTc8LC/2zLrrTfOXABWs049m752PctpvlguA6qhyhp8=";
   };
 
   build-system = [ setuptools-scm ];

From cc78da7bb3c1405e6581bdb67f4db7e156b4dea6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 02:57:02 +0000
Subject: [PATCH 36/90] terraform-ls: 0.34.2 -> 0.34.3

---
 pkgs/development/tools/misc/terraform-ls/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix
index 500c2ff7ba1a..f72e1e000ac4 100644
--- a/pkgs/development/tools/misc/terraform-ls/default.nix
+++ b/pkgs/development/tools/misc/terraform-ls/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "terraform-ls";
-  version = "0.34.2";
+  version = "0.34.3";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-4k9ro5XfcZs68p4QmvO+SBxfgBFf2Z8yrXiWmkbOj1c=";
+    hash = "sha256-fN/C7H0s7ZhXSg8pLn9iex6WglMKsx6hA8OK/HYqbRU=";
   };
 
-  vendorHash = "sha256-znBfzX6oS19auL1ptcVXM0l2Thpnb7DrciYs5Z2XVJY=";
+  vendorHash = "sha256-NL5pqcQTjauxLschhj3kCiZLBLagABSCU/zHLcG2anM=";
 
   ldflags = [ "-s" "-w" ];
 

From acd8757d352af03a7b51ba28c480bbc27d2cb3d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 02:59:32 +0000
Subject: [PATCH 37/90] python312Packages.django-modeltranslation: 0.19.7 ->
 0.19.8

---
 .../python-modules/django-modeltranslation/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix
index 35cd50fe4f53..1ede02a766a6 100644
--- a/pkgs/development/python-modules/django-modeltranslation/default.nix
+++ b/pkgs/development/python-modules/django-modeltranslation/default.nix
@@ -13,7 +13,7 @@
 let
   # 0.18.12 was yanked from PyPI, it refers to this issue:
   # https://github.com/deschler/django-modeltranslation/issues/701
-  version = "0.19.7";
+  version = "0.19.8";
 in
 buildPythonPackage {
   pname = "django-modeltranslation";
@@ -23,7 +23,7 @@ buildPythonPackage {
     owner = "deschler";
     repo = "django-modeltranslation";
     rev = "refs/tags/v${version}";
-    hash = "sha256-jZm51HmK4pgEPeDirMkbLdLJQONspjuqSc2HgiSCtOY=";
+    hash = "sha256-23htGjPtupmg/oSO/5SuxOfbDmRQKrqx2/lvfqYp7dA=";
   };
 
   disabled = pythonOlder "3.6";

From fcdb874388b848d3e697b268aaee8fbaa633df9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 06:42:01 +0000
Subject: [PATCH 38/90] rust-analyzer-unwrapped: 2024-08-27 -> 2024-09-02

---
 pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix
index 122e5d747787..6326657372c4 100644
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
-  version = "2024-08-27";
-  cargoHash = "sha256-zYKBNByyHjLbShhmoVTvqWe30EKVf3XBKzktZzGjifo=";
+  version = "2024-09-02";
+  cargoHash = "sha256-t45RzYkuywGByGWwUON3dW0aKjLYcFXB8uy4CybPuf4=";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rust-analyzer";
     rev = version;
-    hash = "sha256-tRaJTAfFpV2y+kqf8ZzX74waPpkZ0r2EB4WIKLQAsrw=";
+    hash = "sha256-YH0kH5CSOnAuPUB1BUzUqvnKiv5SgDhfMNjrkki9Ahk=";
   };
 
   cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];

From c9fcbdf69b395de1b1bd08147ce9ead05d61fc80 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 09:29:05 +0200
Subject: [PATCH 39/90] python312Packages.pynslookup: init at 1.8.1

Module to do DNS lookups

https://github.com/wesinator/pynslookup
---
 .../python-modules/pynslookup/default.nix     | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/pynslookup/default.nix

diff --git a/pkgs/development/python-modules/pynslookup/default.nix b/pkgs/development/python-modules/pynslookup/default.nix
new file mode 100644
index 000000000000..42591c750ca7
--- /dev/null
+++ b/pkgs/development/python-modules/pynslookup/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  dnspython,
+  pythonOlder,
+}:
+
+buildPythonPackage rec {
+  pname = "pynslookup";
+  version = "1.8.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "wesinator";
+    repo = "pynslookup";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-cb8oyI8D8SzBP+tm1jGPPshJYhPegYOH0RwIH03/K/A=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ dnspython ];
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "nslookup" ];
+
+  meta = with lib; {
+    description = "Module to do DNS lookups";
+    homepage = "https://github.com/wesinator/pynslookup";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 53d67680d8da..dbf0006fa02d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10097,6 +10097,8 @@ self: super: with self; {
 
   pynotifier = callPackage ../development/python-modules/pynotifier { };
 
+  pynslookup = callPackage ../development/python-modules/pynslookup { };
+
   pynuki = callPackage ../development/python-modules/pynuki { };
 
   pynut2 = callPackage ../development/python-modules/pynut2 { };

From 6ccc6bf4d2a6fac38236f7453149e402e443721e Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 4 Sep 2024 12:17:39 +0200
Subject: [PATCH 40/90] initrd: emit a warning when tmpfiles config is created
 manually

---
 nixos/modules/system/boot/systemd/tmpfiles.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixos/modules/system/boot/systemd/tmpfiles.nix
index f609da314c86..44c72f2768cc 100644
--- a/nixos/modules/system/boot/systemd/tmpfiles.nix
+++ b/nixos/modules/system/boot/systemd/tmpfiles.nix
@@ -163,6 +163,20 @@ in
   };
 
   config = {
+    warnings =
+      let
+        paths = lib.filter (path:
+          path != null && lib.hasPrefix "/etc/tmpfiles.d/" path
+        ) (map (path: path.target) config.boot.initrd.systemd.storePaths);
+      in
+      lib.optional (lib.length paths > 0) (lib.concatStringsSep " " [
+        "Files inside /etc/tmpfiles.d in the initrd need to be created with"
+        "boot.initrd.systemd.tmpfiles.settings."
+        "Creating them by hand using boot.initrd.systemd.contents or"
+        "boot.initrd.systemd.storePaths will lead to errors in the future."
+        "Found these problematic files: ${lib.concatStringsSep ", " paths}"
+      ]);
+
     systemd.additionalUpstreamSystemUnits = [
       "systemd-tmpfiles-clean.service"
       "systemd-tmpfiles-clean.timer"

From 455eeff913ec02b4111762580093a195befdf670 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 08:08:24 +0000
Subject: [PATCH 41/90] anytype: 0.42.5 -> 0.42.6

---
 pkgs/by-name/an/anytype/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix
index 619ca4adefd5..65b9fd1e1f00 100644
--- a/pkgs/by-name/an/anytype/package.nix
+++ b/pkgs/by-name/an/anytype/package.nix
@@ -2,11 +2,11 @@
 
 let
   pname = "anytype";
-  version = "0.42.5";
+  version = "0.42.6";
   name = "Anytype-${version}";
   src = fetchurl {
     url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage";
-    hash = "sha256-43g/CdmmQTSxk7OTZMPIiWIYJjCG2zJNM9kaAq1jOqE=";
+    hash = "sha256-ubYk3CsdaUW4AtMYskmFunznUAVcBdbJh4dyGgSs1Io=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in appimageTools.wrapType2 {

From f6081f46dbf7f878f0258e67ad2e79c7b2d5fb82 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Wed, 4 Sep 2024 23:42:03 +0200
Subject: [PATCH 42/90] sink-rotate: fix cross

---
 pkgs/by-name/si/sink-rotate/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/si/sink-rotate/package.nix b/pkgs/by-name/si/sink-rotate/package.nix
index 44fd2a7dc12d..9e61d1ca19b3 100644
--- a/pkgs/by-name/si/sink-rotate/package.nix
+++ b/pkgs/by-name/si/sink-rotate/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
 
   cargoHash = "sha256-MPeyPTkxpi6iw/BT5m4S7jVBD0c2zG2rsv+UZWQxpUU=";
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   postFixup = ''
     wrapProgram $out/bin/sink-rotate \

From 674712809c01ad17421f6446433b4ed4cd6f3989 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 4 Sep 2024 23:51:37 +0300
Subject: [PATCH 43/90] python312Packages.numpy_2: add doronbehar to
 maintainers

---
 pkgs/development/python-modules/numpy/2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix
index 4164b7c80a93..9029111f9e51 100644
--- a/pkgs/development/python-modules/numpy/2.nix
+++ b/pkgs/development/python-modules/numpy/2.nix
@@ -176,5 +176,6 @@ buildPythonPackage rec {
     description = "Scientific tools for Python";
     homepage = "https://numpy.org/";
     license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ doronbehar ];
   };
 }

From bd46e7f067253f2d272aea49eec71dd27905095f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 4 Sep 2024 23:55:14 +0300
Subject: [PATCH 44/90] python312Packages.numpy_2: 2.1.0 -> 2.1.1

Changelog: https://github.com/numpy/numpy/releases/tag/v2.1.1
---
 pkgs/development/python-modules/numpy/2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix
index 9029111f9e51..af9549ee0874 100644
--- a/pkgs/development/python-modules/numpy/2.nix
+++ b/pkgs/development/python-modules/numpy/2.nix
@@ -58,7 +58,7 @@ let
 in
 buildPythonPackage rec {
   pname = "numpy";
-  version = "2.1.0";
+  version = "2.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -66,7 +66,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "tar.gz";
-    hash = "sha256-fckNoAgffh2knsTjmO3mqOnMT16+X54GtEPtiJ7pqqI=";
+    hash = "sha256-0M99VbEFE4eAdAWziY76+oYpl7TLqKpdvmV755Sv6v0=";
   };
 
   patches = lib.optionals python.hasDistutilsCxxPatch [

From bbbc220850926b74f40980a262a471f508ba1571 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 09:15:52 +0000
Subject: [PATCH 45/90] hcledit: 0.2.14 -> 0.2.15

---
 pkgs/tools/text/hcledit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/hcledit/default.nix b/pkgs/tools/text/hcledit/default.nix
index 882561b98387..2328840648c1 100644
--- a/pkgs/tools/text/hcledit/default.nix
+++ b/pkgs/tools/text/hcledit/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "hcledit";
-  version = "0.2.14";
+  version = "0.2.15";
 
   src = fetchFromGitHub {
     owner = "minamijoyo";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-7Yay4a55AIzhJHkUh3lCNjklPOZm9VwrmAAyLIW6XJ0=";
+    hash = "sha256-EJSV7CsxnRCsVcqsJcImqeELdeg6Mnf7N6S9TlMbTaE=";
   };
 
   vendorHash = "sha256-G6jmdosQHBA+n7MgVAlzdSTqPYb5d+k4b4EzAI384FQ=";

From cb71d6df93e57f3f6f99fd3acc91509ed041a188 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 09:22:54 +0000
Subject: [PATCH 46/90] lazysql: 0.2.5 -> 0.2.9

---
 pkgs/by-name/la/lazysql/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix
index dd9199847248..9957de463d87 100644
--- a/pkgs/by-name/la/lazysql/package.nix
+++ b/pkgs/by-name/la/lazysql/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "lazysql";
-  version = "0.2.5";
+  version = "0.2.9";
 
   src = fetchFromGitHub {
     owner = "jorgerojas26";
     repo = "lazysql";
     rev = "v${version}";
-    hash = "sha256-QzvaQMSr0PjeAGJr5ThAQ/U0dRMa17E5hiPnc2ViUNo=";
+    hash = "sha256-6aJrLkmebOhLrnVhl9cnbW1ZBt0vq8lR7Lhz9nPFr8Q=";
   };
 
   vendorHash = "sha256-celee8uyoirX+vtAww2iQJtRwJEHyfHL2mZA2muSRiQ=";

From 60d2865bfabd2f95b91f75f519698d366fd4f0b9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 11:23:58 +0200
Subject: [PATCH 47/90] checkov: 3.2.243 -> 3.2.246

Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.243...3.2.246

Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.246
---
 pkgs/development/tools/analysis/checkov/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index ef91d7ca652e..77057f2f1983 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.243";
+  version = "3.2.246";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     rev = "refs/tags/${version}";
-    hash = "sha256-cOBbfBCpF+//f+lB65XjQqUarZDepkuvh6OvJz7xSdA=";
+    hash = "sha256-oEAu/GDW7u/jPCGLkvazmFJ5c73gAMDWwRu/AkVLDpk=";
   };
 
   patches = [ ./flake8-compat-5.x.patch ];

From 3673c28b29b24afc2fd7355f9ab660641a4648ee Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 11:25:14 +0200
Subject: [PATCH 48/90] python312Packages.tencentcloud-sdk-python: 3.0.1224 ->
 3.0.1225

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1224...3.0.1225

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1225/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index d53b5a3b78f2..a05a4eb06ab4 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1224";
+  version = "3.0.1225";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-HO4W3EevyPC1nmPsTOVAFyc18CTKAE3cKYnQ7onlLPg=";
+    hash = "sha256-Fckkv5Oq8JqTqAqw4aOYqxELfk3+TMVOF5eTsGIRjLY=";
   };
 
   build-system = [ setuptools ];

From db5b9e241661d0dcc2ba1e1fbbd3b28fc53dafd3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 09:28:56 +0000
Subject: [PATCH 49/90] python312Packages.nomadnet: 0.4.9 -> 0.5.0

---
 pkgs/development/python-modules/nomadnet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix
index 6ffc0da4c30f..9848ee69457e 100644
--- a/pkgs/development/python-modules/nomadnet/default.nix
+++ b/pkgs/development/python-modules/nomadnet/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "nomadnet";
-  version = "0.4.9";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "NomadNet";
     rev = "refs/tags/${version}";
-    hash = "sha256-Ut/YifODoiHCo3bhN8nV5ZPNIr70FM6MjlZCrUuNaFc=";
+    hash = "sha256-pYlEstApB0SYnkEfQ0kZl53xtbvTkRV+930TrCMqhbA=";
   };
 
   build-system = [ setuptools ];

From 31b8e334cc3b21344a93f56c342894a6388749cc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 11:33:33 +0200
Subject: [PATCH 50/90] circup: 1.4.0  -> 2.0.4 Diff:
 https://github.com/adafruit/circup/compare/refs/tags/1.4.0...2.0.4

Changelog: https://github.com/adafruit/circup/releases/tag/2.0.4
---
 pkgs/development/tools/circup/default.nix | 39 +++++++++++------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix
index 29b6cb3d8a38..cbb952c1035b 100644
--- a/pkgs/development/tools/circup/default.nix
+++ b/pkgs/development/tools/circup/default.nix
@@ -1,56 +1,55 @@
-{ lib
-, fetchFromGitHub
-, python3
+{
+  lib,
+  fetchFromGitHub,
+  python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "circup";
-  version = "1.4.0";
-  format = "setuptools";
+  version = "2.0.4";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "adafruit";
-    repo = pname;
+    repo = "circup";
     rev = "refs/tags/${version}";
-    hash = "sha256-kax4gnvRkHSqj0Y6Rk8eyPpT7Wia2QngCQtxpqWSl9s=";
+    hash = "sha256-Iid6IwPoj7F9X6Yb0ESsuvD9/tZdRQyCceGOVt2R1qw=";
   };
 
-  pythonRelaxDeps = [
-    "semver"
-  ];
+  pythonRelaxDeps = [ "semver" ];
 
-  nativeBuildInputs = with python3.pkgs; [
-    setuptools-scm
-  ];
+  build-system = with python3.pkgs; [ setuptools-scm ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
     appdirs
     click
     findimports
     requests
     semver
     setuptools
+    toml
     update-checker
   ];
 
-  nativeCheckInputs = with python3.pkgs; [
-    pytestCheckHook
-  ];
+  nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ];
 
   postBuild = ''
     export HOME=$(mktemp -d);
   '';
 
-  pythonImportsCheck = [
-    "circup"
+  pythonImportsCheck = [ "circup" ];
+
+  disabledTests = [
+    # Test requires network access
+    "test_libraries_from_imports_bad"
   ];
 
   meta = with lib; {
     description = "CircuitPython library updater";
-    mainProgram = "circup";
     homepage = "https://github.com/adafruit/circup";
     changelog = "https://github.com/adafruit/circup/releases/tag/${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
+    mainProgram = "circup";
   };
 }

From 2930ea88d02f1a55302daf781ab5624b90495f43 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 11:55:27 +0200
Subject: [PATCH 51/90] python312Packages.fastcore: 1.7.2 -> 1.7.4

Diff: https://github.com/fastai/fastcore/compare/refs/tags/1.7.2...1.7.4

Changelog: https://github.com/fastai/fastcore/blob/1.7.4/CHANGELOG.md
---
 pkgs/development/python-modules/fastcore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix
index 95b8e17b8859..36fd0e8a01ad 100644
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.7.2";
+  version = "1.7.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "fastai";
     repo = "fastcore";
     rev = "refs/tags/${version}";
-    hash = "sha256-3BOsOd3g+SepFUH2czywyaBnA88qLVyu/8eyHGkuEPY=";
+    hash = "sha256-pm/8YRefobh7urVWiAlb05COQbaBrXB70buDmuKY/qc=";
   };
 
   build-system = [ setuptools ];

From ddbdfe29bcfe5ed4dcea5934fb4289623cd50da5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 11:56:04 +0200
Subject: [PATCH 52/90] python312Packages.flipr-api: 1.6.0 -> 1.6.1

Diff: https://github.com/cnico/flipr-api/compare/refs/tags/1.6.0...1.6.1

Changelog: https://github.com/cnico/flipr-api/releases/tag/1.6.1
---
 pkgs/development/python-modules/flipr-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flipr-api/default.nix b/pkgs/development/python-modules/flipr-api/default.nix
index e8cd063468e8..8b725ccc2050 100644
--- a/pkgs/development/python-modules/flipr-api/default.nix
+++ b/pkgs/development/python-modules/flipr-api/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "flipr-api";
-  version = "1.6.0";
+  version = "1.6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "cnico";
     repo = "flipr-api";
     rev = "refs/tags/${version}";
-    hash = "sha256-sFCeWfu5rwImIizzik9RzfCWaEHiqhsQrapfuCXHr+4=";
+    hash = "sha256-/px8NuBwukAPMxdXvHdyfO/j/a9UatKbdrjDNuT0f4k=";
   };
 
   build-system = [ poetry-core ];

From 0545bbb4cd21afe1d1fd00bf9397d415463a762e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 Aug 2024 09:24:18 +0200
Subject: [PATCH 53/90] python312Packages.msoffcrypto-tool: 5.4.1 -> 5.4.2

Diff: https://github.com/nolze/msoffcrypto-tool/compare/refs/tags/v5.4.1...v5.4.2

Changelog: https://github.com/nolze/msoffcrypto-tool/blob/v5.4.2/CHANGELOG.md
---
 pkgs/development/python-modules/msoffcrypto-tool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/pkgs/development/python-modules/msoffcrypto-tool/default.nix
index 1c709d57884d..fe5d79ece2d3 100644
--- a/pkgs/development/python-modules/msoffcrypto-tool/default.nix
+++ b/pkgs/development/python-modules/msoffcrypto-tool/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "msoffcrypto-tool";
-  version = "5.4.1";
+  version = "5.4.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "nolze";
     repo = "msoffcrypto-tool";
     rev = "refs/tags/v${version}";
-    hash = "sha256-BVm4hMKvvNI3bJ82t4NIRcx8o8mgQgoulIerDwoVIT0=";
+    hash = "sha256-nwCjgcZqD0hptHC0WqIodHC5m/JHYyUdfEngIoXzNqA=";
   };
 
   build-system = [ poetry-core ];

From df6dfa1379fe0d7a2d3bd6587c94e99ab513128e Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Thu, 5 Sep 2024 13:18:14 +0200
Subject: [PATCH 54/90] weblate: 5.7.1 -> 5.7.2

Changelog: https://github.com/WeblateOrg/weblate/releases/tag/weblate-5.7.2
---
 pkgs/by-name/we/weblate/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index 93b73293955a..0993515eb1ae 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -28,7 +28,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "weblate";
-  version = "5.7.1";
+  version = "5.7.2";
 
   pyproject = true;
 
@@ -41,7 +41,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "WeblateOrg";
     repo = "weblate";
     rev = "refs/tags/weblate-${version}";
-    hash = "sha256-h5+0lOMD+H0ehtZ0bngA9bI5va1I5KjZH9boaEtXJPo=";
+    hash = "sha256-cIwCNYXbg7l6z9OAkMAGJ783QI/nCOyrhLPURDcDv+Y=";
   };
 
   patches = [

From ead836a24e05dcc3b24e7d19202d6b8b96cef46e Mon Sep 17 00:00:00 2001
From: GetPsyched <priyanshu@getpsyched.dev>
Date: Thu, 5 Sep 2024 17:12:21 +0530
Subject: [PATCH 55/90] atlauncher: 3.4.36.10 -> 3.4.37.2

Changelog: https://github.com/ATLauncher/ATLauncher/compare/v3.4.36.10...v3.4.37.2
---
 pkgs/by-name/at/atlauncher/deps.json   | 733 +++++++++++++------------
 pkgs/by-name/at/atlauncher/package.nix |   4 +-
 2 files changed, 372 insertions(+), 365 deletions(-)

diff --git a/pkgs/by-name/at/atlauncher/deps.json b/pkgs/by-name/at/atlauncher/deps.json
index 5ebd36a13cc5..bd7ab048a99b 100644
--- a/pkgs/by-name/at/atlauncher/deps.json
+++ b/pkgs/by-name/at/atlauncher/deps.json
@@ -1,1276 +1,1283 @@
 {
  "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
  "!version": 1,
- "https:/": {
-  "jitpack.io/com/github/ATLauncher/gradle-macappbundle#build/d22f8cdb94": {
+ "https://jitpack.io/com": {
+  "github/ATLauncher/gradle-macappbundle#build/d22f8cdb94": {
    "jar": "sha256-rBqYi12MUWdwuNbFSlYO0tREzcDpfXI3VRPVV/DRZ+c=",
    "module": "sha256-JlSHpEtQuOO3/qIdidXBZ21IjieA7PE2b0ui7aimdxc=",
    "pom": "sha256-ySbX7ZLlXt7l+JcGEqV/peu6T+h7oJp6s/d95XQdIVo="
   },
-  "jitpack.io/com/github/ATLauncher/gradle-macappbundle#edu.sc.seis.macAppBundle.gradle.plugin/d22f8cdb94": {
+  "github/ATLauncher/gradle-macappbundle#edu.sc.seis.macAppBundle.gradle.plugin/d22f8cdb94": {
    "pom": "sha256-9LZJTFfyVUyMXTgn2ifGyXEPLfPJ6tmlY8qSWEO0YmU="
   },
-  "jitpack.io/com/github/MCRcortex#nekodetector/Version-1.1-pre": {
+  "github/MCRcortex#nekodetector/Version-1.1-pre": {
    "jar": "sha256-5K2d2tmaNRavJFLe9oIv1RxNUoSUsWbZla7B0Z+4f9U=",
    "module": "sha256-NCI+ztVps3ogtEyQTwowxHLTZCzaGuKHF4xQItu/Ejg=",
    "pom": "sha256-pdiFUkilkUhJCwxup4WHMPCu9aPmzg0LmuVZ18Z5ODo="
   },
-  "jitpack.io/com/github/RyanTheAllmighty/gettext#gettext-gradle-plugin/aab5c30bf8": {
+  "github/RyanTheAllmighty/gettext#gettext-gradle-plugin/aab5c30bf8": {
    "jar": "sha256-S6XyAGm5/VXtmttMQBoNSkZ1cKNw0WKPVnLl0GxyTjw=",
    "pom": "sha256-ozcVak/AVSDRcUwozKhEC5crmdQwI1NUJso7nGu5qOg="
   },
-  "jitpack.io/com/github/RyanTheAllmighty/gettext#gettext-lib/88ae68d897": {
+  "github/RyanTheAllmighty/gettext#gettext-lib/88ae68d897": {
    "jar": "sha256-W/Er53HJryRvdlo/Vh4XQFu6TSD5OTwTxSYt7Sv9QMs=",
    "pom": "sha256-nbYGMqdReKL4Po10G3MWrloZWQLK8zUd3YqLKs/8TZI="
   },
-  "jitpack.io/com/github/RyanTheAllmighty/gettext#gettext-lib/aab5c30bf8": {
+  "github/RyanTheAllmighty/gettext#gettext-lib/aab5c30bf8": {
    "jar": "sha256-5ZE5ZDU4P3vhzmlAOVxAZynMBrkJfxPsTKVH+b/MxRE=",
    "pom": "sha256-AdGzI8W4ciDR49kasH/2Bh0XVpY8Ve/MFj+LI3pJHR4="
   },
-  "jitpack.io/com/github/Vatuu#discord-rpc/1.6.2": {
+  "github/Vatuu#discord-rpc/1.6.2": {
    "jar": "sha256-nTR5RBRKtdd34W1ui+EI3gxb9fbIz08uBOXS3Wn7tU4=",
    "pom": "sha256-TWqqjVQWL2EeeD9I7+HngsFOv5WuZifEfKc9s1PVVdo="
   },
-  "jitpack.io/com/gitlab/doomsdayrs#rxswing/a5749ad421": {
+  "gitlab/doomsdayrs#rxswing/a5749ad421": {
    "jar": "sha256-XZIGfC5TCNjiXwHdEdpxBSGWJu8aHt5RLkHYJey0nbc=",
    "module": "sha256-TAPDjgy5Byv7Vh43y9xE1VmAcq62/FGCh6NX+8Ir7lk=",
    "pom": "sha256-7Grt6dk72Csvb8zMKtflZte6wdf4SjDUynirA/OF1fM="
-  },
-  "libraries.minecraft.net/com/mojang#authlib/1.5.21": {
+  }
+ },
+ "https://libraries.minecraft.net": {
+  "com/mojang#authlib/1.5.21": {
    "jar": "sha256-znqchuvr8wuJkpAm9KCjxYzg9NR5N9bcCGrk/Qx3VEo=",
    "pom": "sha256-1ZKDxzA7QuQWUY2PXCZYlSlcEWkP2NNgefGgTGpWsXw="
-  },
-  "plugins.gradle.org/m2/com/adarshr#gradle-test-logger-plugin/3.2.0": {
+  }
+ },
+ "https://plugins.gradle.org/m2": {
+  "com/adarshr#gradle-test-logger-plugin/3.2.0": {
    "jar": "sha256-LW0Bksjs90nVxLHkUz/P2WXrsuteW9G+6qpLEJYdldg=",
    "pom": "sha256-bQ61NlUv5CUhW5L7YX/UP3RSCt05QDQUE3oVEkBPEFA="
   },
-  "plugins.gradle.org/m2/com/adarshr/test-logger#com.adarshr.test-logger.gradle.plugin/3.2.0": {
+  "com/adarshr/test-logger#com.adarshr.test-logger.gradle.plugin/3.2.0": {
    "pom": "sha256-ql6amsMp1l5VI+RgyVfUmalqo/FUJzQoxENCxB57BBk="
   },
-  "plugins.gradle.org/m2/com/apollographql/apollo#com.apollographql.apollo.gradle.plugin/2.5.14": {
+  "com/apollographql/apollo#com.apollographql.apollo.gradle.plugin/2.5.14": {
    "pom": "sha256-+Ww0HGI0gfly9FQurzIE3rd3NerlFYjOQrY0LUzfmcE="
   },
-  "plugins.gradle.org/m2/com/github/ben-manes#gradle-versions-plugin/0.47.0": {
+  "com/github/ben-manes#gradle-versions-plugin/0.47.0": {
    "jar": "sha256-H3CAteTQM5/dUJhSa+YDtPCVFaR/EirBUVCZzRWNg88=",
    "module": "sha256-VYVMhFmwZESD+Gh53gvsIcwx9GsgfNizpF5TdKxngl4=",
    "pom": "sha256-lO3mIRlM2G49tapNmGwedJroqjkSrN9xP5pTyKh9E5Q="
   },
-  "plugins.gradle.org/m2/com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.47.0": {
+  "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.47.0": {
    "pom": "sha256-+Mn7dWyfcAjGRFsFTbe7g9aJAp09tHjdYZqa7cwnCgw="
   },
-  "plugins.gradle.org/m2/com/github/johnrengelman#shadow/8.1.1": {
+  "com/github/johnrengelman#shadow/8.1.1": {
    "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=",
    "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=",
    "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU="
   },
-  "plugins.gradle.org/m2/com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": {
+  "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": {
    "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA="
   },
-  "plugins.gradle.org/m2/de/undercouch/download#de.undercouch.download.gradle.plugin/5.4.0": {
+  "de/undercouch/download#de.undercouch.download.gradle.plugin/5.4.0": {
    "pom": "sha256-6wbtSRqHmov6z2CGiCpS/hh9J17a+DUN0eoMmMQS6Jw="
   },
-  "plugins.gradle.org/m2/edu/sc/seis#macAppBundle/2.3.0": {
+  "edu/sc/seis#macAppBundle/2.3.0": {
    "jar": "sha256-RaQcBHwRecgPk0+WBIlWK8yD9CjWMcLUC2qzf93XlEQ=",
    "pom": "sha256-Bz+N8ig5R6YJRDDWt0iJ8xSjOW+6zOTAfqlTI+uecbY="
   },
-  "plugins.gradle.org/m2/edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.3": {
+  "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.3": {
    "pom": "sha256-Os140q2vOhpbu95A1j3H9vFCTge+OmzytMhvP5E2RKU="
   },
-  "plugins.gradle.org/m2/edu/sc/seis/launch4j#launch4j/3.0.3": {
+  "edu/sc/seis/launch4j#launch4j/3.0.3": {
    "jar": "sha256-nKdCRA20uwEgYWQXxHE500jaDntn3KVB+wKfR3Yjdjo=",
    "module": "sha256-Cjj1r5mHEEhY1lPn0qwfv7kdHDfqDqU7qTf3lC1E4vs=",
    "pom": "sha256-hXI2OQ+LV4qlENBxsf2+k8/UKKcbyie2JDliKah7PGQ="
   },
-  "plugins.gradle.org/m2/edu/sc/seis/macAppBundle#edu.sc.seis.macAppBundle.gradle.plugin/2.3.0": {
+  "edu/sc/seis/macAppBundle#edu.sc.seis.macAppBundle.gradle.plugin/2.3.0": {
    "pom": "sha256-aIm5UVUoqdAZ6vQ1FQTUkj0fIZz34HuRZKnYERmdBsw="
   },
-  "plugins.gradle.org/m2/gradle/plugin/org/cadixdev/gradle#licenser/0.6.1": {
+  "gradle/plugin/org/cadixdev/gradle#licenser/0.6.1": {
    "jar": "sha256-w2sPCJOeiD8o0b9WgNvxxNYCSiIuN5dXiaJTcC05JmI=",
    "pom": "sha256-BPOApmghda+dW1ux+P7ULbtdoscHNpd0D/RfJn5MDtw="
   },
-  "plugins.gradle.org/m2/org/cadixdev/licenser#org.cadixdev.licenser.gradle.plugin/0.6.1": {
+  "org/cadixdev/licenser#org.cadixdev.licenser.gradle.plugin/0.6.1": {
    "pom": "sha256-R5s2fGaOTTg5LrH+WVD4tOq6CFe0hym9oxIiIhX74MM="
-  },
-  "raw.githubusercontent": {
-   "com/tofi86/universalJavaApplicationStub/404f5c1b008d6296065de7a93406b387c9f3dce1/src/universalJavaApplicationStub": "sha256-Sb0xuQ1Bsa/S0OR2Nv6iRh9dFsKlXgFH/YLXcwVRQVE="
-  },
-  "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-api-jvm/2.5.14": {
+  }
+ },
+ "https://repo.maven.apache.org/maven2": {
+  "com/apollographql/apollo#apollo-api-jvm/2.5.14": {
    "jar": "sha256-ik9oiadu00lo72+aZMPpSyarUmFJR65dQjexoMFj2kY=",
    "module": "sha256-UjgMwRILvKZlPCrJHqBq6+z8S8JsqPUV/GH174tgX0E=",
    "pom": "sha256-B1cZPGRU3KS8qiGATDsYfLF6ZhxFy20HRbv3J8tFkkA="
   },
-  "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-api/2.5.14": {
+  "com/apollographql/apollo#apollo-api/2.5.14": {
    "module": "sha256-aCVcba2dnxtyH11LvYGOogtdkEMpTU76vW+ZkdI/3IE=",
    "pom": "sha256-ua2D9n7+u+1w/Xo4Q6xu40aXPMJyIdqG4i/JwcjcD1w="
   },
-  "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-gradle-plugin/2.5.14": {
+  "com/apollographql/apollo#apollo-gradle-plugin/2.5.14": {
    "jar": "sha256-xolghlRAe5uPk217j8CgLcTvhqEubaVgAkQTbJ+vq0M=",
    "module": "sha256-UCBR7CzahYmZRozuBYi1AJZDkCAjp4a/MBERzEENVGA=",
    "pom": "sha256-BADiKaboAKDcR+Smb0HtYvPR91qAz8kCcXhR0+VqR6o="
   },
-  "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-http-cache-api/2.5.14": {
+  "com/apollographql/apollo#apollo-http-cache-api/2.5.14": {
    "jar": "sha256-Qca5bmMQxRJ9LmG3cP84u/3I0Yz95G/F640Z/QZpRlw=",
    "module": "sha256-9DW1mK+1e/Zj59xx6DXNPFSWtx4IaqpE/jEItadtmto=",
    "pom": "sha256-6l/favLiCLRel35kgoX421G/wuITRwWyPYpjYoi6tvA="
   },
-  "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-http-cache/2.5.14": {
+  "com/apollographql/apollo#apollo-http-cache/2.5.14": {
    "jar": "sha256-PEbhbdRZfbTLqShL0jEBFEs3P7izUEY9JW8OykPkjg8=",
    "module": "sha256-HGZ+KrdHJCg6Yuf5ILvuQoEgPT27l/wOp4Lmnb7vA90=",
    "pom": "sha256-pUq2o/vxpNP4IcrW5dEwUg9/ggOEuFYf3M6f4UHf0nA="
   },
-  "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-normalized-cache-api-jvm/2.5.14": {
+  "com/apollographql/apollo#apollo-normalized-cache-api-jvm/2.5.14": {
    "jar": "sha256-vO01dy6yqLrzGYufZJ7ENTawccRxfoKAj2BOsf0PDPg=",
    "module": "sha256-QVaMITERZQZZu+VphkN8S8P8mY5IZ3rMGkAuuDOO0BU=",
    "pom": "sha256-MBBuZ/Ul07Qp2+Xho9c68Xvc25czmfiwWud4nQ89TM8="
   },
-  "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-normalized-cache-api/2.5.14": {
+  "com/apollographql/apollo#apollo-normalized-cache-api/2.5.14": {
    "module": "sha256-gTBeMIcINbqp4CpF/E5TO8Mg9jSnKs49bC7KtTRMBjU=",
    "pom": "sha256-HIccETIq3dAHgDUoTti34Yxa5jjdXD4wiYt5PkCqleo="
   },
-  "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-normalized-cache-jvm/2.5.14": {
+  "com/apollographql/apollo#apollo-normalized-cache-jvm/2.5.14": {
    "jar": "sha256-6kNfiztqub0KZUzBG7di5sTandhb0O3+i+o2ELzOWaI=",
    "module": "sha256-HJW8E/g0ptk3Xq8smD1S0ent1GeJNkd0i94gGV5mO+M=",
    "pom": "sha256-TTOHbwMJCYQXF7edrXrtS5MU9KWvqKL1GtBnmg/fZic="
   },
-  "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-normalized-cache/2.5.14": {
+  "com/apollographql/apollo#apollo-normalized-cache/2.5.14": {
    "module": "sha256-Fpsg4WzmNwCZDGnlmlx0DFx8+8z7lv60Lkx7thQ410I=",
    "pom": "sha256-ao3ZFBX1vESFDzaky32DEcTmJNEdVbQp7ROa+4yCit0="
   },
-  "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-runtime/2.5.14": {
+  "com/apollographql/apollo#apollo-runtime/2.5.14": {
    "jar": "sha256-svVruDVJmTutF/nujXrosNin7NGCo/BO0wwyHqW0vHQ=",
    "module": "sha256-pOMsFT5jX7lgFaBK2JbAqzMkyxjv9CFicPmW07FjwLI=",
    "pom": "sha256-k/cVpVv+AiUlqEnAhbuvvX8S04By7fYLh+Lhn7+TbT8="
   },
-  "repo.maven.apache.org/maven2/com/apollographql/apollo#apollo-rx3-support/2.5.14": {
+  "com/apollographql/apollo#apollo-rx3-support/2.5.14": {
    "jar": "sha256-sHZg8rYqymFjBiL90cy73W1zCcGpjhdBEi5DxvCRV9s=",
    "module": "sha256-VnUaIcuCllQzInsCKAEzUSqiKplxEuIyWdkASuK5OZ0=",
    "pom": "sha256-Ww5yoXMIwc+dld6zMz5VBi+/5razxalgmH2hfhzrAFA="
   },
-  "repo.maven.apache.org/maven2/com/apollographql/apollo#com.apollographql.apollo.gradle.plugin/2.5.14": {
+  "com/apollographql/apollo#com.apollographql.apollo.gradle.plugin/2.5.14": {
    "pom": "sha256-jrv1c+8UAZu4n9/HQnfCBRHVyeEHR10dP8X/O4LVKuY="
   },
-  "repo.maven.apache.org/maven2/com/benasher44#uuid-jvm/0.2.0": {
+  "com/benasher44#uuid-jvm/0.2.0": {
    "jar": "sha256-/YBhY1na/dyoW/WGkelJgQ6UGJ2bs8EZ0AL4XGzVk4Q=",
    "module": "sha256-UoG7jLvCZCKgfEBeSP1JULZU2Qwe08bNWbFrU+fJ4Hs=",
    "pom": "sha256-9ujJ/xbl9o7PsOke2r7s/9lEYh5ZGKlsbAczGmiyg9A="
   },
-  "repo.maven.apache.org/maven2/com/benasher44#uuid/0.2.0": {
+  "com/benasher44#uuid/0.2.0": {
    "module": "sha256-QNZuutBWPPBK7ScOhmAjCHLER8wMoJ5D4ZpOfOIUw1A=",
    "pom": "sha256-jrkHIhN74rupW7ioLd0Q6Nxp9ENCuK5tUYBHc4F6M/U="
   },
-  "repo.maven.apache.org/maven2/com/ethlo/time#itu/1.7.0": {
+  "com/ethlo/time#itu/1.7.0": {
    "jar": "sha256-Vc60GMnoE4xPz2LiE8TIFNieioTIJ9OVQHy+y6XXkec=",
    "pom": "sha256-gIZwS+Wqp8UulyZmz0nHr+6bOZu6O6nNJraAXE/N6Bg="
   },
-  "repo.maven.apache.org/maven2/com/fasterxml#oss-parent/48": {
+  "com/fasterxml#oss-parent/48": {
    "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8="
   },
-  "repo.maven.apache.org/maven2/com/fasterxml#oss-parent/49": {
+  "com/fasterxml#oss-parent/49": {
    "pom": "sha256-bfHMCoZSQhAIiUNBLJcbQqumidGwaNuf05Htmhk4cjU="
   },
-  "repo.maven.apache.org/maven2/com/fasterxml/jackson#jackson-base/2.14.1": {
+  "com/fasterxml/jackson#jackson-base/2.14.1": {
    "pom": "sha256-GAFdG6y6mhRiWovxlBH1v62C0AYN83snvQLngTLEZ24="
   },
-  "repo.maven.apache.org/maven2/com/fasterxml/jackson#jackson-bom/2.14.1": {
+  "com/fasterxml/jackson#jackson-bom/2.14.1": {
    "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw="
   },
-  "repo.maven.apache.org/maven2/com/fasterxml/jackson#jackson-parent/2.14": {
+  "com/fasterxml/jackson#jackson-parent/2.14": {
    "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk="
   },
-  "repo.maven.apache.org/maven2/com/fasterxml/jackson/core#jackson-annotations/2.14.1": {
+  "com/fasterxml/jackson/core#jackson-annotations/2.14.1": {
    "jar": "sha256-0lW0uGP/jscUqPlvpVw0Yh1D27grgtP1dHZJakwJ4ec=",
    "module": "sha256-JnpoC7csvXUsdreeuQiuDAq+sRT8scIKlnjwN4iYues=",
    "pom": "sha256-id8WI4ax7eg6iATpCDlw0aYr310caenpkUdhtGf4CIM="
   },
-  "repo.maven.apache.org/maven2/com/fasterxml/jackson/core#jackson-core/2.14.1": {
+  "com/fasterxml/jackson/core#jackson-core/2.14.1": {
    "jar": "sha256-ARQYfilrNMkxwb+eWoQVK2K/q30YL1Yj85gtwto15SY=",
    "module": "sha256-fIuANfkA8/HL2wa4x53CsYsR9q+hOwt0cZzuNJ/0wyk=",
    "pom": "sha256-dHse68uLbe8o+u7cCSN0jxwVP8aksNjjsLyo3l/aY38="
   },
-  "repo.maven.apache.org/maven2/com/fasterxml/jackson/core#jackson-databind/2.14.1": {
+  "com/fasterxml/jackson/core#jackson-databind/2.14.1": {
    "jar": "sha256-QjoMgG3ks/petKKGmDBeOjd3xzHhvPobLzo3YMe253M=",
    "module": "sha256-2BeXfIprCq7aUZ+yp7jcugKzjDwnICT62jLFzOfj08s=",
    "pom": "sha256-etsj1tdG7c+UbRwGKxmP+aAmwOIrMHuNXXnB4IU4xjU="
   },
-  "repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.14.1": {
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.14.1": {
    "jar": "sha256-nhV+JiXthVq3OveRXiVvaCOZOjCYL0kjycqCu3UqAwM=",
    "module": "sha256-VanyBdnMgeilSjgYNbspbniFWR0Dx0BGd6EuEvJJeoo=",
    "pom": "sha256-MLlX5y4J2kuXIn4AFluOTmupgXTK3JcJHDRlLihi4cI="
   },
-  "repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.14.1": {
+  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.14.1": {
    "pom": "sha256-+jI/nD8sJtfMzU4hNgkQRRVNRdwcFmHU+HakcfVix1k="
   },
-  "repo.maven.apache.org/maven2/com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.14.1": {
+  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.14.1": {
    "jar": "sha256-C2U2E/UdbhU5bStlzP7JU5sqtHHFhC9bEaxId8vVH3I=",
    "module": "sha256-/Tb5c/sUISE7KMjOFXtoj0oKO+9gll/wzohQDtbJIh4=",
    "pom": "sha256-yRM4B2Gdzeb1Jc1UNJZSk/0BcUccj4R+D6GVu6GttNc="
   },
-  "repo.maven.apache.org/maven2/com/fasterxml/jackson/module#jackson-modules-java8/2.14.1": {
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.14.1": {
    "pom": "sha256-CyfB7lgSDFHyo4cXwseUr/qa91wSNNcpe5zkLof8Il4="
   },
-  "repo.maven.apache.org/maven2/com/fasterxml/uuid#java-uuid-generator/4.1.0": {
+  "com/fasterxml/uuid#java-uuid-generator/4.1.0": {
    "jar": "sha256-u0s3BtLxXF5eYCPu0lG87hOPoVK+NUdJ9W/sAccmhnk=",
    "pom": "sha256-5TZK+P0X73rgJVElx+Qy1w0YW/Uy6cLzOSWZSeendSQ="
   },
-  "repo.maven.apache.org/maven2/com/formdev#flatlaf-extras/3.1.1": {
+  "com/formdev#flatlaf-extras/3.1.1": {
    "jar": "sha256-3l09TZ+oX+pOPEOv1+iCfr5cAF8+H/rVTT4/QJofZtM=",
    "module": "sha256-5N/Q1zK+EUS7BJWdNkSwvvzvLAa6MNQj5Cp34hcLmMQ=",
    "pom": "sha256-jFE9cIGiz2SOOUG/LTDo/NJ4y7I3FZqbWn2fCNaeXBo="
   },
-  "repo.maven.apache.org/maven2/com/formdev#flatlaf/3.1.1": {
+  "com/formdev#flatlaf/3.1.1": {
    "jar": "sha256-Jk75UoYnUQyiDzxoDE46wBKbysI1uNTZ8BQmHzzW1W8=",
    "module": "sha256-pyoFwWAhh9DRfKh+1W9IjgzCtVpPiK0LAfgejZlnX4I=",
    "pom": "sha256-X6tw379yYFHCJtgn2zQfND00aPKlm3Qw1hQKSJMsi+8="
   },
-  "repo.maven.apache.org/maven2/com/formdev#svgSalamander/1.1.3": {
+  "com/formdev#svgSalamander/1.1.3": {
    "jar": "sha256-y7Z73jhascHpgy9UkSmCxp/GDIHCRINdB/Q8pORhDrA=",
    "pom": "sha256-Cz+GlIGr8x9f9fQ4apYLTeYY4AQgLPHXsowlRf9Qoy8="
   },
-  "repo.maven.apache.org/maven2/com/github/cliftonlabs#json-simple/3.0.2": {
+  "com/github/cliftonlabs#json-simple/3.0.2": {
    "jar": "sha256-/aZamtDhrAyImHEG6Jqk2LKiSV5+BCNx76g4E/ZbcpU=",
    "pom": "sha256-sNrLFHnNTb4IENGqM1vw+5vDxP9VNpyHWXumj1h5/k8="
   },
-  "repo.maven.apache.org/maven2/com/github/hypfvieh#dbus-java-parent/3.3.2": {
+  "com/github/hypfvieh#dbus-java-parent/3.3.2": {
    "pom": "sha256-f3IGVDpJy9AvxUbGukYJGeQFwDxaRyNCvF0WQs7WGOI="
   },
-  "repo.maven.apache.org/maven2/com/github/hypfvieh#dbus-java/3.3.2": {
+  "com/github/hypfvieh#dbus-java/3.3.2": {
    "jar": "sha256-avCJp4anMpzhH1cjO0EwLa9+DcQGiffy4LCfpr7gCEU=",
    "pom": "sha256-BWRd/O/aPsk7ZdigneVvQfT33DjnqG7nqL5MDZOXhT8="
   },
-  "repo.maven.apache.org/maven2/com/github/java-json-tools#btf/1.3": {
+  "com/github/java-json-tools#btf/1.3": {
    "jar": "sha256-Z8PkYutQgH9OCl9N7jBLvxfNmGpC7l6wsvTJv2TRMNk=",
    "pom": "sha256-qb8bOVbm1Gy99zeRKOsXMs3hrGVAl5RNxlobbcQlcPA="
   },
-  "repo.maven.apache.org/maven2/com/github/java-json-tools#jackson-coreutils-equivalence/1.0": {
+  "com/github/java-json-tools#jackson-coreutils-equivalence/1.0": {
    "jar": "sha256-60qa19gD+whL/895PIqB9R10W21DjChHDvnVql+4oYI=",
    "pom": "sha256-0Vd8uaSY6Et0+ADXdRiQb/ErXT4vKJ2SqTauCU6sxeE="
   },
-  "repo.maven.apache.org/maven2/com/github/java-json-tools#jackson-coreutils/2.0": {
+  "com/github/java-json-tools#jackson-coreutils/2.0": {
    "jar": "sha256-FrOqvTqeslZV3aQz41+b2cfBqnmRQncC9fEfAAgT27A=",
    "pom": "sha256-jZ7pOk/dXSvYDrqUonoTDWBo8/heSI61vxSUOHEc6eo="
   },
-  "repo.maven.apache.org/maven2/com/github/java-json-tools#json-patch/1.13": {
+  "com/github/java-json-tools#json-patch/1.13": {
    "jar": "sha256-H3lNJWlltT7zfnC1VQXi7QDdwBhNROLo4f3OWjysx94=",
    "pom": "sha256-59lec35Uwo1EuFv2Qw8VNvZEZU1pQr2ogzM4r5aWSw8="
   },
-  "repo.maven.apache.org/maven2/com/github/java-json-tools#json-schema-core/1.2.14": {
+  "com/github/java-json-tools#json-schema-core/1.2.14": {
    "jar": "sha256-yFmUL92inCbMsr6DqEU6Ew3jX95viK4Yl4VRa10U+Bw=",
    "pom": "sha256-pR/BAI6VN7vFJbpywl4Lz4LzXxscwwfC53jS7fO9V18="
   },
-  "repo.maven.apache.org/maven2/com/github/java-json-tools#json-schema-validator/2.2.14": {
+  "com/github/java-json-tools#json-schema-validator/2.2.14": {
    "jar": "sha256-zZ48WZuzIpZRf9OsOL7qxwnwpquBstQolJXQNhulmJk=",
    "pom": "sha256-W8HTDGddkv+DV3ldOvN172JqvffrMjS2TahmKqEeqZs="
   },
-  "repo.maven.apache.org/maven2/com/github/java-json-tools#msg-simple/1.2": {
+  "com/github/java-json-tools#msg-simple/1.2": {
    "jar": "sha256-vvQRG5k6Wz5hSNj1hWIczqwqGInNvDREixFjLg2Kmo8=",
    "pom": "sha256-bvPzUgcukUz6FzkzRoXyotAAJRL8Ul+kEtSQ1FCUMKM="
   },
-  "repo.maven.apache.org/maven2/com/github/java-json-tools#uri-template/0.10": {
+  "com/github/java-json-tools#uri-template/0.10": {
    "jar": "sha256-OTb2fY59+j7t7+RQ/1iHF0kwiYLGuLcGU1qIQ5HfT7A=",
    "pom": "sha256-MXithX0gGmwpZy4rFGrAuj7MUlNquZaUpGuxJfoBxrk="
   },
-  "repo.maven.apache.org/maven2/com/github/jnr#jffi/1.3.9": {
+  "com/github/jnr#jffi/1.3.9": {
    "jar": "sha256-1zwPAKXOnb88teW7JpGjJso4giBeyaBs65AGU3En5mE=",
    "pom": "sha256-zEqmwymkRXqBhdvE2iH17AYuIiWux5wgCDsg11ESehw="
   },
-  "repo.maven.apache.org/maven2/com/github/jnr#jffi/1.3.9/native": {
+  "com/github/jnr#jffi/1.3.9/native": {
    "jar": "sha256-vd/kYNUoxopx0NTJ0wEi8o9vGC+eu0vo9l5wkMTKiBw="
   },
-  "repo.maven.apache.org/maven2/com/github/jnr#jnr-a64asm/1.0.0": {
+  "com/github/jnr#jnr-a64asm/1.0.0": {
    "jar": "sha256-U65ep/pcKE6Ceao0jnud5FSLDK4Qv9BY+iF8eRh15M8=",
    "pom": "sha256-ndnCmco+ySh9suwmVxpcxhHcIaGk9dLvElWpJPrOR6g="
   },
-  "repo.maven.apache.org/maven2/com/github/jnr#jnr-constants/0.10.3": {
+  "com/github/jnr#jnr-constants/0.10.3": {
    "jar": "sha256-phew2EY9PqNkNb0WERE97bN0kVev0iaZCKswbJkq7+0=",
    "pom": "sha256-5s/r5K5E3pah7I7j/z6xE07Uk7ChWymoZj45tv2rp6I="
   },
-  "repo.maven.apache.org/maven2/com/github/jnr#jnr-enxio/0.32.13": {
+  "com/github/jnr#jnr-enxio/0.32.13": {
    "jar": "sha256-08ATbrAXYJIhDVyHDb4w8dkrQ9c+6bHkqGHijGRgUnw=",
    "pom": "sha256-pcrvbflKJYBULdQsZzN004RQ2W+82Od8mOaoX4ln/Tk="
   },
-  "repo.maven.apache.org/maven2/com/github/jnr#jnr-ffi/2.2.11": {
+  "com/github/jnr#jnr-ffi/2.2.11": {
    "jar": "sha256-qcC955JRTZLonxneBBLF4m7nLbWYkUAkKykCpDt6x/U=",
    "pom": "sha256-i+JCWRyszLbK6dpwD0Nz3a0Adg6NpnlpepgSi7QqX3s="
   },
-  "repo.maven.apache.org/maven2/com/github/jnr#jnr-posix/3.1.15": {
+  "com/github/jnr#jnr-posix/3.1.15": {
    "jar": "sha256-w47PzNJOXyHxemLkXVvUVIQsXbF+1CsBuGj5IG0Omec=",
    "pom": "sha256-qjwjbl+8bsNl5MgR7OpNvKdZGFHOx8eh32syTE6wgqM="
   },
-  "repo.maven.apache.org/maven2/com/github/jnr#jnr-unixsocket/0.38.17": {
+  "com/github/jnr#jnr-unixsocket/0.38.17": {
    "jar": "sha256-mPYscZs0gUV/Jf0l4lAqznqQ1F91olVOvPy2vgsWGhc=",
    "pom": "sha256-3oSBWeFSRkTp8cV0r39Gt1Hm5TDzWifutMhT6R6hwuE="
   },
-  "repo.maven.apache.org/maven2/com/github/jnr#jnr-x86asm/1.0.2": {
+  "com/github/jnr#jnr-x86asm/1.0.2": {
    "jar": "sha256-OfNnW5EObpuTgl+ChL7J9K0wRM0gpvfI/54vhpXr8h4=",
    "pom": "sha256-6oYs472WzLjKNrjp57rvLaP7v73CVrrqqMioc5EQdOc="
   },
-  "repo.maven.apache.org/maven2/com/github/oshi#oshi-core/6.4.4": {
+  "com/github/oshi#oshi-core/6.4.4": {
    "jar": "sha256-Qj70zXIge3OpGXvVw1FMOzNqcG5E8t+9Hp2hT3UTXc4=",
    "pom": "sha256-LQP0hyNVDZCjSpqrK8EAY2jRaaxvpQnLAbHbKbueOFo="
   },
-  "repo.maven.apache.org/maven2/com/github/oshi#oshi-parent/6.4.4": {
+  "com/github/oshi#oshi-parent/6.4.4": {
    "pom": "sha256-jNu7z13zPmIDXCUQWKKb7LK6e9R+LjqsDtyKrvfl+dA="
   },
-  "repo.maven.apache.org/maven2/com/github/stephenc/jcip#jcip-annotations/1.0-1": {
+  "com/github/stephenc/jcip#jcip-annotations/1.0-1": {
    "jar": "sha256-T8z/g4Kq/FiZYsTtsmL2qlleNPHhHmEFfRxqluj8cyM=",
    "pom": "sha256-aMKlqm6PNFdDCT5StbngGQuk1aUhXApZtNfTNkcgjLs="
   },
-  "repo.maven.apache.org/maven2/com/google/code/findbugs#jsr305/2.0.1": {
+  "com/google/code/findbugs#jsr305/2.0.1": {
    "pom": "sha256-AsEsPCrhLdR1IZ/2kcgqTZ6iH0S8WUoYEpW/bUPc+7A="
   },
-  "repo.maven.apache.org/maven2/com/google/code/findbugs#jsr305/3.0.2": {
+  "com/google/code/findbugs#jsr305/3.0.2": {
    "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
    "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
   },
-  "repo.maven.apache.org/maven2/com/google/code/gson#gson-parent/2.10.1": {
+  "com/google/code/gson#gson-parent/2.10.1": {
    "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM="
   },
-  "repo.maven.apache.org/maven2/com/google/code/gson#gson/2.10.1": {
+  "com/google/code/gson#gson/2.10.1": {
    "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=",
    "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
   },
-  "repo.maven.apache.org/maven2/com/google/errorprone#error_prone_annotations/2.18.0": {
+  "com/google/errorprone#error_prone_annotations/2.18.0": {
    "jar": "sha256-nmgUy3GBaYik/RsHqZOo8hu3BY1SLBYrHehJ4ZvqVK4=",
    "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw="
   },
-  "repo.maven.apache.org/maven2/com/google/errorprone#error_prone_parent/2.18.0": {
+  "com/google/errorprone#error_prone_parent/2.18.0": {
    "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60="
   },
-  "repo.maven.apache.org/maven2/com/google/guava#failureaccess/1.0.1": {
+  "com/google/guava#failureaccess/1.0.1": {
    "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=",
    "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk="
   },
-  "repo.maven.apache.org/maven2/com/google/guava#guava-parent/26.0-android": {
+  "com/google/guava#guava-parent/26.0-android": {
    "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
   },
-  "repo.maven.apache.org/maven2/com/google/guava#guava-parent/32.1.1-jre": {
+  "com/google/guava#guava-parent/32.1.1-jre": {
    "pom": "sha256-BqpdGsBo8vgJUw8/9T+1yMlAFSolNiPQtTxPU/WhOj0="
   },
-  "repo.maven.apache.org/maven2/com/google/guava#guava/32.1.1-jre": {
+  "com/google/guava#guava/32.1.1-jre": {
    "jar": "sha256-kfu6N/HIslHPnqnn06Np63nrHmpd8dS79IPdA4B0AoE=",
    "module": "sha256-pY+TjSOeaYtZs8OcrVgO/Ro/1MoTq5KzBCbUJFLE7z4=",
    "pom": "sha256-LJBx19FSKwx2IFfDToub+uOZJ6DrdVw2qnZRlyGHDXs="
   },
-  "repo.maven.apache.org/maven2/com/google/j2objc#j2objc-annotations/2.8": {
+  "com/google/j2objc#j2objc-annotations/2.8": {
    "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=",
    "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg="
   },
-  "repo.maven.apache.org/maven2/com/googlecode/libphonenumber#libphonenumber-parent/8.11.1": {
+  "com/googlecode/libphonenumber#libphonenumber-parent/8.11.1": {
    "pom": "sha256-X12sUXT4TGCi6Z56g8eCb3NJgfvCDqHUN/em/Piq2hY="
   },
-  "repo.maven.apache.org/maven2/com/googlecode/libphonenumber#libphonenumber/8.11.1": {
+  "com/googlecode/libphonenumber#libphonenumber/8.11.1": {
    "jar": "sha256-9DDJI5TCBT8WhxWFPaltmZlulONOWikbl8XIalrWKpg=",
    "pom": "sha256-irUVuq10qC2rsC6+nm8XLUj0r+0KyAxn7aKIRqbN7dA="
   },
-  "repo.maven.apache.org/maven2/com/jayway/jsonpath#json-path/2.7.0": {
+  "com/jayway/jsonpath#json-path/2.7.0": {
    "jar": "sha256-3oLw5GAu6gGH3zZ3mujPwWU7bZIBJWdK9NNl0LyllQg=",
    "pom": "sha256-F5akBRkEB7LqzgQlhmlKmy/w2XuCAJ016VyeIVDN0Mc="
   },
-  "repo.maven.apache.org/maven2/com/jcraft#jzlib/1.1.3": {
+  "com/jcraft#jzlib/1.1.3": {
    "jar": "sha256-ibE2D0Bzgb9h/eQRAZ2MvQCeuxDP9xXzZpAXoDECdWA=",
    "pom": "sha256-7bZyUWCFVq2VhNAORrXvOOzxJG1XHA+A8k9QsoWp9oI="
   },
-  "repo.maven.apache.org/maven2/com/lmax#disruptor/3.4.4": {
+  "com/lmax#disruptor/3.4.4": {
    "jar": "sha256-FSTtMfE7yr7hthRuZ74wxjF8uU/NDHwvfHofPoIIfFE=",
    "pom": "sha256-34QNrLNYveyOnBZAlyHksOsFJGF9QkJt9yg3b8WHQi8="
   },
-  "repo.maven.apache.org/maven2/com/networknt#json-schema-validator/1.0.76": {
+  "com/networknt#json-schema-validator/1.0.76": {
    "jar": "sha256-CbdNrjzp+L4eeUm979MWQt3aWD4us1ZDnSn5QRMB6uA=",
    "pom": "sha256-+gTgetjg62RK7LCU6USfD7GSxne3ywqurvL1ndq6UHc="
   },
-  "repo.maven.apache.org/maven2/com/nimbusds#nimbus-jose-jwt/9.28": {
+  "com/nimbusds#nimbus-jose-jwt/9.28": {
    "jar": "sha256-7bukLZl+N6zws2zk1anErIjv2ILOVwfzXnUZaul2LkU=",
    "pom": "sha256-5rSewLgGmFClCxkWO1b8eoiyU6D2R7Su5uH7mAGnsnU="
   },
-  "repo.maven.apache.org/maven2/com/nytimes/android#cache/2.0.2": {
+  "com/nytimes/android#cache/2.0.2": {
    "jar": "sha256-AyLQrW+wm6xEH8wBJyuVbUvrUbHkLdaPm4prCoH1uLU=",
    "pom": "sha256-+YA4MgoWLGV7SllvKp9pmkHY2Wg/F/6XQgMdoNT3rjM="
   },
-  "repo.maven.apache.org/maven2/com/samskivert#jmustache/1.15": {
+  "com/samskivert#jmustache/1.15": {
    "jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=",
    "pom": "sha256-Z77EYiZJjJBFuqct8cnH9mG4XOObYni2TWign0Xry1k="
   },
-  "repo.maven.apache.org/maven2/com/sangupta#murmur/1.0.0": {
+  "com/sangupta#murmur/1.0.0": {
    "jar": "sha256-Mmj1Ag+5oi0slAwazBDllj2IxFLbMdn0YQo0LOftGio=",
    "pom": "sha256-iR3ql2IvUijfrV1DCHUq9kJ9GgbfxrRIwuC2vrNwO1Q="
   },
-  "repo.maven.apache.org/maven2/com/squareup/moshi#moshi-kotlin/1.12.0": {
+  "com/squareup/moshi#moshi-kotlin/1.12.0": {
    "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=",
    "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=",
    "pom": "sha256-gwdSmAK8nLCHd24CabvdaSBG+kpz8ZDVgUpaj5JmJ24="
   },
-  "repo.maven.apache.org/maven2/com/squareup/moshi#moshi/1.12.0": {
+  "com/squareup/moshi#moshi/1.12.0": {
    "jar": "sha256-7pCR4dGlkm+ptN8mQsH7e7lq7Ahjm2IZwZ4LhyTUJHU=",
    "module": "sha256-uGqTFURxITGVpEL4XKBG55oAHG1EbEHU0WiTbahW6+I=",
    "pom": "sha256-YbyUJDqTc9mUini25xAAl161EPtvf0aoHq/N3TgeR3k="
   },
-  "repo.maven.apache.org/maven2/com/squareup/okhttp3#okhttp-tls/4.11.0": {
+  "com/squareup/okhttp3#okhttp-tls/4.11.0": {
    "jar": "sha256-SuTHCSwBeBhSRQabkSdGX9V8dkSF81ev7USlxIoFNf0=",
    "module": "sha256-2m5O5qfdybnUZusr5ScBAmsXms2wClyso08uXTdeSMI=",
    "pom": "sha256-0SYiMcXxtb/bVe/7+SXas1/dWlNFEvhsSd3HIGY/IEg="
   },
-  "repo.maven.apache.org/maven2/com/squareup/okhttp3#okhttp/4.11.0": {
+  "com/squareup/okhttp3#okhttp/4.11.0": {
    "jar": "sha256-7o9r1s0SVwE9dIMw9MoUdjip+8tS+ziNWsk89TQIdF0=",
    "module": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g=",
    "pom": "sha256-ei1Cezixfgdtpk7o0hAuZIiNyyOK7l4tukp3UslKP94="
   },
-  "repo.maven.apache.org/maven2/com/squareup/okio#okio-jvm/3.2.0": {
+  "com/squareup/okio#okio-jvm/3.2.0": {
    "jar": "sha256-tkK670xXAFXeTLPRZnsrFtztkB/4BmNFoGNpGqBgJaQ=",
    "module": "sha256-p3jzkIXtar/NaHESmGxjhapXrC2IQLIdlGs8IJXzDqQ=",
    "pom": "sha256-XEUflKdr6oYbbvK/hOj1cgBUWWjIZVWr3+0Tx8otSJ0="
   },
-  "repo.maven.apache.org/maven2/com/squareup/okio#okio-multiplatform/2.9.0": {
+  "com/squareup/okio#okio-multiplatform/2.9.0": {
    "module": "sha256-JA9DK32vz1cfuOx8s48eiQiPFsjN92gq9Wt3I5FKw2A=",
    "pom": "sha256-NywwDgfKvA3u89B/QoPQfESwoS89XoV9WYT5UYCPdsY="
   },
-  "repo.maven.apache.org/maven2/com/squareup/okio#okio/3.2.0": {
+  "com/squareup/okio#okio/3.2.0": {
    "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=",
    "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE="
   },
-  "repo.maven.apache.org/maven2/com/sun/activation#all/2.0.1": {
+  "com/sun/activation#all/2.0.1": {
    "pom": "sha256-ZI1dYrYVP0LxkM7S1ucMHmRCVQyc/rZvvuCWHGYWssw="
   },
-  "repo.maven.apache.org/maven2/com/sun/activation#jakarta.activation/2.0.1": {
+  "com/sun/activation#jakarta.activation/2.0.1": {
    "jar": "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE=",
    "pom": "sha256-igaFktsI5oUyBP8LYlowFDjjw26l8a5lur/tIIUCeBo="
   },
-  "repo.maven.apache.org/maven2/com/sun/mail#all/1.6.2": {
+  "com/sun/mail#all/1.6.2": {
    "pom": "sha256-S36Dqpt31l4AfpfLUPm4nNt1T6rxZBHl/ZTR49q3brM="
   },
-  "repo.maven.apache.org/maven2/com/sun/mail#mailapi/1.6.2": {
+  "com/sun/mail#mailapi/1.6.2": {
    "jar": "sha256-03wPiO+llzzLQQD0zEmu41EM0BqyUBLR8IWxt5iuLrs=",
    "pom": "sha256-PPiVwnXN1NlmmFtwGYwVAaTl/UqfbYGDiGJKm24oCMA="
   },
-  "repo.maven.apache.org/maven2/com/sun/xml/bind#jaxb-bom-ext/4.0.1": {
+  "com/sun/xml/bind#jaxb-bom-ext/4.0.1": {
    "pom": "sha256-q7S3Gd3TFWhM1/W/iebXU2XC4I8wCVmsbF9SyjioLxk="
   },
-  "repo.maven.apache.org/maven2/com/sun/xml/bind#jaxb-core/4.0.1": {
+  "com/sun/xml/bind#jaxb-core/4.0.1": {
    "jar": "sha256-EIaQnLEwQzA52OKGW/Mxr2KNmSvO8QqV9y3BIasCB3U=",
    "pom": "sha256-GmaseJTWVDkAz/EMuxD0hZ68DoQHbYPpP1ybc8wx3lY="
   },
-  "repo.maven.apache.org/maven2/com/sun/xml/bind#jaxb-impl/4.0.1": {
+  "com/sun/xml/bind#jaxb-impl/4.0.1": {
    "jar": "sha256-2XplOnj4z5pt6azznU7ZHaOQe/7XSOhzCmLDD58+ycE=",
    "pom": "sha256-rywz0zS9LjOZLR+fQqSItix5SdweJqpEJ5kMUn4vbZ0="
   },
-  "repo.maven.apache.org/maven2/com/sun/xml/bind/mvn#jaxb-bundles/4.0.1": {
+  "com/sun/xml/bind/mvn#jaxb-bundles/4.0.1": {
    "pom": "sha256-sBFLQhIwN6zURDEpu2pdhvCVtdzSLt7wGrGpNvxRcIk="
   },
-  "repo.maven.apache.org/maven2/com/sun/xml/bind/mvn#jaxb-parent/4.0.1": {
+  "com/sun/xml/bind/mvn#jaxb-parent/4.0.1": {
    "pom": "sha256-URxR71bIkbZ15LYenyNqUDCVLBBy/5RgQBgXoQRT+K4="
   },
-  "repo.maven.apache.org/maven2/com/thoughtworks/xstream#xstream-parent/1.4.20": {
+  "com/thoughtworks/xstream#xstream-parent/1.4.20": {
    "pom": "sha256-ERiJ4wIWWg9EpU3k23BSUNHeDckbp4oZih0ieDRL7uc="
   },
-  "repo.maven.apache.org/maven2/com/thoughtworks/xstream#xstream/1.4.20": {
+  "com/thoughtworks/xstream#xstream/1.4.20": {
    "jar": "sha256-h98PC+V8kgN9ARD7siWjC2UXAtwnVlPSha/P7zG8LoE=",
    "pom": "sha256-c9gezjnpSh0tf80BhGYqo9QQa/6XCbeTlkiS4+f0/cQ="
   },
-  "repo.maven.apache.org/maven2/com/tunnelvisionlabs#antlr4-master/4.7.3": {
+  "com/tunnelvisionlabs#antlr4-master/4.7.3": {
    "pom": "sha256-5KRpWtziLRuHurCavYZ3vnAzbd+63YbTnIAsAMRctro="
   },
-  "repo.maven.apache.org/maven2/com/tunnelvisionlabs#antlr4-runtime/4.7.3": {
+  "com/tunnelvisionlabs#antlr4-runtime/4.7.3": {
    "jar": "sha256-X08MQDHkuDyzae8A9JCc229isR49JT+DphhNgMXrMVc=",
    "pom": "sha256-jcFqM2Rg2Fc4wPw+JKyUwGNwmwHZFYOOBV/PaAFgXV0="
   },
-  "repo.maven.apache.org/maven2/commons-beanutils#commons-beanutils/1.9.4": {
+  "commons-beanutils#commons-beanutils/1.9.4": {
    "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=",
    "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA="
   },
-  "repo.maven.apache.org/maven2/commons-codec#commons-codec/1.15": {
+  "commons-codec#commons-codec/1.15": {
    "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=",
    "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g="
   },
-  "repo.maven.apache.org/maven2/commons-codec#commons-codec/1.9": {
+  "commons-codec#commons-codec/1.9": {
    "jar": "sha256-rRnSYBw6vwuUa1w6QRPiJqjB4zBeOVuQATt43ZSnI84=",
    "pom": "sha256-5e/PA5zZCWiMIB3FR5sUT9bwHw5AJSt/xefS4bXAeZA="
   },
-  "repo.maven.apache.org/maven2/commons-collections#commons-collections/3.2.2": {
+  "commons-collections#commons-collections/3.2.2": {
    "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=",
    "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws="
   },
-  "repo.maven.apache.org/maven2/commons-io#commons-io/2.11.0": {
+  "commons-io#commons-io/2.11.0": {
    "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=",
    "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k="
   },
-  "repo.maven.apache.org/maven2/commons-io#commons-io/2.4": {
+  "commons-io#commons-io/2.4": {
    "jar": "sha256-zGpB3D6qzJ5ECmvQ0okLINNrTuQI/i1nEi8yi7bgFYE=",
    "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI="
   },
-  "repo.maven.apache.org/maven2/commons-logging#commons-logging/1.2": {
+  "commons-logging#commons-logging/1.2": {
    "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
    "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
   },
-  "repo.maven.apache.org/maven2/de/undercouch#gradle-download-task/5.4.0": {
+  "de/undercouch#gradle-download-task/5.4.0": {
    "jar": "sha256-JsVNuzwLnvITSpqanOcC6qyjbsFUnB3NJVv5SiRqjlQ=",
    "module": "sha256-ttq8wyBMhKj4+Eh00qFkQ6thI2PP5SfBAngVuxJ7+sE=",
    "pom": "sha256-jlGpL1k66bZZxEYWIcTymIP4l+EC1SIWZFmBsbQJiYU="
   },
-  "repo.maven.apache.org/maven2/de/undercouch/download#de.undercouch.download.gradle.plugin/5.4.0": {
+  "de/undercouch/download#de.undercouch.download.gradle.plugin/5.4.0": {
    "pom": "sha256-4NrTSpBgtpqatLk0VkOHq5IW2hwphf4BVrQNgfTYMAE="
   },
-  "repo.maven.apache.org/maven2/io/fabric8#kubernetes-client-bom/5.12.2": {
+  "io/fabric8#kubernetes-client-bom/5.12.2": {
    "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs="
   },
-  "repo.maven.apache.org/maven2/io/github/classgraph#classgraph/4.8.154": {
+  "io/github/classgraph#classgraph/4.8.154": {
    "jar": "sha256-8LBLXXexjtow8h+NHDXNbiuMsv8PmsRuc71yekdW39E=",
    "pom": "sha256-Irh7X4jt0O1kE2d4w9XluyqenqONrkg8+pOoAn3Qgd0="
   },
-  "repo.maven.apache.org/maven2/io/github/x-stream#mxparser/1.2.2": {
+  "io/github/x-stream#mxparser/1.2.2": {
    "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=",
    "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-bom/4.1.86.Final": {
+  "io/netty#netty-bom/4.1.86.Final": {
    "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-buffer/4.1.86.Final": {
+  "io/netty#netty-buffer/4.1.86.Final": {
    "jar": "sha256-5C4V9HyGUmax+qbgOOv9fdrc+fSunmYX7dSIHb1Kvog=",
    "pom": "sha256-AuVYTl+waYU7QYqRQ15Xdxp2efcf8Ex6K+UXzdOGZF0="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-codec-http/4.1.86.Final": {
+  "io/netty#netty-codec-http/4.1.86.Final": {
    "jar": "sha256-P2zrMRLPz3twVF61ERIgzlfbVNWT8j9kw4MzuyLEC4Q=",
    "pom": "sha256-Gk2fY66Da5YHWhrQ/QBLUOAerjgqx6BnqPGhtnn/v14="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-codec-http2/4.1.86.Final": {
+  "io/netty#netty-codec-http2/4.1.86.Final": {
    "jar": "sha256-6Ojijmq2u5ia7ZBHeJIgRfOIz7QgvB6zer9N+IAdsWc=",
    "pom": "sha256-E79xRBBCtPvWvrk+VMLnVy11UUJy6JCerJxYxFM4RNE="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-codec-socks/4.1.86.Final": {
+  "io/netty#netty-codec-socks/4.1.86.Final": {
    "jar": "sha256-g4ovRmeOhKu37XZiR9A4y4Xfr8SA/4wsXkLZHZnF/00=",
    "pom": "sha256-qmEWU5aTLf+2bzyVEX8jx+jGUjx9G6uBH9k0SVhJij8="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-codec/4.1.86.Final": {
+  "io/netty#netty-codec/4.1.86.Final": {
    "jar": "sha256-BFaEC1yFHa1sq4gc0amtXZFttl2BBIFF3x2abQMyW+o=",
    "pom": "sha256-6PLkDv2+igJXYhulUNlS53RK1wlXf+ITQXsvya8zJUI="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-common/4.1.86.Final": {
+  "io/netty#netty-common/4.1.86.Final": {
    "jar": "sha256-o1o/FufNRcXYUpqj53AtTvOzYhPqMy21l0TqNI/Crpk=",
    "pom": "sha256-PhYyrWMX3D24rTt3V9I/l3lXHXKNvGrUAyoZqItQ64k="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-handler-proxy/4.1.86.Final": {
+  "io/netty#netty-handler-proxy/4.1.86.Final": {
    "jar": "sha256-uBL+fXLIT7yE5TtPJnZNgvdrBqZfMx8PvZVDqnPhj5E=",
    "pom": "sha256-6KOsTrx3EaCm5UZS2DK1uUiCdlFtPpGyaGKGxxEwafc="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-handler/4.1.86.Final": {
+  "io/netty#netty-handler/4.1.86.Final": {
    "jar": "sha256-5ptCKSkpsnjcUi4lF33ffFQCVIS1WHn4InNJrfvhwE0=",
    "pom": "sha256-MtNruk2l9kv9vau0PHGVXnzQ6dZ5BTHU0/6XiCp+YKs="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-parent/4.1.86.Final": {
+  "io/netty#netty-parent/4.1.86.Final": {
    "pom": "sha256-HZIrfai+sQMcrCpfr89xnOZyyyy2nuzJw4PzCswWUBM="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-resolver/4.1.86.Final": {
+  "io/netty#netty-resolver/4.1.86.Final": {
    "jar": "sha256-diihMJ1/JEPcQdiSOn8mnimBuWFvgKmZ63JkrmvL/bo=",
    "pom": "sha256-q/IkL64IwCALGC91P6pvP0g+wdpt2waO5xfwTOBCB/k="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-tcnative-boringssl-static/2.0.56.Final": {
+  "io/netty#netty-tcnative-boringssl-static/2.0.56.Final": {
    "jar": "sha256-eS2vMLQmGm6uvmUsFxqq4Qr/GBoomT7GWUJtiefzafg=",
    "pom": "sha256-jiXf4zBSV9HHQ1tgk6oqvu8yXN3rAjgxYaRqHF+QcOc="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-tcnative-classes/2.0.56.Final": {
+  "io/netty#netty-tcnative-classes/2.0.56.Final": {
    "jar": "sha256-7t6Afw3V6xrXTqGuEJRDBjHaY/zeANTcIOsM0Ei7CsM=",
    "pom": "sha256-XvARmSCV3II/sBw7MUKMSmypKnvem7jyetY4DqolYjY="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-tcnative-parent/2.0.56.Final": {
+  "io/netty#netty-tcnative-parent/2.0.56.Final": {
    "pom": "sha256-PuDTYrA0q7bTmnEE8G7g0fruIz9MrTVQwwuFKFeaPWE="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-transport-native-unix-common/4.1.86.Final": {
+  "io/netty#netty-transport-native-unix-common/4.1.86.Final": {
    "jar": "sha256-7CbQOgZWV5HVfpl/eTZ37k0/xHspC3lRiYwuzQIy8RU=",
    "pom": "sha256-HLTiJ560F+3OKE9xvflhQYMmTyLwUNxTcm9W3w9SC5U="
   },
-  "repo.maven.apache.org/maven2/io/netty#netty-transport/4.1.86.Final": {
+  "io/netty#netty-transport/4.1.86.Final": {
    "jar": "sha256-9nJtzVTkkitGs7T0RntEOnCjDrCKYmIMj+UC2MuALJ8=",
    "pom": "sha256-hc9ax3wb90xRqFFVexdXE560zS0KW2HK4oSfRvy1ldo="
   },
-  "repo.maven.apache.org/maven2/io/prometheus#parent/0.16.0": {
+  "io/prometheus#parent/0.16.0": {
    "pom": "sha256-citVEZCXsE1xFHnftg3VSye1kgoa63cCAnxEohX/xZY="
   },
-  "repo.maven.apache.org/maven2/io/prometheus#simpleclient/0.16.0": {
+  "io/prometheus#simpleclient/0.16.0": {
    "jar": "sha256-IsN08jf3vE/bHw7C2jecC6AOaa0v/otq3lQ9cwYtN38=",
    "pom": "sha256-/sCA0HqxWHXZccSugflR2mG1z/mZHPUOUwuo/KR3CXM="
   },
-  "repo.maven.apache.org/maven2/io/prometheus#simpleclient_common/0.16.0": {
+  "io/prometheus#simpleclient_common/0.16.0": {
    "jar": "sha256-66bsJs5+QMu4cl4F+4Mkep9PRJRbnnUi4zdd3me58Fk=",
    "pom": "sha256-d/ARCc4VB710Q+InJzdnSydST6rLDcuW47jt4LarnrY="
   },
-  "repo.maven.apache.org/maven2/io/prometheus#simpleclient_httpserver/0.16.0": {
+  "io/prometheus#simpleclient_httpserver/0.16.0": {
    "jar": "sha256-yrh94QtqR0FRzO68O2NDKalz/7YCzm7+8sD9l6kDZcg=",
    "pom": "sha256-PGR/1vVhohsZ7ZcdBBn9Ri2fg/k0e8ChBaHCie6qqsQ="
   },
-  "repo.maven.apache.org/maven2/io/prometheus#simpleclient_tracer/0.16.0": {
+  "io/prometheus#simpleclient_tracer/0.16.0": {
    "pom": "sha256-OBK7IrlfgbTDRg6eTnXDunL6ReRDqfzlMghCqr0OmcI="
   },
-  "repo.maven.apache.org/maven2/io/prometheus#simpleclient_tracer_common/0.16.0": {
+  "io/prometheus#simpleclient_tracer_common/0.16.0": {
    "jar": "sha256-6Ep4SsjiTxgu5i2oC2tcgUB3S3W/pL+cw9O4OQ22JfY=",
    "pom": "sha256-X5AHXOz80RKB3pzLSJaNEhKyRnDWhP/IQEQaUq6HXv8="
   },
-  "repo.maven.apache.org/maven2/io/prometheus#simpleclient_tracer_otel/0.16.0": {
+  "io/prometheus#simpleclient_tracer_otel/0.16.0": {
    "jar": "sha256-oqhMWb7zeWu3+cbyrot96LkFMT7ygYCsPef/Yd1o3z8=",
    "pom": "sha256-frl58dwz6L5OWtFDDlQJcYpBeDwmd5qzEFJg9rQ20EY="
   },
-  "repo.maven.apache.org/maven2/io/prometheus#simpleclient_tracer_otel_agent/0.16.0": {
+  "io/prometheus#simpleclient_tracer_otel_agent/0.16.0": {
    "jar": "sha256-etK7QN90p3LZ9URaPQNXm0nWs3pH1ekPbPP1ns9BrQY=",
    "pom": "sha256-VSj4WIQ1SulNm8BnR+f1iS0JLAtVBVrnBWZo6gyhznw="
   },
-  "repo.maven.apache.org/maven2/io/reactivex/rxjava3#rxjava/3.1.6": {
+  "io/reactivex/rxjava3#rxjava/3.1.6": {
    "jar": "sha256-NGgr0+xvBDxd77WJotGBE7o+LSNy3UAXRPjkgVwdtjg=",
    "module": "sha256-xLSmhqW/xXqx3ud42SR1l8LtzDU3d2nbtMWuPQV000Q=",
    "pom": "sha256-sfaISn2fJzghY7nkaKlfKNtls7j2tIhVieZ6C7zjw1E="
   },
-  "repo.maven.apache.org/maven2/io/sentry#sentry/6.25.0": {
+  "io/sentry#sentry/6.25.0": {
    "jar": "sha256-QkQ2zF0SuRoCxvrazTDaf74NPcfoprvSygQEWMLw68w=",
    "pom": "sha256-xMKzUiPvr/ZFvCRUcAqtmn+WcZjYDr3hLzDsbB0uq60="
   },
-  "repo.maven.apache.org/maven2/io/swagger#swagger-annotations/1.6.9": {
+  "io/swagger#swagger-annotations/1.6.9": {
    "jar": "sha256-fvhZdOXYL8q9DavSxFXNgDeLNtd03gF86shCo6T6ZPg=",
    "pom": "sha256-6BtJB3W1C6snD7sLb7wKoda0wHS6GFuwUrjsMTFIPmk="
   },
-  "repo.maven.apache.org/maven2/io/swagger#swagger-compat-spec-parser/1.0.64": {
+  "io/swagger#swagger-compat-spec-parser/1.0.64": {
    "jar": "sha256-zkFPC8rqxSFq7q/Wivre+J/TPc4m+Zba3uDGO5UWPAM=",
    "pom": "sha256-DK2rKrdbuIf3HmIl5RiL9KxTiWKHQ+JQrCsUwwOaCfo="
   },
-  "repo.maven.apache.org/maven2/io/swagger#swagger-core/1.6.9": {
+  "io/swagger#swagger-core/1.6.9": {
    "jar": "sha256-QPtMcZBJR65H+f/P6+3v3mMNiUfhwbtmdDu8QPB7ngE=",
    "pom": "sha256-3y2nBUrbCjZR1NQ87aKblNXd0Fhz0tgU1OSXe6cPSek="
   },
-  "repo.maven.apache.org/maven2/io/swagger#swagger-models/1.6.9": {
+  "io/swagger#swagger-models/1.6.9": {
    "jar": "sha256-zwtTERHMwCqAE3nXQ8jjPwL7x5BpiqIOYsYvR22oyVo=",
    "pom": "sha256-YNg3lgDJP0qyFYkWJ6cednc+KiSitd1n/DkkWSjxv2s="
   },
-  "repo.maven.apache.org/maven2/io/swagger#swagger-parser-project/1.0.64": {
+  "io/swagger#swagger-parser-project/1.0.64": {
    "pom": "sha256-tMVYXqpLuz2i3XNVaP4YdG+8DwhTzXRjF9tQoRRN6eQ="
   },
-  "repo.maven.apache.org/maven2/io/swagger#swagger-parser/1.0.64": {
+  "io/swagger#swagger-parser/1.0.64": {
    "jar": "sha256-IgYs5/fEO7UodTpc8I/3tZ6A0e4hHxP92+rn3aaQsyg=",
    "pom": "sha256-Y7RH9HoMcUh8xP5tcIuXilfa32WaxvjnwjUPbmD5ryM="
   },
-  "repo.maven.apache.org/maven2/io/swagger#swagger-project/1.6.9": {
+  "io/swagger#swagger-project/1.6.9": {
    "pom": "sha256-bSqxGVAq0G+Apf8NdBzwshPFYXC1F2H8WRGuzY9RJEE="
   },
-  "repo.maven.apache.org/maven2/io/swagger/core/v3#swagger-annotations/2.2.8": {
+  "io/swagger/core/v3#swagger-annotations/2.2.8": {
    "jar": "sha256-Cvzf5Kd3X8zlHRBbj3yMpRRnbBa+pXFCNQPYOHd/Ed0=",
    "pom": "sha256-VhgFAUOpHf/pVfAn7PDg75Z310EbGyXBRsoZUXgQ2Zo="
   },
-  "repo.maven.apache.org/maven2/io/swagger/core/v3#swagger-core/2.2.8": {
+  "io/swagger/core/v3#swagger-core/2.2.8": {
    "jar": "sha256-c4Japfb0d8Y340xwIQspV7jpBL8PXA0yuqoqN9LDOiM=",
    "pom": "sha256-cwB0DaF4EVy0TpD+lk91x5UNgEm0n7br4tsXxwFDzE0="
   },
-  "repo.maven.apache.org/maven2/io/swagger/core/v3#swagger-models/2.2.8": {
+  "io/swagger/core/v3#swagger-models/2.2.8": {
    "jar": "sha256-s3I3ROAu1TADsWLViUqeF8QQxTOrKmlwtDCSHln032Y=",
    "pom": "sha256-p20h2UwizuLWBXr7py8sdDxwA7x1e3IXhY+E84CTXdE="
   },
-  "repo.maven.apache.org/maven2/io/swagger/core/v3#swagger-project/2.2.8": {
+  "io/swagger/core/v3#swagger-project/2.2.8": {
    "pom": "sha256-a17siOJKC8vQFj9ZEErvDwBtJ+S7CGG9ypgCW2f9lFc="
   },
-  "repo.maven.apache.org/maven2/io/swagger/parser/v3#swagger-parser-core/2.1.10": {
+  "io/swagger/parser/v3#swagger-parser-core/2.1.10": {
    "jar": "sha256-dWGrUJ6XLPu1LNmROSwuOQvBPQ/1+/ykJWDTBaG2UJM=",
    "pom": "sha256-lZbs9gLG/YGLNEOz68v0pN4cijVATcgL73aWsog0CW8="
   },
-  "repo.maven.apache.org/maven2/io/swagger/parser/v3#swagger-parser-project/2.1.10": {
+  "io/swagger/parser/v3#swagger-parser-project/2.1.10": {
    "pom": "sha256-R8bWO70ZDgOdpigmdcSWWTfnr7Tg8EHU9gPS0PIH5hM="
   },
-  "repo.maven.apache.org/maven2/io/swagger/parser/v3#swagger-parser-v2-converter/2.1.10": {
+  "io/swagger/parser/v3#swagger-parser-v2-converter/2.1.10": {
    "jar": "sha256-mAr5/FK/ftv8QMlUZViP3Nz1Bt2nqQYn/qnhBvBcI+s=",
    "pom": "sha256-9Oqs2CxPfKPy3+D+CT6EQs4vsC3TRSKIW2wr40KFm4o="
   },
-  "repo.maven.apache.org/maven2/io/swagger/parser/v3#swagger-parser-v3/2.1.10": {
+  "io/swagger/parser/v3#swagger-parser-v3/2.1.10": {
    "jar": "sha256-sa24NH67Y8+SsHt5v8sHWAzsCDQID13MNTz+8UHFr/c=",
    "pom": "sha256-ultheoFp1/obMPnRwt3q3Cd25b9vSp3Ycshwj9n67rk="
   },
-  "repo.maven.apache.org/maven2/io/swagger/parser/v3#swagger-parser/2.1.10": {
+  "io/swagger/parser/v3#swagger-parser/2.1.10": {
    "jar": "sha256-AyreTvUvSxReAlKLhog9Ftf6siz0iHkXKPxk0/mvxKM=",
    "pom": "sha256-4KEdmSQXRe3uUvmuOfVVLICg29b5+wah1q5nF+KDxyY="
   },
-  "repo.maven.apache.org/maven2/jakarta/activation#jakarta.activation-api/2.1.0": {
+  "jakarta/activation#jakarta.activation-api/2.1.0": {
    "jar": "sha256-VujZlAlf5JwoE4xgKRSC9m8Y0SrCtyDpOGl9zmoxNcc=",
    "pom": "sha256-hw0qdcyS4K7Dfo0WNxBVLTVDGJ6B6cqQCaMl33YMKwY="
   },
-  "repo.maven.apache.org/maven2/jakarta/platform#jakarta.jakartaee-bom/9.0.0": {
+  "jakarta/platform#jakarta.jakartaee-bom/9.0.0": {
    "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4="
   },
-  "repo.maven.apache.org/maven2/jakarta/platform#jakartaee-api-parent/9.0.0": {
+  "jakarta/platform#jakartaee-api-parent/9.0.0": {
    "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs="
   },
-  "repo.maven.apache.org/maven2/jakarta/validation#jakarta.validation-api/2.0.2": {
+  "jakarta/validation#jakarta.validation-api/2.0.2": {
    "jar": "sha256-tC1CQo89kiyJKpCfoEMofVd8DFsWWtm31WjOv4f8nqQ=",
    "pom": "sha256-Oy5Oh3+3C6+h2tdcDemZxFYTEoLUcbpR3z25bDt02pI="
   },
-  "repo.maven.apache.org/maven2/jakarta/xml/bind#jakarta.xml.bind-api-parent/3.0.1": {
+  "jakarta/xml/bind#jakarta.xml.bind-api-parent/3.0.1": {
    "pom": "sha256-nx+11KAun4/dYu876rlLj+p7gWQ3SMhvaKMfQPd0rVY="
   },
-  "repo.maven.apache.org/maven2/jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.0": {
+  "jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.0": {
    "pom": "sha256-4lW43VYeity88NHHus2uynK5Cr9BPy5//TSBd4rhCZA="
   },
-  "repo.maven.apache.org/maven2/jakarta/xml/bind#jakarta.xml.bind-api/3.0.1": {
+  "jakarta/xml/bind#jakarta.xml.bind-api/3.0.1": {
    "jar": "sha256-uPtL7j/1tcHvdxRNhBExYBjXu9Qfzx7eBkb3l4VGuGc=",
    "pom": "sha256-onPayXQUEv2dzM6ZESmHBteJ5YLcs1GXB19v0qWw6+o="
   },
-  "repo.maven.apache.org/maven2/jakarta/xml/bind#jakarta.xml.bind-api/4.0.0": {
+  "jakarta/xml/bind#jakarta.xml.bind-api/4.0.0": {
    "jar": "sha256-V+N5atV1NkAIj1+dPFPBg/LCULfa2QUp6j4ZpVFaoSI=",
    "pom": "sha256-a9atlG7ZyKRKJrYKX8zM/M9fyMy/v/SQS1kXs8aUACs="
   },
-  "repo.maven.apache.org/maven2/javax/servlet#javax.servlet-api/4.0.1": {
+  "javax/servlet#javax.servlet-api/4.0.1": {
    "jar": "sha256-g6A92HfTZ0V28Np7kHVchSSvCZzPBgf8YaqXFTWtfGA=",
    "pom": "sha256-FAVeYVW4oqYype7GoeW+DAoLo4D36T+ctMuPfk+Vm/E="
   },
-  "repo.maven.apache.org/maven2/joda-time#joda-time/2.12.5": {
+  "joda-time#joda-time/2.12.5": {
    "jar": "sha256-EGKEEey0DEY0GWxUTzRoGr3u+CbzdwljV0M9H5oTW8Y=",
    "pom": "sha256-QHV6ykQ5qWmPR1jyBsPFNxO1nNxVAd6W0WGKhPb/bH4="
   },
-  "repo.maven.apache.org/maven2/junit#junit/4.13.2": {
+  "junit#junit/4.12": {
+   "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ="
+  },
+  "junit#junit/4.13.2": {
    "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
    "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
   },
-  "repo.maven.apache.org/maven2/net/bytebuddy#byte-buddy-agent/1.12.19": {
+  "net/bytebuddy#byte-buddy-agent/1.12.19": {
    "jar": "sha256-OnAkDefNzeBOfFBMIyfXA1ucJa4CBogeO/TmeYonPtg=",
    "pom": "sha256-taLP9kNoHeFof8QKzSUf7v38oj5nPgSfs8NpK1NSbUs="
   },
-  "repo.maven.apache.org/maven2/net/bytebuddy#byte-buddy-parent/1.12.19": {
+  "net/bytebuddy#byte-buddy-parent/1.12.19": {
    "pom": "sha256-cqtv70CegSkh9HKLPEtu9PpTvCX6uwSI/CyuNnNotU0="
   },
-  "repo.maven.apache.org/maven2/net/bytebuddy#byte-buddy/1.12.19": {
+  "net/bytebuddy#byte-buddy/1.12.19": {
    "jar": "sha256-AwcEE55G8yw40nBg7e6eBnawoP/4qL5TRhUVFUuop74=",
    "pom": "sha256-Q1+4Zkqpt+EgyN1scH1Or6ZC+iYt/21eP3HcJcaeies="
   },
-  "repo.maven.apache.org/maven2/net/freeutils#jlhttp/2.6": {
+  "net/freeutils#jlhttp/2.6": {
    "jar": "sha256-HMFbUBezgFWM4q0uCvwrqW3iYXK6rXjCpwulXFRoV4A=",
    "pom": "sha256-BaYFDFndeVRC+3zdZFjXUrJg6FOWbYovsNXiCXEo6Ug="
   },
-  "repo.maven.apache.org/maven2/net/freeutils#parent/1.3": {
+  "net/freeutils#parent/1.3": {
    "pom": "sha256-xouwWtmH1kcR6aU+/0ODO87EiMepPuRyfTOJEpsBc2Q="
   },
-  "repo.maven.apache.org/maven2/net/iharder#base64/2.3.9": {
+  "net/iharder#base64/2.3.9": {
    "jar": "sha256-8aDjWe7imlk5w15f3txXTdfoygZbBW/BSysp4+081U0=",
    "pom": "sha256-3CpFvNCQU+bgD4tgOpFwz/20GMBV3TWrbrsJ1WgtYns="
   },
-  "repo.maven.apache.org/maven2/net/java#jvnet-parent/1": {
+  "net/java#jvnet-parent/1": {
    "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78="
   },
-  "repo.maven.apache.org/maven2/net/java#jvnet-parent/3": {
+  "net/java#jvnet-parent/3": {
    "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
   },
-  "repo.maven.apache.org/maven2/net/java/dev/jna#jna-platform/5.13.0": {
+  "net/java/dev/jna#jna-platform/5.13.0": {
    "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=",
    "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY="
   },
-  "repo.maven.apache.org/maven2/net/java/dev/jna#jna/5.13.0": {
+  "net/java/dev/jna#jna/5.13.0": {
    "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=",
    "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q="
   },
-  "repo.maven.apache.org/maven2/net/javacrumbs/json-unit#json-unit-core/2.36.0": {
+  "net/javacrumbs/json-unit#json-unit-core/2.36.0": {
    "jar": "sha256-a1j8/G2tlI6YMwzlmDUrOjnEndyPbZ9aCYPpL8h1hwU=",
    "pom": "sha256-k2b/YXpssLQW3sOJQ13+q5AIsgj2lIvSVj8uAgQ5dTM="
   },
-  "repo.maven.apache.org/maven2/net/javacrumbs/json-unit#json-unit-parent/2.36.0": {
+  "net/javacrumbs/json-unit#json-unit-parent/2.36.0": {
    "pom": "sha256-xZA74bIcEdkTIEXwxbQKQqEdX0iub0+ORtLExeVscnw="
   },
-  "repo.maven.apache.org/maven2/net/minidev#accessors-smart/2.4.7": {
+  "net/minidev#accessors-smart/2.4.7": {
    "jar": "sha256-71EDQp8QH34/9i86GCNCcgQ56upD0u7TEZu6dwuyAqk=",
    "pom": "sha256-WNvy07GUT0rbSSvQXSWM0OVW6r/5oU3qnUEBo04FguA="
   },
-  "repo.maven.apache.org/maven2/net/minidev#json-smart/2.4.7": {
+  "net/minidev#json-smart/2.4.7": {
    "jar": "sha256-KMF+0WrCLmhFdD/R6EMh7fXXc1/CFuRO4mnRBr89gUY=",
    "pom": "sha256-6QFccydoKXJRxB74wMnD1HGslQl2iAmKlUx18eIwPrI="
   },
-  "repo.maven.apache.org/maven2/net/sf/jopt-simple#jopt-simple/5.0.4": {
+  "net/sf/jopt-simple#jopt-simple/5.0.4": {
    "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=",
    "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU="
   },
-  "repo.maven.apache.org/maven2/net/sf/launch4j#launch4j/3.50": {
+  "net/sf/launch4j#launch4j/3.50": {
    "pom": "sha256-1716EuPm1bR/Ou0p/4g89cTKnie3GWkQZnkzH6N+xy0="
   },
-  "repo.maven.apache.org/maven2/net/sf/launch4j#launch4j/3.50/core": {
+  "net/sf/launch4j#launch4j/3.50/core": {
    "jar": "sha256-2U8eT20fHhl9Es7vpwot75OMzxbig+mjx0Cmb/WGvW8="
   },
-  "repo.maven.apache.org/maven2/net/sf/launch4j#launch4j/3.50/workdir-linux64": {
+  "net/sf/launch4j#launch4j/3.50/workdir-linux64": {
    "jar": "sha256-/uvoOrT+Q5F+qn3/Jy3uDvP6hUvWgzRDRDDgjjoS8zA="
   },
-  "repo.maven.apache.org/maven2/org/apache#apache/13": {
+  "org/apache#apache/13": {
    "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
   },
-  "repo.maven.apache.org/maven2/org/apache#apache/16": {
+  "org/apache#apache/16": {
    "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4="
   },
-  "repo.maven.apache.org/maven2/org/apache#apache/19": {
+  "org/apache#apache/19": {
    "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8="
   },
-  "repo.maven.apache.org/maven2/org/apache#apache/21": {
+  "org/apache#apache/21": {
    "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
   },
-  "repo.maven.apache.org/maven2/org/apache#apache/23": {
+  "org/apache#apache/23": {
    "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
   },
-  "repo.maven.apache.org/maven2/org/apache#apache/27": {
+  "org/apache#apache/27": {
    "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
   },
-  "repo.maven.apache.org/maven2/org/apache#apache/29": {
+  "org/apache#apache/29": {
    "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c="
   },
-  "repo.maven.apache.org/maven2/org/apache#apache/9": {
+  "org/apache#apache/9": {
    "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0="
   },
-  "repo.maven.apache.org/maven2/org/apache/ant#ant-launcher/1.10.13": {
+  "org/apache/ant#ant-launcher/1.10.13": {
    "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=",
    "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o="
   },
-  "repo.maven.apache.org/maven2/org/apache/ant#ant-parent/1.10.13": {
+  "org/apache/ant#ant-parent/1.10.13": {
    "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk="
   },
-  "repo.maven.apache.org/maven2/org/apache/ant#ant/1.10.13": {
+  "org/apache/ant#ant/1.10.13": {
    "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=",
    "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o="
   },
-  "repo.maven.apache.org/maven2/org/apache/commons#commons-compress/1.23.0": {
+  "org/apache/commons#commons-compress/1.23.0": {
    "jar": "sha256-wmfxcWDp72YrTXi38p3KfIKxXFz/LLaphl70qz3Vt4c=",
    "pom": "sha256-WdwSFAa6notbUSvO9FcTUf7R+QK5Oc9SfYk7f3KUVMk="
   },
-  "repo.maven.apache.org/maven2/org/apache/commons#commons-digester3/3.2": {
+  "org/apache/commons#commons-digester3/3.2": {
    "jar": "sha256-HBUOPS30tCN7R+KP6iB5+w2jJFeNXMpqX+0uN6Ygguw=",
    "pom": "sha256-W7ihmK21l8MCBLTxwzb9s9KBZTZAPprTNJqyAAMuVEU="
   },
-  "repo.maven.apache.org/maven2/org/apache/commons#commons-lang3/3.12.0": {
+  "org/apache/commons#commons-lang3/3.12.0": {
    "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=",
    "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo="
   },
-  "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/22": {
+  "org/apache/commons#commons-parent/22": {
    "pom": "sha256-+4xeVeMKet20/yEIWKDo0klO1nV7vhkBLamdUVhsPLs="
   },
-  "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/25": {
+  "org/apache/commons#commons-parent/25": {
    "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo="
   },
-  "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/32": {
+  "org/apache/commons#commons-parent/32": {
    "pom": "sha256-5NJYr4sv9AMhSNQVN53veHB4mmAD6AV28VBLEPJrS+g="
   },
-  "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/34": {
+  "org/apache/commons#commons-parent/34": {
    "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
   },
-  "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/39": {
+  "org/apache/commons#commons-parent/39": {
    "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac="
   },
-  "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/47": {
+  "org/apache/commons#commons-parent/47": {
    "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc="
   },
-  "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/52": {
+  "org/apache/commons#commons-parent/52": {
    "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
   },
-  "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/54": {
+  "org/apache/commons#commons-parent/54": {
    "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M="
   },
-  "repo.maven.apache.org/maven2/org/apache/commons#commons-parent/56": {
+  "org/apache/commons#commons-parent/56": {
    "pom": "sha256-VgxwUd3HaOE3LkCHlwdk5MATkDxdxutSwph3Nw2uJpQ="
   },
-  "repo.maven.apache.org/maven2/org/apache/commons#commons-text/1.10.0": {
+  "org/apache/commons#commons-text/1.10.0": {
    "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=",
    "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc="
   },
-  "repo.maven.apache.org/maven2/org/apache/httpcomponents#httpclient/4.5.13": {
+  "org/apache/httpcomponents#httpclient/4.5.13": {
    "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=",
    "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw="
   },
-  "repo.maven.apache.org/maven2/org/apache/httpcomponents#httpcomponents-client/4.5.13": {
+  "org/apache/httpcomponents#httpcomponents-client/4.5.13": {
    "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk="
   },
-  "repo.maven.apache.org/maven2/org/apache/httpcomponents#httpcomponents-core/4.4.13": {
+  "org/apache/httpcomponents#httpcomponents-core/4.4.13": {
    "pom": "sha256-xVTnAI5FF8fvVOAFzIt09Mh6VKDqLG9Xvl0Fad9Rk2s="
   },
-  "repo.maven.apache.org/maven2/org/apache/httpcomponents#httpcomponents-parent/11": {
+  "org/apache/httpcomponents#httpcomponents-parent/11": {
    "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o="
   },
-  "repo.maven.apache.org/maven2/org/apache/httpcomponents#httpcore/4.4.13": {
+  "org/apache/httpcomponents#httpcore/4.4.13": {
    "jar": "sha256-4G6J1AlDJF/Po57FN82/zjdirs3o+cWXeA0rAMK0NCQ=",
    "pom": "sha256-j4Etn6e3Kj1Kp/glJ4kypd80S0Km2DmJBYeUMaG/mpc="
   },
-  "repo.maven.apache.org/maven2/org/apache/logging#logging-parent/7": {
+  "org/apache/logging#logging-parent/7": {
    "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys="
   },
-  "repo.maven.apache.org/maven2/org/apache/logging/log4j#log4j-api/2.20.0": {
+  "org/apache/logging/log4j#log4j-api/2.20.0": {
    "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=",
    "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc="
   },
-  "repo.maven.apache.org/maven2/org/apache/logging/log4j#log4j-bom/2.20.0": {
+  "org/apache/logging/log4j#log4j-bom/2.20.0": {
    "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE="
   },
-  "repo.maven.apache.org/maven2/org/apache/logging/log4j#log4j-core/2.20.0": {
+  "org/apache/logging/log4j#log4j-core/2.20.0": {
    "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=",
    "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4="
   },
-  "repo.maven.apache.org/maven2/org/apache/logging/log4j#log4j/2.20.0": {
+  "org/apache/logging/log4j#log4j/2.20.0": {
    "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk="
   },
-  "repo.maven.apache.org/maven2/org/apache/velocity#velocity-engine-core/2.3": {
+  "org/apache/velocity#velocity-engine-core/2.3": {
    "jar": "sha256-sIbO6P2Bg+JAtK/PVP447DPdjrDaQUY25b96pNmFZik=",
    "pom": "sha256-1CQqYXQkPx5oBDRXG6TmoduuGZwLw1Cph9X7nDzh4NM="
   },
-  "repo.maven.apache.org/maven2/org/apache/velocity#velocity-engine-parent/2.3": {
+  "org/apache/velocity#velocity-engine-parent/2.3": {
    "pom": "sha256-TA5KkvaHDzmblG1bt4nRd+SkeUEUfD/dwubwY+nLlts="
   },
-  "repo.maven.apache.org/maven2/org/apache/velocity#velocity-engine-scripting/2.3": {
+  "org/apache/velocity#velocity-engine-scripting/2.3": {
    "jar": "sha256-PspyQVbBrSBlVfBSx4POm2Cc567wLYW5AvdHxcdNUKU=",
    "pom": "sha256-pURg2E/7W60V6jOgR47ZzOWGvxqpN0P3YHM96MBkaTE="
   },
-  "repo.maven.apache.org/maven2/org/apache/velocity#velocity-master/4": {
+  "org/apache/velocity#velocity-master/4": {
    "pom": "sha256-eirHPJDdEEtaB+bizQPpXsKNKfO4ME891//87LBJcS4="
   },
-  "repo.maven.apache.org/maven2/org/apache/velocity/tools#velocity-tools-generic/3.1": {
+  "org/apache/velocity/tools#velocity-tools-generic/3.1": {
    "jar": "sha256-gljP3KoWEn81/+YQo/pPdrfr5RuIkixzxO45zo83jOU=",
    "pom": "sha256-pvUMs/QTh1wDllImnSqJ+IeNDZ/IzGYvwTWRyiDYR1g="
   },
-  "repo.maven.apache.org/maven2/org/apache/velocity/tools#velocity-tools-parent/3.1": {
+  "org/apache/velocity/tools#velocity-tools-parent/3.1": {
    "pom": "sha256-Wll7iNunlQkOdwFbzfU0YbQdRdotfRdk5Ozoswoib80="
   },
-  "repo.maven.apache.org/maven2/org/apiguardian#apiguardian-api/1.1.2": {
+  "org/apiguardian#apiguardian-api/1.1.2": {
    "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
    "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
    "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
   },
-  "repo.maven.apache.org/maven2/org/assertj#assertj-core/3.17.2": {
+  "org/assertj#assertj-core/3.17.2": {
    "jar": "sha256-2al41VnQtSqH9Bmz2PW7E3uXxmH3viE04EmLRU5LmA4=",
    "pom": "sha256-n3yDy/nAPZNYQT7rNDExhDZ6/o5dKRX1X5Eb49vhRgY="
   },
-  "repo.maven.apache.org/maven2/org/assertj#assertj-parent-pom/2.2.1": {
+  "org/assertj#assertj-parent-pom/2.2.1": {
    "pom": "sha256-DtCwM3FLoeYkfT4T7/8FILdvi1TTM+jNsO5fNscphWA="
   },
-  "repo.maven.apache.org/maven2/org/assertj#assertj-parent-pom/2.2.7": {
+  "org/assertj#assertj-parent-pom/2.2.7": {
    "pom": "sha256-DpRvSGuXLAgPwin2U3PRUQSvZnTGMP2fElxP1yEgdzs="
   },
-  "repo.maven.apache.org/maven2/org/assertj#assertj-swing-junit/3.17.1": {
+  "org/assertj#assertj-swing-junit/3.17.1": {
    "jar": "sha256-5W/qUbeWkkBGDQJ6F/HHBLQ+TuykmoxXIG1XPaPjCHE=",
    "pom": "sha256-v1t2qFRwpj6fuShvtCC80iSXySGVM6vou3D5sCoeLpY="
   },
-  "repo.maven.apache.org/maven2/org/assertj#assertj-swing-parent-pom/3.17.1": {
+  "org/assertj#assertj-swing-parent-pom/3.17.1": {
    "pom": "sha256-r1N8kNjGDMiis2NTz/777Dgk/9LsmVvCsqqIxOZ3J8s="
   },
-  "repo.maven.apache.org/maven2/org/assertj#assertj-swing/3.17.1": {
+  "org/assertj#assertj-swing/3.17.1": {
    "jar": "sha256-42RFQ41y2DzEgBXcs/FNmpfqpCxGY6mCbbK7UOTHcTs=",
    "pom": "sha256-rkNavHruVk/+pSh32IPKViRLFBGtcYQqEPcbvv9+1es="
   },
-  "repo.maven.apache.org/maven2/org/bouncycastle#bcpkix-jdk18on/1.72": {
+  "org/bouncycastle#bcpkix-jdk18on/1.72": {
    "jar": "sha256-VqBUyxcNQfsfi6CylWiAYli3/+/cXpi3fvltR0Dz1rw=",
    "pom": "sha256-KFuL5ZWHD2HXXniBsPtO3C0ao30KecT8j/Lczx2caf0="
   },
-  "repo.maven.apache.org/maven2/org/bouncycastle#bcprov-jdk18on/1.72": {
+  "org/bouncycastle#bcprov-jdk18on/1.72": {
    "jar": "sha256-OSh/IginU9tBn1ylKdbIDwlGFKp015AzESazyca4X9o=",
    "pom": "sha256-47ttnhNGz8Iw4JAPF35goSttviEqkuHNLPseSNTASDk="
   },
-  "repo.maven.apache.org/maven2/org/bouncycastle#bcutil-jdk18on/1.72": {
+  "org/bouncycastle#bcutil-jdk18on/1.72": {
    "jar": "sha256-RTd/22VgqXHupyX1B9kf1rj70Hl9Yb/Ibyy2U8WBhqQ=",
    "pom": "sha256-VwEEzKwN+inkb7ZAL35qchcCwlXe9DvjAcassYwl520="
   },
-  "repo.maven.apache.org/maven2/org/checkerframework#checker-qual/3.33.0": {
+  "org/checkerframework#checker-qual/3.33.0": {
    "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=",
    "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=",
    "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM="
   },
-  "repo.maven.apache.org/maven2/org/codehaus/groovy#groovy-bom/3.0.14": {
+  "org/codehaus/groovy#groovy-bom/3.0.14": {
    "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric="
   },
-  "repo.maven.apache.org/maven2/org/codehaus/plexus#plexus-utils/3.5.1": {
+  "org/codehaus/plexus#plexus-utils/3.5.1": {
    "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=",
    "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI="
   },
-  "repo.maven.apache.org/maven2/org/codehaus/plexus#plexus/10": {
+  "org/codehaus/plexus#plexus/10": {
    "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8="
   },
-  "repo.maven.apache.org/maven2/org/commonmark#commonmark-parent/0.21.0": {
+  "org/commonmark#commonmark-parent/0.21.0": {
    "pom": "sha256-qeGddPQOEj3jbHAaUlIg2r5eMjVDZUfbek/TwJi31Qs="
   },
-  "repo.maven.apache.org/maven2/org/commonmark#commonmark/0.21.0": {
+  "org/commonmark#commonmark/0.21.0": {
    "jar": "sha256-gQhKcDUEb+MG8NvxbvV6aNCO5clwBOqGfmK120bpivs=",
    "pom": "sha256-RhGg7TfAGTzGANRRrUxFfT0NVBxaxlbI2ANL0s0NB1g="
   },
-  "repo.maven.apache.org/maven2/org/easytesting#fest-reflect/1.4.1": {
+  "org/easytesting#fest-reflect/1.4.1": {
    "jar": "sha256-wcoZ/PDNNVW698KvFHwErSK0OTq3Xl2wKE5RcPtVTBY=",
    "pom": "sha256-HGUmEF/LVuFjU1Hi0DuO8coI4qOSrj+NRUK1L9DTpYM="
   },
-  "repo.maven.apache.org/maven2/org/easytesting#fest-util/1.2.5": {
+  "org/easytesting#fest-util/1.2.5": {
    "jar": "sha256-e1L0061Bt+1x9baxGDMRO34IMmyO9w0t7fC0MMe6U0E=",
    "pom": "sha256-odiCzcAADcrcZQzw8DXh6edCW/ipx57f1h0lzn8ODHo="
   },
-  "repo.maven.apache.org/maven2/org/easytesting#fest/1.0.15": {
+  "org/easytesting#fest/1.0.15": {
    "pom": "sha256-EBz6z6cEL1sWQWoG7EIZjLeUIqv40R1I/xIXfznbIxc="
   },
-  "repo.maven.apache.org/maven2/org/eclipse/angus#angus-activation-project/1.0.0": {
+  "org/eclipse/angus#angus-activation-project/1.0.0": {
    "pom": "sha256-xbpJl8zRYQNHMGsM23caRKv9qhhzIkogdZVQ4Q8inNU="
   },
-  "repo.maven.apache.org/maven2/org/eclipse/angus#angus-activation/1.0.0": {
+  "org/eclipse/angus#angus-activation/1.0.0": {
    "jar": "sha256-43r/FH4Y7UjFCqn7eMyF50eMv9ASV7AtU9OhhtGDIkU=",
    "pom": "sha256-L8eRQlvvS53yjp80ZAXMCeDqN369YQJjiNqEDGGhsPw="
   },
-  "repo.maven.apache.org/maven2/org/eclipse/ee4j#project/1.0.5": {
+  "org/eclipse/ee4j#project/1.0.5": {
    "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY="
   },
-  "repo.maven.apache.org/maven2/org/eclipse/ee4j#project/1.0.6": {
+  "org/eclipse/ee4j#project/1.0.6": {
    "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0="
   },
-  "repo.maven.apache.org/maven2/org/eclipse/ee4j#project/1.0.7": {
+  "org/eclipse/ee4j#project/1.0.7": {
    "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
   },
-  "repo.maven.apache.org/maven2/org/eclipse/jetty#jetty-bom/9.4.50.v20221201": {
+  "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": {
    "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM="
   },
-  "repo.maven.apache.org/maven2/org/fusesource#fusesource-pom/1.12": {
+  "org/fusesource#fusesource-pom/1.12": {
    "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE="
   },
-  "repo.maven.apache.org/maven2/org/fusesource/jansi#jansi/2.4.0": {
+  "org/fusesource/jansi#jansi/2.4.0": {
    "jar": "sha256-bNkZkTI917L7KMqT16wSr1qGovUyeeKzWCezAxP9C58=",
    "pom": "sha256-rECp8tDB7mMfw7CO+OLwvRS6IgEcp2/xvPZftWnq3zU="
   },
-  "repo.maven.apache.org/maven2/org/glassfish/jaxb#jaxb-bom/4.0.1": {
+  "org/glassfish/jaxb#jaxb-bom/4.0.1": {
    "pom": "sha256-lSK+rNDHwC3Mi7VDMA6Eolu8wPfREPEwr3Z9yX1eP5Q="
   },
-  "repo.maven.apache.org/maven2/org/hamcrest#hamcrest-core/1.3": {
+  "org/hamcrest#hamcrest-core/1.3": {
    "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
   },
-  "repo.maven.apache.org/maven2/org/hamcrest#hamcrest-core/2.2": {
+  "org/hamcrest#hamcrest-core/2.2": {
    "jar": "sha256-CU9dkrS32ciiv1PMadNWJDronDSZRXvLS5L37Tv5WHk=",
    "pom": "sha256-9/3i//UQGl/Do54ogQuRHC2iAt3CvVB2X4nnxv+M590="
   },
-  "repo.maven.apache.org/maven2/org/hamcrest#hamcrest-parent/1.3": {
+  "org/hamcrest#hamcrest-parent/1.3": {
    "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
   },
-  "repo.maven.apache.org/maven2/org/hamcrest#hamcrest/2.2": {
+  "org/hamcrest#hamcrest/2.2": {
    "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=",
    "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0="
   },
-  "repo.maven.apache.org/maven2/org/jdom#jdom2/2.0.6.1": {
+  "org/jdom#jdom2/2.0.6.1": {
    "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=",
    "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M="
   },
-  "repo.maven.apache.org/maven2/org/jetbrains#annotations/13.0": {
+  "org/jetbrains#annotations/13.0": {
    "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
    "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
   },
-  "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-reflect/1.8.20": {
+  "org/jetbrains/kotlin#kotlin-reflect/1.8.20": {
    "jar": "sha256-Ux48P5sMRfmiHxZCF0RTBmoQZr7AGQJUpjMbMxgUq4s=",
    "pom": "sha256-5D19CbkCpeM8I0r1O3YYTUkz9gkI0A4QSy7EA+4tQDU="
   },
-  "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-common/1.6.20": {
+  "org/jetbrains/kotlin#kotlin-stdlib-common/1.6.20": {
    "jar": "sha256-jaQKJSDTDcsQEhdv6T0k6C0Io+NGw34DQ7D7b2T2vgE=",
    "pom": "sha256-PgTMk1HVzsQqRcBg+HM/bpTrx+NZExClGOBuiFB4mcg="
   },
-  "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-common/1.8.21": {
+  "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.21": {
    "jar": "sha256-akTJ7MnXdU2elD+x41iMdNSj8Xhb5RB09J1sVyNoKnM=",
    "pom": "sha256-4ZpVd8vOqJcolw21MzyCZMjGmuci7recv0HV8LDJrmU="
   },
-  "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.20": {
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.20": {
    "jar": "sha256-qi+i6BNVxNmN2X2iFpv0AfhCJhN49bHL6hqhGFXWdiA=",
    "pom": "sha256-iBveiiNwhuKOA0KLTvMmj0SspfoajHb4lUdIRVyuvSE="
   },
-  "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": {
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": {
    "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=",
    "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY="
   },
-  "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.20": {
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.20": {
    "jar": "sha256-/asb8SDiteerbXiI6evAJOxrjKcpNhKWOV2rY0shNpU=",
    "pom": "sha256-GEap+GBLC+HHGiEovb2diQJyAnlCf2ItK5pECsmjwwk="
   },
-  "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": {
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": {
    "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=",
    "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg="
   },
-  "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib/1.6.20": {
+  "org/jetbrains/kotlin#kotlin-stdlib/1.6.20": {
    "jar": "sha256-7rUcK2eyYjP9gdC8T4BE7ISXGIkJBXY87/2Eox4st5k=",
    "pom": "sha256-oI6D3LDymFCYd94i1SZEZHbdsx6hx3Uw8sgfJNsWb5k="
   },
-  "repo.maven.apache.org/maven2/org/jetbrains/kotlin#kotlin-stdlib/1.8.21": {
+  "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": {
    "jar": "sha256-BCoc0ayXbNz+XrY/HY4LC4kskkjhWmnIz7pJXVRupSo=",
    "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c="
   },
-  "repo.maven.apache.org/maven2/org/junit#junit-bom/5.5.2": {
+  "org/junit#junit-bom/5.10.2": {
+   "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
+   "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
+  },
+  "org/junit#junit-bom/5.5.2": {
    "pom": "sha256-WklWKkcEVB5p1O4xbNfq9xHN23ytXQ+Ia/ih/pjWqcU="
   },
-  "repo.maven.apache.org/maven2/org/junit#junit-bom/5.6.2": {
+  "org/junit#junit-bom/5.6.2": {
    "module": "sha256-f0j4L1XvwfDMWVg8LUdKNBDiQXndLR0iFkUVzOM9dkM=",
    "pom": "sha256-6K1gGzGBsjeHoY5x0mrIaknFbcX4VgZ2S8PFG15F/hM="
   },
-  "repo.maven.apache.org/maven2/org/junit#junit-bom/5.7.1": {
+  "org/junit#junit-bom/5.7.1": {
    "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=",
    "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q="
   },
-  "repo.maven.apache.org/maven2/org/junit#junit-bom/5.7.2": {
+  "org/junit#junit-bom/5.7.2": {
    "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=",
    "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs="
   },
-  "repo.maven.apache.org/maven2/org/junit#junit-bom/5.9.0": {
+  "org/junit#junit-bom/5.9.0": {
    "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=",
    "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU="
   },
-  "repo.maven.apache.org/maven2/org/junit#junit-bom/5.9.1": {
+  "org/junit#junit-bom/5.9.1": {
    "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=",
    "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw="
   },
-  "repo.maven.apache.org/maven2/org/junit#junit-bom/5.9.3": {
-   "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=",
-   "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc="
+  "org/junit/jupiter#junit-jupiter-api/5.10.2": {
+   "jar": "sha256-r/93wYbNMXJ1gDhy+lEzqoAf1qxAvZHHimz4AJtLF8w=",
+   "module": "sha256-QRtKlsKm2wmY1uWOiZNn8NElQWPzBBydmOeu38o3RBk=",
+   "pom": "sha256-u12jBgImsbPOtUCEldxptZRlv1DX6+Y+75TyWQnPGQA="
   },
-  "repo.maven.apache.org/maven2/org/junit/jupiter#junit-jupiter-api/5.9.3": {
-   "jar": "sha256-2JXj7t9PobEN4xqRvlWjAbswe/GO8yWz+l2z+A7pLRw=",
-   "module": "sha256-ba7jABTiBFWh7MbW0LOsYERECtE+9CA5jikZCYDpuHo=",
-   "pom": "sha256-f3KVZWK+1JEdMhf5DeCw0kDdklb4V99aJLvrAVS0FBs="
+  "org/junit/jupiter#junit-jupiter-engine/5.10.2": {
+   "jar": "sha256-tt812nUKVGrpMjdvEbPA34QfDJDHyylEzTmttDKIbks=",
+   "module": "sha256-FD7yda5mlRGdeCEqkyRazrv5I1tTdbn0wdSvcy87Uwo=",
+   "pom": "sha256-q+csj7+anI+e55usKbpkedMrDf+quICApQKRHSTTlGM="
   },
-  "repo.maven.apache.org/maven2/org/junit/jupiter#junit-jupiter-engine/5.9.3": {
-   "jar": "sha256-tV4wSxzS6PEWwat3pdw+yoxNm0amnghLY6ylHN61Xw8=",
-   "module": "sha256-lY9TIPRbNNCmZ24W/1ScsBDhQm3KUs/bEFh2vM9Pdog=",
-   "pom": "sha256-D1/XZ2n95tJHMI+Dbf8TTItS9lpC5UuNCtoEFvMKc3o="
+  "org/junit/platform#junit-platform-commons/1.10.2": {
+   "jar": "sha256-tWpewACked9Jc7GLuiTJj+Dbj6oUyJB9PvRR2Mcf2K4=",
+   "module": "sha256-HoFCGmL4cryk0gIgs56hniexNfNre3gXBPkvrVQxlhg=",
+   "pom": "sha256-8/glx8o72JcU1IlEfHfHbifqOPAoX195ahAAoX/KS+c="
   },
-  "repo.maven.apache.org/maven2/org/junit/platform#junit-platform-commons/1.9.3": {
-   "jar": "sha256-hRkVffgTwhDoX8FBS3QQnj2F9D1wklY+1wTEPEjw1eY=",
-   "module": "sha256-eWpB8nJB+2dgjwGazPTBw2cVe3MjinavhvbeuuNZnrQ=",
-   "pom": "sha256-4Xof3keC8vwjtC3sp1wLBWbVwphQ0DBr5lxdpzuAIXg="
+  "org/junit/platform#junit-platform-engine/1.10.2": {
+   "jar": "sha256-kFy6m0mYzMKdEjkIWn+x/g4oAk11JhUjVtgQ7ewKSaM=",
+   "module": "sha256-4dG63P7cJyRFQeC+XV6EtyoicNevYWhrJvEc/Edw2kI=",
+   "pom": "sha256-EqqGyhwNZIoiXU58aWBUwfx26IeCxcOft983muI7728="
   },
-  "repo.maven.apache.org/maven2/org/junit/platform#junit-platform-engine/1.9.3": {
-   "jar": "sha256-DDlVPZoDUQdXIn9aHGzGUwKHsaMh7WJYRQZkh0qioWo=",
-   "module": "sha256-nQVThnLcRrITlxJjbv3B8Xg9Q5qhwktp0Ckrgci36o8=",
-   "pom": "sha256-HFq3/OvjpgEYOXm6r78vQOVUOIKnyiPp+etxkZWnR9U="
+  "org/junit/vintage#junit-vintage-engine/5.10.2": {
+   "jar": "sha256-8fjR0zVyx1DL6bxquBAZryjo3lVdWMQtHQtySLMxV2k=",
+   "module": "sha256-kMb9QnMc0QoP6c6qolXz/B9IPnFO6b2DtPk8lsgfWVY=",
+   "pom": "sha256-kw2chGQmBTZYP28ozjHkZL6JJIWu/tWnYIqzZqUYEK4="
   },
-  "repo.maven.apache.org/maven2/org/junit/vintage#junit-vintage-engine/5.9.3": {
-   "jar": "sha256-a8G0IoKu2LnszbQGMc9FABr4qzrZ0Nhc/4bEXoX8WdA=",
-   "module": "sha256-903In7pI9S/PzSKUFEQbDXn4Cz5tgTsAvIuXT1K0bZE=",
-   "pom": "sha256-FISWCrLBD3mXJlEWmJuzsY21XJKfrFn96nS4ssd5WkY="
-  },
-  "repo.maven.apache.org/maven2/org/mock-server#mockserver-client-java/5.15.0": {
+  "org/mock-server#mockserver-client-java/5.15.0": {
    "jar": "sha256-LMqrNKNYdlkALhh/PISJAtd8g55OrmxZRp4YUUnvGyY=",
    "pom": "sha256-nVRRAJ9Q2bMQCStLyAFPz3+di/HYUbOfOzNPm4rmkfQ="
   },
-  "repo.maven.apache.org/maven2/org/mock-server#mockserver-core/5.15.0": {
+  "org/mock-server#mockserver-core/5.15.0": {
    "jar": "sha256-dpZGoStLzGwK8eZiFsRYH4b5UkY4zvxn3vVJjNKeL7o=",
    "pom": "sha256-DSwI3ATUdSuev1sSROKtV6+kSBJ/YZnqeeUYRAbpUYM="
   },
-  "repo.maven.apache.org/maven2/org/mock-server#mockserver-netty/5.15.0": {
+  "org/mock-server#mockserver-netty/5.15.0": {
    "jar": "sha256-EKBXpHdbami8aXQtEgBmt/cBOH7X5l9RioGYTqRaw6s=",
    "pom": "sha256-1aN22L2gDxkgNt4fm6g89tTXvlFar4+GaN6u1pagCVU="
   },
-  "repo.maven.apache.org/maven2/org/mock-server#mockserver/5.15.0": {
+  "org/mock-server#mockserver/5.15.0": {
    "pom": "sha256-tlNuOpSx7xwjGfX1Zwc1JL1YtvIh4vK1rLh57Bu5DJA="
   },
-  "repo.maven.apache.org/maven2/org/mockito#mockito-core/4.11.0": {
+  "org/mockito#mockito-core/4.11.0": {
    "jar": "sha256-S5CWkMqyiMdh65TAvw6BRJbPOSHYr/rITNh3dFMDUeU=",
    "pom": "sha256-K8LjyMizE/2sIx8jgiIlsHgx3ImdBnBy9J1fiuN+c5o="
   },
-  "repo.maven.apache.org/maven2/org/mockito#mockito-inline/4.11.0": {
+  "org/mockito#mockito-inline/4.11.0": {
    "jar": "sha256-7lLhwpmmMhhPuidKk3CZPgkUBCn15RbmxVcP1ldLKX8=",
    "pom": "sha256-g+Y+nBxoitBSIUa0qneUjJlzrAGCnhAzZGI2lWGoA0Q="
   },
-  "repo.maven.apache.org/maven2/org/mozilla#rhino/1.7.7.2": {
+  "org/mozilla#rhino/1.7.7.2": {
    "jar": "sha256-XG2uBQzrcXdKX8gs5uPwOS2vD/qew1lvcNTQfuULiXA=",
    "pom": "sha256-B2kGiYfBiVPlHUGeBi9AlW8egvOioUD+qITXxeb6lH8="
   },
-  "repo.maven.apache.org/maven2/org/objenesis#objenesis-parent/3.3": {
+  "org/objenesis#objenesis-parent/3.3": {
    "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8="
   },
-  "repo.maven.apache.org/maven2/org/objenesis#objenesis/3.3": {
+  "org/objenesis#objenesis/3.3": {
    "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=",
    "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM="
   },
-  "repo.maven.apache.org/maven2/org/opentest4j#opentest4j/1.2.0": {
-   "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=",
-   "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ="
+  "org/opentest4j#opentest4j/1.3.0": {
+   "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+   "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+   "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
   },
-  "repo.maven.apache.org/maven2/org/ow2#ow2/1.5": {
+  "org/ow2#ow2/1.5": {
    "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs="
   },
-  "repo.maven.apache.org/maven2/org/ow2#ow2/1.5.1": {
+  "org/ow2#ow2/1.5.1": {
    "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
   },
-  "repo.maven.apache.org/maven2/org/ow2/asm#asm-analysis/9.2": {
+  "org/ow2/asm#asm-analysis/9.2": {
    "jar": "sha256-h4++UhcxwHLRTS1luYOxvq5q0G/aAAe2qLroH3P0M8Q=",
    "pom": "sha256-dzzBor/BTGxKl5xRoHXAI0oL9pT8Or5PrPRU83oUXxs="
   },
-  "repo.maven.apache.org/maven2/org/ow2/asm#asm-commons/9.2": {
+  "org/ow2/asm#asm-commons/9.2": {
    "jar": "sha256-vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=",
    "pom": "sha256-AoJOg58qLw5ylZ/dMLSJckDwWvxD3kLXugsYQ3YBwHA="
   },
-  "repo.maven.apache.org/maven2/org/ow2/asm#asm-commons/9.4": {
+  "org/ow2/asm#asm-commons/9.4": {
    "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=",
    "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk="
   },
-  "repo.maven.apache.org/maven2/org/ow2/asm#asm-tree/9.2": {
+  "org/ow2/asm#asm-tree/9.2": {
    "jar": "sha256-qr+b0jCRpOv8EJwfPufPPkuJ9rotP1HFJD8Ws8/64BE=",
    "pom": "sha256-9h8+vqVSDd8Z9FKwPEJscjG92KgdesKHZctScSJaw3g="
   },
-  "repo.maven.apache.org/maven2/org/ow2/asm#asm-tree/9.4": {
+  "org/ow2/asm#asm-tree/9.4": {
    "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=",
    "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY="
   },
-  "repo.maven.apache.org/maven2/org/ow2/asm#asm-tree/9.5": {
+  "org/ow2/asm#asm-tree/9.5": {
    "jar": "sha256-PDOmSBkQea6urrfBmkmxU5UvnkD+hvusUgVVTd2azZQ=",
    "pom": "sha256-pyqq+N0FGJn6CJ54PsfUgnrE19GHYgHG3uy6qUoNyVY="
   },
-  "repo.maven.apache.org/maven2/org/ow2/asm#asm-util/9.2": {
+  "org/ow2/asm#asm-util/9.2": {
    "jar": "sha256-/1s80zGuipqAR2goDamPUPQk/vI908eIuzIOCMlO5Zg=",
    "pom": "sha256-3dBpE/FH1wrmjnpuQ1alWzPxTd5hYtv/K9DiiVgfGtI="
   },
-  "repo.maven.apache.org/maven2/org/ow2/asm#asm/9.2": {
+  "org/ow2/asm#asm/9.2": {
    "jar": "sha256-udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=",
    "pom": "sha256-37EqGyJL8Bvh/WBAIEZviUJBvLZF3M45Xt2M1vilDfQ="
   },
-  "repo.maven.apache.org/maven2/org/ow2/asm#asm/9.4": {
+  "org/ow2/asm#asm/9.4": {
    "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=",
    "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q="
   },
-  "repo.maven.apache.org/maven2/org/ow2/asm#asm/9.5": {
+  "org/ow2/asm#asm/9.5": {
    "jar": "sha256-ti6EtZgHKXUbBFjFNM8TZvcnVCu40VhiEzVoKkYPA1M=",
    "pom": "sha256-LJzOuVHMZYbejZoWxnKtPkwwucMjAo16PDNmVg1WJ7E="
   },
-  "repo.maven.apache.org/maven2/org/reactivestreams#reactive-streams/1.0.4": {
+  "org/reactivestreams#reactive-streams/1.0.4": {
    "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=",
    "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag="
   },
-  "repo.maven.apache.org/maven2/org/slf4j#slf4j-api/1.6.6": {
+  "org/slf4j#slf4j-api/1.6.6": {
    "pom": "sha256-cxmZMiteIokinNntRiTJQexXG3xh0qJ9alB+9zuXyho="
   },
-  "repo.maven.apache.org/maven2/org/slf4j#slf4j-api/2.0.7": {
+  "org/slf4j#slf4j-api/2.0.7": {
    "jar": "sha256-XWKYuToZBcMs2mR4gIrBTC1KR+kVNeU8Qff+64XZRvQ=",
    "pom": "sha256-LUA8zw4KAtXBqGZ7DiozyN/GA4qyh7lnHdaBwgUmeYE="
   },
-  "repo.maven.apache.org/maven2/org/slf4j#slf4j-parent/1.6.6": {
+  "org/slf4j#slf4j-parent/1.6.6": {
    "pom": "sha256-QrjCR2CP2OENW2Zs98gKW1nSseEoRQ97bZ0sIM+2sxs="
   },
-  "repo.maven.apache.org/maven2/org/slf4j#slf4j-parent/2.0.7": {
+  "org/slf4j#slf4j-parent/2.0.7": {
    "pom": "sha256-wYK7Ns068ck8FgPN/v54iRV9swuotYT0pEU1/NIuRec="
   },
-  "repo.maven.apache.org/maven2/org/sonatype/oss#oss-parent/5": {
+  "org/sonatype/oss#oss-parent/5": {
    "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0="
   },
-  "repo.maven.apache.org/maven2/org/sonatype/oss#oss-parent/6": {
+  "org/sonatype/oss#oss-parent/6": {
    "pom": "sha256-tDBtE+j1OSRYobMIZvHP8WGz0uaZmojQWe6jkyyKhJk="
   },
-  "repo.maven.apache.org/maven2/org/sonatype/oss#oss-parent/7": {
+  "org/sonatype/oss#oss-parent/7": {
    "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
   },
-  "repo.maven.apache.org/maven2/org/sonatype/oss#oss-parent/9": {
+  "org/sonatype/oss#oss-parent/9": {
    "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
   },
-  "repo.maven.apache.org/maven2/org/springframework#spring-framework-bom/5.3.24": {
+  "org/springframework#spring-framework-bom/5.3.24": {
    "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=",
    "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE="
   },
-  "repo.maven.apache.org/maven2/org/tukaani#xz/1.9": {
+  "org/tukaani#xz/1.9": {
    "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=",
    "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo="
   },
-  "repo.maven.apache.org/maven2/org/vafer#jdependency/2.8.0": {
+  "org/vafer#jdependency/2.8.0": {
    "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=",
    "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0="
   },
-  "repo.maven.apache.org/maven2/org/xmlunit#xmlunit-core/2.9.1": {
+  "org/xmlunit#xmlunit-core/2.9.1": {
    "jar": "sha256-fnDyPU914F8O558Pa54Tts9R0082xfw6a4OUKd3h7+8=",
    "pom": "sha256-0n5OKjEqIVR+82BcgS5+YMiuyWTn+WDlDU3Dy2azkBI="
   },
-  "repo.maven.apache.org/maven2/org/xmlunit#xmlunit-parent/2.9.1": {
+  "org/xmlunit#xmlunit-parent/2.9.1": {
    "pom": "sha256-1+RY+9XGRFBIeOX7zglLHTB402mn/uF93ezj0Zn9qsA="
   },
-  "repo.maven.apache.org/maven2/org/xmlunit#xmlunit-placeholders/2.9.1": {
+  "org/xmlunit#xmlunit-placeholders/2.9.1": {
    "jar": "sha256-H+OrnCfYNVl+031hZ8m7zLksLT0Buhr+7Cqta0Ny0+g=",
    "pom": "sha256-8lixEzrsF0x2T84Rf12TjVBxfEFzVSIYKJUXmKF8qH8="
   },
-  "repo.maven.apache.org/maven2/org/yaml#snakeyaml/1.33": {
+  "org/yaml#snakeyaml/1.33": {
    "jar": "sha256-Ef9Fl4jwoteB9WpKhtfmkgLOus0Cc9UmnErp8C8/2PA=",
    "pom": "sha256-6n1I/UUyGmAz2XzSiBhtSOXpLMDHBm5ziNfEzrSvWVc="
   },
-  "repo.maven.apache.org/maven2/org/zeroturnaround#zt-zip/1.15": {
+  "org/zeroturnaround#zt-zip/1.15": {
    "jar": "sha256-egIaxh7b4ktfzIM5aWf3BxIE51cLktf0s/mH6Wylu5M=",
    "pom": "sha256-ll/F/uIc+Ys81paoijiZqsjRiBsZlfZp+Jmvdtu2C2E="
   },
-  "repo.maven.apache.org/maven2/xmlpull#xmlpull/1.1.3.1": {
+  "xmlpull#xmlpull/1.1.3.1": {
    "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=",
    "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs="
   }
diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix
index 3337821922f8..5d3fdfa12509 100644
--- a/pkgs/by-name/at/atlauncher/package.nix
+++ b/pkgs/by-name/at/atlauncher/package.nix
@@ -21,13 +21,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "atlauncher";
-  version = "3.4.36.10";
+  version = "3.4.37.2";
 
   src = fetchFromGitHub {
     owner = "ATLauncher";
     repo = "ATLauncher";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EMV/M5W/acJaQJsi4COoRQC2YVfuJG9HGcwvGfakoNo=";
+    hash = "sha256-1sIzQBJWbkGk8VrZdRi3eIHBAfiu90lodEZVouZNzVM=";
   };
 
   postPatch = ''

From 68d77b59d6ad30564f2d757d3b621c2ccf951ae1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 11:42:22 +0000
Subject: [PATCH 56/90] quark-engine: 24.8.1 -> 24.9.1

---
 pkgs/tools/security/quark-engine/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix
index bd53ff018414..a42cca82b67c 100644
--- a/pkgs/tools/security/quark-engine/default.nix
+++ b/pkgs/tools/security/quark-engine/default.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "quark-engine";
-  version = "24.8.1";
+  version = "24.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "quark-engine";
     repo = "quark-engine";
     rev = "refs/tags/v${version}";
-    hash = "sha256-oeVjUbw6RKSZLFBuPy1goraiqtwjeuq1hy81ibpcuus=";
+    hash = "sha256-DmiqsYEdCh9hG5aa41UymW8IDkba4fuCrtM10A0X2Gg=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From f4ec76bd673f5658b1b136885051e9581e463216 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 14:26:48 +0200
Subject: [PATCH 57/90] python312Packages.fickling: init at 0.1.3

A Python pickling decompiler and static analyzer

https://github.com/trailofbits/fickling
---
 .../python-modules/fickling/default.nix       | 55 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/python-modules/fickling/default.nix

diff --git a/pkgs/development/python-modules/fickling/default.nix b/pkgs/development/python-modules/fickling/default.nix
new file mode 100644
index 000000000000..a5de0d913a2c
--- /dev/null
+++ b/pkgs/development/python-modules/fickling/default.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  astunparse,
+  buildPythonPackage,
+  distutils,
+  fetchFromGitHub,
+  fickling,
+  flit-core,
+  numpy,
+  pytestCheckHook,
+  pythonOlder,
+  torch,
+  torchvision,
+}:
+
+buildPythonPackage rec {
+  pname = "fickling";
+  version = "0.1.3";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "trailofbits";
+    repo = "fickling";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/cV1XhJ8KMFby9nZ/qXEYxf+P6352Q2DZOLuvebyuHQ=";
+  };
+
+  build-system = [
+    distutils
+    flit-core
+  ];
+
+  dependencies = [ astunparse ];
+
+  optional-dependencies = {
+    torch = [
+      torch
+      torchvision
+    ];
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+
+  pythonImportsCheck = [ "fickling" ];
+
+  meta = with lib; {
+    description = "A Python pickling decompiler and static analyzer";
+    homepage = "https://github.com/trailofbits/fickling";
+    changelog = "https://github.com/trailofbits/fickling/releases/tag/v${version}";
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 88504c16e663..8c80523085a7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4356,6 +4356,8 @@ self: super: with self; {
 
   fiblary3-fork = callPackage ../development/python-modules/fiblary3-fork { };
 
+  fickling = callPackage ../development/python-modules/fickling { };
+
   fido2 = callPackage ../development/python-modules/fido2 { };
 
   fields = callPackage ../development/python-modules/fields { };

From 9f4a6a1e9e29069469820d6b43818177a64caeaa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 12:32:02 +0000
Subject: [PATCH 58/90] civo: 1.0.89 -> 1.0.90

---
 pkgs/by-name/ci/civo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix
index f96db4760b68..9830daa37615 100644
--- a/pkgs/by-name/ci/civo/package.nix
+++ b/pkgs/by-name/ci/civo/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "civo";
-  version = "1.0.89";
+  version = "1.0.90";
 
   src = fetchFromGitHub {
     owner = "civo";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-hX/tmeQYcTDs3JZSFhvzCrcbqvfa78MXtTo8VcuAqxY=";
+    sha256 = "sha256-2UWEQZRbtPArYK7Kr0eHtF8+XWXl06v86nAb8nka50g=";
   };
 
-  vendorHash = "sha256-bwmJnKxdvVskrrTCa0cdpiYeFVZWTYyaFNEbeymT7P0=";
+  vendorHash = "sha256-ZnomzHbsNKWwAsRjOjESKSdR+KgSiMMlG0xq33qpzX0=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 93e069f9aaf55d56fa6c44edb021953c5e0c1c54 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 14:33:46 +0200
Subject: [PATCH 59/90] python312Packages.graphtage: refactor

---
 .../python-modules/graphtage/default.nix      | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/graphtage/default.nix b/pkgs/development/python-modules/graphtage/default.nix
index 7ecdeb1adf84..5b3f70dcc1f3 100644
--- a/pkgs/development/python-modules/graphtage/default.nix
+++ b/pkgs/development/python-modules/graphtage/default.nix
@@ -1,14 +1,17 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
-  pytestCheckHook,
-  pythonOlder,
   colorama,
+  distutils,
+  fetchFromGitHub,
+  fickling,
   intervaltree,
   json5,
+  pytestCheckHook,
+  pythonOlder,
   pyyaml,
   scipy,
+  setuptools,
   tqdm,
   typing-extensions,
 }:
@@ -16,24 +19,27 @@
 buildPythonPackage rec {
   pname = "graphtage";
   version = "0.3.1";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "trailofbits";
-    repo = pname;
+    repo = "graphtage";
     rev = "refs/tags/v${version}";
     hash = "sha256-Bz2T8tVdVOdXt23yPITkDNL46Y5LZPhY3SXZ5bF3CHw=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "json5==0.9.5" "json5>=0.9.5"
-  '';
+  pythonRelaxDeps = [ "json5" ];
 
-  propagatedBuildInputs = [
+  build-system = [
+    distutils
+    setuptools
+  ];
+
+  dependencies = [
     colorama
+    fickling
     intervaltree
     json5
     pyyaml
@@ -48,10 +54,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Utility to diff tree-like files such as JSON and XML";
-    mainProgram = "graphtage";
     homepage = "https://github.com/trailofbits/graphtage";
     changelog = "https://github.com/trailofbits/graphtage/releases/tag/v${version}";
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ veehaitch ];
+    mainProgram = "graphtage";
   };
 }

From 1afc4e9ab0e93240a6e1ff279760173d0037d6dd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 14:45:37 +0200
Subject: [PATCH 60/90] python312Packages.ansible-runner: refactor

---
 pkgs/development/python-modules/ansible-runner/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix
index 746877f57e2e..8d8e80877307 100644
--- a/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/pkgs/development/python-modules/ansible-runner/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace '"setuptools>=45, <=69.0.2", "setuptools-scm[toml]>=6.2, <=8.0.4"' '"setuptools", "setuptools-scm"'
+      --replace-fail '"setuptools>=45, <=69.0.2", "setuptools-scm[toml]>=6.2, <=8.0.4"' '"setuptools", "setuptools-scm"'
   '';
 
   build-system = [
@@ -69,7 +69,7 @@ buildPythonPackage rec {
   '';
 
   disabledTests = [
-    # Requires network access
+    # Tests require network access
     "test_callback_plugin_task_args_leak"
     "test_env_accuracy"
     # Times out on slower hardware
@@ -95,9 +95,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Helps when interfacing with Ansible";
-    mainProgram = "ansible-runner";
     homepage = "https://github.com/ansible/ansible-runner";
+    changelog = "https://github.com/ansible/ansible-runner/releases/tag/${version}";
     license = licenses.asl20;
     maintainers = [ ];
+    mainProgram = "ansible-runner";
   };
 }

From ad97610187e2d763bef2e2f804d674e00cc12605 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 14:48:14 +0200
Subject: [PATCH 61/90] python312Packages.ansible-runner: disable failing tests

---
 pkgs/development/python-modules/ansible-runner/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix
index 8d8e80877307..0e1a3b8ca7a2 100644
--- a/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/pkgs/development/python-modules/ansible-runner/default.nix
@@ -76,6 +76,11 @@ buildPythonPackage rec {
     "test_large_stdout_blob"
     # Failed: DID NOT RAISE <class 'RuntimeError'>
     "test_validate_pattern"
+    # Assertion error
+    "test_get_role_list"
+    "test_include_role_from_collection_events"
+    "test_resolved_actions"
+    "test_callback_plugin_censoring_does_not_overwrite"
   ];
 
   disabledTestPaths =

From d7a5ae0a6aa6ada77f2ea47662ab3bc1a493af7f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 15:07:18 +0200
Subject: [PATCH 62/90] python312Packages.blocksat-cli: 2.4.6 -> 2.4.7

Diff: https://github.com/Blockstream/satellite/compare/refs/tags/v2.4.6...v2.4.7

Changelog: https://github.com/Blockstream/satellite/releases/tag/v2.4.7
---
 .../python-modules/blocksat-cli/default.nix        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix
index 1351b26698b8..fb1856f7a245 100644
--- a/pkgs/development/python-modules/blocksat-cli/default.nix
+++ b/pkgs/development/python-modules/blocksat-cli/default.nix
@@ -5,6 +5,7 @@
   fetchFromGitHub,
   pyasyncore,
   pysnmp,
+  pysnmplib,
   pytestCheckHook,
   python-gnupg,
   pythonAtLeast,
@@ -16,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "blocksat-cli";
-  version = "2.4.6";
+  version = "2.4.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,14 +26,17 @@ buildPythonPackage rec {
     owner = "Blockstream";
     repo = "satellite";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1gz2lAS/AHeY54AaVXGeofLC68KjAP7POsIaBL3v2EY=";
+    hash = "sha256-OmIQUrUH3kWgf+v+9Hl2OgDdGPwb3guNY0+H64CWkeg=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  pythonRelaxDeps = [ "pyasyncore" ];
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     distro
     pysnmp
+    pysnmplib
     python-gnupg
     qrcode
     requests
@@ -50,10 +54,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Blockstream Satellite CLI";
-    mainProgram = "blocksat-cli";
     homepage = "https://github.com/Blockstream/satellite";
     changelog = "https://github.com/Blockstream/satellite/releases/tag/v${version}";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ prusnak ];
+    mainProgram = "blocksat-cli";
   };
 }

From b6b60e025ac58aca273dbfcf5f416ea3c652f4fe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 15:14:27 +0200
Subject: [PATCH 63/90] python312Packages.azure-mgmt-netapp: 13.1.0 -> 13.2.0

Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-netapp_13.2.0/sdk/netapp/azure-mgmt-netapp/CHANGELOG.md
---
 pkgs/development/python-modules/azure-mgmt-netapp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
index 8d12b418a194..0a5ca8dcfefc 100644
--- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-netapp";
-  version = "13.1.0";
+  version = "13.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8JzJFZTplNGo74wBelP8Geo7+FQ7WYmAOAef4jv533M=";
+    hash = "sha256-31wzzDeQrs04AL8Qsz050RY/AllvXwy+8Ng+QbUihjo=";
   };
 
   build-system = [ setuptools ];

From 696b2a92d03b9d0793e1f786252a655153708d91 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 15:15:42 +0200
Subject: [PATCH 64/90] python312Packages.azure-mgmt-web: 7.3.0 -> 7.3.1

Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-web_7.3.1/sdk/appservice/azure-mgmt-web/CHANGELOG.md
---
 pkgs/development/python-modules/azure-mgmt-web/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix
index adbae42173ca..aec11200508d 100644
--- a/pkgs/development/python-modules/azure-mgmt-web/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-web";
-  version = "7.3.0";
+  version = "7.3.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-IDK/TVDfC7uCLqAMrDv74OZ0h9LJzBGCwIWPgxSc3qk=";
+    hash = "sha256-h7dxQ2vJmnqN9Z0K0YW5aHmgbc4UdkoGs/w9r6j8tWs=";
   };
 
   propagatedBuildInputs = [

From b660e0dd5bc0317b0e64393ea53b0db950b09224 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 15:17:07 +0200
Subject: [PATCH 65/90] python312Packages.azure-appconfiguration: 1.6.0 ->
 1.7.1

Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-appconfiguration_1.7.1/sdk/appconfiguration/azure-appconfiguration/CHANGELOG.md
---
 .../python-modules/azure-appconfiguration/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-appconfiguration/default.nix b/pkgs/development/python-modules/azure-appconfiguration/default.nix
index 33f24c827fdb..02d8447c12ad 100644
--- a/pkgs/development/python-modules/azure-appconfiguration/default.nix
+++ b/pkgs/development/python-modules/azure-appconfiguration/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "azure-appconfiguration";
-  version = "1.6.0";
+  version = "1.7.1";
   pyporject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-z2KKPh6mZDR5ZDzSRt2kZO3Eq3hXQzOaao/oCbwTf+w=";
+    hash = "sha256-Pr5B6b4/SubKYeXbxCxLfMAHoBBUqFBlAaJt/Bmf0+w=";
   };
 
   build-system = [ setuptools ];

From 36a28bc62e40e32de18abe96636f0eb9e2f03957 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 15:18:34 +0200
Subject: [PATCH 66/90] python312Packages.azure-mgmt-network: 25.4.0 -> 26.0.0

Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-network_26.0.0/sdk/network/azure-mgmt-network/CHANGELOG.md
---
 .../development/python-modules/azure-mgmt-network/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix
index 8e0590238007..735184f21b1a 100644
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-network";
-  version = "25.4.0";
+  version = "26.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ozjmLYH9vwUPgCFDwoy5ZbB+3UOADvBQTN+muIVNdVQ=";
+    hash = "sha256-TeZ2GEGVBT/bEGpuoQQqiU5wxzGm08imM9UvUin07hs=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 1c86a6ff8f5505cb481ce2102305152b3267cd53 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 15:19:09 +0200
Subject: [PATCH 67/90] python312Packages.azure-mgmt-appcontainers: 3.0.0 ->
 3.1.0

---
 .../python-modules/azure-mgmt-appcontainers/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix
index 8d66700b5413..0be4aa8e3c01 100644
--- a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-appcontainers";
-  version = "3.0.0";
+  version = "3.1.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-oqKPEOnZaIU7IMzDqT552IBJr9RtWt3vFO3SlG8igs0=";
+    hash = "sha256-PHlDnxK8788UCvjG572LUWJOlx/ZH1rOmKzAc8Lm+uw=";
   };
 
   propagatedBuildInputs = [

From ae48da36640772903475fb54e79c2111a5a75542 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 16:14:46 +0200
Subject: [PATCH 68/90] python312Packages.azure-mgmt-datafactory: 8.0.0 ->
 9.0.0

Changelog: https://github.com/Azure/azure-sdk-for-python/tree/azure-mgmt-datafactory_9.0.0/sdk/datafactory/azure-mgmt-datafactory
---
 .../python-modules/azure-mgmt-datafactory/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
index 3c511be3ca53..325db23d062f 100644
--- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-datafactory";
-  version = "8.0.0";
+  version = "9.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-CL1Z50yjbEkncmKT4FhJ7UaOiUtw1CD85TVEJ7KHjQ4=";
+    hash = "sha256-j1TMe2/jkSVa7p4Ar9HmZjh56GNqtkHP+QbSuyTDT04=";
   };
 
   nativeBuildInputs = [ setuptools ];

From d96191de0b08e9704ce4d1a3d105e2d521b21eed Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 5 Sep 2024 16:23:21 +0200
Subject: [PATCH 69/90] kubectl-view-allocations: remove superfluous perl input
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This hasn't been necessary since kubectl-view-allocations commit
0a2e061 ("➖ switch from openssl to rustls (like kube-rs 0.86)").
---
 .../networking/cluster/kubectl-view-allocations/default.nix     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
index 4d67c3786bdd..25e11043252b 100644
--- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
+++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix
@@ -2,7 +2,6 @@
 , stdenv
 , rustPlatform
 , fetchFromGitHub
-, perl
 , Security ? null
 }:
 
@@ -25,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     lockFile = ./Cargo.lock;
   };
 
-  nativeBuildInputs = [ perl ];
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
   meta = with lib; {

From 5f454a7d94f4822cee0b2749444573107e8b5c86 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 14:24:36 +0000
Subject: [PATCH 70/90] json2hcl: 0.1.1 -> 0.2.0

---
 pkgs/development/tools/json2hcl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/json2hcl/default.nix b/pkgs/development/tools/json2hcl/default.nix
index 39fa629df62b..7255736cd500 100644
--- a/pkgs/development/tools/json2hcl/default.nix
+++ b/pkgs/development/tools/json2hcl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "json2hcl";
-  version = "0.1.1";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "kvz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-0ku8sON4fzWAirqY+dhYAks2LSyC7OH/LKI0kb+QhpM=";
+    sha256 = "sha256-h7DudYVWvDRCbjoIgOoCIudf7ZfUfWXp5OJ4ni0nm6c=";
   };
 
   vendorHash = "sha256-GxYuFak+5CJyHgC1/RsS0ub84bgmgL+bI4YKFTb+vIY=";

From 0088e7d130c1f895294795669e15668f983489af Mon Sep 17 00:00:00 2001
From: paumr <paum@bdisk.eu>
Date: Thu, 5 Sep 2024 16:40:06 +0200
Subject: [PATCH 71/90] matrix: migrated links to new element-hq org

The vector-im GitHub organisation has been renamed to element-hq:
https://github.com/vector-im/.github/blob/1d586281f08885acaa0284598d3a5dfc32402767/profile/README.md
---
 nixos/modules/services/matrix/synapse.md               |  4 ++--
 .../instant-messengers/element/element-desktop.nix     |  6 +++---
 .../instant-messengers/element/element-web.nix         |  6 +++---
 .../networking/instant-messengers/element/update.sh    | 10 +++++-----
 .../instant-messengers/hydrogen-web/unwrapped.nix      |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/matrix/synapse.md b/nixos/modules/services/matrix/synapse.md
index 0ce13550d5b2..62967adddb4b 100644
--- a/nixos/modules/services/matrix/synapse.md
+++ b/nixos/modules/services/matrix/synapse.md
@@ -188,7 +188,7 @@ or [OpenID](https://element-hq.github.io/synapse/latest/openid.html).
 
 ## Element (formerly known as Riot) Web Client {#module-services-matrix-element-web}
 
-[Element Web](https://github.com/vector-im/riot-web/) is
+[Element Web](https://github.com/element-hq/element-web) is
 the reference web client for Matrix and developed by the core team at
 matrix.org. Element was formerly known as Riot.im, see the
 [Element introductory blog post](https://element.io/blog/welcome-to-element/)
@@ -228,6 +228,6 @@ the example, this means that you should not reuse the
 `myhostname.example.org` virtualHost to also serve Element,
 but instead serve it on a different subdomain, like
 `element.example.org` in the example. See the
-[Element Important Security Notes](https://github.com/vector-im/element-web/tree/v1.10.0#important-security-notes)
+[Element Important Security Notes](https://github.com/element-hq/element-web/tree/v1.10.0#important-security-notes)
 for more information on this subject.
 :::
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index db8a8be7a871..37393681224b 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
   pname = "element-desktop";
   name = "${finalAttrs.pname}-${finalAttrs.version}";
   src = fetchFromGitHub {
-    owner = "vector-im";
+    owner = "element-hq";
     repo = "element-desktop";
     rev = "v${finalAttrs.version}";
     hash = desktopSrcHash;
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
   '';
 
   # The desktop item properties should be kept in sync with data from upstream:
-  # https://github.com/vector-im/element-desktop/blob/develop/package.json
+  # https://github.com/element-hq/element-desktop/blob/develop/package.json
   desktopItem = makeDesktopItem {
     name = "element-desktop";
     exec = "${executableName} %u";
@@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
   meta = with lib; {
     description = "A feature-rich client for Matrix.org";
     homepage = "https://element.io/";
-    changelog = "https://github.com/vector-im/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = teams.matrix.members;
     inherit (electron.meta) platforms;
diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix
index 83289e5a6f61..1bfea7162dde 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
   pname = "element-web";
 
   src = fetchFromGitHub {
-    owner = "vector-im";
+    owner = "element-hq";
     repo = "element-web";
     rev = "v${finalAttrs.version}";
     hash = webSrcHash;
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
     # with the update of openssl3, some key ciphers are not supported anymore
     # this flag will allow those codecs again as a workaround
     # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07
-    # and https://github.com/vector-im/element-web/issues/21043
+    # and https://github.com/element-hq/element-web/issues/21043
     export NODE_OPTIONS=--openssl-legacy-provider
     mkdir -p $HOME
 
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // {
   meta = {
     description = "Glossy Matrix collaboration client for the web";
     homepage = "https://element.io/";
-    changelog = "https://github.com/vector-im/element-web/blob/v${finalAttrs.version}/CHANGELOG.md";
+    changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md";
     maintainers = lib.teams.matrix.members;
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
diff --git a/pkgs/applications/networking/instant-messengers/element/update.sh b/pkgs/applications/networking/instant-messengers/element/update.sh
index 0a1cc0595f87..2a4ec5fcdec2 100755
--- a/pkgs/applications/networking/instant-messengers/element/update.sh
+++ b/pkgs/applications/networking/instant-messengers/element/update.sh
@@ -12,15 +12,15 @@ version="$1"
 set -euo pipefail
 
 if [ -z "$version" ]; then
-  version="$(wget -q -O- "https://api.github.com/repos/vector-im/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')"
+  version="$(wget -q -O- "https://api.github.com/repos/element-hq/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')"
 fi
 
 # strip leading "v"
 version="${version#v}"
 
 # Element Web
-web_src="https://raw.githubusercontent.com/vector-im/element-web/v$version"
-web_src_hash=$(nix-prefetch-github vector-im element-web --rev v${version} | jq -r .hash)
+web_src="https://raw.githubusercontent.com/element-hq/element-web/v$version"
+web_src_hash=$(nix-prefetch-github element-hq element-web --rev v${version} | jq -r .hash)
 
 web_tmpdir=$(mktemp -d)
 trap 'rm -rf "$web_tmpdir"' EXIT
@@ -31,8 +31,8 @@ web_yarn_hash=$(prefetch-yarn-deps yarn.lock)
 popd
 
 # Element Desktop
-desktop_src="https://raw.githubusercontent.com/vector-im/element-desktop/v$version"
-desktop_src_hash=$(nix-prefetch-github vector-im element-desktop --rev v${version} | jq -r .hash)
+desktop_src="https://raw.githubusercontent.com/element-hq/element-desktop/v$version"
+desktop_src_hash=$(nix-prefetch-github element-hq element-desktop --rev v${version} | jq -r .hash)
 
 desktop_tmpdir=$(mktemp -d)
 trap 'rm -rf "$desktop_tmpdir"' EXIT
diff --git a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
index 05841080b1dd..c2052473a483 100644
--- a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "0.4.0";
 
   src = fetchFromGitHub {
-    owner = "vector-im";
+    owner = "element-hq";
     repo = "hydrogen-web";
     rev = "v${finalAttrs.version}";
     hash = "sha256-u8Yex3r7EZH+JztQHJbfncYeyyl6hgb1ZNFIg//wcb0=";
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Lightweight matrix client with legacy and mobile browser support";
-    homepage = "https://github.com/vector-im/hydrogen-web";
+    homepage = "https://github.com/element-hq/hydrogen-web";
     maintainers = lib.teams.matrix.members;
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;

From 7b9bb0a9a1e2a0c07640efc9575be3d404d24682 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 5 Sep 2024 15:26:13 +0100
Subject: [PATCH 72/90] nixos/installer: drop support for ReiserFS and JFS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ReiserFS has not been actively maintained for many years. It has been
marked as obsolete since Linux 6.6, and is scheduled for removal
in 2025. A warning is logged informing users of this every time a
ReiserFS file system is mounted. It suffers from unfixable issues
like the year 2038 problem.

JFS is a slightly more ambiguous case. It also has not been actively
maintained for years; even in 2008 questions were being raised
about its maintenance state  and IBM’s commitment to it, and some
enterprise distributions were opting not to ship support for it as
a result. It will [indefinitely postpone journal writes], leading
to data loss over potentially arbitrary amounts of time. Kernel
developers [considered marking it as deprecated] last year, but
no concrete decision was made. There have been [occasional fixes]
to the code since then, but even the developer of much of those was
not opposed to deprecating it.

[considered marking it as deprecated]: https://lore.kernel.org/lkml/Y8DvK281ii6yPRcW@infradead.org/
[indefinitely postpone journal writes]: https://www.usenix.org/legacy/events/usenix05/tech/general/full_papers/prabhakaran/prabhakaran.pdf
[occasional fixes]: https://www.phoronix.com/news/JFS-Linux-6.7-Improvements

Regardless of whether JFS should be removed from the kernel, with all
the implications for existing installations that entails, I think
it’s safe to say that no new Linux installation should be using
either of these file systems, and that it’s a waste of space and
potential footgun to be shipping support for them on our standard
installation media. We’re lagging behind other distributions on
this decision; neither is supported by Fedora’s installation media.

(It also just so happens that `jfsutils` is the one remaining package
in the minimal installer ISO that has reproducibility issues, due to
some cursed toolchain bug, but I’m not trying to Goodhart’s law
this or anything. I just think we shouldn’t be shipping it anyway.)
---
 nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++
 nixos/modules/profiles/base.nix                   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 0d668459f09b..85dbfc68b712 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -407,6 +407,8 @@
 
 - The `openlens` package got removed, suggested replacment `lens-desktop`
 
+- The NixOS installation media no longer support the ReiserFS or JFS file systems by default.
+
 ## Other Notable Changes {#sec-release-24.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 9f32f85a61ec..be79bd205cb3 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -50,7 +50,7 @@
 
   # Include support for various filesystems and tools to create / manipulate them.
   boot.supportedFilesystems =
-    [ "btrfs" "cifs" "f2fs" "jfs" "ntfs" "reiserfs" "vfat" "xfs" ] ++
+    [ "btrfs" "cifs" "f2fs" "ntfs" "vfat" "xfs" ] ++
     lib.optional (lib.meta.availableOn pkgs.stdenv.hostPlatform config.boot.zfs.package) "zfs";
 
   # Configure host id for ZFS to work

From 96cc7aa0ba980740e026cd6ebcb514a7c8cad3e0 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Thu, 5 Sep 2024 10:18:51 +0200
Subject: [PATCH 73/90] idris2Packages.idris2Lsp: fix cross eval

---
 pkgs/development/compilers/idris2/idris2-lsp.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/idris2/idris2-lsp.nix b/pkgs/development/compilers/idris2/idris2-lsp.nix
index 59a718c045ce..a01cd1667938 100644
--- a/pkgs/development/compilers/idris2/idris2-lsp.nix
+++ b/pkgs/development/compilers/idris2/idris2-lsp.nix
@@ -35,7 +35,7 @@ let
     };
     idrisLibraries = [idris2Api lspLib];
 
-    buildInputs = [makeWrapper];
+    nativeBuildInputs = [ makeWrapper ];
     postInstall = ''
       wrapProgram $out/bin/idris2-lsp \
         --suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}"

From ed3f34ffddd6bf470edf0c5e12d1750856f7df0a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 15:23:43 +0000
Subject: [PATCH 74/90] kubergrunt: 0.15.0 -> 0.16.0

---
 pkgs/applications/networking/cluster/kubergrunt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/applications/networking/cluster/kubergrunt/default.nix
index 3c5cf3ee52d2..b6262cf85700 100644
--- a/pkgs/applications/networking/cluster/kubergrunt/default.nix
+++ b/pkgs/applications/networking/cluster/kubergrunt/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kubergrunt";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "kubergrunt";
     rev = "v${version}";
-    sha256 = "sha256-yN5tpe3ayQPhTlBvxlt7CD6mSURCB4lxGatEK9OThzs=";
+    sha256 = "sha256-FOXnerB6qmUUotWLlTTsR5x0+A0Q9D8PVDTMG8j8b9o=";
   };
 
-  vendorHash = "sha256-VJkqg2cnpYHuEYOv5+spoyRWFAdFWE7YIVYaN9OmIZM=";
+  vendorHash = "sha256-rgU6Yv+gmKShWfpPaWtK2VIBPgFSsPVOnUzIp2+V7oI=";
 
   # Disable tests since it requires network access and relies on the
   # presence of certain AWS infrastructure

From 6bb48ed4eafb33c12792ce821b2ad79dc02858ee Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Thu, 5 Sep 2024 19:21:47 +0300
Subject: [PATCH 75/90] sbclPackages.cl-liballegro-nuklear: fix build

- remove patch that no longer applies as upstream includes that change
---
 pkgs/development/lisp-modules/packages.nix      |  1 -
 .../cl-liballegro-nuklear-missing-dll.patch     | 17 -----------------
 2 files changed, 18 deletions(-)
 delete mode 100644 pkgs/development/lisp-modules/patches/cl-liballegro-nuklear-missing-dll.patch

diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index cf7eeb44ca3b..7bada7cbd653 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -104,7 +104,6 @@ let
     nativeBuildInputs = [ pkgs.allegro5 ];
     nativeLibs = [ pkgs.allegro5 ];
     lispLibs = super.cl-liballegro-nuklear.lispLibs ++ [ self.cl-liballegro ];
-    patches = [ ./patches/cl-liballegro-nuklear-missing-dll.patch ];
   };
 
   lessp = build-asdf-system {
diff --git a/pkgs/development/lisp-modules/patches/cl-liballegro-nuklear-missing-dll.patch b/pkgs/development/lisp-modules/patches/cl-liballegro-nuklear-missing-dll.patch
deleted file mode 100644
index b5bde523eba9..000000000000
--- a/pkgs/development/lisp-modules/patches/cl-liballegro-nuklear-missing-dll.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix system not loading due to:
-
-Unhandled CFFI:LOAD-FOREIGN-LIBRARY-ERROR 
-  Unable to load foreign library (LIBALLEGRO-NUKLEAR).
-  Error opening shared object "/build/source/src/liballegro_nuklear.so":
-  /build/source/src/liballegro_nuklear.so: undefined symbol: al_draw_ellipse.
---- a/cl-liballegro-nuklear.asd
-+++ b/cl-liballegro-nuklear.asd
-@@ -12,7 +12,7 @@
-   :description "CFFI wrapper for the Nuklear IM GUI library with liballegro backend, to be used with cl-liballegro."
-   :author "Andrew Kravchuk <awkravchuk@gmail.com>"
-   :license "MIT"
--  :depends-on (:cffi :cffi-libffi :trivial-features)
-+  :depends-on (:cl-liballegro :cffi :cffi-libffi :trivial-features)
-   :pathname "src"
-   :serial t
-   :components ((:makefile "Makefile")

From 879e277f4d5c3284eebed1e3cf2de877a4f7019d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 17:27:12 +0000
Subject: [PATCH 76/90] python312Packages.exchangelib: 5.4.2 -> 5.4.3

---
 pkgs/development/python-modules/exchangelib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix
index 805c348756e1..5be910888a8e 100644
--- a/pkgs/development/python-modules/exchangelib/default.nix
+++ b/pkgs/development/python-modules/exchangelib/default.nix
@@ -29,7 +29,7 @@
 
 buildPythonPackage rec {
   pname = "exchangelib";
-  version = "5.4.2";
+  version = "5.4.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "ecederstrand";
     repo = "exchangelib";
     rev = "refs/tags/v${version}";
-    hash = "sha256-UAc8Aju2+AM7m8XbWliVNzfWlL5fdPDa2q6Fsw04nHQ=";
+    hash = "sha256-SX5F0OXKdxA2HoDwvCe4M7RftdjUEdQuFbxRyuABC4E=";
   };
 
   pythonRelaxDeps = [ "defusedxml" ];

From 9f5bf99b3be22c180a3da283d8a0eb5f2f55e877 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 17:49:33 +0000
Subject: [PATCH 77/90] qgroundcontrol: 4.4.1 -> 4.4.2

---
 pkgs/applications/science/robotics/qgroundcontrol/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index c2ee629d77ba..8caddf7dfcef 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   pname = "qgroundcontrol";
-  version = "4.4.1";
+  version = "4.4.2";
 
   propagatedBuildInputs = [
     qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     owner = "mavlink";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-FdF9QQYCF7HbmjvUQgV6HytJo2Aje2OEDPO2GSl1dqE=";
+    hash = "sha256-2Bc4uC/2e+PTsvFZ4RjnTzkOiBO9vsYHeLPkcwpDRrg=";
     fetchSubmodules = true;
   };
 

From 22beb958eff30548cfaa3240409f20b44871c720 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Fri, 24 May 2024 16:02:41 +0200
Subject: [PATCH 78/90] wine-discord-ipc-bridge: init at unstable-2023-08-09

---
 .../wi/wine-discord-ipc-bridge/package.nix    | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix

diff --git a/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix b/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix
new file mode 100644
index 000000000000..bd873bd7ba33
--- /dev/null
+++ b/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+}:
+
+stdenv.mkDerivation {
+  pname = "wine-discord-ipc-bridge";
+  version = "unstable-2023-08-09";
+
+  src = fetchFromGitHub {
+    owner = "0e4ef622";
+    repo = "wine-discord-ipc-bridge";
+    rev = "f8198c9d52e708143301017a296f7557c4387127";
+    hash = "sha256-tAknITFlG63+gI5cN9SfUIUZkbIq/MgOPoGIcvoNo4Q=";
+  };
+
+  postPatch = ''
+    patchShebangs winediscordipcbridge-steam.sh
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp winediscordipcbridge.exe $out/bin
+    cp winediscordipcbridge-steam.sh $out/bin
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Enable games running under wine to use Discord Rich Presence";
+    homepage = "https://github.com/0e4ef622/wine-discord-ipc-bridge";
+    license = licenses.mit;
+    maintainers = [ maintainers.uku3lig ];
+    mainProgram = "winediscordipcbridge";
+    platforms = [ "mingw32" ];
+  };
+}

From cb82c01eefccf8a6008b15c376413b9fa1e5eabb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 18:20:41 +0000
Subject: [PATCH 79/90] leetgo: 1.4.8 -> 1.4.9

---
 pkgs/by-name/le/leetgo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/le/leetgo/package.nix b/pkgs/by-name/le/leetgo/package.nix
index 0194260f5beb..b4fcfd9aad0a 100644
--- a/pkgs/by-name/le/leetgo/package.nix
+++ b/pkgs/by-name/le/leetgo/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "leetgo";
-  version = "1.4.8";
+  version = "1.4.9";
 
   src = fetchFromGitHub {
     owner = "j178";
     repo = "leetgo";
     rev = "v${version}";
-    hash = "sha256-4Y/NwgLNBdd2uL7oiIdM1I08ZnLjreHf397s/vhS+Ac=";
+    hash = "sha256-FlQYTNz1Fh0igwnufjVXN4bsUYBB1kls19D+/v7Ztps=";
   };
 
-  vendorHash = "sha256-zpS+6Z31m6g67we4JaQ0sPodqC315lgftqGzZkelDCU=";
+  vendorHash = "sha256-DdAe9yyusA6Ac8ioKqLiM5lcOt9Xy7F77gMG6yBTl7Q=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 4c64146e452b9beb6fda91b8124d076b4cd1c9eb Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Thu, 5 Sep 2024 20:23:41 +0200
Subject: [PATCH 80/90] treewide: Retire `srgom` from meta.maintainers
 (#337930)

The GitHub account has been inactive for 4+ years.

This is sadly necessary due to the delays in reviews/merges when others are waiting for the requested maintainers to review the PR.

Instructions for re-adding once you return https://github.com/NixOS/nixpkgs/tree/master/maintainers#how-to-become-a-maintainer

We appreciate your past and future contributions.

Co-authored-by: Anderson Torres <torres.anderson.85@protonmail.com>
---
 pkgs/applications/system/qjournalctl/default.nix | 2 +-
 pkgs/tools/typesetting/tex/pplatex/default.nix   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/applications/system/qjournalctl/default.nix
index 5c8714677ad9..fc80c3f69df8 100644
--- a/pkgs/applications/system/qjournalctl/default.nix
+++ b/pkgs/applications/system/qjournalctl/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/pentix/qjournalctl";
     license = licenses.gpl3Only;
     platforms = platforms.all;
-    maintainers = with maintainers; [ srgom romildo ];
+    maintainers = with maintainers; [ romildo ];
   };
 }
diff --git a/pkgs/tools/typesetting/tex/pplatex/default.nix b/pkgs/tools/typesetting/tex/pplatex/default.nix
index 367daa9450fc..7bd1e4d0eb1e 100644
--- a/pkgs/tools/typesetting/tex/pplatex/default.nix
+++ b/pkgs/tools/typesetting/tex/pplatex/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "pplatex";
     homepage = "https://github.com/stefanhepp/pplatex";
     license = licenses.gpl3Plus;
-    maintainers = [ maintainers.srgom maintainers.doronbehar ];
+    maintainers = [ maintainers.doronbehar ];
     platforms = platforms.unix;
   };
 })

From d598d4360d73c87e1b9d9bd42e978a62f4d9ba84 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 18:40:22 +0000
Subject: [PATCH 81/90] python312Packages.twilio: 9.2.4 -> 9.3.0

---
 pkgs/development/python-modules/twilio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index 7e14cc581a63..33680d968969 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "9.2.4";
+  version = "9.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "twilio";
     repo = "twilio-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-5HHHSAvyUxR5myKucWpjkF7NQv/b1pViij606TZGzTY=";
+    hash = "sha256-v+Xq2t9eaKHLQFypNUTzLVBLo+3m0bKkjI09jwD3ieQ=";
   };
 
   build-system = [ setuptools ];

From 5b09fecd006eff96b769560c3f821ae8bcb1a5db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 18:40:32 +0000
Subject: [PATCH 82/90] vsce: 3.0.0 -> 3.1.0

---
 pkgs/by-name/vs/vsce/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix
index 8020835f0be6..873b4e2c1af3 100644
--- a/pkgs/by-name/vs/vsce/package.nix
+++ b/pkgs/by-name/vs/vsce/package.nix
@@ -12,16 +12,16 @@
 
 buildNpmPackage rec {
   pname = "vsce";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vscode-vsce";
     rev = "v${version}";
-    hash = "sha256-FoJfpzrbui+tKCEq15wGC0o44iLCBAuVYBISiy+zOmE=";
+    hash = "sha256-k2jeYeDLpSVw3puiOqlrtQ1a156OV1Er/TqdJuJ+578=";
   };
 
-  npmDepsHash = "sha256-TTFolysg+La605EoS87gmhEjlzwNUVYmnXKr49De7fk=";
+  npmDepsHash = "sha256-k6LdGCpVoBNpHe4z7NrS0T/gcB1EQBvBxGAM3zo+AAo=";
 
   postPatch = ''
     substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"'

From 05193982cfadb19399acfb53d4865473f0d3b847 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 5 Sep 2024 22:25:09 +0300
Subject: [PATCH 83/90] python312.jaxlib-bin: throw on missing gpuSrc

Better throw than to do an uncatchable missing attribute error

https://www.github.com/NixOS/nixpkgs/pull/338199
---
 pkgs/development/python-modules/jaxlib/bin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix
index 0932222e02b8..3104cee90e1c 100644
--- a/pkgs/development/python-modules/jaxlib/bin.nix
+++ b/pkgs/development/python-modules/jaxlib/bin.nix
@@ -181,7 +181,7 @@ buildPythonPackage {
         or (throw "jaxlib-bin is not supported on ${stdenv.hostPlatform.system}")
       )
     else
-      gpuSrcs."${gpuSrcVersionString}";
+      gpuSrcs."${gpuSrcVersionString}" or (throw "jaxlib-bin: No gpuSrc for ${gpuSrcVersionString}");
 
   # Prebuilt wheels are dynamically linked against things that nix can't find.
   # Run `autoPatchelfHook` to automagically fix them.

From 18d5bb71c700116bcce9ecf08c90d3ab48a053b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 5 Sep 2024 12:28:43 -0700
Subject: [PATCH 84/90] imagemagick: add willow to passthru.tests

see https://github.com/wagtail/Willow/issues/150
---
 pkgs/applications/graphics/ImageMagick/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index c278a476bae8..cd998be7019f 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
     version = testers.testVersion { package = finalAttrs.finalPackage; };
     inherit nixos-icons;
     inherit (perlPackages) ImageMagick;
-    inherit (python3.pkgs) img2pdf;
+    inherit (python3.pkgs) img2pdf willow;
     pkg-config = testers.hasPkgConfigModules {
       package = finalAttrs.finalPackage;
       version = lib.head (lib.splitString "-" finalAttrs.version);

From 9a87b54f702eb8c4b170c1d59a25d13159170928 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 21:37:59 +0200
Subject: [PATCH 85/90] python312Packages.sshfs: disable test

---
 pkgs/development/python-modules/sshfs/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix
index 5b101748cd4f..6eaae84d6f77 100644
--- a/pkgs/development/python-modules/sshfs/default.nix
+++ b/pkgs/development/python-modules/sshfs/default.nix
@@ -54,10 +54,15 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests = lib.optionals stdenv.isDarwin [
-    # test fails with sandbox enabled
-    "test_checksum"
-  ];
+  disabledTests =
+    [
+      # Test requires network access
+      "test_config_expansions"
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      # Test fails with sandbox enabled
+      "test_checksum"
+    ];
 
   pythonImportsCheck = [ "sshfs" ];
 

From a2282d35a722d1905b9f89d7c43dfe1cae09e6aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 19:54:04 +0000
Subject: [PATCH 86/90] picard: 2.12.2 -> 2.12.3

---
 pkgs/applications/audio/picard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index a767658d8d24..e43e39e5a47d 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -21,14 +21,14 @@ in
 pythonPackages.buildPythonApplication rec {
   pname = "picard";
   # nix-update --commit picard --version-regex 'release-(.*)'
-  version = "2.12.2";
+  version = "2.12.3";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "metabrainz";
     repo = "picard";
     rev = "refs/tags/release-${version}";
-    hash = "sha256-m0cFJKkYNH01YzcRrbKgkXpjlZ9ZEymwGDnOFQfZKv0=";
+    hash = "sha256-ysHOiX8b9tlUaQDGl4qHUVLrLUF9MUDc4+vOQB76cj4=";
   };
 
   nativeBuildInputs = [

From 5a575e88b6b395bac6fca5858da08c54b6b74d66 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 5 Sep 2024 15:56:49 -0400
Subject: [PATCH 87/90] Revert "nixos: support dm-verity"

---
 .../manual/release-notes/rl-2411.section.md   |   3 -
 nixos/modules/module-list.nix                 |   1 -
 .../modules/system/boot/systemd/dm-verity.nix |  65 -----
 nixos/modules/system/boot/systemd/initrd.nix  |  11 +-
 nixos/tests/all-tests.nix                     |   1 -
 nixos/tests/dm-verity.nix                     | 245 ------------------
 6 files changed, 4 insertions(+), 322 deletions(-)
 delete mode 100644 nixos/modules/system/boot/systemd/dm-verity.nix
 delete mode 100644 nixos/tests/dm-verity.nix

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index a352fae45ad0..1720dfea3525 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -34,9 +34,6 @@
   Users that want to keep PulseAudio will want to set `services.pipewire.enable = false;` and `hardware.pulseaudio.enable = true;`.
   There is currently no plan to fully deprecate and remove PulseAudio, however, PipeWire should generally be preferred for new installs.
 
-- Support for mounting filesystems from block devices protected with [dm-verity](https://docs.kernel.org/admin-guide/device-mapper/verity.html)
-  was added through the `boot.initrd.systemd.dmVerity` option.
-
 ## New Modules {#sec-release-24.11-new-modules}
 
 - [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwariror 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f94b1368ac69..dff961f3f55b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1622,7 +1622,6 @@
   ./system/boot/stage-2.nix
   ./system/boot/systemd.nix
   ./system/boot/systemd/coredump.nix
-  ./system/boot/systemd/dm-verity.nix
   ./system/boot/systemd/initrd-secrets.nix
   ./system/boot/systemd/initrd.nix
   ./system/boot/systemd/journald.nix
diff --git a/nixos/modules/system/boot/systemd/dm-verity.nix b/nixos/modules/system/boot/systemd/dm-verity.nix
deleted file mode 100644
index eea048126be0..000000000000
--- a/nixos/modules/system/boot/systemd/dm-verity.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ config, lib, ... }:
-
-let
-  cfg = config.boot.initrd.systemd.dmVerity;
-in
-{
-  options = {
-    boot.initrd.systemd.dmVerity = {
-      enable = lib.mkEnableOption "dm-verity" // {
-        description = ''
-          Mount verity-protected block devices in the initrd.
-
-          Enabling this option allows to use `systemd-veritysetup` and
-          `systemd-veritysetup-generator` in the initrd.
-        '';
-      };
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = cfg.enable -> config.boot.initrd.systemd.enable;
-        message = ''
-          'boot.initrd.systemd.dmVerity.enable' requires 'boot.initrd.systemd.enable' to be enabled.
-        '';
-      }
-    ];
-
-    boot.initrd = {
-      availableKernelModules = [
-        # For documentation, see https://docs.kernel.org/admin-guide/device-mapper/dm-init.html
-        "dm_mod"
-        # For documentation, see:
-        # - https://docs.kernel.org/admin-guide/device-mapper/verity.html
-        # - https://gitlab.com/cryptsetup/cryptsetup/-/wikis/DMVerity
-        "dm_verity"
-      ];
-
-      # dm-verity needs additional udev rules from LVM to work.
-      services.lvm.enable = true;
-
-      # The additional targets and store paths allow users to integrate verity-protected devices
-      # through the systemd tooling.
-      systemd = {
-        additionalUpstreamUnits = [
-          # https://github.com/systemd/systemd/blob/main/units/veritysetup-pre.target
-          "veritysetup-pre.target"
-          # https://github.com/systemd/systemd/blob/main/units/veritysetup.target
-          "veritysetup.target"
-          # https://github.com/systemd/systemd/blob/main/units/remote-veritysetup.target
-          "remote-veritysetup.target"
-        ];
-
-        storePaths = [
-          # These are the two binaries mentioned in https://github.com/systemd/systemd/blob/main/src/veritysetup/meson.build; there are no others.
-          "${config.boot.initrd.systemd.package}/lib/systemd/systemd-veritysetup"
-          "${config.boot.initrd.systemd.package}/lib/systemd/system-generators/systemd-veritysetup-generator"
-        ];
-      };
-    };
-  };
-
-  meta.maintainers = [ lib.maintainers.msanft ];
-}
diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index 2ad114d6a1d3..2ccc964820fe 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -218,7 +218,7 @@ in {
     };
 
     root = lib.mkOption {
-      type = lib.types.nullOr (lib.types.enum [ "fstab" "gpt-auto" ]);
+      type = lib.types.enum [ "fstab" "gpt-auto" ];
       default = "fstab";
       example = "gpt-auto";
       description = ''
@@ -227,9 +227,6 @@ in {
         allow specifying the root file system itself this
         way. Instead, the `fstab` value is used in order to interpret
         the root file system specified with the `fileSystems` option.
-
-        If the root FS is mounted by other means, such as systemd generators other than
-        `fstab`, `gpt-auto` or a custom generator, set this to `null`.
       '';
     };
 
@@ -401,9 +398,9 @@ in {
     ++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb"
     ++ lib.optional cfg.package.withEfi "efivarfs";
 
-    boot.kernelParams =
-      lib.optional (config.boot.initrd.systemd.root != null) "root=${config.boot.initrd.systemd.root}"
-      ++ lib.optional (config.boot.resumeDevice != "") "resume=${config.boot.resumeDevice}"
+    boot.kernelParams = [
+      "root=${config.boot.initrd.systemd.root}"
+    ] ++ lib.optional (config.boot.resumeDevice != "") "resume=${config.boot.resumeDevice}"
       # `systemd` mounts root in initrd as read-only unless "rw" is on the kernel command line.
       # For NixOS activation to succeed, we need to have root writable in initrd.
       ++ lib.optional (config.boot.initrd.systemd.root == "gpt-auto") "rw";
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 44ab2d445841..f8e0eb190bf5 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -259,7 +259,6 @@ in {
   dhparams = handleTest ./dhparams.nix {};
   disable-installer-tools = handleTest ./disable-installer-tools.nix {};
   discourse = handleTest ./discourse.nix {};
-  dm-verity = runTest ./dm-verity.nix;
   dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {};
   dnscrypt-wrapper = runTestOn ["x86_64-linux"] ./dnscrypt-wrapper;
   dnsdist = import ./dnsdist.nix { inherit pkgs runTest; };
diff --git a/nixos/tests/dm-verity.nix b/nixos/tests/dm-verity.nix
deleted file mode 100644
index cf20dbe66f59..000000000000
--- a/nixos/tests/dm-verity.nix
+++ /dev/null
@@ -1,245 +0,0 @@
-# Tests a NixOS system with a read-only root filesystem that's integrity-protected
-# through DM-verity. The root filesystem is mounted read-only, and for NixOS activation
-# to succeed, an overlay `tmpfs` is mounted on top of it.
-# This test uses systemd-repart to create a bootable disk image, as it supplies handy
-# utilities for creating verity partitions, but it can also be setup manually through
-# `systemd-veritysetup`.
-
-{ lib, pkgs, ... }:
-
-let
-  imageId = "verity-root-image";
-  imageVersion = "1-rc1";
-
-  # Use a random, but fixed root hash placeholder to allow us specifying the "real" root hash
-  # after the image is first built.
-  roothashPlaceholder = "61fe0f0c98eff2a595dd2f63a5e481a0a25387261fa9e34c37e3a4910edf32b8";
-in
-{
-  name = "verity-root";
-
-  meta.maintainers = with lib.maintainers; [ msanft ];
-
-  nodes.machine =
-    {
-      lib,
-      pkgs,
-      config,
-      modulesPath,
-      ...
-    }:
-    {
-
-      imports = [ "${modulesPath}/image/repart.nix" ];
-
-      virtualisation.directBoot.enable = false;
-      virtualisation.mountHostNixStore = false;
-      virtualisation.useEFIBoot = true;
-
-      # Disable boot loaders, as a UKI is used, which contains systemd-stub.
-      # TODO(raitobezarius): revisit this when #244907 lands
-      boot.loader.grub.enable = false;
-
-      system.image.id = imageId;
-      system.image.version = imageVersion;
-
-      # systemd-veritysetup-generator takes care of setting up the root filesystem.
-      fileSystems = lib.mkForce { };
-      virtualisation.fileSystems = lib.mkForce { };
-
-      # Provides 'veritysetup' to check if the verity-protected device
-      # has been mapped correctly.
-      environment.systemPackages = with pkgs; [ cryptsetup ];
-
-      boot.initrd = {
-        kernelModules = [ "overlay" ];
-        supportedFilesystems = [ "erofs" ];
-
-        systemd = {
-          enable = true;
-          dmVerity.enable = true;
-          root = null; # systemd-veritysetup-generator takes care of mounting /
-
-          tmpfiles.settings = {
-            "10-mountpoints" =
-              let
-                conf = {
-                  mode = "0755";
-                  user = "root";
-                  group = "root";
-                };
-              in
-              {
-                "/run/etc/upper".d = conf;
-                "/run/etc/work".d = conf;
-                "/run/var/upper".d = conf;
-                "/run/var/work".d = conf;
-                "/run/tmp/upper".d = conf;
-                "/run/tmp/work".d = conf;
-              };
-          };
-
-          # We directly define the mount units here, as we need to specify dependencies very
-          # granularly, and systemd-fstab-generator doesn't give us that flexibility.
-          mounts = [
-            {
-              where = "/sysroot/etc";
-              what = "overlay";
-              type = "overlay";
-              options = "lowerdir=/sysroot${config.system.build.etc}/etc,upperdir=/run/etc/upper,workdir=/run/etc/work";
-              wantedBy = [
-                "initrd-fs.target"
-                "initrd-switch-root.target"
-                "default.target"
-              ];
-              before = [ "initrd-fs.target" ];
-              after = [ "systemd-tmpfiles-setup.service" ];
-              unitConfig.RequiresMountsFor = "/sysroot/nix/store";
-              unitConfig.DefaultDependencies = false;
-            }
-            {
-              where = "/sysroot/var";
-              what = "overlay";
-              type = "overlay";
-              options = "lowerdir=/sysroot/var,upperdir=/run/var/upper,workdir=/run/var/work";
-              wantedBy = [
-                "initrd-fs.target"
-                "initrd-switch-root.target"
-                "default.target"
-              ];
-              before = [ "initrd-fs.target" ];
-              after = [ "systemd-tmpfiles-setup.service" ];
-              unitConfig.RequiresMountsFor = "/sysroot/nix/store";
-              unitConfig.DefaultDependencies = false;
-            }
-            {
-              where = "/sysroot/tmp";
-              what = "overlay";
-              type = "overlay";
-              options = "lowerdir=/sysroot/tmp,upperdir=/run/tmp/upper,workdir=/run/tmp/work";
-              wantedBy = [
-                "initrd-fs.target"
-                "initrd-switch-root.target"
-                "default.target"
-              ];
-              before = [ "initrd-fs.target" ];
-              after = [ "systemd-tmpfiles-setup.service" ];
-              unitConfig.RequiresMountsFor = "/sysroot/nix/store";
-              unitConfig.DefaultDependencies = false;
-            }
-          ];
-        };
-      };
-
-      boot.kernelParams = [
-        "systemd.verity=yes"
-        "roothash=${roothashPlaceholder}"
-      ];
-
-      image.repart = {
-        name = imageId;
-        # OVMF does not work with the default repart sector size of 4096
-        sectorSize = 512;
-        partitions = {
-          # ESP
-          "00-esp" = {
-            contents =
-              let
-                efiArch = config.nixpkgs.hostPlatform.efiArch;
-              in
-              {
-                "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source = "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";
-
-                "/EFI/Linux/${config.system.boot.loader.ukiFile}".source = "${config.system.build.uki}/${config.system.boot.loader.ukiFile}";
-              };
-            repartConfig = {
-              Type = "esp";
-              Format = "vfat";
-              # Minimize = "guess" seems to not work very well for vfat
-              # partitions. It's better to set a sensible default instead. The
-              # aarch64 kernel seems to generally be a little bigger than the
-              # x86_64 kernel. To stay on the safe side, leave some more slack
-              # for every platform other than x86_64.
-              SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M";
-            };
-          };
-
-          # Root Partition
-          "10-root" = {
-            storePaths = [ config.system.build.toplevel ];
-            repartConfig = {
-              Type = "root";
-              Format = "erofs";
-              Label = "root";
-              Verity = "data";
-              VerityMatchKey = "root";
-              Minimize = "best";
-              # We need to ensure that mountpoints are available.
-              MakeDirectories = "/bin /boot /dev /etc /home /lib /lib64 /mnt /nix /opt /proc /root /run /srv /sys /tmp /usr /var";
-            };
-          };
-
-          # Verity hashtree for the root partition
-          "20-root-verity" = {
-            repartConfig = {
-              Type = "root-verity";
-              Label = "root-verity";
-              Verity = "hash";
-              VerityMatchKey = "root";
-              Minimize = "best";
-            };
-          };
-        };
-      };
-    };
-
-  testScript =
-    let
-      # We override the build of the image by extending it with code to replace the placeholder with the real root hash.
-      # This way, we can build the image first and then set the root hash afterwards in a single derivation.
-      buildOverride = oldAttrs: {
-        nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.jq ];
-        postInstall = ''
-          # Replace the placeholder with the real root hash.
-          realRoothash=$(${pkgs.jq}/bin/jq -r "[.[] | select(.roothash != null)] | .[0].roothash" $out/repart-output.json)
-          sed -i "0,/${roothashPlaceholder}/ s/${roothashPlaceholder}/$realRoothash/" $out/${oldAttrs.pname}_${oldAttrs.version}.raw
-        '';
-      };
-    in
-    { nodes, ... }:
-    ''
-      import os, subprocess, tempfile
-
-      tmp_disk_image = tempfile.NamedTemporaryFile()
-
-      subprocess.run([
-        "${nodes.machine.virtualisation.qemu.package}/bin/qemu-img",
-        "create",
-        "-f",
-        "qcow2",
-        "-b",
-        "${nodes.machine.system.build.image.overrideAttrs buildOverride}/${nodes.machine.image.repart.imageFile}",
-        "-F",
-        "raw",
-        tmp_disk_image.name,
-      ])
-
-      # Set NIX_DISK_IMAGE so that the qemu script finds the right disk image.
-      os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name
-
-      os_release = machine.succeed("cat /etc/os-release")
-      assert 'IMAGE_ID="${imageId}"' in os_release
-      assert 'IMAGE_VERSION="${imageVersion}"' in os_release
-
-      bootctl_status = machine.succeed("bootctl status")
-      assert "Boot Loader Specification Type #2 (.efi)" in bootctl_status
-
-      verity_status = machine.succeed("veritysetup status root")
-      assert "type:        VERITY" in verity_status
-      assert "status:      verified" in verity_status
-
-      commandline = machine.succeed("cat /proc/cmdline")
-      roothash = commandline.split("roothash=")[1].split(" ")[0]
-      assert roothash in verity_status
-    '';
-}

From d5c686a5bd342d98116cb2b85a33a77fb2c4af95 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 5 Sep 2024 22:01:11 +0200
Subject: [PATCH 88/90] metasploit: 6.4.24 -> 6.4.25

---
 pkgs/tools/security/metasploit/Gemfile      | 2 +-
 pkgs/tools/security/metasploit/Gemfile.lock | 6 +++---
 pkgs/tools/security/metasploit/default.nix  | 4 ++--
 pkgs/tools/security/metasploit/gemset.nix   | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 5cb6092615da..60c1bfad1134 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.24"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.25"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index 6eddefe9becd..49c0b3dd6918 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: 1d1fe1ccc7a339d4800cf20b8301d1ff1f56cd9b
-  ref: refs/tags/6.4.24
+  revision: 8a95b2c37de1aea1c347324a1e8171d9189e149b
+  ref: refs/tags/6.4.25
   specs:
-    metasploit-framework (6.4.24)
+    metasploit-framework (6.4.25)
       aarch64
       abbrev
       actionpack (~> 7.0.0)
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index a8a01e639cc1..d52a883e6520 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -15,13 +15,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "metasploit-framework";
-  version = "6.4.24";
+  version = "6.4.25";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = "refs/tags/${version}";
-    hash = "sha256-320yeezX3GV8sNi84JbU8qeKcj+uuiaqXQkYYh1jmh0=";
+    hash = "sha256-JSRex8aNwINEErNi5UoW29YV0R6pSfkyYrULK9vLTAc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index 26b9050c60cb..b59162d271e0 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -724,12 +724,12 @@
     platforms = [];
     source = {
       fetchSubmodules = false;
-      rev = "1d1fe1ccc7a339d4800cf20b8301d1ff1f56cd9b";
-      sha256 = "07csccfn4609bnm2dfmf7xr8m9zjsjbf1g6qn1y6bp6pxiwk4vfz";
+      rev = "8a95b2c37de1aea1c347324a1e8171d9189e149b";
+      sha256 = "01scrgdjn2xmc8rgjjd93v8ibmnv2r5faqmk29287h4dqv3mw915";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "6.4.24";
+    version = "6.4.25";
   };
   metasploit-model = {
     groups = ["default"];

From 24ef2a079dd6399e6683ba2990756d78ef9ed26d Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Thu, 5 Sep 2024 14:34:49 -0600
Subject: [PATCH 89/90] unrar-free: fix meta.mainProgram

---
 pkgs/by-name/un/unrar-free/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/un/unrar-free/package.nix b/pkgs/by-name/un/unrar-free/package.nix
index ca6b7f7e526e..176a01a45640 100644
--- a/pkgs/by-name/un/unrar-free/package.nix
+++ b/pkgs/by-name/un/unrar-free/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://gitlab.com/bgermann/unrar-free";
     license = lib.licenses.gpl2Plus;
-    mainProgram = "unrar";
+    mainProgram = "unrar-free";
     maintainers = with lib.maintainers; [ thiagokokada ];
     platforms = lib.platforms.unix;
     broken = stdenv.isDarwin;

From c39e9041e8e371ee72a8e28217d7dd9072cd6ef6 Mon Sep 17 00:00:00 2001
From: Jakub Skokan <jakub.skokan@havefun.cz>
Date: Thu, 5 Sep 2024 23:57:13 +0200
Subject: [PATCH 90/90] vpsfree-client: 0.18.0 -> 0.19.0 (#339850)

---
 pkgs/by-name/vp/vpsfree-client/Gemfile      |   2 +-
 pkgs/by-name/vp/vpsfree-client/Gemfile.lock |  52 +++++-----
 pkgs/by-name/vp/vpsfree-client/gemset.nix   | 104 ++++++++++++--------
 3 files changed, 92 insertions(+), 66 deletions(-)

diff --git a/pkgs/by-name/vp/vpsfree-client/Gemfile b/pkgs/by-name/vp/vpsfree-client/Gemfile
index 90fce7a5cbd5..87c9aeebb90c 100644
--- a/pkgs/by-name/vp/vpsfree-client/Gemfile
+++ b/pkgs/by-name/vp/vpsfree-client/Gemfile
@@ -2,4 +2,4 @@
 
 source "https://rubygems.org"
 
-gem "vpsfree-client", "0.18.0"
+gem "vpsfree-client"
diff --git a/pkgs/by-name/vp/vpsfree-client/Gemfile.lock b/pkgs/by-name/vp/vpsfree-client/Gemfile.lock
index 7485c24ce168..761b8a6db21a 100644
--- a/pkgs/by-name/vp/vpsfree-client/Gemfile.lock
+++ b/pkgs/by-name/vp/vpsfree-client/Gemfile.lock
@@ -1,45 +1,48 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.2)
+    activesupport (7.2.1)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
-    concurrent-ruby (1.2.3)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
-    curses (1.4.4)
+    curses (1.4.6)
     domain_name (0.6.20240107)
     drb (2.2.1)
-    haveapi-client (0.19.3)
+    haveapi-client (0.23.7)
       activesupport (>= 7.0)
-      highline (~> 2.1.0)
+      highline (~> 3.1)
       json
       require_all (~> 2.0.0)
       rest-client (~> 2.1.0)
       ruby-progressbar (~> 1.13.0)
-    highline (2.1.0)
+    highline (3.1.1)
+      reline
     http-accept (1.7.0)
-    http-cookie (1.0.5)
+    http-cookie (1.0.7)
       domain_name (~> 0.5)
-    i18n (1.14.3)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-      racc (~> 1.7)
-    json (2.7.1)
+    io-console (0.7.2)
+    json (2.7.2)
+    logger (1.6.1)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0305)
-    minitest (5.22.2)
-    mutex_m (0.2.0)
+    mime-types-data (3.2024.0903)
+    minitest (5.25.1)
     netrc (0.11.0)
-    racc (1.7.3)
+    reline (0.5.10)
+      io-console (~> 0.5)
     require_all (2.0.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
@@ -47,20 +50,21 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     ruby-progressbar (1.13.0)
+    securerandom (0.3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    vpsadmin-client (3.0.0.master.20231229.pre.0.51d41b07)
+    vpsadmin-client (4.0.0)
       curses
-      haveapi-client (~> 0.19.0)
+      haveapi-client (~> 0.23.6)
       json
-    vpsfree-client (0.18.0)
-      vpsadmin-client (= 3.0.0.master.20231229.pre.0.51d41b07)
+    vpsfree-client (0.19.0)
+      vpsadmin-client (~> 4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  vpsfree-client (= 0.18.0)
+  vpsfree-client
 
 BUNDLED WITH
-   2.4.22
+   2.5.9
diff --git a/pkgs/by-name/vp/vpsfree-client/gemset.nix b/pkgs/by-name/vp/vpsfree-client/gemset.nix
index cdc9250b875e..e19de26f9228 100644
--- a/pkgs/by-name/vp/vpsfree-client/gemset.nix
+++ b/pkgs/by-name/vp/vpsfree-client/gemset.nix
@@ -1,14 +1,14 @@
 {
   activesupport = {
-    dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"];
+    dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d";
+      sha256 = "094cv9kxa8hwlsw3c0njkvvayd0wszcz9b6xywv4yajrg83zlmvm";
       type = "gem";
     };
-    version = "7.1.3.2";
+    version = "7.2.1";
   };
   base64 = {
     groups = ["default"];
@@ -25,20 +25,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w";
+      sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
       type = "gem";
     };
-    version = "3.1.6";
+    version = "3.1.8";
   };
   concurrent-ruby = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
+      sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl";
       type = "gem";
     };
-    version = "1.2.3";
+    version = "1.3.4";
   };
   connection_pool = {
     groups = ["default"];
@@ -55,10 +55,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00y9g79lzfffxarj3rmhnkblsnyx7izx91mh8c1sdcs9y2pdfq53";
+      sha256 = "15pj04v9m06lj7xcq5xjk6b0nqfpq3kiaisjmh2pysmi6nvsg9ly";
       type = "gem";
     };
-    version = "1.4.4";
+    version = "1.4.6";
   };
   domain_name = {
     groups = ["default"];
@@ -86,20 +86,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yjcf6yf90sqjsywlcxzfrfrl835ndw96x6bh4grvc75zbb5ijki";
+      sha256 = "1a6k0milq4rfybf1pc8gzikpr18dmnzpz1wi2avzdkp0dpqkvaw3";
       type = "gem";
     };
-    version = "0.19.3";
+    version = "0.23.7";
   };
   highline = {
+    dependencies = ["reline"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn";
+      sha256 = "1q0f7izfi542sp93gl276spm0xyws1kpqxm0alrwwmz06mz4i0ks";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "3.1.1";
   };
   http-accept = {
     groups = ["default"];
@@ -117,31 +118,51 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk";
+      sha256 = "0lr2yk5g5vvf9nzlmkn3p7mhh9mn55gpdc7kl2w21xs46fgkjynb";
       type = "gem";
     };
-    version = "1.0.5";
+    version = "1.0.7";
   };
   i18n = {
-    dependencies = ["concurrent-ruby" "racc"];
+    dependencies = ["concurrent-ruby"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1j9zl6ssshkdjdn21lckdhsfkkw1n4wcynqp8n67afa5qps2gmds";
+      sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
       type = "gem";
     };
-    version = "1.14.3";
+    version = "1.14.5";
+  };
+  io-console = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08d2lx42pa8jjav0lcjbzfzmw61b8imxr9041pva8xzqabrczp7h";
+      type = "gem";
+    };
+    version = "0.7.2";
   };
   json = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq";
+      sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q";
       type = "gem";
     };
-    version = "2.7.1";
+    version = "2.7.2";
+  };
+  logger = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
+      type = "gem";
+    };
+    version = "1.6.1";
   };
   mime-types = {
     dependencies = ["mime-types-data"];
@@ -159,30 +180,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455";
+      sha256 = "0d5bmxcq87nj6h5rx6b1fkdzq8256yba97s2vlkszpwhc47m9rfs";
       type = "gem";
     };
-    version = "3.2024.0305";
+    version = "3.2024.0903";
   };
   minitest = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5";
+      sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix";
       type = "gem";
     };
-    version = "5.22.2";
-  };
-  mutex_m = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
-      type = "gem";
-    };
-    version = "0.2.0";
+    version = "5.25.1";
   };
   netrc = {
     groups = ["default"];
@@ -194,15 +205,16 @@
     };
     version = "0.11.0";
   };
-  racc = {
+  reline = {
+    dependencies = ["io-console"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
+      sha256 = "0rl1jmxs7pay58l7lkxkrn6nkdpk52k8rvnfwqsd1swjlxlwjq0n";
       type = "gem";
     };
-    version = "1.7.3";
+    version = "0.5.10";
   };
   require_all = {
     groups = ["default"];
@@ -235,6 +247,16 @@
     };
     version = "1.13.0";
   };
+  securerandom = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q";
+      type = "gem";
+    };
+    version = "0.3.1";
+  };
   tzinfo = {
     dependencies = ["concurrent-ruby"];
     groups = ["default"];
@@ -252,10 +274,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0d1bdyda8l42x8csf4ri2cqcr3xf6pcnv7s1k859rb8ysj7y8aqx";
+      sha256 = "1qy0l0gyhsyz9hdbqdb324l4zlgs78hml1cnp3gx1jl5ndj62znc";
       type = "gem";
     };
-    version = "3.0.0.master.20231229.pre.0.51d41b07";
+    version = "4.0.0";
   };
   vpsfree-client = {
     dependencies = ["vpsadmin-client"];
@@ -263,9 +285,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "038a57avnp4wmfqdya5a6r4a135nh6crzs6nf0khnhdhb9kkjfjg";
+      sha256 = "0cl6r20r7hksd3g6sjqrgi9x21ykbvv170vszf2l06a8ifrrqlk7";
       type = "gem";
     };
-    version = "0.18.0";
+    version = "0.19.0";
   };
 }