From c1b59d5e62d9b466f62cfaec655647089bd853c1 Mon Sep 17 00:00:00 2001
From: Aleksi Hannula <ahannula4+nixgit@gmail.com>
Date: Thu, 13 Aug 2026 07:33:56 +0300
Subject: [PATCH 01/78] minimal-bootstrap.stage0-posix: add more platforms

---
 .../linux/minimal-bootstrap/stage0-posix/hex0.nix   |  1 +
 .../stage0-posix/mescc-tools-boot.nix               | 13 ++++++++++++-
 .../minimal-bootstrap/stage0-posix/platforms.nix    |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix
index d6d509851d4d..738989e3686d 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/hex0.nix
@@ -14,6 +14,7 @@ let
       "AArch64" = "sha256-XTPsoKeI6wTZAF0UwEJPzuHelWOJe//wXg4HYO0dEJo=";
       "AMD64" = "sha256-DCzZduYrix9yOeJoem/Jhz/WDzAss7UWwjZbkXJq6Ms=";
       "x86" = "sha256-DFmSpy4EYoKBSuPQRqtTsUfIUjlg794PnMrEg5stOFY=";
+      "riscv64" = "sha256-BMgaiXD8bnxOTHal4RlmYKItuWUcDIwSrRuPVAnm/BE=";
     }
     .${stage0Arch} or (throw "Unsupported system: ${hostPlatform.system}");
 
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools-boot.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools-boot.nix
index 1c4360d67025..853693d0fff4 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools-boot.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/mescc-tools-boot.nix
@@ -132,8 +132,19 @@ rec {
   # Phase-4 Build cc_arch from M0 #
   ################################
 
+  cc_arch_src =
+    if hostPlatform.isRiscV then
+      # See e.g. https://github.com/oriansj/stage0-posix-riscv64/blob/4688bc66bdfd00efd5964350c9d76bdb90a0f72e/mescc-tools-mini-kaem.kaem#L54
+      run "cc_arch_riscv_c" catm [
+        out
+        "${src}/${stage0Arch}/${m2libcArch}_defs.M1"
+        "${src}/${stage0Arch}/cc_${m2libcArch}.M1"
+      ]
+    else
+      "${src}/${stage0Arch}/cc_${m2libcArch}.M1";
+
   cc_arch-0_hex2 = run "cc_arch-0.hex2" M0 [
-    "${src}/${stage0Arch}/cc_${m2libcArch}.M1"
+    "${cc_arch_src}"
     out
   ];
   cc_arch-1_hex2 = run "cc_arch-1.hex2" catm [
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/platforms.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/platforms.nix
index 15a84ad5d568..c1b016ffb456 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/platforms.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/platforms.nix
@@ -10,6 +10,7 @@ rec {
     "aarch64-linux"
     "i686-linux"
     "x86_64-linux"
+    "riscv64-linux"
   ];
 
   # system arch as used within the stage0 project
@@ -18,6 +19,7 @@ rec {
       "aarch64-linux" = "AArch64";
       "i686-linux" = "x86";
       "x86_64-linux" = "AMD64";
+      "riscv64-linux" = "riscv64";
     }
     .${hostPlatform.system} or (throw "Unsupported system: ${hostPlatform.system}");
 
@@ -33,6 +35,7 @@ rec {
       "aarch64-linux" = "0x00600000";
       "i686-linux" = "0x08048000";
       "x86_64-linux" = "0x00600000";
+      "riscv64-linux" = "0x00600000";
     }
     .${hostPlatform.system} or (throw "Unsupported system: ${hostPlatform.system}");
 }

From 9129d8bf6fb5971b8a946a0170c3197981ded432 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sun, 30 Aug 2026 21:42:12 +0700
Subject: [PATCH 02/78] tmuxPlugins: fix invalid unstable version scheme

As part of https://github.com/NixOS/nixpkgs/issues/541820
---
 pkgs/misc/tmux-plugins/default.nix | 62 +++++++++++++++---------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 4bfefe112979..93c3927a02ba 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -95,7 +95,7 @@ in
 
   better-mouse-mode = mkTmuxPlugin {
     pluginName = "better-mouse-mode";
-    version = "unstable-2021-08-02";
+    version = "0-unstable-2017-10-16";
     src = fetchFromGitHub {
       owner = "NHDaly";
       repo = "tmux-better-mouse-mode";
@@ -142,7 +142,7 @@ in
 
   continuum = mkTmuxPlugin {
     pluginName = "continuum";
-    version = "unstable-2022-01-25";
+    version = "3.1.0-unstable-2022-01-25";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-continuum";
@@ -196,7 +196,7 @@ in
 
   copycat = mkTmuxPlugin {
     pluginName = "copycat";
-    version = "unstable-2020-01-09";
+    version = "3.0.0-unstable-2020-01-09";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-copycat";
@@ -210,7 +210,7 @@ in
 
   cpu = mkTmuxPlugin {
     pluginName = "cpu";
-    version = "unstable-2023-01-06";
+    version = "0-unstable-2023-01-06";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-cpu";
@@ -321,7 +321,7 @@ in
 
   fpp = mkTmuxPlugin {
     pluginName = "fpp";
-    version = "unstable-2016-03-08";
+    version = "0-unstable-2016-03-08";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-fpp";
@@ -338,7 +338,7 @@ in
 
   fuzzback = mkTmuxPlugin {
     pluginName = "fuzzback";
-    version = "unstable-2022-11-21";
+    version = "0-unstable-2022-11-21";
     src = fetchFromGitHub {
       owner = "roosta";
       repo = "tmux-fuzzback";
@@ -373,7 +373,7 @@ in
   fzf-tmux-url = mkTmuxPlugin {
     pluginName = "fzf-tmux-url";
     rtpFilePath = "fzf-url.tmux";
-    version = "unstable-2024-04-14";
+    version = "0-unstable-2024-04-14";
     src = fetchFromGitHub {
       owner = "wfxr";
       repo = "tmux-fzf-url";
@@ -507,7 +507,7 @@ in
 
   logging = mkTmuxPlugin {
     pluginName = "logging";
-    version = "unstable-2019-04-19";
+    version = "2.1.0-unstable-2019-04-19";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-logging";
@@ -548,7 +548,7 @@ in
 
   mode-indicator = mkTmuxPlugin {
     pluginName = "mode-indicator";
-    version = "unstable-2021-10-01";
+    version = "0-unstable-2021-10-01";
     src = fetchFromGitHub {
       owner = "MunifTanjim";
       repo = "tmux-mode-indicator";
@@ -566,7 +566,7 @@ in
 
   net-speed = mkTmuxPlugin {
     pluginName = "net-speed";
-    version = "unstable-2018-12-02";
+    version = "0.3-unstable-2018-12-02";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-net-speed";
@@ -604,7 +604,7 @@ in
 
   maildir-counter = mkTmuxPlugin {
     pluginName = "maildir-counter";
-    version = "unstable-2016-11-25";
+    version = "0-unstable-2016-11-25";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-maildir-counter";
@@ -618,7 +618,7 @@ in
 
   online-status = mkTmuxPlugin {
     pluginName = "online-status";
-    version = "unstable-2018-11-30";
+    version = "1.0.0-unstable-2017-12-14";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-online-status";
@@ -632,7 +632,7 @@ in
 
   open = mkTmuxPlugin {
     pluginName = "open";
-    version = "unstable-2019-12-02";
+    version = "3.0.0-unstable-2019-12-02";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-open";
@@ -647,7 +647,7 @@ in
   onedark-theme = mkTmuxPlugin {
     pluginName = "onedark-theme";
     rtpFilePath = "tmux-onedark-theme.tmux";
-    version = "unstable-2020-06-07";
+    version = "0-unstable-2020-02-25";
     src = fetchFromGitHub {
       owner = "odedlaz";
       repo = "tmux-onedark-theme";
@@ -661,7 +661,7 @@ in
 
   pain-control = mkTmuxPlugin {
     pluginName = "pain-control";
-    version = "unstable-2020-02-18";
+    version = "1.0.0-unstable-2020-02-18";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-pain-control";
@@ -732,7 +732,7 @@ in
   power-theme = mkTmuxPlugin {
     pluginName = "power";
     rtpFilePath = "tmux-power.tmux";
-    version = "unstable-2024-05-12";
+    version = "1.0-unstable-2024-04-14";
     src = pkgs.fetchFromGitHub {
       owner = "wfxr";
       repo = "tmux-power";
@@ -749,7 +749,7 @@ in
 
   prefix-highlight = mkTmuxPlugin {
     pluginName = "prefix-highlight";
-    version = "unstable-2021-03-30";
+    version = "0-unstable-2021-03-30";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-prefix-highlight";
@@ -763,7 +763,7 @@ in
 
   resurrect = mkTmuxPlugin {
     pluginName = "resurrect";
-    version = "unstable-2022-05-01";
+    version = "4.0.0-unstable-2022-05-01";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-resurrect";
@@ -800,7 +800,7 @@ in
 
   rose-pine = mkTmuxPlugin {
     pluginName = "rose-pine";
-    version = "unstable-2024-01-08";
+    version = "0-unstable-2024-01-08";
     rtpFilePath = "rose-pine.tmux";
     src = fetchFromGitHub {
       owner = "rose-pine";
@@ -853,7 +853,7 @@ in
 
   sensible = mkTmuxPlugin {
     pluginName = "sensible";
-    version = "unstable-2022-08-14";
+    version = "3.0.0-unstable-2022-08-14";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-sensible";
@@ -914,7 +914,7 @@ in
 
   sessionist = mkTmuxPlugin {
     pluginName = "sessionist";
-    version = "unstable-2023-05-02";
+    version = "2.3.0-unstable-2023-05-02";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-sessionist";
@@ -928,7 +928,7 @@ in
 
   sidebar = mkTmuxPlugin {
     pluginName = "sidebar";
-    version = "unstable-2018-11-30";
+    version = "0.7.0-unstable-2018-11-30";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-sidebar";
@@ -942,7 +942,7 @@ in
 
   sysstat = mkTmuxPlugin {
     pluginName = "sysstat";
-    version = "unstable-2017-12-12";
+    version = "0-unstable-2017-12-12";
     src = fetchFromGitHub {
       owner = "samoshkin";
       repo = "tmux-plugin-sysstat";
@@ -956,7 +956,7 @@ in
 
   tilish = mkTmuxPlugin {
     pluginName = "tilish";
-    version = "unstable-2023-09-20";
+    version = "0-unstable-2023-09-20";
     src = fetchFromGitHub {
       owner = "jabirali";
       repo = "tmux-tilish";
@@ -994,7 +994,7 @@ in
 
   tmux-colors-solarized = mkTmuxPlugin {
     pluginName = "tmuxcolors";
-    version = "unstable-2019-07-14";
+    version = "0-unstable-2019-07-14";
     src = fetchFromGitHub {
       owner = "seebi";
       repo = "tmux-colors-solarized";
@@ -1029,7 +1029,7 @@ in
   tmux-fzf = mkTmuxPlugin {
     pluginName = "tmux-fzf";
     rtpFilePath = "main.tmux";
-    version = "unstable-2025-09-24";
+    version = "0-unstable-2025-09-24";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "tmux-fzf";
@@ -1238,7 +1238,7 @@ in
 
   urlview = mkTmuxPlugin {
     pluginName = "urlview";
-    version = "unstable-2016-01-06";
+    version = "0-unstable-2016-01-06";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-urlview";
@@ -1255,7 +1255,7 @@ in
 
   vim-tmux-focus-events = mkTmuxPlugin {
     pluginName = "vim-tmux-focus-events";
-    version = "unstable-2020-10-05";
+    version = "1.0.0-unstable-2020-10-05";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "vim-tmux-focus-events";
@@ -1275,7 +1275,7 @@ in
   vim-tmux-navigator = mkTmuxPlugin {
     pluginName = "vim-tmux-navigator";
     rtpFilePath = "vim-tmux-navigator.tmux";
-    version = "unstable-2025-07-15";
+    version = "1.0-unstable-2025-07-15";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-tmux-navigator";
@@ -1290,7 +1290,7 @@ in
   weather = mkTmuxPlugin {
     pluginName = "weather";
     rtpFilePath = "tmux-weather.tmux";
-    version = "unstable-2020-02-08";
+    version = "0-unstable-2020-02-08";
     src = fetchFromGitHub {
       owner = "xamut";
       repo = "tmux-weather";
@@ -1313,7 +1313,7 @@ in
 
   yank = mkTmuxPlugin {
     pluginName = "yank";
-    version = "unstable-2023-07-19";
+    version = "2.3.0-unstable-2023-07-19";
     src = fetchFromGitHub {
       owner = "tmux-plugins";
       repo = "tmux-yank";

From 332d07adfef10432f6de7a261a3928558d90298e Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Mon, 28 Sep 2026 09:30:48 +0000
Subject: [PATCH 03/78] sqlite3_flutter_libs: only copy CMakeLists.txt for
 versions < 0.6.0

---
 .../package-source-builders/sqlite3_flutter_libs/default.nix   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/dart/package-source-builders/sqlite3_flutter_libs/default.nix b/pkgs/development/compilers/dart/package-source-builders/sqlite3_flutter_libs/default.nix
index 7584e0c1eeae..1a25574fe992 100644
--- a/pkgs/development/compilers/dart/package-source-builders/sqlite3_flutter_libs/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/sqlite3_flutter_libs/default.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   stdenv,
 }:
 
@@ -9,7 +10,7 @@ stdenv.mkDerivation {
   inherit version src;
   inherit (src) passthru;
 
-  postPatch = ''
+  postPatch = lib.optionalString (lib.versionOlder version "0.6.0") ''
     cp ${./CMakeLists.txt} linux/CMakeLists.txt
   '';
 

From 1b921a1d5e2e6ade5816d72f42488e56a50e2329 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Mon, 28 Sep 2026 09:31:01 +0000
Subject: [PATCH 04/78] sqlite3_flutter_libs: add sqlcipher hashes for sqlite3
 3.5.2

---
 .../compilers/dart/package-source-builders/sqlite3/default.nix  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/dart/package-source-builders/sqlite3/default.nix b/pkgs/development/compilers/dart/package-source-builders/sqlite3/default.nix
index dc4860e72d6d..6153ee5d39d2 100644
--- a/pkgs/development/compilers/dart/package-source-builders/sqlite3/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/sqlite3/default.nix
@@ -26,6 +26,8 @@ let
           {
             _3_5_0-aarch64-linux = "sha256-m2Op1KowdxErQ9nFa1+0TIshwjBSdXdrnlsyO4mULos=";
             _3_5_0-x86_64-linux = "sha256-GH+3MhYXTwWD7WmEHzc8wecYcaOcCXsy93UWiEjh6Eo=";
+            _3_5_2-aarch64-linux = "sha256-LMKxM9hJXdCGytVuYSro3iYbMuDwDk6fcqvzVYHD7s0=";
+            _3_5_2-x86_64-linux = "sha256-RdsYQ+ujyR16Ip72A7u2o7uavqtDC72V26pAJAxxOAk=";
           }
           .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version) + "-" + stdenv.hostPlatform.system}
             or (throw ''

From 618d0dffc1ebe0f6c519a12cee4b9655bd32596d Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Mon, 28 Sep 2026 09:31:01 +0000
Subject: [PATCH 05/78] windsend: 1.7.1 -> 1.7.4

---
 pkgs/by-name/wi/windsend/package.nix       |  10 +-
 pkgs/by-name/wi/windsend/pubspec.lock.json | 522 ++++++++++++---------
 2 files changed, 307 insertions(+), 225 deletions(-)

diff --git a/pkgs/by-name/wi/windsend/package.nix b/pkgs/by-name/wi/windsend/package.nix
index 64a130f29ea1..0b1cff751c29 100644
--- a/pkgs/by-name/wi/windsend/package.nix
+++ b/pkgs/by-name/wi/windsend/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  flutter341,
+  flutter344,
   fetchFromGitHub,
   cmake,
   copyDesktopItems,
@@ -13,17 +13,18 @@
   libxrandr,
   libxtst,
   sqlite,
+  wayland-scanner,
 }:
 
-flutter341.buildFlutterApplication (finalAttrs: {
+flutter344.buildFlutterApplication (finalAttrs: {
   pname = "windsend";
-  version = "1.7.1";
+  version = "1.7.4";
 
   src = fetchFromGitHub {
     owner = "doraemonkeys";
     repo = "WindSend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-r3D6Uj8buMceqXov6An+OxgOTcNFrX5PwxhphtbeUv0=";
+    hash = "sha256-nsiCPaJlB6APxnmNMLaognwSrAyaDxPVa4L5Fwr2sKA=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -35,6 +36,7 @@ flutter341.buildFlutterApplication (finalAttrs: {
   nativeBuildInputs = [
     cmake
     copyDesktopItems
+    wayland-scanner
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/wi/windsend/pubspec.lock.json b/pkgs/by-name/wi/windsend/pubspec.lock.json
index 35b4afd3e100..8e52fa97a63f 100644
--- a/pkgs/by-name/wi/windsend/pubspec.lock.json
+++ b/pkgs/by-name/wi/windsend/pubspec.lock.json
@@ -4,41 +4,51 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d",
+        "sha256": "a49d6cf99e8d8e7a8e93668d09ced0bbdb954d0b4fccc2f5f9241c6b87fad95c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "93.0.0"
+      "version": "99.0.0"
     },
     "accessing_security_scoped_resource": {
       "dependency": "transitive",
       "description": {
         "name": "accessing_security_scoped_resource",
-        "sha256": "afb84f50ecca60dda51b93a4d92e9e22776d897b29f280374448ae8877160e75",
+        "sha256": "6539ad51007ab22600d1de2d8049293a2d10b778baa505ac8b68fc4e0ce5e18c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.0"
+      "version": "3.5.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b",
+        "sha256": "663efa951fb8a45e06f491223a604c93820598f20e6a99c25617a1576065e8b7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.1"
+      "version": "12.1.0"
+    },
+    "android_file_picker": {
+      "dependency": "transitive",
+      "description": {
+        "name": "android_file_picker",
+        "sha256": "14ab27769b54c48d5a8a71aa9858372b7a3ae77572ea0a8aee744643c5d8c53d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.0"
     },
     "archive": {
       "dependency": "transitive",
       "description": {
         "name": "archive",
-        "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff",
+        "sha256": "6c5bcd986e06b94e3c40244af471750840a3d2341d1f9763a1100a14add517b4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.9"
+      "version": "4.3.0"
     },
     "args": {
       "dependency": "transitive",
@@ -84,41 +94,41 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "aadd943f4f8cc946882c954c187e6115a84c98c81ad1d9c6cbf0895a8c85da9c",
+        "sha256": "45d14a0fb23e018d8287c32fc98d726ce466b231928ed9b9200f29bd3ccd39ae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.5"
+      "version": "4.0.7"
     },
     "build_config": {
       "dependency": "transitive",
       "description": {
         "name": "build_config",
-        "sha256": "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71",
+        "sha256": "d466ed2dc9c6cd1d169948879b84ee061eb5e22c64a7c6089879c6296d272a8d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.3.3"
     },
     "build_daemon": {
       "dependency": "transitive",
       "description": {
         "name": "build_daemon",
-        "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957",
+        "sha256": "e1d40ef3f7934986d5da2271b1ba07794921ce263e44d622fb6c406d76589e33",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.1"
+      "version": "4.1.6"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "521daf8d189deb79ba474e43a696b41c49fb3987818dbacf3308f1e03673a75e",
+        "sha256": "5367e521935b102bdf1e735d2aab461e36b2edca6517662d088dd04cc39f8d16",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.13.1"
+      "version": "2.15.1"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -134,11 +144,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "0730c18c770d05636a8f945c32a4d7d81cb6e0f0148c8db4ad12e7748f7e49af",
+        "sha256": "f87ea98192116f7093cb214551ce1929caae0681fdba282b3d8b4462adee7bb7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.12.5"
+      "version": "8.13.0"
     },
     "characters": {
       "dependency": "transitive",
@@ -194,11 +204,11 @@
       "dependency": "direct main",
       "description": {
         "name": "clipshare_clipboard_listener",
-        "sha256": "13a48db2ab67740f0f580a452777a1b7a576610930951796571425414871ba27",
+        "sha256": "311af136eef0d275e9e411c72457361079a38d0ad43a50a57f24a27c5ce63251",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.14"
+      "version": "1.3.6"
     },
     "clock": {
       "dependency": "transitive",
@@ -214,21 +224,11 @@
       "dependency": "transitive",
       "description": {
         "name": "code_assets",
-        "sha256": "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687",
+        "sha256": "bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
-    },
-    "code_builder": {
-      "dependency": "transitive",
-      "description": {
-        "name": "code_builder",
-        "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.11.1"
+      "version": "1.2.1"
     },
     "collection": {
       "dependency": "direct main",
@@ -264,21 +264,21 @@
       "dependency": "transitive",
       "description": {
         "name": "coverage",
-        "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d",
+        "sha256": "956a3de0725ca232ad353565a8290d3357592bf4250f6f298a185e2d949c5d3d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.15.1"
     },
     "cross_file": {
       "dependency": "transitive",
       "description": {
         "name": "cross_file",
-        "sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937",
+        "sha256": "f141ea4f277af142a0356955707f6556f37b03947d39d55585981a06ca437bd6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.5+2"
+      "version": "0.3.5+5"
     },
     "crypto": {
       "dependency": "direct main",
@@ -294,21 +294,21 @@
       "dependency": "direct main",
       "description": {
         "name": "cryptography_flutter_plus",
-        "sha256": "35a8c270aae0abaac7125a6b6b33c2b3daa0ea90d85320aa7d588b6dd6c2edc9",
+        "sha256": "daf0914823fc11d4f81044114967163c1d14c0e2517d138d3998ee1559be69de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.4"
+      "version": "3.2.0"
     },
     "cryptography_plus": {
       "dependency": "direct main",
       "description": {
         "name": "cryptography_plus",
-        "sha256": "34db787df4f4740a39474b6fb0a610aa6dc13a5b5b68754b4787a79939ac0454",
+        "sha256": "edf96fc96518368b11bb1ba33b515f59aa5a55b0aa7533c0e1813399cf81130e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.7.1"
+      "version": "3.0.0"
     },
     "cupertino_icons": {
       "dependency": "direct main",
@@ -324,101 +324,101 @@
       "dependency": "direct main",
       "description": {
         "name": "custom_refresh_indicator",
-        "sha256": "c34dd1dfb1f6b9ee2db9c5972586dba5e4445d79f8431f6ab098a6e963ccd39c",
+        "sha256": "4b570ec0b526631b49de22c861a129e04572bbd76c24f0772dbd703a0822b4f3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.1"
+      "version": "4.0.2"
     },
     "dart_style": {
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2",
+        "sha256": "a4c1ccfee44c7e75ed80484071a5c142a385345e658fd8bd7c4b5c97e7198f98",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.7"
+      "version": "3.1.8"
     },
     "dbus": {
       "dependency": "transitive",
       "description": {
         "name": "dbus",
-        "sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270",
+        "sha256": "a48d5da28e89bd02196e80d81ed8d7954923d00a0f4a68cc20b575038f023383",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.12"
+      "version": "0.7.15"
     },
     "device_info_plus": {
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c",
+        "sha256": "0891702f96b2e465fe567b7ec448380e6b1c14f60af552a8536d9f583b6b8442",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.3.0"
+      "version": "13.2.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "device_info_plus_platform_interface",
-        "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
+        "sha256": "04b173a92e2d9161dfead145667037c8d834db725ce2e7b942bfe18fd2f45a46",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.3"
+      "version": "8.1.0"
     },
     "dio": {
       "dependency": "direct main",
       "description": {
         "name": "dio",
-        "sha256": "aff32c08f92787a557dd5c0145ac91536481831a01b4648136373cddb0e64f8c",
+        "sha256": "852ec3b48cc431ac04fff978413c541502b67ffc3e26921e74e3d994694192c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.9.2"
+      "version": "5.11.1"
     },
     "dio_cookie_manager": {
       "dependency": "direct main",
       "description": {
         "name": "dio_cookie_manager",
-        "sha256": "0db1a7b997a0455e488ac35744c68eed3f2a4280d3ab531835a65641b0a08744",
+        "sha256": "4ed4669cacb11931517c1158876a2189f19386674b9dab498abcca063dbe4c61",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.0"
+      "version": "3.5.0"
     },
     "dio_web_adapter": {
       "dependency": "transitive",
       "description": {
         "name": "dio_web_adapter",
-        "sha256": "2f9e64323a7c3c7ef69567d5c800424a11f8337b8b228bad02524c9fb3c1f340",
+        "sha256": "3a1b2cd7be71086f38504956e3ebcd2837288d231ff454bafa78021244102bfc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.2.2"
     },
     "drift": {
       "dependency": "direct main",
       "description": {
         "name": "drift",
-        "sha256": "055c249d1f91be5a47fe447f88afc24c4ca6f4cd6c5ed66767b4797d48acc2e5",
+        "sha256": "bab55d542d63765f6250ee3e2c62e11bfa1145d4ec2ffa05353c8fb4e10b52c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.32.1"
+      "version": "2.34.4"
     },
     "drift_dev": {
       "dependency": "direct dev",
       "description": {
         "name": "drift_dev",
-        "sha256": "88a9de3af8571518148a6d8a513b57779fd1e60a026d3ab8a481a878fba01d91",
+        "sha256": "9cfff1576b49725da0d32c040651a41ae195e8c4af8d8da301593e41d7abc2f7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.32.1"
+      "version": "2.34.0"
     },
     "fake_async": {
       "dependency": "transitive",
@@ -434,11 +434,11 @@
       "dependency": "direct main",
       "description": {
         "name": "fast_file_picker",
-        "sha256": "081ee4c85b25efb4b2a3bb803cb8d669a42127c5afa590f477cca3ab2b44c233",
+        "sha256": "9782502c1cb09d3e6c884d0c7c61f0f2f292cfcf1676d1b8a0b7844129266244",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.8"
+      "version": "1.0.2"
     },
     "ffi": {
       "dependency": "transitive",
@@ -450,6 +450,16 @@
       "source": "hosted",
       "version": "2.2.0"
     },
+    "ffi_leak_tracker": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ffi_leak_tracker",
+        "sha256": "4093d4ef9ca06ffe2786e73bfb25e22aa92112b9bb4ec941f11e3e6b61489a97",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.2"
+    },
     "file": {
       "dependency": "transitive",
       "description": {
@@ -464,14 +474,54 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "57d9a1dd5063f85fa3107fb42d1faffda52fdc948cefd5fe5ea85267a5fc7343",
+        "sha256": "98c0b156b6380ba55bc767a14e2e6b3feb246e713ad40092424596fa79005bea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.3.10"
+      "version": "13.1.0"
+    },
+    "file_picker_darwin": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file_picker_darwin",
+        "sha256": "51aef9f4c80449c736e7cc02198675fda73689f0bd45a84da642cfeab0250d46",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "file_picker_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file_picker_linux",
+        "sha256": "e7db600f50672ce5ebbe422ac0906e0f3d2a476188cc93e7126afee12bf08063",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.0"
+    },
+    "file_picker_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file_picker_platform_interface",
+        "sha256": "bbdc085a6f168e63f147e9ce8988f79fa0800a58e7f25a48f762c60837107ba5",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
+    },
+    "file_picker_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file_picker_web",
+        "sha256": "b3004268da0c1b52baa18df430e7ec4438194de855a807d26b447cbf07ef3496",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
     },
     "file_selector": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "file_selector",
         "sha256": "bd15e43e9268db636b53eeaca9f56324d1622af30e5c34d6e267649758c84d9a",
@@ -484,41 +534,41 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_android",
-        "sha256": "bf7ab65776d7e176280c853679e7742668586ba1663f7f1561e897fadad6c3ba",
+        "sha256": "d670cd0ce77a2e785b18d8b4d0a8d6a222d6a813ec9b7ddf2790a1b4fb6fa92c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.2+5"
+      "version": "0.5.2+11"
     },
     "file_selector_ios": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_ios",
-        "sha256": "e2ecf2885c121691ce13b60db3508f53c01f869fb6e8dc5c1cfa771e4c46aeca",
+        "sha256": "97269e5307a0ab813b1fa2430bada0a96e0afb74848417f8676f64ba5de0051c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.3+5"
+      "version": "0.5.3+6"
     },
     "file_selector_linux": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_linux",
-        "sha256": "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0",
+        "sha256": "da76400e7872ce7637ffdce12749ec24169c25f6195c28372208e65a24bcd2ab",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.4"
+      "version": "0.9.4+1"
     },
     "file_selector_macos": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_macos",
-        "sha256": "5e0bbe9c312416f1787a68259ea1505b52f258c587f12920422671807c4d618a",
+        "sha256": "d57c62362766b5e7ae739448650b66c6aab7a68ba7ecc65e04018652645ae0f4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.5"
+      "version": "0.9.5+1"
     },
     "file_selector_platform_interface": {
       "dependency": "transitive",
@@ -534,21 +584,21 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_web",
-        "sha256": "c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7",
+        "sha256": "73181fbc5257776d8ecaa6a94ab3c8e920ad143b9132a6d984a9271dfc6928d3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.4+2"
+      "version": "0.9.5"
     },
     "file_selector_windows": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_windows",
-        "sha256": "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd",
+        "sha256": "fbefc5fb92c6d3cbe8d284a2cd971b593bb07d2cd6da8557b81a862250b4acec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3+5"
+      "version": "0.9.3+6"
     },
     "fixnum": {
       "dependency": "transitive",
@@ -570,61 +620,61 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_image_compress",
-        "sha256": "51d23be39efc2185e72e290042a0da41aed70b14ef97db362a6b5368d0523b27",
+        "sha256": "98a48c05a7add6869c6838270e862124a4d571f9dd5d0cf209ed03a71b20ea84",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.5.1"
     },
     "flutter_image_compress_common": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_image_compress_common",
-        "sha256": "c5c5d50c15e97dd7dc72ff96bd7077b9f791932f2076c5c5b6c43f2c88607bfb",
+        "sha256": "76869e4d5f3d65f3431e7edff0b2d8ad1eea68b49c6a37772fdb1ae6016da9ed",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.6"
+      "version": "1.1.1"
     },
     "flutter_image_compress_macos": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_image_compress_macos",
-        "sha256": "20019719b71b743aba0ef874ed29c50747461e5e8438980dfa5c2031898f7337",
+        "sha256": "0d2a842d2e544828fb32bda16dcfccb3149107df568898a4936d78232e486847",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.3"
+      "version": "1.1.0"
     },
     "flutter_image_compress_ohos": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_image_compress_ohos",
-        "sha256": "e76b92bbc830ee08f5b05962fc78a532011fcd2041f620b5400a593e96da3f51",
+        "sha256": "1491bb7bcfdf59e3b127c263c116cfbf8ed3afade6e7fa691d9622e838ed7e48",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.0.3"
+      "version": "0.0.3+1"
     },
     "flutter_image_compress_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_image_compress_platform_interface",
-        "sha256": "579cb3947fd4309103afe6442a01ca01e1e6f93dc53bb4cbd090e8ce34a41889",
+        "sha256": "bbefb7967bda565004fdabdb3300dcbfb40c7ef8402675d23206e5bddc358178",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.5"
+      "version": "1.1.0"
     },
     "flutter_image_compress_web": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_image_compress_web",
-        "sha256": "b9b141ac7c686a2ce7bb9a98176321e1182c9074650e47bb140741a44b6f5a96",
+        "sha256": "91cc58e091a1e09c7683d216d579e2b964119a8527fc43b64dfdb00f1acc94ec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.5"
+      "version": "0.1.5+1"
     },
     "flutter_lints": {
       "dependency": "direct dev",
@@ -640,11 +690,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_localization",
-        "sha256": "578a73455a0deffc4169ef9372ba0562a3e2cff563e5c524ea87bc96daa519c0",
+        "sha256": "5689348dd0cc265c0400593563450c08d21953b98288cb4bbe76a30a81d79795",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.3"
+      "version": "0.4.1"
     },
     "flutter_localizations": {
       "dependency": "transitive",
@@ -652,16 +702,6 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "flutter_plugin_android_lifecycle": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_plugin_android_lifecycle",
-        "sha256": "38d1c268de9097ff59cf0e844ac38759fc78f76836d37edad06fa21e182055a0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.34"
-    },
     "flutter_test": {
       "dependency": "direct dev",
       "description": "flutter",
@@ -678,11 +718,11 @@
       "dependency": "direct main",
       "description": {
         "name": "fluttertoast",
-        "sha256": "144ddd74d49c865eba47abe31cbc746c7b311c82d6c32e571fd73c4264b740e2",
+        "sha256": "7903c9d5339173497bfecbc23bc4212f5a87e0edfac2e1693fb74465ea67da7e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.0.0"
+      "version": "9.1.0"
     },
     "frontend_server_client": {
       "dependency": "transitive",
@@ -698,11 +738,11 @@
       "dependency": "transitive",
       "description": {
         "name": "glob",
-        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
+        "sha256": "218aeb56050c714f62a3182775320dfa04602b55074873e24e31bbd39bda96fb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.2.0"
     },
     "graphs": {
       "dependency": "transitive",
@@ -718,11 +758,11 @@
       "dependency": "transitive",
       "description": {
         "name": "hooks",
-        "sha256": "e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388",
+        "sha256": "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.2"
+      "version": "2.0.2"
     },
     "http": {
       "dependency": "transitive",
@@ -758,21 +798,21 @@
       "dependency": "direct main",
       "description": {
         "name": "image",
-        "sha256": "f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce",
+        "sha256": "a1e7f4951e538a568e14b856702afc9ae1d2f4b202daced8d22c1b9cd211ce89",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.8.0"
+      "version": "4.10.1"
     },
     "image_gallery_saver_plus": {
       "dependency": "direct main",
       "description": {
         "name": "image_gallery_saver_plus",
-        "sha256": "199b9e24f8d85e98f11e3d35571ab68ae50626ad40e2bb85c84383f69a6950ad",
+        "sha256": "598beaaade0ead242416a6ef85883bb8f7f1c18f523c531c06c586a4688bd34a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.1"
+      "version": "5.1.1"
     },
     "intl": {
       "dependency": "direct main",
@@ -788,21 +828,21 @@
       "dependency": "transitive",
       "description": {
         "name": "io",
-        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
+        "sha256": "2635216ca6a737e60de577ffa1a48a0bec76ca8a62917cfc1bb88c14c570646f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.5"
+      "version": "1.1.0"
     },
     "ios_document_picker": {
       "dependency": "transitive",
       "description": {
         "name": "ios_document_picker",
-        "sha256": "d7cbc61366602f6fd74a5bfeeecf68ad553ef91a6b1bb6d406dd7808d694d5c4",
+        "sha256": "a26b450d6a868a7f737d6e7fd9eaf68200a7d867d624eae9fbc2670103e64ff0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.0"
+      "version": "1.0.0"
     },
     "irondash_engine_context": {
       "dependency": "transitive",
@@ -824,25 +864,45 @@
       "source": "hosted",
       "version": "0.7.0"
     },
-    "js": {
+    "jni": {
       "dependency": "transitive",
       "description": {
-        "name": "js",
-        "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
+        "name": "jni",
+        "sha256": "f038e58b4dc2c9037f50e233175086337e0b305e356d28211bf55f21c504cbd3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.2"
+      "version": "1.0.3"
+    },
+    "jni_flutter": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni_flutter",
+        "sha256": "b2310cdd4c18c65c081ab141a41efa94aa26c65431803703ece51996f174f351",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.3"
+    },
+    "jni_util": {
+      "dependency": "transitive",
+      "description": {
+        "name": "jni_util",
+        "sha256": "1ba86da04a5f2bf18fde2edb235587e70c5b0fc5bd4ba955f46b00942c3fc35f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
     },
     "json_annotation": {
       "dependency": "transitive",
       "description": {
         "name": "json_annotation",
-        "sha256": "cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8",
+        "sha256": "2a743920d81b7910627f68ee2c9ac1fc0bfee32b9fc3403587d7c6791ca12f80",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.11.0"
+      "version": "4.12.0"
     },
     "leak_tracker": {
       "dependency": "transitive",
@@ -898,11 +958,11 @@
       "dependency": "direct main",
       "description": {
         "name": "logger",
-        "sha256": "25aee487596a6257655a1e091ec2ae66bc30e7af663592cc3a27e6591e05035c",
+        "sha256": "2a0dc097e7b01d942475bdd552356db2d0f768b05540bd4b2b53f1840f2239a7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.7.0"
+      "version": "2.8.0"
     },
     "logging": {
       "dependency": "transitive",
@@ -918,11 +978,11 @@
       "dependency": "transitive",
       "description": {
         "name": "macos_file_picker",
-        "sha256": "04c60122609e619ddb440da5c744a36f88a719f157e47a69d06e4be4ca6d1966",
+        "sha256": "03914a61dc2d922ff6e4fe4a211136f4ace83da3229473973dac09c7acffee13",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.2"
+      "version": "0.7.3"
     },
     "matcher": {
       "dependency": "transitive",
@@ -959,51 +1019,51 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
+        "sha256": "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.17.0"
+      "version": "1.18.0"
     },
     "mime": {
       "dependency": "transitive",
       "description": {
         "name": "mime",
-        "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
+        "sha256": "bd47de35f07e27267e69c8c8b22edf9473bfee170a60d60fcc93730c5144b7f6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "2.1.0"
     },
     "native_toolchain_c": {
       "dependency": "transitive",
       "description": {
         "name": "native_toolchain_c",
-        "sha256": "6ba77bb18063eebe9de401f5e6437e95e1438af0a87a3a39084fbd37c90df572",
+        "sha256": "f9c168717100ae6d9fee9ffb0be379bf1f8b26b0f6bcbd4fdddcd931993a6a72",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.17.6"
+      "version": "0.19.2"
     },
     "network_info_plus": {
       "dependency": "direct main",
       "description": {
         "name": "network_info_plus",
-        "sha256": "2866dadcbee2709e20d67737a1556f5675b8b0cdcf2c1659ba74bc21bffede4f",
+        "sha256": "096a700e2321507e2e587487a442b9baa7ba6cd4e70e3cc1ebbb8327d2632c2d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.0"
+      "version": "8.2.1"
     },
     "network_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "network_info_plus_platform_interface",
-        "sha256": "7e7496a8a9d8136859b8881affc613c4a21304afeb6c324bcefc4bd0aff6b94b",
+        "sha256": "210b58064bc08e04b3a2b608f1f999cf768871fbd531961dc33a91720869d182",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.2"
+      "version": "3.1.0"
     },
     "nm": {
       "dependency": "transitive",
@@ -1029,11 +1089,11 @@
       "dependency": "transitive",
       "description": {
         "name": "objective_c",
-        "sha256": "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52",
+        "sha256": "b7fb95a6d9a4f009edd63dc5ac69f07420b23a16161c6dd8660290b59c602e8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.3.0"
+      "version": "9.5.0"
     },
     "open_filex": {
       "dependency": "direct main",
@@ -1070,21 +1130,21 @@
       "dependency": "direct main",
       "description": {
         "name": "path_provider",
-        "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
+        "sha256": "a7f4874f987173da295a61c181b8ee71dab59b332a486b391babf26a1b884825",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.1.6"
     },
     "path_provider_android": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "149441ca6e4f38193b2e004c0ca6376a3d11f51fa5a77552d8bd4d2b0c0912ba",
+        "sha256": "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.23"
+      "version": "2.3.1"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -1100,21 +1160,21 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_linux",
-        "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
+        "sha256": "58c2005f147315b11e9b4a7bc889cd5203e250cba8e3f012dae259b4972b5c16",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.1"
+      "version": "2.2.2"
     },
     "path_provider_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_platform_interface",
-        "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
+        "sha256": "484838772624c3a4b94f1e44a3e19897fee738f2d5c4ce448443b0417f7c9dda",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
     },
     "path_provider_windows": {
       "dependency": "transitive",
@@ -1130,11 +1190,11 @@
       "dependency": "direct main",
       "description": {
         "name": "permission_handler",
-        "sha256": "bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1",
+        "sha256": "fe54465bcc62a4564c6e4db337bbaded6c0c0fa6e10487414436d163114784f6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.0.1"
+      "version": "12.0.3"
     },
     "permission_handler_android": {
       "dependency": "transitive",
@@ -1150,41 +1210,41 @@
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_apple",
-        "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023",
+        "sha256": "066bbbc60031b63b916a3871e7bb4b6a8c5e7cec8146dafec53d1da304eff0a5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.4.7"
+      "version": "9.6.2"
     },
     "permission_handler_html": {
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_html",
-        "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24",
+        "sha256": "6ea98b3f17f60d3b527f2647ed2ab4dc0f6bfe25b22cb1c363f5d8f62252f6ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.3+5"
+      "version": "0.1.4+1"
     },
     "permission_handler_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_platform_interface",
-        "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878",
+        "sha256": "ed86a61c190258fdd65de395ea0632822e3415c1faec38eae0c31b479c28a531",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.3.0"
+      "version": "4.4.1"
     },
     "permission_handler_windows": {
       "dependency": "transitive",
       "description": {
         "name": "permission_handler_windows",
-        "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e",
+        "sha256": "caeae01858a0a7d2df67a445ac98e1ad95e55a0e77c73044f4e9b1c8c2289cbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1"
+      "version": "0.2.2"
     },
     "petitparser": {
       "dependency": "transitive",
@@ -1210,11 +1270,11 @@
       "dependency": "transitive",
       "description": {
         "name": "platform",
-        "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
+        "sha256": "a36d119c13416516a7b5913fbe8af8531e11633d784c550b2125f76c758524ec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.6"
+      "version": "3.2.0"
     },
     "plugin_platform_interface": {
       "dependency": "transitive",
@@ -1240,41 +1300,41 @@
       "dependency": "transitive",
       "description": {
         "name": "pool",
-        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
+        "sha256": "4177f68c237ea2128d1bee66ac17b2ce05ba3dbaafcbdd54c5d40a39d0b6b11c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.2"
+      "version": "1.5.3"
     },
     "posix": {
       "dependency": "transitive",
       "description": {
         "name": "posix",
-        "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07",
+        "sha256": "bc1bad54ad2b735816e31f8d4600cfde6c7839975085ddfbca48b6c9f7c4044e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.5.0"
+      "version": "6.5.2"
     },
     "pub_semver": {
       "dependency": "transitive",
       "description": {
         "name": "pub_semver",
-        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
+        "sha256": "261236774e8b1d69cfc6b9eabbc96c40f25e7a2d6b171f3385d4f65d5734fb24",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.0"
+      "version": "2.2.1"
     },
     "pubspec_parse": {
       "dependency": "transitive",
       "description": {
         "name": "pubspec_parse",
-        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
+        "sha256": "c38b81cbf34450b67e0265d73433569d12e34782e30ed769c9cc99c9d5f2e796",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.0"
+      "version": "1.6.0"
     },
     "recase": {
       "dependency": "transitive",
@@ -1286,25 +1346,35 @@
       "source": "hosted",
       "version": "4.1.0"
     },
+    "record_use": {
+      "dependency": "transitive",
+      "description": {
+        "name": "record_use",
+        "sha256": "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.0"
+    },
     "saf_stream": {
       "dependency": "direct main",
       "description": {
         "name": "saf_stream",
-        "sha256": "c05449997698c481a03e428162a999f93b1ee1bcc0349d651899a59f7b10230a",
+        "sha256": "3f740a4bb8411100d2b6b209e9cbbc3e711f4992d5af2c1513d9f047f2162620",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.3"
+      "version": "4.0.1"
     },
     "saf_util": {
       "dependency": "direct main",
       "description": {
         "name": "saf_util",
-        "sha256": "219f983e5f17b28998335158cdc97add9d52af9884e38b5a43f10dcc070510ec",
+        "sha256": "35cd99ec282f9fc68ec0fb35338315a7198250f8ff0d24006f8507a6aae3d344",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.11.0"
+      "version": "3.1.0"
     },
     "share_handler": {
       "dependency": "direct main",
@@ -1351,21 +1421,21 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840",
+        "sha256": "34f00f9becd2743c1fb05363d624f9f70d37f7ccdcdda47450bc0b8c9d327b8c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "12.0.1"
+      "version": "13.3.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "share_plus_platform_interface",
-        "sha256": "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a",
+        "sha256": "365ef7379fc22507256adda3385152942ffce08935452bc972c2e52a0bebae41",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.0"
+      "version": "7.2.0"
     },
     "shared_preferences": {
       "dependency": "direct main",
@@ -1381,21 +1451,21 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "e8d4762b1e2e8578fc4d0fd548cebf24afd24f49719c08974df92834565e2c53",
+        "sha256": "1e12aafe408aa50da80edfd679a2a6bf63ba7ab37c7fa98286da459a757b3399",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.23"
+      "version": "2.4.28"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_foundation",
-        "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f",
+        "sha256": "2ec3934efa51e46117f23031cc141b8fc878e8525b94ec1ea4f7f586cf1b47ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.6"
+      "version": "2.5.7"
     },
     "shared_preferences_linux": {
       "dependency": "transitive",
@@ -1487,11 +1557,11 @@
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "732792cfd197d2161a65bb029606a46e0a18ff30ef9e141a7a82172b05ea8ecd",
+        "sha256": "a603f1fb984a7391ae5978d1b92bfaaa08b350dca5c825256f925818f7943bf5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.2"
+      "version": "4.2.4"
     },
     "source_map_stack_trace": {
       "dependency": "transitive",
@@ -1507,11 +1577,11 @@
       "dependency": "transitive",
       "description": {
         "name": "source_maps",
-        "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
+        "sha256": "14c2945847669b44089bb1222f66873d7ff7103c58911917f2a63c5a62327898",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.10.13"
+      "version": "0.10.14"
     },
     "source_span": {
       "dependency": "transitive",
@@ -1527,31 +1597,31 @@
       "dependency": "transitive",
       "description": {
         "name": "sqlite3",
-        "sha256": "caa693ad15a587a2b4fde093b728131a1827903872171089dedb16f7665d3a91",
+        "sha256": "4c7fe79840389aaeaf05fd093f795b631b5a98e2bd28d54e555c100f4a9c7a1c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.0"
+      "version": "3.5.2"
     },
     "sqlite3_flutter_libs": {
       "dependency": "direct main",
       "description": {
         "name": "sqlite3_flutter_libs",
-        "sha256": "eeb9e3a45207649076b808f8a5a74d68770d0b7f26ccef6d5f43106eee5375ad",
+        "sha256": "3ed7553eee7bb368f8950f58ba29f634e06e813c029aff6a0d60862b96de8454",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.42"
+      "version": "0.6.0+eol"
     },
     "sqlparser": {
       "dependency": "transitive",
       "description": {
         "name": "sqlparser",
-        "sha256": "ab2b467425f1d4f3acfa5fd11a08226f7d6c26ff102c06be1807e1dff34e050b",
+        "sha256": "40bdddb306a727be9ce510bd2d2b9a6c9db6c586d846ef7b22e3990a2b24f02d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.44.3"
+      "version": "0.44.5"
     },
     "stack_trace": {
       "dependency": "transitive",
@@ -1577,11 +1647,11 @@
       "dependency": "transitive",
       "description": {
         "name": "stream_transform",
-        "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
+        "sha256": "a00e5f18bffc764f923e7dec1038527f7fe7a1791361a7117f0358193f13d53a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "string_scanner": {
       "dependency": "transitive",
@@ -1627,31 +1697,31 @@
       "dependency": "direct dev",
       "description": {
         "name": "test",
-        "sha256": "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7",
+        "sha256": "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.30.0"
+      "version": "1.31.0"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a",
+        "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.10"
+      "version": "0.7.11"
     },
     "test_core": {
       "dependency": "transitive",
       "description": {
         "name": "test_core",
-        "sha256": "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51",
+        "sha256": "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.16"
+      "version": "0.6.17"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -1697,41 +1767,41 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "3bb000251e55d4a209aa0e2e563309dc9bb2befea2295fd0cec1f51760aac572",
+        "sha256": "611e87fb320b70d1dd721dc46af89c98aceccea9b31fde49e084591414e0c610",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.29"
+      "version": "6.3.33"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0",
+        "sha256": "8faa1aab294f1ab4040b43660c887b0418d5fa4f0cffef76a484e6aa1092eb4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.4.1"
+      "version": "6.4.2"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_linux",
-        "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a",
+        "sha256": "10f86fef4c2c43563fa6c211ff9cf757adf4d3ab762c56bd430664a947d70cd0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.2"
+      "version": "3.2.3"
     },
     "url_launcher_macos": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18",
+        "sha256": "5e835a3b869c2d70325349c81c5a45c28e20791265b67b2669da6b08c5cd5201",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.5"
+      "version": "3.2.6"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -1747,31 +1817,31 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f",
+        "sha256": "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_windows",
-        "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f",
+        "sha256": "6c5ad3f22cd4c38e089b81963b3cd7bb83b111b2df5dce008bb066162f42e429",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.5"
+      "version": "3.1.6"
     },
     "uuid": {
       "dependency": "transitive",
       "description": {
         "name": "uuid",
-        "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489",
+        "sha256": "9b129329f58692f6e6578329498a8fe9fbe98f090beb764ffbb8ee2eadd01dcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.3"
+      "version": "4.6.0"
     },
     "vector_math": {
       "dependency": "transitive",
@@ -1787,11 +1857,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
+        "sha256": "5f37239c4851efcef929cea7824e76df7f2f0970aef85d66bbc430afa40e72f0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.2"
+      "version": "15.3.0"
     },
     "watcher": {
       "dependency": "transitive",
@@ -1847,21 +1917,31 @@
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
+        "sha256": "a0b93865d5644f11cf6a8c3f6db909f1ec168958b5805f6cc684adea957cd63d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.15.0"
+      "version": "6.4.0"
     },
     "win32_registry": {
       "dependency": "transitive",
       "description": {
         "name": "win32_registry",
-        "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae",
+        "sha256": "73b1d78920a9d6e03f8b4e43e612b87bf3152a0e5c5e5150267762b7c4116904",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "3.0.3"
+    },
+    "windows_file_picker": {
+      "dependency": "transitive",
+      "description": {
+        "name": "windows_file_picker",
+        "sha256": "9f3aa833068b09e380fdc59560ad260a4a14e9397173abb533699f967443602e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.0"
     },
     "xdg_directories": {
       "dependency": "transitive",
@@ -1877,25 +1957,25 @@
       "dependency": "transitive",
       "description": {
         "name": "xml",
-        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
+        "sha256": "67f0aff7be013d107995e9b75bf4e7f2c3ef2dfdb2c8e68024bba0a7fd5756a4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.6.1"
+      "version": "7.0.1"
     },
     "yaml": {
       "dependency": "transitive",
       "description": {
         "name": "yaml",
-        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
+        "sha256": "f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.3"
+      "version": "3.1.4"
     }
   },
   "sdks": {
-    "dart": ">=3.10.3 <4.0.0",
-    "flutter": ">=3.38.4"
+    "dart": ">=3.12.0 <4.0.0",
+    "flutter": ">=3.44.0"
   }
 }

From c3c0a36e6272b94e46a63ddb9d79fd15cf726b24 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Wed, 30 Sep 2026 06:00:43 -0700
Subject: [PATCH 06/78] breezy: avoid runtime dependency on build-time python
 packages

Embedding the build-time PYTHONPATH into the output binary adds
unnecessary references to build-time tools, especially gcc-wrapper.

This is especially painful for setuptools-rust, which pulls in the
entire gcc-wrapper transitively.

Instead, breezy should embed the runtime `dependencies` attributes,
using the established buildPythonPath pattern.

Output closure size: 690.77 MiB -> 328.48 MiB
---
 pkgs/development/python-modules/breezy/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix
index a02f3d322980..396766f72055 100644
--- a/pkgs/development/python-modules/breezy/default.nix
+++ b/pkgs/development/python-modules/breezy/default.nix
@@ -94,7 +94,8 @@ buildPythonPackage rec {
   '';
 
   postInstall = ''
-    wrapProgram $out/bin/brz --prefix PYTHONPATH : "$PYTHONPATH"
+    buildPythonPath "$out ${toString dependencies}"
+    wrapProgram $out/bin/brz --prefix PYTHONPATH : "$program_PYTHONPATH"
 
     # symlink for bazaar compatibility
     ln -s "$out/bin/brz" "$out/bin/bzr"

From a4d659bd9627e09bee2e38b1e394ea7b7410b133 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Thu, 8 Oct 2026 23:30:10 +0200
Subject: [PATCH 07/78] python3Packages.imagededup: 03.3 -> 0.3.3.post2

https://github.com/idealo/imagededup/releases/tag/v0.3.3.post2

Fixes the build: the old upstream tag v03.3 was a typo, so the derivation
version did not match the 0.3.3 in the package metadata.

The new pyproject-based build would install the docs generator as a
top-level `mkdocs` package, so exclude it. Disable test_import_defaults,
which deletes the preloaded MobileNet checkpoint.

Assisted-by: claude-opus-5-5
---
 .../python-modules/imagededup/default.nix         | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/imagededup/default.nix b/pkgs/development/python-modules/imagededup/default.nix
index 715c42c2170d..4ec51494bc37 100644
--- a/pkgs/development/python-modules/imagededup/default.nix
+++ b/pkgs/development/python-modules/imagededup/default.nix
@@ -31,16 +31,22 @@ let
 in
 buildPythonPackage rec {
   pname = "imagededup";
-  version = "03.3";
+  version = "0.3.3.post2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "idealo";
     repo = "imagededup";
     tag = "v${version}";
-    hash = "sha256-tm6WGf74xu3CcwpyeA7+rvO5wemO0daXpj/jvYrH19E=";
+    hash = "sha256-+/83xsfbrny8x7szVQezix+FBYvoeYXNfTA+Go18ASY=";
   };
 
+  # don't install the docs generator as a top-level `mkdocs` package
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'exclude = ["tests*"]' 'exclude = ["tests*", "mkdocs*"]'
+  '';
+
   nativeBuildInputs = [
     cython
     setuptools
@@ -71,6 +77,11 @@ buildPythonPackage rec {
     ln -s ${EfficientNet} $HOME/.cache/torch/hub/checkpoints/${EfficientNet.name}
   '';
 
+  disabledTests = [
+    # deletes the preloaded MobileNet checkpoint, so later tests try to download it
+    "test_import_defaults"
+  ];
+
   pythonImportsCheck = [ "imagededup" ];
 
   meta = {

From a330d06beb992cc128de1a952c4606948f9c1d1e Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Mon, 5 Oct 2026 00:06:23 +0200
Subject: [PATCH 08/78] php86: init at 8.6.0RC3

---
 nixos/tests/all-tests.nix                     |  4 +++
 pkgs/development/interpreters/php/default.nix | 16 +++++++++--
 .../interpreters/php/fix-paths-php86.patch    | 28 +++++++++++++++++++
 pkgs/development/interpreters/php/generic.nix |  5 +++-
 pkgs/top-level/all-packages.nix               |  4 +++
 5 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/interpreters/php/fix-paths-php86.patch

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 55d9076cc79d..ecc2306ffc45 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1488,6 +1488,10 @@ in
     inherit runTest;
     php = pkgs.php85;
   };
+  php86 = import ./php/default.nix {
+    inherit runTest;
+    php = pkgs.php86;
+  };
   phylactery = runTest ./web-apps/phylactery.nix;
   pict-rs = runTest ./pict-rs.nix;
   pihole-ftl = import ./pihole-ftl { inherit runTest; };
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index c0c502767f99..1e9a96c61473 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   callPackage,
+  fetchurl,
   stdenv,
   llvmPackages,
   pcre2,
@@ -8,11 +9,15 @@
 
 let
   mkPhp =
-    { version, hash }:
+    {
+      version,
+      hash ? null,
+      phpSrc ? null,
+    }:
     let
       base = callPackage ./generic.nix {
         stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
-        inherit version hash;
+        inherit version hash phpSrc;
       };
     in
     base.withExtensions (
@@ -81,4 +86,11 @@ in
     version = "8.5.11";
     hash = "sha256-3JQHFqjHPlMcAHjuy5VdWV0yHsLMnUcUnPAInqbhj2Q=";
   };
+  php86 = mkPhp rec {
+    version = "8.6.0RC3";
+    phpSrc = fetchurl {
+      url = "https://downloads.php.net/~svpernova09/php-${version}.tar.xz";
+      hash = "sha256-Ex+Hoga92QwXjY5E6AJDrgwzPEzuhTH2PRyqms3YaWo=";
+    };
+  };
 }
diff --git a/pkgs/development/interpreters/php/fix-paths-php86.patch b/pkgs/development/interpreters/php/fix-paths-php86.patch
new file mode 100644
index 000000000000..af25165ac0b2
--- /dev/null
+++ b/pkgs/development/interpreters/php/fix-paths-php86.patch
@@ -0,0 +1,28 @@
+diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4
+index 6235658..93a8b96 100644
+--- a/ext/gettext/config.m4
++++ b/ext/gettext/config.m4
+@@ -4,9 +4,7 @@ PHP_ARG_WITH([gettext],
+     [Include GNU gettext support])])
+ 
+ if test "$PHP_GETTEXT" != "no"; then
+-  for i in $PHP_GETTEXT /usr/local /usr; do
+-    AS_IF([test -r $i/include/libintl.h], [GETTEXT_DIR=$i; break;])
+-  done
++  GETTEXT_DIR=$PHP_GETTEXT
+ 
+   AS_VAR_IF([GETTEXT_DIR],,
+     [AC_MSG_ERROR([Cannot locate header file libintl.h])])
+diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
+index 3001a4d..7e1e6c3 100644
+--- a/sapi/apache2handler/config.m4
++++ b/sapi/apache2handler/config.m4
+@@ -77,7 +77,7 @@ if test "$PHP_APXS2" != "no"; then
+   AS_VERSION_COMPARE([$APACHE_VERSION], [2.4.0],
+     [AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])])
+ 
+-  APXS_LIBEXECDIR='$(INSTALL_ROOT)'$($APXS -q LIBEXECDIR)
++  APXS_LIBEXECDIR="$prefix/modules"
+   if test -z $($APXS -q SYSCONFDIR) || test "$PHP_APACHE2_CONF" = "no"; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix
index 664985ce0755..a1dcce92de39 100644
--- a/pkgs/development/interpreters/php/generic.nix
+++ b/pkgs/development/interpreters/php/generic.nix
@@ -360,9 +360,12 @@ let
             lib.optionals (lib.versionOlder version "8.4") [
               ./fix-paths-php7.patch
             ]
-            ++ lib.optionals (lib.versionAtLeast version "8.4") [
+            ++ lib.optionals (lib.versionAtLeast version "8.4" && lib.versionOlder version "8.6") [
               ./fix-paths-php84.patch
             ]
+            ++ lib.optionals (lib.versionAtLeast version "8.6") [
+              ./fix-paths-php86.patch
+            ]
             ++ extraPatches;
 
           separateDebugInfo = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0bec1864928..23d4d3372583 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4400,6 +4400,7 @@ with pkgs;
     php83
     php84
     php85
+    php86
     ;
 
   # PHP Extensions and Packages
@@ -4415,6 +4416,9 @@ with pkgs;
   php85Extensions = recurseIntoAttrs php85.extensions;
   php85Packages = recurseIntoAttrs php85.packages;
 
+  php86Extensions = recurseIntoAttrs php86.extensions;
+  php86Packages = recurseIntoAttrs php86.packages;
+
   # Python interpreters. All standard library modules are included except for tkinter, which is
   # available as `pythonPackages.tkinter` and can be used as any other Python package.
   # When switching these sets, please update docs at ../../doc/languages-frameworks/python.md

From eb5e80bbea0673f11283451a2ae7600188e7cbd6 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:26:08 +0200
Subject: [PATCH 09/78] php86Extensions.apcu: fix build

---
 .../development/php-packages/apcu/default.nix | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix
index de253c35c17d..35570d9f2028 100644
--- a/pkgs/development/php-packages/apcu/default.nix
+++ b/pkgs/development/php-packages/apcu/default.nix
@@ -3,6 +3,7 @@
   lib,
   pcre2,
   fetchFromGitHub,
+  fetchpatch,
 }:
 
 let
@@ -19,6 +20,26 @@ buildPecl {
     sha256 = "sha256-L8bGSPUuBsZXsJdeY6cVA0DvI2+0wEbNHH6IcfT+cFU=";
   };
 
+  # PHP 8.6 compatibility, backported from upstream master
+  patches = [
+    (fetchpatch {
+      name = "php86-empty-switch-default-case.patch";
+      url = "https://github.com/krakjoe/apcu/commit/d29e907791502af89a7996930f8dce5fd8efe4a1.patch";
+      excludes = [ ".github/*" ];
+      hash = "sha256-Xd6v7MZ9/Ur2lQHS2xCjcgskenNCWmXhoH+2v/7O1bw=";
+    })
+    (fetchpatch {
+      name = "php86-xtoffsetof.patch";
+      url = "https://github.com/krakjoe/apcu/commit/95f9ab828f95c6ca5877e584ead109189d0cec61.patch";
+      hash = "sha256-hED/qZayZJ3NVM5e/eDtrKtykMEhxjmWgI++T+oTL1c=";
+    })
+    (fetchpatch {
+      name = "php86-php-verror.patch";
+      url = "https://github.com/krakjoe/apcu/commit/90899684be91c4f750512c2f840f487286ecb807.patch";
+      hash = "sha256-uSOZP6Qlw3WylqJI34yFP3l8z0nsIL1bHhfEyJmIimw=";
+    })
+  ];
+
   buildInputs = [ pcre2 ];
   doCheck = true;
   makeFlags = [ "phpincludedir=$(dev)/include" ];

From 2cee5df753da5e0294eb2a91565d8660793e84ee Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:47:30 +0200
Subject: [PATCH 10/78] php86Extensions.ast: fix build

---
 pkgs/development/php-packages/ast/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/php-packages/ast/default.nix b/pkgs/development/php-packages/ast/default.nix
index 19dd3e837bf6..2da68d11206e 100644
--- a/pkgs/development/php-packages/ast/default.nix
+++ b/pkgs/development/php-packages/ast/default.nix
@@ -2,6 +2,7 @@
   buildPecl,
   lib,
   fetchFromGitHub,
+  fetchpatch,
 }:
 
 let
@@ -18,6 +19,19 @@ buildPecl {
     sha256 = "sha256-TGMZA3Qe+/TwG+FIevrcQzy/ufCyN8sXKjsPrnz3K1Q=";
   };
 
+  patches = [
+    # Support PHP 8.6, backported from upstream master
+    (fetchpatch {
+      name = "php86-support.patch";
+      url = "https://github.com/nikic/php-ast/commit/64ea7276bcd9cf8e503b719aafbec4d802c9eacc.patch";
+      excludes = [
+        ".github/*"
+        "ci/*"
+      ];
+      hash = "sha256-fCZk4cGrJIG66MO7CKb9aJzpvpCSskcc2ZdlFEMtb5U=";
+    })
+  ];
+
   meta = {
     changelog = "https://github.com/nikic/php-ast/releases/tag/v${version}";
     description = "Exposes the abstract syntax tree generated by PHP";

From f5e35788cfb07e9d43d43008ee4ce52b3775fdf1 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:59:46 +0200
Subject: [PATCH 11/78] php86Extensions.blackfire: fix eval

---
 pkgs/by-name/bl/blackfire/php-probe.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix
index ed53bfc1ecfe..3d4ac81e7135 100644
--- a/pkgs/by-name/bl/blackfire/php-probe.nix
+++ b/pkgs/by-name/bl/blackfire/php-probe.nix
@@ -74,10 +74,6 @@ let
     };
 in
 
-assert lib.assertMsg (
-  hashes ? ${system}.hash.${phpMajor}
-) "blackfire does not support PHP version ${phpMajor} on ${system}.";
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "php-blackfire";
   extensionName = "blackfire";
@@ -152,12 +148,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://blackfire.io/";
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ spk ];
-    platforms = [
-      "x86_64-linux"
-      "aarch64-linux"
-      "i686-linux"
-      "aarch64-darwin"
-    ];
+    platforms = lib.attrNames (lib.filterAttrs (_: v: v.hash ? ${phpMajor}) hashes);
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 })

From e82178611c6e55c71a622035af1f27166e3cbc8f Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 21:11:12 +0200
Subject: [PATCH 12/78] php86Extensions.imagick: fix build

---
 pkgs/development/php-packages/imagick/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix
index 8b1e40cc033c..06270e048d22 100644
--- a/pkgs/development/php-packages/imagick/default.nix
+++ b/pkgs/development/php-packages/imagick/default.nix
@@ -1,6 +1,7 @@
 {
   buildPecl,
   lib,
+  fetchpatch,
   imagemagick,
   pkg-config,
   pcre2,
@@ -12,6 +13,15 @@ buildPecl {
   version = "3.8.1";
   hash = "sha256-OjWHwKUkwX0NrZZzoWC5DNd26DaDhHThc7VJ7YZDUu4=";
 
+  patches = [
+    # Support PHP 8.6, backported from upstream master
+    (fetchpatch {
+      name = "php86-offsetof.patch";
+      url = "https://github.com/Imagick/imagick/commit/b580a705e2c879924bfaee2e1ed3a93c9cb3fcfb.patch";
+      hash = "sha256-DOW/HuYJmXrkwHolvIPk3M1ikrCHKhHMeP9gJqanv+s=";
+    })
+  ];
+
   configureFlags = [ "--with-imagick=${imagemagick.dev}" ];
 
   depsBuildBuild = [ pkg-config ];

From 8cb6bcea634f1acd54c09de2d65b4adbf543e491 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 13/78] php86Extensions.datadog_trace: mark broken

(cherry picked from commit f6045e5b723d7eb47e11b2a326a378ab992548ce)
---
 pkgs/development/php-packages/datadog_trace/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix
index 65c638296593..535f39c91450 100644
--- a/pkgs/development/php-packages/datadog_trace/default.nix
+++ b/pkgs/development/php-packages/datadog_trace/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  php,
   stdenv,
   buildPecl,
   cargo,
@@ -57,6 +58,7 @@ buildPecl rec {
   ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     changelog = "https://github.com/DataDog/dd-trace-php/blob/${src.rev}/CHANGELOG.md";
     description = "Datadog Tracing PHP Client";
     homepage = "https://github.com/DataDog/dd-trace-php";

From 7eb55aa889ce05b2f96c53b562f2f57df3a30b2f Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 14/78] php86Extensions.amqp: mark broken

(cherry picked from commit 691da521aa9f8da33ac8f19d83b20d018d8be855)
---
 pkgs/development/php-packages/amqp/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/amqp/default.nix b/pkgs/development/php-packages/amqp/default.nix
index 8b542ff2ff2a..9d0ea0a3f81f 100644
--- a/pkgs/development/php-packages/amqp/default.nix
+++ b/pkgs/development/php-packages/amqp/default.nix
@@ -1,6 +1,7 @@
 {
   buildPecl,
   lib,
+  php,
   rabbitmq-c,
   fetchFromGitHub,
 }:
@@ -24,6 +25,7 @@ buildPecl {
   env.AMQP_DIR = rabbitmq-c;
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     changelog = "https://github.com/php-amqp/php-amqp/releases/tag/v${version}";
     description = "PHP extension to communicate with any AMQP compliant server";
     license = lib.licenses.php301;

From cd830fe0c167177567c3d7eb42941b1683ed27ba Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 15/78] php86Extensions.spx: mark broken

(cherry picked from commit 6f3874e7cbf1425621cdcb79cbeeeec15231ffa4)
---
 pkgs/development/php-packages/spx/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix
index bb6e2b61c95b..404daf163419 100644
--- a/pkgs/development/php-packages/spx/default.nix
+++ b/pkgs/development/php-packages/spx/default.nix
@@ -1,6 +1,7 @@
 {
   buildPecl,
   lib,
+  php,
   fetchFromGitHub,
   zlib,
 }:
@@ -25,6 +26,7 @@ buildPecl {
   ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     changelog = "https://github.com/NoiseByNorthwest/php-spx/releases/tag/v${version}";
     description = "Simple & straight-to-the-point PHP profiling extension with its built-in web UI";
     homepage = "https://github.com/NoiseByNorthwest/php-spx";

From 50acfecd2dd981113c388e88aff75c67dee5f38b Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 16/78] php86Extensions.gnupg: mark broken

(cherry picked from commit 5e078bcc64ecd48d33da2e8e77e1636d465941cc)
---
 pkgs/development/php-packages/gnupg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/php-packages/gnupg/default.nix b/pkgs/development/php-packages/gnupg/default.nix
index 4476f7a88ea6..2dd6ce523cf5 100644
--- a/pkgs/development/php-packages/gnupg/default.nix
+++ b/pkgs/development/php-packages/gnupg/default.nix
@@ -66,7 +66,7 @@ buildPecl {
 
   meta = {
     changelog = "https://github.com/php-gnupg/php-gnupg/releases/tag/gnupg-${version}";
-    broken = lib.versionOlder php.version "8.1"; # Broken on PHP older than 8.1.
+    broken = lib.versionAtLeast php.version "8.6";
     description = "PHP wrapper for GpgME library that provides access to GnuPG";
     license = lib.licenses.bsd3;
     homepage = "https://pecl.php.net/package/gnupg";

From 1b181c33b43a1611087e5b4b352545409f7f27fe Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:27 +0200
Subject: [PATCH 17/78] php86Extensions.wikidiff2: mark broken

(cherry picked from commit 52ec6ee6330abd2715c3ece72ec9c674514dc1d2)
---
 pkgs/development/php-packages/wikidiff2/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/wikidiff2/default.nix b/pkgs/development/php-packages/wikidiff2/default.nix
index 295e68783a7f..f06f76657895 100644
--- a/pkgs/development/php-packages/wikidiff2/default.nix
+++ b/pkgs/development/php-packages/wikidiff2/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  php,
   buildPecl,
   fetchFromGitHub,
   pkg-config,
@@ -21,6 +22,7 @@ buildPecl rec {
   buildInputs = [ libthai ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "PHP extension which formats changes between two input texts, producing HTML or JSON";
     license = lib.licenses.gpl2;
     homepage = "https://www.mediawiki.org/wiki/Wikidiff2";

From 8e4f0711a0faac5391ec2135ae4c69e8433ae78c Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 18/78] php86Extensions.imap: mark broken

(cherry picked from commit 2dfc5ff1753f742aca3e998fb76667a350e41885)
---
 pkgs/development/php-packages/imap/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/imap/default.nix b/pkgs/development/php-packages/imap/default.nix
index 522e751dfd56..7c8e1715d250 100644
--- a/pkgs/development/php-packages/imap/default.nix
+++ b/pkgs/development/php-packages/imap/default.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   fetchpatch,
   lib,
+  php,
   libkrb5,
   openssl,
   pam,
@@ -44,6 +45,7 @@ buildPecl {
   doCheck = true;
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "PHP extension for checking the spelling of a word";
     homepage = "https://pecl.php.net/package/imap";
     license = lib.licenses.php301;

From 746d75d8a96f089a506c576cc98437260eb7aa68 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 19/78] php86Extensions.pspell: mark broken

(cherry picked from commit 190ca16ce60456495f6cd762310906e2574b9abe)
---
 pkgs/development/php-packages/pspell/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/pspell/default.nix b/pkgs/development/php-packages/pspell/default.nix
index f1380c4c3918..ae0fbd63d027 100644
--- a/pkgs/development/php-packages/pspell/default.nix
+++ b/pkgs/development/php-packages/pspell/default.nix
@@ -3,6 +3,7 @@
   buildPecl,
   fetchFromGitHub,
   lib,
+  php,
 }:
 
 let
@@ -24,6 +25,7 @@ buildPecl {
   doCheck = true;
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "PHP extension for checking the spelling of a word";
     homepage = "https://pecl.php.net/package/pspell";
     license = lib.licenses.php301;

From 59603943f625bc69b0cb5ea1d5d0b70d9284b5a0 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 20/78] php86Extensions.rdkafka: mark broken

(cherry picked from commit 1c1162ace41830e54f8f4008859dafe5e832033e)
---
 pkgs/development/php-packages/rdkafka/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix
index 0d9a400d0428..cfb171a69480 100644
--- a/pkgs/development/php-packages/rdkafka/default.nix
+++ b/pkgs/development/php-packages/rdkafka/default.nix
@@ -1,6 +1,7 @@
 {
   buildPecl,
   lib,
+  php,
   rdkafka,
   pcre2,
 }:
@@ -21,6 +22,7 @@ buildPecl {
   '';
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "Kafka client based on librdkafka";
     license = lib.licenses.mit;
     homepage = "https://github.com/arnaud-lb/php-rdkafka";

From d32080da8b540e8cb230cd2c9cd26fb430926039 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 21/78] php86Extensions.snuffleupagus: mark broken

(cherry picked from commit 2f5b3a6a3e2d4cb9169f12bcdb2221bf17c64037)
---
 pkgs/development/php-packages/snuffleupagus/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/php-packages/snuffleupagus/default.nix b/pkgs/development/php-packages/snuffleupagus/default.nix
index cf1189cedbc7..722bbd7eaff5 100644
--- a/pkgs/development/php-packages/snuffleupagus/default.nix
+++ b/pkgs/development/php-packages/snuffleupagus/default.nix
@@ -37,6 +37,7 @@ buildPecl rec {
   '';
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "Security module for php7 and php8 - Killing bugclasses and virtual-patching the rest";
     homepage = "https://github.com/jvoisin/snuffleupagus";
     license = lib.licenses.lgpl3Only;

From cc1de4252025779324427c0e96feafb30e2f270f Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 22/78] php86Extensions.rrd: mark broken

(cherry picked from commit 33f5777b28fd0870c1f958c48bc4201ff2a7ccd1)
---
 pkgs/development/php-packages/rrd/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/rrd/default.nix b/pkgs/development/php-packages/rrd/default.nix
index 9c37fa225543..030d946a5f27 100644
--- a/pkgs/development/php-packages/rrd/default.nix
+++ b/pkgs/development/php-packages/rrd/default.nix
@@ -1,6 +1,7 @@
 {
   buildPecl,
   lib,
+  php,
   pkg-config,
   rrdtool,
   fetchpatch,
@@ -33,6 +34,7 @@ buildPecl {
   env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "PHP bindings to RRD tool system";
     license = lib.licenses.bsd0;
     homepage = "https://github.com/php/pecl-processing-rrd";

From 763679a13a74865a2b23e757e35d457609edb1df Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 23/78] php86Extensions.smbclient: mark broken

(cherry picked from commit 462bcfbad14fed85807130f38c7a4b37233c0a7b)
---
 pkgs/development/php-packages/smbclient/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/smbclient/default.nix b/pkgs/development/php-packages/smbclient/default.nix
index 7b24722ec623..b81b965322db 100644
--- a/pkgs/development/php-packages/smbclient/default.nix
+++ b/pkgs/development/php-packages/smbclient/default.nix
@@ -1,6 +1,7 @@
 {
   buildPecl,
   lib,
+  php,
   samba,
   pkg-config,
 }:
@@ -16,6 +17,7 @@ buildPecl {
   buildInputs = [ samba ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "PHP wrapper for libsmbclient";
     license = lib.licenses.bsd2;
     homepage = "https://github.com/eduardok/libsmbclient-php";

From 5d4b0ddef364113a14d84eba4cfb81ac45dbabd5 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 24/78] php86Extensions.pdo_oci: mark broken

(cherry picked from commit 57a3cb9b4efcd3df0fe51ab9f769cd4fbfb9accf)
---
 pkgs/development/php-packages/pdo_oci/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/php-packages/pdo_oci/default.nix b/pkgs/development/php-packages/pdo_oci/default.nix
index eb50613ae33b..e326b351d9f3 100644
--- a/pkgs/development/php-packages/pdo_oci/default.nix
+++ b/pkgs/development/php-packages/pdo_oci/default.nix
@@ -20,6 +20,7 @@ buildPecl {
   '';
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     changelog = "https://pecl.php.net/package-changelog.php?package=PDO_OCI";
     description = "PHP PDO_OCI extension lets you access Oracle Database";
     license = lib.licenses.php301;

From cf406ee5914c875f26b6fbc4dda638002384a6ac Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 25/78] php86Extensions.pinba: mark broken

(cherry picked from commit 57c8ef223de4fcc3af8bc1f258f968a202131701)
---
 pkgs/development/php-packages/pinba/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/pinba/default.nix b/pkgs/development/php-packages/pinba/default.nix
index 0d45ac186707..bf62ffa2985c 100644
--- a/pkgs/development/php-packages/pinba/default.nix
+++ b/pkgs/development/php-packages/pinba/default.nix
@@ -1,6 +1,7 @@
 {
   buildPecl,
   lib,
+  php,
   fetchFromGitHub,
 }:
 
@@ -20,6 +21,7 @@ buildPecl rec {
   env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "PHP extension for Pinba";
     longDescription = ''
       Pinba is a MySQL storage engine that acts as a realtime monitoring and

From df71966a0495ea0d0b5a1f3ffc047e1072eafc4e Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 26/78] php86Extensions.grpc: mark broken

(cherry picked from commit 626f5e66d7883d6e9240f2d4821d47a4f5f351da)
---
 pkgs/development/php-packages/grpc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/php-packages/grpc/default.nix b/pkgs/development/php-packages/grpc/default.nix
index 25b9b57057e4..fc6994bb6b75 100644
--- a/pkgs/development/php-packages/grpc/default.nix
+++ b/pkgs/development/php-packages/grpc/default.nix
@@ -23,6 +23,7 @@ buildPecl {
   doCheck = true;
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "High performance, open source, general RPC framework that puts mobile and HTTP/2 first";
     homepage = "https://github.com/grpc/grpc/tree/master/src/php/ext/grpc";
     license = lib.licenses.asl20;

From 2a9ec6eab465737827bf06fc92c3b4651382201c Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 27/78] php86Extensions.pdlib: mark broken

(cherry picked from commit 1bf6babb146d9fcc030d620673eff2f5066d1543)
---
 pkgs/development/php-packages/pdlib/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/pdlib/default.nix b/pkgs/development/php-packages/pdlib/default.nix
index faa1d792b016..ce7c820bb800 100644
--- a/pkgs/development/php-packages/pdlib/default.nix
+++ b/pkgs/development/php-packages/pdlib/default.nix
@@ -2,6 +2,7 @@
   buildPecl,
   fetchFromGitHub,
   lib,
+  php,
   pkg-config,
   dlib,
 }:
@@ -23,6 +24,7 @@ buildPecl {
   buildInputs = [ (dlib.override { guiSupport = true; }) ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "PHP extension for Dlib";
     license = lib.licenses.mit;
     homepage = "https://github.com/goodspb/pdlib";

From 3d05dc793279b7b4088994f26619b4115e1ccd05 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 28/78] php86Extensions.protobuf: mark broken

(cherry picked from commit b2a21f46525493f02abc4de7ab65e56f5cff5dde)
---
 pkgs/development/php-packages/protobuf/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix
index 0367dd4fc533..0f01a754e237 100644
--- a/pkgs/development/php-packages/protobuf/default.nix
+++ b/pkgs/development/php-packages/protobuf/default.nix
@@ -1,6 +1,7 @@
 {
   buildPecl,
   lib,
+  php,
   pcre2,
 }:
 
@@ -13,6 +14,7 @@ buildPecl {
   buildInputs = [ pcre2 ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data";
     license = lib.licenses.bsd3;
     homepage = "https://developers.google.com/protocol-buffers/";

From cd3b517ab267860b2dc474d9892d0dc6c39a5058 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 29/78] php86Extensions.decimal: mark broken

(cherry picked from commit bf6be53e9a1665c8be83c3427b4e2d13df57ddff)
---
 pkgs/development/php-packages/decimal/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/php-packages/decimal/default.nix b/pkgs/development/php-packages/decimal/default.nix
index df36f230acef..af0cdce75e13 100644
--- a/pkgs/development/php-packages/decimal/default.nix
+++ b/pkgs/development/php-packages/decimal/default.nix
@@ -17,6 +17,7 @@ buildPecl {
   configureFlags = [ "--with-libmpdec-path=${mpdecimal}" ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "Arbitrary-precision decimal arithmetic for PHP";
     homepage = "https://php-decimal.github.io";
     changelog = "https://pecl.php.net/package-changelog.php?package=decimal&release=${version}";

From 3a69157dc2d144b564eafabe6f67d875f697349a Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 30/78] php86Extensions.ds: mark broken

(cherry picked from commit ee757c554aa23d3ed88a5acbbb9867bca30c084d)
---
 pkgs/development/php-packages/ds/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/php-packages/ds/default.nix b/pkgs/development/php-packages/ds/default.nix
index 3cfb2314da93..2b4121fc2063 100644
--- a/pkgs/development/php-packages/ds/default.nix
+++ b/pkgs/development/php-packages/ds/default.nix
@@ -23,6 +23,7 @@ buildPecl {
   buildInputs = [ pcre2 ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     changelog = "https://github.com/php-ds/ext-ds/releases/tag/v${version}";
     description = "Extension providing efficient data structures for PHP";
     license = lib.licenses.mit;

From 06158f0acebc19a7a2be8b3f273031ad8c2850bd Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 31/78] php86Extensions.excimer: mark broken

(cherry picked from commit cd83d0f2bce7b16ad45346759e289d33f0150db0)
---
 pkgs/development/php-packages/excimer/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/excimer/default.nix b/pkgs/development/php-packages/excimer/default.nix
index 1c0346280aed..d22032f698e2 100644
--- a/pkgs/development/php-packages/excimer/default.nix
+++ b/pkgs/development/php-packages/excimer/default.nix
@@ -1,6 +1,7 @@
 {
   buildPecl,
   lib,
+  php,
   fetchFromGitHub,
 }:
 
@@ -19,6 +20,7 @@ buildPecl {
   };
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     changelog = "https://pecl.php.net/package-changelog.php?package=excimer&release=${version}";
     description = "PHP extension that provides an interrupting timer and a low-overhead sampling profiler";
     license = lib.licenses.asl20;

From 315864d135c24988332dc316d49e35e1592f51ab Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:27 +0200
Subject: [PATCH 32/78] php86Extensions.ssh2: mark broken

(cherry picked from commit b9a1a32a66665932c7db3d2cc64ad8092d83c375)
---
 pkgs/development/php-packages/ssh2/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/ssh2/default.nix b/pkgs/development/php-packages/ssh2/default.nix
index 153dfe60e2b1..09af195341ca 100644
--- a/pkgs/development/php-packages/ssh2/default.nix
+++ b/pkgs/development/php-packages/ssh2/default.nix
@@ -1,6 +1,7 @@
 {
   buildPecl,
   lib,
+  php,
   libssh2,
 }:
 
@@ -14,6 +15,7 @@ buildPecl rec {
   configureFlags = [ "--with-ssh2=${libssh2.dev}" ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     changelog = "https://pecl.php.net/package-info.php?package=ssh2&version=${version}";
     description = "PHP bindings for the libssh2 library";
     license = lib.licenses.php301;

From 64159daa055abee07d2ca521d238cb969a5cd28c Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:27 +0200
Subject: [PATCH 33/78] php86Extensions.xdebug: mark broken

(cherry picked from commit 6b8e7bb44f1bfdb0588a5b9da5458c97c7e2777b)
---
 pkgs/development/php-packages/xdebug/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix
index 96d30a5223c3..76f96a200e7d 100644
--- a/pkgs/development/php-packages/xdebug/default.nix
+++ b/pkgs/development/php-packages/xdebug/default.nix
@@ -1,6 +1,7 @@
 {
   buildPecl,
   lib,
+  php,
   fetchFromGitHub,
 }:
 
@@ -24,6 +25,7 @@ buildPecl {
   zendExtension = true;
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     changelog = "https://github.com/xdebug/xdebug/releases/tag/${version}";
     description = "Provides functions for function traces and profiling";
     homepage = "https://xdebug.org/";

From f439f4fd50e685e14e4ae1cf4129a15821f27aa6 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 34/78] php86Extensions.redis: mark broken

(cherry picked from commit df2bd6d6545285c6da88ea42fa5d3fad1bfdf4bc)
---
 pkgs/development/php-packages/redis/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix
index 86223a65d056..ed3826ebf69c 100644
--- a/pkgs/development/php-packages/redis/default.nix
+++ b/pkgs/development/php-packages/redis/default.nix
@@ -22,6 +22,7 @@ buildPecl {
   internalDeps = with php.extensions; [ session ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     changelog = "https://github.com/phpredis/phpredis/releases/tag/${version}";
     description = "PHP extension for interfacing with Redis";
     license = lib.licenses.php301;

From 6894a11b020aabb4b3ee5c077bb2e1cc676e7e2e Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 35/78] php86Extensions.sqlsrv: mark broken

(cherry picked from commit 32546ad9fc057840fd275e473f1d2bf16e672500)
---
 pkgs/development/php-packages/sqlsrv/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix
index fe2f77e5a245..cc318b7e536f 100644
--- a/pkgs/development/php-packages/sqlsrv/default.nix
+++ b/pkgs/development/php-packages/sqlsrv/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   buildPecl,
   lib,
+  php,
   unixodbc,
   libiconv,
 }:
@@ -14,6 +15,7 @@ buildPecl {
   buildInputs = [ unixodbc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "Microsoft Drivers for PHP for SQL Server";
     license = lib.licenses.mit;
     homepage = "https://github.com/Microsoft/msphpsql";

From 44a9f8b5a75ba3ab156a9303edb83e478efbd4d3 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 36/78] php86Extensions.pcov: mark broken

(cherry picked from commit c3fd60a0a3aea73bdec4200a6099055e3f5dc11f)
---
 pkgs/development/php-packages/pcov/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix
index c925662e6f5b..56e882633805 100644
--- a/pkgs/development/php-packages/pcov/default.nix
+++ b/pkgs/development/php-packages/pcov/default.nix
@@ -1,6 +1,7 @@
 {
   buildPecl,
   lib,
+  php,
   pcre2,
   fetchFromGitHub,
   fetchpatch,
@@ -23,6 +24,7 @@ buildPecl {
   buildInputs = [ pcre2 ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     changelog = "https://github.com/krakjoe/pcov/releases/tag/v${version}";
     description = "Self contained php-code-coverage compatible driver for PHP";
     license = lib.licenses.php301;

From cc3326c6ac36a6514c426170ae8fdc1ced11d100 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 37/78] php86Extensions.memcached: mark broken

(cherry picked from commit cfe9dc40957e07a439acef2cbbc853f978120c28)
---
 pkgs/development/php-packages/memcached/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix
index f2c5125dd677..660fa5136498 100644
--- a/pkgs/development/php-packages/memcached/default.nix
+++ b/pkgs/development/php-packages/memcached/default.nix
@@ -34,6 +34,7 @@ buildPecl rec {
   ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "PHP extension for interfacing with memcached via libmemcached library";
     license = lib.licenses.php301;
     homepage = "https://github.com/php-memcached-dev/php-memcached";

From 26f441c482040d97b410545bfa22c6df47a9f419 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 38/78] php86Extensions.luasandbox: mark broken

(cherry picked from commit eb6f82bcefb7691039d8235b22be158059582f4c)
---
 pkgs/development/php-packages/luasandbox/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/luasandbox/default.nix b/pkgs/development/php-packages/luasandbox/default.nix
index b1d388fe0e9d..16723103d88d 100644
--- a/pkgs/development/php-packages/luasandbox/default.nix
+++ b/pkgs/development/php-packages/luasandbox/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  php,
   buildPecl,
   fetchFromGitHub,
   pkg-config,
@@ -21,6 +22,7 @@ buildPecl rec {
   buildInputs = [ lua51Packages.lua ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "Extension for PHP 7 and PHP 8 to allow safely running untrusted Lua 5.1 code from within PHP";
     license = lib.licenses.mit;
     homepage = "https://www.mediawiki.org/wiki/LuaSandbox";

From 4225347b00b9b8c451d0c2914a192e8a8b8bc09b Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 39/78] php86Extensions.msgpack: mark broken

(cherry picked from commit d61da723d7023a0b05613dabeedbce730947fe0a)
---
 pkgs/development/php-packages/msgpack/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/php-packages/msgpack/default.nix b/pkgs/development/php-packages/msgpack/default.nix
index df746a99829b..d5284836973a 100644
--- a/pkgs/development/php-packages/msgpack/default.nix
+++ b/pkgs/development/php-packages/msgpack/default.nix
@@ -1,4 +1,8 @@
-{ buildPecl, lib }:
+{
+  buildPecl,
+  lib,
+  php,
+}:
 
 buildPecl rec {
   version = "3.0.0";
@@ -7,6 +11,7 @@ buildPecl rec {
   sha256 = "sha256-VTBqhHl9OZxrJpGB7EhGNPGL6hMwu9nXQFBDxZfeac0=";
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     changelog = "https://pecl.php.net/package-info.php?package=msgpack&version=${version}";
     description = "PHP extension for interfacing with MessagePack";
     homepage = "https://github.com/msgpack/msgpack-php";

From 33a63ab815362b7cd080a20fe41f04fd05a7ddbc Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 40/78] php86Extensions.openswoole: mark broken

(cherry picked from commit b2ef64707a34f236c30c88c8990a1f2c78fdb794)
---
 pkgs/development/php-packages/openswoole/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix
index a0499aba6250..a8feb286042c 100644
--- a/pkgs/development/php-packages/openswoole/default.nix
+++ b/pkgs/development/php-packages/openswoole/default.nix
@@ -35,6 +35,6 @@ buildPecl {
       You can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process.
     '';
     teams = [ lib.teams.php ];
-    broken = lib.versionOlder php.version "8.3";
+    broken = lib.versionOlder php.version "8.3" || lib.versionAtLeast php.version "8.6";
   };
 }

From b987f5fb4e27364f9f4a0036a1d1e6ceec153b7e Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:26 +0200
Subject: [PATCH 41/78] php86Extensions.ioncube-loader: mark broken

(cherry picked from commit 98403e0d71b65f70ad4073f3a2e782bdd4f4c219)
---
 pkgs/development/php-packages/ioncube-loader/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/php-packages/ioncube-loader/default.nix b/pkgs/development/php-packages/ioncube-loader/default.nix
index 9b15f880223d..fba889ed8f1c 100644
--- a/pkgs/development/php-packages/ioncube-loader/default.nix
+++ b/pkgs/development/php-packages/ioncube-loader/default.nix
@@ -52,6 +52,7 @@ stdenv.mkDerivation {
     homepage = "https://www.ioncube.com";
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     license = lib.licenses.unfree;
+    broken = lib.versionAtLeast php.version "8.6";
     maintainers = with lib.maintainers; [ neverbehave ];
     platforms = [
       "x86_64-linux"

From f6e6432dd2c846c96d949632b694695963a67ebb Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 20:18:27 +0200
Subject: [PATCH 42/78] php86Extensions.yaml: mark broken

(cherry picked from commit cc3a36d7c70aed1f9b062767113f0609f2225ff4)
---
 pkgs/development/php-packages/yaml/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix
index 1982ffd8d8c2..9cf8d2bb97c5 100644
--- a/pkgs/development/php-packages/yaml/default.nix
+++ b/pkgs/development/php-packages/yaml/default.nix
@@ -1,6 +1,7 @@
 {
   buildPecl,
   lib,
+  php,
   libyaml,
 }:
 
@@ -17,6 +18,7 @@ buildPecl {
   ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     description = "YAML-1.1 parser and emitter";
     license = lib.licenses.mit;
     homepage = "https://github.com/php/pecl-file_formats-yaml";

From 1bc65cff999e2b1c1df8293b4eac04ad6d12d8f5 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Tue, 6 Oct 2026 22:26:07 +0200
Subject: [PATCH 43/78] php86Packages.psalm: mark broken

(cherry picked from commit 525e2f86fe99140d051cba56517f930ad8a3de1f)
---
 pkgs/development/php-packages/psalm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix
index 44c3b94f92d7..2ac776eb537c 100644
--- a/pkgs/development/php-packages/psalm/default.nix
+++ b/pkgs/development/php-packages/psalm/default.nix
@@ -37,6 +37,7 @@ php.buildComposerProject2 (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   meta = {
+    broken = lib.versionAtLeast php.version "8.6";
     changelog = "https://github.com/vimeo/psalm/releases/tag/${finalAttrs.version}";
     description = "Static analysis tool for finding errors in PHP applications";
     homepage = "https://github.com/vimeo/psalm";

From 8e5b4a988c359c60b1cd2993a0428affbb4617c2 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Fri, 9 Oct 2026 14:44:17 +0200
Subject: [PATCH 44/78] phpExtensions.apcu: fix tests on darwin

---
 pkgs/development/php-packages/apcu/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix
index 35570d9f2028..93a299377a90 100644
--- a/pkgs/development/php-packages/apcu/default.nix
+++ b/pkgs/development/php-packages/apcu/default.nix
@@ -48,6 +48,9 @@ buildPecl {
     "dev"
   ];
 
+  # Tests launch the builtin webserver.
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     changelog = "https://github.com/krakjoe/apcu/releases/tag/v${version}";
     description = "Userland cache for PHP";

From 088f0f3798b0bc0dd82720fc1a4bf8d34348bf62 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Fri, 9 Oct 2026 14:44:18 +0200
Subject: [PATCH 45/78] phpExtensions.zlib: fix tests on darwin

---
 pkgs/top-level/php-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 5969439872af..cd96feeb3c01 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -795,6 +795,8 @@ lib.makeScope pkgs.newScope (
               configureFlags = [
                 "--with-zlib"
               ];
+              # Tests launch the builtin webserver.
+              __darwinAllowLocalNetworking = true;
             }
           ]
           ++ lib.optionals (lib.versionOlder php.version "8.3") [

From 16ec12ec4cba79840acca2cc3d16a2917e10ee85 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 Oct 2026 07:35:49 +0000
Subject: [PATCH 46/78] gitkraken: 12.4.1 -> 12.6.0

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

diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix
index b4a1d5737cd4..1c3eb5b898c6 100644
--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@@ -56,19 +56,19 @@
 
 let
   pname = "gitkraken";
-  version = "12.4.1";
+  version = "12.6.0";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz";
-      hash = "sha256-vudaXmTqCdRzkVzw3MyzfGSGGM9xfDO0Wims0vxM4yw=";
+      hash = "sha256-6KCgoCq95IhK6xA0WQ13+0sYgdxbq4UCECvtJgGgbrQ=";
     };
 
     aarch64-darwin = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip";
-      hash = "sha256-T2AlXHW1eQvlJ7zFndg0sy4X4fITdPhTePk27utYAe0=";
+      hash = "sha256-UlbbaNBD9DYhCNheadg4mGcWtcrwBp9VIsAMuP86HzQ=";
     };
   };
 

From 9195724948709941793c815e89f84ebc8cf10c4d Mon Sep 17 00:00:00 2001
From: Anas Elgarhy <anas.elgarhy.dev@gmail.com>
Date: Sun, 11 Oct 2026 12:13:35 +0300
Subject: [PATCH 47/78] lrcget: fix WebKit crash with NVIDIA gpu on popups
 creation

---
 pkgs/by-name/lr/lrcget/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix
index 1b17b43d6d97..9b929bd8c257 100644
--- a/pkgs/by-name/lr/lrcget/package.nix
+++ b/pkgs/by-name/lr/lrcget/package.nix
@@ -159,8 +159,14 @@ rustPlatform.buildRustPackage rec {
 
   preFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     gappsWrapperArgs+=(
-      # WEBKIT_DISABLE_COMPOSITING_MODE essential in NVIDIA + compositor https://github.com/NixOS/nixpkgs/issues/212064#issuecomment-1400202079
-      --set WEBKIT_DISABLE_COMPOSITING_MODE 1
+      # WEBKIT_DISABLE_COMPOSITING_MODE=1 is commonly exported session-wide on
+      # NVIDIA (see NixOS/nixpkgs#212064). Inherited into WebKit's UI process it
+      # makes AcceleratedBackingStore::create() return null, yet the web process
+      # still enters accelerated compositing mode, so the UI process segfaults
+      # in AcceleratedBackingStore::update(). Force compositing back on and use
+      # the shared-memory transport so no GBM buffers are allocated either.
+      --set WEBKIT_DISABLE_COMPOSITING_MODE 0
+      --set WEBKIT_DMABUF_RENDERER_FORCE_SHM 1
     )
   '';
 

From 2a1aef38806b5a139f29d909dbd958b4c3ecf972 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 Oct 2026 19:18:34 +0000
Subject: [PATCH 48/78] rahasher: 1.8.3 -> 1.8.4

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

diff --git a/pkgs/by-name/ra/rahasher/package.nix b/pkgs/by-name/ra/rahasher/package.nix
index e3c0bffa13b2..18cb0d464e9b 100644
--- a/pkgs/by-name/ra/rahasher/package.nix
+++ b/pkgs/by-name/ra/rahasher/package.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rahasher";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "LeXofLeviafan";
     repo = "RAHasher";
     rev = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-PitP2MUNwkcCwNJTet3D+A4/RTWp7Xl5Fpc63o5KRFc=";
+    hash = "sha256-3nFp9z55juPOteZ2wtb4+Ut/mCm93c/2G3Bgf6f3h8U=";
   };
 
   # The upstream Makefile derives src/RA_BuildVer.h from `.git/HEAD` by

From dbbb3c865a251018b589e91ede496883195d4791 Mon Sep 17 00:00:00 2001
From: Skye Soss <skye@soss.website>
Date: Sun, 11 Oct 2026 14:50:54 -0500
Subject: [PATCH 49/78] diod: fix build with gcc 16, add meta.changelog

---
 pkgs/by-name/di/diod/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/di/diod/package.nix b/pkgs/by-name/di/diod/package.nix
index a3127d32ab80..864383c84200 100644
--- a/pkgs/by-name/di/diod/package.nix
+++ b/pkgs/by-name/di/diod/package.nix
@@ -26,6 +26,11 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
+    # fix build w/ gcc 16
+    (fetchpatch {
+      url = "https://github.com/chaos/diod/commit/a8c55f0dd3ad9debc0e77b29ebde6e991d99d55d.patch";
+      hash = "sha256-Ws8DFGle9q/WMO5FJXm0WW3t1QL03Nbc/jfIsMUEx38=";
+    })
     # fix build w/ glibc-2.44
     (fetchpatch {
       url = "https://github.com/chaos/diod/commit/d56db0c55012c8a9ea2d3c72749022292c0f65b8.patch";
@@ -58,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "I/O forwarding server that implements a variant of the 9P protocol";
     homepage = "https://github.com/chaos/diod";
+    changelog = "https://github.com/chaos/diod/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [ rnhmjoj ];
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl2Plus;

From a4ae3930a81e5793778218e45c8a76fa2091c61d Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Wed, 30 Sep 2026 20:39:35 -0400
Subject: [PATCH 50/78] python3Packages.mcp-types, python3Packages.mcp_2: init
 at 2.2.0

Signed-off-by: Anish Pallati <i@anish.land>
---
 .../python-modules/mcp-types/default.nix      |  43 ++++++
 pkgs/development/python-modules/mcp/2.nix     | 145 ++++++++++++++++++
 .../development/python-modules/mcp/common.nix |  11 ++
 .../python-modules/mcp/default.nix            |   9 +-
 pkgs/top-level/python-packages.nix            |   4 +
 5 files changed, 207 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/python-modules/mcp-types/default.nix
 create mode 100644 pkgs/development/python-modules/mcp/2.nix
 create mode 100644 pkgs/development/python-modules/mcp/common.nix

diff --git a/pkgs/development/python-modules/mcp-types/default.nix b/pkgs/development/python-modules/mcp-types/default.nix
new file mode 100644
index 000000000000..214ca8b36216
--- /dev/null
+++ b/pkgs/development/python-modules/mcp-types/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildPythonPackage,
+  mcp_2,
+
+  # build-system
+  hatchling,
+  uv-dynamic-versioning,
+
+  # dependencies
+  pydantic,
+  typing-extensions,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "mcp-types";
+  inherit (mcp_2) version src;
+  pyproject = true;
+  __structuredAttrs = true;
+
+  sourceRoot = "${finalAttrs.src.name}/src/mcp-types";
+
+  build-system = [
+    hatchling
+    uv-dynamic-versioning
+  ];
+
+  dependencies = [
+    pydantic
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [ "mcp_types" ];
+
+  # tested by mcp_2
+  doCheck = false;
+
+  meta = {
+    description = "Model Context Protocol wire types";
+    homepage = "https://github.com/modelcontextprotocol/python-sdk/tree/main/src/mcp-types";
+    inherit (mcp_2.meta) changelog license maintainers;
+  };
+})
diff --git a/pkgs/development/python-modules/mcp/2.nix b/pkgs/development/python-modules/mcp/2.nix
new file mode 100644
index 000000000000..a043609de6cc
--- /dev/null
+++ b/pkgs/development/python-modules/mcp/2.nix
@@ -0,0 +1,145 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+  uv-dynamic-versioning,
+
+  # dependencies
+  anyio,
+  httpx2,
+  jsonschema,
+  mcp-types,
+  opentelemetry-api,
+  pydantic,
+  pyjwt,
+  python-multipart,
+  sse-starlette,
+  starlette,
+  typing-extensions,
+  typing-inspection,
+  uvicorn,
+
+  # optional-dependencies
+  # cli
+  python-dotenv,
+  typer,
+  # rich
+  rich,
+
+  # tests
+  coverage,
+  dirty-equals,
+  griffelib,
+  inline-snapshot,
+  logfire,
+  opentelemetry-sdk,
+  pytest-asyncio,
+  pytest-examples,
+  pytest-xdist,
+  pytestCheckHook,
+  pyyaml,
+  trio,
+  zensical,
+}:
+
+let
+  common = import ./common.nix { inherit lib; };
+in
+buildPythonPackage (finalAttrs: {
+  pname = "mcp";
+  version = "2.2.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "modelcontextprotocol";
+    repo = "python-sdk";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-nnpNXnQiFSGx5KQBDXHCOH0wE3cznlmI6s7vtchcj3A=";
+  };
+
+  build-system = [
+    hatchling
+    uv-dynamic-versioning
+  ];
+
+  dependencies = [
+    anyio
+    httpx2
+    jsonschema
+    mcp-types
+    opentelemetry-api
+    pydantic
+    pyjwt
+    python-multipart
+    sse-starlette
+    starlette
+    typing-extensions
+    typing-inspection
+    uvicorn
+  ]
+  ++ pyjwt.optional-dependencies.crypto;
+
+  optional-dependencies = {
+    cli = [
+      python-dotenv
+      typer
+    ];
+    rich = [
+      rich
+    ];
+  };
+
+  pythonImportsCheck = [ "mcp" ];
+
+  nativeCheckInputs = [
+    coverage
+    dirty-equals
+    griffelib
+    inline-snapshot
+    logfire
+    opentelemetry-sdk
+    pytest-asyncio
+    pytest-examples
+    pytest-xdist
+    pytestCheckHook
+    pyyaml
+    trio
+    zensical
+  ]
+  ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
+
+  # tests import examples/stories
+  preCheck = ''
+    export PYTHONPATH="$PWD/examples:$PYTHONPATH"
+  '';
+
+  disabledTests = [
+    # spawned server doesn't inherit PYTHONPATH
+    "test_client_with_stdio_parameters_launches_the_server_as_a_subprocess"
+    "test_tool_call_and_notification_round_trip_over_a_stdio_subprocess"
+    "test_a_tool_spawned_childs_stdout_writes_never_reach_the_wire"
+
+    # Flaky: https://github.com/modelcontextprotocol/python-sdk/pull/1171
+    "test_notification_validation_error"
+
+    # Flaky: httpx.ConnectError: All connection attempts failed
+    "test_sse_security_"
+    "test_streamable_http_"
+    "test_streamablehttp_"
+
+    # This just feels a bit optimistic...
+    #     	assert duration < 3 * _sleep_time_seconds
+    # AssertionError: assert 0.0733884589999434 < (3 * 0.01)
+    "test_messages_are_executed_concurrently"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  meta = common.meta // {
+    changelog = "https://github.com/modelcontextprotocol/python-sdk/releases/tag/${finalAttrs.src.tag}";
+  };
+})
diff --git a/pkgs/development/python-modules/mcp/common.nix b/pkgs/development/python-modules/mcp/common.nix
new file mode 100644
index 000000000000..25a45816fec5
--- /dev/null
+++ b/pkgs/development/python-modules/mcp/common.nix
@@ -0,0 +1,11 @@
+{ lib }:
+{
+  meta = {
+    description = "Official Python SDK for Model Context Protocol servers and clients";
+    homepage = "https://github.com/modelcontextprotocol/python-sdk";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      bryanhonof
+    ];
+  };
+}
diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix
index 4a6832f12731..044065644d35 100644
--- a/pkgs/development/python-modules/mcp/default.nix
+++ b/pkgs/development/python-modules/mcp/default.nix
@@ -40,6 +40,9 @@
   requests,
 }:
 
+let
+  common = import ./common.nix { inherit lib; };
+in
 buildPythonPackage (finalAttrs: {
   pname = "mcp";
   version = "1.29.0";
@@ -157,11 +160,7 @@ buildPythonPackage (finalAttrs: {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = {
+  meta = common.meta // {
     changelog = "https://github.com/modelcontextprotocol/python-sdk/releases/tag/${finalAttrs.src.tag}";
-    description = "Official Python SDK for Model Context Protocol servers and clients";
-    homepage = "https://github.com/modelcontextprotocol/python-sdk";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ bryanhonof ];
   };
 })
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 46aabeeefd87..0ab847cf38bf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10648,6 +10648,10 @@ self: super: with self; {
 
   mcp = callPackage ../development/python-modules/mcp { };
 
+  mcp-types = callPackage ../development/python-modules/mcp-types { };
+
+  mcp_2 = callPackage ../development/python-modules/mcp/2.nix { };
+
   mcpadapt = callPackage ../development/python-modules/mcpadapt { };
 
   mcstatus = callPackage ../development/python-modules/mcstatus { };

From 52cf62805496e1ba08cc860321e36c51ba64b9f1 Mon Sep 17 00:00:00 2001
From: Anish Pallati <i@anish.land>
Date: Wed, 30 Sep 2026 20:39:36 -0400
Subject: [PATCH 51/78] python3Packages.mcp: add anish to maintainers

Signed-off-by: Anish Pallati <i@anish.land>
---
 pkgs/development/python-modules/mcp/common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/mcp/common.nix b/pkgs/development/python-modules/mcp/common.nix
index 25a45816fec5..4bb9fddff2c7 100644
--- a/pkgs/development/python-modules/mcp/common.nix
+++ b/pkgs/development/python-modules/mcp/common.nix
@@ -5,6 +5,7 @@
     homepage = "https://github.com/modelcontextprotocol/python-sdk";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
+      anish
       bryanhonof
     ];
   };

From 773e818787a092f82f2fb443af0a68cfc02188a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 Oct 2026 06:52:02 +0000
Subject: [PATCH 52/78] wasm-tools: 1.260.0 -> 1.261.0

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

diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix
index 408f4f39dbc4..43d474b1edd2 100644
--- a/pkgs/by-name/wa/wasm-tools/package.nix
+++ b/pkgs/by-name/wa/wasm-tools/package.nix
@@ -8,20 +8,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasm-tools";
-  version = "1.260.0";
+  version = "1.261.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasm-tools";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yn8YTJXhpdzxPKv8ZELosky1BHzPjSxXd+jcxkJ3MEU=";
+    hash = "sha256-scSPUam/rtEwPNec2JSJbQkmAnlJ2VC7ouXV6rpUxuc=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
 
-  cargoHash = "sha256-IJtoerutDHew59XR4XHv2Vxfrbvj9wdd/DNx5yp4Vo8=";
+  cargoHash = "sha256-PZQcFflja6EK9VxR7eD1qzwl3+jbfF5kVE3yuvESk+I=";
   cargoBuildFlags = [
     "--package"
     "wasm-tools"

From 46b40fdfdbf638d79eedbf1028193a9798eb4d69 Mon Sep 17 00:00:00 2001
From: Tom Vincent <git@tlvince.com>
Date: Sun, 11 Oct 2026 12:39:50 +0100
Subject: [PATCH 53/78] openvino: disable LTO on aarch64

---
 pkgs/by-name/op/openvino/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix
index 7cbea42f8597..7a9bfef032fa 100644
--- a/pkgs/by-name/op/openvino/package.nix
+++ b/pkgs/by-name/op/openvino/package.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
     (cmakeBool "ENABLE_INTEL_GPU" true)
     (cmakeBool "ENABLE_INTEL_NPU" stdenv.hostPlatform.isx86_64)
     (cmakeBool "ENABLE_JS" false)
-    (cmakeBool "ENABLE_LTO" true)
+    (cmakeBool "ENABLE_LTO" (!stdenv.hostPlatform.isAarch64)) # LTO leaks SVE into generic code on ARM (SIGILL); upstream defaults it off there.
     (cmakeBool "ENABLE_ONEDNN_FOR_GPU" false)
     (cmakeBool "ENABLE_OPENCV" true)
     (cmakeBool "ENABLE_OV_JAX_FRONTEND" false) # auto-patchelf could not satisfy dependency libopenvino_jax_frontend.so.2450

From a46dcc354d95191b4e0b03aeb635f1be258c3c26 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 13 Oct 2026 11:10:19 +0000
Subject: [PATCH 54/78] oxlint: 1.86.0 -> 1.88.0

---
 pkgs/by-name/ox/oxlint/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix
index 273bc012f7d3..7efef3fe05a3 100644
--- a/pkgs/by-name/ox/oxlint/package.nix
+++ b/pkgs/by-name/ox/oxlint/package.nix
@@ -28,25 +28,25 @@ in
 # runs without an external linter, which leaves `jsPlugins` configs inert.
 stdenv.mkDerivation (finalAttrs: {
   pname = "oxlint";
-  version = "1.86.0";
+  version = "1.88.0";
 
   src = fetchFromGitHub {
     owner = "oxc-project";
     repo = "oxc";
     tag = "oxlint_v${finalAttrs.version}";
-    hash = "sha256-B/L7rXj9Bjp7RJgLYNRGGyC01jmYle/0c4htmHXcN04=";
+    hash = "sha256-snIIcDk8o8pisV8piEGgrLCsmLa7HJPrmwwGoeThppk=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-Uz8Lau2kGdIJI2q1JoZ/dgYa+mHO6VdKxP9NAEIzfI0=";
+    hash = "sha256-RVXdem6nT71khAB62G4MSJyBxhyOq30NcSsLMambK34=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
     fetcherVersion = 4;
-    hash = "sha256-WuoVYuc9q8hUs3H6REYBFFRLfy8fgOdxHZ76diPh0kI=";
+    hash = "sha256-sruMkQeoBKuUtce4aHwJX1C6hfrh2jzfLyGuIcwLmZ4=";
   };
 
   dontUseCmakeConfigure = true;

From c3a4f0bf5d263a0e7b4efa0ae953a15ae22b1218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 13 Oct 2026 16:36:25 +0200
Subject: [PATCH 55/78] intel-media-driver: 26.2.4 -> 26.3.5

Diff: https://github.com/intel/media-driver/compare/intel-media-26.2.4...intel-media-26.3.5

Changelog: https://github.com/intel/media-driver/releases/tag/intel-media-26.3.5
---
 pkgs/by-name/in/intel-media-driver/cmake4.patch | 13 -------------
 pkgs/by-name/in/intel-media-driver/package.nix  |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/in/intel-media-driver/cmake4.patch b/pkgs/by-name/in/intel-media-driver/cmake4.patch
index 7ed2a4ec79b7..cca5b2bedf2b 100644
--- a/pkgs/by-name/in/intel-media-driver/cmake4.patch
+++ b/pkgs/by-name/in/intel-media-driver/cmake4.patch
@@ -63,19 +63,6 @@ index af622be19cb..40e4eba171e 100644
  
  project(KrnToHex_IGA)
  
-diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt
-index b066138d9df..df02bab2a69 100644
---- a/cmrtlib/linux/CMakeLists.txt
-+++ b/cmrtlib/linux/CMakeLists.txt
-@@ -18,7 +18,7 @@
- # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- # OTHER DEALINGS IN THE SOFTWARE.
- 
--cmake_minimum_required(VERSION 2.8)
-+cmake_minimum_required(VERSION 3.5)
- include (${CMAKE_CURRENT_LIST_DIR}/cmrt_utils.cmake)
- 
- 
 diff --git a/media_driver/linux/ult/CMakeLists.txt b/media_driver/linux/ult/CMakeLists.txt
 index 9fb5b39ee42..f06b490110b 100644
 --- a/media_driver/linux/ult/CMakeLists.txt
diff --git a/pkgs/by-name/in/intel-media-driver/package.nix b/pkgs/by-name/in/intel-media-driver/package.nix
index 4d2484c7f48c..13f15f93c4c7 100644
--- a/pkgs/by-name/in/intel-media-driver/package.nix
+++ b/pkgs/by-name/in/intel-media-driver/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "intel-media-driver";
-  version = "26.2.4";
+  version = "26.3.5";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "intel";
     repo = "media-driver";
     tag = "intel-media-${finalAttrs.version}";
-    hash = "sha256-dgdqezwnwY5FCaDhov0ft4gnhRdCDyD2DFJ17sF2d4o=";
+    hash = "sha256-DSyF3CLNdj4pi2DHOduNc0pZ70qVmMoKu0ReQyqprFk=";
   };
 
   patches = [

From e138c17220166e5b883a345eeb46c4e0670083d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 13 Oct 2026 15:54:48 +0000
Subject: [PATCH 56/78] mongodb-atlas-cli: 1.59.0 -> 1.59.1

---
 pkgs/by-name/mo/mongodb-atlas-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
index 8a76129d0990..d815c5e0b2ee 100644
--- a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
+++ b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "mongodb-atlas-cli";
-  version = "1.59.0";
+  version = "1.59.1";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongodb-atlas-cli";
     tag = "atlascli/v${finalAttrs.version}";
-    hash = "sha256-5VX6lIZdLc+FCOtP+PFBRHcXJSReu2scMYfGEh3kKQs=";
+    hash = "sha256-q7bXQWkpOLZxDCzYTd71YAvi4F1OrPi0M/Wz0Rr1Uq0=";
   };
 
-  vendorHash = "sha256-h330R4hbRyDnMMpgYIw8JxF1/q8rOMyDK0dkIZSdGM4=";
+  vendorHash = "sha256-Vzx0uwKLpn0nXIHDrftNs2hu4FkpjmvdfUHriaShJaQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From b1757f5b3fea6049cfc2dc7c648b8e3766b04a6a Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Tue, 13 Oct 2026 16:35:27 -0400
Subject: [PATCH 57/78] kagen: modernize

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/ka/kagen/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ka/kagen/package.nix b/pkgs/by-name/ka/kagen/package.nix
index cafacbff8ac7..ba4a75d8b779 100644
--- a/pkgs/by-name/ka/kagen/package.nix
+++ b/pkgs/by-name/ka/kagen/package.nix
@@ -19,6 +19,9 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "kagen";
   version = "1.2.1";
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "KarlsruheGraphGeneration";
     repo = "kagen";
@@ -30,11 +33,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
+    mpi
     pkg-config
   ];
 
   buildInputs = [
     imagemagick
+    gtest
   ];
 
   propagatedBuildInputs = [

From 6578b4582b06c108e5b6efbe20abe8aa493f1b22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 13 Oct 2026 23:01:19 +0000
Subject: [PATCH 58/78] zwave-js-ui: 11.24.2 -> 11.24.3

---
 pkgs/by-name/zw/zwave-js-ui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix
index 8f6133d733da..41e82b10d473 100644
--- a/pkgs/by-name/zw/zwave-js-ui/package.nix
+++ b/pkgs/by-name/zw/zwave-js-ui/package.nix
@@ -7,15 +7,15 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-ui";
-  version = "11.24.2";
+  version = "11.24.3";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-ui";
     tag = "v${version}";
-    hash = "sha256-DRjos1Ay1UylUvJJojDAFB8+B5gW9DgjKSfAUp1WamY=";
+    hash = "sha256-Td93QUARvZHK1FZEB4ard6Lo43TgMKpz129/Knu4OQI=";
   };
-  npmDepsHash = "sha256-vFRRZxzKWoqNvrvXD1LKGs5oBqsF12yB4YoxdjPZQoI=";
+  npmDepsHash = "sha256-VS//DmkU/wP595PMslQIioAoOnW52kl8m5VX2qd+Geo=";
 
   passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
 

From 5509216d7817d4ee82770965366644dfd2f7f760 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Oct 2026 01:27:58 +0200
Subject: [PATCH 59/78] frigate: 0.18.0 -> 0.18.1

https://github.com/blakeblackshear/frigate/releases/tag/v0.18.1
---
 pkgs/by-name/fr/frigate/package.nix   |   4 +-
 pkgs/by-name/fr/frigate/pr23641.patch | 137 ++++++++++++++------------
 2 files changed, 76 insertions(+), 65 deletions(-)

diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix
index d97e1be68719..f7573cb3d72e 100644
--- a/pkgs/by-name/fr/frigate/package.nix
+++ b/pkgs/by-name/fr/frigate/package.nix
@@ -63,7 +63,7 @@ let
 in
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "frigate";
-  version = "0.18.0";
+  version = "0.18.1";
   pyproject = false;
 
   src = fetchFromGitHub {
@@ -71,7 +71,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     owner = "blakeblackshear";
     repo = "frigate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2FJG7tEZCuCQ6VJga9BMiuLTeswmlG8oN1MO6t0eroM=";
+    hash = "sha256-CLl55iXxt/lE0GE/OO2vXXMvNb+g6Hc9lZYyjkV/Bjk=";
   };
 
   patches = [
diff --git a/pkgs/by-name/fr/frigate/pr23641.patch b/pkgs/by-name/fr/frigate/pr23641.patch
index 281c651fcdde..a7db52682a52 100644
--- a/pkgs/by-name/fr/frigate/pr23641.patch
+++ b/pkgs/by-name/fr/frigate/pr23641.patch
@@ -1,4 +1,4 @@
-From e4bba6f9c03af6fe20c8bd090bb1bc94cbd9ef1f Mon Sep 17 00:00:00 2001
+From 5a7ee128bdf4af1a6db04f37db50a5061abe724e Mon Sep 17 00:00:00 2001
 From: Martin Weinelt <hexa@darmstadt.ccc.de>
 Date: Mon, 6 Jul 2026 13:14:54 +0200
 Subject: [PATCH 1/5] Migrate to fastapi lifespan for startup events
@@ -11,7 +11,7 @@ https://fastapi.tiangolo.com/advanced/events/
  1 file changed, 12 insertions(+), 9 deletions(-)
 
 diff --git a/frigate/api/fastapi_app.py b/frigate/api/fastapi_app.py
-index 387f0473fc..86058bfdaa 100644
+index 387f0473f..86058bfda 100644
 --- a/frigate/api/fastapi_app.py
 +++ b/frigate/api/fastapi_app.py
 @@ -1,6 +1,7 @@
@@ -43,7 +43,7 @@ index 387f0473fc..86058bfdaa 100644
          swagger_ui_parameters={"apisSorter": "alpha", "operationsSorter": "alpha"},
          dependencies=[Depends(require_admin_by_default())]
          if enforce_default_admin
-@@ -115,15 +127,6 @@ async def frigate_middleware(request: Request, call_next):
+@@ -115,15 +127,6 @@ def create_fastapi_app(
              database.close()
          return response
  
@@ -59,8 +59,10 @@ index 387f0473fc..86058bfdaa 100644
      # Rate limiter (used for login endpoint)
      if frigate_config.auth.failed_login_rate_limit is None:
          limiter.enabled = False
+-- 
+2.55.0
 
-From ef8fcf2328bd59b6d30c7ca523e39909a8b8c01e Mon Sep 17 00:00:00 2001
+From 46cdd45c957d5d5c5a864d99ecb4e52586218f85 Mon Sep 17 00:00:00 2001
 From: Martin Weinelt <hexa@darmstadt.ccc.de>
 Date: Mon, 6 Jul 2026 13:16:58 +0200
 Subject: [PATCH 2/5] Migrate to pydantic TypeAdapter
@@ -71,10 +73,10 @@ https://pydantic.dev/docs/validation/2.12/get-started/migration/#introduction-of
  1 file changed, 12 insertions(+), 6 deletions(-)
 
 diff --git a/frigate/test/test_object_detector.py b/frigate/test/test_object_detector.py
-index dc15b23516..33748c2807 100644
+index dc15b2351..33748c280 100644
 --- a/frigate/test/test_object_detector.py
 +++ b/frigate/test/test_object_detector.py
-@@ -2,7 +2,7 @@
+@@ -2,7 +2,7 @@ import unittest
  from unittest.mock import Mock, patch
  
  import numpy as np
@@ -83,7 +85,7 @@ index dc15b23516..33748c2807 100644
  
  import frigate.detectors as detectors
  import frigate.object_detection.base
-@@ -19,8 +19,8 @@ def test_localdetectorprocess_should_only_create_specified_detector_type(self):
+@@ -19,8 +19,8 @@ class TestLocalObjectDetector(unittest.TestCase):
                      "frigate.detectors.api_types",
                      {det_type: Mock() for det_type in DetectorTypeEnum},
                  ):
@@ -94,7 +96,7 @@ index dc15b23516..33748c2807 100644
                      )
                      test_cfg.model.path = "/test/modelpath"
                      test_obj = frigate.object_detection.base.LocalObjectDetector(
-@@ -44,7 +44,9 @@ def test_detect_raw_given_tensor_input_should_return_api_detect_raw_result(self)
+@@ -44,7 +44,9 @@ class TestLocalObjectDetector(unittest.TestCase):
          TEST_DATA = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
          TEST_DETECT_RESULT = np.ndarray([1, 2, 4, 8, 16, 32])
          test_obj_detect = frigate.object_detection.base.LocalObjectDetector(
@@ -105,7 +107,7 @@ index dc15b23516..33748c2807 100644
          )
  
          mock_det_api = mock_cputfl.return_value
-@@ -67,7 +69,9 @@ def test_detect_raw_given_tensor_input_should_call_api_detect_raw_with_transpose
+@@ -67,7 +69,9 @@ class TestLocalObjectDetector(unittest.TestCase):
          TEST_DATA = np.zeros((1, 32, 32, 3), np.uint8)
          TEST_DETECT_RESULT = np.ndarray([1, 2, 4, 8, 16, 32])
  
@@ -116,7 +118,7 @@ index dc15b23516..33748c2807 100644
          test_cfg.model.input_tensor = InputTensorEnum.nchw
  
          test_obj_detect = frigate.object_detection.base.LocalObjectDetector(
-@@ -116,7 +120,9 @@ def test_detect_given_tensor_input_should_return_lfiltered_detections(
+@@ -116,7 +120,9 @@ class TestLocalObjectDetector(unittest.TestCase):
              "label-5",
          ]
  
@@ -127,8 +129,10 @@ index dc15b23516..33748c2807 100644
          test_cfg.model = ModelConfig()
          test_obj_detect = frigate.object_detection.base.LocalObjectDetector(
              detector_config=test_cfg,
+-- 
+2.55.0
 
-From e9f1435eeb337bf7e269af1b09a0b1b87de719d5 Mon Sep 17 00:00:00 2001
+From 2e774cd1c3cadc10c10eaa5cfebd2f17b8abb6b1 Mon Sep 17 00:00:00 2001
 From: Martin Weinelt <hexa@darmstadt.ccc.de>
 Date: Mon, 6 Jul 2026 13:17:16 +0200
 Subject: [PATCH 3/5] Replace pytz with native tz-aware objects and zoneinfo
@@ -153,7 +157,7 @@ https://blog.ganssle.io/articles/2019/11/utcnow.html.
  13 files changed, 50 insertions(+), 55 deletions(-)
 
 diff --git a/docker/main/requirements-wheels.txt b/docker/main/requirements-wheels.txt
-index 5ed9664fc2..164ab3b853 100644
+index 5ed9664fc..164ab3b85 100644
 --- a/docker/main/requirements-wheels.txt
 +++ b/docker/main/requirements-wheels.txt
 @@ -25,7 +25,6 @@ peewee_migrate == 1.14.*
@@ -165,7 +169,7 @@ index 5ed9664fc2..164ab3b853 100644
  ruamel.yaml == 0.18.*
  tzlocal == 5.2
 diff --git a/docs/static/frigate-api.yaml b/docs/static/frigate-api.yaml
-index fe467e0c62..3ce79e4ae6 100644
+index 7753ed7af..0c331c9e2 100644
 --- a/docs/static/frigate-api.yaml
 +++ b/docs/static/frigate-api.yaml
 @@ -2087,7 +2087,7 @@ paths:
@@ -186,7 +190,7 @@ index fe467e0c62..3ce79e4ae6 100644
              title: Timezone
        responses:
          '200':
-@@ -4227,7 +4227,7 @@ paths:
+@@ -4237,7 +4237,7 @@ paths:
              anyOf:
                - type: string
                - type: 'null'
@@ -195,7 +199,7 @@ index fe467e0c62..3ce79e4ae6 100644
              title: Timezone
        responses:
          '200':
-@@ -4479,7 +4479,7 @@ paths:
+@@ -4499,7 +4499,7 @@ paths:
              anyOf:
                - type: string
                - type: 'null'
@@ -204,7 +208,7 @@ index fe467e0c62..3ce79e4ae6 100644
              title: Timezone
          - name: min_score
            in: query
-@@ -4559,7 +4559,7 @@ paths:
+@@ -4579,7 +4579,7 @@ paths:
              anyOf:
                - type: string
                - type: 'null'
@@ -213,7 +217,7 @@ index fe467e0c62..3ce79e4ae6 100644
              title: Timezone
          - name: has_clip
            in: query
-@@ -6854,7 +6854,7 @@ paths:
+@@ -6875,7 +6875,7 @@ paths:
            required: false
            schema:
              type: string
@@ -222,7 +226,7 @@ index fe467e0c62..3ce79e4ae6 100644
              title: Timezone
          - name: cameras
            in: query
-@@ -6904,7 +6904,7 @@ paths:
+@@ -6925,7 +6925,7 @@ paths:
            required: false
            schema:
              type: string
@@ -232,7 +236,7 @@ index fe467e0c62..3ce79e4ae6 100644
        responses:
          '200':
 diff --git a/frigate/api/defs/query/app_query_parameters.py b/frigate/api/defs/query/app_query_parameters.py
-index 626d39679b..26974d59b9 100644
+index 626d39679..26974d59b 100644
 --- a/frigate/api/defs/query/app_query_parameters.py
 +++ b/frigate/api/defs/query/app_query_parameters.py
 @@ -7,4 +7,4 @@ class AppTimelineHourlyQueryParameters(BaseModel):
@@ -242,10 +246,10 @@ index 626d39679b..26974d59b9 100644
 -    timezone: str | None = "utc"
 +    timezone: str | None = "UTC"
 diff --git a/frigate/api/defs/query/events_query_parameters.py b/frigate/api/defs/query/events_query_parameters.py
-index 06d0dfc3af..30d0fcac50 100644
+index 80cc77c72..1cbc2d80a 100644
 --- a/frigate/api/defs/query/events_query_parameters.py
 +++ b/frigate/api/defs/query/events_query_parameters.py
-@@ -39,7 +39,7 @@ class EventsQueryParams(BaseModel):
+@@ -40,7 +40,7 @@ class EventsQueryParams(BaseModel):
      max_length: float | None = None
      event_id: str | None = None
      sort: str | None = None
@@ -254,7 +258,7 @@ index 06d0dfc3af..30d0fcac50 100644
  
  
  class EventsSearchQueryParams(BaseModel):
-@@ -66,7 +66,7 @@ class EventsSearchQueryParams(BaseModel):
+@@ -68,7 +68,7 @@ class EventsSearchQueryParams(BaseModel):
      has_clip: bool | None = None
      has_snapshot: bool | None = None
      is_submitted: bool | None = None
@@ -263,7 +267,7 @@ index 06d0dfc3af..30d0fcac50 100644
      min_score: float | None = None
      max_score: float | None = None
      min_speed: float | None = None
-@@ -76,6 +76,6 @@ class EventsSearchQueryParams(BaseModel):
+@@ -78,6 +78,6 @@ class EventsSearchQueryParams(BaseModel):
  
  
  class EventsSummaryQueryParams(BaseModel):
@@ -272,10 +276,10 @@ index 06d0dfc3af..30d0fcac50 100644
      has_clip: int | None = None
      has_snapshot: int | None = None
 diff --git a/frigate/api/defs/query/recordings_query_parameters.py b/frigate/api/defs/query/recordings_query_parameters.py
-index 770da96bb8..cd7b4221c2 100644
+index 770da96bb..cd7b4221c 100644
 --- a/frigate/api/defs/query/recordings_query_parameters.py
 +++ b/frigate/api/defs/query/recordings_query_parameters.py
-@@ -3,7 +3,7 @@
+@@ -3,7 +3,7 @@ from pydantic.json_schema import SkipJsonSchema
  
  
  class MediaRecordingsSummaryQueryParams(BaseModel):
@@ -285,7 +289,7 @@ index 770da96bb8..cd7b4221c2 100644
  
  
 diff --git a/frigate/api/defs/query/review_query_parameters.py b/frigate/api/defs/query/review_query_parameters.py
-index b16146a9bc..16f759f42a 100644
+index b16146a9b..16f759f42 100644
 --- a/frigate/api/defs/query/review_query_parameters.py
 +++ b/frigate/api/defs/query/review_query_parameters.py
 @@ -19,7 +19,7 @@ class ReviewSummaryQueryParams(BaseModel):
@@ -298,10 +302,10 @@ index b16146a9bc..16f759f42a 100644
  
  class ReviewActivityMotionQueryParams(BaseModel):
 diff --git a/frigate/api/media.py b/frigate/api/media.py
-index c6fa90c068..a5f5e1bab8 100644
+index d6e2a7f83..632d81554 100644
 --- a/frigate/api/media.py
 +++ b/frigate/api/media.py
-@@ -11,10 +11,10 @@
+@@ -11,10 +11,10 @@ from datetime import UTC, datetime, timedelta
  from pathlib import Path as FilePath
  from typing import Any
  from urllib.parse import unquote
@@ -313,7 +317,7 @@ index c6fa90c068..a5f5e1bab8 100644
  from fastapi import APIRouter, Depends, Path, Query, Request, Response
  from fastapi.responses import FileResponse, JSONResponse, StreamingResponse
  from pathvalidate import sanitize_filename
-@@ -714,7 +714,7 @@ async def vod_hour(
+@@ -723,7 +723,7 @@ async def vod_hour(
      parts = year_month.split("-")
      start_date = (
          datetime(int(parts[0]), int(parts[1]), day, hour, tzinfo=UTC)
@@ -323,10 +327,10 @@ index c6fa90c068..a5f5e1bab8 100644
      end_date = start_date + timedelta(hours=1) - timedelta(milliseconds=1)
      start_ts = start_date.timestamp()
 diff --git a/frigate/api/preview.py b/frigate/api/preview.py
-index 1047591434..af84117fd6 100644
+index 104759143..af84117fd 100644
 --- a/frigate/api/preview.py
 +++ b/frigate/api/preview.py
-@@ -5,8 +5,8 @@
+@@ -5,8 +5,8 @@ import logging
  import os
  import threading
  from datetime import UTC, datetime, timedelta
@@ -346,7 +350,7 @@ index 1047591434..af84117fd6 100644
      end_date = start_date + timedelta(hours=1) - timedelta(milliseconds=1)
      start_ts = start_date.timestamp()
 diff --git a/frigate/api/record.py b/frigate/api/record.py
-index 5db257f482..3352ec039b 100644
+index 5db257f48..3352ec039 100644
 --- a/frigate/api/record.py
 +++ b/frigate/api/record.py
 @@ -120,7 +120,7 @@ def all_recordings_summary(
@@ -359,10 +363,10 @@ index 5db257f482..3352ec039b 100644
  
      time_range_query = (
 diff --git a/frigate/record/export.py b/frigate/record/export.py
-index 5d307077c9..0564dee04b 100644
+index 00addda12..79f2fb9a6 100644
 --- a/frigate/record/export.py
 +++ b/frigate/record/export.py
-@@ -12,8 +12,8 @@
+@@ -12,8 +12,8 @@ import threading
  from collections.abc import Callable
  from enum import Enum
  from pathlib import Path
@@ -372,7 +376,7 @@ index 5d307077c9..0564dee04b 100644
  from peewee import DoesNotExist
  
  from frigate.config import FfmpegConfig, FrigateConfig
-@@ -371,8 +371,8 @@ def get_datetime_from_timestamp(self, timestamp: int) -> str:
+@@ -372,8 +372,8 @@ class RecordingExporter(threading.Thread):
          tz_name = self.config.ui.timezone
          if tz_name:
              try:
@@ -383,7 +387,7 @@ index 5d307077c9..0564dee04b 100644
                  tz = None
              if tz is not None:
                  return datetime.datetime.fromtimestamp(timestamp, tz=tz).strftime(
-@@ -533,8 +533,8 @@ def _build_recording_segment_chapter_metadata_file(
+@@ -534,8 +534,8 @@ class RecordingExporter(threading.Thread):
          tz: datetime.tzinfo | None = None
          if tz_name:
              try:
@@ -395,20 +399,20 @@ index 5d307077c9..0564dee04b 100644
          if tz is None:
              tz = datetime.UTC
 diff --git a/frigate/test/http_api/test_http_media.py b/frigate/test/http_api/test_http_media.py
-index b2d83cbc8a..8a3835c324 100644
+index 252d8a0af..a693d9f67 100644
 --- a/frigate/test/http_api/test_http_media.py
 +++ b/frigate/test/http_api/test_http_media.py
-@@ -1,8 +1,8 @@
- """Unit tests for recordings/media API endpoints."""
- 
+@@ -4,8 +4,8 @@ import threading
+ from concurrent.futures import ThreadPoolExecutor
  from datetime import UTC, datetime
+ from unittest.mock import patch
 +from zoneinfo import ZoneInfo
  
 -import pytz
  from fastapi import Request
  
  from frigate.api.auth import get_allowed_cameras_for_filter, get_current_user
-@@ -51,16 +51,16 @@ def test_recordings_summary_across_dst_spring_forward(self):
+@@ -54,16 +54,16 @@ class TestHttpMedia(BaseTestHttp):
          In 2024, DST in America/New_York transitions on March 10, 2024 at 2:00 AM
          Clocks spring forward from 2:00 AM to 3:00 AM (EST to EDT)
          """
@@ -429,7 +433,7 @@ index b2d83cbc8a..8a3835c324 100644
  
          with AuthTestClient(self.app) as client:
              # Insert recordings for each day
-@@ -124,19 +124,16 @@ def test_recordings_summary_across_dst_fall_back(self):
+@@ -127,19 +127,16 @@ class TestHttpMedia(BaseTestHttp):
          In 2024, DST in America/New_York transitions on November 3, 2024 at 2:00 AM
          Clocks fall back from 2:00 AM to 1:00 AM (EDT to EST)
          """
@@ -453,7 +457,7 @@ index b2d83cbc8a..8a3835c324 100644
  
          with AuthTestClient(self.app) as client:
              # Insert recordings for each day
-@@ -197,13 +194,13 @@ def test_recordings_summary_multiple_cameras_across_dst(self):
+@@ -200,13 +197,13 @@ class TestHttpMedia(BaseTestHttp):
          """
          Test recordings summary with multiple cameras across DST boundary.
          """
@@ -470,7 +474,7 @@ index b2d83cbc8a..8a3835c324 100644
  
          with AuthTestClient(self.app) as client:
              # Override allowed cameras for this test to include both
-@@ -266,15 +263,15 @@ def test_recordings_summary_at_dst_transition_time(self):
+@@ -269,15 +266,15 @@ class TestHttpMedia(BaseTestHttp):
          """
          Test recordings that span the exact DST transition time.
          """
@@ -489,7 +493,7 @@ index b2d83cbc8a..8a3835c324 100644
  
          with AuthTestClient(self.app) as client:
              Recordings.insert(
-@@ -334,7 +331,7 @@ def test_recordings_summary_utc_timezone(self):
+@@ -337,7 +334,7 @@ class TestHttpMedia(BaseTestHttp):
  
              # Test with UTC timezone
              response = client.get(
@@ -498,7 +502,7 @@ index b2d83cbc8a..8a3835c324 100644
              )
  
              assert response.status_code == 200
-@@ -365,8 +362,8 @@ def test_recordings_summary_single_camera_filter(self):
+@@ -368,8 +365,8 @@ class TestHttpMedia(BaseTestHttp):
          """
          Test recordings summary filtered to a single camera.
          """
@@ -510,10 +514,10 @@ index b2d83cbc8a..8a3835c324 100644
          with AuthTestClient(self.app) as client:
              # Insert recordings for both cameras
 diff --git a/frigate/test/http_api/test_http_review.py b/frigate/test/http_api/test_http_review.py
-index d13a7bd273..62d4f1608d 100644
+index e2312e771..3dd319b6c 100644
 --- a/frigate/test/http_api/test_http_review.py
 +++ b/frigate/test/http_api/test_http_review.py
-@@ -250,7 +250,7 @@ def test_get_review_summary_all_filters(self):
+@@ -342,7 +342,7 @@ class TestHttpReview(BaseTestHttp):
                  "cameras": "front_door",
                  "labels": "all",
                  "zones": "all",
@@ -523,7 +527,7 @@ index d13a7bd273..62d4f1608d 100644
              response = client.get("/review/summary", params=params)
              assert response.status_code == 200
 diff --git a/frigate/util/time.py b/frigate/util/time.py
-index 861bec17f6..777ae9cc11 100644
+index 861bec17f..777ae9cc1 100644
 --- a/frigate/util/time.py
 +++ b/frigate/util/time.py
 @@ -2,9 +2,8 @@
@@ -537,7 +541,7 @@ index 861bec17f6..777ae9cc11 100644
  from tzlocal import get_localzone
  
  logger = logging.getLogger(__name__)
-@@ -12,7 +11,7 @@
+@@ -12,7 +11,7 @@ logger = logging.getLogger(__name__)
  
  def get_tz_modifiers(tz_name: str) -> tuple[str, str, float]:
      seconds_offset = (
@@ -592,8 +596,10 @@ index 861bec17f6..777ae9cc11 100644
          local_dt = dt.astimezone(tz)
          current_offset = local_dt.utcoffset().total_seconds()
  
+-- 
+2.55.0
 
-From af86312f3dd57c068c3f6b3ae68d8fa6f77c6e30 Mon Sep 17 00:00:00 2001
+From b62ef0459bbe096631da95a4e6d94cf8177eef01 Mon Sep 17 00:00:00 2001
 From: Martin Weinelt <hexa@darmstadt.ccc.de>
 Date: Mon, 6 Jul 2026 16:21:01 +0200
 Subject: [PATCH 4/5] Provide lookup for normalized timezone names
@@ -608,10 +614,10 @@ of the casing of the given timezone name.
  4 files changed, 30 insertions(+), 8 deletions(-)
 
 diff --git a/frigate/api/media.py b/frigate/api/media.py
-index a5f5e1bab8..14ae263053 100644
+index 632d81554..af8998b8c 100644
 --- a/frigate/api/media.py
 +++ b/frigate/api/media.py
-@@ -54,6 +54,7 @@
+@@ -54,6 +54,7 @@ from frigate.util.file import (
  from frigate.util.image import get_image_from_recording, get_image_quality_params
  from frigate.util.media import get_keyframe_before
  from frigate.util.object import create_empty_regions_grid
@@ -619,7 +625,7 @@ index a5f5e1bab8..14ae263053 100644
  
  logger = logging.getLogger(__name__)
  
-@@ -714,7 +715,9 @@ async def vod_hour(
+@@ -723,7 +724,9 @@ async def vod_hour(
      parts = year_month.split("-")
      start_date = (
          datetime(int(parts[0]), int(parts[1]), day, hour, tzinfo=UTC)
@@ -631,10 +637,10 @@ index a5f5e1bab8..14ae263053 100644
      end_date = start_date + timedelta(hours=1) - timedelta(milliseconds=1)
      start_ts = start_date.timestamp()
 diff --git a/frigate/api/preview.py b/frigate/api/preview.py
-index af84117fd6..81de23d003 100644
+index af84117fd..81de23d00 100644
 --- a/frigate/api/preview.py
 +++ b/frigate/api/preview.py
-@@ -22,6 +22,7 @@
+@@ -22,6 +22,7 @@ from frigate.api.defs.response.preview_response import (
  from frigate.api.defs.tags import Tags
  from frigate.const import BASE_DIR, CACHE_DIR, PREVIEW_FRAME_TYPE
  from frigate.models import Previews
@@ -654,10 +660,10 @@ index af84117fd6..81de23d003 100644
      end_date = start_date + timedelta(hours=1) - timedelta(milliseconds=1)
      start_ts = start_date.timestamp()
 diff --git a/frigate/record/export.py b/frigate/record/export.py
-index 0564dee04b..ff33063bc3 100644
+index 79f2fb9a6..f5bd1cd31 100644
 --- a/frigate/record/export.py
 +++ b/frigate/record/export.py
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ from frigate.ffmpeg_presets import (
  )
  from frigate.models import Export, Previews, Recordings, ReviewSegment
  from frigate.util.ffmpeg import run_ffmpeg_with_progress
@@ -666,7 +672,7 @@ index 0564dee04b..ff33063bc3 100644
  
  logger = logging.getLogger(__name__)
  
-@@ -371,7 +371,7 @@ def get_datetime_from_timestamp(self, timestamp: int) -> str:
+@@ -372,7 +372,7 @@ class RecordingExporter(threading.Thread):
          tz_name = self.config.ui.timezone
          if tz_name:
              try:
@@ -675,7 +681,7 @@ index 0564dee04b..ff33063bc3 100644
              except (ValueError, ZoneInfoNotFoundError):
                  tz = None
              if tz is not None:
-@@ -533,7 +533,7 @@ def _build_recording_segment_chapter_metadata_file(
+@@ -534,7 +534,7 @@ class RecordingExporter(threading.Thread):
          tz: datetime.tzinfo | None = None
          if tz_name:
              try:
@@ -685,7 +691,7 @@ index 0564dee04b..ff33063bc3 100644
                  tz = None
          if tz is None:
 diff --git a/frigate/util/time.py b/frigate/util/time.py
-index 777ae9cc11..a4395c5d5d 100644
+index 777ae9cc1..a4395c5d5 100644
 --- a/frigate/util/time.py
 +++ b/frigate/util/time.py
 @@ -2,16 +2,32 @@
@@ -732,8 +738,10 @@ index 777ae9cc11..a4395c5d5d 100644
      except (ValueError, ZoneInfoNotFoundError):
          # If timezone is invalid, return single period with no offset
          return [(start_time, end_time, 0)]
+-- 
+2.55.0
 
-From 490f1b93f8cc2aa450e74e882aa31516d6c1078c Mon Sep 17 00:00:00 2001
+From f5609f623c12cce7bc7e19bf6f2e276c436772d6 Mon Sep 17 00:00:00 2001
 From: Martin Weinelt <hexa@darmstadt.ccc.de>
 Date: Mon, 6 Jul 2026 18:12:37 +0200
 Subject: [PATCH 5/5] Test timezone naming normalization and error handling
@@ -745,7 +753,7 @@ Subject: [PATCH 5/5] Test timezone naming normalization and error handling
 
 diff --git a/frigate/test/test_tz.py b/frigate/test/test_tz.py
 new file mode 100644
-index 0000000000..5be8010dda
+index 000000000..5be8010dd
 --- /dev/null
 +++ b/frigate/test/test_tz.py
 @@ -0,0 +1,19 @@
@@ -768,3 +776,6 @@ index 0000000000..5be8010dda
 +    def test_invalid(self):
 +        with self.assertRaisesRegex(ValueError, r"Unknown timezone: foo/bar"):
 +            get_normalized_tz_name("foo/bar")
+-- 
+2.55.0
+

From b89110be6a2fc5308b625f0cefcb3a3ba956471d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 Oct 2026 00:33:37 +0000
Subject: [PATCH 60/78] cargo-tauri: 2.11.4 -> 2.12.2

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

diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
index af2ab9087fed..16a5472192dc 100644
--- a/pkgs/by-name/ca/cargo-tauri/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tauri";
-  version = "2.11.4";
+  version = "2.12.2";
 
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "tauri";
     tag = "tauri-cli-v${finalAttrs.version}";
-    hash = "sha256-bYkooyO8msGlewK4zU8NSgGQwAKzc5xfboMakugukBc=";
+    hash = "sha256-GSxBnwMnsBrYxEbUs11MlQP/3/0F0QwOOnvCuz7B3+o=";
   };
 
-  cargoHash = "sha256-S1t4GsBQ4/ktSvLitb8FufnXwZfwVc9r8z9tCLRDy8Y=";
+  cargoHash = "sha256-qFJ0mA+kmhvXcjPaYnSr7gR2GZ2rfqcS1t2HMtAaFcc=";
 
   nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [
     pkg-config

From eda88ee46793a249498ba22a80ac7d9879201502 Mon Sep 17 00:00:00 2001
From: Brandon Bennett <brandon@brbe.me>
Date: Mon, 5 Oct 2026 19:22:01 -0600
Subject: [PATCH 61/78] pkl: 0.31.1 -> 0.32.1

https://github.com/apple/pkl/releases/tag/0.32.1
https://pkl-lang.org/main/0.32/release-notes/0.32.html

Use JDK 25 for build and runtime, refresh Gradle dependencies and test
patches, and remove the obsolete msgpack lockfile repair. Permit version
ranges during dependency collection and prefer IPv4 for sandboxed Darwin
builds, following signal-cli (#565650).

Fix the external-reader test fixture interpreter and exclude additional
Gradle tests that fetch dependencies outside the MITM cache.

Assisted-by: Codex (GPT-6)
---
 pkgs/by-name/pk/pkl/deps.json                 | 2030 +++++++----------
 pkgs/by-name/pk/pkl/disable_bad_tests.patch   |   11 +-
 .../pk/pkl/disable_gradle_codegen_tests.patch |   39 +-
 pkgs/by-name/pk/pkl/package.nix               |   27 +-
 ...r_org.msgpack-msgpack-core_lockfiles.patch |   52 -
 5 files changed, 856 insertions(+), 1303 deletions(-)
 delete mode 100644 pkgs/by-name/pk/pkl/repair_org.msgpack-msgpack-core_lockfiles.patch

diff --git a/pkgs/by-name/pk/pkl/deps.json b/pkgs/by-name/pk/pkl/deps.json
index b1ea3bf2c5e7..32bf7fbdeaee 100644
--- a/pkgs/by-name/pk/pkl/deps.json
+++ b/pkgs/by-name/pk/pkl/deps.json
@@ -1,73 +1,14 @@
 {
  "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
  "!version": 1,
- "https://cache-redirector.jetbrains.com": {
-  "intellij-dependencies/org/jetbrains/intellij/deps#asm-all/9.6.1": {
-   "jar": "sha256-py6E77FAanqzJuCyjEN26eHr/AjAnyPt/15ucklYjfc=",
-   "pom": "sha256-sb6PEPz9zNxGZMcpdhrEZiEpbe4NiIHoMQhRuMhCes4="
-  },
-  "www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/java#java-compiler-ant-tasks/252.26830.84": {
-   "jar": "sha256-aHfe0PGV8RmLK6jmwiYDYVRAVYu2kk720JwKAu9GuVQ=",
-   "pom": "sha256-gcT+th5Tey7WfrhbQTMBWwn4PgGTg36KKZr/XyiQqkE="
-  },
-  "www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/java#java-compiler-instrumentation-util-java8/252.26830.84": {
-   "jar": "sha256-6jtJLoavaRELzZ/H6aiicPWeY7TYzNKCZJoVOh3Pyc0=",
-   "pom": "sha256-9p5zrBHE5kCK1BA30fuYMZuIRoWzXUIvj0o8R6dczks="
-  },
-  "www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/java#java-compiler-instrumentation-util/252.26830.84": {
-   "jar": "sha256-5D++7lj4LbPEBke2dFfSj43U6G4uWofThz3nwQDGrnM=",
-   "pom": "sha256-F4Dj8waVYA1xgqK+AlhTr0NadvyGuXYc5DhgQVyWhJQ="
-  },
-  "www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/java#java-gui-forms-compiler/252.26830.84": {
-   "jar": "sha256-AQqvcMl7+m+uuMhDzRsOXFoN0TNGTR5Qx8ZbOlTSXpo=",
-   "pom": "sha256-zACAxZzsgCWqYPD1TsW7m5bklOcTv+4qPElGedoN6xA="
-  },
-  "www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/java#java-gui-forms-rt/252.26830.84": {
-   "jar": "sha256-aEsHOaiATmPLILELy9rg/b3TP14n+RKWi7f8LtH1rEE=",
-   "pom": "sha256-GUhr+HFLPoJ/NQbwy3zj3jQjqhhpsnHmobcCB9p5H6Y="
-  },
-  "www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/java/java-compiler-ant-tasks/maven-metadata": {
-   "xml": {
-    "groupId": "com.jetbrains.intellij.java",
-    "lastUpdated": "20260928112703",
-    "release": "262.10968.136"
-   }
-  },
-  "www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/platform#util-jdom/252.26830.84": {
-   "jar": "sha256-efM61v24XtrSzK5uxmvMlkmhxXb+UXg2w57CP079wZQ=",
-   "pom": "sha256-tX1pzgFFeQqGixWV1BhVyT/CWZglE4Q/8NtzWt7jPhA="
-  },
-  "www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/java/java-compiler-ant-tasks/maven-metadata": {
-   "xml": {
-    "groupId": "com.jetbrains.intellij.java",
-    "lastUpdated": "20260930172448",
-    "release": "263.6259.21"
-   }
-  }
- },
- "https://download.jetbrains.com": {
-  "idea/ideaIC-2025.2.3": {
-   "tar.gz": "sha256-a3xnHpexQZyiL/TEoy58pRV35Bd1ib/TIb2aJt8Wybo="
-  }
- },
  "https://plugins.gradle.org/m2": {
-  "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.6.1": {
-   "pom": "sha256-Pj4PpBJMMdsPCox1AspldKvAncODpaxcWCBA1TJE0RI="
-  },
-  "com/gradleup/shadow/com.gradleup.shadow.gradle.plugin/maven-metadata": {
-   "xml": {
-    "groupId": "com.gradleup.shadow",
-    "lastUpdated": "20260722011204",
-    "release": "9.6.1"
-   }
-  },
   "gradle/plugin/org/gradle/crypto#checksum/1.4.0": {
    "jar": "sha256-GZuCZMulLIpIqibHExIveIFOPB6AGmrwsgoaUdXFsJQ=",
    "pom": "sha256-9JIlgzqyRZYjC9qx+OQyOJFVNx9h7MBLiRUbL/AydBk="
   },
-  "gradle/plugin/org/jetbrains/gradle/plugin/idea-ext#gradle-idea-ext/1.1.9": {
-   "jar": "sha256-581IH2xEr1PReSD/VQU256P5SjGC6b0euN+Udy3E6Ow=",
-   "pom": "sha256-FOT6q6pDC/wzpuk92vzIj1Ct88uGb/RXzqqClJEVNcc="
+  "gradle/plugin/org/jetbrains/gradle/plugin/idea-ext#gradle-idea-ext/1.4.1": {
+   "jar": "sha256-unoFHkwVHP4dSoxGCjIA1YemlwwI/yuEMjPa4Sh7FXY=",
+   "pom": "sha256-O90zL1i+vYUg2G28JYoh8yLlm1FAcH9xFVxk43qbtOo="
   },
   "io/github/gradle-nexus#publish-plugin/2.0.0": {
    "jar": "sha256-lCwaFtFh9kYxkBtOLa1UHS/L/lHPAyOVXavgLiqe8qo=",
@@ -77,13 +18,23 @@
   "io/github/gradle-nexus/publish-plugin#io.github.gradle-nexus.publish-plugin.gradle.plugin/2.0.0": {
    "pom": "sha256-oymrlfS/3VyJEIPK06uzB0H9xroLspsRUqgP4KadYu8="
   },
-  "me/champeau/jmh#jmh-gradle-plugin/0.7.2": {
-   "jar": "sha256-2Wcgmf+Pw/m/PU0BWGThWG8H7L0qihd6ZhhO8LaKumU=",
-   "module": "sha256-bYSa50VKs5Fxjl/HDicWQY7z7SZEcjRb2Axt5k4AtsQ=",
-   "pom": "sha256-FdkdAH98O7wCJseQSM3cRf/BJPoegAgu//jhAwxoSg8="
+  "me/champeau/jmh#jmh-gradle-plugin/0.7.3": {
+   "jar": "sha256-1wl+YZVB2Q4KlwsqaFc+Iq0B0pme5TZdVtWYMHZb+Y8=",
+   "module": "sha256-NIfRq6JP4K9SfG1feLXw6P1k/ph4cItGDmYA45pHvEM=",
+   "pom": "sha256-q01ZN3zri1A/HyetEg53jpK2fTnAv/dxZfv701ZcCYI="
   },
-  "me/champeau/jmh#me.champeau.jmh.gradle.plugin/0.7.2": {
-   "pom": "sha256-V+DCOsYJRa77WgxKkzm+poopU2TKR8epB5oDL3kBOrs="
+  "me/champeau/jmh#me.champeau.jmh.gradle.plugin/0.7.3": {
+   "pom": "sha256-1RYiazsRTksy1CVE0dJ5bHMsVGXV2ufMhGvmsjvtjR0="
+  },
+  "net/ltgt/gradle#gradle-errorprone-plugin/5.1.0": {
+   "jar": "sha256-mFJMxRZwzVHesAdFNb9eo3O3KY6ghmne+VK8PSy7eyo=",
+   "module": "sha256-HYwRUTYlZI2yeHUOYBGJKUnlR2C641ahRc8tz1tSpqc=",
+   "pom": "sha256-tLkH2LgEDm6YXjNOhVUwu13l7iQ+PinXYgjyc0REYQo="
+  },
+  "net/ltgt/gradle#gradle-nullaway-plugin/3.0.0": {
+   "jar": "sha256-5oSt/pa+LM5ebHdaQJGGhkuph/H0OOLVhyTt21kYPgk=",
+   "module": "sha256-yxvubtbJqkaf8A3d9dSrOv7UD0yFfko3cpl116WwyC8=",
+   "pom": "sha256-m466f0yq9Dyi70cwvGlH2Tl/QXJzm2QAUbZnoIMv4P0="
   },
   "org/gradle/crypto/checksum#org.gradle.crypto.checksum.gradle.plugin/1.4.0": {
    "pom": "sha256-HzWQYt4QGbCRu7QhGghr4U0xCMX2mXisy9AbZRUFN0w="
@@ -104,16 +55,8 @@
   "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/1.0.0": {
    "pom": "sha256-8TMkmhh1Suah0nAdANhJsa+6ewaD3bX8GxinAHHOwvo="
   },
-  "org/jetbrains/gradle/plugin/idea-ext#org.jetbrains.gradle.plugin.idea-ext.gradle.plugin/1.1.9": {
-   "pom": "sha256-6wJgv+4Rm/1Rks144nHJcBaqRUx54PxVPd2Gbym+vTw="
-  },
-  "org/jetbrains/intellij/platform#intellij-platform-gradle-plugin/2.10.1": {
-   "jar": "sha256-9vKwRBf8qv0ICuDmt5fXPHmX8qa/jYcq3yt5G7bpYno=",
-   "module": "sha256-/ETighN61ABcHjPUmlcD+HNcRnME7p3myFM8YNOrXVI=",
-   "pom": "sha256-96pGao17RChgcx0nrYfLGQRRXWlD88g6qvr2UjsYJJA="
-  },
-  "org/jetbrains/intellij/platform#org.jetbrains.intellij.platform.gradle.plugin/2.10.1": {
-   "pom": "sha256-7vhxrEz78ep5mlCc/ZqqtCABofmKzBTV6ZgGslvrdPg="
+  "org/jetbrains/gradle/plugin/idea-ext#org.jetbrains.gradle.plugin.idea-ext.gradle.plugin/1.4.1": {
+   "pom": "sha256-u4C9r6a1Yy67g2Ql5Grlkr2aFPBz713gXH5v/Mc8jzA="
   }
  },
  "https://repo.maven.apache.org/maven2": {
@@ -129,142 +72,102 @@
    "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=",
    "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4="
   },
-  "com/diffplug/durian#durian-swt.os/4.2.2": {
-   "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=",
-   "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=",
-   "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU="
+  "com/diffplug/durian#durian-swt.os/4.3.0": {
+   "jar": "sha256-geK2Oafkvm3JtyRXE88G9cq1HynbLha5tXZFyW/eKIQ=",
+   "module": "sha256-IFNqlfL+sr9DBRKMaq7Lb9idxFeYqchfJgK4qAnXUNs=",
+   "pom": "sha256-Q1z/VXiZht7arXF/aPuo1UgklHhWLc2EsirU1lZvRAs="
   },
-  "com/diffplug/spotless#spotless-lib-extra/2.45.0": {
-   "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=",
-   "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=",
-   "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A="
+  "com/diffplug/spotless#spotless-lib-extra/4.7.0": {
+   "jar": "sha256-vciax56nfFUzRzZDf6MuhsUW1aCbayIXgORXl2Pe6mw=",
+   "module": "sha256-AFuJ+A/N+YczpVVnUO23+fLPkMBMHMu7+A5RML0W478=",
+   "pom": "sha256-laJic+i5Lo37eI16VItXUsmhRLDZAzJnSwCmv1R+0zE="
   },
-  "com/diffplug/spotless#spotless-lib/2.45.0": {
-   "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=",
-   "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=",
-   "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw="
+  "com/diffplug/spotless#spotless-lib/4.7.0": {
+   "jar": "sha256-jF4uWKFEj1pjFvAb7cnQ9N3aOOiEwFYyTn28RDMVRns=",
+   "module": "sha256-49pdAIRCM2IzAulHWNjzEJE8/fmDXiFmEcG/Rhj0ECo=",
+   "pom": "sha256-ngcUx2+Ybr5vFPHHoAMfw94G0IHv6ml7JHSe/hHGTBc="
   },
-  "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": {
-   "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=",
-   "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=",
-   "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo="
+  "com/diffplug/spotless#spotless-plugin-gradle/8.7.0": {
+   "jar": "sha256-t2RIUI5I74DVOsiaEDicHfyecL7tgSHNaFVfpsuzLtM=",
+   "module": "sha256-cYKaVUWLRCHqEM18dHuYJVHrhJpNOwL3GkYEidxizA8=",
+   "pom": "sha256-fvGO4r+vYaYWhp3Ifyiyw7roBGXfkbcWhPZheHU2kMI="
   },
-  "com/ethlo/time#itu/1.10.3": {
-   "jar": "sha256-I9O6hAldSJpZUkD4kEUIXqUGb7b8HcCRJY1XffnXSrw=",
-   "pom": "sha256-shihqWmXfQEerG6Ttzo6uwuIQGMK0aHxbr//JOWIbXQ="
-  },
-  "com/fasterxml#oss-parent/48": {
-   "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8="
+  "com/ethlo/time#itu/1.14.0": {
+   "jar": "sha256-XPQKsMx3goqyuHWx8+zXHIKV13IZM0dqvC4I/dzqFko=",
+   "pom": "sha256-DVrgvsCUlVKcY8yKbBMlOHBoaDKk47IGwTgWUDWuS8U="
   },
   "com/fasterxml#oss-parent/55": {
    "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0="
   },
-  "com/fasterxml#oss-parent/58": {
-   "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
-  },
   "com/fasterxml#oss-parent/61": {
    "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ="
   },
-  "com/fasterxml#oss-parent/65": {
-   "pom": "sha256-2wuaUmqeMDxjuptYSWicYfs4kkf6cjEFS5DgvwC0MR4="
-  },
   "com/fasterxml#oss-parent/68": {
    "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc="
   },
-  "com/fasterxml#oss-parent/69": {
-   "pom": "sha256-OFbVhKqhyOM86UxnJE9x9vcFOKJZ/+jngXYbn6qth18="
+  "com/fasterxml#oss-parent/70": {
+   "pom": "sha256-JsqO1vgsnS7XzTIpgQW7ZcD52JnbYXV6CXQVhvqTpjk="
   },
-  "com/fasterxml/jackson#jackson-base/2.14.2": {
-   "pom": "sha256-OuJFud+VEnMh8fkF9wO9MndP5VcVip06nlB9grK8TtQ="
+  "com/fasterxml#oss-parent/75": {
+   "pom": "sha256-/LvxwYyQR+aRfThPIGTiG0Klj8hfsFI6ni4BXv98YZ0="
   },
-  "com/fasterxml/jackson#jackson-base/2.17.2": {
-   "pom": "sha256-fPnFn70UyQVnRxN7kNcKleh3YN/huCRWufAjF9W1b68="
+  "com/fasterxml/jackson#jackson-base/2.20.1": {
+   "pom": "sha256-C3SKsMx/KH21tgGMYUz+Z+fh9NgJQc4vQdMXzMO1tcU="
   },
-  "com/fasterxml/jackson#jackson-base/2.19.0": {
-   "pom": "sha256-Noz4ykJkRni737F6sUfJC8QyWaWZUJfD8cT7au9Mdcg="
+  "com/fasterxml/jackson#jackson-bom/2.18.3": {
+   "pom": "sha256-8dTGrrMhGGUMgF/pu8XulA+o8s19DwT6Q2BVHponspA="
   },
-  "com/fasterxml/jackson#jackson-bom/2.14.2": {
-   "pom": "sha256-mqIJuzI5HL9fG9Pn+hGQFnYWms0ZDZiWtcHod8mZ/rw="
+  "com/fasterxml/jackson#jackson-bom/2.19.1": {
+   "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4="
   },
-  "com/fasterxml/jackson#jackson-bom/2.17.2": {
-   "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
+  "com/fasterxml/jackson#jackson-bom/2.20.1": {
+   "pom": "sha256-DGRn7UyMc5JSTOcDymzj7YhZbuw5DxOwwmTy+WEwilQ="
   },
-  "com/fasterxml/jackson#jackson-bom/2.19.0": {
-   "pom": "sha256-sR/LPvM6wH5oDObYXxfELWoz2waG+6z68OQ0j8Y5cbI="
+  "com/fasterxml/jackson#jackson-bom/2.21.2": {
+   "pom": "sha256-vGxUnmMpJ7udigraIMhGe1AH07eXx/XbA6m2DR3lm+M="
   },
-  "com/fasterxml/jackson#jackson-bom/2.19.2": {
-   "pom": "sha256-IgBr5w/QGAmemcbCesCYIyDzoPPCzgU8VXA1eaXuowM="
+  "com/fasterxml/jackson#jackson-parent/2.18.1": {
+   "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw="
   },
-  "com/fasterxml/jackson#jackson-parent/2.14": {
-   "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk="
+  "com/fasterxml/jackson#jackson-parent/2.19.2": {
+   "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U="
   },
-  "com/fasterxml/jackson#jackson-parent/2.17": {
-   "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
+  "com/fasterxml/jackson#jackson-parent/2.20": {
+   "pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U="
   },
-  "com/fasterxml/jackson#jackson-parent/2.19": {
-   "pom": "sha256-bNk0tNFdfz7hONl7I8y4Biqd5CJX7YelVs7k1NvvWxo="
+  "com/fasterxml/jackson#jackson-parent/2.21": {
+   "pom": "sha256-OFHfYn+utGiHuVYQRjC3Sou7X33iLpdM8VmC4g4Dc94="
   },
-  "com/fasterxml/jackson#jackson-parent/2.19.3": {
-   "pom": "sha256-I9GGyNjNBgFdAixxDHFUI9Zg1J4pc7FYcLApzCYBhoI="
+  "com/fasterxml/jackson/core#jackson-annotations/2.20": {
+   "jar": "sha256-lZov+y1ZFDb1Hxg8alIfyJNHkS9xG/DK4AjN8EXZUxk=",
+   "module": "sha256-wHDxTsg1jQlcAurootZcsAzLoOXFqnOwASlDM/5GiXE=",
+   "pom": "sha256-TXQMRHjdCNCJ7NxtBjIopVoRp+jkl9pDOPhy+BFXlKQ="
   },
-  "com/fasterxml/jackson/core#jackson-annotations/2.17.2": {
-   "jar": "sha256-hzpgbiNQeWn5u76pOdXhknSoh3XqWhabp+LXlapRVuE=",
-   "module": "sha256-KMxD6Y54gYA+HoKFIeOKt67S+XejbCVR3ReQ9DDz688=",
-   "pom": "sha256-Q3gYTWCK3Nu7BKd4vGRmhj8HpFUqcgREZckQQD+ewLs="
+  "com/fasterxml/jackson/core#jackson-core/2.20.1": {
+   "jar": "sha256-/6tNlX2qJ5bPJMtm0LeKcJDxvL4Xw6RXjwmv+q8TcIk=",
+   "module": "sha256-GalAQ0Ic2ahuFUkSnDjBjgs1exQUWuT3Ns2gL4Bch8k=",
+   "pom": "sha256-FuBJqySPgqpssEjwTVLvPuH1TIDaHSY68k++UM9ueX4="
   },
-  "com/fasterxml/jackson/core#jackson-annotations/2.19.0": {
-   "jar": "sha256-6tYOnKwOQrVwkrni0If/Q1NulHfUSGujkwN6jMFWzac=",
-   "module": "sha256-HzHOjWv4Trf0q6Hl/gGn7mshk+mw8rv4zENMRUXVGh8=",
-   "pom": "sha256-MnlOx3WinmcwPfut370Jq/3nKaRPWuJ7Wew8g65vOuA="
+  "com/fasterxml/jackson/core#jackson-databind/2.20.1": {
+   "jar": "sha256-NLvrRSb/9PhWWxIQa/haavy66FiWbUibVCFKxGsuJug=",
+   "module": "sha256-S1M7Mu5wZfVaSnsNbuTYn9WDdxSr83YUyJkRT7EhWHo=",
+   "pom": "sha256-vP3yeCUyMraDq1HeLcvI+Y8g9Hc4wRHs/SyFxBsTHOw="
   },
-  "com/fasterxml/jackson/core#jackson-core/2.17.2": {
-   "jar": "sha256-choYkkHasFJdnoWOXLYE0+zA7eCB4t531vNPpXeaW0Y=",
-   "module": "sha256-OCgvt1xzPSOV3TTcC1nsy7Q6p8wxohomFrqqivy38jY=",
-   "pom": "sha256-F4IeGYjoMnB6tHGvGjBvSl7lATTyLY0nF7WNqFnrNbs="
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.20.1": {
+   "jar": "sha256-Aw8dkfffJ46G4bo+Ep+1IIcawWzlMBfHNfcIgjvpcNs=",
+   "module": "sha256-At0WoElpdLY7sgrszAK2fpeuQ6Uc5H1JSbyAUiLHQxI=",
+   "pom": "sha256-JrotoAFsKiNbPccCc5xm3O6xjKBURirhVE2srfnguSU="
   },
-  "com/fasterxml/jackson/core#jackson-core/2.19.0": {
-   "jar": "sha256-2o6Fm6yUh0UoEWol8gxoVg5Ch6y/J2KHEbik+WsChDA=",
-   "module": "sha256-WT2jX9rflNEYYvfErCjcq52J1bzd2y2jOe7WFXxVbYk=",
-   "pom": "sha256-zOajQFk4YjqBCJX/b94vBMnDuTegVihx4aY0lr4Pr6s="
+  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.20.1": {
+   "pom": "sha256-bIZ3yvUcuerYfbYmiPNR3MxDrPkAqONHcuQQ0TOPaqs="
   },
-  "com/fasterxml/jackson/core#jackson-databind/2.17.2": {
-   "jar": "sha256-wEmT8zwPhFNCZTeE8U84Nz0AUoDmNZ21+AhwHPrnPAw=",
-   "module": "sha256-9HC96JRNV9axUMqov1O7mCqZ6x1lkecxr8uXKrPddx8=",
-   "pom": "sha256-0kUGmLrpC+M48rmfrtppTNRQrbUhJCE+elO0Ehm1QGI="
+  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.20.1": {
+   "jar": "sha256-aSvoPH4u67U7mVwR2BPGA6fXFtYMnS1PuUhuyxBfkpE=",
+   "module": "sha256-Ym4ePGc34Ie1v0UXrorr1pQ1ChBIdvtHSmJ3h+HEq0Y=",
+   "pom": "sha256-8V/WLrJEdrAKsf93IPALFmtpc+YobRRwi7hmEuv5I9Q="
   },
-  "com/fasterxml/jackson/core#jackson-databind/2.19.0": {
-   "jar": "sha256-ztoxH0dsOxjh0rJAyU4ty5yNROcPivqfrKuIusTdwDo=",
-   "module": "sha256-Z2HeLgXl0m7GK5R/p1AJEZDz/JnM8iaM3suTz/bfbSo=",
-   "pom": "sha256-f0zGn9XZuwIW0ULD2Cv/2v64bUelU8KBRbjOcOfreHY="
-  },
-  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.19.0": {
-   "jar": "sha256-RuVNy9OdTRLNoY7JJ257iI4I/HZeoMd+cWYjBvDUq8Q=",
-   "module": "sha256-PMYsM/xsilphLhhqrDn6Lagh8wZqt9Dj0O5Jh8moGtw=",
-   "pom": "sha256-/vTqd2/yMf2s7avll/9DGpXe9Rjk9140ZLwr5HCj23o="
-  },
-  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.19.0": {
-   "pom": "sha256-wZ0UHUA3aIQ2Rq7KvAMdPPqalqeH2Cfqmj5KDCguUwI="
-  },
-  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.19.0": {
-   "jar": "sha256-Dul78yk2NJ1qTPbYQoUzv0pLWz5+Vf2aTxlQjOBip3U=",
-   "module": "sha256-cg5M2qz3VPSlMw9EWBBhKPSGf4D7jTB1tavgx6Auam4=",
-   "pom": "sha256-6exZhNwLuy2kMH/TugiAergZ8GsGDNyne6OmWwHjKF0="
-  },
-  "com/fasterxml/jackson/module#jackson-module-kotlin/2.14.2": {
-   "module": "sha256-A8Dr/HqKuim5FYMeoyeu1v90bHutBeJs2rSkbM8YoCE=",
-   "pom": "sha256-YVA03vOhdZ59j5pQkwbv3+qtlB0hrTLX3dYn7z0TTsg="
-  },
-  "com/fasterxml/jackson/module#jackson-module-kotlin/2.17.2": {
-   "jar": "sha256-+WmG/nvCVVn5ODJAZb16DpbA1ZrPF6SOJuUXqavUEeg=",
-   "module": "sha256-RKNnCpnNMawmLgxVm00QbPclryv2EImRoSgWJEVx0IQ=",
-   "pom": "sha256-g0XdxGiYbn83hPDuJWWX76ZsifmYsS2ep5jTD0h1VSk="
-  },
-  "com/fasterxml/jackson/module#jackson-modules-java8/2.19.0": {
-   "pom": "sha256-th9zuCA8++8rHkGf9wDM/arlMgbcx20VBUqPg00roDI="
-  },
-  "com/fasterxml/woodstox#woodstox-core/7.1.0": {
-   "jar": "sha256-gSZpIKHNxHMGqKK0cmyZ7Imz+/McJHDk9eR32dhXyp8=",
-   "pom": "sha256-+ZXFCx0gl18KjW8OUyK8jRPHiuPcGCcXdoQUlypmzIU="
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.20.1": {
+   "pom": "sha256-ARd18sV1jwGRus7bTlFDj6/crz2rJUi/xLfXlaRUNg0="
   },
   "com/fasterxml/woodstox#woodstox-core/7.1.1": {
    "jar": "sha256-ArnQIunUdwT/inqFmg2/07KIKoMR63/x4YD3YMzaJxI=",
@@ -276,7 +179,6 @@
    "pom": "sha256-CPpCgzMVYwi9KLYyNih6MXIVLcu/ccgx4LOshiPl4XE="
   },
   "com/github/ajalt/clikt#clikt-core/5.0.3": {
-   "jar": "sha256-KeBaQXAKBp8NEHSOp9Xwyb8OFjbUsQNXPj98X3q7fDo=",
    "module": "sha256-CmMddfhkwX5dYQBfYDwSaUtGcy3s1cOckU0pLQXo6zM=",
    "pom": "sha256-wrBLaB6IqaGSgLZW2mBKIfLj4lUih2i4maaLoejuYBU="
   },
@@ -291,12 +193,10 @@
    "pom": "sha256-j65i2Z1IbZcvnPE8AYPoodAa1qZwJ+Kb7yxnJxV81VE="
   },
   "com/github/ajalt/clikt#clikt-markdown/5.0.3": {
-   "jar": "sha256-OVCM/Xz1fhXCfgKU8T5Q5ATSuUnsyxJkr3/T2Iwc0p0=",
    "module": "sha256-Gugy8ma3VZkKEovS0iFDb8U087ENcqYtznZs1UDjm9o=",
    "pom": "sha256-vlz5vmknfu7Yz1qiPziHX50MSm+DgGrpMbBasA8BCUM="
   },
   "com/github/ajalt/clikt#clikt/5.0.3": {
-   "jar": "sha256-qLzj6fI3DFVs1FG2AY5Yfu1LCfO3jr72SP2D874LgPw=",
    "module": "sha256-vNNPHTxGfvq1FuoiqeeazD8SRJxIl/DF6sGCEnMizsY=",
    "pom": "sha256-GwUigSeaOs6FY7svHtP1Khs9Rq15w9T2wzMjI+VzX9g="
   },
@@ -306,7 +206,6 @@
    "pom": "sha256-8Dw11QURDQZzNF9HQOVbzZdqmp+lobE8qirTmPO8Hl0="
   },
   "com/github/ajalt/colormath#colormath/3.6.0": {
-   "jar": "sha256-49ox0EqJXlNfXQh2TM9fODQcQr99aNqW6h8ACfclmdY=",
    "module": "sha256-aQeqSXrbmvY4EsdTZjic7T5ruL7oDnsjmttMU2c/iIQ=",
    "pom": "sha256-zh3tjA259LxNNjS64Vn9jVu2qWDyzTuWoAyPDnnOZAs="
   },
@@ -316,7 +215,6 @@
    "pom": "sha256-1Ylt5eNKnVarJ4Y5iyYHJLGB85zAUIy7Kh9+iGzSXYc="
   },
   "com/github/ajalt/mordant#mordant-core/3.0.1": {
-   "jar": "sha256-c/UXnY6U+FEUR18Zlo0WWURZTmszjbcciwv9sJUe6z4=",
    "module": "sha256-BWl6xcBV8Uh2cJ/U6f1ejD0VphrHesVy+RZEmTKgjC8=",
    "pom": "sha256-Ah3YAdKdWJlqDJv/ux8VHWkHytU20syNGnoHuck4UNo="
   },
@@ -358,24 +256,17 @@
    "pom": "sha256-CTcnsaakYK6yzbTSXHsVIIbOxs9JCtQY8OAaZKqQuq0="
   },
   "com/github/ajalt/mordant#mordant-markdown/3.0.1": {
-   "jar": "sha256-Si/srE3DCUCL+3jNcQnBmmVFbIATk/mvv9PMwJW3rQk=",
    "module": "sha256-EtkyhMfHBhsJKCKHmsPNfqdRHyYgCP0Vy2AepLdXowU=",
    "pom": "sha256-6wdnhNOAGG4CtaSQhIkOH01xqs6YzA/D+Ma4tz3ecS4="
   },
   "com/github/ajalt/mordant#mordant/3.0.1": {
-   "jar": "sha256-CQmE0gJpL/70R+iN/ixjaTpd4pZw2ggxuGO8KE2hR+I=",
    "module": "sha256-lJLcf2NgJt8ulCkim52Ae1d00uZBUQ2Qv4Kb0qyzthU=",
    "pom": "sha256-BlK5t9Y0kro8J8ZIkANIZRxbKFdEAph7j+KqBUlqkaQ="
   },
-  "com/github/ben-manes/caffeine#caffeine/2.9.3": {
-   "jar": "sha256-Hgp7vvHdeRZTFD8/BdDkiZNL9UgeWKh8nmGc1Gtocps=",
-   "module": "sha256-J9/TStZlaZDTxzF2NEsJkfLIJwn6swcJs93qj6MAMHA=",
-   "pom": "sha256-b6TxwQGSgG+O8FtdS+e9n1zli4dvZDZNTpDD/AkjI9w="
-  },
-  "com/github/ben-manes/caffeine#caffeine/3.1.8": {
-   "jar": "sha256-fdFfnfG+I4/6o2fOb1VnN6iAMd5ClNrRju9XxHTd8dM=",
-   "module": "sha256-SazUz4G+Hk6GgFTw00/PXHdWCEWVBzB86HjNuk/dTYQ=",
-   "pom": "sha256-Rj9PiWOKroLGVLPyhC6NA/eg1IGUxCYEbdnJXOBjJu4="
+  "com/github/ben-manes/caffeine#caffeine/3.0.5": {
+   "jar": "sha256-iptU01BqO5LuRrIXvO55GWshym1S3ClnxoaiBfsvnBU=",
+   "module": "sha256-MNqUAgRzgsSZ0djzcgH8Ead8mTTSxYa8WkKvrEr6wrI=",
+   "pom": "sha256-vM/bJH7Xa1K7sUMMIoLEO61BjtPGl7TiqVrQmbvyXPg="
   },
   "com/github/jknack#handlebars-helpers/4.3.1": {
    "jar": "sha256-VvCtTe+0RLA4pwio4NADaS3xuRK5EhlzanZN6I/3hnw=",
@@ -388,6 +279,28 @@
    "jar": "sha256-VCT9EukRzxW+/RY0G0bg4bxoGqYePLHAcMV+aNzNW70=",
    "pom": "sha256-/DAp8kYk6YvWC1pGmSEPP1YKOUiTQpzQbMrYROj41BU="
   },
+  "com/github/kevinstern#software-and-algorithms/1.0": {
+   "jar": "sha256-YauCQ5zvNzQ7FPUxVMRhYZN1NzpWuTOOiVcJ+1Tghkw=",
+   "pom": "sha256-7ZcfAJNU5owJQUyWT74aLIXCyLvUYBIrdJenuMXU84g="
+  },
+  "com/google/auto#auto-common/1.2.2": {
+   "jar": "sha256-9Qsc6KQfrTGoqBnAUvj/o2LqCj2+nvj3x9yaNtRzilk=",
+   "pom": "sha256-A6mS+6T8+7z3ekYJgRgWMARuW64JZzpIGTxuD3YSceo="
+  },
+  "com/google/auto/service#auto-service-aggregator/1.0.1": {
+   "pom": "sha256-BIFGDbWZAzYrJvq9O9zV7CAHUPk5G7tlAv48fcLfPkw="
+  },
+  "com/google/auto/service#auto-service-annotations/1.0.1": {
+   "jar": "sha256-x77FS3tViLWWfocDQQkcVpEYHZVM8gOfG/Cm7rg3Rzs=",
+   "pom": "sha256-6bvxs9ZsoYAEpqB6INv6EMos6DZzSPdB3i/o/vzmjMI="
+  },
+  "com/google/auto/value#auto-value-annotations/1.9": {
+   "jar": "sha256-+lRp9MRO5Zii2PAzqwqdy8ZJigxeDJmN+gwq31E1gEQ=",
+   "pom": "sha256-kiCj2r51x5M08GGw5A34M0SGZrrCiouCO8Ho/VL4yYo="
+  },
+  "com/google/auto/value#auto-value-parent/1.9": {
+   "pom": "sha256-Lj2d/2OWAcq4gdfhcIBry9jgMffr/yWcu0W+V7TL14c="
+  },
   "com/google/code/findbugs#jsr305/3.0.2": {
    "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
    "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
@@ -399,55 +312,66 @@
    "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o="
   },
   "com/google/code/gson#gson/2.10.1": {
-   "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=",
    "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
   },
   "com/google/code/gson#gson/2.11.0": {
    "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=",
    "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A="
   },
-  "com/google/errorprone#error_prone_annotations/2.21.1": {
-   "jar": "sha256-0fPGaqkaxSVJ4Arjsgi6S5r31y1o8jBkNVO+s45hGKw=",
-   "pom": "sha256-9ZiID+766p1nTcQdsTqzcAS/A3drW7IcBN7ejpIMHxI="
+  "com/google/errorprone#error_prone_annotation/2.50.0": {
+   "jar": "sha256-qptno6o0GLNm4mWU4a410QCtM2nNEBCufUeC2YTqmq8=",
+   "pom": "sha256-J7eLAjbfhT3FBsRw9vYKjQ9c8lxq4is0fzNpMHgj5Ao="
   },
   "com/google/errorprone#error_prone_annotations/2.27.0": {
    "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=",
    "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do="
   },
-  "com/google/errorprone#error_prone_annotations/2.28.0": {
-   "jar": "sha256-8/yKOgpAIHBqNzsA5/V8JRLdJtH4PSjH04do+GgrIx4=",
-   "pom": "sha256-DOkJ8TpWgUhHbl7iAPOA+Yx1ugiXGq8V2ylet3WY7zo="
-  },
-  "com/google/errorprone#error_prone_annotations/2.3.4": {
-   "jar": "sha256-uvfW6pfOYGxT4RtoVLpfLOfvXCTd3wr6GNEmC9JbACw=",
-   "pom": "sha256-EyZziktPfMrPYHuGahH7hRk+9g9qWUYRh85yZfm+W+0="
-  },
   "com/google/errorprone#error_prone_annotations/2.36.0": {
    "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=",
    "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw="
   },
+  "com/google/errorprone#error_prone_annotations/2.41.0": {
+   "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=",
+   "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4="
+  },
+  "com/google/errorprone#error_prone_annotations/2.50.0": {
+   "jar": "sha256-RmdySHfx03pokgLaGR4j76dlfGLu+TzNrEBuzP5c3Qo=",
+   "pom": "sha256-caBoDSdzJLq0a+xLAPbxEcG3lKkx0NjNp5vLkkaYL5I="
+  },
   "com/google/errorprone#error_prone_annotations/2.7.1": {
    "jar": "sha256-zVJXwIokbPhiiBeuccuCK+GS75H2iByko/z/Tx3hz/M=",
    "pom": "sha256-Mahy4RScXzqLwF+03kVeXqYI7PrRryIst2N8psdi7iU="
   },
-  "com/google/errorprone#error_prone_parent/2.21.1": {
-   "pom": "sha256-MrsLX/JB/Wuh/upEiuu5zt7xaZvnPLbzGTZTh7gr+Sw="
+  "com/google/errorprone#error_prone_check_api/2.50.0": {
+   "jar": "sha256-7pNaT0KsQJ+wpHGv/qk4wwUMaIfbqtsQaGiTbYPYyPE=",
+   "pom": "sha256-pJPS7DOP341iL2kvT5V7Ujkl4jSq0Rf8HkhyukOr6Fs="
+  },
+  "com/google/errorprone#error_prone_core/2.50.0": {
+   "jar": "sha256-QKiNPqcy+sOleuDisn8XKc52zEGFe81j1YReeerl9y4=",
+   "pom": "sha256-iCMGeNynNcwtwQ1jMbyvdCjSvRCNYh1NxpF4IkKX4fY="
   },
   "com/google/errorprone#error_prone_parent/2.27.0": {
    "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ="
   },
-  "com/google/errorprone#error_prone_parent/2.28.0": {
-   "pom": "sha256-rM79u1QWzvX80t3DfbTx/LNKIZPMGlXf5ZcKExs+doM="
-  },
-  "com/google/errorprone#error_prone_parent/2.3.4": {
-   "pom": "sha256-QElbQ3pg0jmPD9/AVLidnDlKgjR6J0oHIcLpUKQwIYY="
-  },
   "com/google/errorprone#error_prone_parent/2.36.0": {
    "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw="
   },
+  "com/google/errorprone#error_prone_parent/2.41.0": {
+   "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI="
+  },
+  "com/google/errorprone#error_prone_parent/2.50.0": {
+   "pom": "sha256-q/RaAZ2xJbUP9VE07Cr5SuNRl2EDit8KYLm9e0uLYlQ="
+  },
   "com/google/errorprone#error_prone_parent/2.7.1": {
    "pom": "sha256-Cm4kLigQToCTQFrjeWlmCkOLccTBtz/E/3FtuJ2ojeY="
   },
+  "com/google/googlejavaformat#google-java-format-parent/1.35.0": {
+   "pom": "sha256-mqMpxgZZv0KcsdmTQUAdb5IIivxpvl9LwJxu+MFU9eM="
+  },
+  "com/google/googlejavaformat#google-java-format/1.35.0": {
+   "jar": "sha256-sqUuNj1R3Yazs40ajdUVOFQbQv8QSHaWhGgcZ2VQ8EM=",
+   "pom": "sha256-LXw5Gv+5MNYmPTsYoTmlMLubuvNnIRATrrL4BtEG1hw="
+  },
   "com/google/guava#failureaccess/1.0.1": {
    "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=",
    "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk="
@@ -459,9 +383,6 @@
   "com/google/guava#guava-parent/26.0-android": {
    "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
   },
-  "com/google/guava#guava-parent/28.2-jre": {
-   "pom": "sha256-UEptGOuBum1aJVomK9gj8BaMf0eBTUtST1+jA+pWF8I="
-  },
   "com/google/guava#guava-parent/31.0.1-jre": {
    "pom": "sha256-s7a2qnCZwRgXrO6FsyL9kffuMq6mn+CD7jbIc17AZ4g="
   },
@@ -471,9 +392,8 @@
   "com/google/guava#guava-parent/33.4.8-jre": {
    "pom": "sha256-oDxRmaG+FEQ99/1AuoZzscaq4E3u9miM59Vz6kieOiA="
   },
-  "com/google/guava#guava/28.2-jre": {
-   "jar": "sha256-/DqjY62HIj0fvqWE7uAVqGIVD200xx8k3HQIimNfCO8=",
-   "pom": "sha256-wIBSYVSNxhykyYK1m/qtZQPkMZD15eRE6Qss9qty25Q="
+  "com/google/guava#guava-parent/33.5.0-jre": {
+   "pom": "sha256-aHGeaHxuTJ/z4P7L73vSCJbw9PezFHQ+0zxy+WJWghU="
   },
   "com/google/guava#guava/31.0.1-jre": {
    "jar": "sha256-1b6U1l6HvSGfsxk60VF7qlWjuI/JHSHPc1gmq1rwh7k=",
@@ -484,6 +404,11 @@
    "module": "sha256-WKM1cwMGmiGTDnuf6bhk3ov7i9RgdDPb5IJjRZYgz/w=",
    "pom": "sha256-BDZdS27yLIz5NJ/mKAafw+gaLIODUUAu9OlfnnV77rw="
   },
+  "com/google/guava#guava/33.5.0-jre": {
+   "jar": "sha256-HjAfDFKsJIsLFP3D0SKDx3JS1Nb0hSHVcufYxMLMSsc=",
+   "module": "sha256-d+1CyMiyzru5OsngdUP/ZBiqJL24UXWAz1Mk6aZRCVY=",
+   "pom": "sha256-BHj6eKkIs8Mf5td76ZeKqmIeKhgduEAH49OzdCSirGE="
+  },
   "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
    "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
    "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
@@ -496,6 +421,10 @@
    "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=",
    "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc="
   },
+  "com/google/j2objc#j2objc-annotations/3.1": {
+   "jar": "sha256-hNOhUFGEhfgUDqmbiphWVnSWKfZDPJK4DHWzaro7CZs=",
+   "pom": "sha256-FFcIOFAANPwbR8ggXOHJ1rJVwczdLRr9zcv3XomySjM="
+  },
   "com/google/jimfs#jimfs-parent/1.3.1": {
    "pom": "sha256-UVwlNuqpY91FJWxKFILcKOAJ4k2V4Ep7IFVpPCR1bZE="
   },
@@ -503,6 +432,16 @@
    "jar": "sha256-sx5dqNTXO/ljTKhUOvCZUX1F6cLmtHt2xrzChzaQLxQ=",
    "pom": "sha256-miXIjXSUa2YYKZgpTknO23++fT1cejl3BCLokDsDSHc="
   },
+  "com/google/protobuf#protobuf-bom/4.33.2": {
+   "pom": "sha256-bKXx5DgMUyPLEDsDTt8RYMn7tnau3l2ZifTe8XLHxNg="
+  },
+  "com/google/protobuf#protobuf-java/4.33.2": {
+   "jar": "sha256-xbWCqhJ/tixfwwdzKdUi37eTC06aYlwIdgtoGyulqrc=",
+   "pom": "sha256-GnLGjsB6XAN3R0sZl6NjrYNHpfIGuHHbQLOIt/LngZY="
+  },
+  "com/google/protobuf#protobuf-parent/4.33.2": {
+   "pom": "sha256-yMIhEseGDm7dx+ywHOkXb8u0BJ7aWwomvj1LufvYAhE="
+  },
   "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": {
    "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=",
    "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE="
@@ -511,45 +450,33 @@
    "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=",
    "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM="
   },
-  "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.6.1": {
-   "pom": "sha256-T5fP/LW+ix7URygSLLZqIegrfau5jlOJTmDR3dRc3iw="
+  "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.4.2": {
+   "pom": "sha256-xeVASrUAnkLi6EiGHO1La2vPMFR2QoHiDaNzyfry9S8="
   },
-  "com/gradleup/shadow#shadow-gradle-plugin/9.6.1": {
-   "jar": "sha256-cFO8Q2bPgHmPIF439PZJzeUWCB5eZTo8SepnALIEexE=",
-   "module": "sha256-2r7oRq2BjQEs6wAtYfrDT7STf3Tu60yWRRkxiiomDSU=",
-   "pom": "sha256-TyBfM3n3wluZqUwe6OgKqiEdORMFKYBbWLId9N7y0Qc="
+  "com/gradleup/shadow#shadow-gradle-plugin/9.4.2": {
+   "jar": "sha256-QiPAjWXkx+HxILSpbnMZ34/j36ZV3fJmH2C7VtrPkaw=",
+   "module": "sha256-QLLd0qhM9ov7ur/ED8XLlNQvDTzrglMb8/eQ/xdeu9A=",
+   "pom": "sha256-TPRHwc6WyuND5uDnRPnOnD5jz+e9GQ9j/qbSdPFeKrU="
   },
-  "com/gradleup/shadow/com.gradleup.shadow.gradle.plugin/maven-metadata": {
-   "xml": {
-    "groupId": "com.gradleup.shadow",
-    "lastUpdated": "20260722011714",
-    "release": "9.6.1"
-   }
+  "com/ibm/icu#icu4j-root/75.1": {
+   "pom": "sha256-J+pmH2aKb+FPpHFtJteuS6lMtnIyxtuNAO9KwDQE8Io="
   },
-  "com/ibm/icu#icu4j/58.2": {
-   "jar": "sha256-lT4eg7K+fD6i+I2obBNhT0fp5x01eMhSHX8Yd1a2OWI=",
-   "pom": "sha256-R7Zq1yxypJmlRL57ixEzX2xz/bcyFxfRGBHfs+k0FGo="
+  "com/ibm/icu#icu4j/75.1": {
+   "jar": "sha256-VD5DqR0UmeMxxxGnVvgz1vuMwBn5yZE8C99NUwCZMtU=",
+   "pom": "sha256-zQuqR3iLDwfDHUpJMvYY1Mqf/TADrj3Cyt5T32cI8CA="
   },
-  "com/jayway/jsonpath#json-path/2.9.0": {
-   "jar": "sha256-Eanub4i7MfFFAQjRz2RBN33shKygdetrsjQ74VdXW+o=",
-   "module": "sha256-5ikAQ9rpOnDZqz+hvrh56M9e1ajgqQGD+5bCUVqXCD4=",
-   "pom": "sha256-DCU33em/ncKix5ZzAPwTvFIp0ZJnf8uItv2Jlmk2ZD8="
+  "com/jayway/jsonpath#json-path/2.10.0": {
+   "jar": "sha256-iQ2qld04ktNNn6vCfNUVNlbm82k1hiXIj03Ht5y9bFo=",
+   "module": "sha256-ZvG5aHJXUMTc6dp9ezpDFQOEz0JsonDGCJEPo2WlKsI=",
+   "pom": "sha256-aMqh5GELllfKmjy47mpvkr4yIxl9+hqk8qmML09fBOU="
   },
-  "com/jgoodies#forms/1.1-preview": {
-   "jar": "sha256-JrD8dF6gUbV0Yr4ioVDHYA26xnFrJMxgpezA6AhcQaA=",
-   "pom": "sha256-fUMCsVHgRZfNBfrDHhnU6s7F6OlutbJSRKBubNPGTkc="
+  "com/networknt#json-schema-validator/1.5.9": {
+   "jar": "sha256-4Li663j9G6AnRU7jl02KAvVER+qlENMFKCCn0hYNmuQ=",
+   "pom": "sha256-E+TTJ9RfM5jr+A9HfiRw62rCY/Qj0okCO7sq1eacJ4w="
   },
-  "com/networknt#json-schema-validator/1.5.7": {
-   "jar": "sha256-LHHpcNwbZ0mbme+vZZgmlumM7QAoVI1Dv066Bu3Yg08=",
-   "pom": "sha256-qQU6VxFYaUiNK879i+139s2czA5HL7gDlUXCpFv1VTQ="
-  },
-  "com/palantir/javapoet#javapoet/0.7.0": {
-   "jar": "sha256-Zs9MQ65UyOirEHcLoxjN/qdV76Yxta2Y8y2i44+6Mmo=",
-   "pom": "sha256-Q2t78jXbshEs3GKu8whmQDJKCOHsz8arL2otUl8wNYI="
-  },
-  "com/shapesecurity#salvation/2.7.2": {
-   "jar": "sha256-UrhnP2KpmupssmLnlGBkH/iJrVDO51e+MeIn2ZWn8rw=",
-   "pom": "sha256-oOTbnCwgUSBjf5XD7eCR3zpte3HGvD7CyzUcIo3k8IM="
+  "com/palantir/javapoet#javapoet/0.16.0": {
+   "jar": "sha256-vEtqFqBqmOz/ylTiEW8rxGu1MHkjZYfPRuWg3RdBmfI=",
+   "pom": "sha256-G8Syms5srqBP9jOpVjJ70VNcC5YokpxhcLPXjg6dmVA="
   },
   "com/squareup#kotlinpoet/1.6.0": {
    "jar": "sha256-gIXrTIsezk8yJZsi8mv4gLxHt09UjikBCwFGqms48ks=",
@@ -569,86 +496,14 @@
    "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=",
    "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU="
   },
-  "com/squareup/retrofit2#converter-jackson/2.11.0": {
-   "jar": "sha256-k7XbLSrmc/PvU0VubX36rZ6XvXxJwtBWRtK+6eG7gw4=",
-   "module": "sha256-DKYTaNJk5yzbem/lrJO3zQ5cOgwBzob0Xx4v9cTT+CM=",
-   "pom": "sha256-XeJsV9JXtjkKN5pUFr8/viYoPXz9jDRzaeh4OzZc8ks="
+  "com/uber/nullaway#nullaway/0.13.7": {
+   "jar": "sha256-a8tpbdz6D3zBK5D6zo568EEGPyeM2fPwfeLFMmLiTWg=",
+   "module": "sha256-WX63OSkaDEKUI/Ua2gKvKxvScrOEQeTdloWs7Nfzy2A=",
+   "pom": "sha256-KaqdrSX9D4C25TUt+QFWxUVKZdYu/bd6BjiXJHjD+GI="
   },
-  "com/squareup/retrofit2#converter-jaxb/2.11.0": {
-   "jar": "sha256-SE7ANkz72yZlB/auw5pQ5aYogTuCcsypXpZ/oUJaZXQ=",
-   "module": "sha256-QyDitxeSPO6GdIwpxP2xN1lLd2mtZoGFGlu6x3t2AUM=",
-   "pom": "sha256-zsIuapJbeUT9gGDr9Dm9jfzlLm9Dq/cF5idQP/C73Bc="
-  },
-  "com/squareup/retrofit2#retrofit/2.11.0": {
-   "jar": "sha256-n0+7znByhYT77tONQGHzbUR36JvKdLTirIrraBmw/kM=",
-   "module": "sha256-6bsuIBhEyI5HUGJPkRSmNUtRtwlItE1ca0qU6M0HCoE=",
-   "pom": "sha256-3iKB4huk2YSrrxPcBn84C8WBaXBoxlaKu5uZjZ13cF4="
-  },
-  "com/sun/activation#all/1.2.0": {
-   "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ="
-  },
-  "com/sun/istack#istack-commons-runtime/3.0.7": {
-   "jar": "sha256-ZEPhC6LiWfuCHZtr7PENtTFihfwwxTzsnXsZo4d+f98=",
-   "pom": "sha256-bXBORQqBakW86Aa6IsIv6D2Ojc96cVF2A95jChcmgJ8="
-  },
-  "com/sun/istack#istack-commons/3.0.7": {
-   "pom": "sha256-b4PTyF/cqe8kAQyy9lKqsaUIv/YzHAh7YNAwF4K3jG8="
-  },
-  "com/sun/xml/bind#jaxb-bom-ext/2.3.0": {
-   "pom": "sha256-+9fhvXsf/lKWbaih4hDHTkJ0/vCSh1Lj/bkNWszoFZM="
-  },
-  "com/sun/xml/bind#jaxb-bom-ext/2.3.1": {
-   "pom": "sha256-wiBPVLQ1k4CMmvZQKGXucWeYIxVtq97zQecdNWYseqA="
-  },
-  "com/sun/xml/bind#jaxb-bom-ext/2.3.2": {
-   "pom": "sha256-Gn3sKyfn4FV0TNuM8bkN70/Uc6zRuATv8JgTk1iVm9c="
-  },
-  "com/sun/xml/bind#jaxb-core/2.3.0": {
-   "jar": "sha256-MwYa+NKgc3nUUvjw/dy79RhCjf07g9ni1HnBlIAgeVs=",
-   "pom": "sha256-pWda8runIvgY7yWpCO77/Vy8/DbQneeYxX/y+/C4amc="
-  },
-  "com/sun/xml/bind#jaxb-impl/2.3.2": {
-   "jar": "sha256-s6PTrqpVA8rcJNypU5uH7817w72MSAGIh6FInyp3vcA=",
-   "pom": "sha256-VlwVUBKWdZfOjTUUDyYglKEmEhciiaT+ZFPD8DN4d6E="
-  },
-  "com/sun/xml/bind/mvn#jaxb-bundles/2.3.0": {
-   "pom": "sha256-AuZrosGxHBr7jp1Uxaj8uC1D6lGz9hK4Jl1lDLpefh8="
-  },
-  "com/sun/xml/bind/mvn#jaxb-bundles/2.3.2": {
-   "pom": "sha256-mPaUdp+Z/sMWwfisPhwAuVM8VxRgJ8C7bqBM+dwBhlc="
-  },
-  "com/sun/xml/bind/mvn#jaxb-parent/2.3.0": {
-   "pom": "sha256-idoEzlchcb/cOHyaTwb0kQIvQNgWSvSEQRjpPMmHBFI="
-  },
-  "com/sun/xml/bind/mvn#jaxb-parent/2.3.1": {
-   "pom": "sha256-9pnvN+x5ZuKEdC38qDB1IhF5BBqaSa73mRKAGSYERi0="
-  },
-  "com/sun/xml/bind/mvn#jaxb-parent/2.3.2": {
-   "pom": "sha256-IN1tw0q3VJrEDaHYLpIiLsQ0etDsDLEY72xXA77VOhg="
-  },
-  "com/sun/xml/bind/mvn#jaxb-runtime-parent/2.3.1": {
-   "pom": "sha256-tWOD601DSYsUXTeeKpPV/NzY/5KR+JtYuCy5Fljb8Uw="
-  },
-  "com/sun/xml/bind/mvn#jaxb-txw-parent/2.3.1": {
-   "pom": "sha256-eoRz6TVQSEHGBmhthOnAF6c5rCwUT95oeqADp91E3n8="
-  },
-  "com/sun/xml/fastinfoset#FastInfoset/1.2.15": {
-   "jar": "sha256-eFhh2xHKG9DRlWaCuXStc+sZzT4BpLP6gtYuypchCuw=",
-   "pom": "sha256-u8eWq4Smd4p1HC7/ETYHir0rTTW1BHBigE81gu88Qsg="
-  },
-  "com/sun/xml/fastinfoset#fastinfoset-project/1.2.15": {
-   "pom": "sha256-z7jNrUwN0F7YysvhRr8XGHZEA5R7neg0jhv9QvYupz4="
-  },
-  "commons-codec#commons-codec/1.10": {
-   "jar": "sha256-QkHfqU5xHUNfKaRgSj4t5cSqPBZeI70Ga+b8H8QwlWk=",
-   "pom": "sha256-vbjbcBLREqbj6o/bfFELMA2Z7/CBnSfd26nEM5fqTPs="
-  },
-  "commons-codec#commons-codec/1.16.0": {
-   "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ="
-  },
-  "commons-codec#commons-codec/1.19.0": {
-   "jar": "sha256-XDiB5PVWhV6cUykn7gyd/elMxmdg1YBcAxpZiHBwr18=",
-   "pom": "sha256-4PMmn6I94MgxMMVln1+VFMxUIsC830Xy6uAEp4ufyjQ="
+  "commons-codec#commons-codec/1.15": {
+   "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=",
+   "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g="
   },
   "commons-codec#commons-codec/1.22.0": {
    "jar": "sha256-0WT+efJiwy2bGKC1stMX0cJ2U9Xpj9K5mMJL+QHHLOQ=",
@@ -658,35 +513,35 @@
    "jar": "sha256-k4MnLJNWmv6r7bFpI6lKbcilvXovn4O/Mmr07mhDRik=",
    "pom": "sha256-5WCT0Gr1rCOC2q5GC2Etp5JvSj0GsergjEyzLfQ8/nQ="
   },
+  "commons-io#commons-io/2.15.1": {
+   "jar": "sha256-pYrxLuG2jP0uuwwnyu8WTwhDgaAOyBpIzCdf1+pU4VQ=",
+   "pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0="
+  },
   "commons-io#commons-io/2.19.0": {
    "jar": "sha256-gkJokZtLYvn0DwjFQ4HeWZOwePWGZ+My0XNIrgGdcrk=",
    "pom": "sha256-VCt6UC7WGVDRuDEStRsWF9NAfjpN9atWqY12Dg+MWVA="
   },
-  "commons-io#commons-io/2.20.0": {
-   "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=",
-   "pom": "sha256-vb34EHLBkO6aixgaXFj1vZF6dQ+xOiVt679T9dvTOio="
-  },
-  "commons-io#commons-io/2.22.0": {
-   "jar": "sha256-K5p7H3JvuGIW29LIMh6r4CIdvVsb6BwY4ctTgRsQR1g=",
-   "pom": "sha256-ZCXOwOp2ADXvp3J33oX4n6bb7RR6s92VuNLLxVNArM8="
-  },
-  "commons-io#commons-io/2.4": {
-   "jar": "sha256-zGpB3D6qzJ5ECmvQ0okLINNrTuQI/i1nEi8yi7bgFYE=",
-   "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI="
+  "commons-io#commons-io/2.21.0": {
+   "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=",
+   "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas="
   },
   "commons-logging#commons-logging/1.2": {
    "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
    "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
   },
-  "de/undercouch#gradle-download-task/5.6.0": {
-   "jar": "sha256-zkN6arnKcZzIVrVbp0kuQsTODumC5tIvtDLNVYh2gb4=",
-   "module": "sha256-P+YJN66Dzs2qpOD2EykVaQKD7d+IQ54m8efjgEV4NSI=",
-   "pom": "sha256-RqMBkMaLY9AegKQEQJfCULu8MgmkXw3FpNDioe1bgKc="
+  "de/undercouch#gradle-download-task/5.7.0": {
+   "jar": "sha256-+8mtrLZlJ6OeM43t5/tKtxwEfQf2yGuDbpXXiI+Ll4c=",
+   "module": "sha256-E2VOE42mFhYRwkOhaN4wEb1i3R8sEP7Fs8bgG6x02J0=",
+   "pom": "sha256-GueknyaugyKYiuehSxnHB6P/UlDOc6kY98qQADF79zo="
   },
-  "dev/equo/ide#solstice/1.7.5": {
-   "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=",
-   "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=",
-   "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8="
+  "dev/equo/ide#solstice/1.8.2": {
+   "jar": "sha256-nslXwJZgBSDcmfN6EEp/TJkNQMLdN17pYOt8bNUMEvM=",
+   "module": "sha256-SrIVTJ83agthp6/i0djQJ+pvOQ08hyzkcKbZgqR+Wv4=",
+   "pom": "sha256-70jsrBwclJAdj/ML8J16CClTQCNnLdXiVyek6Vh+oFM="
+  },
+  "io/github/eisop#dataflow-errorprone/3.41.0-eisop1": {
+   "jar": "sha256-EENPuk5T9V+px2kEzeQUuRiTJUjJ38Ti1jSsBf96fRA=",
+   "pom": "sha256-I/HN+kYTwAzG6lyfU2DhRxtEn4JjPxPPX/bNs0+jHr0="
   },
   "io/github/java-diff-utils#java-diff-utils-parent/4.12": {
    "pom": "sha256-2BHPnxGMwsrRMMlCetVcF01MCm8aAKwa4cm8vsXESxk="
@@ -695,92 +550,12 @@
    "jar": "sha256-mZCiA5d49rTMlHkBQcKGiGTqzuBiDGxFlFESGpAc1bU=",
    "pom": "sha256-wm4JftyOxoBdExmBfSPU5JbMEBXMVdxSAhEtj2qRZfw="
   },
-  "io/github/pdvrieze/xmlutil#core-jvm/0.86.3": {
-   "jar": "sha256-kVJ9hv6gS9YYPRQKCfENqy3qcnrxLSfZFl7jQuo9Dt4=",
-   "module": "sha256-FgIJExZWo2dDGWXYAYk7J3fuguD3ZmaD+nXE+Wck/wc=",
-   "pom": "sha256-oBGIoPlVW1s7nZLlQz242AJ6vjleD/cIBRU+8v6qf4U="
+  "io/leangen/geantyref#geantyref/2.0.1": {
+   "jar": "sha256-OGtTXAeb59Zd2+CtnACVUVW3hiIlqpK0xlU6srHqlfk=",
+   "pom": "sha256-okoUZv+P+orR91QYQebb2Q+LPKLF1c46Ryo2bR5DVXw="
   },
-  "io/github/pdvrieze/xmlutil#serialization-jvm/0.86.3": {
-   "jar": "sha256-nOJz3LhguSpb8uw2rR4qEbQa7YnGyYTKc+h+/17aG9A=",
-   "module": "sha256-3ppDm3mA++bMPDS8rZyEqIMVmdyHZNceD2c93Ho91Jo=",
-   "pom": "sha256-OX1XqPVTaUEf7HRETH1NTLaeyYANUkSTrGHekJIl4wc="
-  },
-  "io/leangen/geantyref#geantyref/1.3.16": {
-   "jar": "sha256-fx1ZEJLVFCtqqnz1n5TEx01X2+7wOy+CYpSfjza6xuM=",
-   "pom": "sha256-JCgbY4MutO8QZOfd/b57eWquGr+IeYrb9NC5ZpurpKQ="
-  },
-  "io/opentelemetry#opentelemetry-api/1.41.0": {
-   "jar": "sha256-kzZmjziN5ooKLD4RQVT+vSnbGadkTyfE66VI9d6FIlg=",
-   "module": "sha256-JhRoWJyZO4j3zK2TOP/YFmud9Mw03jCAZpMrKlyd6VY=",
-   "pom": "sha256-vB7w93s71tsLem8WUv20IWmKDlQ3RQSnQZ+xvrRWKZM="
-  },
-  "io/opentelemetry#opentelemetry-context/1.41.0": {
-   "jar": "sha256-XjQypEZKQyq/2rc75xQuUW0lqEqoQm/OEZL/sFMvqjU=",
-   "module": "sha256-F03No+hAImE4rbjOkENXbdxDwoa2EtPb9kUx9nvY2Yc=",
-   "pom": "sha256-yzs5YlmYNClZTWLkdmdcwAuyUskNMU1keptW3sI+VSY="
-  },
-  "io/smallrye#smallrye-build-parent/42": {
-   "pom": "sha256-FBJFawNFSQ+NC00L5SnQSh1Y0Z1a2FvzHDdAwT+Q1t4="
-  },
-  "io/smallrye#smallrye-build-parent/45": {
-   "pom": "sha256-1vPL5JFUM6LZ9bmsEjjul17d+7En3yDbdpRpCKBMXys="
-  },
-  "io/smallrye#smallrye-parent/42": {
-   "pom": "sha256-EGQjW60r3LUZiEslMIbPyqQ0Ft20fExszkIVadt5ooU="
-  },
-  "io/smallrye#smallrye-parent/45": {
-   "pom": "sha256-dTF5dGlXsJx7pqz7vwOy5YBvIwyVIXC/HQKI5zPkOXY="
-  },
-  "io/smallrye/common#smallrye-common-annotation/2.6.0": {
-   "jar": "sha256-2ng+RNV5YTT3UThNTOt27ImBfD/xm8bnUhUfnQwuNRA=",
-   "pom": "sha256-18e6LhRTdQ5rK6F8Z2AIVWYYQUDuexqh1C3juXgFWFI="
-  },
-  "io/smallrye/common#smallrye-common-bom/2.4.0": {
-   "pom": "sha256-puGY/JfU0KDHsxCSPhkTTjS6+jHmpG6CcmYDwLxeYow="
-  },
-  "io/smallrye/common#smallrye-common-bom/2.6.0": {
-   "pom": "sha256-TcMYfHYvS9UdXTdnh+z4nkK11jMH6qfTiTp/ESi5VQs="
-  },
-  "io/smallrye/common#smallrye-common-constraint/2.6.0": {
-   "jar": "sha256-kFY/JF1aVbcZgNnOu+nP4q2+xqCSxjUCVssTJ+myk4s=",
-   "pom": "sha256-uumJI7gmYCwfbSkezEZ+dyRQS0rIb1ra/WSqmJXBZOg="
-  },
-  "io/smallrye/common#smallrye-common-cpu/2.6.0": {
-   "jar": "sha256-Bm7i/e+FJJB6Ka1nmoa0obXjFOtXduZEHtRf8lM8xvI=",
-   "pom": "sha256-lW8Hjy95t/my95AwbJKZt77V9455uUZ6nY1c2SlrN8g="
-  },
-  "io/smallrye/common#smallrye-common-expression/2.4.0": {
-   "jar": "sha256-vnH9t1jnul/z672awt8j7DZW7XNITGJBkuE8QsHo5+g=",
-   "pom": "sha256-wBzAQOvkRjOSkKdFwFvU4nykStE1TbF/g9VpXEMeErk="
-  },
-  "io/smallrye/common#smallrye-common-function/2.6.0": {
-   "jar": "sha256-z+daeBAUr1FLwX5Y33mzmDMkscuXGXFKviJ97+FYXdo=",
-   "pom": "sha256-ewjOWqUfyv7GGlGSPrmu4zDeMwMzq4oaBilstPrFaYw="
-  },
-  "io/smallrye/common#smallrye-common-net/2.4.0": {
-   "jar": "sha256-wwPBS2+Nz+u7O/IwwcKU5MP5kOBgtKLHDo/86jyabe4=",
-   "pom": "sha256-oLeuxpBtgIykODX1QIJb9Dr0HkNX3Me6dcvHfuWnqLM="
-  },
-  "io/smallrye/common#smallrye-common-os/2.4.0": {
-   "jar": "sha256-zwG6ILN5vQgPAZV9d3jt8KgCx+K1itbJSLUu4U51V5c=",
-   "pom": "sha256-OuqCAw7DTFXEEcUOe5rsAAgbce8i5lGzZS3fTXewZ3E="
-  },
-  "io/smallrye/common#smallrye-common-parent/2.4.0": {
-   "pom": "sha256-snO2sOWvRzileVZ+dA4krJON7RD45EbT26GQ9xhkT+E="
-  },
-  "io/smallrye/common#smallrye-common-parent/2.6.0": {
-   "pom": "sha256-YKrtgLXJoR5R75J0ag3mgRZ5V6Sec2ZUHaCR7/3yyXI="
-  },
-  "io/smallrye/common#smallrye-common-ref/2.4.0": {
-   "jar": "sha256-uZAtmbUqRjzDhREF3d1Y1A9YBzUGSLmWrhYasUEjQnw=",
-   "pom": "sha256-wMVVPQElarUrmuLe57dismveONfMkHaddTWM8+Cpo4Y="
-  },
-  "io/undertow#undertow-core/2.3.20.Final": {
-   "jar": "sha256-0TbXVZLv3pAGi/gVVjOek7oclIkInIo4gObIBaJjDKY=",
-   "pom": "sha256-UrJYOyfrUT222kG6Dcw3uM5jkMs3/nFp4f/X9lOmxis="
-  },
-  "io/undertow#undertow-parent/2.3.20.Final": {
-   "pom": "sha256-JvNmbC032UfoCdoeqOhNttoXOcb7eYKF+4f4dgEJfoU="
+  "io/netty#netty-bom/4.2.12.Final": {
+   "pom": "sha256-Sx6sh5HJMaM9ni+4wINDJVLPh0adtBm30kNBeONPBww="
   },
   "isorelax#isorelax/20030108": {
    "jar": "sha256-NCcVJDHPf5Z/kuaeXKwWFHxdj7S05ainL1KReI78/4w=",
@@ -792,34 +567,20 @@
   "jakarta/platform#jakartaee-api-parent/9.1.0": {
    "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA="
   },
-  "javax/activation#javax.activation-api/1.2.0": {
-   "jar": "sha256-Q/3vC1ts6zGwQksgi5MMdKtY+sLO63s/b9OuuLXKQ5M=",
-   "pom": "sha256-2ikm88i+iYZDzBCs3sbeCwNRpX+yc1dw+gF3sGrecbk="
+  "jakarta/servlet#jakarta.servlet-api/6.1.0": {
+   "jar": "sha256-ijH0ZfNZO/I1FTGlyVIBTrg52pamBbWCW5PdVHFMSMQ=",
+   "pom": "sha256-G6+Lb6bQIYAwINCXDqQ/sH32beZskNKZohZ3Dwsz5K4="
   },
   "javax/inject#javax.inject/1": {
    "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=",
    "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o="
   },
-  "javax/xml/bind#jaxb-api-parent/2.3.1": {
-   "pom": "sha256-zRvqpFYNxN/bgmudgJ5GTbIlJt+1QmS654pv9++wjh8="
+  "net/bytebuddy#byte-buddy-parent/1.18.3": {
+   "pom": "sha256-kOpTFzFQjup1/5KVFBxQjX+aU9GgX0W4D49JmVIUJu8="
   },
-  "javax/xml/bind#jaxb-api/2.3.1": {
-   "jar": "sha256-iLlVoN9XiAomp0cIvDT3Tcr46/TniEOii1Dq6UVzKwY=",
-   "pom": "sha256-ErIM+SJ3NEXDRFwog8v2cfqYIRHpv5+HUCD5MTs4FLE="
-  },
-  "jaxen#jaxen/1.2.0": {
-   "jar": "sha256-cP7vndda0GTe8Fo86Jda66UV7n0b4UbRIZnIgopkF0w=",
-   "pom": "sha256-zEgr+qIqVQepb6WzorYVkRRDrT9zZOAgBNGQsGfzsH8="
-  },
-  "net/bytebuddy#byte-buddy-parent/1.17.7": {
-   "pom": "sha256-ilfiDczgDaccM+8+GdndhY/p0gQsouK8onhxcA1SaYw="
-  },
-  "net/bytebuddy#byte-buddy/1.17.7": {
-   "jar": "sha256-NXXcuKmPr5Q9PBWVxHoWBHxPzoqD67smJi8aL2dUY1c=",
-   "pom": "sha256-7n+6hWnDu1wekeWBL9n0oPMb4n5WjVNU4a39GRGfl7M="
-  },
-  "net/java#jvnet-parent/1": {
-   "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78="
+  "net/bytebuddy#byte-buddy/1.18.3": {
+   "jar": "sha256-14OW48W84/KGXJGGZHSB5VidNMrMYySEcVtoYQjRfGY=",
+   "pom": "sha256-cVe2IqDWiFy1UmoQ8SIN3wkNu1LKL+OMMsxpxPFTB4g="
   },
   "net/java#jvnet-parent/5": {
    "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
@@ -835,13 +596,13 @@
   "net/javacrumbs/json-unit#json-unit-parent/2.40.1": {
    "pom": "sha256-GgCNCnykEDwm/lGk3ott86W5KGQZHNGLGfEBumF3yZQ="
   },
-  "net/minidev#accessors-smart/2.5.0": {
-   "jar": "sha256-EjFPxogdZqQT/WY3B4etuhblBPv34ThpCw85UuP70yE=",
-   "pom": "sha256-VJelxIYeWCxm5xyHzFppgtauiz4hSUersbl7l70+HAc="
+  "net/minidev#accessors-smart/2.6.0": {
+   "jar": "sha256-IiyfVHuyCpn8SGQDo5g1LRMG+2cbOKvX7KtkAd8XDmE=",
+   "pom": "sha256-JoMVeR7GYeKGFPRhISwGGBwGoEJzNCjYunEfCq1W6fk="
   },
-  "net/minidev#json-smart/2.5.0": {
-   "jar": "sha256-QyueVFhIxBQbgHF7JuNn+DvzPxklCiKM512m6WfaK8c=",
-   "pom": "sha256-wyo2YQmypaNuoA4SGqolfa5W7jqbl9JEI+YzteIUVGY="
+  "net/minidev#json-smart/2.6.0": {
+   "jar": "sha256-GuS1YUWK+1QL6OxcbbtPLnFaMZp65khUmYqvkkdw1hs=",
+   "pom": "sha256-g/GTz67zNO55oklFMELtXwhNuM2ckWojh7Q26aj7c6c="
   },
   "net/sf/jopt-simple#jopt-simple/5.0.4": {
    "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=",
@@ -851,36 +612,13 @@
    "jar": "sha256-wW6MiyS/b6Fl4B7KaSiMtkNf2TW4s19WeFjFl8yLyrQ=",
    "pom": "sha256-t/yqK4yQwOrPBGivdO71cu/ehElg1JeTwyXFXgYE3Mk="
   },
-  "nu/validator#cssvalidator/1.0.8": {
-   "jar": "sha256-sBzzjmk2G81Aux/Yuo2kaVcrkvIsjEqgCltYrXcuBAY=",
-   "pom": "sha256-yQ8wpMPMPMXLtvTWGfz3j5H0JgafiuziZd1NQYhLD/M="
-  },
-  "nu/validator#galimatias/0.1.3": {
-   "jar": "sha256-s3y8RRNYTtaqHY91KevnervijB9U7GOw/yigCi2dKpo=",
-   "pom": "sha256-0pTwlIXl8ZksreBRvbe+5wkiW5sKPOPQkAn36KjwG10="
-  },
-  "nu/validator#htmlparser/1.4.16": {
-   "jar": "sha256-Gh2hDgEJBdA+ZLQ/kLFxkDQOlkSCPLKvKlgiYIJVIRM=",
-   "pom": "sha256-X/JPq97/y7gin1SRPIomRALbzuZEL9DFNSBSgGQgxHI="
-  },
-  "nu/validator#jing/20200702VNU": {
-   "jar": "sha256-jjev/dEa645RrxsKg3CioWS7Bvjs0OR+oC/IGb/VX1o=",
-   "pom": "sha256-FKoIrg/V4KZsswsCx9bnOpOHC98K98jN8ub1flu4zWs="
-  },
-  "nu/validator#langdetect/1.2": {
-   "jar": "sha256-+wJvcyKYtK5eVurhHOXafBpc5AVzCEIInMku15vpanY=",
-   "pom": "sha256-KyE28/fhlC+B4R9FV0x+cnfWeURT27yzmYs8MluPu+g="
-  },
-  "nu/validator#validator/20.7.2": {
-   "jar": "sha256-L9dKzt4kTJ7GcyvLVyR6AfZ+JYCLVztT6EoK4pyfl4U=",
-   "pom": "sha256-GHLq+MRZqWPz+Oo+G6220xgYc8YH4v9aj1CylRNjvkM="
+  "nu/validator#validator/26.6.24": {
+   "jar": "sha256-z3bPal9Jiwp0Gkb9RIiuSBVgi9Z0+xrUy+uB4x1xsU4=",
+   "pom": "sha256-Mqc9wnw/yr6itcRIopom+JUUaSdZ3g97xebVjJcOIzU="
   },
   "org/apache#apache/13": {
    "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
   },
-  "org/apache#apache/15": {
-   "pom": "sha256-NsLy+XmsZ7RQwMtIDk6br2tA86aB8iupaSKH0ROa1JQ="
-  },
   "org/apache#apache/16": {
    "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4="
   },
@@ -890,8 +628,11 @@
   "org/apache#apache/27": {
    "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
   },
-  "org/apache#apache/29": {
-   "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c="
+  "org/apache#apache/30": {
+   "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg="
+  },
+  "org/apache#apache/31": {
+   "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
   },
   "org/apache#apache/33": {
    "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU="
@@ -905,46 +646,42 @@
   "org/apache#apache/37": {
    "pom": "sha256-Uk7EeHr/c69rOp+voVTH8YgbZIKZtmP9v8rdoShvI1M="
   },
-  "org/apache#apache/9": {
-   "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0="
+  "org/apache/ant#ant-launcher/1.10.15": {
+   "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=",
+   "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU="
   },
-  "org/apache/ant#ant-launcher/1.10.17": {
-   "jar": "sha256-9uPeBtwOo5ZjgATxoAP1X9vSDD58z7m3pST0n9CuhWg=",
-   "pom": "sha256-9AC2o10TvZ5x6sSDWfHZH799QMhtnHduwxZ/cQh5Xs0="
+  "org/apache/ant#ant-parent/1.10.15": {
+   "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA="
   },
-  "org/apache/ant#ant-parent/1.10.17": {
-   "pom": "sha256-mp73BzK+4Ro0oIZDqmlGPRwlhlhAHXJ5pU9zrQoVqeQ="
+  "org/apache/ant#ant/1.10.15": {
+   "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=",
+   "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY="
   },
-  "org/apache/ant#ant/1.10.17": {
-   "jar": "sha256-i+aS4Cg39BpHo9Ic3mZVeSFC/fQv4jvLFtcSnK2bIoQ=",
-   "pom": "sha256-Y6briOLg/NdpZ6rn5vWBGwLz+cUtltt2a2tJBXaPxis="
-  },
-  "org/apache/commons#commons-compress/1.28.0": {
-   "jar": "sha256-4VIpRSGEVvNkmjm8Sv1wzkvUZiIVGdun03jyFBpGQso=",
-   "pom": "sha256-Az9MeNYy2ojQ646tl0/BSiZDks6/EqtsaNbOp63wxko="
-  },
-  "org/apache/commons#commons-lang3/3.18.0": {
-   "jar": "sha256-Tu6ujSDAeKu2SwFewVit04OsWBVxzdxFxo8MmuAjByA=",
-   "pom": "sha256-qiVLNztvbUa8ncqGMxsHKoq4brJeqZIf1Dlhg5LpihY="
+  "org/apache/commons#commons-lang3/3.14.0": {
+   "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=",
+   "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554="
   },
   "org/apache/commons#commons-math3/3.6.1": {
    "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=",
    "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA="
   },
-  "org/apache/commons#commons-parent/25": {
-   "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo="
-  },
   "org/apache/commons#commons-parent/34": {
    "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
   },
-  "org/apache/commons#commons-parent/35": {
-   "pom": "sha256-cJihq4M27NTJ3CHLvKyGn4LGb2S4rE95iNQbT8tE5Jo="
-  },
   "org/apache/commons#commons-parent/39": {
    "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac="
   },
-  "org/apache/commons#commons-parent/58": {
-   "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA="
+  "org/apache/commons#commons-parent/52": {
+   "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+  },
+  "org/apache/commons#commons-parent/64": {
+   "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds="
+  },
+  "org/apache/commons#commons-parent/65": {
+   "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424="
+  },
+  "org/apache/commons#commons-parent/69": {
+   "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs="
   },
   "org/apache/commons#commons-parent/81": {
    "pom": "sha256-NI1OfBMb5hFMhUpxnOekQwenw5vTZghJd7JP0prQ7bQ="
@@ -952,56 +689,43 @@
   "org/apache/commons#commons-parent/84": {
    "pom": "sha256-kjn7lxAdsnBw5Jg9ENM6DpHPZ2ytkb9TgVQiw1Ye+bE="
   },
-  "org/apache/commons#commons-parent/85": {
-   "pom": "sha256-0Yn/LAAn6Wu2XTHm8iftKvlmFps2rx6XPdW6CJJtx7U="
+  "org/apache/commons#commons-parent/91": {
+   "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI="
   },
   "org/apache/commons#commons-parent/98": {
    "pom": "sha256-1AMYUn9WAz4P8HiZccw4yFaqmaaF7qEScIFOfx7an7o="
   },
+  "org/apache/commons#commons-text/1.12.0": {
+   "jar": "sha256-3gIyV/8WYESla9GqkSToQ80F2sWAbMcFqTEfNVbVoV8=",
+   "pom": "sha256-stQ0HJIZgcs11VcPT8lzKgijSxUo3uhMBQfH8nGaM08="
+  },
   "org/apache/groovy#groovy-bom/4.0.27": {
    "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=",
    "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs="
   },
-  "org/apache/httpcomponents#httpclient/4.4": {
-   "jar": "sha256-xQ6vpUd68vqCF9P3KbgV/zxmnbxGdVLA/u7cYb6WVSM=",
-   "pom": "sha256-ZKLnQYeKsG0yEWJ1cC6TLPjc/UYJNJ+yAL3sNG1elfE="
-  },
-  "org/apache/httpcomponents#httpcomponents-client/4.4": {
-   "pom": "sha256-M/J/3AzbDS+IohFr5amyo1ZTn2u3o5MZdxrbZZ200kM="
-  },
-  "org/apache/httpcomponents#httpcomponents-core/4.4": {
-   "pom": "sha256-UFItaYaRpZowcLDqR6/yag2GqjJAyIRd8rOQlkpci74="
-  },
   "org/apache/httpcomponents#httpcomponents-parent/13": {
    "pom": "sha256-5Ch4ZwNYVsc3QgNo3VhuXlfnAgmBNYQM89c+nINj17M="
   },
   "org/apache/httpcomponents#httpcomponents-parent/14": {
    "pom": "sha256-Xc62qyBqQZF5Jz8V0NK0cvlHK7t0fGyLfpbar3jMRSc="
   },
-  "org/apache/httpcomponents#httpcore/4.4": {
-   "jar": "sha256-HvjbXTC3dBq1/fbfh2oJCn3VFiPoPzc20LuPsbXq0y8=",
-   "pom": "sha256-rwGjbrhaJe6i0r5BG+ogbQMP3CzwogJLtpUSqK7ME40="
+  "org/apache/httpcomponents/client5#httpclient5-parent/5.5.1": {
+   "pom": "sha256-4O4QIcIIMoq/dcPd0fLx0xR24Pm/zIifoep5v/tzFtU="
   },
-  "org/apache/httpcomponents#project/7": {
-   "pom": "sha256-PW66QoVVpVjeBGtddurMH1pUtPXyC4TWNu16/xiqSMM="
+  "org/apache/httpcomponents/client5#httpclient5/5.5.1": {
+   "jar": "sha256-Lh5dDM9g0Hi6xuOwKQdq+oQzpqbZPu/bRrzlByC1i30=",
+   "pom": "sha256-84HRveWBuzaZLxRnSprIj3Nis+NcSKmYBbxW4d+TFkc="
   },
-  "org/apache/httpcomponents/client5#httpclient5-parent/5.5": {
-   "pom": "sha256-IlLZjPJibTGepzwPNpZXURTxc5UEuwajvJUrt1opyaQ="
+  "org/apache/httpcomponents/core5#httpcore5-h2/5.3.6": {
+   "jar": "sha256-R5qKpeb5kDCipEamjR9iMgaYkydG+BH8ZWoeoGuUGE0=",
+   "pom": "sha256-lYEsK/vPPsHWciilQHF5qJhSoUr9jTIYQFnqnSVCTVs="
   },
-  "org/apache/httpcomponents/client5#httpclient5/5.5": {
-   "jar": "sha256-SWtLDo1fOoE5pdJjhIbTBHWLrDqcOddpifZjz9k1T8k=",
-   "pom": "sha256-X7Zn7Afcjf7Y9rsUahresLev3459826ILart2wrcd38="
+  "org/apache/httpcomponents/core5#httpcore5-parent/5.3.6": {
+   "pom": "sha256-3kVXRSKzj9A1kJXNQdeKQ4IXoQr5DCD9LCpHgMR6cws="
   },
-  "org/apache/httpcomponents/core5#httpcore5-h2/5.3.4": {
-   "jar": "sha256-H7TzTkthLnwSetaTM1WDWHhQsXzpscNm+d4cpJ/ix4E=",
-   "pom": "sha256-zsGQjdjoavkI22E/I6CTt1lgvEpcaI5X9u9BmYtsUos="
-  },
-  "org/apache/httpcomponents/core5#httpcore5-parent/5.3.4": {
-   "pom": "sha256-Iyuj6AizQJPByLh2XNvqSQ4FrLfK9KQTbh9HDIykrOw="
-  },
-  "org/apache/httpcomponents/core5#httpcore5/5.3.4": {
-   "jar": "sha256-8rL9egFk6MMSDNhDe8n+pDkjnhZcFyYrPpB9qn6Xn4A=",
-   "pom": "sha256-NMsQqf+CzT+yBfasdsfpHrazHyL4wnSJUtvbm2ZXpbc="
+  "org/apache/httpcomponents/core5#httpcore5/5.3.6": {
+   "jar": "sha256-j7RSjT6XCspEBSOhvWmKOJ+nEOz+pMXGCWaYuG0Wac4=",
+   "pom": "sha256-jjcEPG/EAon+Pwyv0z0NfhoQrOT3RJW7xb45WGYUcY8="
   },
   "org/apache/logging#logging-parent/3": {
    "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc="
@@ -1014,24 +738,24 @@
    "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=",
    "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io="
   },
-  "org/apache/logging/log4j#log4j-api/2.26.1": {
-   "jar": "sha256-8YEKRwTMzgGdArugKdwCpPKsDJl/ZHtGXn1AnBkn+CI=",
-   "module": "sha256-Xtk/b7UzS/fuUpQ9GmVLw6Hz8Qdlri/Uu9OHMzvmZ4o=",
-   "pom": "sha256-yKuGj5xTIjO9EvMRzqkKP23mXqB6eqRww+K7+Dtcefs="
+  "org/apache/logging/log4j#log4j-api/2.25.3": {
+   "jar": "sha256-6IZoKSD6D7nW62OV3LTeCIRD+GRsicXlhG4WjjJ/QG8=",
+   "module": "sha256-W+T3N0jWz53pXLci63n8rVvCQnk6l4p+cmbyNZGBHAw=",
+   "pom": "sha256-MoS+ZXOuuDNGz/a3RvoyXSPq3Z0JyOKG7R11kEoS3W4="
   },
-  "org/apache/logging/log4j#log4j-bom/2.26.1": {
-   "pom": "sha256-RBWtGJ3QTbVJWKQ+I7N8w5eh7e6eiIIUuL1H++gZBy4="
+  "org/apache/logging/log4j#log4j-bom/2.25.3": {
+   "pom": "sha256-ZleICHEo/mw6+dAlJEhTKvl4cRdmSB20k5a/AyWibK0="
   },
-  "org/apache/logging/log4j#log4j-core/2.26.1": {
-   "jar": "sha256-LsjDv1ptfIm+hiARai/Jc/fdoa0CYa05PE1HJu39Pcs=",
-   "module": "sha256-A7/Yrb4wasRgAeyd5mj45dJPZlnyEvxk5iobZypaL2o=",
-   "pom": "sha256-Gj/ZpEZ8OrmxJ+cUG+8Sm2JCj+Ey9/klw69/Uk3XqLU="
+  "org/apache/logging/log4j#log4j-core/2.25.3": {
+   "jar": "sha256-Nit/y2W3OqRsxLxTq/TrIW9ESoO10aA3y2/f/wrp8Pk=",
+   "module": "sha256-ChRnoKtPxLJSc7VVHGCL15UguZ/SgRGgM9M4jwJVYwA=",
+   "pom": "sha256-ysGDRqDJErAmrVF/SE78POgyZ/LPambKhGmRL/GYaw0="
   },
   "org/apache/logging/log4j#log4j/2.17.1": {
    "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk="
   },
-  "org/apache/logging/log4j#log4j/2.26.1": {
-   "pom": "sha256-6kcFcl/ZS/XevikR1Op68giYYD9oNU5kskYaDySeRF0="
+  "org/apache/logging/log4j#log4j/2.25.3": {
+   "pom": "sha256-pbdIJFris5b1vKlHpJbtwI29vfeWmuLMsattS0lznn8="
   },
   "org/apache/maven#maven-api-annotations/4.0.0-rc-5": {
    "jar": "sha256-H3MlwBoKxaUgbK/wn6OIUgxlBdq4UBePRS0saq09PIM=",
@@ -1062,16 +786,9 @@
    "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
    "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
   },
-  "org/assertj#assertj-core/3.27.6": {
-   "jar": "sha256-snhysEmryI4jyFPOWReUXdV9Q70xF12FLjlB0qb9AjE=",
-   "pom": "sha256-sPgJRcedY8PDPWEL2HVNXppUNpVfev1oPQFg2GErquw="
-  },
-  "org/atteo#evo-inflector/1.3": {
-   "jar": "sha256-rAGS/REKA2NzKxfqlP0c6M/YV5DI4VUeFPhmkItdgOE=",
-   "pom": "sha256-OojhQWuYqbRmWwKS3Pr64qefRemQiAnhVklkSGVxLlI="
-  },
-  "org/atteo#parent/1.19": {
-   "pom": "sha256-17QKMvRll/Nx3fVV2FL6I55PC6+axp/hiDmdi+Tr7f4="
+  "org/assertj#assertj-core/3.27.7": {
+   "jar": "sha256-xKRFQmw8KGFmaGO4QsxOx7uxxCJv79NwttL+g9bE/w8=",
+   "pom": "sha256-laENz7O6mq1NC16cUjqNWDN3vuXs1Lo34Z5Vo0Zn8Hk="
   },
   "org/bouncycastle#bcpg-jdk18on/1.80": {
    "jar": "sha256-N5mg1TURuGB4CvQ8RK6OBRmvq7JjGVr0AXT0YxLNWL0=",
@@ -1081,18 +798,10 @@
    "jar": "sha256-T0umqSYX6hncGD8PpdtJLu5Cb93ioKLWyUd3/9GvZBM=",
    "pom": "sha256-pKEiETRntyjhjyb7DP1X8LGg18SlO4Zxis5wv4uG7Uc="
   },
-  "org/bouncycastle#bcprov-jdk18on/1.80": {
-   "jar": "sha256-6K0gn4xY0pGjfKl1Dp6frGBZaVbJg+Sd2Cgjgd2LMkk=",
-   "pom": "sha256-oKdcdtkcQh7qVtD2Bi+49j7ff6x+xyT9QgzNytcYHUM="
-  },
   "org/bouncycastle#bcprov-jdk18on/1.80.2": {
    "jar": "sha256-szIn8H3OJk2vGqwueY7xCaSQHzGr7axTY1dG3ZNnnTs=",
    "pom": "sha256-EqUFpxejvHZH99jt6ndzLJxty1PE32Kju1i3pUIooo8="
   },
-  "org/bouncycastle#bcutil-jdk18on/1.80": {
-   "jar": "sha256-Iuymh/eVVBH0Vq8z5uqOaPxzzYDLizKqX3qLGCfXxng=",
-   "pom": "sha256-Qhp95L/rnFs4sfxHxCagh9kIeJVdQQf1t6gusde3R7Y="
-  },
   "org/bouncycastle#bcutil-jdk18on/1.80.2": {
    "jar": "sha256-vHjTLX/7FB7ifk+3ffBCWdhCyJnn6Or5EvmQ1yU707Q=",
    "pom": "sha256-Joi+GvSZ1SUJYRTML1HHp6TKI8PScxe3HhjByWvsA9E="
@@ -1111,28 +820,23 @@
     "release": "1.86"
    }
   },
-  "org/checkerframework#checker-qual/2.10.0": {
-   "jar": "sha256-0mH94l1ZD2tp23ch1GmsGwoZoXzKqqdRwx8Ni4JguJQ=",
-   "pom": "sha256-JG5H45X416jBK3IisWa8Oh04Cbw6PTDel0cKo42VKks="
-  },
   "org/checkerframework#checker-qual/3.12.0": {
    "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=",
    "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=",
    "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk="
   },
-  "org/checkerframework#checker-qual/3.37.0": {
-   "jar": "sha256-5M4TdswnNeHd4iC2KtCRP1EpdwTarRVaM/OGvF2w2fc=",
-   "module": "sha256-clinadyqJrmBVNIp2FzHLls2ZrC8tjfS2vFuxJiVZjg=",
-   "pom": "sha256-AjkvvUziGQH5RWFUcrHU1NNZGzqr3wExBfXJLsMstPA="
+  "org/checkerframework#checker-qual/4.0.0": {
+   "jar": "sha256-oG8IvF36UddRzFvSRTRDqZoUgl1XvTxXbeJkjSyZ/Lg=",
+   "module": "sha256-ln2QDRHjn0Odlp13jowgxLszARwlhlgNGHvH+206KEk=",
+   "pom": "sha256-ahhIdMIp+tXF8KOgnP+3qZS8e9NnrOsw54Fz1lE78gY="
   },
-  "org/checkerframework#checker-qual/3.43.0": {
-   "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=",
-   "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=",
-   "pom": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM="
+  "org/checkerframework#dataflow-nullaway/4.0.0": {
+   "jar": "sha256-QDi5T0pY9YlaGd3pycBO5MyL8l6D1O8QFSQo52B4P5o=",
+   "pom": "sha256-MHAZFq+kHJtUGHSAsZrK+09uOwjf612+fxZ8fx7nn6I="
   },
-  "org/codehaus/plexus#plexus-utils/4.0.3": {
-   "jar": "sha256-Qh/27RRsU6nU6q3o9im1KxKvcYcQHxvQbCxk6QQBnzw=",
-   "pom": "sha256-NXNmWPP+Hvo5UIbJHfJZJmT6+iTD8mCP2roRNtF/02A="
+  "org/codehaus/plexus#plexus-utils/4.0.2": {
+   "jar": "sha256-iVcnTnX+LCeLFCjdFqDa7uHdOBUstu/4Fhd6wo/Mtpc=",
+   "pom": "sha256-UVHBO918w6VWlYOn9CZzkvAT/9MRXquNtfht5CCjZq8="
   },
   "org/codehaus/plexus#plexus-xml/4.1.1": {
    "jar": "sha256-4JsfzEbadEoOTavnA/KHzhM7Yx6pXG4aioLrrSsaKBU=",
@@ -1145,117 +849,135 @@
    "jar": "sha256-phxI1VPvrXi8Af/8SsUovruuZMuuwXCypeOc9h61Gr4=",
    "pom": "sha256-TpAuxVb8ZZi0HClS7BVz7cgVA35zMOxJIuq2GUImhuI="
   },
-  "org/commonmark#commonmark-ext-gfm-tables/0.26.0": {
-   "jar": "sha256-rBrfUKGkYL0V9Kpyr3KPoiDp3efJjWY4dczBFpNuE5g=",
-   "pom": "sha256-qHRitOyKVyrfRlxJTF4wZB6jIg6sM1PZP8uJ+ayBgLo="
+  "org/commonmark#commonmark-ext-gfm-tables/0.29.0": {
+   "jar": "sha256-8mPShMB5Ww3dYHHU+pafZ9RgZEwggo5RlXrVrsDXVhI=",
+   "pom": "sha256-IKZ4MLqW03gm638zVKnzkMqifh9mr2cCn/ae98LzO9E="
   },
-  "org/commonmark#commonmark-parent/0.26.0": {
-   "pom": "sha256-dgGFUmrpT6mf/I9bmQfJBgHgwt4SCdzcCzPSiLOlO5E="
+  "org/commonmark#commonmark-parent/0.29.0": {
+   "pom": "sha256-EYuW9nM4jSi8bDNRm7mxl3C+WfWJNfIwvKnrCwgvbhk="
   },
-  "org/commonmark#commonmark/0.26.0": {
-   "jar": "sha256-D70DfExN94Oq4Xz4ypiMktxNFxxzWrBMGzPRO0pslsY=",
-   "pom": "sha256-IJRQLBPLFmyM0VoNjXSRjONcI8CDDZp+OJ2zcH/R0Pc="
-  },
-  "org/eclipse/ee4j#project/1.0.5": {
-   "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY="
+  "org/commonmark#commonmark/0.29.0": {
+   "jar": "sha256-TJsPpIHjbXF2845XLBNGVkJM+WAbwZCFXQ+JR435AcY=",
+   "pom": "sha256-29OXmkXlxrTctXwOcZYcPezbfgifW49bk3VMLI4XiXM="
   },
   "org/eclipse/ee4j#project/1.0.7": {
    "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
   },
-  "org/eclipse/jetty#jetty-alpn-client/11.0.24": {
-   "jar": "sha256-0+q/fwpQ7pnkwu7T+VWZetfIToMe9tmcpl/N2Gkbg7s=",
-   "pom": "sha256-4ChUPNXWBpMyzMepXiaeCUfgUWY62QK8CRmkbgxrfSk="
+  "org/eclipse/ee4j#project/1.0.9": {
+   "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc="
   },
-  "org/eclipse/jetty#jetty-alpn-java-client/11.0.24": {
-   "jar": "sha256-GjsnDNXypSIpCZ1ZDV6pqgTuXkD2//6rffkmvmUzggg=",
-   "pom": "sha256-EXzXCLo3u6kMVwaD9v3LsY9IPiDkpOj0QhRT/JP47a0="
+  "org/eclipse/jetty#jetty-alpn-client/11.0.26": {
+   "jar": "sha256-AMrhET1gUaoV8yWclt75BkeTdW3GLF8a4jY7FsVbUz8=",
+   "pom": "sha256-OT7sghkKPlCBxEDEnQLlQQtkeb15wR8e5XAaKM4ZlqQ="
   },
-  "org/eclipse/jetty#jetty-alpn-java-server/11.0.24": {
-   "jar": "sha256-zIMflTl1QO7wVV8LHht7L8pfYt/e0MT7UPo1jYulTc0=",
-   "pom": "sha256-jq2POCgEbXoevHVoT2OTaLdhQ51Ru19sgiCscdMJ33o="
+  "org/eclipse/jetty#jetty-alpn-java-client/11.0.26": {
+   "jar": "sha256-RRKS6LEv/Cf3qHaBRvZ+gswF2ypWGR7IVz90HOh54PM=",
+   "pom": "sha256-o5952bqLssmcn/DJsOAFG4Zcn6C6yXa0TlwWOQxfRz4="
   },
-  "org/eclipse/jetty#jetty-alpn-parent/11.0.24": {
-   "pom": "sha256-OEfidTdZ+GkaIo2c8dddJPcwJG4J3FL/8b0r0PTbnVc="
+  "org/eclipse/jetty#jetty-alpn-java-server/11.0.26": {
+   "jar": "sha256-fHHT3Uq8niayJZ2/Ovqlx5TxKrlX9bNrazNmtaCN2KM=",
+   "pom": "sha256-qK5Z1PnTjw/gWExP1NN6d5E3jTwY23+VAG0hGafCd/g="
   },
-  "org/eclipse/jetty#jetty-alpn-server/11.0.24": {
-   "jar": "sha256-oRp4O8Aj5vsgET85ugmM/6H4/F2pkwOXHploc2PlZWI=",
-   "pom": "sha256-Kl+OKVd+qPdvkUmX9VOPjofcGYeJef4SC+UFRtsUoUg="
+  "org/eclipse/jetty#jetty-alpn-parent/11.0.26": {
+   "pom": "sha256-O9Bn6iUPIKQ3vVm09NAgMQ70412iA9IZ+TwjFEEUDXw="
   },
-  "org/eclipse/jetty#jetty-bom/11.0.24": {
-   "pom": "sha256-OzjVNA/7MaYiymePR8K2Bawg6lhVJZ84Xm0ujyfs1dk="
+  "org/eclipse/jetty#jetty-alpn-server/11.0.26": {
+   "jar": "sha256-eu7ewKYwSsArLD1BUvbem9FL9gB+w+E+pz4/s9INAVQ=",
+   "pom": "sha256-4X803Xd74B2if+SY+027zqz6ZijnXDqEU68nGoXwggo="
   },
-  "org/eclipse/jetty#jetty-client/11.0.24": {
-   "jar": "sha256-yYOqFTdFGdhxcoDh2EM028XuQiePsQllX29alJQ/TS8=",
-   "pom": "sha256-u68OEXqGWPInb/qKEbdVywctM1NQWvsKPk7BpkzkbP4="
+  "org/eclipse/jetty#jetty-bom/11.0.26": {
+   "pom": "sha256-Iyqf1oLlxbyCwaRj70NMgGJA5i9cH5oWfArWnRXZ/WQ="
   },
-  "org/eclipse/jetty#jetty-http/11.0.24": {
-   "jar": "sha256-ZONoY0f2D7GqAlATghVHmVpwjmGomWfAOGrTrcn60R8=",
-   "pom": "sha256-/lve2cVDbsrkT438v4Rw0O96qj/U1nAe+oEuV4EOeP8="
+  "org/eclipse/jetty#jetty-client/11.0.26": {
+   "jar": "sha256-d9o+HbsNDyiPhinXui9x6ArruPIYpdz6iIJ4x/peBP0=",
+   "pom": "sha256-FO0rm93vWtZ5r3uRxQ8+9bfwDZWKw5FfovttaL6hrSE="
   },
-  "org/eclipse/jetty#jetty-io/11.0.24": {
-   "jar": "sha256-N5oEGTtOZm15AEePYC0SvU49kavTtfZENNkpJ7BHIPk=",
-   "pom": "sha256-vTPGW6IaAznasQRHEZ9yPb23L7mSM0AHjtTT1ZVTkwc="
+  "org/eclipse/jetty#jetty-client/12.0.34": {
+   "jar": "sha256-t3t1NagJx4r3ESa5Cu0INsyfmsgNMuXL96BwJazhRAE=",
+   "pom": "sha256-w0jYiLweJSCUjf5db/iUQY8ClroJ/1uGMhxWIaR2bnU="
   },
-  "org/eclipse/jetty#jetty-project/11.0.24": {
-   "pom": "sha256-9miJ0dIX26PbBfSwXOwksKIg1PHRbFLSA9m2+3HaYIY="
+  "org/eclipse/jetty#jetty-core/12.0.34": {
+   "pom": "sha256-aR8lOSAY3+1rvop8xWoUFGSzy5VmbgsNp4fzqmowNyQ="
   },
-  "org/eclipse/jetty#jetty-project/9.4.18.v20190429": {
-   "pom": "sha256-1GvUDvRMD9fEvW/Hp/MUbHxgL3TrtfN42ipcMDXnmDg="
+  "org/eclipse/jetty#jetty-http/11.0.26": {
+   "jar": "sha256-3nOMjP1XAWJ7U3PEI3ZFO+uCdvmJ115SWOOx/+IX6Tg=",
+   "pom": "sha256-vTaZtGxq1niURndL54PXpr/okL7MRVMQJsRD6tdWEgg="
   },
-  "org/eclipse/jetty#jetty-proxy/11.0.24": {
-   "jar": "sha256-Sm2GP0PMQH0GsriAgUOHog0hodIptNdV7xx8Ln4QOGc=",
-   "pom": "sha256-NaAFoAOnCQTDSyp+GfgdI71U25KBjCEfYsTiInDyGys="
+  "org/eclipse/jetty#jetty-io/11.0.26": {
+   "jar": "sha256-zg73YHHjYdl/EC5ctIkos8xmrImdEr4+8K+NBrT3aKE=",
+   "pom": "sha256-dgtuIuCjYWRruZ4gUOqlogKgcSgXp4L+Z8zitr9GtCg="
   },
-  "org/eclipse/jetty#jetty-security/11.0.24": {
-   "jar": "sha256-B/VW40sEjIGUQLnpn6apwUSeDRDjwNhiikRr5e0IK4g=",
-   "pom": "sha256-NeCJ1jkTMrp34adpkgnU7j7zlq0pkmWDWt4tm/0Esp0="
+  "org/eclipse/jetty#jetty-io/12.0.34": {
+   "jar": "sha256-NwTa64KzkEHuXm+BBjbC/LmhBHbNvw/QZ+WE7TEQ1mo=",
+   "pom": "sha256-ZNZ0k373UtnCvLpVH408/RUOsZujVBNCAWlBeVhSwOc="
   },
-  "org/eclipse/jetty#jetty-server/11.0.24": {
-   "jar": "sha256-ECHKaaTLVr2kZsqbuw/K/z3zFimi7PckBZX2Wuuro0s=",
-   "pom": "sha256-5yEko9Ho+3DaG1JY4VQrgB/+sDOqExYB2hH3lLQpj1Q="
+  "org/eclipse/jetty#jetty-project/11.0.26": {
+   "pom": "sha256-VC6ygTNLpIZ+brBSuBks+7h4qVEGb21wTjMtcLHjOlM="
   },
-  "org/eclipse/jetty#jetty-servlet/11.0.24": {
-   "jar": "sha256-F4yNx+mFFboodMh7NgwZFf53TsbgARxlHmOeoycZvmM=",
-   "pom": "sha256-3uiUnisDmOn03P7p/2yS86l4qZd3aF1i6MheSx+7itg="
+  "org/eclipse/jetty#jetty-project/12.0.34": {
+   "pom": "sha256-Z5kGPgs6OwOWfkqjUSuYnKL+jQcUfUisYNBp5BdKnDo="
   },
-  "org/eclipse/jetty#jetty-servlets/11.0.24": {
-   "jar": "sha256-x66EoSNNwkBEbqnmbyLhKRBfYvJfETYnME+LPBacz7Y=",
-   "pom": "sha256-gbRgsSDWSrntgs0oDfrdtb4om9P6V2M6D4/1e6R1HoQ="
+  "org/eclipse/jetty#jetty-proxy/11.0.26": {
+   "jar": "sha256-xcqhIfenhXTCWzP2XILtbx/7t/aDd3ZT0evkRg0/ENo=",
+   "pom": "sha256-Bv0aUwb5Yd3p5s7JTveKEAoVlU7CdHHEVDa8v5P7sV4="
   },
-  "org/eclipse/jetty#jetty-util-ajax/9.4.18.v20190429": {
-   "jar": "sha256-sfOmKclI6RzM8O5BwkcYLwjCeKzjCdbzhvJJdFvhrLE=",
-   "pom": "sha256-59pcvWbuHZsx0DFJ1Jj183k6+aU6ghN/+PUsqdBGlW4="
+  "org/eclipse/jetty#jetty-security/11.0.26": {
+   "jar": "sha256-HwobWDBHQfJD4vasaU5lBrHia7B5z8K6qj8qbtS/LZ8=",
+   "pom": "sha256-YEtXpql14cXQM5K6NmzOCbOx06wr3Z819WoaufJgG8s="
   },
-  "org/eclipse/jetty#jetty-util/11.0.24": {
-   "jar": "sha256-HscB9QUFZEPeE00OVGTimKoVQAmBIQwQtmigcP/Ze/0=",
-   "pom": "sha256-7ro8qZy7kyAEbuNm6V3wzr8vEQciaPRcouvj4iO2m8o="
+  "org/eclipse/jetty#jetty-server/11.0.26": {
+   "jar": "sha256-PMOyA7lscRUVHqlMrYr0PAkUv7b+IM8sqDeOxoIvpHE=",
+   "pom": "sha256-f1F7VfQEd4im327OVSv1/za0GP7b3yMh5dH9bh/75J0="
   },
-  "org/eclipse/jetty#jetty-util/9.4.18.v20190429": {
-   "jar": "sha256-2yrpdnnk2d0LluDi4EQj1BQHl3qH7foO0XFMROtceqE=",
-   "pom": "sha256-g/9B2rfamDvQ3Y+IUSZRCz+sQEtSzOlF/YbM4PAeIh4="
+  "org/eclipse/jetty#jetty-servlet/11.0.26": {
+   "jar": "sha256-wJRp8QRfniB3MmkrO8Vuj+TQWZ3lLTvVk5J8SpBg5nk=",
+   "pom": "sha256-fJakLgJv8/rkEsozOfFICuRHII7mmmuBnyBA5mF8FaY="
   },
-  "org/eclipse/jetty#jetty-webapp/11.0.24": {
-   "jar": "sha256-McsSrHHqnIzljqDSmfOP3w7abuIzp3CuHqPOj3S5VP4=",
-   "pom": "sha256-Y9pNCE6Eb9AtbJpCi8zGYK+hxb17wkfsIfFsN6cWaBs="
+  "org/eclipse/jetty#jetty-servlets/11.0.26": {
+   "jar": "sha256-U1wLisV+XB+83rnCANrFwB04QhA01NfP/JSLs61vbwk=",
+   "pom": "sha256-/obYXjH/x3tOSKIvon6oR4fdVWuJNLvMq7Jpa/iK75A="
   },
-  "org/eclipse/jetty#jetty-xml/11.0.24": {
-   "jar": "sha256-gOF06W0GINnCf9Ck0ZqDEnjxRkycVr7Z5DfMikUlX9Q=",
-   "pom": "sha256-JXNlZfHw0Et42x+ZH449AZRmgAWbwqhXauRd7pJu8h8="
+  "org/eclipse/jetty#jetty-session/12.0.34": {
+   "jar": "sha256-oWGuUxxdamlfF6VH/fkHRtzZKfGrrFxgxwYab7INNG8=",
+   "pom": "sha256-zQE2au8ii4AzMqc6yjihhLz5e8wB072sv6DpZLFzISk="
   },
-  "org/eclipse/jetty/http2#http2-common/11.0.24": {
-   "jar": "sha256-XXdG9EmGKB3Ks+fLpeTSSGgnQ3XErF45F4XET5uZJ9E=",
-   "pom": "sha256-aEwrliRzkYCfzaIEvCz/NqLyc7LgCLlDxs6QTrmkCsE="
+  "org/eclipse/jetty#jetty-util/11.0.26": {
+   "jar": "sha256-G2G4dabUDo/UTP+zB722bzRZNwoVKlCgkqaYw3N+7Kk=",
+   "pom": "sha256-Nfw2JswhOC7LE+FDx2hJdyE/adLWfa/4/+U9HrRaQMU="
   },
-  "org/eclipse/jetty/http2#http2-hpack/11.0.24": {
-   "jar": "sha256-8yapKXQgEU+ZuzCFkHcrQQDNjmL1XWdm5ctJb7JHQ8U=",
-   "pom": "sha256-4N056ZrPI6FKjnFfmLf5Lxe6AgVMJuI4XOXEm85i4jU="
+  "org/eclipse/jetty#jetty-util/12.0.34": {
+   "jar": "sha256-P4kGzXJCjYfbvAvZFRks4PQm6dt4BdOwM3WIwbbXIG4=",
+   "pom": "sha256-WsXWULMseHq2Ix4cdN+tTe8citJvmPAeLIZNnM/mkVU="
   },
-  "org/eclipse/jetty/http2#http2-parent/11.0.24": {
-   "pom": "sha256-H/63MlEaizavZ8nPMV5XckiQjy/U8WLyxVezUjFsBis="
+  "org/eclipse/jetty#jetty-webapp/11.0.26": {
+   "jar": "sha256-/kUVL4uEvjVjq6/WwLmV4TuaaFeZrfiy5XrGQB7a7tE=",
+   "pom": "sha256-jK98qgiYQfjeSxAATFiOworOFF3qqub8gTruCdBhskI="
   },
-  "org/eclipse/jetty/http2#http2-server/11.0.24": {
-   "jar": "sha256-p4bvTZ6UpIZcl3XKG6wwdgMA9WNx17QISGixfM4Cw48=",
-   "pom": "sha256-e4PC3DueupOTnXmCIU9A++tU/iean6/NAb9Me0dVdE0="
+  "org/eclipse/jetty#jetty-xml/11.0.26": {
+   "jar": "sha256-FvpwYaUtYFL04e1k3R1hYB0hC93J7W296GIbDtt76x8=",
+   "pom": "sha256-EOJPprkAx1MPVsaUbrUVx18ZbXnwgNB2fng3rwG2Iak="
+  },
+  "org/eclipse/jetty/ee10#jetty-ee10-servlets/12.0.34": {
+   "jar": "sha256-v5/oQeCfOdSYg4lltX5St58S571eJZ5kXMngpsvpZCY=",
+   "pom": "sha256-v5I6DRKBS8LcZztR6oVOx8meMVuCJrj8JePEjr6WhCE="
+  },
+  "org/eclipse/jetty/ee10#jetty-ee10/12.0.34": {
+   "pom": "sha256-fRB3tam4WVEt1lpDve4DgObylWbXDHFCZV/X17MmQSo="
+  },
+  "org/eclipse/jetty/http2#http2-common/11.0.26": {
+   "jar": "sha256-SHhCfKcSnGbGyHApakIkqdaV/BlNGmhRAV15Nv6j5Ow=",
+   "pom": "sha256-S79DrQUbbZNNfrCxsC196vaiWqtwUqBkFZ/v2fUgbjQ="
+  },
+  "org/eclipse/jetty/http2#http2-hpack/11.0.26": {
+   "jar": "sha256-Jp0FD9deN7Uu1rqDJ4rLSgpv92vAuD8JepCiZd/vfOs=",
+   "pom": "sha256-HmuVipubDGn4MzcP6yZzRzOi17pIXvcN4mK84IyTCeg="
+  },
+  "org/eclipse/jetty/http2#http2-parent/11.0.26": {
+   "pom": "sha256-IthncC1PuPBHjxrHsc8yqqVxSIV3GZ/JtmlklwNbCk0="
+  },
+  "org/eclipse/jetty/http2#http2-server/11.0.26": {
+   "jar": "sha256-vLlS8e1h3cWUtqbNsODB5YfIlhHoGvCGhgtJxE/0Fcw=",
+   "pom": "sha256-TMcITsrZStbDg7LkF65/h9/QYmYdgJsNBUUPyWIe6kU="
   },
   "org/eclipse/jetty/toolchain#jetty-jakarta-servlet-api/5.0.2": {
    "jar": "sha256-77IJl3KfMr+myKgxkDfDU/etRg1dSfM2vyMpmOojWNs=",
@@ -1264,139 +986,122 @@
   "org/eclipse/jetty/toolchain#jetty-toolchain/1.6": {
    "pom": "sha256-RVY/EXXZhZwcBmoJgPvbn2u0xtPBLgXYlXm7F4P0e2w="
   },
-  "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": {
-   "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8="
+  "org/eclipse/jgit#org.eclipse.jgit-parent/7.7.0.202606012155-r": {
+   "pom": "sha256-S4qHPLaFhEH/MSUDTbVU0leSL7cIIEeVtyAZDW+05iE="
   },
-  "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": {
-   "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=",
-   "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI="
+  "org/eclipse/jgit#org.eclipse.jgit/7.7.0.202606012155-r": {
+   "jar": "sha256-onxHjV94vD2VRh8VOmDv3xYjknUCxopFetmplaNcWnw=",
+   "pom": "sha256-owH00aR2nxrSVstU54V6Uq8n59A+UMo8UPTLZDw98SY="
   },
-  "org/eclipse/platform#org.eclipse.osgi/3.18.300": {
-   "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=",
-   "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ="
+  "org/eclipse/platform#org.eclipse.osgi/3.24.200": {
+   "jar": "sha256-v+g/zR+gNOuamGs8tuXisY27rLZ+q9qtLaMoBOzYxlo=",
+   "pom": "sha256-sMVs+qxqcAh+RUJXzABLfTb7uYk9vu5N64fGISWGERY="
   },
-  "org/fusesource#fusesource-pom/1.12": {
-   "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE="
+  "org/glassfish#javax.json/1.1.4": {
+   "jar": "sha256-F/3rfiI3Wn+0C7BVEwb23PK1dDB4Zorc32xkLJqeyVU=",
+   "pom": "sha256-UNKlkVUoQQmnCGdbUuu0WYUA5DaTlnz/FAHLJrl/iFM="
   },
-  "org/fusesource/jansi#jansi/2.4.2": {
-   "jar": "sha256-C3uLADqQ6kkVebYvURiCjkURKRTGVYmwD6pJ1ux4WDk=",
-   "pom": "sha256-Lory+B0MmVUIvWfJid4ewhbrakdgk/WY9CFOz2ESjfA="
+  "org/glassfish#json/1.1.4": {
+   "pom": "sha256-2j9Tvh1F7zr2Z/36JvVMPrwOGWuMTftkZJHb4+Mcsgs="
   },
-  "org/glassfish/jaxb#jaxb-bom/2.3.0": {
-   "pom": "sha256-9P6WMlVnrr4PLzTRjHEmHdOl1mEPXfbrl/195BheVxQ="
+  "org/graalvm/compiler#compiler/25.0.1": {
+   "jar": "sha256-wIPqATVEMYTLZ1Oowa61uWFl3PK3gDA4qiREWqfwsww=",
+   "pom": "sha256-9j+2Bb7/m3TFL88579nSttQ9LAMTOAYpKZVGuiwvDPc="
   },
-  "org/glassfish/jaxb#jaxb-bom/2.3.1": {
-   "pom": "sha256-bMEmbPMGVXtPLQnL2M1udbXvDFdzyk73Y9T3MN+Ue2Q="
+  "org/graalvm/espresso#espresso-svm/25.0.1": {
+   "jar": "sha256-zLZoZgxUphjsxR3BGDGaQ6+4lIuJm7T71uQds+9h1SI=",
+   "pom": "sha256-RpxYjrlAp1J9mtzbRZn7g9JpbGviqJmB+z+j37Uxnkc="
   },
-  "org/glassfish/jaxb#jaxb-bom/2.3.2": {
-   "pom": "sha256-oQGLtUZ47Z9ayy96QITjhf9RAgH06dv1913GpnX2a+c="
+  "org/graalvm/js#js-language/25.0.1": {
+   "jar": "sha256-YKSKH1TasQbf/NGOU29fJy7C7pm1yWDul8VmbLZc3p4=",
+   "pom": "sha256-72kkfMnF8QmzXr4a7v3z2Esv8w73tMOZI8Tc++4IMxk="
   },
-  "org/glassfish/jaxb#jaxb-runtime/2.3.1": {
-   "jar": "sha256-Rf7PpcghfOHzZSq5UXl5DsjMDewDhLylHL65Sik9ny8=",
-   "pom": "sha256-+BAbhhV/v8AZSf/cfFnqccojt+ziX2p5Bh/gHLdQ/wA="
+  "org/graalvm/js#js/25.0.1": {
+   "pom": "sha256-Bqw/ZiuiGes2zQffMp/FWT3mgklDzx+ZFQrFKCkaNC0="
   },
-  "org/glassfish/jaxb#txw2/2.3.1": {
-   "jar": "sha256-NJdd3hxpIPGjl5EUIjVom8PNNX4k0F7dj/k7iFvWjWA=",
-   "pom": "sha256-RxTUbKz3Aqss1HjWBIxdnMV6vbVfTAe2t6pyeZ4C02w="
+  "org/graalvm/nativeimage#native-image-base/25.0.1": {
+   "jar": "sha256-dnjTyetVJfDTKiaiuQfUEqvsucq14xkkqZp80qdkakQ=",
+   "pom": "sha256-8H9Xst0vdnRh+s2OmGY6dEb71rnW3j+/Nb3MgxgAj+s="
   },
-  "org/graalvm/compiler#compiler/25.0.0": {
-   "jar": "sha256-w3DmC4Y4h2jh4ZdkRuSmqU1TkYhXtXRCb976lNpaLL8=",
-   "pom": "sha256-OOm8UaMuHvarkmqBPpIYOPgLRgAu4ysuhnodjRZzcW0="
+  "org/graalvm/nativeimage#objectfile/25.0.1": {
+   "jar": "sha256-R18rZjc6Da4/Dy8AHD4uUekvWNjwU7ieqjhR6xOFiNQ=",
+   "pom": "sha256-dQ8Jv4nE32jQStkb5JoLTChd7+hy7RXYMTcaMMz0QgY="
   },
-  "org/graalvm/espresso#espresso-svm/25.0.0": {
-   "jar": "sha256-qVv7OnXGCF8yZ9EkRH3yJlEdH/bZEp3Eeh+XKxIcaWU=",
-   "pom": "sha256-TiIWsIfeF3LBadbroRrfoA0gGHOocqfhIm0H1poPYyU="
+  "org/graalvm/nativeimage#pointsto/25.0.1": {
+   "jar": "sha256-nwKxNDoAUmPzAI7A1FEFo/B+L402sytSV58qiK5HQ3w=",
+   "pom": "sha256-MyDdydYKlJlxs1Zo07A+tgGlM3N9zJGQRgaofZgZPK0="
   },
-  "org/graalvm/js#js-language/25.0.0": {
-   "jar": "sha256-Ah+bPnmfviomeRIgLhQbmlxM7aqCNJdkU/e8mlQY+lM=",
-   "pom": "sha256-tYfrBNhzI7A/zJaQ0L0kqWP/H5FiCHCpEbmJcRfiHVU="
+  "org/graalvm/nativeimage#svm-capnproto-runtime/25.0.1": {
+   "jar": "sha256-DKnzoBhP2azb/37sWfd3BZWg1Zy4P6ztsqmKZH0eexc=",
+   "pom": "sha256-wCbaPEkemE7DzhyFaq09DY0cIx2WubBoovMPbx5NZ6Q="
   },
-  "org/graalvm/js#js/25.0.0": {
-   "pom": "sha256-1JiC9F3kXBuTZAO0p1VAEnMhjRTKP+xCF3IghjZzqJo="
+  "org/graalvm/nativeimage#svm-configure/25.0.1": {
+   "jar": "sha256-rJNbCuI72sLQDmr8sC8830uJL2pKmQuK13vK9MmUQSM=",
+   "pom": "sha256-o3vjquaT9qV47LCLfKfR1hgTVPB2qvQvZXWuHk6HXI8="
   },
-  "org/graalvm/nativeimage#native-image-base/25.0.0": {
-   "jar": "sha256-Avx8sDjdUWuueAW7SAo2G4aNcG5LkaurAKydtcTAUBE=",
-   "pom": "sha256-P3T0AgL5h7dpQQFPaJ7xHnERibkcgX5LbHDugWWkLA0="
+  "org/graalvm/nativeimage#svm/25.0.1": {
+   "jar": "sha256-7noVIwBCnVq56et+RGqOb6308n0tKAtsvXhQadvpEhs=",
+   "pom": "sha256-qtCHE/Tlv4gegVEz0sp9StccqtqWbKdCueyI+atxYyQ="
   },
-  "org/graalvm/nativeimage#objectfile/25.0.0": {
-   "jar": "sha256-gq/wwxYUW8SuqOkpy/6zrDwnsbLgpKtP2ZQklm1+vDQ=",
-   "pom": "sha256-UCGaGz1FjXx3p172eqDfXNh27SyxSF0YNzZshm121Xw="
+  "org/graalvm/nativeimage#truffle-runtime-svm/25.0.1": {
+   "jar": "sha256-9dq/6sUjQGgHO9c+cp2AZnzlvnQUUsLiirViio7SCCA=",
+   "pom": "sha256-28FxQAW6dwfnYKcBmcb2L9AthSM/oQTCde2xA/92dqg="
   },
-  "org/graalvm/nativeimage#pointsto/25.0.0": {
-   "jar": "sha256-FiMcDi+jste+G7tlkycjgRXMV4YvbeNwEGrWlrGJQMQ=",
-   "pom": "sha256-iuBpvfMS8qjOnyyAt4WhUbZJZS0IF33Heevg+drNdOI="
+  "org/graalvm/polyglot#polyglot/25.0.1": {
+   "jar": "sha256-mSCZ04q2ThqOu5dTwZWdQxxIiZBf+ejslGkRaS8IecU=",
+   "pom": "sha256-SAW2vChKn7TvRs++E+k1LNcudb664sjYf7wFP1E+DlI="
   },
-  "org/graalvm/nativeimage#svm-capnproto-runtime/25.0.0": {
-   "jar": "sha256-+kmImosIFg+jjT6JH5/pSrGMZgiEKmkDx45483r9Y3w=",
-   "pom": "sha256-mOjg8wXpGRQ4SMdzj0hMp8BcwfaLyJTs6PjguD0o8VM="
+  "org/graalvm/regex#regex/25.0.1": {
+   "jar": "sha256-ZnbQaiePOfcavC9Nx4UaIzys854Qfq/+bj0yN0mezAQ=",
+   "pom": "sha256-tt5FiquEVNXHj/VDA5elC6WDBjd1izgxprb8oL1nC5A="
   },
-  "org/graalvm/nativeimage#svm-configure/25.0.0": {
-   "jar": "sha256-aXrli5wj5g14Wc2ifTKYEjKBrJnCNFgiH6NNrN1jxow=",
-   "pom": "sha256-pYbrwaL8l3xIsU0DBVe91oV8HABg77Ivrh1SftGcIVk="
+  "org/graalvm/sdk#collections/25.0.1": {
+   "jar": "sha256-/wYQSPIKk7CvUdipSFVtU2+zaa72uFHmmP+HQ6O8Tn8=",
+   "pom": "sha256-7hzy/CFafyUqAfE4Ly50lfd7pcILBL+QfMCK+k2913g="
   },
-  "org/graalvm/nativeimage#svm/25.0.0": {
-   "jar": "sha256-xSnS1sLwIcc4qWaDYZKBqVjI/IkNdxsctRVILTLgAYA=",
-   "pom": "sha256-oUxlnfPvW+gxD5QsrYhdte9diUmFSfchQhhXdgD5i/s="
+  "org/graalvm/sdk#graal-sdk/25.0.1": {
+   "jar": "sha256-67STgSJlzXhDeLQ2rmqMFPrJfv2ieQ8IZNPRgwM/RAo=",
+   "pom": "sha256-Fhcd1hCIrClLhCugEeipAiZ9Nsc+x7GTK8jJmOSXiHA="
   },
-  "org/graalvm/nativeimage#truffle-runtime-svm/25.0.0": {
-   "jar": "sha256-1LJeRXZbZzM9YgQqFHh6d02e5s+R0B1rXieawtFf+iQ=",
-   "pom": "sha256-fXbg64cpjLT2G0aIP71wz/5iRcGDtDrN6kwcu1n0EzA="
+  "org/graalvm/sdk#jniutils/25.0.1": {
+   "jar": "sha256-psQY3oJnYpJDeH272FQ+I86PXLoXRKOp//NlXmPEUYM=",
+   "pom": "sha256-AXpL6HDZmIYUUJSRq+83VkWh14Z3eTjQWH4/epg8gis="
   },
-  "org/graalvm/polyglot#polyglot/25.0.0": {
-   "jar": "sha256-R52GADdXCs9lX2TmcYEyuFXFQJHncvZ+kBqIzHLELng=",
-   "pom": "sha256-HIrKleAdBdtIKI5PJjyI7999Jyv6VTxg4354VTTcrtc="
+  "org/graalvm/sdk#nativeimage-libgraal/25.0.1": {
+   "jar": "sha256-HUymdNMTnlIupXSDdBr5Te7dUmUsTcvbgrg5JArvNvQ=",
+   "pom": "sha256-bfFV0YtS7tCB2oTjgRdswepYkeDeQJONE10muF2ZndI="
   },
-  "org/graalvm/regex#regex/25.0.0": {
-   "jar": "sha256-7b6LBLT2YKcpruH7zAq06Hb+oGGSyxPvu8Ix6LLE+9U=",
-   "pom": "sha256-xjnYs32yHD7Q/6eCvdW/ZoImazd+F90W9lHs2/dGx3g="
+  "org/graalvm/sdk#nativeimage/25.0.1": {
+   "jar": "sha256-RYvLqvRmJMntpJwOSZ/TKvHDd0xvjkEqUJocQizAbPg=",
+   "pom": "sha256-JzW15EowqVY2uJ0oBKW4A07RJqVUdCbklbeb9QmU7AA="
   },
-  "org/graalvm/sdk#collections/25.0.0": {
-   "jar": "sha256-kh8isU3AU0RxOOtSv1cNOC/GLaa6PaTdSvH+IEF3OUE=",
-   "pom": "sha256-b1JN0J9rf5odb8q04NnLrnJ2p0J1uDb2l29HNVQAvLY="
+  "org/graalvm/sdk#word/25.0.1": {
+   "jar": "sha256-Bx9KSpaZd/Y9w29EbguQsZxjH1RmpxW6fV6PCrn1/Ic=",
+   "pom": "sha256-qZijaYc1Zi0sArPokqqPecdOi/iZNhyVznaO8K8tiTo="
   },
-  "org/graalvm/sdk#graal-sdk/25.0.0": {
-   "jar": "sha256-ediYWya+dJax7yuFCJoJNC/S+SqYyJI0dkCBD75LSFw=",
-   "pom": "sha256-AlS9KHaCEGEhfgnqqGb3SZvM9iCHfIit70si4oo1vt8="
+  "org/graalvm/shadowed#icu4j/25.0.1": {
+   "jar": "sha256-u7lfXyuKtXCLUv1iba4lNBEXKGZTpEYY7yA4QvlgK3E=",
+   "pom": "sha256-AjF3RGU5bR3GBIAmSyLkHjBdh2JgrA5HF9tQChRrz38="
   },
-  "org/graalvm/sdk#jniutils/25.0.0": {
-   "jar": "sha256-J9+FS5/UUNhPEbHhgp/Hq0YTO7ui3G9rJrjvhwVKyHU=",
-   "pom": "sha256-dDyjKWnrFMbpoorTydRFojH207nOMcjUFjBs65y1fXM="
+  "org/graalvm/shadowed#xz/25.0.1": {
+   "jar": "sha256-2w7mdmk09Yu7angmxYaDEyuDOG70Zr66YJgI9tG5eZw=",
+   "pom": "sha256-5wBQEi8gm/SznrnHpXt2Nr+EhFmi2zw+tuq9piS2IJg="
   },
-  "org/graalvm/sdk#nativeimage-libgraal/25.0.0": {
-   "jar": "sha256-gl52ADvxEHL8oZLN3lvktELyyJGZK1NLLpkoicL2tMA=",
-   "pom": "sha256-3Hn3w08YaRKJ2AGe0LKmr9nFgH3VYXXIWwotxGdGCpU="
+  "org/graalvm/truffle#truffle-api/25.0.1": {
+   "jar": "sha256-msQphnXnqwaQyhM4mZqJNqtaEaCJHuaGS3Z0/aXblOU=",
+   "pom": "sha256-nnj2gYOpbXSreRdeRY/p2ihP3VzEkJ7v7oARrZGxv+A="
   },
-  "org/graalvm/sdk#nativeimage/25.0.0": {
-   "jar": "sha256-Jj0j/ALhALux9+IBksdo8+0S9kfWw2717sp5LBjTEYA=",
-   "pom": "sha256-swUXlP29FueEWSkPvOoSJBucmuHrQPotCV4nxmJY9GE="
+  "org/graalvm/truffle#truffle-compiler/25.0.1": {
+   "jar": "sha256-XY7q4mR4Qc5ebxoL+ifvkTQ7nlwBeNUVO+QJ95JQfSw=",
+   "pom": "sha256-vrdMiLDIZbMbzxz64593Hot+OfqD8oHvb94W+yfWAuw="
   },
-  "org/graalvm/sdk#word/25.0.0": {
-   "jar": "sha256-RZkMbe3+Sg8JD/pbNJf8TYUALtiSRuVQP32/svSIYQw=",
-   "pom": "sha256-CwePLRyFPje+teV5e43Q/mDdEim8P9xhRGRn/nquscI="
+  "org/graalvm/truffle#truffle-dsl-processor/25.0.1": {
+   "jar": "sha256-CY2huRGYW0YA9g1ham4FEuodR3gK+PCL3KVQfcdfUv0=",
+   "pom": "sha256-Dklx42Bcz52b5vk+OEi6Bh0pJKYk8XsTXYKAmof/dSk="
   },
-  "org/graalvm/shadowed#icu4j/25.0.0": {
-   "jar": "sha256-GcAMJPh1xrgVRDfZbiuTLdzp9XPMutTGgT+8umr8bwo=",
-   "pom": "sha256-qRDtR/JOsNdL/gg7AqJn6vBaJ5e9fccz6JdbJpFFBSY="
-  },
-  "org/graalvm/shadowed#xz/25.0.0": {
-   "jar": "sha256-TmKdbOTTWyX7QqCd6ObVaa+5AYkXpTJfq00QQFGn87g=",
-   "pom": "sha256-kSEgQ9n7sAC32ZUWJNt18U8It04zD3gIWLW7CtrMHVQ="
-  },
-  "org/graalvm/truffle#truffle-api/25.0.0": {
-   "jar": "sha256-eJL9bHy/0qWx8zBjeLtw/e1On1T1MLvUL9njcSpQv2I=",
-   "pom": "sha256-mY9WO/sFTP0kFpgHSTv25klVfB7xUANlDUEhprEx2Pw="
-  },
-  "org/graalvm/truffle#truffle-compiler/25.0.0": {
-   "jar": "sha256-qy7nFaMSSCFJCBwn87Y+rygPEmb+pQAk17A4Qe9SX2Q=",
-   "pom": "sha256-/8nkEVUH6N1zF/wqPpOJzjlyP52sc9sGBeprpq30tlA="
-  },
-  "org/graalvm/truffle#truffle-dsl-processor/25.0.0": {
-   "jar": "sha256-/Qwd71s6+1vSlObyMn45krNd+Xmeojx95bGAiXUp7k8=",
-   "pom": "sha256-A8xStxoaX8xDDVk+k6QwhayMySghCIR87uNjCtEmVBM="
-  },
-  "org/graalvm/truffle#truffle-runtime/25.0.0": {
-   "jar": "sha256-my0MK716ROEWzFCRlV7K/wL7130MgqN356sUWHFcN48=",
-   "pom": "sha256-QFSCrx1hYaphxUttZcb2jVc75HVdfWVETPg21z+DqZ8="
+  "org/graalvm/truffle#truffle-runtime/25.0.1": {
+   "jar": "sha256-D+pzPsusehCW9wFjaY+v1mMiQgOk83tOpHn+x7auByE=",
+   "pom": "sha256-0vYeobR6zREr60UZsmj2043Lh6xjuLPAwFc2fNyDe78="
   },
   "org/hamcrest#hamcrest-core/2.2": {
    "jar": "sha256-CU9dkrS32ciiv1PMadNWJDronDSZRXvLS5L37Tv5WHk=",
@@ -1406,70 +1111,28 @@
    "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=",
    "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0="
   },
+  "org/hibernate/search#hibernate-search-bom/7.2.6.Final": {
+   "pom": "sha256-GLDDkLZrC4yTK+KWFRO6GDOZYr5MlnJo5ZyDYUTc35s="
+  },
+  "org/htmlunit#htmlunit-csp/4.22.0": {
+   "jar": "sha256-bQmE+bseHwh6deJq0AmxQNqc8sf/uC6zphFw5nGMYs4=",
+   "pom": "sha256-2O/V4ndt2OYxX/tJoSS56EW8pdNNH8CsxTbyojlUIMw="
+  },
   "org/infinispan#infinispan-bom/11.0.19.Final": {
    "pom": "sha256-OmBv0rX3f991rPM15brdRnxCQFsR8mjnPBfrkkM+WhE="
   },
+  "org/infinispan#infinispan-bom/15.2.6.Final": {
+   "pom": "sha256-u5OCufYvaxwsp5SsAO/N9r9Jgimo1jJg/li5dezIuG4="
+  },
   "org/infinispan#infinispan-build-configuration-parent/11.0.19.Final": {
    "pom": "sha256-EghgxWpNd7zBIjy650Dusm8vk1XUmhfV8WWADuCvqno="
   },
-  "org/jboss#jboss-parent/23": {
-   "pom": "sha256-bPr6FVv0aJ5KySbQDxDwWBbpqyVXOUNt/kLZk1KpVhM="
-  },
-  "org/jboss#jboss-parent/34": {
-   "pom": "sha256-SnwiYk4BxsRbAh/EYJ6INagHxaai2WFeiq5j6iCtSFk="
+  "org/infinispan#infinispan-build-configuration-parent/15.2.6.Final": {
+   "pom": "sha256-Om9mkHTwu24ztx17FOLxh3jFB0X2QNcCfQOA1smMSQs="
   },
   "org/jboss#jboss-parent/36": {
    "pom": "sha256-AA3WFimK69IanVcxh03wg9cphCS5HgN7c8vdB+vIPg4="
   },
-  "org/jboss#jboss-parent/39": {
-   "pom": "sha256-BN/wdaAAlLYwYa9AfSgW2c3mZ5WsrjdqBUvf6Lox5mQ="
-  },
-  "org/jboss#jboss-parent/42": {
-   "pom": "sha256-5BJ27+NQkFTLpBl7PWNgxR3Ve8ZA3eSM832vqkWgnDs="
-  },
-  "org/jboss#jboss-parent/43": {
-   "pom": "sha256-PDredvuIOs25qKAzVdHfQGb/ucjHjwmyGenA/Co/Qxc="
-  },
-  "org/jboss#jboss-parent/44": {
-   "pom": "sha256-zsr9kUYWSkIoy76TFkCzmGAmwC2D+U7fFrZJNPe2rcc="
-  },
-  "org/jboss#jboss-parent/46": {
-   "pom": "sha256-FdG5Ln/V3GF2d8ikajgsA7cNX3qvMFCToGKqZVpPk3s="
-  },
-  "org/jboss#jboss-parent/50": {
-   "pom": "sha256-T8NBJJkZz8/LIY64Zw+uXV/rqa+dyXLaoXo7qvSJFAU="
-  },
-  "org/jboss/logging#jboss-logging/3.4.3.Final": {
-   "pom": "sha256-92OUM0Iui/Hzl9t1dfKrlUzCD30VgbM/bZeNswlDr+w="
-  },
-  "org/jboss/logging#jboss-logging/3.6.0.Final": {
-   "pom": "sha256-hGm6DfdDEj4s9rYLeW6uEt8F+q1kHYe7QkG5H8nQFhI="
-  },
-  "org/jboss/logging#jboss-logging/3.6.1.Final": {
-   "jar": "sha256-XgiksJLchbM38JEKdAVx2HIM+lZfq9iAqMr5SmV8pBY=",
-   "pom": "sha256-J82Iq45ZRrinqpJkTrNzLjW+KBQ5qwevcfiYRT7nVA0="
-  },
-  "org/jboss/logging#logging-parent/1.0.3.Final": {
-   "pom": "sha256-mXLIlHSc2jVXZiF9Q97XAJse6ybgMBwwkUotslPdaFs="
-  },
-  "org/jboss/shrinkwrap#shrinkwrap-bom/1.2.6": {
-   "pom": "sha256-HArIAaoxJb3l6IFrqHijJDJZw5bS845nbihSqcxVADY="
-  },
-  "org/jboss/threads#jboss-threads/3.7.0.Final": {
-   "jar": "sha256-QtzTmijMQqoY/xU5ldJNdWvcojpsKYZURh5Zz+XhXDM=",
-   "pom": "sha256-Ts9o9/4Bv+ViUAenonKKr/t9NNJHXCNl9V2/F2Qq1sA="
-  },
-  "org/jboss/xnio#xnio-all/3.8.16.Final": {
-   "pom": "sha256-N4WVxwPU7C3gsx6r8srQhxSfNHK8RsqDpvAnmxd3RRw="
-  },
-  "org/jboss/xnio#xnio-api/3.8.16.Final": {
-   "jar": "sha256-NXIJj+FofavZDwIiCA+xWPY8p3HELvHTmXRDSEn3i8Q=",
-   "pom": "sha256-rTWKhTspPiUCRfkr2qnn9Rokv20VjR0SuYybQWr1J60="
-  },
-  "org/jboss/xnio#xnio-nio/3.8.16.Final": {
-   "jar": "sha256-zuGtlnT/RhX0kqMUqYbHe3wiOuAyVcd6rMYMbOpi1Zw=",
-   "pom": "sha256-k+JZm2FdarytEYxCDdUj2nFPCq9whZLwMI0NQ/e38i0="
-  },
   "org/jdom#jdom2/2.0.6.1": {
    "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=",
    "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M="
@@ -1482,81 +1145,29 @@
    "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=",
    "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw="
   },
-  "org/jetbrains#annotations/26.0.2": {
-   "jar": "sha256-IDe+N4mA07qTM+l5VfOyzeOSqhJNBMpzzi7uZlcZkpc=",
-   "module": "sha256-vvC4NSst/Uy3FV7MKjkie/FqPghme6vsZQx2sau/zss=",
-   "pom": "sha256-fr7Oreja2nyxfv8+AUkiw5Ai0qN44+LSRh8o8Bb/x/c="
-  },
   "org/jetbrains#markdown-jvm/0.7.3": {
    "jar": "sha256-iTq7MfFbYhb3TccEwMa/HlZ9zytizKKc9C5PUxU2N6w=",
    "module": "sha256-cCm2PHSWTltDNDCO5ynpW1ONpe1qwSsuR31HhXLQIlI=",
    "pom": "sha256-rLnRV//Hpk7mK+jt2WANJrXbAycKdOi+U815/gsm880="
   },
   "org/jetbrains#markdown/0.7.3": {
-   "jar": "sha256-+Hp+5ADarnOaX9bzGdMb+6MG8E1qV1dAawGd8b8r9qk=",
    "module": "sha256-2/rnqoU+teoe66MYllOKhANkb1XFmpkZHWh/wDe9rDk=",
    "pom": "sha256-EeUuCmQOVKSzsjDRSFyVukuneyx7H8KENzkPngEicUc="
   },
-  "org/jetbrains#marketplace-zip-signer/0.1.43": {
-   "module": "sha256-jHoPkyhAhqEC5RMARx2pbuMcnzMpplX+hRmq71K/2WY=",
-   "pom": "sha256-f924fRZAvxNxTvozJE7MV9gPtvTbBX83Zl9lH7n9Qj0="
+  "org/jetbrains/kotlin#abi-tools-api/2.3.21": {
+   "jar": "sha256-3HIcf6qETff11utiAh3J6t/RmY4ejfkYNB8W6zw5Guo=",
+   "pom": "sha256-c5V4i6yoKSFpTSZh9L6mc32eeFRbO1arpiQQDgUF2MI="
   },
-  "org/jetbrains#marketplace-zip-signer/0.1.43/cli": {
-   "jar": "sha256-KVig9CIh1gYrUPInVOQTrlzEL2DEQUZyAsZwDfLiL0Q="
+  "org/jetbrains/kotlin#abi-tools/2.3.21": {
+   "jar": "sha256-Z2FlYgXDUUBQ9o/efDKyvrRyRnhiR9rPsnnbQypwVis=",
+   "pom": "sha256-4sAPASdLb0ZFpyikxuSpCnydRjlAlqMDJvfDGvCVZ7M="
   },
-  "org/jetbrains/intellij#blockmap/1.0.5": {
-   "jar": "sha256-9wQbrZfd2nrormW78hjC8bx8pMpMaewx0kfQNu1c1D0=",
-   "module": "sha256-tqUFvLX7dQ8tNJancPk6Kj2l1wnCcPG2ieXOj+54Lko=",
-   "pom": "sha256-K0O76MWdWEAN4Bfhn6RikHSYWG8HYDjL3GppItCgS7s="
+  "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.3.21": {
+   "module": "sha256-jkdTFzSm1uiWG04P0a6GefvL0SRxPdLP5+mhLEe8c44=",
+   "pom": "sha256-BY3N0jaAFCxnal7LzCDFSPmuCyDwD8+UGbnLADcRc7o="
   },
-  "org/jetbrains/intellij#plugin-repository-rest-client/2.0.49": {
-   "jar": "sha256-HPDbBPUGMBDf4YTHabD78YBHfNJ5esjdYLq9T76/pj0=",
-   "module": "sha256-sqB4q3GvOpW3L99AX+xLhbXNzpvFDkDX6a4P0OZKu+U=",
-   "pom": "sha256-fVwz0aPySyLKPDN8z09vjGMWjouOaQKRzLfSFyvWJGw="
-  },
-  "org/jetbrains/intellij/plugins#structure-base/3.317": {
-   "jar": "sha256-wZcV1dydY2KThqMUvb+xXnHIup5jZYFZyRR+gpRLWKE=",
-   "module": "sha256-cD60SvUSiEtML4j5mcf1+tuLn9SNJubPwXHH8SoBkB0=",
-   "pom": "sha256-jk/IV1pkprw+XFgiA/IyhlTzUxs5O2P3aoaC3lNPueA="
-  },
-  "org/jetbrains/intellij/plugins#structure-ide/3.317": {
-   "jar": "sha256-9pRhqIPCfZu006D/KZHz0eF/j6yLjLnJRlDtHY1lezk=",
-   "module": "sha256-zuLu2Wc+wUK+1PQTnh/uQaVSZ506FBUD735+mAOoRQ4=",
-   "pom": "sha256-X9qgzPU0evRG8aHx7ZudIz9kTYY7nDbNz4HqwWLzhwE="
-  },
-  "org/jetbrains/intellij/plugins#structure-intellij/3.317": {
-   "jar": "sha256-vJ3Ds9l9acXwwJ+eUE7uhJYCs/d3PzdGhm980GKcsqY=",
-   "module": "sha256-/x91VjoeC+Dv6f7u4jMAVeRGM0jqsCZvExFWOO+jafo=",
-   "pom": "sha256-jcV+h39+P1+wNTin/0mxKX5seEA+4PdABuvKxyuCcl4="
-  },
-  "org/jetbrains/intellij/plugins#verifier-cli/1.410": {
-   "module": "sha256-V4EQj6SpzC6LnqALBQGvUJZD6xam3ydy9guiML14T2w=",
-   "pom": "sha256-v0whWXxkABnkMKpM0rx+GyZJmlkFhAOpQjmIZ/iAypA="
-  },
-  "org/jetbrains/intellij/plugins#verifier-cli/1.410/all": {
-   "jar": "sha256-WaXvBcvfBYTL/Wy2yoAsdOzzQP3q3Fpz6sJK9iLCIBA="
-  },
-  "org/jetbrains/intellij/plugins/verifier-cli/maven-metadata": {
-   "xml": {
-    "groupId": "org.jetbrains.intellij.plugins",
-    "lastUpdated": "20260826152402",
-    "release": "1.410"
-   }
-  },
-  "org/jetbrains/kotlin#abi-tools-api/2.2.20": {
-   "jar": "sha256-8chm6sXcCI8/0IEQCENAm/TxYSu7mY+6ofaFMlyuDVU=",
-   "pom": "sha256-HOL7NczYP8vJCuXFmN/bsilS0IVHgElEpbIfLEbKwL0="
-  },
-  "org/jetbrains/kotlin#abi-tools/2.2.20": {
-   "jar": "sha256-paY3q4IXBJkc9wYWtk4CuaT4IMggGfk8DSbwzfsiZjM=",
-   "pom": "sha256-ffGAKEU136pgq3jo5pNEiC5c3Np9clU1sRDgOu6MWFA="
-  },
-  "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.2.20": {
-   "module": "sha256-n+aVWzf+KQtlFiXPnGgea6IKjxLEZYzOUCblk1BaMSk=",
-   "pom": "sha256-P6gmRiy9hG0YAgLyLFGTQYy5zan2lcmUEjWpsbXBQdk="
-  },
-  "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.2.20/gradle813": {
-   "jar": "sha256-OmlZW2x1+/ktMgFodFxpj/cRS4YHhBBQ1ISYgjAG6HE="
+  "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.3.21/gradle813": {
+   "jar": "sha256-czebOE2dpmQZtfTVyD3hqZ3X8ZVmK8RcOUQ4WeY+GLI="
   },
   "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.4.10": {
    "module": "sha256-jtWvXG2kojPK2J8L7az8z9PvDhk5agILuXTi/tviPpc=",
@@ -1576,85 +1187,100 @@
   "org/jetbrains/kotlin#kotlin-assignment/2.4.10/gradle813": {
    "jar": "sha256-NQ3BJbSOYrLUWOzeEhUydMHVtkS+40qMRWV3btQ7qFE="
   },
-  "org/jetbrains/kotlin#kotlin-build-statistics/2.2.20": {
-   "jar": "sha256-+2VKT1vFY2h1kXMSnfSRB60J3FtBcrAXda+z+nJXndU=",
-   "pom": "sha256-tdU2T1fSH/FBgiBei2lf1oZNnYqleApu3EIJWEBHwRU="
+  "org/jetbrains/kotlin#kotlin-build-statistics/2.3.21": {
+   "jar": "sha256-Ey1sgC5F3rpMXtoa+WAcZpXa8TR9Xcs4hH8YfhesM3g=",
+   "pom": "sha256-djN952QHddu7bAhmK+vhB1UeC7Us2nG1xYk8MVuzpVo="
   },
   "org/jetbrains/kotlin#kotlin-build-statistics/2.4.10": {
    "jar": "sha256-uidItn+3sk7hQB7s/uMutn3QVchaWaV0IYj3lUd6Ecw=",
    "pom": "sha256-AcwyrTsRJ0REk50GQky/Q6PiB+h3aD0chRGWyhkIisE="
   },
-  "org/jetbrains/kotlin#kotlin-build-tools-api/2.2.20": {
-   "jar": "sha256-/ZlHs6F2Iahvq9lTr4fzS9K7f4sm2uksHte+dHL0TDs=",
-   "pom": "sha256-AtR9SHfsMktJbZMTMkXNTTSLZSMDzyfvpj44ry+zzyo="
+  "org/jetbrains/kotlin#kotlin-build-tools-api/2.3.21": {
+   "jar": "sha256-suXMJmbBAAee00NhhSjrgg3PpQlQleMPLdGcYN/35GI=",
+   "pom": "sha256-cfil/z5A5xkQT1Mw4oMyDhnYWINO+S0Sv6DQZtvDcdc="
   },
   "org/jetbrains/kotlin#kotlin-build-tools-api/2.4.10": {
    "jar": "sha256-OVPSg+dxDJkGcuQDqH3zk9lyapvz4XIZTrtcM+Bi/LA=",
    "pom": "sha256-eCQqlED5JADq89+NIQitcG9mmlMSWEWn0x0998TeRDk="
   },
+  "org/jetbrains/kotlin#kotlin-build-tools-compat/2.3.21": {
+   "jar": "sha256-mWMrd3uKhaej+EMd70l+MfdgShR1u6PAEavjBfWF2NY=",
+   "pom": "sha256-gA3wZQgt3NhJXQvNT6EF0uXYDJ1864UaR8CiRFEEeas="
+  },
   "org/jetbrains/kotlin#kotlin-build-tools-compat/2.4.10": {
    "jar": "sha256-zcxQ2AFvQlDn3GGCLyjyJ7qam30/nrVQPDFesSGI2VI=",
    "pom": "sha256-oIGnlvgormRLWZUPByzQC9ZKx08SsS6DA5najeLk+jQ="
   },
+  "org/jetbrains/kotlin#kotlin-build-tools-cri-impl/2.3.21": {
+   "jar": "sha256-z/CptmWFGjJcIZWFfi4aWnR5VMlDfQDeC6FVGaQpTEY=",
+   "pom": "sha256-Z1U7yyHpwRZ3AOwyd6x/q5cuays2j5W/bUZ+BGTb2jM="
+  },
   "org/jetbrains/kotlin#kotlin-build-tools-cri-impl/2.4.10": {
    "jar": "sha256-eByVoo8FPe0tGDuBi9rpjbPW0V68BVXOz2SAD+oAOzs=",
    "pom": "sha256-rabst8tUTvL87nPiUsMfgMjjQsO9tRu5mZ/lf+wEH9I="
   },
-  "org/jetbrains/kotlin#kotlin-build-tools-impl/2.2.20": {
-   "jar": "sha256-ZHiafwBWWSfy8/LRCfIwV009kwjtXW6Gv8qEPaZIfPc=",
-   "pom": "sha256-4vQ157rwHeL/kNCoc3r4+b+X/BUuWVuGp2C6ZOjmnfY="
+  "org/jetbrains/kotlin#kotlin-build-tools-impl/2.3.21": {
+   "jar": "sha256-LNcDlkBKDkPAWq95qLNf86j/Lilq7fdw9uWSP7+srjs=",
+   "pom": "sha256-0F9jI8F/lhholWgx+dWvrTEQNbGMP1Q//S88hGaT2VI="
   },
   "org/jetbrains/kotlin#kotlin-build-tools-impl/2.4.10": {
    "jar": "sha256-SjL2NSLvRyavve4Xg/BWmEmavHpeyt46bK+j5AdFYu4=",
    "pom": "sha256-8bQxw3cX8NRyzQU9yB2JMgTLWSgPgDXWNvU0vHxdjbQ="
   },
-  "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.2.20": {
-   "jar": "sha256-HGw/gQv+akGry8NLOi72OfHj9K7tOpU6Swl07qT0GIk=",
-   "pom": "sha256-Bf8CX3+wky+xH6HhzK71KPdgJ9lWaA+INdQ4VCdi4go="
+  "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.2.21": {
+   "jar": "sha256-lYj6aWrFUHr3ZP1WYN9olBheEnBOwbw/XLdyr0mH8pU=",
+   "pom": "sha256-CzPGTyYiujvIKDN4vbdQXyvjMKInWAcDitVDWbM935s="
+  },
+  "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.3.21": {
+   "jar": "sha256-0+cPsBFnXnfvAPGmiRjTzZHu0mBYl30ePqKjeikyM68=",
+   "pom": "sha256-lSPI/q3LF/QtBP+pf+KpwI5dsY8JD225A9ylw2x65cQ="
   },
   "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.4.10": {
    "jar": "sha256-kwljii7gPmvenvS3REBVqUuEq5BlY2ddcf+a7LZNqRM=",
    "pom": "sha256-w6209m+/qoQ8AZtALSx+XwiA0ylWvY3YQCKUYXclEQI="
   },
-  "org/jetbrains/kotlin#kotlin-compiler-runner/2.2.20": {
-   "jar": "sha256-+vloNPogBNeL2ORCD1go3j1CckJ9ZHR5gCTqbpz4XN0=",
-   "pom": "sha256-kbsVJI9OqUS2Mw8xA/HrVF0TvditSuxDe3R6WG57F6k="
+  "org/jetbrains/kotlin#kotlin-compiler-runner/2.3.21": {
+   "jar": "sha256-bbcIYinbidBxg6m0duCZL4YSDbwh9mCSzRJMftbXRDQ=",
+   "pom": "sha256-H6VIXunMzI6TOZU0scUqB1/NRj1poinJyqYBzAkdwog="
   },
   "org/jetbrains/kotlin#kotlin-compiler-runner/2.4.10": {
    "jar": "sha256-noadZlBFcoUvQhvLFiXA1WTCs8jOy/bNX+9+fzPgAT4=",
    "pom": "sha256-GAc4diyJQcTjDXF0qSBxlVvYaVhzMteF5hORFnyCvFo="
   },
-  "org/jetbrains/kotlin#kotlin-daemon-client/2.2.20": {
-   "jar": "sha256-cO983NwwEHe5s7ohqp6cVadq+z/73+9KtWKmd9GN+kw=",
-   "pom": "sha256-ihNtDxPrmDpr40/x4WPJznmFXkuiF09Fy0KqpnVT91Q="
+  "org/jetbrains/kotlin#kotlin-daemon-client/2.3.21": {
+   "jar": "sha256-+nZ8m0DQafFkxhem5r0wJkPHuowHkujtnkEsGPhLUL4=",
+   "pom": "sha256-1wqhMeENnEDUT/s9iMhcrFSmSjBUIXn4R/gD7HGuG60="
   },
   "org/jetbrains/kotlin#kotlin-daemon-client/2.4.10": {
    "jar": "sha256-o9GlhU/ZJ2beHKN/8AOoItPaIDmQIAg4TdH3N189XPk=",
    "pom": "sha256-9t6eOg6JrdjgQ/p2hm2aL/EPuHljsTljd7uwDCKf3m4="
   },
-  "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.2.20": {
-   "jar": "sha256-fFyM0vi+rdMoMjm7nKIZoMr6GvAmgrQHsYHhF5cY8vc=",
-   "pom": "sha256-9Yhmv7yYZ8bWR1ec/3DUKHeZctvd2N5MJXh5y0N0FIk="
+  "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.2.21": {
+   "jar": "sha256-kcBnPCLkSwVK4DFNMjhg6+Hzr/Pw68dP/4LEcz3eCb4=",
+   "pom": "sha256-Fwvb7LpX/wCiuNF+8seeCLhfZ99p2FO6CiWaQYO/uSM="
+  },
+  "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.3.21": {
+   "jar": "sha256-Ii/BCjwi500wNpv4oMpsT5Ny6sfUoAgeKQwlb6TTD7I=",
+   "pom": "sha256-9cV3dsXsNQSkFjZBZGALDL6F6+qPFuvvYH6trw/Wv0M="
   },
   "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.4.10": {
    "jar": "sha256-VH2Wmi6rYC/gvf2fyxtWOlxtMAmdM1E5TWQn66gohGc=",
    "pom": "sha256-RO0aSQpLZGMT/AvCaDiXoerE2Ma1fAgl0+gfp8o3bTU="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.2.20": {
-   "jar": "sha256-T8MqG+ZFynQE4hskRSCI+T6OmT6v/Sbza9Ndv3XGB1I=",
-   "pom": "sha256-sbbgEXktfKkv7K+/+sSlCPdvA5yfeuijI9GJKIgl9P4="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.3.21": {
+   "jar": "sha256-4k36gQu102+DvzIPJcIwNLLSgMx5A+KQFMS3vRJIUGI=",
+   "pom": "sha256-Cm4AthBXLfGe60hgsjzhyUOJfShqfe9LPg3nqgi+KAw="
   },
   "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.4.10": {
    "jar": "sha256-FcO5jxjIdLmsW+JWXzcks+r2xs9X3HhNc1FqIqnkcM8=",
    "pom": "sha256-RPxaCnEckt8W8A01ddDyxKJk9Dqy9YjkVbPGBDEk/VM="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.2.20": {
-   "jar": "sha256-dgfuXHoMpT+lku58VA7oCJYqe62P7p7Xj+Z0hBRj2V0=",
-   "module": "sha256-T8vx/H5Uzr/pC5peD7RpYv7Vwi03I52iNfXi37xtUog=",
-   "pom": "sha256-C5E9oNIYhCAmOpBLtApkD9s1pTWnLwWC/llkHjoMSi4="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.3.21": {
+   "module": "sha256-TIDhxRjiLuhPQYns4T12swL70HhraSZGnNGdLg97x+U=",
+   "pom": "sha256-U8Zbb7K4HfO712wWlK/3ISURMaRbWPEJJLpLbBriVDc="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.2.20/gradle813": {
-   "jar": "sha256-dgfuXHoMpT+lku58VA7oCJYqe62P7p7Xj+Z0hBRj2V0="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.3.21/gradle813": {
+   "jar": "sha256-rVjSY47gQfbOTnPpeC6/Uo4Yz5ADsQmapwReyVjjwZU="
   },
   "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.4.10": {
    "module": "sha256-reKOGDGyIuFh4AwSDVydVvnU/jsKq+2eVJEtcatu6Ms=",
@@ -1663,35 +1289,30 @@
   "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.4.10/gradle813": {
    "jar": "sha256-dMTk99A36FC6tmbbEskKSeBl2Ulf0t/ap7w53ZYwg9Y="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.2.20": {
-   "jar": "sha256-dtFu5ZzeHmpwVWtdQEhu+fEcFkOodJPBnE3zMWU4N9k=",
-   "pom": "sha256-xRuhScfyk1nSWk7RIS4otpNOGkdW9VLAAHvxFE0onB0="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.3.21": {
+   "jar": "sha256-ASEJ0X4MrSA7Y2OFDUZ7hqA0n6f0BPwRMGqrbGOjIjI=",
+   "pom": "sha256-dMlhFwLfjLOgpRGBfBWQ/u5z0tIIQTHueLYghLTYgpE="
   },
   "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.4.10": {
    "jar": "sha256-NVrFZv90100jD3y21V4u1QFYtMKPwYb8jYJo6P6YaPQ=",
    "pom": "sha256-B07g3UCN5UKo5Lcm2q2CncM6nlbdtPQ6AOubn2ev8X8="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.2.20": {
-   "jar": "sha256-7JacXwsJn4I4RiMiOPm9ZPPTdB5i6pBQrS5DL6150KA=",
-   "module": "sha256-/IW7KUlsw/X5DHjHonejkw7xFg8IQ/iu1ke3TGejtJQ=",
-   "pom": "sha256-NkQjJURfF7rCH1OGu0k4+D53K4NOWGBT1BRbGnXZ4oU="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.3.21": {
+   "jar": "sha256-lS5zlI4qINOYwmuHprtwzPZkGPuvFSfDUVsYjqnUvWA=",
+   "module": "sha256-AchKGocd5pwHAiKZIL09Dfy0YEXg3YMOUc82GffzdiY=",
+   "pom": "sha256-SepLd1fok3YudcKXj73A8kujUhqU7nETc49ihUoDC5E="
   },
   "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.4.10": {
    "jar": "sha256-CGc0SEx+3xmmIKsaYX0JfEDgO8UmAud4QOpevWOA5RQ=",
    "module": "sha256-fog/v+nSyc7UqPqZIXqN1BO7FKfqky7bvaNdXpGlEZo=",
    "pom": "sha256-lg7wg2JqdGbqFgeWuUAEeqO9tr2598vQ1bi3TqNw5mE="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.2.20": {
-   "jar": "sha256-U6MhUoJjIGAYUgSaC291OMqLtX/QnYeszRGLxo1D+OQ=",
-   "module": "sha256-EZdKVPSOCCXpdxML9u9qyZp/216yr53iZa9iTHY2g+U=",
-   "pom": "sha256-3uDjB7pub1GQPH5DPehSZ10eMOfyLPJGWxglVSZR7fs="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.3.21": {
+   "module": "sha256-4E06ViPPjdAf6cdLkYPuJBhQKYuoodz9J0b5SS3zprg=",
+   "pom": "sha256-am4v5xyYMtD2a+do4gIozgJSUUnqkvJ0K2YSXjl6WMk="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.2.20": {
-   "module": "sha256-3CS/pH4EQigykOIfBpoFYUHR8IjWy57Kouqs4bR7a4w=",
-   "pom": "sha256-ucP9Lr1UhNYMX+DbeqEIeDA+7d/JP5Qvc1wHupmBh8w="
-  },
-  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.2.20/gradle813": {
-   "jar": "sha256-XTJbXCxdS8i/RBRdJOtNS+sGDRPRHr5IiYk27VzRVk4="
+  "org/jetbrains/kotlin#kotlin-gradle-plugin/2.3.21/gradle813": {
+   "jar": "sha256-tX+s5dvRXJ0G7RfNccMSqCQcl1lVB4KsYo6FebztU/4="
   },
   "org/jetbrains/kotlin#kotlin-gradle-plugin/2.4.10": {
    "module": "sha256-DncT2EYF2gvuA4tXjzF5WILM1yEiCnnMNnNqya+ctBI=",
@@ -1700,37 +1321,41 @@
   "org/jetbrains/kotlin#kotlin-gradle-plugin/2.4.10/gradle813": {
    "jar": "sha256-E+Ishp3zly25SWtHvygV+8+2HgQ5+Wy9jWrrkStIE3U="
   },
-  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.2.20": {
-   "module": "sha256-P7tFda43xKd2rrhtj/k8aqEbDPLadXScUyDiWFCwIp4=",
-   "pom": "sha256-PG1GnpFfuzCWrEy4wvRsedAnw8WQ5lihBoihVx61eNg="
+  "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.3.21": {
+   "module": "sha256-XyDoze3JaVuIQAsDCwVkGWDhASORd2974f4k6gRNEtI=",
+   "pom": "sha256-et8h026Tdq1EUInhkadxXJqx+VA6IxJAlGQdhO5fy30="
   },
   "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.4.10": {
    "module": "sha256-SOtHVihNHX6iRjnSKGHxX/DLaFoVMxpsajZ0/0S68Ck=",
    "pom": "sha256-cz/M2gOuNHc+e1yF0OJ4yJffKDNwBZyzmCX3wDgeSbY="
   },
-  "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.2.20": {
-   "jar": "sha256-OYK+RbEpMOIYGbWJ2zcHyOhM4le/Ks5/xi/I3zaPWz4=",
-   "pom": "sha256-CzAJtJQmv6F3qtlLSBCbjKVMck6i5sUGgmo6lc9ZEOE="
+  "org/jetbrains/kotlin#kotlin-klib-abi-reader/2.3.21": {
+   "jar": "sha256-xFQbDaJUUqjqZFWv8N1ZC51WfR2mj2WyutsoH/0UzrY=",
+   "pom": "sha256-bDTzpbw28/2ZIG0q4au3NP4iVIga6s8pFUHmq8qIlLc="
+  },
+  "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.3.21": {
+   "jar": "sha256-fBGSL3xsinXyF0bvj8oAKu5Zdl92713/8bvYRtdaOOA=",
+   "pom": "sha256-dNC5uiuwtCpMjWTGoqJzBRHsYutpA2rkqxnX2rVLC68="
   },
   "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.4.10": {
    "jar": "sha256-lxu5aLSvEJMrzBjzOVch7kjMFmWXtQkmcxru/zNAhto=",
    "pom": "sha256-E5s86NZVgH62ikV5jwQyl2CyEGZpqzMtKsEIhD11iyk="
   },
-  "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.2.20": {
-   "jar": "sha256-XeE7Sb8dRBCZFep1tjiWZpNpXfQM1bIebhKu62fcKSQ=",
-   "pom": "sha256-ZPn6nRljGcOOL66C6dzpm5q3nxo6SSv9BOoc0GxKhWY="
+  "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.3.21": {
+   "jar": "sha256-VBJEACe/WlffQbEgitWexffHthJHOjDiiZiCyY/gcd0=",
+   "pom": "sha256-75BsX4qPlQB8qhUQpGBDQkzHOrf1+CJDwu+FtuiN3zA="
   },
-  "org/jetbrains/kotlin#kotlin-metadata-jvm/2.2.20": {
-   "jar": "sha256-hSTqyQ9+jg8TZog/LGyCDJO/ph3z12hXyNPoA89nMV0=",
-   "pom": "sha256-e2qAtqLSZ2oEIvaWg4EyMVQlUfYbMgxochz7nh9ZCdA="
+  "org/jetbrains/kotlin#kotlin-metadata-jvm/2.3.20": {
+   "jar": "sha256-FyZLlpD+7TSqi459VW+y55UfaABGLxFyQ/upYgEBT30=",
+   "pom": "sha256-DF/7/5dG1Ca56GasBWviiSizGKJc3FaDkIHsRJspzZc="
   },
-  "org/jetbrains/kotlin#kotlin-metadata-jvm/2.4.10": {
-   "jar": "sha256-IzqqhMomjibW06mc4wQB5twRGnrhDgoLR5TOY1HXrcQ=",
-   "pom": "sha256-aUkVuGhi29YGDGkjlpBZTx9S3yVDuxEKARZmJCpBBgs="
+  "org/jetbrains/kotlin#kotlin-metadata-jvm/2.3.21": {
+   "jar": "sha256-AFkPJqWnaHd/BCUsbPk8AWozYaa8k2Nt9nN1rU0ZVX0=",
+   "pom": "sha256-g7erCwEj57FCij1fdNwVHpBKEMjNMgY5kaYGUIvCHoA="
   },
-  "org/jetbrains/kotlin#kotlin-native-utils/2.2.20": {
-   "jar": "sha256-UBd3SirqQf+HEhNxFs1NgAP+mroSAMEG5lcw/rW7dEI=",
-   "pom": "sha256-U+++4FpxIhiQYPXuXspodjnOr+KfXlmW3phiopxnJyU="
+  "org/jetbrains/kotlin#kotlin-native-utils/2.3.21": {
+   "jar": "sha256-CA6LPO7rLvzlHQI4T14i/w2N8am7qUrpAV4wrCGhdJA=",
+   "pom": "sha256-uRJdcl70/Xj8L0pLc1G/apS8G7OeZT9p+u4o2FgH8n0="
   },
   "org/jetbrains/kotlin#kotlin-native-utils/2.4.10": {
    "jar": "sha256-duxV+Wfcj1dIGiez54aMyXyzKWTW0oVReu8xDD11SkQ=",
@@ -1740,9 +1365,9 @@
    "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=",
    "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak="
   },
-  "org/jetbrains/kotlin#kotlin-reflect/2.2.20": {
-   "jar": "sha256-ggkIOkp8TkdtmEKweDCPqWqW8Hpr2Z8F81hu4TKJqyY=",
-   "pom": "sha256-TidHQGbbg/uixZB0KJunEr6MhRV83guQUCmkRcJ19bo="
+  "org/jetbrains/kotlin#kotlin-reflect/2.2.21": {
+   "jar": "sha256-RDgKvzfSRc5cDylPQ1EtHDmllkK/pGOSLHTpaHfPSfg=",
+   "pom": "sha256-5atrEFYKWlJWLDXNvnHdvkJ9Uetb/HAdzU9rlJvZ4D8="
   },
   "org/jetbrains/kotlin#kotlin-reflect/2.4.10": {
    "jar": "sha256-JaGu90VNRlSOyq9RAhsOUuOBQaYu11rxJNoQm3MkxOU=",
@@ -1759,68 +1384,84 @@
   "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.4.10/gradle813": {
    "jar": "sha256-qEQhdVttiJlOpUeSGgpUj2Kl+jUGLhpMjnFkTKCPNrg="
   },
-  "org/jetbrains/kotlin#kotlin-script-runtime/2.2.20": {
-   "jar": "sha256-XIvV3Xrh6i7rJ3j9vqoZpWIYSXX2yrigu2d55BkHMa4=",
-   "pom": "sha256-IpOhQenagKfpjYXtKkkuldsMAWW86rC3Klzp4tkrCAc="
+  "org/jetbrains/kotlin#kotlin-script-runtime/2.2.21": {
+   "jar": "sha256-KxUZtCe1FNFTbBtCVnSwP+kUr2N5JAKOmVnGYlRC31E=",
+   "pom": "sha256-h2elQPxdviC34Sg6lfUQKX5sDJiy6sLtxNBhKi0PLq8="
+  },
+  "org/jetbrains/kotlin#kotlin-script-runtime/2.3.21": {
+   "jar": "sha256-7GG/EinIN/qfQlXzTKaYFhOLcxWOeum42WTPkspt/S4=",
+   "pom": "sha256-LPXREj2KYovMXudPWwewjFWoetTpyR4T24O7Wi/2qi0="
   },
   "org/jetbrains/kotlin#kotlin-script-runtime/2.4.10": {
    "jar": "sha256-9KWzDC/fvjhrCXEBt5idvuo3Q8BjlhNmZHhOCOFcaJk=",
    "pom": "sha256-7c8OLNcJZGxOWUW+DwpJIKDz9BfzKHVnRqKdkrI7FZM="
   },
-  "org/jetbrains/kotlin#kotlin-scripting-common/2.2.20": {
-   "jar": "sha256-+5n/fwzZUtpo1UjT89ZErlB4sLlvybrwZewUZqKTuAU=",
-   "pom": "sha256-iTjGIFKXW7uW3OotqaeNS2sk2vLwnTWMGnqEHxaMtzo="
+  "org/jetbrains/kotlin#kotlin-scripting-common/2.2.21": {
+   "jar": "sha256-QU7ZHD9eRJKyPLlTeEK0ZRA44l2thBB5OfQ0wiA/KpI=",
+   "pom": "sha256-7CWpeZRRdbrSFlRqSEsLj0SoZwVZGV4kCzR/H9oXcN8="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-common/2.3.21": {
+   "jar": "sha256-aYhXUb3OfU4dG5dYuvS8D+A7JIJ6vXt2h+WnwLTQKe0=",
+   "pom": "sha256-vs1qSEFg/hN/BtdtNflbZ3b6Ca5vdR5TlOaTWa7i9fY="
   },
   "org/jetbrains/kotlin#kotlin-scripting-common/2.4.10": {
    "jar": "sha256-1TmZgs2/WZT386cxr6z7xcIbeX2X/9cyi2LOpnAQMHY=",
    "pom": "sha256-GFY2qRwY8J+K+H+H6heIwtVfcqaIAhCgNlpaakTWGDM="
   },
-  "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.2.20": {
-   "jar": "sha256-2GJhDAAzQuUIjKIcRAQix9ijcA4ZnWA/ehAnjESIR2E=",
-   "pom": "sha256-PW9vFZH6P3r14jFlxowu4BclFYZFQ09eMBdF5kfHVhE="
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.2.21": {
+   "jar": "sha256-2TS50MJGvAliS3Bor1itV87xHb4q3bx7GdJQzOQt4ck=",
+   "pom": "sha256-EUhmLJXzbgCYEXj7LYldBrLs59BX7YRTLdNTu9bDVlA="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.3.21": {
+   "jar": "sha256-oE/wbvtKWuB6ko2pT5tdBhIwyW1/69rri8dDjhqjGBE=",
+   "pom": "sha256-8aTyFh2fPULJrE7Lm5zuKhmQNoE1CdW1pP85oRy7n+M="
   },
   "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.4.10": {
    "jar": "sha256-FWxo/4FiUcnSl8kNd+fo5RPqrVlCd87lCjb67dvoiTU=",
    "pom": "sha256-B9mROoMxfCjKdwS+DBCaFCmidiNuQ76LmPh9vU0Cr60="
   },
-  "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.2.20": {
-   "jar": "sha256-e3kSNZL//r81xhag/xBDMscc3mN6ZX4JrbXfbD+cA84=",
-   "pom": "sha256-+l+wJ+4qSbPb/zh3VBtC+3CuzMN7oC4dOthipcZyVLc="
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.2.21": {
+   "jar": "sha256-eIowYMjnmX+K4WulwCgNBQBa8KQgKfGMsQxWJbl5+sM=",
+   "pom": "sha256-DKT5XDLUrpVOF06kHlutYseNvJOmTEUHb96czISrNgk="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.3.21": {
+   "jar": "sha256-ieeKMybhIFqUIKGUQaTzgvenIkHVLJZCXonlsTA4coY=",
+   "pom": "sha256-L3wkrV6C4ttdtdqNwHDub8D1bCDpkGOaVMppB2vOPm0="
   },
   "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.4.10": {
    "jar": "sha256-Hc/FSV2MdJZvy705JAqcD4qza7T6rS6l/8AAxdd4UXE=",
    "pom": "sha256-qAtGPcTj3ldVXE4bbnNljUCsIVsniPTBk/VskbNJTKk="
   },
-  "org/jetbrains/kotlin#kotlin-scripting-jsr223/2.2.20": {
-   "jar": "sha256-vu1gZeZxK5p/JM72Xyd0TcopoTUmgzYN1xoPTwQZhNk=",
-   "pom": "sha256-zq1zu96gIxtz8bHGKf3JihoTsKeAi4DblRKOLElwXpQ="
+  "org/jetbrains/kotlin#kotlin-scripting-jsr223/2.2.21": {
+   "jar": "sha256-vkLurzUeOYJd+/kHIOIgVS+rpLrHFgxHCzN0iGZKwU4=",
+   "pom": "sha256-Cm2xLXjZJLTYiSi4vuj1hZ0OaY+LoavVxBs4XzQyzHA="
   },
-  "org/jetbrains/kotlin#kotlin-scripting-jvm-host/2.2.20": {
-   "jar": "sha256-pEZB37WsO8RRlfK5u5iMs8hHHl4qTr3A7A8ZItc3IQU=",
-   "pom": "sha256-/MWO7zqJfudX1inQpBvfEL5Bd5iXjay8e6VKrPkGsrU="
+  "org/jetbrains/kotlin#kotlin-scripting-jvm-host/2.2.21": {
+   "jar": "sha256-73L3PXUhV8mlfipuFzqAvlMEAjslyvhr1rWxfMXjeto=",
+   "pom": "sha256-HK2XLrk/pRORoLAao0LA2A5/NiEfnlTpdVZ3iyFU0sQ="
   },
-  "org/jetbrains/kotlin#kotlin-scripting-jvm/2.2.20": {
-   "jar": "sha256-qR+5BJY0oyum09LpGgy5mD4KpOccDC4bKDg4qOBhYx8=",
-   "pom": "sha256-0df8RWSBne6v6OvdcfbyGBf/xVjr0U9HpW6NyTaW3Rk="
+  "org/jetbrains/kotlin#kotlin-scripting-jvm/2.2.21": {
+   "jar": "sha256-g4IMX8xdKPBF+RTs1ZALu8+BFbDXAHM03gaf5scGaeY=",
+   "pom": "sha256-nR1Dsi27irmp3yJ6bVRYNB2v/sFQ73WV12XMXsvxeQg="
+  },
+  "org/jetbrains/kotlin#kotlin-scripting-jvm/2.3.21": {
+   "jar": "sha256-jLY3Ey/H+lEccA7n8rY7KCYwFn9evWmaJjoLZ7XUhqs=",
+   "pom": "sha256-WAssmFfzpmLFOj3rSFHXoa+jvV9Ku+mQX1tV+1Ih+BY="
   },
   "org/jetbrains/kotlin#kotlin-scripting-jvm/2.4.10": {
    "jar": "sha256-C3UYIZ2mm0J+Cz+EDxPigNueYag5x9P/CU3kYw3byfU=",
    "pom": "sha256-QDoSkR3HG0+kwuPcMFzZjg7z/qH6vOctCmVtz4kLN3U="
   },
-  "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.2.20": {
-   "jar": "sha256-jY+TYgGErIdsuo09/aF8JdQD+Q0kacqHrNfvox2EeZ8=",
-   "pom": "sha256-fJa3mogscA0BKBr1iT0dkuknZX2AOHkGjYMQsNV5G8E="
+  "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.3.21": {
+   "jar": "sha256-VCo2/lrlw1t7tMwpcQDzY007X5fHtfeM5ENiGDC7vvQ=",
+   "pom": "sha256-xARZ8GJeuKt2KJcbQvqint7UvIdcJe+7owkmlLD/vpE="
   },
-  "org/jetbrains/kotlin#kotlin-serialization/2.2.20": {
-   "module": "sha256-iuU6MFsYxCBiyzt+qNRd0AvKEmDZfJZIr1SlaHnhz9g=",
-   "pom": "sha256-pP7tPG9RvldyFRaRsNKW4AyPESX3s3jg8TvQ43Te81k="
+  "org/jetbrains/kotlin#kotlin-serialization/2.3.21": {
+   "module": "sha256-Zh45Pz6mchz5ZcIDHUZgi713Y55ImdV1H1c04j83RUI=",
+   "pom": "sha256-ThKQ9JKxREoSZtO4OKCzHUo6cVOs1KfMo5BwZP4MNKc="
   },
-  "org/jetbrains/kotlin#kotlin-serialization/2.2.20/gradle813": {
-   "jar": "sha256-dBE+hnGOJqOlpa8177uXaa2lBcVarELp14xoYEC3vUY="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.22": {
-   "module": "sha256-+Tyemr+NUtjo/Y6FGqgC7OxVEyFhxK7ufTzZJL95QkY=",
-   "pom": "sha256-10k21oh1ZK63EOhCmLVCB/U+m88jpSrSv6IsIIZ3V2c="
+  "org/jetbrains/kotlin#kotlin-serialization/2.3.21/gradle813": {
+   "jar": "sha256-DhI+4919qUppjA+SqmDyRESVJKzeYu7KSjbixgcbM0U="
   },
   "org/jetbrains/kotlin#kotlin-stdlib-common/2.4.10": {
    "module": "sha256-Xa9+3NbWMF0LASG+WXqdUElrq/0pkL32sI/XACWpTdE=",
@@ -1833,14 +1474,6 @@
    "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=",
    "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.21": {
-   "jar": "sha256-v+IfQkbIvKNQsYQEBv+803awXto36ypksBHeGMLKeBg=",
-   "pom": "sha256-AVFiDhh0XvJ2ECNw/GdHBPcN821kgsxBmh5S263Cg2I="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.2.20": {
-   "jar": "sha256-O9Juy20Sl4xcTgtB92yf9VH6wqXmJoQnqdKgzfilrZE=",
-   "pom": "sha256-Cukeav/wZg79os8CjFvbnnoehn4Z3CyOuuiaglcUOOI="
-  },
   "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": {
    "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg="
   },
@@ -1848,182 +1481,120 @@
    "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=",
    "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.21": {
-   "jar": "sha256-BwLWS6qpDlxW5GdzeCTJvjreHlFWJHPBQ60DWByVUSc=",
-   "pom": "sha256-J79Q6ETwZc0emFT8m8K9pRIrh4ZOoDBL1pW7En0AMvQ="
+  "org/jetbrains/kotlin#kotlin-stdlib/2.2.21": {
+   "jar": "sha256-ZVij0jPaVqIJNLMhWfnbX4btWBbvCY94osIj3Gq7ed0=",
+   "module": "sha256-v7xlfd06jjfkyK1BeWjV6wsLFxyfzkj5YsKtMu5DTCE=",
+   "pom": "sha256-zzH5IxlsY67ezQpXwkJpvTcCpOR8C/C9ZLWtpd5SInI="
   },
-  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.2.20": {
-   "jar": "sha256-wxQXeTXY3C7ah5UHEX8l1t5W9sV+3plBaxTNYiu54J0=",
-   "pom": "sha256-NditbBnaV6t00h7YHdxYSZt8GwAlEbXoUgANuwxYq64="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib/2.2.20": {
-   "jar": "sha256-iDbM/9NYX63amQEkSyDUKQHS881YEFjYQ04v+rzzo+c=",
-   "module": "sha256-yRj1IU0CGnLjdn8nVul9EDpSbgTxQj2jZj79+1hH25U=",
-   "pom": "sha256-SosIbmQxvPYjY39Ssv8ZLhrbkTg4dC5cDupwqN7kKcQ="
-  },
-  "org/jetbrains/kotlin#kotlin-stdlib/2.2.20/all": {
-   "jar": "sha256-VVzbTIhKWEwbXVn2lvt2zWYJF/qza4roAyvNYsdQ7+U="
+  "org/jetbrains/kotlin#kotlin-stdlib/2.3.21": {
+   "jar": "sha256-b2TqxzbblDTdaSW0pRi50dFxd2UjIMN5Fs+bo859fXo=",
+   "module": "sha256-e06ksiQrsXektKu2PD89hXMx1A01hl42/MPbZm7BAXQ=",
+   "pom": "sha256-PgtI2qFNxz+AKdjZ4V7TKUA3fK97kVUQ+I0zIZs1AYY="
   },
   "org/jetbrains/kotlin#kotlin-stdlib/2.4.10": {
    "jar": "sha256-TsApO8N1FCOyA/HYSTJRxXxC5z62N3prhWDQl0/wpt8=",
    "module": "sha256-HASpjxIAyHBdAV3wiXchFYnuy8h88cTG0oqSaC/oRG4=",
    "pom": "sha256-n4HyXpa5GRUzkt7VO9MyFudmJJCc/QgKPtsnjUT8NPA="
   },
-  "org/jetbrains/kotlin#kotlin-tooling-core/2.2.20": {
-   "jar": "sha256-dAFOxPPveM59p+Pmlk8sUmoxIdXFj++MopeeXzRFgvQ=",
-   "pom": "sha256-jvep2QYs59w/xlVxXdAoqZRLeElhPgEYR8XWs7mSgXE="
+  "org/jetbrains/kotlin#kotlin-tooling-core/2.3.21": {
+   "jar": "sha256-NnFCeBKZvA+RIMHe7A5ik0oa+ep/AaqpxaU1TcXY19k=",
+   "pom": "sha256-bUmGsDzsaBW3sTLst2rWwLcczaeQSzoRTPOXAOnKyOQ="
   },
   "org/jetbrains/kotlin#kotlin-tooling-core/2.4.10": {
    "jar": "sha256-WeowU3LjordBd2Tc/s9kUGag2bF5KrQK/RXBzIU1tYo=",
    "pom": "sha256-WQJIMoqGPY8ADvBjrA7otEg/UtPiL6UcokPOf2p4x1w="
   },
-  "org/jetbrains/kotlin#kotlin-util-io/2.2.20": {
-   "jar": "sha256-1DGva+puLcmInE/iawc84VfxEchgj+laGL/gi4F8/3Q=",
-   "pom": "sha256-xqXQGEjNBAz8j3uuYjLXktcFwpOi2nJmrmJszbNdagM="
+  "org/jetbrains/kotlin#kotlin-util-io/2.3.21": {
+   "jar": "sha256-t2hAXLhDvDAOzhpegDI+cPEb3hLw2RUG0MyZARvi8tc=",
+   "pom": "sha256-n0P507get+JPh6EIDggL+R7DedSpElEzm/QZ2oVbB8o="
   },
   "org/jetbrains/kotlin#kotlin-util-io/2.4.10": {
    "jar": "sha256-Bqmg+JiEwcGoa6qWJgI42Sf7AnB3ume7XSlYr2/Xdtc=",
    "pom": "sha256-PJykPr/4Q2bn/yh0K3R1VTYZxfD4rMLXqXmm9LQ3yBo="
   },
-  "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.2.20": {
-   "jar": "sha256-vuSQHKU6WiHA22RZAdKwcK/2gkAkF91XiODjWTZFcTs=",
-   "pom": "sha256-vtAGUSIGX65328DEb/xBRqaFy7GLijApq9XaO/qhECc="
+  "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.3.21": {
+   "jar": "sha256-dqEKVcpEgx6gapkjhNiAgF8qkyAW8ebBSsc0UWPSbiQ=",
+   "pom": "sha256-dd/VZv0HoRFxxNibG2cFFHXpbwUsKv/NgUNipx97tFE="
   },
   "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.4.10": {
    "jar": "sha256-+bDMM1QsU9gwBKtK7/b2UV1QnSbhTnj0IO6uKkWfSSc=",
    "pom": "sha256-YG9w2HiKI/mwFwORB9AFJI0Ih0gfCBXmKEupppM6e3s="
   },
-  "org/jetbrains/kotlin#kotlin-util-klib/2.2.20": {
-   "jar": "sha256-7XyAlrK75HetF8MXjeuoyDr1MourNr/iEJEL1bQZI0w=",
-   "pom": "sha256-2mwiR3qvQt2hbYWa2unj7Yq8khzLp/9RYTTMi9NZqpI="
+  "org/jetbrains/kotlin#kotlin-util-klib/2.3.21": {
+   "jar": "sha256-3goaZsoKH5X4WACtwMdxnAhGB2zE7Ne+SFd7dAvub7s=",
+   "pom": "sha256-Bi70j2uBMJw4sqBER7ysF3OyWG6NPWvv6Qi+l5Rto10="
   },
   "org/jetbrains/kotlin#kotlin-util-klib/2.4.10": {
    "jar": "sha256-QI070W4PUTrC9PBKeIcXAZJINggcLMd0qis/c5J45DA=",
    "pom": "sha256-Yx2/78467+od41c9jcHlSRm+mviMFCUF0zUhJ9hKu4Q="
   },
-  "org/jetbrains/kotlin#swift-export-embeddable/2.2.20": {
-   "jar": "sha256-xAgKy0UComoaKdjxcbLjBIJKoiDCrtSvQEOHfy8tREg=",
-   "pom": "sha256-CiNVWKEHhN+VqqVTXkFEpscfSfpqCqGOL8sBKbaLG3Y="
+  "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.3.21": {
+   "pom": "sha256-yIhTYIUUX6NyHzlWQ7PIDLYim9iayrC4etXTYuOd7Gk="
   },
-  "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.2.20": {
-   "pom": "sha256-SKZBhWIwQP1md7AQCD2JxhgTm9cxYLra1lkW5tVDn8Y="
-  },
-  "org/jetbrains/kotlinx#atomicfu/0.23.1": {
-   "jar": "sha256-fbhmDr5LkbtHjts2FsTjpQulnAfcpRfR4ShMA/6GrFc=",
-   "module": "sha256-Pokf5ja1UQgZIQD884saObzRwlM+I8Ri/AdkTur8sg8=",
-   "pom": "sha256-aIt5ABn0F87APmldZWexc7o7skGJVBZi8U/2ZEG1Pas="
-  },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.2": {
-   "pom": "sha256-+vDGU45T3cBJmmNmTY52PCFlgLLhjnIsy98bQxpq/iY="
+  "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.11.0": {
+   "pom": "sha256-9lhgvOWKK/rfBf3FFtODM0IfDjh/74fiREnAOUyA0lQ="
   },
   "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": {
    "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU="
   },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.10.2": {
-   "jar": "sha256-XKF1s43zMf1kFVs1zYyuElH6nuNpcJs21C4KKIzM4/0=",
-   "module": "sha256-6eSnS02/4PXr7tiNSfNUbD7DCJQZsg5SUEAxNcLGTFM=",
-   "pom": "sha256-ZY9Xa5bIMuc4JAatsZfWTY4ul94Q6W36NwDez6KmDe8="
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.11.0": {
+   "jar": "sha256-0ddaoB3/u00cUg5n5MTn9fYXRxjny0YyQSUD8vDmBPo=",
+   "module": "sha256-WyVWU61rHyHgxGEIYF8SnjqlbtlBSEnMn1tDZEFRdSg=",
+   "pom": "sha256-3VS5eqP6uR/CT13ykWwivpQpoznS9Ft/8JIzL2wZ3Dk="
   },
   "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": {
    "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=",
    "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=",
    "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs="
   },
-  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.10.2": {
-   "jar": "sha256-MZtlMAnUnHCYL5jfKcyE/HAlsJLLBXHI51MuOtQ2ba4=",
-   "module": "sha256-j+JUF35xGnzRijwG2CQvzpRfQcLMoT3BmzOuQqVDUBY=",
-   "pom": "sha256-UZ2lQACW80YqTa6AeDrQUEE9S8gex65T+udq7wzL7Uw="
+  "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.11.0": {
+   "module": "sha256-Hhl4XTRyi3Ul16d/8y6tRUfVHMekXUrETU3mCBabDA0=",
+   "pom": "sha256-QbbnjBsNEbyZ3nlTkN+eTs5k3BE/SC1uMI8bekIcHTA="
   },
-  "org/jetbrains/kotlinx#kotlinx-html-jvm/0.11.0": {
-   "jar": "sha256-4nb9kD4yUy/2N0RxOj0QJeelDw94rEb75ZEOFZb9HD0=",
-   "module": "sha256-X7HkFdiYoGjNPuH5fEA8qMg7PtA7/WecP2Bs5wOKdw8=",
-   "pom": "sha256-JwybmESOeNZABjIDsKsWdqKS3YDjOj3hiMcvxcIuSVA="
+  "org/jetbrains/kotlinx#kotlinx-html-jvm/0.12.0": {
+   "jar": "sha256-+FQSbzmsvZY/1U4M0iYAChUadvciXuKBhdUvROJivvs=",
+   "module": "sha256-vDyVbv4Yl2iOf7dYgY7XNUnOwtjRaQEFYS6rrTAmaRk=",
+   "pom": "sha256-6NAtNAasx/wou/TMxbJu/RGYiTl41A5NLm2jaB/733U="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.6.3": {
-   "pom": "sha256-KdaYQrt9RJviqkreakp85qpVgn0KsT0Wh0X+bZVzkzI="
+  "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.9.0": {
+   "pom": "sha256-bX/zZcDvHNN2+1SxoWyAoh7Vj+tGwz80ULbPIuKxNT0="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.7.3": {
-   "pom": "sha256-QiakkcW1nOkJ9ztlqpiUQZHI3Kw4JWN8a+EGnmtYmkY="
+  "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.9.0": {
+   "jar": "sha256-Hwr6FyEQ5FpyMe8bRK6P2Eweuv+W8/w61o74xIEgtZw=",
+   "module": "sha256-cMh+MWGSq3cpqmOZIgKQ98jZ/dTZNC3J+cDkKFarNG0=",
+   "pom": "sha256-hxkNQ05icv7WBa8PztFfa8CC2KVQQMUZjm1LLWovysI="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.0": {
-   "pom": "sha256-xD5IdSnM/RIJ66hlOrjolZggNGSq+/5fBEje2ZKHFQk="
+  "org/jetbrains/kotlinx#kotlinx-serialization-core/1.9.0": {
+   "module": "sha256-jNEYEwvyIIAgKeI5l0oz0nL00COlYQ9Vfs5rD4mV+J8=",
+   "pom": "sha256-lTt2Dcs2Ooqgz+X5GMPd0SRmh4XZGKw/QAsZGZasrJ0="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.6.3": {
-   "jar": "sha256-KcghqNTiXL/k8s6WzdRSb2H49OaaE1+WEqNKgdk7ZfE=",
-   "module": "sha256-MpEE29NOS96QVhHUJ8dYTlPD+MQRg2+59pmsnbpbqmw=",
-   "pom": "sha256-K0qolJn8AbMNHBB1lmmOCvQ0BBLVQBnFAdm6ayk7oro="
+  "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.9.0": {
+   "jar": "sha256-2UzDTK45JGoa90/aY/nEgSzhIhbvZB1fo7u7U5ppItg=",
+   "module": "sha256-u634x2urP82I/ORbO7tj37FIfzgCHhvdg7+5MQ735po=",
+   "pom": "sha256-azQzwqqesmYo26vxbJYzTKqzD24HcQ0Q7n+HkGznMN0="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.7.3": {
-   "jar": "sha256-8K3eRYZBREdThc9Kp+C3/rJ/Yfz5RyZl7ZjMlxsGses=",
-   "module": "sha256-c7tMAnk/h8Ke9kvqS6AlgHb01Mlj/NpjPRJI7yS0tO8=",
-   "pom": "sha256-c09fdJII3QvvPZjKpZTPkiKv3w/uW2hDNHqP5k4kBCc="
+  "org/jetbrains/kotlinx#kotlinx-serialization-json/1.9.0": {
+   "module": "sha256-T8E+xBK3uaIToX39qjNkV4Ab4W/BZa2GsLcxT9CW5ww=",
+   "pom": "sha256-mUGX39Wqub9VhVbCFW/eIoK6b8OtR/RmoIznk1zPR2Q="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.8.0": {
-   "jar": "sha256-08lOnYKbum4MTNOuR4pAhG3UnVR11nB4d76FOXav5BY=",
-   "module": "sha256-NzH80jhWGpCpdSs0hfHWNeAbRF5Kd4F9ewd/S50vQi0=",
-   "pom": "sha256-QVKRtvWbeTemcau136BLJyl811jLUQLNzHWUFJj5wDw="
+  "org/jline#jline-native/4.2.1": {
+   "jar": "sha256-LCOQFScOoAAxVm/cI51rQmBa+vTP72wrNKw/LHqjQ8o=",
+   "pom": "sha256-lZGbL9C3p1AQP5IfINDunwHuf2sbfWzQU8XgjMnKYSk="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-core/1.6.3": {
-   "module": "sha256-Nh6eMetylhdLdAhaxJ7dhKTzkAupQxpOQM0cI952oyg=",
-   "pom": "sha256-0tv2/BU2TIlp1qq24+zMdROZU/LMBXtzDjUmdGWztX4="
+  "org/jline#jline-parent/4.2.1": {
+   "pom": "sha256-fqGaOOSQX4Nqa1Sor2HNi5u1yIhrEF5Pk1kX4kXZd70="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-core/1.7.3": {
-   "module": "sha256-OdCabgLfKzJVhECmTGKPnGBfroxPYJAyF5gzTIIXfmQ=",
-   "pom": "sha256-MdERd2ua93fKFnED8tYfvuqjLa5t1mNZBrdtgni6VzA="
+  "org/jline#jline-reader/4.2.1": {
+   "jar": "sha256-PhV5yu8GFYTgK9fBtKb4eztnZ4Gc05TUJf8OY5kJ9uE=",
+   "pom": "sha256-hQNQxfP9xfuf7rESHJPYwDHomcK+0jtwqVjIJ7T7kfA="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-core/1.8.0": {
-   "jar": "sha256-hThiUkHBX0SBQAQyDq6l32fpRK3FKwDduDGY1mTpIlE=",
-   "module": "sha256-mE2aqabpvMONfoNuqNAAsThyCH/GZY0NjWIldjPzlfE=",
-   "pom": "sha256-nVbnQWLOQn4MSetsuXUSR0Mq3PwukTw4KWY+27qr7hM="
+  "org/jline#jline-terminal-jni/4.2.1": {
+   "jar": "sha256-Pl3YxTDBv71dldtTUqO3VUeLe6DOOA6Yu9XLa7qp42g=",
+   "pom": "sha256-0we1BY1TucBCSb7P0OTKSU9mC1peLT4clqewQApisPE="
   },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.6.3": {
-   "jar": "sha256-0yNBebz/GIbVPWfBHspH9/PPe2PDSdFpZfbbUbfz3Zo=",
-   "module": "sha256-InoqmtOMAQsQe8gFjNYVF32lqqhts399WNSdnJt/l9A=",
-   "pom": "sha256-eN9n0GTTuq8a9Ohi6YFGl3YpfGyHi7e/G0Ljky9vr48="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.8.0": {
-   "jar": "sha256-e3xEWIDO+U3EZPRzPaGzO5S+54gFBB6giuBuhQfkYg4=",
-   "module": "sha256-l+NZl/6prZY63lv0wDko/lOXS4JlIdSwP7+zyrAgiqo=",
-   "pom": "sha256-4CSBj4YiByqIM8DTmVd3Uet3ZJymO9DA/AYATWaRd6Q="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json/1.6.3": {
-   "module": "sha256-gNHYf6CmO/+Dleo5EL2oDQnw9YNQTd6o7QB7x6hrTNQ=",
-   "pom": "sha256-KcIhdhjlMdfYMsyICupu0aj0B3PkN/WkHXC9FUaNPOM="
-  },
-  "org/jetbrains/kotlinx#kotlinx-serialization-json/1.8.0": {
-   "jar": "sha256-+qvHPoVryerJe6GdPfT8Suh+FOKt0HZccEG8cupHobs=",
-   "module": "sha256-lK/eU8GRw+Hge5+AiqF3f4YryKlbxQtGYozQkhnVaFg=",
-   "pom": "sha256-WAgq+Zc0Ah1bjbKcQ1sR1FyhGxwP14bHhFIsnSxxeVg="
-  },
-  "org/jetbrains/marketplace-zip-signer/maven-metadata": {
-   "xml": {
-    "groupId": "org.jetbrains",
-    "lastUpdated": "20250902130013",
-    "release": "0.1.43"
-   }
-  },
-  "org/jline#jline-native/3.23.0": {
-   "jar": "sha256-67QTkCH3PxmswV70H+XfOYk979pEqMt5EEfYT+hlUo8=",
-   "pom": "sha256-4R+TbRRFnwzlLXrIugQX+Jo0F7ZteARXYnIVZPynFJQ="
-  },
-  "org/jline#jline-parent/3.23.0": {
-   "pom": "sha256-FsBy+h0RKs7uO+J1KOm/FX+S++nSrLwiKhIpmRP8Y/4="
-  },
-  "org/jline#jline-reader/3.23.0": {
-   "jar": "sha256-8jn4QWZ3XwUZ+4ioqggjbWzLbfuCHy29DPPYeAp3yXw=",
-   "pom": "sha256-2v464XJ0coWwlqlcxBtcUJAvkRpgiEpJjt/eZ8QjzAE="
-  },
-  "org/jline#jline-terminal-jansi/3.23.0": {
-   "jar": "sha256-5J8/1WLzw+Yug9WNQnA8o9KMNdwIJ2z/J/qiicA/lRQ=",
-   "pom": "sha256-MEQFUqD44DBRCgJEGsJMGpLiWk3ztTSntHMgGmNLyks="
-  },
-  "org/jline#jline-terminal/3.23.0": {
-   "jar": "sha256-hwrs9UUhkKdKOJe0Esle6aeukqP+RPWpqLGi4uZqfhM=",
-   "pom": "sha256-8x3FciyLEYhUc6IZ0wJXKdjvUbL03xLjFJabA5/eaUU="
-  },
-  "org/jsoup#jsoup/1.16.1": {
-   "jar": "sha256-HxFXJlQN33GVjBS8UX6/xJz0gekc2Rew+s6E8BJy6QE=",
-   "pom": "sha256-bMUH9jBTbyBb3iwbOMPFkHUR3i17GkRL6dY41GFPJDw="
+  "org/jline#jline-terminal/4.2.1": {
+   "jar": "sha256-998+scd6OVCDXmuS1KM+NbtvqvDXsoVeNEd1pAgjQRg=",
+   "pom": "sha256-n0mvzwn33v9iaEETt+Z5IuV9x+DSwapaoL1utzHm1yI="
   },
   "org/jspecify#jspecify/1.0.0": {
    "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=",
@@ -2034,18 +1605,14 @@
    "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=",
    "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM="
   },
+  "org/junit#junit-bom/5.10.1": {
+   "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=",
+   "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I="
+  },
   "org/junit#junit-bom/5.10.2": {
    "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
    "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
   },
-  "org/junit#junit-bom/5.10.3": {
-   "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
-   "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
-  },
-  "org/junit#junit-bom/5.11.0": {
-   "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=",
-   "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0="
-  },
   "org/junit#junit-bom/5.11.4": {
    "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=",
    "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU="
@@ -2054,18 +1621,22 @@
    "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=",
    "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc="
   },
+  "org/junit#junit-bom/5.13.0": {
+   "module": "sha256-v3UwQWgCi0oJde+GVIArFVrq5H5pT2iUJfTFqfHj6IU=",
+   "pom": "sha256-1I9UvAWY2rDpGg2XXH18lUZm6sT+5jlBh24/kuoeWcY="
+  },
   "org/junit#junit-bom/5.13.1": {
    "module": "sha256-M8B6uXJHkKblhZugfWkResUwQ5ckVFqBxBeeMnLHXeg=",
    "pom": "sha256-+mhFHqgwVy7UP/5R11tqBfel5mWmAqUfSda+AgY6ZfM="
   },
+  "org/junit#junit-bom/5.13.2": {
+   "module": "sha256-7WfhUiFASsQrXlmBAu33Yt1qlS3JUAHpwMTudKBOgoM=",
+   "pom": "sha256-Q7EQT7P9TvS3KpdR1B4Jwp8AHIvgD/OXIjjcFppzS0k="
+  },
   "org/junit#junit-bom/5.13.4": {
    "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
    "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
   },
-  "org/junit#junit-bom/5.14.0": {
-   "module": "sha256-etPdstdOanfWWuiaykXUaMl7+ZFba8UvRJ1nXk5vmzU=",
-   "pom": "sha256-9apHs2ZIPo0fm+8Q5noMZvZq/A8zHJ+WaxMQutYND28="
-  },
   "org/junit#junit-bom/5.14.1": {
    "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=",
    "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ="
@@ -2074,47 +1645,43 @@
    "module": "sha256-XSb0RAOSMm3SSDz0kBQ+6hSV1QlUWaC5ZRp7GzjiTr8=",
    "pom": "sha256-7S3MeFW9RgvMyTob8Mli5jtWb/fY8d7Q8fJZO6gYOq8="
   },
-  "org/junit#junit-bom/5.8.2": {
-   "module": "sha256-QM+tmT+nDs3yr3TQxW2hSE7iIJZL6Pkyz+YyvponM/o=",
-   "pom": "sha256-g2Bpyp6O48VuSDdiItopEmPxN70/0W2E/dR+/MPyhuI="
+  "org/junit#junit-bom/5.14.3": {
+   "module": "sha256-8lxAv6Usi3tCXVdqiPMQ9kMmFtYrpYkyA/on37yfAl4=",
+   "pom": "sha256-CKAoVuSHyTV/mynjh0X4roBYSBEectFarQNSM48WMuE="
   },
-  "org/junit#junit-bom/5.9.3": {
-   "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=",
-   "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc="
+  "org/junit#junit-bom/6.1.0": {
+   "module": "sha256-SCB/lc3sO/tc5sy/GNUqzlHoFfIRBp3BbgKDslWmTZo=",
+   "pom": "sha256-97Zl5dVzsBr21DTT0kUKpbdBtoPz8QFy8etEo9DQrAw="
   },
-  "org/junit/jupiter#junit-jupiter-api/5.14.0": {
-   "jar": "sha256-00MaAEuDgjvN2VtnOBMAh+wysvsopaXetPvBY1e6uPk=",
-   "module": "sha256-V86ZtxkZ0eDbZV6tULSICJBLKO5qv3xUWBB/mEjVw1o=",
-   "pom": "sha256-BB5HJeF9zQfpo65wj6aHHXEq3dsLXTbqy0D1xC4nE7s="
+  "org/junit/jupiter#junit-jupiter-api/6.1.0": {
+   "jar": "sha256-UPl+uADC6Ij6ojegb1oO9EX67VVn+ZTawMK50niprSA=",
+   "module": "sha256-HQFsKC2GuCGvWz2zd7cJrZI4tUyJSzMjzRsj6lMSl9Y=",
+   "pom": "sha256-000J8MyNqqQOMC26REEyf8BF+gvV39qC0ho3IBj3i4c="
   },
-  "org/junit/jupiter#junit-jupiter-engine/5.14.0": {
-   "jar": "sha256-IDt6JAsVcW+LiB4t+rDFgPHaWydKGW/zYPjK2i0XUuo=",
-   "module": "sha256-KGfhYWM1n7KIfHUvqy8A0Z2Pyj8NzO2dHV8BiM32rgY=",
-   "pom": "sha256-KPX4YI+V7PYg3qXcJg2BTF6RFZuKrayxa5QrcVBmXZI="
+  "org/junit/jupiter#junit-jupiter-engine/6.1.0": {
+   "jar": "sha256-6nB7lkcIRhmg/JEc77JQN1QNWLKAD46tH8aiuvWLHaU=",
+   "module": "sha256-qxcPpDeU24cKcgzDt6LWdi3MRXcyjv2vizCOaNLH79E=",
+   "pom": "sha256-h+13EyLIt6c55oZct+WGTqwoj9IL1qP8Vjtiov8sSVo="
   },
-  "org/junit/jupiter#junit-jupiter-params/5.14.0": {
-   "jar": "sha256-f7tRg3khwylgS6EZ3BrwVz02Iw6oD3hqo9T9jB27ihs=",
-   "module": "sha256-V/+2UZyCd8xdhK7GB1hLfcPgA/Dtjc4sJYBHBWHELGY=",
-   "pom": "sha256-RkOJ7Dv6ZGLKy944a9Ba0f9/3iCY24vQXD73fC5Omdg="
+  "org/junit/jupiter#junit-jupiter-params/6.1.0": {
+   "jar": "sha256-uYfuoyBRhadvNlmjnmdQPLe2gti3vgO+S5+StxDw7sA=",
+   "module": "sha256-evPVYvC8fWUmA2HlcT5vzVVQuZcqGA1vxM2itoJM4pc=",
+   "pom": "sha256-ZOXfB1ZYuUmh2lSyEp6jHOY87fodJTEHWgBxlJnOwEY="
   },
-  "org/junit/platform#junit-platform-commons/1.14.0": {
-   "jar": "sha256-5UOjqEIvHf5gR/U1MFtwx3fg20MfHvP1XvXIasC7y5s=",
-   "module": "sha256-Kwq1YmEUumwASZEJ6MOJoXy6XhP7+BEExBjoY3UNSLw=",
-   "pom": "sha256-Ed3u4UN656ybNGhLDophehZaIKobIjyk0YM3ZMxwZJI="
+  "org/junit/platform#junit-platform-commons/6.1.0": {
+   "jar": "sha256-HZBGqxfsftr7C8eUXS5Z1xgP/08oxzS4I7UQAedp9xs=",
+   "module": "sha256-eVv++8OD8DMoadK4AUJSK65GKjkFu6ntSbe8NcQf64A=",
+   "pom": "sha256-yRmWB2BYBu8YXQT9RpVRsrShUQos6twHTbRBvXf23TY="
   },
-  "org/junit/platform#junit-platform-engine/1.14.0": {
-   "jar": "sha256-V80p3oNEaa7mVuXevaHwn3xZYw/Ve5DMDLqjFyb8TUo=",
-   "module": "sha256-panr9kOUz5HYW/InO6g+K3f5V2dAYYiEV+4nzr00gOQ=",
-   "pom": "sha256-dAumF9c4ITX+Ekf3H3Umh0ljeYj9OdEq5Qn9Rl+v3QY="
+  "org/junit/platform#junit-platform-engine/6.1.0": {
+   "jar": "sha256-P7a+dsJqsPlP4ITj/Qo54dJeIhKZKaYbKb2AoFK5PqU=",
+   "module": "sha256-OnbyFfpzfJbOlycTqva0UYePpzOVX/IbDNao+I3LIhI=",
+   "pom": "sha256-NgVWdVmFVdSVuvtVezXukYzbF2pnUxALABtO7thfJsU="
   },
-  "org/junit/platform#junit-platform-launcher/1.14.0": {
-   "jar": "sha256-EACyeHl1ENzsQNkPd/DYTcwT5ZgtpWPBi2tWZarkuBw=",
-   "module": "sha256-pJlI15aokT/22Jl1ITnUl2YxQ7AS3fgEqxzlMuC/1zw=",
-   "pom": "sha256-q41bLHzlSaDJEsG9E7yNV0dYOcLneiLlb4DxniPcdQI="
-  },
-  "org/jvnet/staxex#stax-ex/1.8": {
-   "jar": "sha256-lbBdlZCvQVTGUTucXcH7LlW1OZcroKnvKOmgwB2DrXc=",
-   "pom": "sha256-CoTCDPcfaj0h/iJrDViDMvx64+kMtYPGCkgzF+ufNkQ="
+  "org/junit/platform#junit-platform-launcher/6.1.0": {
+   "jar": "sha256-CZXm7SRNZhlsvaAZ4vh5UE0LSJce2unMPepGobMcA3c=",
+   "module": "sha256-f4PRJdcb5Z4JVD1LUGn6h9jKchyqQ9FKq+gm+x2xuME=",
+   "pom": "sha256-on93QpSA4V22Cwlf21lfULa6VylfIqXCZEuo1BitM54="
   },
   "org/mockito#mockito-bom/4.11.0": {
    "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
@@ -2122,9 +1689,9 @@
   "org/mockito#mockito-bom/5.20.0": {
    "pom": "sha256-YmvA9584nSxBVD0W2NnbC1OtCEjMN6bgtM53Gk/gvEk="
   },
-  "org/msgpack#msgpack-core/0.9.8": {
-   "jar": "sha256-HTpha505JEfSb2siPsv75idr8of4H1SQsMSf9Vtob3w=",
-   "pom": "sha256-u4D60T5fabCRH95YrhGZHTB6n1j2+6UWY59lrL+3Kqg="
+  "org/msgpack#msgpack-core/0.9.12": {
+   "jar": "sha256-Jh544yIn0pjyXDKK7NUyp4nUh9gHP5e6m2qm2+QaK+M=",
+   "pom": "sha256-QOy3zxhJEA12WVxAczXjf1GKLF1Mwei5s2KC85XF7R0="
   },
   "org/openjdk/jmh#jmh-core/1.37": {
    "jar": "sha256-3A6vK78ANqcLYHmMeF1uA6na8GtouO2w8bqes0IbrrM=",
@@ -2160,42 +1727,59 @@
   "org/ow2#ow2/1.5.1": {
    "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
   },
-  "org/ow2/asm#asm-bom/9.7": {
-   "pom": "sha256-jIZR874EOzV43SihXAFhhhsV6wObf1JHZ5wMwNvwd4c="
+  "org/ow2/asm#asm-bom/9.8": {
+   "pom": "sha256-DaHcsibmzf2ttNrFkZFruRe1c3RnTZG9LxMAMTe0FSA="
+  },
+  "org/ow2/asm#asm-bom/9.9.1": {
+   "pom": "sha256-6XiDGaZk6tWHmD4Lwx7j2oY3Ohn0LcIhDtqMmbTUcAE="
   },
   "org/ow2/asm#asm/9.0": {
    "jar": "sha256-Dfl1dJFK7pL9NJ0MtOAPM0XUWywjngu1DwqQ6tR4iOA=",
    "module": "sha256-ivgQlu06/6OaRyn8kApVtmOJSRHWfE1L7w6kJDk90/k=",
    "pom": "sha256-3gNVWQ3Rv8zNyNeQJK6ZKXLoVSaKztua1oLQheA6lK0="
   },
+  "org/pcollections#pcollections/4.0.1": {
+   "jar": "sha256-H4J2bXwyIZMIVAM76/9Qc+pGtD8nMmB0u+FdFIwYv7M=",
+   "module": "sha256-nr2nwMnbETTTQd/3yK0LxZUyhvvwuZiuyil6HuboCfA=",
+   "pom": "sha256-+j8pi1AlO5bpz7BvARw7zHj9m0DY3NJZCbygRUlzjHE="
+  },
   "org/pkl-lang#pkl-config-java-all/0.25.0": {
    "jar": "sha256-LY60xLafflMRbzLYGxbmvsaLNO0OHCZTpW02Rk8VKhs=",
    "pom": "sha256-xPMxhJFlYwvKLrOJSTrg82IjMoXHxqQudDvvam5P9zo="
   },
   "org/slf4j#slf4j-api/1.7.36": {
-   "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=",
    "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ="
   },
   "org/slf4j#slf4j-api/2.0.17": {
    "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=",
    "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8="
   },
+  "org/slf4j#slf4j-api/2.0.18": {
+   "jar": "sha256-RFCP0VdlAGiMeQsZCs3Rb+xPjHmj4LkAr9cFA88FX1U=",
+   "pom": "sha256-bCx/LAJ3TMK3thn70t94c82tKXGJJuRHVLh/cNHrQ8s="
+  },
   "org/slf4j#slf4j-bom/2.0.17": {
    "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek="
   },
+  "org/slf4j#slf4j-bom/2.0.18": {
+   "pom": "sha256-khmqtgFXUSbE5m4TMesrDGwXozCsTVoH480R1YCgwS0="
+  },
   "org/slf4j#slf4j-parent/1.7.36": {
    "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI="
   },
   "org/slf4j#slf4j-parent/2.0.17": {
    "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs="
   },
-  "org/slf4j#slf4j-simple/1.7.36": {
-   "jar": "sha256-Lzm+2UPWJN+o9BAtBXEoOhCHC2qjbxl6ilBvFHAQwQ8=",
-   "pom": "sha256-xWuAoKa+oqBGPnDQiSrjOKnlB+SGdnpSBFNAmBIFjRs="
+  "org/slf4j#slf4j-parent/2.0.18": {
+   "pom": "sha256-CziWvtrSye2Wl+3L6h2gxUzSOKcjWDqBNYqDv7eC6fo="
   },
-  "org/snakeyaml#snakeyaml-engine/2.10": {
-   "jar": "sha256-yZ2f1mx8JR2IGpzZUIm3yARMKaGwKYPXA2mBvUNU7Dc=",
-   "pom": "sha256-VhQsopiYjPZNplrivcGYNJIdc411qyN2Go+sS19YMUk="
+  "org/slf4j#slf4j-simple/2.0.18": {
+   "jar": "sha256-gmi9AYpXCbByCeDYymIho3WEuhvBK6mFuDNagsZIvdA=",
+   "pom": "sha256-Pujj8RjAy41D7iyW2Q2CXGnYSSP0muShTVM6AHAkuZk="
+  },
+  "org/snakeyaml#snakeyaml-engine/3.0.1": {
+   "jar": "sha256-C2OMiAYRIhXgLljpXL2emmnUvVQJkfR1U9BTkZmUzJQ=",
+   "pom": "sha256-A1Wc/HGvjvSvgzhdJdk78438ekMWm4Pe/HCs394Uttk="
   },
   "org/sonatype/oss#oss-parent/5": {
    "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0="
@@ -2210,8 +1794,11 @@
    "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=",
    "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs="
   },
-  "org/testcontainers#testcontainers-bom/1.20.1": {
-   "pom": "sha256-CKrS6R3QXKeycG0t/Ap66AxLXFBHAweZyLzbcyfLL0A="
+  "org/testcontainers#testcontainers-bom/1.21.1": {
+   "pom": "sha256-AQ+82FfudTqY7dfMvj79ljJ7oUPwqgUk2KvBtf7R+yE="
+  },
+  "org/testcontainers#testcontainers-bom/1.21.4": {
+   "pom": "sha256-EXPBeX/MM6edvj/raXQLPFOAPNLkYB6oCZdL2eHZ1D4="
   },
   "org/tukaani#xz/1.9": {
    "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=",
@@ -2221,46 +1808,29 @@
    "jar": "sha256-hpgdL1CrFe6+GpD4Q6GV8o8L0e5SJV12pz7AtLfsec0=",
    "pom": "sha256-+jUpmw0MRzE9cDZKddILmsOoh0Q8Yyx+z1C6ffiHG+U="
   },
-  "org/wildfly/client#wildfly-client-config/1.0.1.Final": {
-   "jar": "sha256-gKTpY86U67BD7LDywOd9Mn8j3IfYE1C4Y3Uu7fosO7M=",
-   "pom": "sha256-6HXRTGUNTWchLybTP8xbsrhqAoOfGFVjCcN8XFULvKY="
+  "org/wiremock#wiremock/3.13.2": {
+   "jar": "sha256-mUbD8O9fjxTYP0w4+r05Ki/1H+KKQL2OZ00BUOk7U5k=",
+   "module": "sha256-nv8h1CBRdqX9Dnv5YwKCXVwGCTXJeTFlMuT7SAXl+0o=",
+   "pom": "sha256-9yE0Yth9zF6uDdD2Ioh6NVurI2JErwR/ewrGOKjB74Q="
   },
-  "org/wildfly/common#wildfly-common/1.5.4.Final": {
-   "pom": "sha256-5uGiImN0fokpANH1Aj4dDf6LFtZe/shy8gV3oGl+01c="
+  "org/xmlunit#xmlunit-core/2.11.0": {
+   "jar": "sha256-UJcOYGnCEYJonrRK6fgZOXDggLbzf8E/IqpCAcyi3+Q=",
+   "pom": "sha256-trpHPI+OmLrucZY5SexHU49pb90gYonkli9etOz+dkA="
   },
-  "org/wildfly/common#wildfly-common/2.0.0": {
-   "jar": "sha256-d34ID08tlZIniXx8kr/U1K/jwrJYM6iRMoxn9qlXa4o=",
-   "pom": "sha256-suPHun37w4Va7Rd7XGSnLqRFJwVGSw61uwmnIZ9b2Yw="
+  "org/xmlunit#xmlunit-legacy/2.11.0": {
+   "jar": "sha256-jJJBmKbcW8/mQLzyRgd3a7TCM6HefwfqJWKmFF3eFjE=",
+   "pom": "sha256-fLcOi2VWP5DKyKyKkUV214wRPjUhdwGs5V+XznAA794="
   },
-  "org/wiremock#wiremock/3.13.1": {
-   "jar": "sha256-GlsnUBTtn7kqkCvhUVV+2OTaX89kTrRynwJHTpsfEAI=",
-   "module": "sha256-Rt8NJq8GyXLHq8HY+Z3e9FYJCrKokmrAFrgtrw1uAzI=",
-   "pom": "sha256-5uM+y5QJ6CNXb9gijFVos0KDoFnZq9rFLHJDhwhCKgA="
+  "org/xmlunit#xmlunit-parent/2.11.0": {
+   "pom": "sha256-Lv+zPkG1sImb9LfIiJriCBD4DIrr7hhEk1dYhCUnpMI="
   },
-  "org/xmlunit#xmlunit-core/2.10.2": {
-   "jar": "sha256-UeQZ/nq6fVCuxyfFv5AvjN8qrPQkh5gy5YES9z0/vCE=",
-   "pom": "sha256-zdDCCYG2VbFaaOG8FqXQ1EVhETY2qF58OiSsKlx9ABI="
-  },
-  "org/xmlunit#xmlunit-legacy/2.10.2": {
-   "jar": "sha256-PLibAW3nPOJE/r05cgzomQs/EfcsjrXYqdgrZ7EulJA=",
-   "pom": "sha256-hbUl6P+AkVUTmln3ddjwvCMOAxjkZ2ShIP84uCPlIVY="
-  },
-  "org/xmlunit#xmlunit-parent/2.10.2": {
-   "pom": "sha256-K9PJ4x5r0rPz459lnCJPZIcc1mtEGKePE0lJIHcadH8="
-  },
-  "org/xmlunit#xmlunit-placeholders/2.10.2": {
-   "jar": "sha256-7AGjBJk7RBsu4W5BqJYImGFYGb8Z5nDuE7EqtwHrED4=",
-   "pom": "sha256-W3l31Ufm447C7kdM9dDZfnTyEdMpxl/zLcyjxcqAwYk="
+  "org/xmlunit#xmlunit-placeholders/2.11.0": {
+   "jar": "sha256-tf2jFZ8GV1zHGnxb0+RftR5TWqiK71FLVRA7v+Q1kjg=",
+   "pom": "sha256-uXYf/KuxILv14styc+OHQvhSlE81mq83m9UqETUPlMI="
   },
   "org/yaml#snakeyaml/2.4": {
    "jar": "sha256-73ea9dKand6MxwzgNB9cb3c14j7f+Whc6qnTU1m3u38=",
    "pom": "sha256-4VSjIxzWzeaKq/J0/RiWTUmpwaX16e079HHprnvfCOY="
-  },
-  "software/amazon/awssdk#aws-sdk-java-pom/2.11.9": {
-   "pom": "sha256-VShpci1oRaixYc5eBPqcC8U9QQNk7Sl9xrBL9FEXzDE="
-  },
-  "software/amazon/awssdk#bom/2.11.9": {
-   "pom": "sha256-RSqcnj8+2iuJURUkYEXKgAJOy9BHDq+rK1vxtEtom1k="
   }
  }
 }
diff --git a/pkgs/by-name/pk/pkl/disable_bad_tests.patch b/pkgs/by-name/pk/pkl/disable_bad_tests.patch
index 6c8028cedda9..9445f99c01f5 100644
--- a/pkgs/by-name/pk/pkl/disable_bad_tests.patch
+++ b/pkgs/by-name/pk/pkl/disable_bad_tests.patch
@@ -1,9 +1,8 @@
-diff --git i/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt w/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt
-index df88c423..ae1db500 100644
---- i/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt
-+++ w/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt
-@@ -1497,6 +1497,7 @@ result = someLib.x
-     assertThat(output).isEqualTo("result = 1\n")
+diff --git a/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt b/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt
+--- a/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt
++++ b/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt
+@@ -1632,6 +1632,7 @@
+     verify(getRequestedFor(urlEqualTo("/foo.pkl")).withHeader("X-Foo", equalTo("Foo")))
    }
  
 +  @Disabled
diff --git a/pkgs/by-name/pk/pkl/disable_gradle_codegen_tests.patch b/pkgs/by-name/pk/pkl/disable_gradle_codegen_tests.patch
index 9d12ec70e9cd..0356c713e5b1 100644
--- a/pkgs/by-name/pk/pkl/disable_gradle_codegen_tests.patch
+++ b/pkgs/by-name/pk/pkl/disable_gradle_codegen_tests.patch
@@ -1,8 +1,7 @@
 diff --git a/pkl-gradle/src/test/kotlin/org/pkl/gradle/JavaCodeGeneratorsTest.kt b/pkl-gradle/src/test/kotlin/org/pkl/gradle/JavaCodeGeneratorsTest.kt
-index 68a5b533..84fe66df 100644
 --- a/pkl-gradle/src/test/kotlin/org/pkl/gradle/JavaCodeGeneratorsTest.kt
 +++ b/pkl-gradle/src/test/kotlin/org/pkl/gradle/JavaCodeGeneratorsTest.kt
-@@ -18,9 +18,11 @@ package org.pkl.gradle
+@@ -18,9 +18,11 @@
  import kotlin.io.path.listDirectoryEntries
  import kotlin.io.path.readText
  import org.assertj.core.api.Assertions.assertThat
@@ -14,7 +13,7 @@ index 68a5b533..84fe66df 100644
    @Test
    fun `generate code`() {
      writeBuildFile()
-@@ -68,6 +70,7 @@ class JavaCodeGeneratorsTest : AbstractTest() {
+@@ -68,6 +70,7 @@
      )
    }
  
@@ -22,19 +21,34 @@ index 68a5b533..84fe66df 100644
    @Test
    fun `compile generated code`() {
      writeBuildFile()
-@@ -84,6 +87,7 @@ class JavaCodeGeneratorsTest : AbstractTest() {
+@@ -84,6 +87,7 @@
      assertThat(addressClassFile).exists()
    }
  
++  @Disabled("runTask doesn't use the MITM cache")
+   @Test
+   fun `is configuration cache compatible`() {
+     writeBuildFile()
+@@ -106,6 +110,7 @@
+     )
+   }
+ 
 +  @Disabled("runTask doesn't use the MITM cache")
    @Test
    fun `no source modules`() {
      writeFile(
+@@ -129,6 +134,7 @@
+     assertThat(result.output).contains("No source modules specified.")
+   }
+ 
++  @Disabled("runTask doesn't use the MITM cache")
+   @Test
+   fun `source set configured after pkl block`() {
+     writeFile(
 diff --git a/pkl-gradle/src/test/kotlin/org/pkl/gradle/KotlinCodeGeneratorsTest.kt b/pkl-gradle/src/test/kotlin/org/pkl/gradle/KotlinCodeGeneratorsTest.kt
-index 2b9ffc88..99b91893 100644
 --- a/pkl-gradle/src/test/kotlin/org/pkl/gradle/KotlinCodeGeneratorsTest.kt
 +++ b/pkl-gradle/src/test/kotlin/org/pkl/gradle/KotlinCodeGeneratorsTest.kt
-@@ -18,9 +18,11 @@ package org.pkl.gradle
+@@ -18,9 +18,11 @@
  import kotlin.io.path.listDirectoryEntries
  import kotlin.io.path.readText
  import org.assertj.core.api.Assertions.assertThat
@@ -46,7 +60,7 @@ index 2b9ffc88..99b91893 100644
    @Test
    fun `generate code`() {
      writeBuildFile()
-@@ -69,6 +71,7 @@ class KotlinCodeGeneratorsTest : AbstractTest() {
+@@ -69,6 +71,7 @@
      )
    }
  
@@ -54,12 +68,19 @@ index 2b9ffc88..99b91893 100644
    @Test
    fun `compile generated code`() {
      writeBuildFile()
-@@ -84,6 +87,7 @@ class KotlinCodeGeneratorsTest : AbstractTest() {
+@@ -84,6 +87,7 @@
      assertThat(addressClassFile).exists()
    }
  
++  @Disabled("runTask doesn't use the MITM cache")
+   @Test
+   fun `is configuration cache compatible`() {
+     writeBuildFile()
+@@ -95,6 +99,7 @@
+     assertThat(secondRun.output).contains(CONFIG_CACHE_REUSED)
+   }
+ 
 +  @Disabled("runTask doesn't use the MITM cache")
    @Test
    fun `no source modules`() {
      writeFile(
-
diff --git a/pkgs/by-name/pk/pkl/package.nix b/pkgs/by-name/pk/pkl/package.nix
index 186b19a5657b..d0535a48c8e9 100644
--- a/pkgs/by-name/pk/pkl/package.nix
+++ b/pkgs/by-name/pk/pkl/package.nix
@@ -3,7 +3,7 @@
   lib,
   fetchFromGitHub,
   gradle_9,
-  temurin-bin-21,
+  temurin-bin-25,
   kotlin,
   nix-update-script,
   replaceVars,
@@ -11,20 +11,20 @@
   installShellFiles,
 }:
 let
-  jdk = temurin-bin-21;
+  jdk = temurin-bin-25;
   gradle = gradle_9;
   gradleOverlay = gradle.override { java = jdk; };
   kotlinOverlay = kotlin.override { jre = jdk; };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "pkl";
-  version = "0.31.1";
+  version = "0.32.1";
 
   src = fetchFromGitHub {
     owner = "apple";
     repo = "pkl";
     tag = finalAttrs.version;
-    hash = "sha256-6oY1F1I6xDq8TzYCOGi2Mc+nm/mxc13G/rvjJx4twLQ=";
+    hash = "sha256-jO18ugPyHv7NsaZyJYHFusoYRqR6SJm2JgPvVZkF/Nw=";
     leaveDotGit = true;
     postFetch = ''
       pushd $out
@@ -38,9 +38,13 @@ stdenv.mkDerivation (finalAttrs: {
     (replaceVars ./fix_kotlin_classpath.patch { gradle = gradle.unwrapped; })
     ./disable_gradle_codegen_tests.patch
     ./disable_bad_tests.patch
-    ./repair_org.msgpack-msgpack-core_lockfiles.patch
   ];
 
+  postPatch = ''
+    substituteInPlace pkl-core/pkl-core.gradle.kts \
+      --replace-fail '#!/usr/bin/env bash' '#!${stdenv.shell}'
+  '';
+
   nativeBuildInputs = [
     gradleOverlay
     jdk
@@ -80,7 +84,18 @@ stdenv.mkDerivation (finalAttrs: {
     gradleFlagsArray+=(-DcommitId=$(cat .commit-hash))
   '';
 
-  env.JAVA_TOOL_OPTIONS = "-Dfile.encoding=utf-8";
+  # The dependency collector also resolves Kotlin's Bouncy Castle configuration,
+  # which uses version ranges. The fetched artifacts are pinned in deps.json.
+  preGradleUpdate = ''
+    substituteInPlace build-logic/src/main/kotlin/pklAllProjects.gradle.kts \
+      --replace-fail 'failOnDynamicVersions()' ""
+  '';
+
+  env.JAVA_TOOL_OPTIONS =
+    "-Dfile.encoding=utf-8"
+    # Java's dual-stack sockets prevent Gradle from connecting to its daemon
+    # inside the Darwin sandbox.
+    + lib.optionalString stdenv.hostPlatform.isDarwin " -Djava.net.preferIPv4Stack=true";
   __darwinAllowLocalNetworking = true;
 
   preCheck = ''
diff --git a/pkgs/by-name/pk/pkl/repair_org.msgpack-msgpack-core_lockfiles.patch b/pkgs/by-name/pk/pkl/repair_org.msgpack-msgpack-core_lockfiles.patch
deleted file mode 100644
index 217725ccc52c..000000000000
--- a/pkgs/by-name/pk/pkl/repair_org.msgpack-msgpack-core_lockfiles.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From daede858a1568224b06033b256300c8f86db973e Mon Sep 17 00:00:00 2001
-From: Matei Dibu <contact@mateidibu.dev>
-Date: Fri, 27 Feb 2026 14:13:40 +0200
-Subject: [PATCH] fix: repair org.msgpack:msgpack-core lockfiles
-
----
- pkl-commons-test/gradle.lockfile  | 2 +-
- pkl-config-java/gradle.lockfile   | 2 +-
- pkl-config-kotlin/gradle.lockfile | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/pkl-commons-test/gradle.lockfile b/pkl-commons-test/gradle.lockfile
-index a1c9514e..a9021ca2 100644
---- a/pkl-commons-test/gradle.lockfile
-+++ b/pkl-commons-test/gradle.lockfile
-@@ -47,6 +47,6 @@ org.junit.platform:junit-platform-commons:1.14.0=apiDependenciesMetadata,compile
- org.junit.platform:junit-platform-engine:1.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
- org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
- org.junit:junit-bom:5.14.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
--org.msgpack:msgpack-core:0.9.8=compileClasspath
-+org.msgpack:msgpack-core:0.9.8=compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
- org.opentest4j:opentest4j:1.3.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
- empty=annotationProcessor,compileOnlyDependenciesMetadata,intransitiveDependenciesMetadata,kotlinCompilerPluginClasspath,kotlinNativeCompilerPluginClasspath,kotlinScriptDefExtensions,sourcesJar,testAnnotationProcessor,testApiDependenciesMetadata,testCompileOnlyDependenciesMetadata,testIntransitiveDependenciesMetadata,testKotlinScriptDefExtensions
-diff --git a/pkl-config-java/gradle.lockfile b/pkl-config-java/gradle.lockfile
-index fa2fbd37..ebf64def 100644
---- a/pkl-config-java/gradle.lockfile
-+++ b/pkl-config-java/gradle.lockfile
-@@ -79,7 +79,7 @@ org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplem
- org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath
- org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
- org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
--org.msgpack:msgpack-core:0.9.8=compileClasspath,pklCodegenJava,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-+org.msgpack:msgpack-core:0.9.8=compileClasspath,implementationDependenciesMetadata,pklCodegenJava,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
- org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
- org.organicdesign:Paguro:3.10.3=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
- org.snakeyaml:snakeyaml-engine:2.10=pklCodegenJava,runtimeClasspath,testRuntimeClasspath
-diff --git a/pkl-config-kotlin/gradle.lockfile b/pkl-config-kotlin/gradle.lockfile
-index 2bdeb136..0fd4d516 100644
---- a/pkl-config-kotlin/gradle.lockfile
-+++ b/pkl-config-kotlin/gradle.lockfile
-@@ -78,7 +78,7 @@ org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testImplem
- org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath
- org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
- org.junit:junit-bom:5.14.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
--org.msgpack:msgpack-core:0.9.8=compileClasspath,pklCodegenKotlin,pklConfigJava,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-+org.msgpack:msgpack-core:0.9.8=compileClasspath,implementationDependenciesMetadata,pklCodegenKotlin,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
- org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
- org.organicdesign:Paguro:3.10.3=pklCodegenKotlin,testRuntimeClasspath
- org.snakeyaml:snakeyaml-engine:2.10=pklCodegenKotlin,testRuntimeClasspath
--- 
-2.53.0
-

From 1e0e2ef4a5043604bf41b88fe03460aeb536f103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?=
 <23130178+ShadowRZ@users.noreply.github.com>
Date: Tue, 13 Oct 2026 14:53:10 +0800
Subject: [PATCH 62/78] python3Packages.*: convert all sha256 to hash in pypi
 fetchers

---
 pkgs/development/python-modules/addict/default.nix              | 2 +-
 pkgs/development/python-modules/aioextensions/default.nix       | 2 +-
 pkgs/development/python-modules/ajpy/default.nix                | 2 +-
 pkgs/development/python-modules/args/default.nix                | 2 +-
 pkgs/development/python-modules/astunparse/default.nix          | 2 +-
 pkgs/development/python-modules/asynctest/default.nix           | 2 +-
 pkgs/development/python-modules/azure-mgmt-commerce/default.nix | 2 +-
 pkgs/development/python-modules/azure-mgmt-relay/default.nix    | 2 +-
 pkgs/development/python-modules/backcall/default.nix            | 2 +-
 pkgs/development/python-modules/banal/default.nix               | 2 +-
 pkgs/development/python-modules/bme280spi/default.nix           | 2 +-
 pkgs/development/python-modules/braceexpand/default.nix         | 2 +-
 pkgs/development/python-modules/bwapy/default.nix               | 2 +-
 pkgs/development/python-modules/casttube/default.nix            | 2 +-
 pkgs/development/python-modules/cbor/default.nix                | 2 +-
 pkgs/development/python-modules/chainmap/default.nix            | 2 +-
 pkgs/development/python-modules/colorama/default.nix            | 2 +-
 pkgs/development/python-modules/colorclass/default.nix          | 2 +-
 pkgs/development/python-modules/cram/default.nix                | 2 +-
 pkgs/development/python-modules/cx-oracle/default.nix           | 2 +-
 pkgs/development/python-modules/cxxfilt/default.nix             | 2 +-
 pkgs/development/python-modules/dbglib/default.nix              | 2 +-
 pkgs/development/python-modules/deprecation/default.nix         | 2 +-
 pkgs/development/python-modules/devgoldyutils/default.nix       | 2 +-
 pkgs/development/python-modules/django-raster/default.nix       | 2 +-
 pkgs/development/python-modules/django-tagging/default.nix      | 2 +-
 pkgs/development/python-modules/djmail/default.nix              | 2 +-
 pkgs/development/python-modules/dmenu/default.nix               | 2 +-
 pkgs/development/python-modules/dockerpty/default.nix           | 2 +-
 pkgs/development/python-modules/docloud/default.nix             | 2 +-
 pkgs/development/python-modules/docopt/default.nix              | 2 +-
 pkgs/development/python-modules/docrep/default.nix              | 2 +-
 pkgs/development/python-modules/easywatch/default.nix           | 2 +-
 pkgs/development/python-modules/edward/default.nix              | 2 +-
 pkgs/development/python-modules/eggdeps/default.nix             | 2 +-
 pkgs/development/python-modules/elevate/default.nix             | 2 +-
 pkgs/development/python-modules/enrich/default.nix              | 2 +-
 .../python-modules/environmental-override/default.nix           | 2 +-
 pkgs/development/python-modules/envoy-utils/default.nix         | 2 +-
 pkgs/development/python-modules/etesync/default.nix             | 2 +-
 pkgs/development/python-modules/ewmh/default.nix                | 2 +-
 pkgs/development/python-modules/facebook-sdk/default.nix        | 2 +-
 pkgs/development/python-modules/fastdiff/default.nix            | 2 +-
 pkgs/development/python-modules/fastentrypoints/default.nix     | 2 +-
 pkgs/development/python-modules/fiblary3-fork/default.nix       | 2 +-
 pkgs/development/python-modules/filebrowser-safe/default.nix    | 2 +-
 pkgs/development/python-modules/firetv/default.nix              | 2 +-
 pkgs/development/python-modules/flake8-polyfill/default.nix     | 2 +-
 pkgs/development/python-modules/flashtext/default.nix           | 2 +-
 pkgs/development/python-modules/flask-gravatar/default.nix      | 2 +-
 pkgs/development/python-modules/flask-swagger/default.nix       | 2 +-
 pkgs/development/python-modules/fpdf/default.nix                | 2 +-
 pkgs/development/python-modules/fs-s3fs/default.nix             | 2 +-
 pkgs/development/python-modules/func-timeout/default.nix        | 2 +-
 pkgs/development/python-modules/funcsigs/default.nix            | 2 +-
 pkgs/development/python-modules/future-fstrings/default.nix     | 2 +-
 pkgs/development/python-modules/future-typing/default.nix       | 2 +-
 pkgs/development/python-modules/fuzzywuzzy/default.nix          | 2 +-
 pkgs/development/python-modules/genome-collector/default.nix    | 2 +-
 pkgs/development/python-modules/genzshcomp/default.nix          | 2 +-
 pkgs/development/python-modules/geoip/default.nix               | 2 +-
 pkgs/development/python-modules/getkey/default.nix              | 2 +-
 pkgs/development/python-modules/gflags/default.nix              | 2 +-
 pkgs/development/python-modules/ghdiff/default.nix              | 2 +-
 pkgs/development/python-modules/github-webhook/default.nix      | 2 +-
 pkgs/development/python-modules/glob2/default.nix               | 2 +-
 pkgs/development/python-modules/gntp/default.nix                | 2 +-
 pkgs/development/python-modules/halo/default.nix                | 2 +-
 pkgs/development/python-modules/handout/default.nix             | 2 +-
 pkgs/development/python-modules/hopcroftkarp/default.nix        | 2 +-
 pkgs/development/python-modules/hsaudiotag3k/default.nix        | 2 +-
 pkgs/development/python-modules/httpie-ntlm/default.nix         | 2 +-
 pkgs/development/python-modules/httpretty/default.nix           | 2 +-
 pkgs/development/python-modules/humanfriendly/default.nix       | 2 +-
 pkgs/development/python-modules/hypchat/default.nix             | 2 +-
 pkgs/development/python-modules/hyperlink/default.nix           | 2 +-
 pkgs/development/python-modules/hyperopt/default.nix            | 2 +-
 pkgs/development/python-modules/i2csense/default.nix            | 2 +-
 pkgs/development/python-modules/imagecodecs-lite/default.nix    | 2 +-
 pkgs/development/python-modules/imagecorruptions/default.nix    | 2 +-
 pkgs/development/python-modules/imutils/default.nix             | 2 +-
 pkgs/development/python-modules/infinity/default.nix            | 2 +-
 pkgs/development/python-modules/inflection/default.nix          | 2 +-
 pkgs/development/python-modules/inifile/default.nix             | 2 +-
 pkgs/development/python-modules/iniparse/default.nix            | 2 +-
 pkgs/development/python-modules/insegel/default.nix             | 2 +-
 pkgs/development/python-modules/interruptingcow/default.nix     | 2 +-
 pkgs/development/python-modules/iocapture/default.nix           | 2 +-
 pkgs/development/python-modules/iowait/default.nix              | 2 +-
 pkgs/development/python-modules/ipaddr/default.nix              | 2 +-
 pkgs/development/python-modules/iso-639/default.nix             | 2 +-
 pkgs/development/python-modules/iwlib/default.nix               | 2 +-
 pkgs/development/python-modules/jaydebeapi/default.nix          | 2 +-
 pkgs/development/python-modules/jdcal/default.nix               | 2 +-
 pkgs/development/python-modules/jinja2-time/default.nix         | 2 +-
 pkgs/development/python-modules/jschema-to-python/default.nix   | 2 +-
 pkgs/development/python-modules/jsmin/default.nix               | 2 +-
 pkgs/development/python-modules/jsonpath-rw/default.nix         | 2 +-
 pkgs/development/python-modules/jupyter-c-kernel/default.nix    | 2 +-
 pkgs/development/python-modules/jxmlease/default.nix            | 2 +-
 pkgs/development/python-modules/kaa-base/default.nix            | 2 +-
 pkgs/development/python-modules/kaa-metadata/default.nix        | 2 +-
 pkgs/development/python-modules/kconfiglib/default.nix          | 2 +-
 pkgs/development/python-modules/kerberos/default.nix            | 2 +-
 pkgs/development/python-modules/keystone-engine/default.nix     | 2 +-
 pkgs/development/python-modules/langdetect/default.nix          | 2 +-
 pkgs/development/python-modules/leveldb/default.nix             | 2 +-
 pkgs/development/python-modules/lexid/default.nix               | 2 +-
 pkgs/development/python-modules/libkeepass/default.nix          | 2 +-
 pkgs/development/python-modules/liblzfse/default.nix            | 2 +-
 pkgs/development/python-modules/libmr/default.nix               | 2 +-
 pkgs/development/python-modules/libpurecool/default.nix         | 2 +-
 pkgs/development/python-modules/limitlessled/default.nix        | 2 +-
 pkgs/development/python-modules/linecache2/default.nix          | 2 +-
 pkgs/development/python-modules/linode/default.nix              | 2 +-
 pkgs/development/python-modules/linuxfd/default.nix             | 2 +-
 pkgs/development/python-modules/logzero/default.nix             | 2 +-
 pkgs/development/python-modules/lrcalc-python/default.nix       | 2 +-
 pkgs/development/python-modules/ltpycld2/default.nix            | 2 +-
 pkgs/development/python-modules/mailcap-fix/default.nix         | 2 +-
 pkgs/development/python-modules/mailchimp/default.nix           | 2 +-
 .../python-modules/marionette-harness/manifestparser.nix        | 2 +-
 pkgs/development/python-modules/markdown-macros/default.nix     | 2 +-
 pkgs/development/python-modules/mattermostdriver/default.nix    | 2 +-
 pkgs/development/python-modules/mergedb/default.nix             | 2 +-
 pkgs/development/python-modules/meshlabxml/default.nix          | 2 +-
 pkgs/development/python-modules/midiutil/default.nix            | 2 +-
 pkgs/development/python-modules/milksnake/default.nix           | 2 +-
 pkgs/development/python-modules/mongodict/default.nix           | 2 +-
 pkgs/development/python-modules/monkeyhex/default.nix           | 2 +-
 pkgs/development/python-modules/monotonic/default.nix           | 2 +-
 pkgs/development/python-modules/morfessor/default.nix           | 2 +-
 pkgs/development/python-modules/mplleaflet/default.nix          | 2 +-
 pkgs/development/python-modules/mpyq/default.nix                | 2 +-
 pkgs/development/python-modules/mullvad-api/default.nix         | 2 +-
 pkgs/development/python-modules/mulpyplexer/default.nix         | 2 +-
 pkgs/development/python-modules/munkres/default.nix             | 2 +-
 pkgs/development/python-modules/musicbrainzngs/default.nix      | 2 +-
 pkgs/development/python-modules/mutatormath/default.nix         | 2 +-
 pkgs/development/python-modules/mutesync/default.nix            | 2 +-
 pkgs/development/python-modules/nbsmoke/default.nix             | 2 +-
 pkgs/development/python-modules/nevow/default.nix               | 2 +-
 pkgs/development/python-modules/niluclient/default.nix          | 2 +-
 pkgs/development/python-modules/nixpkgs-pytools/default.nix     | 2 +-
 pkgs/development/python-modules/notedown/default.nix            | 2 +-
 pkgs/development/python-modules/notify-events/default.nix       | 2 +-
 pkgs/development/python-modules/notify2/default.nix             | 2 +-
 pkgs/development/python-modules/npyscreen/default.nix           | 2 +-
 pkgs/development/python-modules/ntplib/default.nix              | 2 +-
 pkgs/development/python-modules/nulltype/default.nix            | 2 +-
 pkgs/development/python-modules/oauth2client/default.nix        | 2 +-
 pkgs/development/python-modules/odfpy/default.nix               | 2 +-
 pkgs/development/python-modules/offtrac/default.nix             | 2 +-
 pkgs/development/python-modules/ofxparse/default.nix            | 2 +-
 pkgs/development/python-modules/onetimepad/default.nix          | 2 +-
 pkgs/development/python-modules/onkyo-eiscp/default.nix         | 2 +-
 pkgs/development/python-modules/openidc-client/default.nix      | 2 +-
 pkgs/development/python-modules/oset/default.nix                | 2 +-
 pkgs/development/python-modules/overly/default.nix              | 2 +-
 pkgs/development/python-modules/packbits/default.nix            | 2 +-
 pkgs/development/python-modules/pandas-datareader/default.nix   | 2 +-
 pkgs/development/python-modules/pandoc-attributes/default.nix   | 2 +-
 pkgs/development/python-modules/papis-python-rofi/default.nix   | 2 +-
 pkgs/development/python-modules/parsley/default.nix             | 2 +-
 pkgs/development/python-modules/pastel/default.nix              | 2 +-
 pkgs/development/python-modules/pathtools/default.nix           | 2 +-
 pkgs/development/python-modules/pbkdf2/default.nix              | 2 +-
 pkgs/development/python-modules/pdfkit/default.nix              | 2 +-
 pkgs/development/python-modules/pdfrw/default.nix               | 2 +-
 pkgs/development/python-modules/pep8/default.nix                | 2 +-
 pkgs/development/python-modules/peppercorn/default.nix          | 2 +-
 pkgs/development/python-modules/pexif/default.nix               | 2 +-
 pkgs/development/python-modules/pgpdump/default.nix             | 2 +-
 pkgs/development/python-modules/phpserialize/default.nix        | 2 +-
 pkgs/development/python-modules/pickleshare/default.nix         | 2 +-
 pkgs/development/python-modules/pid/default.nix                 | 2 +-
 pkgs/development/python-modules/pika-pool/default.nix           | 2 +-
 pkgs/development/python-modules/pillowfight/default.nix         | 2 +-
 pkgs/development/python-modules/pixcat/default.nix              | 2 +-
 pkgs/development/python-modules/plugnplay/default.nix           | 2 +-
 pkgs/development/python-modules/ply/default.nix                 | 2 +-
 pkgs/development/python-modules/plyplus/default.nix             | 2 +-
 pkgs/development/python-modules/pmsensor/default.nix            | 2 +-
 pkgs/development/python-modules/pocket/default.nix              | 2 +-
 pkgs/development/python-modules/ponywhoosh/default.nix          | 2 +-
 pkgs/development/python-modules/potr/default.nix                | 2 +-
 pkgs/development/python-modules/power/default.nix               | 2 +-
 .../python-modules/powerline-mem-segment/default.nix            | 2 +-
 pkgs/development/python-modules/poyo/default.nix                | 2 +-
 pkgs/development/python-modules/preggy/default.nix              | 2 +-
 pkgs/development/python-modules/priority/default.nix            | 2 +-
 pkgs/development/python-modules/progressbar/default.nix         | 2 +-
 pkgs/development/python-modules/progressbar33/default.nix       | 2 +-
 pkgs/development/python-modules/protobuf3-to-dict/default.nix   | 2 +-
 pkgs/development/python-modules/pure-python-adb/default.nix     | 2 +-
 pkgs/development/python-modules/pushbullet-py/default.nix       | 2 +-
 pkgs/development/python-modules/pweave/default.nix              | 2 +-
 .../python-modules/py-air-control-exporter/default.nix          | 2 +-
 pkgs/development/python-modules/py-lru-cache/default.nix        | 2 +-
 pkgs/development/python-modules/py/default.nix                  | 2 +-
 pkgs/development/python-modules/pyaes/default.nix               | 2 +-
 pkgs/development/python-modules/pyalgotrade/default.nix         | 2 +-
 pkgs/development/python-modules/pycayennelpp/default.nix        | 2 +-
 pkgs/development/python-modules/pycflow2dot/default.nix         | 2 +-
 pkgs/development/python-modules/pychm/default.nix               | 2 +-
 pkgs/development/python-modules/pycosat/default.nix             | 2 +-
 pkgs/development/python-modules/pydenticon/default.nix          | 2 +-
 pkgs/development/python-modules/pydocumentdb/default.nix        | 2 +-
 pkgs/development/python-modules/pydoods/default.nix             | 2 +-
 pkgs/development/python-modules/pyepsg/default.nix              | 2 +-
 pkgs/development/python-modules/pyfakewebcam/default.nix        | 2 +-
 pkgs/development/python-modules/pyfreedompro/default.nix        | 2 +-
 pkgs/development/python-modules/pyfttt/default.nix              | 2 +-
 .../python-modules/pygments-markdown-lexer/default.nix          | 2 +-
 pkgs/development/python-modules/pylibconfig2/default.nix        | 2 +-
 pkgs/development/python-modules/pymacaroons/default.nix         | 2 +-
 pkgs/development/python-modules/pymemoize/default.nix           | 2 +-
 pkgs/development/python-modules/pyment/default.nix              | 2 +-
 pkgs/development/python-modules/pymysqlsa/default.nix           | 2 +-
 pkgs/development/python-modules/pync/default.nix                | 2 +-
 pkgs/development/python-modules/pynzb/default.nix               | 2 +-
 pkgs/development/python-modules/pyombi/default.nix              | 2 +-
 pkgs/development/python-modules/pypblib/default.nix             | 2 +-
 pkgs/development/python-modules/pypca/default.nix               | 2 +-
 pkgs/development/python-modules/pypeg2/default.nix              | 2 +-
 pkgs/development/python-modules/pyprind/default.nix             | 2 +-
 pkgs/development/python-modules/pyptlib/default.nix             | 2 +-
 pkgs/development/python-modules/pyqrcode/default.nix            | 2 +-
 pkgs/development/python-modules/pyrabbit2/default.nix           | 2 +-
 pkgs/development/python-modules/pyramid-mako/default.nix        | 2 +-
 pkgs/development/python-modules/pyro-api/default.nix            | 2 +-
 pkgs/development/python-modules/pyrss2gen/default.nix           | 2 +-
 pkgs/development/python-modules/pyschedule/default.nix          | 2 +-
 pkgs/development/python-modules/pyscrypt/default.nix            | 2 +-
 pkgs/development/python-modules/pysdcp/default.nix              | 2 +-
 pkgs/development/python-modules/pysftp/default.nix              | 2 +-
 pkgs/development/python-modules/pysigset/default.nix            | 2 +-
 pkgs/development/python-modules/pysingleton/default.nix         | 2 +-
 pkgs/development/python-modules/pysmf/default.nix               | 2 +-
 pkgs/development/python-modules/pysocks/default.nix             | 2 +-
 pkgs/development/python-modules/pyspice/default.nix             | 2 +-
 pkgs/development/python-modules/pysqlitecipher/default.nix      | 2 +-
 pkgs/development/python-modules/pysychonaut/default.nix         | 2 +-
 pkgs/development/python-modules/pytabix/default.nix             | 2 +-
 pkgs/development/python-modules/pytankerkoenig/default.nix      | 2 +-
 .../python-modules/pytest-astropy-header/default.nix            | 2 +-
 pkgs/development/python-modules/pytest-catchlog/default.nix     | 2 +-
 pkgs/development/python-modules/pytest-dotenv/default.nix       | 2 +-
 pkgs/development/python-modules/pytest-expect/default.nix       | 2 +-
 pkgs/development/python-modules/pytest-flakes/default.nix       | 2 +-
 .../python-modules/pytest-helpers-namespace/default.nix         | 2 +-
 pkgs/development/python-modules/pytest-lazy-fixture/default.nix | 2 +-
 pkgs/development/python-modules/pytest-tornado/default.nix      | 2 +-
 pkgs/development/python-modules/pytest-warnings/default.nix     | 2 +-
 pkgs/development/python-modules/pytest-watch/default.nix        | 2 +-
 pkgs/development/python-modules/pytestcache/default.nix         | 2 +-
 .../python-modules/python-axolotl-curve25519/default.nix        | 2 +-
 pkgs/development/python-modules/python-axolotl/default.nix      | 2 +-
 pkgs/development/python-modules/python-baseconv/default.nix     | 2 +-
 pkgs/development/python-modules/python-ldap-test/default.nix    | 2 +-
 pkgs/development/python-modules/python-mnist/default.nix        | 2 +-
 pkgs/development/python-modules/python-oauth2/default.nix       | 2 +-
 pkgs/development/python-modules/python-packer/default.nix       | 2 +-
 pkgs/development/python-modules/python-pipedrive/default.nix    | 2 +-
 pkgs/development/python-modules/python-prctl/default.nix        | 2 +-
 pkgs/development/python-modules/python-status/default.nix       | 2 +-
 pkgs/development/python-modules/python-u2flib-host/default.nix  | 2 +-
 pkgs/development/python-modules/python-wink/default.nix         | 2 +-
 pkgs/development/python-modules/python3-openid/default.nix      | 2 +-
 pkgs/development/python-modules/pythondialog/default.nix        | 2 +-
 pkgs/development/python-modules/pytidylib/default.nix           | 2 +-
 pkgs/development/python-modules/pytransportnsw/default.nix      | 2 +-
 .../python-modules/pytz-deprecation-shim/default.nix            | 2 +-
 pkgs/development/python-modules/pyunifi/default.nix             | 2 +-
 pkgs/development/python-modules/pyverilog/default.nix           | 2 +-
 pkgs/development/python-modules/pyxeoma/default.nix             | 2 +-
 pkgs/development/python-modules/qt5reactor/default.nix          | 2 +-
 pkgs/development/python-modules/random2/default.nix             | 2 +-
 pkgs/development/python-modules/ratelim/default.nix             | 2 +-
 pkgs/development/python-modules/rawkit/default.nix              | 2 +-
 pkgs/development/python-modules/readme/default.nix              | 2 +-
 pkgs/development/python-modules/requestsexceptions/default.nix  | 2 +-
 pkgs/development/python-modules/retry/default.nix               | 2 +-
 pkgs/development/python-modules/rfc3339-validator/default.nix   | 2 +-
 pkgs/development/python-modules/rfc3339/default.nix             | 2 +-
 pkgs/development/python-modules/rfc3987/default.nix             | 2 +-
 pkgs/development/python-modules/rfc7464/default.nix             | 2 +-
 pkgs/development/python-modules/ritassist/default.nix           | 2 +-
 pkgs/development/python-modules/rmcl/default.nix                | 2 +-
 pkgs/development/python-modules/robot-detection/default.nix     | 2 +-
 .../python-modules/robotframework-selenium2library/default.nix  | 2 +-
 .../python-modules/robotframework-sshlibrary/default.nix        | 2 +-
 pkgs/development/python-modules/rocket-errbot/default.nix       | 2 +-
 pkgs/development/python-modules/routes/default.nix              | 2 +-
 pkgs/development/python-modules/rtmidi-python/default.nix       | 2 +-
 pkgs/development/python-modules/ruamel-base/default.nix         | 2 +-
 pkgs/development/python-modules/rx/default.nix                  | 2 +-
 pkgs/development/python-modules/s2clientprotocol/default.nix    | 2 +-
 pkgs/development/python-modules/safeio/default.nix              | 2 +-
 pkgs/development/python-modules/samsungctl/default.nix          | 2 +-
 pkgs/development/python-modules/sane/default.nix                | 2 +-
 pkgs/development/python-modules/sansio-multipart/default.nix    | 2 +-
 pkgs/development/python-modules/sarif-om/default.nix            | 2 +-
 pkgs/development/python-modules/scour/default.nix               | 2 +-
 pkgs/development/python-modules/sdnotify/default.nix            | 2 +-
 pkgs/development/python-modules/secp256k1/default.nix           | 2 +-
 pkgs/development/python-modules/serpy/default.nix               | 2 +-
 pkgs/development/python-modules/serverlessrepo/default.nix      | 2 +-
 pkgs/development/python-modules/simplegeneric/default.nix       | 2 +-
 pkgs/development/python-modules/simplekml/default.nix           | 2 +-
 pkgs/development/python-modules/sleepyq/default.nix             | 2 +-
 pkgs/development/python-modules/smbus-cffi/default.nix          | 2 +-
 pkgs/development/python-modules/smdebug-rulesconfig/default.nix | 2 +-
 pkgs/development/python-modules/snapshottest/default.nix        | 2 +-
 pkgs/development/python-modules/sockjs-tornado/default.nix      | 2 +-
 pkgs/development/python-modules/socksipy-branch/default.nix     | 2 +-
 pkgs/development/python-modules/speaklater/default.nix          | 2 +-
 pkgs/development/python-modules/speaklater3/default.nix         | 2 +-
 pkgs/development/python-modules/speedtest-cli/default.nix       | 2 +-
 pkgs/development/python-modules/sphinx-comments/default.nix     | 2 +-
 pkgs/development/python-modules/sphinx-serve/default.nix        | 2 +-
 pkgs/development/python-modules/sphinx-testing/default.nix      | 2 +-
 .../python-modules/sphinxcontrib-blockdiag/default.nix          | 2 +-
 pkgs/development/python-modules/strategies/default.nix          | 2 +-
 pkgs/development/python-modules/strict-rfc3339/default.nix      | 2 +-
 pkgs/development/python-modules/stytra/default.nix              | 2 +-
 .../python-modules/telethon-session-sqlalchemy/default.nix      | 2 +-
 .../python-modules/tensorboard-plugin-wit/default.nix           | 2 +-
 pkgs/development/python-modules/terminaltables/default.nix      | 2 +-
 .../python-modules/testing-common-database/default.nix          | 2 +-
 pkgs/development/python-modules/testscenarios/default.nix       | 2 +-
 pkgs/development/python-modules/text-unidecode/default.nix      | 2 +-
 pkgs/development/python-modules/tflearn/default.nix             | 2 +-
 pkgs/development/python-modules/threadloop/default.nix          | 2 +-
 pkgs/development/python-modules/tidyexc/default.nix             | 2 +-
 pkgs/development/python-modules/timeout-decorator/default.nix   | 2 +-
 pkgs/development/python-modules/tlslite/default.nix             | 2 +-
 pkgs/development/python-modules/toml/default.nix                | 2 +-
 pkgs/development/python-modules/traceback2/default.nix          | 2 +-
 pkgs/development/python-modules/treelog/default.nix             | 2 +-
 pkgs/development/python-modules/twiggy/default.nix              | 2 +-
 pkgs/development/python-modules/twofish/default.nix             | 2 +-
 pkgs/development/python-modules/txamqp/default.nix              | 2 +-
 pkgs/development/python-modules/txgithub/default.nix            | 2 +-
 pkgs/development/python-modules/ukpostcodeparser/default.nix    | 2 +-
 pkgs/development/python-modules/umalqurra/default.nix           | 2 +-
 pkgs/development/python-modules/unidic-lite/default.nix         | 2 +-
 pkgs/development/python-modules/unrpa/default.nix               | 2 +-
 pkgs/development/python-modules/untokenize/default.nix          | 2 +-
 .../python-modules/uonet-request-signer-hebe/default.nix        | 2 +-
 pkgs/development/python-modules/update-checker/default.nix      | 2 +-
 pkgs/development/python-modules/uptime-kuma-monitor/default.nix | 2 +-
 pkgs/development/python-modules/urlgrabber/default.nix          | 2 +-
 pkgs/development/python-modules/vidstab/default.nix             | 2 +-
 pkgs/development/python-modules/visitor/default.nix             | 2 +-
 pkgs/development/python-modules/web/default.nix                 | 2 +-
 pkgs/development/python-modules/webencodings/default.nix        | 2 +-
 pkgs/development/python-modules/wget/default.nix                | 2 +-
 pkgs/development/python-modules/whichcraft/default.nix          | 2 +-
 pkgs/development/python-modules/zerorpc/default.nix             | 2 +-
 360 files changed, 360 insertions(+), 360 deletions(-)

diff --git a/pkgs/development/python-modules/addict/default.nix b/pkgs/development/python-modules/addict/default.nix
index a1fefe8778f0..f74236a3fca0 100644
--- a/pkgs/development/python-modules/addict/default.nix
+++ b/pkgs/development/python-modules/addict/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "b3b2210e0e067a281f5646c8c5db92e99b7231ea8b0eb5f74dbdf9e259d4e494";
+    hash = "sha256-s7IhDg4GeigfVkbIxduS6ZtyMeqLDrX3Tb354lnU5JQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/aioextensions/default.nix b/pkgs/development/python-modules/aioextensions/default.nix
index a398f256d489..9589d588b02e 100644
--- a/pkgs/development/python-modules/aioextensions/default.nix
+++ b/pkgs/development/python-modules/aioextensions/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2eacc52692495f331437e8c8e9782ca71f4617ec84f174ca17acdd77631efc47";
+    hash = "sha256-LqzFJpJJXzMUN+jI6Xgspx9GF+yE8XTKF6zdd2Me/Ec=";
   };
 
   propagatedBuildInputs = [ uvloop ];
diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix
index 9d0dc702882a..ef05c0d19037 100644
--- a/pkgs/development/python-modules/ajpy/default.nix
+++ b/pkgs/development/python-modules/ajpy/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "173wm207zyi86m2ms7vscakdi4mmjqfxqsdx1gn0j9nn0gsf241h";
+    hash = "sha256-MBDh9APWJgnsC71p3B2WtZLYpmJ6H11FNSj6f4CofJw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix
index f706962de445..8a4c132ecac9 100644
--- a/pkgs/development/python-modules/args/default.nix
+++ b/pkgs/development/python-modules/args/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814";
+    hash = "sha256-p4W42DdiXpthw5EIUy2VuFJ0rNZ5aTtx67UVaEj8+BQ=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix
index 8f367a1a15ee..4e96b8a1900d 100644
--- a/pkgs/development/python-modules/astunparse/default.nix
+++ b/pkgs/development/python-modules/astunparse/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5ad93a8456f0d084c3456d059fd9a92cce667963232cbf763eac3bc5b7940872";
+    hash = "sha256-Wtk6hFbw0ITDRW0Fn9mpLM5meWMjLL92Pqw7xbeUCHI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix
index 62333d77a3a5..62327d7620ab 100644
--- a/pkgs/development/python-modules/asynctest/default.nix
+++ b/pkgs/development/python-modules/asynctest/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b3zsy7p84gag6q8ai2ylyrhx213qdk2h2zb6im3xn0m5n264y62";
+    hash = "sha256-wnhihC0V2D5qNOsLKGbDI4gOs6deRIWweeoRdI/Xf6w=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
index e5af60f7de31..c4c05e437270 100644
--- a/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-commerce/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "6f5447395503b2318f451d24f8021ee08db1cac44f1c3337ea690700419626b6";
+    hash = "sha256-b1RHOVUDsjGPRR0k+AIe4I2xysRPHDM36mkHAEGWJrY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix
index 30837b47b0d4..32416c3a828e 100644
--- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "c93b7550e64b6734bf23ce57ca974a3ea929b734c58d1fe3669728c4fd2d2eb3";
+    hash = "sha256-yTt1UOZLZzS/I85XypdKPqkptzTFjR/jZpcoxP0tLrM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/backcall/default.nix b/pkgs/development/python-modules/backcall/default.nix
index ca1f30956a1c..86d0b839e159 100644
--- a/pkgs/development/python-modules/backcall/default.nix
+++ b/pkgs/development/python-modules/backcall/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e";
+    hash = "sha256-XL2/J75efPrbRIuvCqlVCPkfK7xsZDfNnNBuKkwhXh4=";
   };
 
   nativeCheckInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/banal/default.nix b/pkgs/development/python-modules/banal/default.nix
index 4e73816480f2..f3931d0961f1 100644
--- a/pkgs/development/python-modules/banal/default.nix
+++ b/pkgs/development/python-modules/banal/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2fe02c9305f53168441948f4a03dfbfa2eacc73db30db4a93309083cb0e250a5";
+    hash = "sha256-L+AskwX1MWhEGUj0oD37+i6sxz2zDbSpMwkIPLDiUKU=";
   };
 
   # no tests
diff --git a/pkgs/development/python-modules/bme280spi/default.nix b/pkgs/development/python-modules/bme280spi/default.nix
index 52105a65838a..2bcf8b165477 100644
--- a/pkgs/development/python-modules/bme280spi/default.nix
+++ b/pkgs/development/python-modules/bme280spi/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "51682acefda6f29eaaf9f37815edbfdd48ef0e9f1509419eceafe7b440eddc6e";
+    hash = "sha256-UWgqzv2m8p6q+fN4Fe2/3UjvDp8VCUGezq/ntEDt3G4=";
   };
 
   propagatedBuildInputs = [ spidev ];
diff --git a/pkgs/development/python-modules/braceexpand/default.nix b/pkgs/development/python-modules/braceexpand/default.nix
index 5b7ae81a3251..6c650ac5a53f 100644
--- a/pkgs/development/python-modules/braceexpand/default.nix
+++ b/pkgs/development/python-modules/braceexpand/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "01gpcnksnqv6np28i4x8s3wkngawzgs99zvjfia57spa42ykkrg6";
+    hash = "sha256-5uU5vSDq6lNUdHL/lPT7XD07+dCok4jEtWZjq6dl9wU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/bwapy/default.nix b/pkgs/development/python-modules/bwapy/default.nix
index 6de156ff9d2e..b4b80eb964e4 100644
--- a/pkgs/development/python-modules/bwapy/default.nix
+++ b/pkgs/development/python-modules/bwapy/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "090qwx3vl729zn3a7sksbviyg04kc71gpbm3nd8dalqp673x1npw";
+    hash = "sha256-/NrQxzEXU9VQs6Ou+8Jhk4Dn41566qOG/UkcukfnGCQ=";
   };
   postPatch = ''
     # replace bundled bwa
diff --git a/pkgs/development/python-modules/casttube/default.nix b/pkgs/development/python-modules/casttube/default.nix
index f13a3e9d2923..5c0aa5354126 100644
--- a/pkgs/development/python-modules/casttube/default.nix
+++ b/pkgs/development/python-modules/casttube/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "10pw2sjy648pvp42lbbdmkkx79bqlkq1xcbzp1frraj9g66azljl";
+    hash = "sha256-VNKvjHlJqpxduH+xHvCkeKXT56xtLSrI3RcR46UW/II=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/cbor/default.nix b/pkgs/development/python-modules/cbor/default.nix
index 3f9052f2139b..bb995c3d523c 100644
--- a/pkgs/development/python-modules/cbor/default.nix
+++ b/pkgs/development/python-modules/cbor/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "1dmv163cnslyqccrybkxn0c9s1jk1mmafmgxv75iamnz5lk5l8hk";
+    hash = "sha256-EyJaJi3fVhXL2f1Vp2oNUwadGLB9Lp8Zw55qy4YJu7Y=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix
index 7a60c30ca71d..7b8cd956b5e8 100644
--- a/pkgs/development/python-modules/chainmap/default.nix
+++ b/pkgs/development/python-modules/chainmap/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e42aaa4b3e2f66102a11bfd563069704bfbfd84fdcb517b564effd736bf53cd9";
+    hash = "sha256-5CqqSz4vZhAqEb/VYwaXBL+/2E/ctRe1ZO/9c2v1PNk=";
   };
 
   # Requires tox
diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix
index 9c2399d5e161..6619c6512d54 100644
--- a/pkgs/development/python-modules/colorama/default.nix
+++ b/pkgs/development/python-modules/colorama/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44";
+    hash = "sha256-CGlfXLftbgUxogVyaXKXJzxHuMrlpj/8bW7VwgG+bkQ=";
   };
 
   nativeBuildInputs = [ hatchling ];
diff --git a/pkgs/development/python-modules/colorclass/default.nix b/pkgs/development/python-modules/colorclass/default.nix
index 2efa1a0b95b1..738617ed0150 100644
--- a/pkgs/development/python-modules/colorclass/default.nix
+++ b/pkgs/development/python-modules/colorclass/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6d4fe287766166a98ca7bc6f6312daf04a0481b1eda43e7173484051c0ab4366";
+    hash = "sha256-bU/ih3ZhZqmMp7xvYxLa8EoEgbHtpD5xc0hAUcCrQ2Y=";
   };
 
   # No tests in archive
diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix
index 1f92211953ca..a56a39f6caa5 100644
--- a/pkgs/development/python-modules/cram/default.nix
+++ b/pkgs/development/python-modules/cram/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0bvz6fwdi55rkrz3f50zsy35gvvwhlppki2yml5bj5ffy9d499vx";
+    hash = "sha256-fadEWvLOFbkKrV7EeS+FfO9XhtcfFDd+nrmU2Lgzfy8=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/cx-oracle/default.nix b/pkgs/development/python-modules/cx-oracle/default.nix
index e5b5ad0cec64..6005a0e69934 100644
--- a/pkgs/development/python-modules/cx-oracle/default.nix
+++ b/pkgs/development/python-modules/cx-oracle/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "cx_Oracle";
     inherit version;
-    sha256 = "3b2d215af4441463c97ea469b9cc307460739f89fdfa8ea222ea3518f1a424d9";
+    hash = "sha256-Oy0hWvREFGPJfqRpucwwdGBzn4n9+o6iIuo1GPGkJNk=";
   };
 
   preConfigure = ''
diff --git a/pkgs/development/python-modules/cxxfilt/default.nix b/pkgs/development/python-modules/cxxfilt/default.nix
index bce948304e9d..249bb6338ca1 100644
--- a/pkgs/development/python-modules/cxxfilt/default.nix
+++ b/pkgs/development/python-modules/cxxfilt/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7df6464ba5e8efbf0d8974c0b2c78b32546676f06059a83515dbdfa559b34214";
+    hash = "sha256-ffZGS6Xo778NiXTAsseLMlRmdvBgWag1FdvfpVmzQhQ=";
   };
 
   postPatch =
diff --git a/pkgs/development/python-modules/dbglib/default.nix b/pkgs/development/python-modules/dbglib/default.nix
index e53b235267fe..1977cbe01b27 100644
--- a/pkgs/development/python-modules/dbglib/default.nix
+++ b/pkgs/development/python-modules/dbglib/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   pyproject = true;
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7b4fd5c4949af435a7ab558f87b406acd5ddf9dc7f01fc3b3e99ebcec9a4674c";
+    hash = "sha256-e0/VxJSa9DWnq1WPh7QGrNXd+dx/Afw7PpnrzsmkZ0w=";
   };
   propagatedBuildInputs = [ poetry-core ];
   pythonImportsCheck = [ "dbglib" ];
diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix
index 21ab1bc24df2..b1ac6b317eba 100644
--- a/pkgs/development/python-modules/deprecation/default.nix
+++ b/pkgs/development/python-modules/deprecation/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zqqjlgmhgkpzg9ss5ki8wamxl83xn51fs6gn2a8cxsx9vkbvcvj";
+    hash = "sha256-crO95k5dd4aUsM9oF4rtA9FeFUdxFq3T+3c+WB+VGP8=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/devgoldyutils/default.nix b/pkgs/development/python-modules/devgoldyutils/default.nix
index f3a757a0a2d1..0a3041a11133 100644
--- a/pkgs/development/python-modules/devgoldyutils/default.nix
+++ b/pkgs/development/python-modules/devgoldyutils/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2kGu9QPP5WqKv2gO9DAkE9SNDerzNaEDRt5DrrYD9nQ=";
+    hash = "sha256-2kGu9QPP5WqKv2gO9DAkE9SNDerzNaEDRt5DrrYD9nQ=";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix
index 9a5fa30422f9..b27e3b071c4a 100644
--- a/pkgs/development/python-modules/django-raster/default.nix
+++ b/pkgs/development/python-modules/django-raster/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "213758fe96d74be502f69f2620f7666961a85caa0551d14573637315035a9745";
+    hash = "sha256-ITdY/pbXS+UC9p8mIPdmaWGoXKoFUdFFc2NzFQNal0U=";
   };
 
   # Tests require a postgresql + postgis server
diff --git a/pkgs/development/python-modules/django-tagging/default.nix b/pkgs/development/python-modules/django-tagging/default.nix
index e211031ecaeb..5a2ca5b5d948 100644
--- a/pkgs/development/python-modules/django-tagging/default.nix
+++ b/pkgs/development/python-modules/django-tagging/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "28d68fa4831705e51ad7d1e845ed6dd9e354f9b6f8a5f63b655a430646ef4e8d";
+    hash = "sha256-KNaPpIMXBeUa19HoRe1t2eNU+bb4pfY7ZVpDBkbvTo0=";
   };
 
   # error: invalid command 'test'
diff --git a/pkgs/development/python-modules/djmail/default.nix b/pkgs/development/python-modules/djmail/default.nix
index 3e7128aeffe6..05cc11548d3a 100644
--- a/pkgs/development/python-modules/djmail/default.nix
+++ b/pkgs/development/python-modules/djmail/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cf3ce7626305d218a8bf2b6a219266ef8061aceeefc1c70a54170f4105465202";
+    hash = "sha256-zzznYmMF0hiovytqIZJm74BhrO7vwccKVBcPQQVGUgI=";
   };
 
   nativeBuildInputs = [ glibcLocales ];
diff --git a/pkgs/development/python-modules/dmenu/default.nix b/pkgs/development/python-modules/dmenu/default.nix
index aa935b7d2f61..a26b2c89c31c 100644
--- a/pkgs/development/python-modules/dmenu/default.nix
+++ b/pkgs/development/python-modules/dmenu/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "dmenu";
-    sha256 = "06v2fq0ciallbib7sbk4kncj0n3gdqp1kz8n5k2669x49wyh34wm";
+    hash = "sha256-lZMBPU+kJ2PELBb9GS5ub1ggmZ1kLn1WXJSqyAB2Yhs=";
   };
 
   propagatedBuildInputs = [ dmenu ];
diff --git a/pkgs/development/python-modules/dockerpty/default.nix b/pkgs/development/python-modules/dockerpty/default.nix
index 26b7b00ccc89..5bb5967597eb 100644
--- a/pkgs/development/python-modules/dockerpty/default.nix
+++ b/pkgs/development/python-modules/dockerpty/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1kjn64wx23jmr8dcc6g7bwlmrhfmxr77gh6iphqsl39sayfxdab9";
+    hash = "sha256-aanWnVc6DaoxvNHAd07u1cFcKV/nGcYaylUO0TkxVs4=";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/docloud/default.nix b/pkgs/development/python-modules/docloud/default.nix
index 246b06fad485..d0f250cc1bb1 100644
--- a/pkgs/development/python-modules/docloud/default.nix
+++ b/pkgs/development/python-modules/docloud/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "996d55407498fd01e6c6c480f367048f92255e9ca9db0e9ea19aaef91328a441";
+    hash = "sha256-mW1VQHSY/QHmxsSA82cEj5IlXpyp2w6eoZqu+RMopEE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/docopt/default.nix b/pkgs/development/python-modules/docopt/default.nix
index 62504275a7fd..30066c2ef3ee 100644
--- a/pkgs/development/python-modules/docopt/default.nix
+++ b/pkgs/development/python-modules/docopt/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14f4hn6d1j4b99svwbaji8n2zj58qicyz19mm0x6pmhb50jsics9";
+    hash = "sha256-SbOoJSgL1ms6qDWF71nEqMgvLIpSLb51SovI0IyFxJE=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/docrep/default.nix b/pkgs/development/python-modules/docrep/default.nix
index 2aeb00ebe324..9881a4eb85a1 100644
--- a/pkgs/development/python-modules/docrep/default.nix
+++ b/pkgs/development/python-modules/docrep/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ed8a17e201abd829ef8da78a0b6f4d51fb99a4cbd0554adbed3309297f964314";
+    hash = "sha256-7YoX4gGr2CnvjaeKC29NUfuZpMvQVUrb7TMJKX+WQxQ=";
   };
 
   nativeCheckInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/easywatch/default.nix b/pkgs/development/python-modules/easywatch/default.nix
index f20a6b7b91ca..bf07ea00279f 100644
--- a/pkgs/development/python-modules/easywatch/default.nix
+++ b/pkgs/development/python-modules/easywatch/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "1b40cjigv7s9qj8hxxy6yhwv0320z7qywrigwgkasgh80q0xgphc";
+    hash = "sha256-DN7XAQYIPq3m4y9m7vH5QAywOfTG9w6RxEmf/aJkgKw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix
index 2041bc1ce1da..28fd79b4d464 100644
--- a/pkgs/development/python-modules/edward/default.nix
+++ b/pkgs/development/python-modules/edward/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3818b39e77c26fc1a37767a74fdd5e7d02877d75ed901ead2f40bd03baaa109f";
+    hash = "sha256-OBiznnfCb8Gjd2enT91efQKHfXXtkB6tL0C9A7qqEJ8=";
   };
 
   # disabled for now due to Tensorflow trying to create files in $HOME:
diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix
index 5feaa5e35825..500ec9664711 100644
--- a/pkgs/development/python-modules/eggdeps/default.nix
+++ b/pkgs/development/python-modules/eggdeps/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "tl.eggdeps";
-    sha256 = "a094ed7961a3dd38fcaaa69cf7a58670038acdff186360166d9e3d964b7a7323";
+    hash = "sha256-oJTteWGj3Tj8qqac96WGcAOKzf8YY2AWbZ49lkt6cyM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/elevate/default.nix b/pkgs/development/python-modules/elevate/default.nix
index 225ce304ea06..a8ec60f81eec 100644
--- a/pkgs/development/python-modules/elevate/default.nix
+++ b/pkgs/development/python-modules/elevate/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "53ad19fa1de301fb1de3f8768fb3a5894215716fd96a475690c4d0ff3b1de209";
+    hash = "sha256-U60Z+h3jAfsd4/h2j7OliUIVcW/ZakdWkMTQ/zsd4gk=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/enrich/default.nix b/pkgs/development/python-modules/enrich/default.nix
index 717ba634426d..f107d0254a1f 100644
--- a/pkgs/development/python-modules/enrich/default.nix
+++ b/pkgs/development/python-modules/enrich/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0a2ab0d2931dff8947012602d1234d2a3ee002d9a355b5d70be6bf5466008893";
+    hash = "sha256-Ciqw0pMd/4lHASYC0SNNKj7gAtmjVbXXC+a/VGYAiJM=";
   };
 
   buildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/environmental-override/default.nix b/pkgs/development/python-modules/environmental-override/default.nix
index c61823ff7a19..7e2c2145162d 100644
--- a/pkgs/development/python-modules/environmental-override/default.nix
+++ b/pkgs/development/python-modules/environmental-override/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vhd37i6f8xh6kd61yxc2ynzgcln7v2p7fyzjmhbkdnws6gwfs6s";
+    hash = "sha256-2mjHn9Hctrlgld+7c8U+lrL3rRes+2DaNLAjZ+IZDe4=";
   };
 
   # No tests have been written for this library.
diff --git a/pkgs/development/python-modules/envoy-utils/default.nix b/pkgs/development/python-modules/envoy-utils/default.nix
index 126042bf9434..af4d77753a5d 100644
--- a/pkgs/development/python-modules/envoy-utils/default.nix
+++ b/pkgs/development/python-modules/envoy-utils/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "envoy_utils";
     inherit version;
-    sha256 = "13zn0d6k2a4nls9vp8cs0w07bgg4138vz18cadjadhm8p6r3bi0c";
+    hash = "sha256-DMQ1srmowqZkUwyFv9EI5L11AAeaobuTppYoMU0D9o8=";
   };
 
   propagatedBuildInputs = [ zeroconf ];
diff --git a/pkgs/development/python-modules/etesync/default.nix b/pkgs/development/python-modules/etesync/default.nix
index c5ce2cd1685e..cc21446ceeba 100644
--- a/pkgs/development/python-modules/etesync/default.nix
+++ b/pkgs/development/python-modules/etesync/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f20f7e9922ee789c4b71379676ebfe656b675913fe524f2ee722e1b9ef4e5197";
+    hash = "sha256-8g9+mSLueJxLcTeWduv+ZWtnWRP+Uk8u5yLhue9OUZc=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ewmh/default.nix b/pkgs/development/python-modules/ewmh/default.nix
index 7acff2a6b90b..b65b22f3d463 100644
--- a/pkgs/development/python-modules/ewmh/default.nix
+++ b/pkgs/development/python-modules/ewmh/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0g9l14my3v8zlgq1yd8wh5gpara0qcapsfmvg7lq2lapglzhjsy5";
+    hash = "sha256-xWsJP31XUYHpebs6fRXDQGV1X4EcNR/wox/t4SsJND0=";
   };
 
   propagatedBuildInputs = [ python-xlib ];
diff --git a/pkgs/development/python-modules/facebook-sdk/default.nix b/pkgs/development/python-modules/facebook-sdk/default.nix
index 35ce112fd918..002f0ffda20f 100644
--- a/pkgs/development/python-modules/facebook-sdk/default.nix
+++ b/pkgs/development/python-modules/facebook-sdk/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "138grz0n6plzdqgi4h6hhszf58bsvx9v76cwj51g1nd3kvkd5g6a";
+    hash = "sha256-yrzS5p6j2fBCkZyZs1PfeqHivobQQBIfbp9eY8HPD40=";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/fastdiff/default.nix b/pkgs/development/python-modules/fastdiff/default.nix
index fa48eb1dc657..eb5a820b30fe 100644
--- a/pkgs/development/python-modules/fastdiff/default.nix
+++ b/pkgs/development/python-modules/fastdiff/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4dfa09c47832a8c040acda3f1f55fc0ab4d666f0e14e6951e6da78d59acd945a";
+    hash = "sha256-TfoJxHgyqMBArNo/H1X8CrTWZvDhTmlR5tp41ZrNlFo=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/fastentrypoints/default.nix b/pkgs/development/python-modules/fastentrypoints/default.nix
index 44e9fe52cc4a..5fa528bb6224 100644
--- a/pkgs/development/python-modules/fastentrypoints/default.nix
+++ b/pkgs/development/python-modules/fastentrypoints/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02s1j8i2dzbpbwgq2a3fiqwm3cnmhii2qzc0k42l0rdxd4a4ya7z";
+    hash = "sha256-/yhPFGm9ZUAFmYB9LGKE1bJROY5uKIEfX3f9JiKSQQs=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/fiblary3-fork/default.nix b/pkgs/development/python-modules/fiblary3-fork/default.nix
index c4c2d3610b3c..d942fd0d2822 100644
--- a/pkgs/development/python-modules/fiblary3-fork/default.nix
+++ b/pkgs/development/python-modules/fiblary3-fork/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "001wqh7gx2dv3sf7a5xsbppz9r88f5qwrp05jzjsjcm6cbcvmsz0";
+    hash = "sha256-4Ou62WKmMqnllwXczHFxCOX07126F3WcHruJ/g7EPAA=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/filebrowser-safe/default.nix b/pkgs/development/python-modules/filebrowser-safe/default.nix
index 4d5b173d95fc..798ed7a70ac5 100644
--- a/pkgs/development/python-modules/filebrowser-safe/default.nix
+++ b/pkgs/development/python-modules/filebrowser-safe/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "filebrowser_safe";
     inherit version;
-    sha256 = "499c5dbd9e112dfc436cae7713b2fb664a59015021f6c9d131e3b7980aeb5c94";
+    hash = "sha256-SZxdvZ4RLfxDbK53E7L7ZkpZAVAh9snRMeO3mArrXJQ=";
   };
 
   buildInputs = [ django ];
diff --git a/pkgs/development/python-modules/firetv/default.nix b/pkgs/development/python-modules/firetv/default.nix
index 882b86fcb756..ab527d88019a 100644
--- a/pkgs/development/python-modules/firetv/default.nix
+++ b/pkgs/development/python-modules/firetv/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "602de77411c2caffb322e4ff63fa6cc4eeb9a50c5f4b14e13930ed7cd87cf513";
+    hash = "sha256-YC3ndBHCyv+zIuT/Y/psxO65pQxfSxThOTDtfNh89RM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/flake8-polyfill/default.nix b/pkgs/development/python-modules/flake8-polyfill/default.nix
index 985cd74f7b84..0e28690bba96 100644
--- a/pkgs/development/python-modules/flake8-polyfill/default.nix
+++ b/pkgs/development/python-modules/flake8-polyfill/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4";
+    hash = "sha256-5EsIdZf22lLsY5OnCecQiykFMX0MC3RM3KYgjmcNjto=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/flashtext/default.nix b/pkgs/development/python-modules/flashtext/default.nix
index 7ab7f67b7435..89fbe9bac975 100644
--- a/pkgs/development/python-modules/flashtext/default.nix
+++ b/pkgs/development/python-modules/flashtext/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1kq5idfp9skqkjdcld40igxn2yqjly8jpmxawkp0skwxw29jpgm1";
+    hash = "sha256-ob4rk+CdTw3u5KrXK5GnEnth+4uANMqanHjqdF2LBc8=";
   };
 
   # json files that tests look for don't exist in the pypi dist
diff --git a/pkgs/development/python-modules/flask-gravatar/default.nix b/pkgs/development/python-modules/flask-gravatar/default.nix
index bf5deaa02186..859234adcf85 100644
--- a/pkgs/development/python-modules/flask-gravatar/default.nix
+++ b/pkgs/development/python-modules/flask-gravatar/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Flask-Gravatar";
     inherit version;
-    sha256 = "YGZfMcLGEokdto/4Aek+06CIHGyOw0arxk0qmSP1YuE=";
+    hash = "sha256-YGZfMcLGEokdto/4Aek+06CIHGyOw0arxk0qmSP1YuE=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/flask-swagger/default.nix b/pkgs/development/python-modules/flask-swagger/default.nix
index fe84a12912df..2e2d92480e67 100644
--- a/pkgs/development/python-modules/flask-swagger/default.nix
+++ b/pkgs/development/python-modules/flask-swagger/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b4085f5bc36df4c20b6548cd1413adc9cf35719b0f0695367cd542065145294d";
+    hash = "sha256-tAhfW8Nt9MILZUjNFBOtyc81cZsPBpU2fNVCBlFFKU0=";
   };
 
   # No Tests
diff --git a/pkgs/development/python-modules/fpdf/default.nix b/pkgs/development/python-modules/fpdf/default.nix
index 4b71d8d36f39..ef468bbd6911 100644
--- a/pkgs/development/python-modules/fpdf/default.nix
+++ b/pkgs/development/python-modules/fpdf/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0yb73c2clv581sgak5jvlvkj4wy3jav6ms5ia8jx3rw969w40n0j";
+    hash = "sha256-ElhAeDKJ59ElUrHoaraSw3Mi56ZblqmeDqhsygQbZ3k=";
   };
 
   # No tests available
diff --git a/pkgs/development/python-modules/fs-s3fs/default.nix b/pkgs/development/python-modules/fs-s3fs/default.nix
index 3c707f2a13f8..71ce7bfd41d3 100644
--- a/pkgs/development/python-modules/fs-s3fs/default.nix
+++ b/pkgs/development/python-modules/fs-s3fs/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b57f8c7664460ff7b451b4b44ca2ea9623a374d74e1284c2d5e6df499dc7976c";
+    hash = "sha256-tX+MdmRGD/e0UbS0TKLqliOjdNdOEoTC1ebfSZ3Hl2w=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/func-timeout/default.nix b/pkgs/development/python-modules/func-timeout/default.nix
index 8b6a09149f30..72425a4edeba 100644
--- a/pkgs/development/python-modules/func-timeout/default.nix
+++ b/pkgs/development/python-modules/func-timeout/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "func_timeout";
     inherit version;
-    sha256 = "74cd3c428ec94f4edfba81f9b2f14904846d5ffccc27c92433b8b5939b5575dd";
+    hash = "sha256-dM08Qo7JT07fuoH5svFJBIRtX/zMJ8kkM7i1k5tVdd0=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix
index fc2ae9722c9a..822acf8a6473 100644
--- a/pkgs/development/python-modules/funcsigs/default.nix
+++ b/pkgs/development/python-modules/funcsigs/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7";
+    hash = "sha256-p7sPLPOj/Rqycyy0nrpCUsKvQkBEJBW0q847hwIqj1A=";
   };
 
   # https://github.com/testing-cabal/funcsigs/issues/10
diff --git a/pkgs/development/python-modules/future-fstrings/default.nix b/pkgs/development/python-modules/future-fstrings/default.nix
index 949532f3a24a..5992fa8465fa 100644
--- a/pkgs/development/python-modules/future-fstrings/default.nix
+++ b/pkgs/development/python-modules/future-fstrings/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "future_fstrings";
-    sha256 = "6cf41cbe97c398ab5a81168ce0dbb8ad95862d3caf23c21e4430627b90844089";
+    hash = "sha256-bPQcvpfDmKtagRaM4Nu4rZWGLTyvI8IeRDBie5CEQIk=";
   };
 
   # No tests included in Pypi archive
diff --git a/pkgs/development/python-modules/future-typing/default.nix b/pkgs/development/python-modules/future-typing/default.nix
index 0dcd260c118c..572cc5feafcf 100644
--- a/pkgs/development/python-modules/future-typing/default.nix
+++ b/pkgs/development/python-modules/future-typing/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "future_typing";
     inherit version;
-    sha256 = "65fdc5034a95db212790fee5e977fb0a2df8deb60dccf3bac17d6d2b1a9bbacd";
+    hash = "sha256-Zf3FA0qV2yEnkP7l6Xf7Ci343rYNzPO6wX1tKxqbus0=";
   };
 
   doCheck = false; # No tests in pypi source. Did not get tests from GitHub source to work.
diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix
index 12708a956184..21b3fc9d7f7b 100644
--- a/pkgs/development/python-modules/fuzzywuzzy/default.nix
+++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     inherit (finalAttrs) version;
     pname = "fuzzywuzzy";
-    sha256 = "1s00zn75y2dkxgnbw8kl8dw4p1mc77cv78fwfa4yb0274s96w0a5";
+    hash = "sha256-RQFukiZHgOWJctyhs9k5rIZLeEN0Ir7s67MJX479AOg=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/genome-collector/default.nix b/pkgs/development/python-modules/genome-collector/default.nix
index c36f1fa31bdb..a805e5f8fc38 100644
--- a/pkgs/development/python-modules/genome-collector/default.nix
+++ b/pkgs/development/python-modules/genome-collector/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "genome_collector";
     inherit version;
-    sha256 = "0023ihrz0waxbhq28xh1ymvk51ih882y9psg4glm6s9d1zmqvdph";
+    hash = "sha256-8LaN6w8taVPpI0/f5AVCMIYyd/UBdiQwXF1x8DOMQwA=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/genzshcomp/default.nix b/pkgs/development/python-modules/genzshcomp/default.nix
index 3050aa77188b..e423e920fa26 100644
--- a/pkgs/development/python-modules/genzshcomp/default.nix
+++ b/pkgs/development/python-modules/genzshcomp/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "b582910d36f9ad0992756d7e9ccbe3e5cf811934b1002b51f25b99d3dda9d573";
+    hash = "sha256-tYKRDTb5rQmSdW1+nMvj5c+BGTSxACtR8luZ092p1XM=";
   };
 
   buildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/geoip/default.nix b/pkgs/development/python-modules/geoip/default.nix
index d2af48f5049f..0886b4e4dd15 100644
--- a/pkgs/development/python-modules/geoip/default.nix
+++ b/pkgs/development/python-modules/geoip/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "GeoIP";
     inherit version;
-    sha256 = "1rphxf3vrn8wywjgr397f49s0s22m83lpwcq45lm0h2p45mdm458";
+    hash = "sha256-qJDaaiFXQFBpIZjxSweqQmigE3Enjfwk9xzZvIfr8OY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/getkey/default.nix b/pkgs/development/python-modules/getkey/default.nix
index a4c6e406f49b..380677b9c47b 100644
--- a/pkgs/development/python-modules/getkey/default.nix
+++ b/pkgs/development/python-modules/getkey/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ng0ihfagh9g8hral0bq5nhjlp3csqghyv3z8b7ylkdkqc1cgiv8";
+    hash = "sha256-aMfHAsOzTerPQn9sDx/WbFwqoS14AaoyRC/BpxyM4Fk=";
   };
 
   # disable coverage, because we don't care and python-coveralls is not in nixpkgs
diff --git a/pkgs/development/python-modules/gflags/default.nix b/pkgs/development/python-modules/gflags/default.nix
index 312822f8de76..7ab964ac498b 100644
--- a/pkgs/development/python-modules/gflags/default.nix
+++ b/pkgs/development/python-modules/gflags/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "40ae131e899ef68e9e14aa53ca063839c34f6a168afe622217b5b875492a1ee2";
+    hash = "sha256-QK4THome9o6eFKpTygY4OcNPahaK/mIiF7W4dUkqHuI=";
   };
 
   nativeCheckInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/ghdiff/default.nix b/pkgs/development/python-modules/ghdiff/default.nix
index f200f0e17e5c..387054a3eb69 100644
--- a/pkgs/development/python-modules/ghdiff/default.nix
+++ b/pkgs/development/python-modules/ghdiff/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17mdhi2sq9017nq8rkjhhc87djpi5z99xiil0xz17dyplr7nmkqk";
+    hash = "sha256-E89qT6bXtxN+BzTGntIv8cp2EINQzoywPQEkrEWErZ4=";
   };
 
   nativeCheckInputs = [ zope-testrunner ];
diff --git a/pkgs/development/python-modules/github-webhook/default.nix b/pkgs/development/python-modules/github-webhook/default.nix
index 6db61b55c9bb..91f6bbba0c38 100644
--- a/pkgs/development/python-modules/github-webhook/default.nix
+++ b/pkgs/development/python-modules/github-webhook/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "b2444dbfd03deda35792bd00ebd1692597c2605c61445da79da6322afaca7a8d";
+    hash = "sha256-skRNv9A97aNXkr0A69FpJZfCYFxhRF2nnaYyKvrKeo0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/glob2/default.nix b/pkgs/development/python-modules/glob2/default.nix
index f72a9f2977b2..278a3554accf 100644
--- a/pkgs/development/python-modules/glob2/default.nix
+++ b/pkgs/development/python-modules/glob2/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "135bj8gm6vn45vv0phrvhyir36kfm17y7kmasxinv8lagk8dphw5";
+    hash = "sha256-hcPb0HyKom1j16rO40+obpqRo4c7wwv2LsRuUx+Sq4w=";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/gntp/default.nix b/pkgs/development/python-modules/gntp/default.nix
index 62acd02f7284..cba4b764293b 100644
--- a/pkgs/development/python-modules/gntp/default.nix
+++ b/pkgs/development/python-modules/gntp/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1q6scs8lp84v0aph6b5c9jhv51rhq2vmzpdd38db92ybkq0g597l";
+    hash = "sha256-9KTyAJ7Li7QaGq3dX7fAMIeyoUysLAOvApugS5Fm2uA=";
   };
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/halo/default.nix b/pkgs/development/python-modules/halo/default.nix
index 9750b7686691..1497e8616e56 100644
--- a/pkgs/development/python-modules/halo/default.nix
+++ b/pkgs/development/python-modules/halo/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "1mn97h370ggbc9vi6x8r6akd5q8i512y6kid2nvm67g93r9a6rvv";
+    hash = "sha256-e2ejUh7pHVO3FS1O40UoEeHSpjIZdRN3Yus9cAY8ydY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/handout/default.nix b/pkgs/development/python-modules/handout/default.nix
index fedcbf7d23cf..2d89c74f1a6d 100644
--- a/pkgs/development/python-modules/handout/default.nix
+++ b/pkgs/development/python-modules/handout/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "52daaf1f9a4cb2ceb88c1dedf85d22ef449b9422b424a2534d21f941e57bc915";
+    hash = "sha256-UtqvH5pMss64jB3t+F0i70SblCK0JKJTTSH5QeV7yRU=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hopcroftkarp/default.nix b/pkgs/development/python-modules/hopcroftkarp/default.nix
index e7a5efdc5bda..5af177bf80c5 100644
--- a/pkgs/development/python-modules/hopcroftkarp/default.nix
+++ b/pkgs/development/python-modules/hopcroftkarp/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "28a7887db81ad995ccd36a1b5164a4c542b16d2781e8c49334dc9d141968c0e7";
+    hash = "sha256-KKeIfbga2ZXM02obUWSkxUKxbSeB6MSTNNydFBlowOc=";
   };
 
   # tests fail due to bad package name
diff --git a/pkgs/development/python-modules/hsaudiotag3k/default.nix b/pkgs/development/python-modules/hsaudiotag3k/default.nix
index a0ab3f77d2b6..240f7ed7c8c6 100644
--- a/pkgs/development/python-modules/hsaudiotag3k/default.nix
+++ b/pkgs/development/python-modules/hsaudiotag3k/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ef60e9210d4727e82f0095a686cb07b676d055918f0c59c5bfa8598da03e59d1";
+    hash = "sha256-72DpIQ1HJ+gvAJWmhssHtnbQVZGPDFnFv6hZjaA+WdE=";
   };
 
   # no tests
diff --git a/pkgs/development/python-modules/httpie-ntlm/default.nix b/pkgs/development/python-modules/httpie-ntlm/default.nix
index 345df5e3ce4d..6b67a63e7c75 100644
--- a/pkgs/development/python-modules/httpie-ntlm/default.nix
+++ b/pkgs/development/python-modules/httpie-ntlm/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b1f757180c0bd60741ea16cf91fc53d47df402a5c287c4a61a14b335ea0552b3";
+    hash = "sha256-sfdXGAwL1gdB6hbPkfxT1H30AqXCh8SmGhSzNeoFUrM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix
index 9a65c1dbab5d..ef41e6ac3063 100644
--- a/pkgs/development/python-modules/httpretty/default.nix
+++ b/pkgs/development/python-modules/httpretty/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "20de0e5dd5a18292d36d928cc3d6e52f8b2ac73daec40d41eb62dee154933b68";
+    hash = "sha256-IN4OXdWhgpLTbZKMw9blL4sqxz2uxA1B62Le4VSTO2g=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix
index c21d2b0dfc91..7538b71be966 100644
--- a/pkgs/development/python-modules/humanfriendly/default.nix
+++ b/pkgs/development/python-modules/humanfriendly/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2288ddc";
+    hash = "sha256-awuDHOjxX3MAchqkmCn8ToOSGpowHMf2Br5mhqIojdw=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/hypchat/default.nix b/pkgs/development/python-modules/hypchat/default.nix
index 3842d10d8dca..0df6dad57d8a 100644
--- a/pkgs/development/python-modules/hypchat/default.nix
+++ b/pkgs/development/python-modules/hypchat/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1sd8f3gihagaqd848dqy6xw457fa4f9bla1bfyni7fq3h76sjdzg";
+    hash = "sha256-7zepzYEDuxOtdysoupIjyp1CeDceN0RQw+opGN9wqOk=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix
index 3bfd9a6e2ca6..898f626194e3 100644
--- a/pkgs/development/python-modules/hyperlink/default.nix
+++ b/pkgs/development/python-modules/hyperlink/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0sx50lkivsfjxx9zr4yh7l9gll2l9kvl0v0w8w4wk2x5v9bzjyj2";
+    hash = "sha256-Qnr5V9qli8kJRxxsQPdMVFD6Ej3Qk/xT79LpHScFpWs=";
   };
 
   propagatedBuildInputs = [ idna ];
diff --git a/pkgs/development/python-modules/hyperopt/default.nix b/pkgs/development/python-modules/hyperopt/default.nix
index 0ac498452801..d1f4efb48ac3 100644
--- a/pkgs/development/python-modules/hyperopt/default.nix
+++ b/pkgs/development/python-modules/hyperopt/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bf89ae58050bbd32c7307199046117feee245c2fd9ab6255c7308522b7ca149";
+    hash = "sha256-G/ia5YBQu9MscwcZkEYRf+7iRcL9mrYlXHMIUit8oUk=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/i2csense/default.nix b/pkgs/development/python-modules/i2csense/default.nix
index b41dd6426652..87e40b06a648 100644
--- a/pkgs/development/python-modules/i2csense/default.nix
+++ b/pkgs/development/python-modules/i2csense/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6f9c0a37d971e5b8a60c54982bd580cff84bf94fedc08c097e603a8e5609c33f";
+    hash = "sha256-b5wKN9lx5bimDFSYK9WAz/hL+U/twIwJfmA6jlYJwz8=";
   };
 
   propagatedBuildInputs = [ smbus-cffi ];
diff --git a/pkgs/development/python-modules/imagecodecs-lite/default.nix b/pkgs/development/python-modules/imagecodecs-lite/default.nix
index 149fb2539038..3ab214935275 100644
--- a/pkgs/development/python-modules/imagecodecs-lite/default.nix
+++ b/pkgs/development/python-modules/imagecodecs-lite/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0s4xb17qd7vimc46rafbjnibj4sf0lnv8cwl22k1h6zb7jhqmlcm";
+    hash = "sha256-ldGKoTzrGximEJQztC0FThO5opXLqWwIq3Gfhk9YnWg=";
   };
 
   nativeBuildInputs = [ cython ];
diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix
index c55b05e98510..2d07f25d3ec7 100644
--- a/pkgs/development/python-modules/imagecorruptions/default.nix
+++ b/pkgs/development/python-modules/imagecorruptions/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "044e173f24d5934899bdbf3596bfbec917e8083e507eed583ab217abebbe084d";
+    hash = "sha256-BE4XPyTVk0iZvb81lr++yRfoCD5Qfu1YOrIXq+u+CE0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/imutils/default.nix b/pkgs/development/python-modules/imutils/default.nix
index 8a1ec92d2d43..1b479cc3ec5b 100644
--- a/pkgs/development/python-modules/imutils/default.nix
+++ b/pkgs/development/python-modules/imutils/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "03827a9fca8b5c540305c0844a62591cf35a0caec199cb0f2f0a4a0fb15d8f24";
+    hash = "sha256-A4J6n8qLXFQDBcCESmJZHPNaDK7BmcsPLwpKD7FdjyQ=";
   };
 
   propagatedBuildInputs = [ opencv4 ];
diff --git a/pkgs/development/python-modules/infinity/default.nix b/pkgs/development/python-modules/infinity/default.nix
index e9ec298c3088..b8bf010372f6 100644
--- a/pkgs/development/python-modules/infinity/default.nix
+++ b/pkgs/development/python-modules/infinity/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1npcc4adcc3c9diw4kgmd5c0ikym1iz364p2zp6gs011rqaprald";
+    hash = "sha256-jap8Fc4hAP3M/eISM34M1c8IWGn1TcJjS2ww1hRh7No=";
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix
index a4b0b46ffb4a..4080d9d28031 100644
--- a/pkgs/development/python-modules/inflection/default.nix
+++ b/pkgs/development/python-modules/inflection/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1a29730d366e996aaacffb2f1f1cb9593dc38e2ddd30c91250c6dde09ea9b417";
+    hash = "sha256-GilzDTZumWqqz/svHxy5WT3Dji3dMMkSUMbd4J6ptBc=";
   };
 
   nativeCheckInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/inifile/default.nix b/pkgs/development/python-modules/inifile/default.nix
index 98e06c3108e0..0e404f9d5dac 100644
--- a/pkgs/development/python-modules/inifile/default.nix
+++ b/pkgs/development/python-modules/inifile/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d9e5eb4708ebf13353c4cfce798ad47890a8bcc5fbae04630223d15d79f55e96";
+    hash = "sha256-2eXrRwjr8TNTxM/OeYrUeJCovMX7rgRjAiPRXXn1XpY=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/iniparse/default.nix b/pkgs/development/python-modules/iniparse/default.nix
index 36efa6761449..ca7676e826fd 100644
--- a/pkgs/development/python-modules/iniparse/default.nix
+++ b/pkgs/development/python-modules/iniparse/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "932e5239d526e7acb504017bb707be67019ac428a6932368e6851691093aa842";
+    hash = "sha256-ky5SOdUm56y1BAF7twe+ZwGaxCimkyNo5oUWkQk6qEI=";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/insegel/default.nix b/pkgs/development/python-modules/insegel/default.nix
index 3100128f5ecc..196854b888fb 100644
--- a/pkgs/development/python-modules/insegel/default.nix
+++ b/pkgs/development/python-modules/insegel/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1d055dd64f6eb335580a485271511ba2f4e3b5e315f48f827f58da3cace4b4ae";
+    hash = "sha256-HQVd1k9uszVYCkhScVEbovTjteMV9I+Cf1jaPKzktK4=";
   };
 
   propagatedBuildInputs = [ pygments ];
diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix
index 4f8cfe01985a..acb943c58880 100644
--- a/pkgs/development/python-modules/interruptingcow/default.nix
+++ b/pkgs/development/python-modules/interruptingcow/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "3e8cd5058b651e625702cba53e3b1fb76d7a5ec07ab69c52a167a9f784e3306c";
+    hash = "sha256-PozVBYtlHmJXAsulPjsft216XsB6tpxSoWep94TjMGw=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix
index c7a00b3f420a..da7329935584 100644
--- a/pkgs/development/python-modules/iocapture/default.nix
+++ b/pkgs/development/python-modules/iocapture/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "86670e1808bcdcd4f70112f43da72ae766f04cd8311d1071ce6e0e0a72e37ee8";
+    hash = "sha256-hmcOGAi83NT3ARL0Pacq52bwTNgxHRBxzm4OCnLjfug=";
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/iowait/default.nix b/pkgs/development/python-modules/iowait/default.nix
index d5be45de2e26..fd09b8ca7d09 100644
--- a/pkgs/development/python-modules/iowait/default.nix
+++ b/pkgs/development/python-modules/iowait/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16djvxd9sxm7cr57clhqkyrq3xvdzgwj803sy5hwyb62hkmw46xb";
+    hash = "sha256-qxvC64TCLM9h8XoAJPn7bfeBs58YUnZKZqd2nVrfspk=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix
index 5f8c0efaa8b8..68a257021c5a 100644
--- a/pkgs/development/python-modules/ipaddr/default.nix
+++ b/pkgs/development/python-modules/ipaddr/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ml8r8z3f0mnn381qs1snbffa920i9ycp6mm2am1d3aqczkdz4j0";
+    hash = "sha256-QJLf5mdYjRaqErWay3yKQCTl3LI6aBzQsLYCNz7KiNY=";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix
index f40aadb9ef25..6f4b46a2f54e 100644
--- a/pkgs/development/python-modules/iso-639/default.nix
+++ b/pkgs/development/python-modules/iso-639/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dc9cd4b880b898d774c47fe9775167404af8a85dd889d58f9008035109acce49";
+    hash = "sha256-3JzUuIC4mNd0xH/pd1FnQEr4qF3YidWPkAgDUQmszkk=";
   };
 
   propagatedBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/iwlib/default.nix b/pkgs/development/python-modules/iwlib/default.nix
index 774845f67bf2..2c8b04f9b37b 100644
--- a/pkgs/development/python-modules/iwlib/default.nix
+++ b/pkgs/development/python-modules/iwlib/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a805f6597a70ee3001aba8f039fb7b2dcb75dc15c4e7852f5594fd6379196da1";
+    hash = "sha256-qAX2WXpw7jABq6jwOft7Lct13BXE54UvVZT9Y3kZbaE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/jaydebeapi/default.nix b/pkgs/development/python-modules/jaydebeapi/default.nix
index a8f1b072c9ee..daef2cf46196 100644
--- a/pkgs/development/python-modules/jaydebeapi/default.nix
+++ b/pkgs/development/python-modules/jaydebeapi/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "JayDeBeApi";
     inherit version;
-    sha256 = "f25e9307fbb5960cb035394c26e37731b64cc465b197c4344cee85ec450ab92f";
+    hash = "sha256-8l6TB/u1lgywNTlMJuN3MbZMxGWxl8Q0TO6F7EUKuS8=";
   };
 
   propagatedBuildInputs = [ jpype1 ];
diff --git a/pkgs/development/python-modules/jdcal/default.nix b/pkgs/development/python-modules/jdcal/default.nix
index 7303d46384de..7b894504a9f1 100644
--- a/pkgs/development/python-modules/jdcal/default.nix
+++ b/pkgs/development/python-modules/jdcal/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8";
+    hash = "sha256-Ryhy4JbrjfIZwj8mifwzZmi9tD0ZQJS1zBcH4WQKz8g=";
   };
 
   nativeCheckInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/jinja2-time/default.nix b/pkgs/development/python-modules/jinja2-time/default.nix
index 397fe292664c..fb4e0ec29808 100644
--- a/pkgs/development/python-modules/jinja2-time/default.nix
+++ b/pkgs/development/python-modules/jinja2-time/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0h0dr7cfpjnjj8bgl2vk9063a53649pn37wnlkd8hxjy656slkni";
+    hash = "sha256-0U6qTTFedojapJafYW8iZhQ1DEhzC/oWktLK69jJDUA=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/jschema-to-python/default.nix b/pkgs/development/python-modules/jschema-to-python/default.nix
index 8d4d02de48c0..b00a33c142eb 100644
--- a/pkgs/development/python-modules/jschema-to-python/default.nix
+++ b/pkgs/development/python-modules/jschema-to-python/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "jschema_to_python";
     inherit version;
-    sha256 = "76ff14fe5d304708ccad1284e4b11f96a658949a31ee7faed9e0995279549b91";
+    hash = "sha256-dv8U/l0wRwjMrRKE5LEflqZYlJox7n+u2eCZUnlUm5E=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix
index 1525888ac793..edc1ad945f28 100644
--- a/pkgs/development/python-modules/jsmin/default.nix
+++ b/pkgs/development/python-modules/jsmin/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c0959a121ef94542e807a674142606f7e90214a2b3d1eb17300244bbb5cc2bfc";
+    hash = "sha256-wJWaEh75RULoB6Z0FCYG9+kCFKKz0esXMAJEu7XMK/w=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/jsonpath-rw/default.nix b/pkgs/development/python-modules/jsonpath-rw/default.nix
index bfcdf597ae67..15590f7a6e0b 100644
--- a/pkgs/development/python-modules/jsonpath-rw/default.nix
+++ b/pkgs/development/python-modules/jsonpath-rw/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05c471281c45ae113f6103d1268ec7a4831a2e96aa80de45edc89b11fac4fbec";
+    hash = "sha256-BcRxKBxFrhE/YQPRJo7HpIMaLpaqgN5F7cibEfrE++w=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/jupyter-c-kernel/default.nix b/pkgs/development/python-modules/jupyter-c-kernel/default.nix
index 1318f265992a..3b8f37d3e561 100644
--- a/pkgs/development/python-modules/jupyter-c-kernel/default.nix
+++ b/pkgs/development/python-modules/jupyter-c-kernel/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "jupyter_c_kernel";
     inherit version;
-    sha256 = "e4b34235b42761cfc3ff08386675b2362e5a97fb926c135eee782661db08a140";
+    hash = "sha256-5LNCNbQnYc/D/wg4ZnWyNi5al/uSbBNe7ngmYdsIoUA=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/jxmlease/default.nix b/pkgs/development/python-modules/jxmlease/default.nix
index 8f7cf07d496d..84b875707fe0 100644
--- a/pkgs/development/python-modules/jxmlease/default.nix
+++ b/pkgs/development/python-modules/jxmlease/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17l3w3ak07p72s8kv8hg0ilxs0kkxjn7bfwnl3g2cw58v1siab31";
+    hash = "sha256-YSwVddiocCbeoJa7dazscwLdaQQPoj2RFuceMNXgg54=";
   };
 
   propagatedBuildInputs = [ lxml ];
diff --git a/pkgs/development/python-modules/kaa-base/default.nix b/pkgs/development/python-modules/kaa-base/default.nix
index 8796adcc56c6..121cf0910926 100644
--- a/pkgs/development/python-modules/kaa-base/default.nix
+++ b/pkgs/development/python-modules/kaa-base/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0k3zzz84wzz9q1fl3vvqr2ys96z9pcf4viq9q6s2a63zaysmcfd2";
+    hash = "sha256-ojlWtVd/GCW0wQnHTRy76Zukvch470FdwOl/TtD/f0w=";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/kaa-metadata/default.nix b/pkgs/development/python-modules/kaa-metadata/default.nix
index 5d7391452860..ed541dad0118 100644
--- a/pkgs/development/python-modules/kaa-metadata/default.nix
+++ b/pkgs/development/python-modules/kaa-metadata/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0bkbzfgxvmby8lvzkqjp86anxvv3vjd9nksv2g4l7shsk1n7y27a";
+    hash = "sha256-6gh/bJga6kPJE1tPm5rcY+9ulUFX4vk3RX7V3Z/7ay4=";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix
index 2ed4d2554e6c..55548e4bd7b3 100644
--- a/pkgs/development/python-modules/kconfiglib/default.nix
+++ b/pkgs/development/python-modules/kconfiglib/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0g690bk789hsry34y4ahvly5c8w8imca90ss4njfqf7m2qicrlmy";
+    hash = "sha256-vtLMIhb1OOykJVqDpFiNiCNWPN1QEU+GzxomdOYCyTw=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/kerberos/default.nix b/pkgs/development/python-modules/kerberos/default.nix
index 2bfa064a16c4..0c0f9f89d99e 100644
--- a/pkgs/development/python-modules/kerberos/default.nix
+++ b/pkgs/development/python-modules/kerberos/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cdd046142a4e0060f96a00eb13d82a5d9ebc0f2d7934393ed559bac773460a2c";
+    hash = "sha256-zdBGFCpOAGD5agDrE9gqXZ68Dy15NDk+1Vm6x3NGCiw=";
   };
 
   nativeBuildInputs = [ libkrb5 ];
diff --git a/pkgs/development/python-modules/keystone-engine/default.nix b/pkgs/development/python-modules/keystone-engine/default.nix
index 45dacca71297..29001fd86e70 100644
--- a/pkgs/development/python-modules/keystone-engine/default.nix
+++ b/pkgs/development/python-modules/keystone-engine/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig";
+    hash = "sha256-L3r2LasM5sJzLbtPMc+iGEqKFJ4oC5a5LrwNuExuUPU=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/langdetect/default.nix b/pkgs/development/python-modules/langdetect/default.nix
index 46e0e3fdd462..249a3ebc439b 100644
--- a/pkgs/development/python-modules/langdetect/default.nix
+++ b/pkgs/development/python-modules/langdetect/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1805svvb7xjm4sf1j7b6nc3409x37pd1xmabfwwjf1ldkzwgxhfb";
+    hash = "sha256-y8H++J+NBic5d0vVHto9oydABrNmHRmcJlX2s/bWBaA=";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/leveldb/default.nix b/pkgs/development/python-modules/leveldb/default.nix
index fd37ed3dcc0c..3f97225edd9f 100644
--- a/pkgs/development/python-modules/leveldb/default.nix
+++ b/pkgs/development/python-modules/leveldb/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cffe776842917e09f073bd6ea5856c64136aebddbe51bd17ea29913472fecbf";
+    hash = "sha256-HP/ndoQpF+CfBzvW6lhWxkE2rr3b5RvRfqKZE0cv7L8=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/lexid/default.nix b/pkgs/development/python-modules/lexid/default.nix
index 161ac4e7e02f..c2239d2355f5 100644
--- a/pkgs/development/python-modules/lexid/default.nix
+++ b/pkgs/development/python-modules/lexid/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   format = "setuptools";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "509a3a4cc926d3dbf22b203b18a4c66c25e6473fb7c0e0d30374533ac28bafe5";
+    hash = "sha256-UJo6TMkm09vyKyA7GKTGbCXmRz+3wODTA3RTOsKLr+U=";
   };
 
   prePatch = ''
diff --git a/pkgs/development/python-modules/libkeepass/default.nix b/pkgs/development/python-modules/libkeepass/default.nix
index 6d65cbcf6e2f..b60d86974e37 100644
--- a/pkgs/development/python-modules/libkeepass/default.nix
+++ b/pkgs/development/python-modules/libkeepass/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0pwg7n9xqcjia1qmz6g48h5s31slh3mxmcqag73gq4zhl4xb6bai";
+    hash = "sha256-US2zOqHwE/zGeQqz2uuAVIehC0TkmV9xUFEy3JM9j18=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/liblzfse/default.nix b/pkgs/development/python-modules/liblzfse/default.nix
index 3051713bfc80..6c08acce5af0 100644
--- a/pkgs/development/python-modules/liblzfse/default.nix
+++ b/pkgs/development/python-modules/liblzfse/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bb0b899b3830c02fdf3dbde48ea59611833f366fef836e5c32cf8145134b7d3d";
+    hash = "sha256-uwuJmzgwwC/fPb3kjqWWEYM/Nm/vg25cMs+BRRNLfT0=";
   };
 
   preBuild = ''
diff --git a/pkgs/development/python-modules/libmr/default.nix b/pkgs/development/python-modules/libmr/default.nix
index 83a29565ba88..15d5a62eedd8 100644
--- a/pkgs/development/python-modules/libmr/default.nix
+++ b/pkgs/development/python-modules/libmr/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "43ccd86693b725fa3abe648c8cdcef17ba5fa46b5528168829e5f9b968dfeb70";
+    hash = "sha256-Q8zYZpO3Jfo6vmSMjNzvF7pfpGtVKBaIKeX5uWjf63A=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/libpurecool/default.nix b/pkgs/development/python-modules/libpurecool/default.nix
index 651c5bc01ebc..2c4777d1e1d5 100644
--- a/pkgs/development/python-modules/libpurecool/default.nix
+++ b/pkgs/development/python-modules/libpurecool/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1kwbinbg0i4fca1bpx6jwa1fiw71vg0xa89jhq4pmnl5cn9c8kqx";
+    hash = "sha256-HU/EkmWF2noJhjIh1cHb4fDoguLS9LuCYo5E8JaNi88=";
   };
 
   # Remove vendorized zeroconf, https://github.com/etheralm/libpurecool/issues/33
diff --git a/pkgs/development/python-modules/limitlessled/default.nix b/pkgs/development/python-modules/limitlessled/default.nix
index 08015669fb34..29d0ba1e5030 100644
--- a/pkgs/development/python-modules/limitlessled/default.nix
+++ b/pkgs/development/python-modules/limitlessled/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0pd71wxqjvznx10brsj1sgy3420bz7awbzk9jlj422rrdxql754j";
+    hash = "sha256-kpRDcW85C0EklWn+xdX5Cwgy/NNB6rxA6PZviTsPp10=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/linecache2/default.nix b/pkgs/development/python-modules/linecache2/default.nix
index 64d45ab14422..a9ea23e38e45 100644
--- a/pkgs/development/python-modules/linecache2/default.nix
+++ b/pkgs/development/python-modules/linecache2/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0z79g3ds5wk2lvnqw0y2jpakjf32h95bd9zmnvp7dnqhf57gy9jb";
+    hash = "sha256-Syb/TnEQ23butvWntkqCYjg51ZXCA47tpmLyott46Xw=";
   };
 
   buildInputs = [ pbr ];
diff --git a/pkgs/development/python-modules/linode/default.nix b/pkgs/development/python-modules/linode/default.nix
index 58fffef62924..bff52c7f7446 100644
--- a/pkgs/development/python-modules/linode/default.nix
+++ b/pkgs/development/python-modules/linode/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "db3c2a7fab8966d903a63f16c515bff241533e4ef2d746aa7aae4a49bba5e573";
+    hash = "sha256-2zwqf6uJZtkDpj8WxRW/8kFTPk7y10aqeq5KSbul5XM=";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/linuxfd/default.nix b/pkgs/development/python-modules/linuxfd/default.nix
index 38ca284285be..1f25c540fa3c 100644
--- a/pkgs/development/python-modules/linuxfd/default.nix
+++ b/pkgs/development/python-modules/linuxfd/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b8c00109724b68e093f9b556edd78e41ed65fb8d969fd0e83186a97b5d3139b4";
+    hash = "sha256-uMABCXJLaOCT+bVW7deOQe1l+42Wn9DoMYape10xObQ=";
   };
 
   # no tests
diff --git a/pkgs/development/python-modules/logzero/default.nix b/pkgs/development/python-modules/logzero/default.nix
index 3cf5a2e8e05b..e22374236922 100644
--- a/pkgs/development/python-modules/logzero/default.nix
+++ b/pkgs/development/python-modules/logzero/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7f73ddd3ae393457236f081ffebd044a3aa2e423a47ae6ddb5179ab90d0ad082";
+    hash = "sha256-f3Pd0645NFcjbwgf/r0ESjqi5COkeubdtReauQ0K0II=";
   };
 
   nativeCheckInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/lrcalc-python/default.nix b/pkgs/development/python-modules/lrcalc-python/default.nix
index 448e07d8e2fd..73a0a68082b9 100644
--- a/pkgs/development/python-modules/lrcalc-python/default.nix
+++ b/pkgs/development/python-modules/lrcalc-python/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "lrcalc";
-    sha256 = "e3a0509aeda487b412b391a52e817ca36b5c063a8305e09fd54d53259dd6aaa9";
+    hash = "sha256-46BQmu2kh7QSs5GlLoF8o2tcBjqDBeCf1U1TJZ3Wqqk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/ltpycld2/default.nix b/pkgs/development/python-modules/ltpycld2/default.nix
index 35063a66a5be..2d78952d0acd 100644
--- a/pkgs/development/python-modules/ltpycld2/default.nix
+++ b/pkgs/development/python-modules/ltpycld2/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "LTpycld2";
     inherit version;
-    sha256 = "948d0c1ab5518ab4efcbcc3cd73bb29f809f1dfb30f4d2fbd81b175a1ffeb516";
+    hash = "sha256-lI0MGrVRirTvy8w81zuyn4CfHfsw9NL72BsXWh/+tRY=";
   };
 
   doCheck = false; # completely broken tests
diff --git a/pkgs/development/python-modules/mailcap-fix/default.nix b/pkgs/development/python-modules/mailcap-fix/default.nix
index dbad311633e9..aa465ca44a82 100644
--- a/pkgs/development/python-modules/mailcap-fix/default.nix
+++ b/pkgs/development/python-modules/mailcap-fix/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02lijkq6v379r8zkqg9q2srin3i80m4wvwik3hcbih0s14v0ng0i";
+    hash = "sha256-ETwLNgkawLgYHDPyzUkFKA4bsxY4PTw/yumMbfCUkQo=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/mailchimp/default.nix b/pkgs/development/python-modules/mailchimp/default.nix
index ba1c503193dc..5d9792f639f4 100644
--- a/pkgs/development/python-modules/mailchimp/default.nix
+++ b/pkgs/development/python-modules/mailchimp/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5227999904233a7d2e9ce5eac5225b9a5fac0318ae5107e3ed09c8bf89286768";
+    hash = "sha256-UieZmQQjOn0unOXqxSJbml+sAxiuUQfj7QnIv4koZ2g=";
   };
 
   buildInputs = [ docopt ];
diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix
index e43995df4fd5..4fcb86ae6585 100644
--- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix
+++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06cnj682ynacwpi63k1427vbf7ydnwh3dchc4b11yw8ii25wbc5d";
+    hash = "sha256-rbDFi4gRcR/CIgyyNiC3zR+39hEkzGHi5UxZL5CRlhk=";
   };
 
   propagatedBuildInputs = [ ];
diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix
index 685151184f34..d3768916c9bf 100644
--- a/pkgs/development/python-modules/markdown-macros/default.nix
+++ b/pkgs/development/python-modules/markdown-macros/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lzvrb7nci22yp21ab2qqc9p0fhkazqj29vw0wln2r4ckb2nbawv";
+    hash = "sha256-m6tlxZqMZGEpB3wnIfFXEzpwE8NYLBXE9UJEZs/K+9M=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/mattermostdriver/default.nix b/pkgs/development/python-modules/mattermostdriver/default.nix
index 82b458e87809..3636e09a2e35 100644
--- a/pkgs/development/python-modules/mattermostdriver/default.nix
+++ b/pkgs/development/python-modules/mattermostdriver/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2e4d7b4a17d3013e279c6f993746ea18cd60b45d8fa3be24f47bc2de22b9b3b4";
+    hash = "sha256-Lk17ShfTAT4nnG+ZN0bqGM1gtF2Po74k9HvC3iK5s7Q=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mergedb/default.nix b/pkgs/development/python-modules/mergedb/default.nix
index 9ec57d783e65..242ae07fe6aa 100644
--- a/pkgs/development/python-modules/mergedb/default.nix
+++ b/pkgs/development/python-modules/mergedb/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2034c18dca23456c5b166b63d94300bcd8ec9f386e6cd639c2f66e141c0313f9";
+    hash = "sha256-IDTBjcojRWxbFmtj2UMAvNjsnzhubNY5wvZuFBwDE/k=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/meshlabxml/default.nix b/pkgs/development/python-modules/meshlabxml/default.nix
index 9e9a6025390c..a96eebad0116 100644
--- a/pkgs/development/python-modules/meshlabxml/default.nix
+++ b/pkgs/development/python-modules/meshlabxml/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "MeshLabXML";
     inherit version;
-    sha256 = "1villmg46hqby5jjkkpxr5bxydr72y5b3cbfngwpyxxdljn091w8";
+    hash = "sha256-iIcErKStd3/5s26xsYoXJzffV8n9zill8QtDQ16lNO4=";
   };
 
   propagatedBuildInputs = [ ];
diff --git a/pkgs/development/python-modules/midiutil/default.nix b/pkgs/development/python-modules/midiutil/default.nix
index 1ea3b74e569d..02fb68e62f8f 100644
--- a/pkgs/development/python-modules/midiutil/default.nix
+++ b/pkgs/development/python-modules/midiutil/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "MIDIUtil";
     inherit version;
-    sha256 = "02m9sqv36zrzgz5zg2w9qmz8snzlm27yg3ways2hgipgs4xriykr";
+    hash = "sha256-efqYO9HvxgeF9oqP54+o9FuNfsWJi/fLfz9/MzbWqQo=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/milksnake/default.nix b/pkgs/development/python-modules/milksnake/default.nix
index f1d58a12b3e4..3aa6945fef36 100644
--- a/pkgs/development/python-modules/milksnake/default.nix
+++ b/pkgs/development/python-modules/milksnake/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "120nprd8lqis7x7zy72536gk2j68f7gxm8gffmx8k4ygifvl7kfz";
+    hash = "sha256-381Dt4vPk4l6de6h2t9xyEgxnxlFHP9PPzpiilq+Fog=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/mongodict/default.nix b/pkgs/development/python-modules/mongodict/default.nix
index ab8c181be343..bec376099924 100644
--- a/pkgs/development/python-modules/mongodict/default.nix
+++ b/pkgs/development/python-modules/mongodict/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0nv5amfs337m0gbxpjb0585s20rndqfc3mfrzq1iwgnds5gxcrlw";
+    hash = "sha256-nGbWX9HNPh4D/tnVwRxuNgOhCypgydvXA/WMoV1VZVs=";
   };
 
   propagatedBuildInputs = [ pymongo ];
diff --git a/pkgs/development/python-modules/monkeyhex/default.nix b/pkgs/development/python-modules/monkeyhex/default.nix
index 7c46c59609cd..f47caa3d9ea0 100644
--- a/pkgs/development/python-modules/monkeyhex/default.nix
+++ b/pkgs/development/python-modules/monkeyhex/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a646096dd3114ee8a7c6f30363f38c288ec56c4e032c8fc7e681792b604dd122";
+    hash = "sha256-pkYJbdMRTuinxvMDY/OMKI7FbE4DLI/H5oF5K2BN0SI=";
   };
 
   propagatedBuildInputs = [ future ];
diff --git a/pkgs/development/python-modules/monotonic/default.nix b/pkgs/development/python-modules/monotonic/default.nix
index fdd4cd03ca44..c9abbc9656a6 100644
--- a/pkgs/development/python-modules/monotonic/default.nix
+++ b/pkgs/development/python-modules/monotonic/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3a55207bcfed53ddd5c5bae174524062935efed17792e9de2ad0205ce9ad63f7";
+    hash = "sha256-OlUge8/tU93VxbrhdFJAYpNe/tF3kuneKtAgXOmtY/c=";
   };
 
   __propagatedImpureHostDeps = lib.optional stdenv.hostPlatform.isDarwin "/usr/lib/libc.dylib";
diff --git a/pkgs/development/python-modules/morfessor/default.nix b/pkgs/development/python-modules/morfessor/default.nix
index 0fda02a714f4..891984befc8e 100644
--- a/pkgs/development/python-modules/morfessor/default.nix
+++ b/pkgs/development/python-modules/morfessor/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Morfessor";
     inherit version;
-    sha256 = "bb3beac234341724c5f640f65803071f62373a50dba854d5a398567f9aefbab2";
+    hash = "sha256-uzvqwjQ0FyTF9kD2WAMHH2I3OlDbqFTVo5hWf5rvurI=";
   };
 
   build-system = [ setuptools_80 ];
diff --git a/pkgs/development/python-modules/mplleaflet/default.nix b/pkgs/development/python-modules/mplleaflet/default.nix
index b0c48b23892b..ec50f36431b9 100644
--- a/pkgs/development/python-modules/mplleaflet/default.nix
+++ b/pkgs/development/python-modules/mplleaflet/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "049e0b91797ce5b462853395138161fed9e8dfc1f4723f482ebb0739a0bbd289";
+    hash = "sha256-BJ4LkXl85bRihTOVE4Fh/tno38H0cj9ILrsHOaC70ok=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/mpyq/default.nix b/pkgs/development/python-modules/mpyq/default.nix
index cae321df5c0b..4186cde13a1d 100644
--- a/pkgs/development/python-modules/mpyq/default.nix
+++ b/pkgs/development/python-modules/mpyq/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01q0xh2fy3zzsrfr45d2ypj4whs7s060cy1rnprg6sg55fbgbaih";
+    hash = "sha256-MKr1livlafPytTl4BgzQR0NO5PWiFZJd1v8P7wTsAAc=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/mullvad-api/default.nix b/pkgs/development/python-modules/mullvad-api/default.nix
index 427746b9b17d..2447eb3888c5 100644
--- a/pkgs/development/python-modules/mullvad-api/default.nix
+++ b/pkgs/development/python-modules/mullvad-api/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "mullvad_api";
     inherit version;
-    sha256 = "0r0hc2d6vky52hxdqxn37w0y42ddh1zal6zz2cvqlxamc53wbiv1";
+    hash = "sha256-YcfFR2FVdYo3E/8bqn6ArQniAT/Ddtw6FMXPbZpgEGQ=";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/mulpyplexer/default.nix b/pkgs/development/python-modules/mulpyplexer/default.nix
index 0816313a567d..c52fad8047f2 100644
--- a/pkgs/development/python-modules/mulpyplexer/default.nix
+++ b/pkgs/development/python-modules/mulpyplexer/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0c5xzci1djy1yi9hxxh8g67l6ms8r7ad7ja20pv8hfbdysdrwkhl";
+    hash = "sha256-FE6em/ZtOYj2BULJ09TJSFdDj3kI9g5T9MHLFiL7vTA=";
   };
 
   # Project has no tests
diff --git a/pkgs/development/python-modules/munkres/default.nix b/pkgs/development/python-modules/munkres/default.nix
index 2c6d7906378b..45ef902b636a 100644
--- a/pkgs/development/python-modules/munkres/default.nix
+++ b/pkgs/development/python-modules/munkres/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fc44bf3c3979dada4b6b633ddeeb8ffbe8388ee9409e4d4e8310c2da1792db03";
+    hash = "sha256-/ES/PDl52tpLa2M93uuP++g4julAnk1OgxDC2heS2wM=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/musicbrainzngs/default.nix b/pkgs/development/python-modules/musicbrainzngs/default.nix
index bde6bd44e396..b4b510ced34c 100644
--- a/pkgs/development/python-modules/musicbrainzngs/default.nix
+++ b/pkgs/development/python-modules/musicbrainzngs/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "09z6k07pxncfgfc8clfmmxl2xqbd7h8x8bjzwr95hc0bzl00275b";
+    hash = "sha256-qxwBAP0LMFhS5l8u1BE8beEuaK/VUYaYe47Zfg+Y5ic=";
   };
 
   buildInputs = [ pkgs.glibcLocales ];
diff --git a/pkgs/development/python-modules/mutatormath/default.nix b/pkgs/development/python-modules/mutatormath/default.nix
index fd141dcda203..1dd4a22fd760 100644
--- a/pkgs/development/python-modules/mutatormath/default.nix
+++ b/pkgs/development/python-modules/mutatormath/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     pname = "MutatorMath";
     inherit (finalAttrs) version;
-    sha256 = "0r1qq45np49x14zz1zwkaayqrn7m8dn2jlipjldg2ihnmpzw29w1";
+    hash = "sha256-gSfB/60WRvEalTdSKWxD9diMvVKT//A/CT2RawvBOGQ=";
     extension = "zip";
   };
 
diff --git a/pkgs/development/python-modules/mutesync/default.nix b/pkgs/development/python-modules/mutesync/default.nix
index d90deaeacabc..472c1ce837d1 100644
--- a/pkgs/development/python-modules/mutesync/default.nix
+++ b/pkgs/development/python-modules/mutesync/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     pname = "mutesync";
     inherit (finalAttrs) version;
-    sha256 = "1lz3q3q9lw8qxxb8jyrak77v6hkxwi39akyx96j8hd5jjaq2k5qc";
+    hash = "sha256-DJcpsJKyNIikSd1PlUbkfUKzz5kqe4lW7xhxmvDA49M=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix
index aae9e7d86427..87c1bf82fd6d 100644
--- a/pkgs/development/python-modules/nbsmoke/default.nix
+++ b/pkgs/development/python-modules/nbsmoke/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8b55333e2face27bc7ff80c266c468ca5633947cb0697727348020dd445b0874";
+    hash = "sha256-i1UzPi+s4nvH/4DCZsRoylYzlHywaXcnNIAg3URbCHQ=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix
index 852863e1b7d9..990fe5e86425 100644
--- a/pkgs/development/python-modules/nevow/default.nix
+++ b/pkgs/development/python-modules/nevow/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Nevow";
     inherit version;
-    sha256 = "afb6ba85a5351953578c018fcdb9dfbd62f29a8d46c58bc9652bc000a27223f3";
+    hash = "sha256-r7a6haU1GVNXjAGPzbnfvWLymo1GxYvJZSvAAKJyI/M=";
   };
 
   propagatedBuildInputs = [ twisted ];
diff --git a/pkgs/development/python-modules/niluclient/default.nix b/pkgs/development/python-modules/niluclient/default.nix
index c15cdd332200..a6191824263e 100644
--- a/pkgs/development/python-modules/niluclient/default.nix
+++ b/pkgs/development/python-modules/niluclient/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "11ymn0cr4lchrcnf2xxlgljw223gwln01gxwr7mcgf95yc4006iq";
+    hash = "sha256-OBoACPMlucfqyby/ACzlbwjBJX20d+Esy5BRkhmw1Yc=";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/nixpkgs-pytools/default.nix b/pkgs/development/python-modules/nixpkgs-pytools/default.nix
index c3349704f60e..a4c384956b27 100644
--- a/pkgs/development/python-modules/nixpkgs-pytools/default.nix
+++ b/pkgs/development/python-modules/nixpkgs-pytools/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "11skcbi1lf9qcv9j5ikifb4pakhbbygqpcmv3390j7gxsa85cn19";
+    hash = "sha256-KVhWkNL9HQnSGLuyi59fC051yXJxxiLTZjg5GuJiU4c=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/notedown/default.nix b/pkgs/development/python-modules/notedown/default.nix
index 72666397f044..a17a6447a4a8 100644
--- a/pkgs/development/python-modules/notedown/default.nix
+++ b/pkgs/development/python-modules/notedown/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "36e033ebbbe5aca0fab031ffaf3611d5bc5c50237df68ff81bb95f8be353a1ee";
+    hash = "sha256-NuAz67vlrKD6sDH/rzYR1bxcUCN99o/4G7lfi+NToe4=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/notify-events/default.nix b/pkgs/development/python-modules/notify-events/default.nix
index 6a5d1a4bd07a..95882883a3d8 100644
--- a/pkgs/development/python-modules/notify-events/default.nix
+++ b/pkgs/development/python-modules/notify-events/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "notify_events";
     inherit version;
-    sha256 = "e63ba935c3300ff7f48cba115f7cb4474906e83c2e9b60b95a0881eb949701e7";
+    hash = "sha256-5jupNcMwD/f0jLoRX3y0R0kG6Dwum2C5WgiB65SXAec=";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/notify2/default.nix b/pkgs/development/python-modules/notify2/default.nix
index b2e5c33faaa4..dad15f0fe1a8 100644
--- a/pkgs/development/python-modules/notify2/default.nix
+++ b/pkgs/development/python-modules/notify2/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0z8rrv9rsg1r2qgh2dxj3dfj5xnki98kgi3w839kqby4a26i1yik";
+    hash = "sha256-M/oQjVDELzzTQHzEN1GK0/YiXRuyNwEfFjk8ndPOGX0=";
   };
 
   # Tests require Xorg and Dbus instance
diff --git a/pkgs/development/python-modules/npyscreen/default.nix b/pkgs/development/python-modules/npyscreen/default.nix
index 28031b113b4a..0600b54909d8 100644
--- a/pkgs/development/python-modules/npyscreen/default.nix
+++ b/pkgs/development/python-modules/npyscreen/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0vhjwn0dan3zmffvh80dxb4x67jysvvf1imp6pk4dsfslpwy0bk2";
+    hash = "sha256-Yi7g+aXa6UbmNbfG4PbWXh7TyeoNILidq39Y1YDlEm4=";
   };
 
   # Tests are outdated
diff --git a/pkgs/development/python-modules/ntplib/default.nix b/pkgs/development/python-modules/ntplib/default.nix
index 29844518e020..4cb6fd47f9c1 100644
--- a/pkgs/development/python-modules/ntplib/default.nix
+++ b/pkgs/development/python-modules/ntplib/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "899d8fb5f8c2555213aea95efca02934c7343df6ace9d7628a5176b176906267";
+    hash = "sha256-iZ2PtfjCVVITrqle/KApNMc0Pfas6ddiilF2sXaQYmc=";
   };
 
   # Require networking
diff --git a/pkgs/development/python-modules/nulltype/default.nix b/pkgs/development/python-modules/nulltype/default.nix
index 9588940625e3..1fa10055818e 100644
--- a/pkgs/development/python-modules/nulltype/default.nix
+++ b/pkgs/development/python-modules/nulltype/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0wpjbsmm0c9ifg9y6cnfz49qq9pa5f99nnqp6wdlv42ymfr3rak4";
+    hash = "sha256-ZKo8sqtekE0bNxdbm5Ir6iaME/nOMuPTczExUKte8nI=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/oauth2client/default.nix b/pkgs/development/python-modules/oauth2client/default.nix
index 1fa9918a4e20..c1669638e317 100644
--- a/pkgs/development/python-modules/oauth2client/default.nix
+++ b/pkgs/development/python-modules/oauth2client/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d486741e451287f69568a4d26d70d9acd73a2bbfa275746c535b4209891cccc6";
+    hash = "sha256-1IZ0HkUSh/aVaKTSbXDZrNc6K7+idXRsU1tCCYkczMY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix
index 9d063ebe463a..f35adb0de4b0 100644
--- a/pkgs/development/python-modules/odfpy/default.nix
+++ b/pkgs/development/python-modules/odfpy/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1v1qqk9p12qla85yscq2g413l3qasn6yr4ncyc934465b5p6lxnv";
+    hash = "sha256-23ZqblnFEDIS88yS7I3VCg86AnkCM+0LUhSLcNPEOOw=";
   };
 
   propagatedBuildInputs = [ defusedxml ];
diff --git a/pkgs/development/python-modules/offtrac/default.nix b/pkgs/development/python-modules/offtrac/default.nix
index 667f797ef108..689dd09a4eec 100644
--- a/pkgs/development/python-modules/offtrac/default.nix
+++ b/pkgs/development/python-modules/offtrac/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06vd010pa1z7lyfj1na30iqzffr4kzj2k2sba09spik7drlvvl56";
+    hash = "sha256-ptC9aW5nxqsTUEuLKeSfJDv3cQRD2SCdp+cHdUEAbRs=";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix
index 3401313a215f..e44c65f01604 100644
--- a/pkgs/development/python-modules/ofxparse/default.nix
+++ b/pkgs/development/python-modules/ofxparse/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19y4sp5l9jqiqzzlbqdfiab42qx7d84n4xm4s7jfq397666vcyh5";
+    hash = "sha256-BXq2jTEnDezk0aR2Yglqp2NBloqu4UX/xxHLRMvVxKc=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/onetimepad/default.nix b/pkgs/development/python-modules/onetimepad/default.nix
index affa6182b7d7..977a5bc3d1ba 100644
--- a/pkgs/development/python-modules/onetimepad/default.nix
+++ b/pkgs/development/python-modules/onetimepad/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1eaade76d8036e1cb79e944b75874bfe5ee4046a571c0724564e1721565c73fd";
+    hash = "sha256-HqredtgDbhy3npRLdYdL/l7kBGpXHAckVk4XIVZcc/0=";
   };
 
   # upstream has no tests
diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix
index 18faff5bdc27..5e59a60a41d6 100644
--- a/pkgs/development/python-modules/onkyo-eiscp/default.nix
+++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "761abb16c654a1136763b927d094174d41f282809e44ea32cd47e199dd79d9c9";
+    hash = "sha256-dhq7FsZUoRNnY7kn0JQXTUHygoCeROoyzUfhmd152ck=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix
index b5d05ab5b894..fa99dfd28053 100644
--- a/pkgs/development/python-modules/openidc-client/default.nix
+++ b/pkgs/development/python-modules/openidc-client/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "680e969cae18c30adbddd6a087ed09f6a296b4937b4c8bc69be813bdbbfa9847";
+    hash = "sha256-aA6WnK4Ywwrb3dagh+0J9qKWtJN7TIvGm+gTvbv6mEc=";
   };
   propagatedBuildInputs = [ requests ];
 
diff --git a/pkgs/development/python-modules/oset/default.nix b/pkgs/development/python-modules/oset/default.nix
index 9b0d93fd20ad..502d5a92ef8b 100644
--- a/pkgs/development/python-modules/oset/default.nix
+++ b/pkgs/development/python-modules/oset/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "017rr1m72s2fh9bmz5vrvc5mshczgzisi5894v9zkvvfr7gdf7sc";
+    hash = "sha256-TB/X3slu7/nTJgmVqON/n0FdC9t5l19Xgk5ocWrI+QQ=";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/overly/default.nix b/pkgs/development/python-modules/overly/default.nix
index 2c58410c8117..fd2ecbe0d26f 100644
--- a/pkgs/development/python-modules/overly/default.nix
+++ b/pkgs/development/python-modules/overly/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "20a99526c7859acc859e87afd97b5c4916405e7477834f727b49210e478370cb";
+    hash = "sha256-IKmVJseFmsyFnoev2XtcSRZAXnR3g09ye0khDkeDcMs=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/packbits/default.nix b/pkgs/development/python-modules/packbits/default.nix
index e6e9cffceb8b..135f86a4891e 100644
--- a/pkgs/development/python-modules/packbits/default.nix
+++ b/pkgs/development/python-modules/packbits/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bc6b370bb34e04ac8cfa835e06c0484380affc6d593adb8009dd6c0f7bfff034";
+    hash = "sha256-vGs3C7NOBKyM+oNeBsBIQ4Cv/G1ZOtuACd1sD3v/8DQ=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/pandas-datareader/default.nix b/pkgs/development/python-modules/pandas-datareader/default.nix
index 08c97850568a..c119044f09cc 100644
--- a/pkgs/development/python-modules/pandas-datareader/default.nix
+++ b/pkgs/development/python-modules/pandas-datareader/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9fc3c63d39bc0c10c2683f1c6d503ff625020383e38f6cbe14134826b454d5a6";
+    hash = "sha256-n8PGPTm8DBDCaD8cbVA/9iUCA4Pjj2y+FBNIJrRU1aY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pandoc-attributes/default.nix b/pkgs/development/python-modules/pandoc-attributes/default.nix
index 8322f3883530..3884619e7451 100644
--- a/pkgs/development/python-modules/pandoc-attributes/default.nix
+++ b/pkgs/development/python-modules/pandoc-attributes/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "69221502dac74f5df1317011ce62c85a83eef5da3b71c63b1908e98224304a8c";
+    hash = "sha256-aSIVAtrHT13xMXARzmLIWoPu9do7ccY7GQjpgiQwSow=";
   };
 
   propagatedBuildInputs = [ pandocfilters ];
diff --git a/pkgs/development/python-modules/papis-python-rofi/default.nix b/pkgs/development/python-modules/papis-python-rofi/default.nix
index c23b6cffa2a4..57c0f35fc1bf 100644
--- a/pkgs/development/python-modules/papis-python-rofi/default.nix
+++ b/pkgs/development/python-modules/papis-python-rofi/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "358e24f5fb0a86de6f15d5168753ad4cbb97e52b36b1bd7abbad4053aeb6f621";
+    hash = "sha256-NY4k9fsKht5vFdUWh1OtTLuX5Ss2sb16u61AU6629iE=";
   };
 
   # No tests existing
diff --git a/pkgs/development/python-modules/parsley/default.nix b/pkgs/development/python-modules/parsley/default.nix
index 1da008231b18..64040b003465 100644
--- a/pkgs/development/python-modules/parsley/default.nix
+++ b/pkgs/development/python-modules/parsley/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Parsley";
     inherit version;
-    sha256 = "0hcd41bl07a8sx7nmx12p16xprnblc4phxkawwmmy78n8y6jfi4l";
+    hash = "sha256-lEQnjUcWHV8r52p2eAmjy+bbTbgi9GpP10gdQFcgjUE=";
   };
   # Tests fail although the package works just fine.  Unfortunately
   # the tests as run by the upstream CI server travis.org are broken.
diff --git a/pkgs/development/python-modules/pastel/default.nix b/pkgs/development/python-modules/pastel/default.nix
index 60ac6810eea6..2fc89c13295b 100644
--- a/pkgs/development/python-modules/pastel/default.nix
+++ b/pkgs/development/python-modules/pastel/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e6581ac04e973cac858828c6202c1e1e81fee1dc7de7683f3e1ffe0bfd8a573d";
+    hash = "sha256-5lgawE6XPKyFiCjGICweHoH+4dx952g/Ph/+C/2KVz0=";
   };
 
   nativeCheckInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pathtools/default.nix b/pkgs/development/python-modules/pathtools/default.nix
index a15226a69292..c6e5bbfece64 100644
--- a/pkgs/development/python-modules/pathtools/default.nix
+++ b/pkgs/development/python-modules/pathtools/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1h7iam33vwxk8bvslfj4qlsdprdnwf8bvzhqh3jq5frr391cadbw";
+    hash = "sha256-fDXFQho5u4LlgBj+vZDjtuXbNMVEOqr3QrPzPUZV8cA=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/pbkdf2/default.nix b/pkgs/development/python-modules/pbkdf2/default.nix
index f08ecedebfaf..f6844b7a26a4 100644
--- a/pkgs/development/python-modules/pbkdf2/default.nix
+++ b/pkgs/development/python-modules/pbkdf2/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0yb99rl2mbsaamj571s1mf6vgniqh23v98k4632150hjkwv9fqxc";
+    hash = "sha256-rGOXNp8SghLEMGSitIeAONq3jatBh1NkVUqvKmhOaXk=";
   };
 
   # ImportError: No module named test
diff --git a/pkgs/development/python-modules/pdfkit/default.nix b/pkgs/development/python-modules/pdfkit/default.nix
index 13c20f2d8fd9..4e048bd18c6f 100644
--- a/pkgs/development/python-modules/pdfkit/default.nix
+++ b/pkgs/development/python-modules/pdfkit/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "992f821e1e18fc8a0e701ecae24b51a2d598296a180caee0a24c0af181da02a9";
+    hash = "sha256-mS+CHh4Y/IoOcB7K4ktRotWYKWoYDK7gokwK8YHaAqk=";
   };
 
   # tests are not distributed
diff --git a/pkgs/development/python-modules/pdfrw/default.nix b/pkgs/development/python-modules/pdfrw/default.nix
index 9e23839d6dab..9e548ee70881 100644
--- a/pkgs/development/python-modules/pdfrw/default.nix
+++ b/pkgs/development/python-modules/pdfrw/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1x1yp63lg3jxpg9igw8lh5rc51q353ifsa1bailb4qb51r54kh0d";
+    hash = "sha256-DcBJSg5lYbJoVCso7eIoA4fCcoEU8RfTu12OR4e5PvQ=";
   };
 
   # tests require the extra download of github.com/pmaupin/static_pdfs
diff --git a/pkgs/development/python-modules/pep8/default.nix b/pkgs/development/python-modules/pep8/default.nix
index 0154616fea39..4df0b3f0e63f 100644
--- a/pkgs/development/python-modules/pep8/default.nix
+++ b/pkgs/development/python-modules/pep8/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fe249b52e20498e59e0b5c5256aa52ee99fc295b26ec9eaa85776ffdb9fe6374";
+    hash = "sha256-/iSbUuIEmOWeC1xSVqpS7pn8KVsm7J6qhXdv/bn+Y3Q=";
   };
 
   # FAIL: test_checkers_testsuite (testsuite.test_all.Pep8TestCase)
diff --git a/pkgs/development/python-modules/peppercorn/default.nix b/pkgs/development/python-modules/peppercorn/default.nix
index a47eb71111ef..c0f955271ea1 100644
--- a/pkgs/development/python-modules/peppercorn/default.nix
+++ b/pkgs/development/python-modules/peppercorn/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ip4bfwcpwkq9hz2dai14k2cyabvwrnvcvrcmzxmqm04g8fnimwn";
+    hash = "sha256-ltdoHXoEVFz7ryxvtm3meynPxCQhqiY+THjyy7hb5MY=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/pexif/default.nix b/pkgs/development/python-modules/pexif/default.nix
index e5b1970b4fe3..47b66e3d599e 100644
--- a/pkgs/development/python-modules/pexif/default.nix
+++ b/pkgs/development/python-modules/pexif/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "45a3be037c7ba8b64bbfc48f3586402cc17de55bb9d7357ef2bc99954a18da3f";
+    hash = "sha256-RaO+A3x7qLZLv8SPNYZALMF95Vu51zV+8ryZlUoY2j8=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/pgpdump/default.nix b/pkgs/development/python-modules/pgpdump/default.nix
index e49def42fc4f..58b540ed1f87 100644
--- a/pkgs/development/python-modules/pgpdump/default.nix
+++ b/pkgs/development/python-modules/pgpdump/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0s4nh8h7qsdj2yf29bspjs1zvxd4lcd11r6g11dp7fppgf2h0iqw";
+    hash = "sha256-HEcAhXv3unNbCM/kEBqjpPX9g5ZXryScF7JpfCCClmg=";
   };
 
   # Disabling check because of: https://github.com/toofishes/python-pgpdump/issues/18
diff --git a/pkgs/development/python-modules/phpserialize/default.nix b/pkgs/development/python-modules/phpserialize/default.nix
index 89e7c9d30b55..c5be37d136c9 100644
--- a/pkgs/development/python-modules/phpserialize/default.nix
+++ b/pkgs/development/python-modules/phpserialize/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19qgkb9z4zjbjxlpwh2w6pxkz2j3iymnydi69jl0jg905lqjsrxz";
+    hash = "sha256-v2ctMS0gPQmoTCY2b6uPQ4o/+zVcQH5pl0t+8tOaD6c=";
   };
 
   # project does not have tests at the moment
diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/pkgs/development/python-modules/pickleshare/default.nix
index 59ae4082f783..2a7fbbbfc210 100644
--- a/pkgs/development/python-modules/pickleshare/default.nix
+++ b/pkgs/development/python-modules/pickleshare/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca";
+    hash = "sha256-h2g9R5ZcHaZc2srzHIRB0SuARM3smspQDNePwsaDr8o=";
   };
 
   propagatedBuildInputs = [ path ];
diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix
index 72a303014c9b..cba4941f14f6 100644
--- a/pkgs/development/python-modules/pid/default.nix
+++ b/pkgs/development/python-modules/pid/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0e33670e83f6a33ebb0822e43a609c3247178d4a375ff50a4689e266d853eb66";
+    hash = "sha256-DjNnDoP2oz67CCLkOmCcMkcXjUo3X/UKRoniZthT62Y=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix
index 9292a70487a2..24f050a29bc2 100644
--- a/pkgs/development/python-modules/pika-pool/default.nix
+++ b/pkgs/development/python-modules/pika-pool/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f3985888cc2788cdbd293a68a8b5702a9c955db6f7b8b551aeac91e7f32da397";
+    hash = "sha256-85hYiMwniM29KTpoqLVwKpyVXbb3uLVRrqyR5/Mto5c=";
   };
 
   pythonRelaxDeps = [ "pika" ];
diff --git a/pkgs/development/python-modules/pillowfight/default.nix b/pkgs/development/python-modules/pillowfight/default.nix
index 14c705e01808..758d7bea6e34 100644
--- a/pkgs/development/python-modules/pillowfight/default.nix
+++ b/pkgs/development/python-modules/pillowfight/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4923f4d1e78be15f19f03a608fb34ba9cb71bf5205de3c9fe7461c49078167a7";
+    hash = "sha256-SSP00eeL4V8Z8Dpgj7NLqctxv1IF3jyf50YcSQeBZ6c=";
   };
 
   propagatedBuildInputs = [ pillow ];
diff --git a/pkgs/development/python-modules/pixcat/default.nix b/pkgs/development/python-modules/pixcat/default.nix
index e2c23e5bcb33..89a37ca5fb04 100644
--- a/pkgs/development/python-modules/pixcat/default.nix
+++ b/pkgs/development/python-modules/pixcat/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "657c8fe04513caecccd6086b347aa4b85db6b4c0f761b162cb9cd789abe7abb6";
+    hash = "sha256-ZXyP4EUTyuzM1ghrNHqkuF22tMD3YbFiy5zXiavnq7Y=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/plugnplay/default.nix b/pkgs/development/python-modules/plugnplay/default.nix
index 2cc1c6a6c09d..92fb3383d498 100644
--- a/pkgs/development/python-modules/plugnplay/default.nix
+++ b/pkgs/development/python-modules/plugnplay/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "877e2d2500a45aaf31e5175f9f46182088d3e2d64c1c6b9ff6c778ae0ee594c8";
+    hash = "sha256-h34tJQCkWq8x5Rdfn0YYIIjT4tZMHGuf9sd4rg7llMg=";
   };
 
   # no tests
diff --git a/pkgs/development/python-modules/ply/default.nix b/pkgs/development/python-modules/ply/default.nix
index e4a4118bb53f..d202a27594a9 100644
--- a/pkgs/development/python-modules/ply/default.nix
+++ b/pkgs/development/python-modules/ply/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3";
+    hash = "sha256-AMfBqqiDWLnHZbbTAAxu7AukKrylNRsJUyGu9EYIHaM=";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/plyplus/default.nix b/pkgs/development/python-modules/plyplus/default.nix
index d41f45b528cb..6981af01ea74 100644
--- a/pkgs/development/python-modules/plyplus/default.nix
+++ b/pkgs/development/python-modules/plyplus/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PlyPlus";
     inherit version;
-    sha256 = "0g3flgfm3jpb2d8v9z0qmbwca5gxdqr10cs3zvlfhv5cs06ahpnp";
+    hash = "sha256-116oDNCsbOjo/kMzEDJu/RXF+KoY/LRRE+vKUd2jbjw=";
   };
 
   propagatedBuildInputs = [ ply ];
diff --git a/pkgs/development/python-modules/pmsensor/default.nix b/pkgs/development/python-modules/pmsensor/default.nix
index a13f92af4b7e..b4f1d01cd4ae 100644
--- a/pkgs/development/python-modules/pmsensor/default.nix
+++ b/pkgs/development/python-modules/pmsensor/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7fc03aafb791ca70d847c9ab97cf181bc7d8f7345efb4b0c3f66c07b9c7dee69";
+    hash = "sha256-f8A6r7eRynDYR8mrl88YG8fY9zRe+0sMP2bAe5x97mk=";
   };
 
   propagatedBuildInputs = [ pyserial ];
diff --git a/pkgs/development/python-modules/pocket/default.nix b/pkgs/development/python-modules/pocket/default.nix
index 9783da3ac051..19075a79c6a9 100644
--- a/pkgs/development/python-modules/pocket/default.nix
+++ b/pkgs/development/python-modules/pocket/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fc9vc5nyzf1kzmnrs18dmns7nn8wjfrg7br1w4c5sgs35mg2ywh";
+    hash = "sha256-kHvxahn66cIID3mdl53kyNqjbW0o6Gzrn8F9bwvbibk=";
   };
 
   buildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/ponywhoosh/default.nix b/pkgs/development/python-modules/ponywhoosh/default.nix
index 4d067f0b0af4..183d948c2a47 100644
--- a/pkgs/development/python-modules/ponywhoosh/default.nix
+++ b/pkgs/development/python-modules/ponywhoosh/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mggj9d265hra4z67qyla686qvl0cf79655cszi136gh9hqlibv9";
+    hash = "sha256-aa9IMUzwmRHi16wUk45jgG5skFHU42M+URkWI1qS79U=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/potr/default.nix b/pkgs/development/python-modules/potr/default.nix
index 7614880eae9f..f0257c9dcf2b 100644
--- a/pkgs/development/python-modules/potr/default.nix
+++ b/pkgs/development/python-modules/potr/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f95b9a7feaf8e3a6aaa898609f8a2ada55518cf52fc09152775c4c59c99b8ea6";
+    hash = "sha256-+Vuaf+r446aqqJhgn4oq2lVRjPUvwJFSd1xMWcmbjqY=";
   };
 
   propagatedBuildInputs = [ pycrypto ];
diff --git a/pkgs/development/python-modules/power/default.nix b/pkgs/development/python-modules/power/default.nix
index aef9acaf2bcf..8b1235dc9fec 100644
--- a/pkgs/development/python-modules/power/default.nix
+++ b/pkgs/development/python-modules/power/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7d7d60ec332acbe3a7d00379b45e39abf650bf7ee311d61da5ab921f52f060f0";
+    hash = "sha256-fX1g7DMqy+On0AN5tF45q/ZQv37jEdYdpauSH1LwYPA=";
   };
 
   # Tests can't work because there is no power information available.
diff --git a/pkgs/development/python-modules/powerline-mem-segment/default.nix b/pkgs/development/python-modules/powerline-mem-segment/default.nix
index faaeb8890b7f..027896814760 100644
--- a/pkgs/development/python-modules/powerline-mem-segment/default.nix
+++ b/pkgs/development/python-modules/powerline-mem-segment/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0507zw7g449zk7dcq56adcdp71inbqfdmp6y5yk4x4j7kkp6pii9";
+    hash = "sha256-KcZr7pxHkk6mL97c2hxeNoZzG2vKFMzamT8R8g7/BxQ=";
   };
 
   propagatedBuildInputs = [ psutil ];
diff --git a/pkgs/development/python-modules/poyo/default.nix b/pkgs/development/python-modules/poyo/default.nix
index dfd6d3fa8213..f1b9e8b62ecf 100644
--- a/pkgs/development/python-modules/poyo/default.nix
+++ b/pkgs/development/python-modules/poyo/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "1pflivs6j22frz0v3dqxnvc8yb8fb52g11lqr88z0i8cg2m5csg2";
+    hash = "sha256-4mlWqngMRfARypiG8ERZDi2P2LYdt7HBz04IafSO1N0=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix
index 0054e56ae73f..de1f90e46224 100644
--- a/pkgs/development/python-modules/preggy/default.nix
+++ b/pkgs/development/python-modules/preggy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "25ba803afde4f35ef543a60915ced2e634926235064df717c3cb3e4e3eb4670c";
+    hash = "sha256-JbqAOv3k8171Q6YJFc7S5jSSYjUGTfcXw8s+Tj60Zww=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/priority/default.nix b/pkgs/development/python-modules/priority/default.nix
index 7b04d731a247..bdf012a04054 100644
--- a/pkgs/development/python-modules/priority/default.nix
+++ b/pkgs/development/python-modules/priority/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0";
+    hash = "sha256-yWXVTxuNDQsZR52zkkx8Ns9nLb8q7JLUP72vRJK6GMA=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix
index 8b0abbfb3cf3..2e402803dfe3 100644
--- a/pkgs/development/python-modules/progressbar/default.nix
+++ b/pkgs/development/python-modules/progressbar/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "5d81cb529da2e223b53962afd6c8ca0f05c6670e40309a7219eacc36af9b6c63";
+    hash = "sha256-XYHLUp2i4iO1OWKv1sjKDwXGZw5AMJpyGerMNq+bbGM=";
   };
 
   # invalid command 'test'
diff --git a/pkgs/development/python-modules/progressbar33/default.nix b/pkgs/development/python-modules/progressbar33/default.nix
index 2c12014436bf..faf05a0a7a84 100644
--- a/pkgs/development/python-modules/progressbar33/default.nix
+++ b/pkgs/development/python-modules/progressbar33/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zvf6zs5hzrc03p9nfs4p16vhilqikycvv1yk0pxn8s07fdhvzji";
+    hash = "sha256-Uf4NmztAI9svmD7szfyMmEa4TbhEO5vuACx/WPQ3bv8=";
   };
 
   # no tests implemented
diff --git a/pkgs/development/python-modules/protobuf3-to-dict/default.nix b/pkgs/development/python-modules/protobuf3-to-dict/default.nix
index 7f65a21e30df..f8aa37b259dd 100644
--- a/pkgs/development/python-modules/protobuf3-to-dict/default.nix
+++ b/pkgs/development/python-modules/protobuf3-to-dict/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0nibblvj3n20zvq6d73zalbjqjby0w8ji5mim7inhn7vb9dw4hhy";
+    hash = "sha256-HkLCW1r7WGjjqbGWKBEHfkksF1V/nGbw/kDYITddK1o=";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/pure-python-adb/default.nix b/pkgs/development/python-modules/pure-python-adb/default.nix
index f920e1dc5260..6ae80a64edba 100644
--- a/pkgs/development/python-modules/pure-python-adb/default.nix
+++ b/pkgs/development/python-modules/pure-python-adb/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0kdr7w2fhgjpcf1k3l6an9im583iqkr6v8hb4q1zw30nh3bqkk0f";
+    hash = "sha256-DsyJ14AWDP4DJguibfLEcaBSY7LK0DGDY1c+6AQ/uU0=";
   };
 
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/pushbullet-py/default.nix b/pkgs/development/python-modules/pushbullet-py/default.nix
index 9ba3ea89d405..4cf23d30d849 100644
--- a/pkgs/development/python-modules/pushbullet-py/default.nix
+++ b/pkgs/development/python-modules/pushbullet-py/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "pushbullet.py";
-    sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
+    hash = "sha256-kXiD4a9KDJec5GB2s5HgJD64/gqBwIZUS8+hD1PlrmQ=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix
index 1050a5fbdb73..ad28c2da684f 100644
--- a/pkgs/development/python-modules/pweave/default.nix
+++ b/pkgs/development/python-modules/pweave/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Pweave";
     inherit version;
-    sha256 = "5e5298d90e06414a01f48e0d6aa4c36a70c5f223d929f2a9c7e2d388451c7357";
+    hash = "sha256-XlKY2Q4GQUoB9I4NaqTDanDF8iPZKfKpx+LTiEUcc1c=";
   };
 
   disabled = !isPy3k;
diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix
index 2b3290c32b94..f297564a2f82 100644
--- a/pkgs/development/python-modules/py-air-control-exporter/default.nix
+++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0cwhcyyjzc6wlj7jp5h7fcj1hl03wzrz1if3sg205kh2hfrzzlqq";
+    hash = "sha256-GNP/s4MCzgLE08PF8PPnA1AYJHMHliuPpNywL71nkDM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/py-lru-cache/default.nix b/pkgs/development/python-modules/py-lru-cache/default.nix
index d445157a3897..c9824171a13d 100644
--- a/pkgs/development/python-modules/py-lru-cache/default.nix
+++ b/pkgs/development/python-modules/py-lru-cache/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "py_lru_cache";
-    sha256 = "1w3a8l3ckl1zz0f2vlfrawl9a402r458p7xzhy4sgq8k9rl37pq2";
+    hash = "sha256-At8zaE4T4aeJh7+fiwrJAhCVKFfZ0S0c+D/QyQZFavA=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix
index 6ea8602f8d59..b20fc2f33155 100644
--- a/pkgs/development/python-modules/py/default.nix
+++ b/pkgs/development/python-modules/py/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719";
+    hash = "sha256-UcdcQSYHS0cvdGokOZrTL2BT0bNLaNL6QeVY5vSphxk=";
   };
 
   # Circular dependency on pytest
diff --git a/pkgs/development/python-modules/pyaes/default.nix b/pkgs/development/python-modules/pyaes/default.nix
index 58cd4f155081..4f04ddaca5bb 100644
--- a/pkgs/development/python-modules/pyaes/default.nix
+++ b/pkgs/development/python-modules/pyaes/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f";
+    hash = "sha256-AsGxQFw408NwsIX7lS3YvqP63O5kEa2Z8xLMEpxTbY8=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/pyalgotrade/default.nix b/pkgs/development/python-modules/pyalgotrade/default.nix
index 1b709231644e..29cf5e69824a 100644
--- a/pkgs/development/python-modules/pyalgotrade/default.nix
+++ b/pkgs/development/python-modules/pyalgotrade/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PyAlgoTrade";
     inherit version;
-    sha256 = "7927c87af202869155280a93ff6ee934bb5b46cdb1f20b70f7407337f8541cbd";
+    hash = "sha256-eSfIevIChpFVKAqT/27pNLtbRs2x8gtw90BzN/hUHL0=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pycayennelpp/default.nix b/pkgs/development/python-modules/pycayennelpp/default.nix
index e16c16e280b1..f49c6a764fca 100644
--- a/pkgs/development/python-modules/pycayennelpp/default.nix
+++ b/pkgs/development/python-modules/pycayennelpp/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cc6lz28aa57gs74767xyd3i370lwx046yb5a1nfch6fk3kf7xdx";
+    hash = "sha256-vfXj5pjOQOZsUGV5Q0DnFJwRR/P9mEOOfqcohcSnhrE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pycflow2dot/default.nix b/pkgs/development/python-modules/pycflow2dot/default.nix
index 9d0d64a94917..8edf03f7adf3 100644
--- a/pkgs/development/python-modules/pycflow2dot/default.nix
+++ b/pkgs/development/python-modules/pycflow2dot/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zm8x2pd0q6zza0fw7hg9g1qvybfnjq6ql9b8mh2fc45l7l25655";
+    hash = "sha256-pZgi6KGFMCdgRStRbLC0bvmNw0sPHu6A+t9g0K7oqP4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pychm/default.nix b/pkgs/development/python-modules/pychm/default.nix
index c450845d3e06..ff87c1e1ef29 100644
--- a/pkgs/development/python-modules/pychm/default.nix
+++ b/pkgs/development/python-modules/pychm/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0wpn9ijlsmrpyiwg3drmgz4dms1i1i347adgqw37bkrh3vn6yq16";
+    hash = "sha256-JmBv7B4wz3UGx6+pQ0YMMejayH81t/F49DdXTWVM9nI=";
   };
 
   buildInputs = [ chmlib ];
diff --git a/pkgs/development/python-modules/pycosat/default.nix b/pkgs/development/python-modules/pycosat/default.nix
index 4b633d197db1..b4deefb74afa 100644
--- a/pkgs/development/python-modules/pycosat/default.nix
+++ b/pkgs/development/python-modules/pycosat/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "4c99874946a7e939bb941bbb019dd2c20e6068e3107c91366e7779c69d70e0ed";
+    hash = "sha256-TJmHSUan6Tm7lBu7AZ3Swg5gaOMQfJE2bnd5xp1w4O0=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/pydenticon/default.nix b/pkgs/development/python-modules/pydenticon/default.nix
index 698a59f91227..a4fa74419398 100644
--- a/pkgs/development/python-modules/pydenticon/default.nix
+++ b/pkgs/development/python-modules/pydenticon/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2ef363cdd6f4f0193ce62257486027e36884570f6140bbde51de72df321b77f1";
+    hash = "sha256-LvNjzdb08Bk85iJXSGAn42iEVw9hQLveUd5y3zIbd/E=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pydocumentdb/default.nix b/pkgs/development/python-modules/pydocumentdb/default.nix
index e6e20fb38033..0567a48cf126 100644
--- a/pkgs/development/python-modules/pydocumentdb/default.nix
+++ b/pkgs/development/python-modules/pydocumentdb/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1e6f072ae516fc061c9442f8ca470463b53dc626f0f6a86ff3a803293f4b50dd";
+    hash = "sha256-Hm8HKuUW/AYclEL4ykcEY7U9xibw9qhv86gDKT9LUN0=";
   };
 
   # https://github.com/Azure/azure-cosmos-python/issues/183
diff --git a/pkgs/development/python-modules/pydoods/default.nix b/pkgs/development/python-modules/pydoods/default.nix
index ff6cf609ac2b..43b31e877b27 100644
--- a/pkgs/development/python-modules/pydoods/default.nix
+++ b/pkgs/development/python-modules/pydoods/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1brpcfj1iy9mhf2inla4gi681zlh7g4qvhr6vrprk6r693glpn3x";
+    hash = "sha256-fdhL30gmm5lv3ibDjck7kP6ATHxEURuFgzX5GKRjN68=";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/pyepsg/default.nix b/pkgs/development/python-modules/pyepsg/default.nix
index 92d0ddb22550..1f26a551c33c 100644
--- a/pkgs/development/python-modules/pyepsg/default.nix
+++ b/pkgs/development/python-modules/pyepsg/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2d08fad1e7a8b47a90a4e43da485ba95705923425aefc4e2a3efa540dbd470d7";
+    hash = "sha256-LQj60eeotHqQpOQ9pIW6lXBZI0Ja78Tio++lQNvUcNc=";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/pyfakewebcam/default.nix b/pkgs/development/python-modules/pyfakewebcam/default.nix
index c88a4e993e85..fbe21096b1fa 100644
--- a/pkgs/development/python-modules/pyfakewebcam/default.nix
+++ b/pkgs/development/python-modules/pyfakewebcam/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "152nglscxmv7600i1i2gahny5z0bybnqgq3npak8npb0lsnwxn1a";
+    hash = "sha256-KtjOraZgXYumunbgh+3yC/ziLVRPxBABMGfXzjR9VpQ=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyfreedompro/default.nix b/pkgs/development/python-modules/pyfreedompro/default.nix
index f37b6a88447e..86cd8ca45428 100644
--- a/pkgs/development/python-modules/pyfreedompro/default.nix
+++ b/pkgs/development/python-modules/pyfreedompro/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "92812070a0c74761fa0c8cac98ddbe0bca781c8de80e2b08dbd04492e831c172";
+    hash = "sha256-koEgcKDHR2H6DIysmN2+C8p4HI3oDisI29BEkugxwXI=";
   };
 
   propagatedBuildInputs = [ aiohttp ];
diff --git a/pkgs/development/python-modules/pyfttt/default.nix b/pkgs/development/python-modules/pyfttt/default.nix
index aa0c93156fc2..39b2091c8ee3 100644
--- a/pkgs/development/python-modules/pyfttt/default.nix
+++ b/pkgs/development/python-modules/pyfttt/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "10iq7c9c832ssl2xrvf62xf7znfvqzax6sq8ppsibq6wpb8dlnj5";
+    hash = "sha256-RVra0Lrc4BX1vQhr09XH29l/XBfG7dwF1VoMxBI7OII=";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix
index 451e120d3eba..9835b7babb31 100644
--- a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix
+++ b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1pzb5wy23q3fhs0rqzasjnw6hdzwjngpakb73i98cn0b8lk8q4jc";
+    hash = "sha256-TBKMJkULWIZSHGdNdZ+V/DdouJVafZyBhm7gITwv698=";
   };
 
   propagatedBuildInputs = [ pygments ];
diff --git a/pkgs/development/python-modules/pylibconfig2/default.nix b/pkgs/development/python-modules/pylibconfig2/default.nix
index 988b64430f27..a57c50f6a215 100644
--- a/pkgs/development/python-modules/pylibconfig2/default.nix
+++ b/pkgs/development/python-modules/pylibconfig2/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "1iwm11v0ghv2pq2cyvly7gdwrhxsx6iwi581fz46l0snhgcd4sqq";
+    hash = "sha256-GGvS2INWA2rIdwGVyKPpusPM2zuebs8EvmLDB3YIlcc=";
   };
 
   # tests not included in the distribution
diff --git a/pkgs/development/python-modules/pymacaroons/default.nix b/pkgs/development/python-modules/pymacaroons/default.nix
index c6a4f7f5b9fe..356c0c017275 100644
--- a/pkgs/development/python-modules/pymacaroons/default.nix
+++ b/pkgs/development/python-modules/pymacaroons/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1e6bba42a5f66c245adf38a5a4006a99dcc06a0703786ea636098667d42903b8";
+    hash = "sha256-Hmu6QqX2bCRa3zilpABqmdzAagcDeG6mNgmGZ9QpA7g=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pymemoize/default.nix b/pkgs/development/python-modules/pymemoize/default.nix
index 2a92209d671b..9fe63d10b033 100644
--- a/pkgs/development/python-modules/pymemoize/default.nix
+++ b/pkgs/development/python-modules/pymemoize/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "PyMemoize";
-    sha256 = "0yqr60hm700zph6nv8wb6yp2s0i08mahxvw98bvkmw5ijbsviiq7";
+    hash = "sha256-B8e49ZKx8Dr3QonvDlVFIAItrjeLo20NvB+AUyEwGXs=";
   };
 
   nativeCheckInputs = [ django ];
diff --git a/pkgs/development/python-modules/pyment/default.nix b/pkgs/development/python-modules/pyment/default.nix
index 023dfd740de1..09e7f514ec65 100644
--- a/pkgs/development/python-modules/pyment/default.nix
+++ b/pkgs/development/python-modules/pyment/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Pyment";
     inherit version;
-    sha256 = "951a4c52d6791ccec55bc739811169eed69917d3874f5fe722866623a697f39d";
+    hash = "sha256-lRpMUtZ5HM7FW8c5gRFp7taZF9OHT1/nIoZmI6aX850=";
   };
 
   # Tests are not included in PyPI tarball
diff --git a/pkgs/development/python-modules/pymysqlsa/default.nix b/pkgs/development/python-modules/pymysqlsa/default.nix
index e2d8503e0621..6659123b9600 100644
--- a/pkgs/development/python-modules/pymysqlsa/default.nix
+++ b/pkgs/development/python-modules/pymysqlsa/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "pymysql_sa";
-    sha256 = "a2676bce514a29b2d6ab418812259b0c2f7564150ac53455420a20bd7935314a";
+    hash = "sha256-omdrzlFKKbLWq0GIEiWbDC91ZBUKxTRVQgogvXk1MUo=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix
index 53979649277d..9799e59d02d9 100644
--- a/pkgs/development/python-modules/pync/default.nix
+++ b/pkgs/development/python-modules/pync/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "38b9e61735a3161f9211a5773c5f5ea698f36af4ff7f77fa03e8d1ff0caa117f";
+    hash = "sha256-OLnmFzWjFh+SEaV3PF9eppjzavT/f3f6A+jR/wyqEX8=";
   };
 
   nativeCheckInputs = [ which ];
diff --git a/pkgs/development/python-modules/pynzb/default.nix b/pkgs/development/python-modules/pynzb/default.nix
index da4d43d0e71b..33127f9d2f3d 100644
--- a/pkgs/development/python-modules/pynzb/default.nix
+++ b/pkgs/development/python-modules/pynzb/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0735b3889a1174bbb65418ee503629d3f5e4a63f04b16f46ffba18253ec3ef17";
+    hash = "sha256-BzWziJoRdLu2VBjuUDYp0/Xkpj8EsW9G/7oYJT7D7xc=";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/pyombi/default.nix b/pkgs/development/python-modules/pyombi/default.nix
index 90f367da2878..25a17473a3c8 100644
--- a/pkgs/development/python-modules/pyombi/default.nix
+++ b/pkgs/development/python-modules/pyombi/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ykbmdc2v05ly9q358j7g73ma9fsqdlclc8i0k1yd0bn7219icpx";
+    hash = "sha256-/bKYgjh2gebDBBExymjD2iVVx3lHojJw8rSALVira/o=";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/pypblib/default.nix b/pkgs/development/python-modules/pypblib/default.nix
index e5547b0c6a95..bc8a1d1b5ffa 100644
--- a/pkgs/development/python-modules/pypblib/default.nix
+++ b/pkgs/development/python-modules/pypblib/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qlhykm9flj6cv3v0b9q40gy21yz0lnp0wxlxvb3ijkpy45r7pbi";
+    hash = "sha256-cd2TC/F3yjjW7rRzcC0F3wfhHyA4LbDHZkZSl+r0kGI=";
   };
 
   pythonImportsCheck = [ "pypblib" ];
diff --git a/pkgs/development/python-modules/pypca/default.nix b/pkgs/development/python-modules/pypca/default.nix
index 74a81987faa8..66842df7e447 100644
--- a/pkgs/development/python-modules/pypca/default.nix
+++ b/pkgs/development/python-modules/pypca/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0y0p2rm22x21mykipiv42fjc79b0969qsbhk3cqkrdnqwh5psbdl";
+    hash = "sha256-tC19C+TYtjwxGxMujZNJYKXDpBNkxxunr0F0IWoWF3g=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pypeg2/default.nix b/pkgs/development/python-modules/pypeg2/default.nix
index 6c225f19dddd..1aeeb5956db7 100644
--- a/pkgs/development/python-modules/pypeg2/default.nix
+++ b/pkgs/development/python-modules/pypeg2/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0v8ziaam2r637v94ra4dbjw6jzxz99gs5x4i585kgag1v204yb9b";
+    hash = "sha256-Ky1PgNjhqTcLKpH0ol9Kv39puFyNqEzSPsNkUZWKH20=";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/pyprind/default.nix b/pkgs/development/python-modules/pyprind/default.nix
index 133f86677c89..dff33195e759 100644
--- a/pkgs/development/python-modules/pyprind/default.nix
+++ b/pkgs/development/python-modules/pyprind/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PyPrind";
     inherit version;
-    sha256 = "e37dcab6e1a9c8e0a7f0fce65fde7a79e2deda1c75aa015910a49e2137b54cbf";
+    hash = "sha256-433KtuGpyOCn8PzmX956eeLe2hx1qgFZEKSeITe1TL8=";
   };
 
   buildInputs = [ psutil ];
diff --git a/pkgs/development/python-modules/pyptlib/default.nix b/pkgs/development/python-modules/pyptlib/default.nix
index 98c1e46318ef..4f2dfec00291 100644
--- a/pkgs/development/python-modules/pyptlib/default.nix
+++ b/pkgs/development/python-modules/pyptlib/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01y6vbwncqb0hxlnin6whd9wrrm5my4qzjhk76fnix78v7ip515r";
+    hash = "sha256-uYRy49no9GidORPKj4mvpebMU4Pc2Ghph2BhZvnaxgc=";
   };
 
   doCheck = false; # No such file or directory errors on 32bit
diff --git a/pkgs/development/python-modules/pyqrcode/default.nix b/pkgs/development/python-modules/pyqrcode/default.nix
index 6ed1ca58e0d4..46aa2130a08b 100644
--- a/pkgs/development/python-modules/pyqrcode/default.nix
+++ b/pkgs/development/python-modules/pyqrcode/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PyQRCode";
     inherit version;
-    sha256 = "fdbf7634733e56b72e27f9bce46e4550b75a3a2c420414035cae9d9d26b234d5";
+    hash = "sha256-/b92NHM+VrcuJ/m85G5FULdaOixCBBQDXK6dnSayNNU=";
   };
 
   # No tests in PyPI tarball
diff --git a/pkgs/development/python-modules/pyrabbit2/default.nix b/pkgs/development/python-modules/pyrabbit2/default.nix
index 40515e959ea2..0101505be4a6 100644
--- a/pkgs/development/python-modules/pyrabbit2/default.nix
+++ b/pkgs/development/python-modules/pyrabbit2/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d27160cb35c096f0072df57307233d01b117a451236e136604a8e51be6f106c0";
+    hash = "sha256-0nFgyzXAlvAHLfVzByM9AbEXpFEjbhNmBKjlG+bxBsA=";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/pyramid-mako/default.nix b/pkgs/development/python-modules/pyramid-mako/default.nix
index 4644bffdba25..2d3ad5e364f6 100644
--- a/pkgs/development/python-modules/pyramid-mako/default.nix
+++ b/pkgs/development/python-modules/pyramid-mako/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0066c863441f1c3ddea60cee1ccc50d00a91a317a8052ca44131da1a12a840e2";
+    hash = "sha256-AGbIY0QfHD3epgzuHMxQ0AqRoxeoBSykQTHaGhKoQOI=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/pyro-api/default.nix b/pkgs/development/python-modules/pyro-api/default.nix
index c5f2ea37e0c8..fc96b39d302c 100644
--- a/pkgs/development/python-modules/pyro-api/default.nix
+++ b/pkgs/development/python-modules/pyro-api/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "a1b900d9580aa1c2fab3b123ab7ff33413744da7c5f440bd4aadc4d40d14d920";
+    hash = "sha256-obkA2VgKocL6s7Ejq3/zNBN0TafF9EC9Sq3E1A0U2SA=";
   };
 
   pythonImportsCheck = [ "pyroapi" ];
diff --git a/pkgs/development/python-modules/pyrss2gen/default.nix b/pkgs/development/python-modules/pyrss2gen/default.nix
index c3efd81888b0..879b137afdac 100644
--- a/pkgs/development/python-modules/pyrss2gen/default.nix
+++ b/pkgs/development/python-modules/pyrss2gen/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PyRSS2Gen";
     inherit version;
-    sha256 = "1rvf5jw9hknqz02rp1vg8abgb1lpa0bc65l7ylmlillqx7bswq3r";
+    hash = "sha256-eWCu1+mY0kgr9YcWwxZQl4b1lkJvh5sF+NhOmLgsbuc=";
   };
 
   # No tests in archive
diff --git a/pkgs/development/python-modules/pyschedule/default.nix b/pkgs/development/python-modules/pyschedule/default.nix
index a62a288704fe..8493eb3cb9fb 100644
--- a/pkgs/development/python-modules/pyschedule/default.nix
+++ b/pkgs/development/python-modules/pyschedule/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6bba9e9ea07906ce2dfe3cd847c1822b137f6b13e9f975c50b347312fd98e110";
+    hash = "sha256-a7qenqB5Bs4t/jzYR8GCKxN/axPp+XXFCzRzEv2Y4RA=";
   };
 
   propagatedBuildInputs = [ pulp ];
diff --git a/pkgs/development/python-modules/pyscrypt/default.nix b/pkgs/development/python-modules/pyscrypt/default.nix
index b6fc96296e6e..1a7291ffd885 100644
--- a/pkgs/development/python-modules/pyscrypt/default.nix
+++ b/pkgs/development/python-modules/pyscrypt/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1sd5pd5fpcdnpp4h58kdnvkf0s3afh4ssfqky2ap6z0gy6ax3zds";
+    hash = "sha256-uv3RlfEPfHOV8BM7rQl0amjg5rZtogLJvbax60q7pek=";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/pysdcp/default.nix b/pkgs/development/python-modules/pysdcp/default.nix
index 7a14902b42e8..970c4bf70e36 100644
--- a/pkgs/development/python-modules/pysdcp/default.nix
+++ b/pkgs/development/python-modules/pysdcp/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pySDCP";
     inherit version;
-    sha256 = "07396lsn610izaravqc6j5f6m0wjrzgc0d1r9dwqzj15g5zfc7wm";
+    hash = "sha256-lR/mfnklyI95Szk0wN7PkoNqXJGG4a2y+hEEYzU1aRw=";
   };
 
   # Project has no tests
diff --git a/pkgs/development/python-modules/pysftp/default.nix b/pkgs/development/python-modules/pysftp/default.nix
index 565abb80f9f3..2a2e382e4174 100644
--- a/pkgs/development/python-modules/pysftp/default.nix
+++ b/pkgs/development/python-modules/pysftp/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0jl5qix5cxzrv4lb8rfpjkpcghbkacnxkb006ikn7mkl5s05mxgv";
+    hash = "sha256-+/VagC501mNnNACs2S1Tc8HH7pTXZbQo2fl3VnrEhUo=";
   };
 
   propagatedBuildInputs = [ paramiko ];
diff --git a/pkgs/development/python-modules/pysigset/default.nix b/pkgs/development/python-modules/pysigset/default.nix
index c1d980866a54..b89f5cc3f3b5 100644
--- a/pkgs/development/python-modules/pysigset/default.nix
+++ b/pkgs/development/python-modules/pysigset/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13ef98b058489ff572b6667c38970a544699895c0844cb3ac2494e3a59ac51e6";
+    hash = "sha256-E++YsFhIn/VytmZ8OJcKVEaZiVwIRMs6wklOOlmsUeY=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/pysingleton/default.nix b/pkgs/development/python-modules/pysingleton/default.nix
index 96461a73f82d..89dcc13af04d 100644
--- a/pkgs/development/python-modules/pysingleton/default.nix
+++ b/pkgs/development/python-modules/pysingleton/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5776e7a4ba0bab26709da604f4e648c5814385fef34010723db3da0d41b0dbcc";
+    hash = "sha256-V3bnpLoLqyZwnaYE9OZIxYFDhf7zQBByPbPaDUGw28w=";
   };
 
   pythonImportsCheck = [ "singleton" ];
diff --git a/pkgs/development/python-modules/pysmf/default.nix b/pkgs/development/python-modules/pysmf/default.nix
index 3dca63ed4d39..a7f5cb31c69f 100644
--- a/pkgs/development/python-modules/pysmf/default.nix
+++ b/pkgs/development/python-modules/pysmf/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "10i7vvvdx6c3gl4afsgnpdanwgzzag087zs0fxvfipnqknazj806";
+    hash = "sha256-BiD5lZ3Y3uh2d0D/g8BT/z9uVbv2aacIfYOZ3vbeJ4I=";
   };
 
   postUnpack = ''
diff --git a/pkgs/development/python-modules/pysocks/default.nix b/pkgs/development/python-modules/pysocks/default.nix
index 6c521221391c..ae4c1b413b35 100644
--- a/pkgs/development/python-modules/pysocks/default.nix
+++ b/pkgs/development/python-modules/pysocks/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PySocks";
     inherit version;
-    sha256 = "184sg65mbmih6ljblfsxcmq5js5l7dj3gpn618w9q5dy3rbh921z";
+    hash = "sha256-P4gEVx6+FZw4CsbeN2Q7tGhZcGVdO7okNTDWVYt5mqA=";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/pyspice/default.nix b/pkgs/development/python-modules/pyspice/default.nix
index e5915c23ab4e..46de8fda30e5 100644
--- a/pkgs/development/python-modules/pyspice/default.nix
+++ b/pkgs/development/python-modules/pyspice/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PySpice";
     inherit version;
-    sha256 = "d28448accad98959e0f5932af8736e90a1f3f9ff965121c6881d24cdfca23d22";
+    hash = "sha256-0oRIrMrZiVng9ZMq+HNukKHz+f+WUSHGiB0kzfyiPSI=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pysqlitecipher/default.nix b/pkgs/development/python-modules/pysqlitecipher/default.nix
index 4fad18741729..a046a831f812 100644
--- a/pkgs/development/python-modules/pysqlitecipher/default.nix
+++ b/pkgs/development/python-modules/pysqlitecipher/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "daff63ca2719fbd698aa10f64493c4b31fb67877a8e8dbb8090e9c03a1b1a9e4";
+    hash = "sha256-2v9jyicZ+9aYqhD2RJPEsx+2eHeo6Nu4CQ6cA6GxqeQ=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pysychonaut/default.nix b/pkgs/development/python-modules/pysychonaut/default.nix
index b43101ce12ee..2e6d484269f2 100644
--- a/pkgs/development/python-modules/pysychonaut/default.nix
+++ b/pkgs/development/python-modules/pysychonaut/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PySychonaut";
     inherit version;
-    sha256 = "1wgk445gmi0x7xmd8qvnyxy1ka0n72fr6nrhzdm29q6687dqyi7h";
+    hash = "sha256-8ESP20HG4CRq+zBbk504FqgZfPd2Y9RqPx3E+goh8/E=";
   };
 
   preConfigure = ''
diff --git a/pkgs/development/python-modules/pytabix/default.nix b/pkgs/development/python-modules/pytabix/default.nix
index fe454cbfe0e1..1d9d87ce3bf8 100644
--- a/pkgs/development/python-modules/pytabix/default.nix
+++ b/pkgs/development/python-modules/pytabix/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ldp5r4ggskji6qx4bp2qxy2vrvb3fam03ksn0gq2hdxgrlg2x07";
+    hash = "sha256-B3TxaH69QYEfsHoOUJUba+ctfMfiLtKxiXLq90gut9E=";
   };
 
   buildInputs = [ zlib ];
diff --git a/pkgs/development/python-modules/pytankerkoenig/default.nix b/pkgs/development/python-modules/pytankerkoenig/default.nix
index ad5038d9280d..74446f524768 100644
--- a/pkgs/development/python-modules/pytankerkoenig/default.nix
+++ b/pkgs/development/python-modules/pytankerkoenig/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "021fg1a4n3527fz86zxfbsi0jrk0dnai1y92q6hwh5za68lrs710";
+    hash = "sha256-IBydKTLqF8ihwSL5EJVtYGYJol6uf4O+O6IMS1R4Lgg=";
   };
 
   # Tests require an API key and network access
diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix
index f53bcfb838ca..e6da9f411b49 100644
--- a/pkgs/development/python-modules/pytest-astropy-header/default.nix
+++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "77891101c94b75a8ca305453b879b318ab6001b370df02be2c0b6d1bb322db10";
+    hash = "sha256-d4kRAclLdajKMFRTuHmzGKtgAbNw3wK+LAttG7Mi2xA=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/pytest-catchlog/default.nix b/pkgs/development/python-modules/pytest-catchlog/default.nix
index 903cbfec0fab..6253f470a8fa 100644
--- a/pkgs/development/python-modules/pytest-catchlog/default.nix
+++ b/pkgs/development/python-modules/pytest-catchlog/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1w7wxh27sbqwm4jgwrjr9c2gy384aca5jzw9c0wzhl0pmk2mvqab";
+    hash = "sha256-S+FdxawXUPg5YIl/WRRTBA3/BEtZZv4kqRwvfQTs/PA=";
     extension = "zip";
   };
 
diff --git a/pkgs/development/python-modules/pytest-dotenv/default.nix b/pkgs/development/python-modules/pytest-dotenv/default.nix
index a89ebe0bd2ce..652e50faff7d 100644
--- a/pkgs/development/python-modules/pytest-dotenv/default.nix
+++ b/pkgs/development/python-modules/pytest-dotenv/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "LcbDrG2HZMccbSgE6QLQ/4EPoZaS6V/hOK78mxqnNzI=";
+    hash = "sha256-LcbDrG2HZMccbSgE6QLQ/4EPoZaS6V/hOK78mxqnNzI=";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytest-expect/default.nix b/pkgs/development/python-modules/pytest-expect/default.nix
index a21c970a3eca..7ed205a91192 100644
--- a/pkgs/development/python-modules/pytest-expect/default.nix
+++ b/pkgs/development/python-modules/pytest-expect/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "36b4462704450798197d090809a05f4e13649d9cba9acdc557ce9517da1fd847";
+    hash = "sha256-NrRGJwRFB5gZfQkICaBfThNknZy6ms3FV86VF9of2Ec=";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix
index 8f2260ec8f52..2d32fde954d3 100644
--- a/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/pkgs/development/python-modules/pytest-flakes/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "953134e97215ae31f6879fbd7368c18d43f709dc2fab5b7777db2bb2bac3a924";
+    hash = "sha256-lTE06XIVrjH2h5+9c2jBjUP3Cdwvq1t3d9srsrrDqSQ=";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
index f9b58f18bad5..49eda154559e 100644
--- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
+++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "792038247e0021beb966a7ea6e3a70ff5fcfba77eb72c6ec8fd6287af871c35b";
+    hash = "sha256-eSA4JH4AIb65Zqfqbjpw/1/Punfrcsbsj9Yoevhxw1s=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pytest-lazy-fixture/default.nix b/pkgs/development/python-modules/pytest-lazy-fixture/default.nix
index b251c4287384..8f66af9543c2 100644
--- a/pkgs/development/python-modules/pytest-lazy-fixture/default.nix
+++ b/pkgs/development/python-modules/pytest-lazy-fixture/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b0hmnsxw4s2wf9pks8dg6dfy5cx3zcbzs8517lfccxsfizhqz8f";
+    hash = "sha256-Dn0Mf3S6M+boCQXpv9gfnRXvmnkN6XmT40IT3rWtEKw=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix
index 8ca97fdad613..a30b6cc18ca0 100644
--- a/pkgs/development/python-modules/pytest-tornado/default.nix
+++ b/pkgs/development/python-modules/pytest-tornado/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cgisd7lb9q2hf55558cbn5jfhv65vsgk46ykgidzf9kqcq1kymr";
+    hash = "sha256-ufoZMMMzud/im96Q+fQuZkMni10MlVKKgwKnRU/T8bE=";
   };
 
   # package has no tests
diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/pkgs/development/python-modules/pytest-warnings/default.nix
index d79138af5f41..9336ded86fcd 100644
--- a/pkgs/development/python-modules/pytest-warnings/default.nix
+++ b/pkgs/development/python-modules/pytest-warnings/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5939f76fe04ad18297e53af0c9fb38aca1ec74db807bd40ad72733603adbbc7d";
+    hash = "sha256-WTn3b+BK0YKX5Trwyfs4rKHsdNuAe9QK1yczYDrbvH0=";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytest-watch/default.nix b/pkgs/development/python-modules/pytest-watch/default.nix
index f8bf50c9fd4e..6258cccd2af5 100644
--- a/pkgs/development/python-modules/pytest-watch/default.nix
+++ b/pkgs/development/python-modules/pytest-watch/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06136f03d5b361718b8d0d234042f7b2f203910d8568f63df2f866b547b3d4b9";
+    hash = "sha256-BhNvA9WzYXGLjQ0jQEL3svIDkQ2FaPY98vhmtUez1Lk=";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytestcache/default.nix b/pkgs/development/python-modules/pytestcache/default.nix
index 9b6be02d845f..fd6597960e21 100644
--- a/pkgs/development/python-modules/pytestcache/default.nix
+++ b/pkgs/development/python-modules/pytestcache/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1a873fihw4rhshc722j4h6j7g3nj7xpgsna9hhg3zn6ksknnhx5y";
+    hash = "sha256-vnRo7dTT2D8ehElZ/W4/0o53pIFECnEY1DATDqMbB6k=";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
index dcdb14545349..6668000984af 100644
--- a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
+++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3";
+    hash = "sha256-BwWmYpfr0vUIpg3JTiKIHHVDAeuB25OWMyL2s73LY6M=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix
index 1c0e848ebc1e..ec3f27b8ed8d 100644
--- a/pkgs/development/python-modules/python-axolotl/default.nix
+++ b/pkgs/development/python-modules/python-axolotl/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bwdp24fmriffwx91aigs9k162albb51iskp23nc939z893q23py";
+    hash = "sha256-/g6BR0I/jcTsEHfqGMpaVAkTZtIvqpA6dy7m6oi4ja8=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-baseconv/default.nix b/pkgs/development/python-modules/python-baseconv/default.nix
index ad8a7f8dcbd6..e4a823ec12fb 100644
--- a/pkgs/development/python-modules/python-baseconv/default.nix
+++ b/pkgs/development/python-modules/python-baseconv/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0539f8bd0464013b05ad62e0a1673f0ac9086c76b43ebf9f833053527cd9931b";
+    hash = "sha256-BTn4vQRkATsFrWLgoWc/CskIbHa0Pr+fgzBTUnzZkxs=";
   };
 
   pythonImportsCheck = [ "baseconv" ];
diff --git a/pkgs/development/python-modules/python-ldap-test/default.nix b/pkgs/development/python-modules/python-ldap-test/default.nix
index 176b2f7978c9..580405144e25 100644
--- a/pkgs/development/python-modules/python-ldap-test/default.nix
+++ b/pkgs/development/python-modules/python-ldap-test/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qh9x3lncaldnw79fgpqbayichs8pbz8abr6pxb5qxbs7zrnyrwf";
+    hash = "sha256-jmdv8z96dVxWvyYvhf66SEMWvVr4PpcOt40qZunoCeI=";
   };
 
   propagatedBuildInputs = [ py4j ];
diff --git a/pkgs/development/python-modules/python-mnist/default.nix b/pkgs/development/python-modules/python-mnist/default.nix
index 2bd23d7404e0..c5ce6936d4ab 100644
--- a/pkgs/development/python-modules/python-mnist/default.nix
+++ b/pkgs/development/python-modules/python-mnist/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a0cced01e83b5b844cff86109280df7a672a8e4e38fc19fa68999a17f8a9fbd8";
+    hash = "sha256-oMztAeg7W4RM/4YQkoDfemcqjk44/Bn6aJmaF/ip+9g=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix
index 518e0c926aa9..d16fc5b6976b 100644
--- a/pkgs/development/python-modules/python-oauth2/default.nix
+++ b/pkgs/development/python-modules/python-oauth2/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d7a8544927ac18215ba5317edd8f640a5f1f0593921bcf3ce862178312c8c9a4";
+    hash = "sha256-16hUSSesGCFbpTF+3Y9kCl8fBZOSG8886GIXgxLIyaQ=";
   };
   # attempts to run mysql
   doCheck = false;
diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix
index c8912328a88c..e931f0f5ce86 100644
--- a/pkgs/development/python-modules/python-packer/default.nix
+++ b/pkgs/development/python-modules/python-packer/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fd363dae9bd2efd447739bbf7a4f29c1e4741596ae7b02d252fe525b2b4176e7";
+    hash = "sha256-/TY9rpvS79RHc5u/ek8pweR0FZauewLSUv5SWytBduc=";
   };
 
   patches = fetchpatch {
diff --git a/pkgs/development/python-modules/python-pipedrive/default.nix b/pkgs/development/python-modules/python-pipedrive/default.nix
index 74edd260a94f..5759db6505fd 100644
--- a/pkgs/development/python-modules/python-pipedrive/default.nix
+++ b/pkgs/development/python-modules/python-pipedrive/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0f8qiyl82bpwxwjw2746vdvkps2010mvn1x9b6j6ppmifff2d4pl";
+    hash = "sha256-9JImnHOx3mukWakHuysIQOg7d9uGHMEl7/wugaiPGDk=";
   };
 
   propagatedBuildInputs = [ httplib2 ];
diff --git a/pkgs/development/python-modules/python-prctl/default.nix b/pkgs/development/python-modules/python-prctl/default.nix
index e5b132bb885b..996c2f30bf25 100644
--- a/pkgs/development/python-modules/python-prctl/default.nix
+++ b/pkgs/development/python-modules/python-prctl/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b4ca9a25a7d4f1ace4fffd1f3a2e64ef5208fe05f929f3edd5e27081ca7e67ce";
+    hash = "sha256-tMqaJafU8azk//0fOi5k71II/gX5KfPt1eJwgcp+Z84=";
   };
 
   buildInputs = [ libcap ];
diff --git a/pkgs/development/python-modules/python-status/default.nix b/pkgs/development/python-modules/python-status/default.nix
index f344d0d856fd..41692ee52c30 100644
--- a/pkgs/development/python-modules/python-status/default.nix
+++ b/pkgs/development/python-modules/python-status/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0lryrvmi04g7d38ilm4wfw717m0ddhylrzb5cm59lrp3ai3q572f";
+    hash = "sha256-TpyCR1TjZppKZWX9TD1sDdQTDnecVBrRaOcREOvOPlM=";
   };
 
   # Project doesn't ship tests yet
diff --git a/pkgs/development/python-modules/python-u2flib-host/default.nix b/pkgs/development/python-modules/python-u2flib-host/default.nix
index 18b97e94e811..da3c2168c758 100644
--- a/pkgs/development/python-modules/python-u2flib-host/default.nix
+++ b/pkgs/development/python-modules/python-u2flib-host/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02pwafd5kyjpc310ys0pgnd0adff1laz18naxxwsfrllqafqnrxb";
+    hash = "sha256-q2eLncKUZqd578qi8BUNzjUFmn0XaA/CYFf6WZpT/Ao=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/python-wink/default.nix b/pkgs/development/python-modules/python-wink/default.nix
index 82fa589a1a35..fd22d5211c22 100644
--- a/pkgs/development/python-modules/python-wink/default.nix
+++ b/pkgs/development/python-modules/python-wink/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1r6qabnqxyy3llnj10z60d4w9pg2zabysl3l7znpy1adss4ywxl0";
+    hash = "sha256-gHbuidZNBX/tP3RQ7Zf64t3ESQPmgyAtpcP7ju1S2OQ=";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/pkgs/development/python-modules/python3-openid/default.nix
index 6edcb500db2a..35193798609b 100644
--- a/pkgs/development/python-modules/python3-openid/default.nix
+++ b/pkgs/development/python-modules/python3-openid/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bxf9a3ny1js422j962zfzl4a9dhj192pvai05whn7j0iy9gdyrk";
+    hash = "sha256-M/v2ko9AHgt5AVHtK1KQsCVF6HdfmCSFIFoGb4dKrq8=";
   };
 
   propagatedBuildInputs = [ defusedxml ];
diff --git a/pkgs/development/python-modules/pythondialog/default.nix b/pkgs/development/python-modules/pythondialog/default.nix
index 2fb348c0ba91..61838f4aac8b 100644
--- a/pkgs/development/python-modules/pythondialog/default.nix
+++ b/pkgs/development/python-modules/pythondialog/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b2a34a8af0a6625ccbdf45cd343b854fc6c1a85231dadc80b8805db836756323";
+    hash = "sha256-sqNKivCmYlzL30XNNDuFT8bBqFIx2tyAuIBduDZ1YyM=";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/python-modules/pytidylib/default.nix b/pkgs/development/python-modules/pytidylib/default.nix
index a623602dfce6..9081d005bada 100644
--- a/pkgs/development/python-modules/pytidylib/default.nix
+++ b/pkgs/development/python-modules/pytidylib/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "22b1c8d75970d8064ff999c2369e98af1d0685417eda4c829a5c9f56764b0af3";
+    hash = "sha256-IrHI11lw2AZP+ZnCNp6Yrx0GhUF+2kyCmlyfVnZLCvM=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pytransportnsw/default.nix b/pkgs/development/python-modules/pytransportnsw/default.nix
index bc5ebb6885d1..5096f130cdd4 100644
--- a/pkgs/development/python-modules/pytransportnsw/default.nix
+++ b/pkgs/development/python-modules/pytransportnsw/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PyTransportNSW";
     inherit version;
-    sha256 = "00jklgjirmc58hiaqqc2n2rgixvx91bgrd6lv6hv28k51kid10f3";
+    hash = "sha256-w4HQ4gxlIrGh2dS0/FZIfff4srCCYawiRIXVHOWjUwI=";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix
index d9258a6ebc82..3816fdb4a87d 100644
--- a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix
+++ b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pytz_deprecation_shim";
     inherit version;
-    sha256 = "af097bae1b616dde5c5744441e2ddc69e74dfdcb0c263129610d85b87445a59d";
+    hash = "sha256-rwl7rhthbd5cV0REHi3caedN/csMJjEpYQ2FuHRFpZ0=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix
index 88890c4af085..a4583bf0f6fb 100644
--- a/pkgs/development/python-modules/pyunifi/default.nix
+++ b/pkgs/development/python-modules/pyunifi/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ea7919caee14abe741016d8e37e96bc67a43e22f77c079e55962273f39dbea4e";
+    hash = "sha256-6nkZyu4Uq+dBAW2ON+lrxnpD4i93wHnlWWInPznb6k4=";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/pyverilog/default.nix b/pkgs/development/python-modules/pyverilog/default.nix
index a22a0abfba21..a006f9db0eef 100644
--- a/pkgs/development/python-modules/pyverilog/default.nix
+++ b/pkgs/development/python-modules/pyverilog/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1a74k8r21swmfwvgv4c014y6nbcyl229fspxw89ygsgb0j83xnar";
+    hash = "sha256-Wdk+kATr6ecT4v1ql4Sgni1rPAmAkf02d5XrIDKa5Kg=";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/python-modules/pyxeoma/default.nix b/pkgs/development/python-modules/pyxeoma/default.nix
index 596c3e865f69..9a3430ad9abd 100644
--- a/pkgs/development/python-modules/pyxeoma/default.nix
+++ b/pkgs/development/python-modules/pyxeoma/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c6a3ed855025662df9b35ae2d1cac3fa41775a7612655804bde7276a8cab8d1c";
+    hash = "sha256-xqPthVAlZi35s1ri0crD+kF3WnYSZVgEvecnaoyrjRw=";
   };
 
   propagatedBuildInputs = [ aiohttp ];
diff --git a/pkgs/development/python-modules/qt5reactor/default.nix b/pkgs/development/python-modules/qt5reactor/default.nix
index 6bc07621c7d8..2e566d636126 100644
--- a/pkgs/development/python-modules/qt5reactor/default.nix
+++ b/pkgs/development/python-modules/qt5reactor/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c3470a8a25d9a339f9ca6243502a9b2277f181d772b7acbff551d5bc363b7572";
+    hash = "sha256-w0cKiiXZozn5ymJDUCqbInfxgddyt6y/9VHVvDY7dXI=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/random2/default.nix b/pkgs/development/python-modules/random2/default.nix
index 9e23cfcd8b3d..7e97fddbd565 100644
--- a/pkgs/development/python-modules/random2/default.nix
+++ b/pkgs/development/python-modules/random2/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "34ad30aac341039872401595df9ab2c9dc36d0b7c077db1cea9ade430ed1c007";
+    hash = "sha256-NK0wqsNBA5hyQBWV35qyydw20LfAd9sc6preQw7RwAc=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/ratelim/default.nix b/pkgs/development/python-modules/ratelim/default.nix
index a8ede1537a19..9e955acdbf77 100644
--- a/pkgs/development/python-modules/ratelim/default.nix
+++ b/pkgs/development/python-modules/ratelim/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "07dirdd8y23706110nb0lfz5pzbrcvd9y74h64la3y8igqbk4vc2";
+    hash = "sha256-gm0yF34R+aEoMZAcn9pmef1bvqNgWRCCAWcIj1rLsR0=";
   };
 
   propagatedBuildInputs = [ decorator ];
diff --git a/pkgs/development/python-modules/rawkit/default.nix b/pkgs/development/python-modules/rawkit/default.nix
index ec1191875a27..ab8fab059acc 100644
--- a/pkgs/development/python-modules/rawkit/default.nix
+++ b/pkgs/development/python-modules/rawkit/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0vrhrpr70i61y5q5ysk341x1539ff1q1k82g59zq69lv16s0f76s";
+    hash = "sha256-2hwHtAmbJoN/Kk+gGXBwLo0SeiBjal9w8cFEcPLNMG8=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/readme/default.nix b/pkgs/development/python-modules/readme/default.nix
index c7142c7f2bf6..f8868586c833 100644
--- a/pkgs/development/python-modules/readme/default.nix
+++ b/pkgs/development/python-modules/readme/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "32fbe1538a437da160fa4e4477270bfdcd8876e2e364d0d12898302644496231";
+    hash = "sha256-MvvhU4pDfaFg+k5EdycL/c2IduLjZNDRKJgwJkRJYjE=";
   };
 
   nativeCheckInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/requestsexceptions/default.nix b/pkgs/development/python-modules/requestsexceptions/default.nix
index e9d7957ced51..66b88ca6806d 100644
--- a/pkgs/development/python-modules/requestsexceptions/default.nix
+++ b/pkgs/development/python-modules/requestsexceptions/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b095cbc77618f066d459a02b137b020c37da9f46d9b057704019c9f77dba3065";
+    hash = "sha256-sJXLx3YY8GbUWaArE3sCDDfan0bZsFdwQBnJ9326MGU=";
   };
 
   propagatedBuildInputs = [ pbr ];
diff --git a/pkgs/development/python-modules/retry/default.nix b/pkgs/development/python-modules/retry/default.nix
index 3d80319ff604..ccffbe9b3744 100644
--- a/pkgs/development/python-modules/retry/default.nix
+++ b/pkgs/development/python-modules/retry/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f8bfa8b99b69c4506d6f5bd3b0aabf77f98cdb17f3c9fc3f5ca820033336fba4";
+    hash = "sha256-+L+ouZtpxFBtb1vTsKq/d/mM2xfzyfw/XKggAzM2+6Q=";
   };
 
   nativeBuildInputs = [ pbr ];
diff --git a/pkgs/development/python-modules/rfc3339-validator/default.nix b/pkgs/development/python-modules/rfc3339-validator/default.nix
index 27da24deb82d..18b051ef2588 100644
--- a/pkgs/development/python-modules/rfc3339-validator/default.nix
+++ b/pkgs/development/python-modules/rfc3339-validator/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "rfc3339_validator";
     inherit version;
-    sha256 = "0srg0b89aikzinw72s433994k5gv5lfyarq1adhas11kz6yjm2hk";
+    hash = "sha256-E4oqvfkzBK1gUwFn5R0t+5VJUhqDaHG4jX9GldACL2s=";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/rfc3339/default.nix b/pkgs/development/python-modules/rfc3339/default.nix
index 19250ac307f4..4698a478adca 100644
--- a/pkgs/development/python-modules/rfc3339/default.nix
+++ b/pkgs/development/python-modules/rfc3339/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1l6l1bh91i2r4dwcm86hlkx8cbh1xwgsk8hb4jvr5y5fxxg3ng6m";
+    hash = "sha256-1Tw7Xu+u+JK3JAuiqR/vAS6G+qTQoMp4I1nEkOAK1NA=";
   };
 
   # Project has no tests
diff --git a/pkgs/development/python-modules/rfc3987/default.nix b/pkgs/development/python-modules/rfc3987/default.nix
index 10d144063a21..81bd46335f54 100644
--- a/pkgs/development/python-modules/rfc3987/default.nix
+++ b/pkgs/development/python-modules/rfc3987/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d3c4d257a560d544e9826b38bc81db676890c79ab9d7ac92b39c7a253d5ca733";
+    hash = "sha256-08TSV6Vg1UTpgms4vIHbZ2iQx5q516ySs5x6JT1cpzM=";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/rfc7464/default.nix b/pkgs/development/python-modules/rfc7464/default.nix
index 80e1d3a590e9..333005044e16 100644
--- a/pkgs/development/python-modules/rfc7464/default.nix
+++ b/pkgs/development/python-modules/rfc7464/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1hcn6h38qplfcmq392cs58r01k16k202bqyap4br02376pr4ik7a";
+    hash = "sha256-6sxI8jVnCJAXucrjJYCYJswAMiqaiTRwZY5ejAY0lsE=";
     extension = "zip";
   };
 
diff --git a/pkgs/development/python-modules/ritassist/default.nix b/pkgs/development/python-modules/ritassist/default.nix
index 29605d1e65d1..63ff12210921 100644
--- a/pkgs/development/python-modules/ritassist/default.nix
+++ b/pkgs/development/python-modules/ritassist/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1JCKWb+3mdQYnL250Ml+kFkx6VAlBC7FL6XcQlQ+kC4=";
+    hash = "sha256-1JCKWb+3mdQYnL250Ml+kFkx6VAlBC7FL6XcQlQ+kC4=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/rmcl/default.nix b/pkgs/development/python-modules/rmcl/default.nix
index 232910d56e18..ec8eb17585fb 100644
--- a/pkgs/development/python-modules/rmcl/default.nix
+++ b/pkgs/development/python-modules/rmcl/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "58de4758e7e3cb7acbf28fcfa80f4155252afdfb191beb4ba4aa36961f66cc67";
+    hash = "sha256-WN5HWOfjy3rL8o/PqA9BVSUq/fsZG+tLpKo2lh9mzGc=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/robot-detection/default.nix b/pkgs/development/python-modules/robot-detection/default.nix
index b343afa58f6e..e3c118e075e2 100644
--- a/pkgs/development/python-modules/robot-detection/default.nix
+++ b/pkgs/development/python-modules/robot-detection/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xd2jm3yn31bnk1kqzggils2rxj26ylxsfz3ap7bhr3ilhnbg3rx";
+    hash = "sha256-PY+3LKRxZLjOVeM73ak3QvYsNI3vfTzDtCsM60eVovU=";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/robotframework-selenium2library/default.nix b/pkgs/development/python-modules/robotframework-selenium2library/default.nix
index 5e3cae9270b5..32bfa61a0070 100644
--- a/pkgs/development/python-modules/robotframework-selenium2library/default.nix
+++ b/pkgs/development/python-modules/robotframework-selenium2library/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2a8e942b0788b16ded253039008b34d2b46199283461b294f0f41a579c70fda7";
+    hash = "sha256-Ko6UKweIsW3tJTA5AIs00rRhmSg0YbKU8PQaV5xw/ac=";
   };
 
   # Neither the PyPI tarball nor the repository has tests
diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
index a9d1afb9dd15..20e658bff800 100644
--- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
+++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "aedf8a02bcb7344404cf8575d0ada25d6c7dc2fcb65de2113c4e07c63d2446c2";
+    hash = "sha256-rt+KAry3NEQEz4V10K2iXWx9wvy2XeIRPE4Hxj0kRsI=";
   };
 
   # unit tests are impure
diff --git a/pkgs/development/python-modules/rocket-errbot/default.nix b/pkgs/development/python-modules/rocket-errbot/default.nix
index 57c9d2eeae31..cfaf1409480d 100644
--- a/pkgs/development/python-modules/rocket-errbot/default.nix
+++ b/pkgs/development/python-modules/rocket-errbot/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "181y1wqjvlry5xdzbliajvrxvswzh3myh795jnj1pm92r5grqzda";
+    hash = "sha256-qn2cX8ki1RuklSUd6OuAn+vd85Yq0vVbLz7TLTEPPqA=";
   };
 
   # remove with 1.2.6
diff --git a/pkgs/development/python-modules/routes/default.nix b/pkgs/development/python-modules/routes/default.nix
index 9f2afb77bb09..f6f0e79bd117 100644
--- a/pkgs/development/python-modules/routes/default.nix
+++ b/pkgs/development/python-modules/routes/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Routes";
     inherit version;
-    sha256 = "b6346459a15f0cbab01a45a90c3d25caf980d4733d628b4cc1952b865125d053";
+    hash = "sha256-tjRkWaFfDLqwGkWpDD0lyvmA1HM9YotMwZUrhlEl0FM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/rtmidi-python/default.nix b/pkgs/development/python-modules/rtmidi-python/default.nix
index fe2aa3c54f8e..e55d82d091c1 100644
--- a/pkgs/development/python-modules/rtmidi-python/default.nix
+++ b/pkgs/development/python-modules/rtmidi-python/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1wpcaxfpbmsjc78g8841kpixr0a3v6zn0ak058s3mm25kcysp4m0";
+    hash = "sha256-oJKrPZtF1Do0KmAqYL/ZQ4Hc452BIPTQYVLXdV1X7PI=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/ruamel-base/default.nix b/pkgs/development/python-modules/ruamel-base/default.nix
index 2ceefbf2f6f2..8478390268d1 100644
--- a/pkgs/development/python-modules/ruamel-base/default.nix
+++ b/pkgs/development/python-modules/ruamel-base/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "ruamel.base";
     inherit version;
-    sha256 = "1wswxrn4givsm917mfl39rafgadimf1sldpbjdjws00g1wx36hf0";
+    hash = "sha256-wEEzOg8PAM1lk+s2qoOrsannVE6DunpCqnrHR2zuXPM=";
   };
 
   # no tests
diff --git a/pkgs/development/python-modules/rx/default.nix b/pkgs/development/python-modules/rx/default.nix
index 76f02155f3ab..21a9b760ad0d 100644
--- a/pkgs/development/python-modules/rx/default.nix
+++ b/pkgs/development/python-modules/rx/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "Rx";
-    sha256 = "b657ca2b45aa485da2f7dcfd09fac2e554f7ac51ff3c2f8f2ff962ecd963d91c";
+    hash = "sha256-tlfKK0WqSF2i99z9CfrC5VT3rFH/PC+PL/li7Nlj2Rw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/s2clientprotocol/default.nix b/pkgs/development/python-modules/s2clientprotocol/default.nix
index 08ce5f72eaaa..f31d4477759c 100644
--- a/pkgs/development/python-modules/s2clientprotocol/default.nix
+++ b/pkgs/development/python-modules/s2clientprotocol/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02jqwdfj5zpag4c5nf0707qmwk7sqm98yfgrd19rq6pi58zgl74f";
+    hash = "sha256-jhz6PirxGpxTaPk5j1LF+kxe8QEHOFsYeer+Il3jWAo=";
   };
 
   patches = [ ./pure-version.patch ];
diff --git a/pkgs/development/python-modules/safeio/default.nix b/pkgs/development/python-modules/safeio/default.nix
index 85dbc04339e6..1781088df644 100644
--- a/pkgs/development/python-modules/safeio/default.nix
+++ b/pkgs/development/python-modules/safeio/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "safeIO";
     inherit version;
-    sha256 = "d480a6dab01a390ebc24c12d6b774ad00cef3db5348ad07d8bd11d272a808cd3";
+    hash = "sha256-1ICm2rAaOQ68JMEta3dK0AzvPbU0itB9i9EdJyqAjNM=";
   };
 
   pythonImportsCheck = [ "safeIO" ];
diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix
index 5e438dc1caac..801375b5f339 100644
--- a/pkgs/development/python-modules/samsungctl/default.nix
+++ b/pkgs/development/python-modules/samsungctl/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ipz3fd65rqkxlb02sql0awc3vnslrwb2pfrsnpfnf8bfgxpbh9g";
+    hash = "sha256-L8F1+3MLOeuu1dldsXim2u7BuAIUawEW7RPnYpob/0Y=";
   };
 
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/sane/default.nix b/pkgs/development/python-modules/sane/default.nix
index 41bae43c4b1e..cfd987630707 100644
--- a/pkgs/development/python-modules/sane/default.nix
+++ b/pkgs/development/python-modules/sane/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "python-sane";
-    sha256 = "JAmOuDxujhsBEm5q16WwR5wHsBPF0iBQm1VYkv5JJd4=";
+    hash = "sha256-JAmOuDxujhsBEm5q16WwR5wHsBPF0iBQm1VYkv5JJd4=";
   };
 
   buildInputs = [ sane-backends ];
diff --git a/pkgs/development/python-modules/sansio-multipart/default.nix b/pkgs/development/python-modules/sansio-multipart/default.nix
index aa12f71a01e7..d8283a4c9071 100644
--- a/pkgs/development/python-modules/sansio-multipart/default.nix
+++ b/pkgs/development/python-modules/sansio-multipart/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "sansio_multipart";
     inherit version;
-    sha256 = "6e95b2e64039a95d0f2cd8f3360eaf418d6b9018fb2215d82d399d62d6122dc3";
+    hash = "sha256-bpWy5kA5qV0PLNjzNg6vQY1rkBj7IhXYLTmdYtYSLcM=";
   };
 
   # upstream has no tests
diff --git a/pkgs/development/python-modules/sarif-om/default.nix b/pkgs/development/python-modules/sarif-om/default.nix
index 1eabe2ee461e..d5a2107d6262 100644
--- a/pkgs/development/python-modules/sarif-om/default.nix
+++ b/pkgs/development/python-modules/sarif-om/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "sarif_om";
     inherit version;
-    sha256 = "cd5f416b3083e00d402a92e449a7ff67af46f11241073eea0461802a3b5aef98";
+    hash = "sha256-zV9BazCD4A1AKpLkSaf/Z69G8RJBBz7qBGGAKjta75g=";
   };
 
   nativeBuildInputs = [ pbr ];
diff --git a/pkgs/development/python-modules/scour/default.nix b/pkgs/development/python-modules/scour/default.nix
index ffda524843d5..56abdbf8f97d 100644
--- a/pkgs/development/python-modules/scour/default.nix
+++ b/pkgs/development/python-modules/scour/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6881ec26660c130c5ecd996ac6f6b03939dd574198f50773f2508b81a68e0daf";
+    hash = "sha256-aIHsJmYMEwxezZlqxvawOTndV0GY9Qdz8lCLgaaODa8=";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/sdnotify/default.nix b/pkgs/development/python-modules/sdnotify/default.nix
index 6f775615c85b..090a458bac8a 100644
--- a/pkgs/development/python-modules/sdnotify/default.nix
+++ b/pkgs/development/python-modules/sdnotify/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
   format = "setuptools";
 
   src = fetchPypi {
-    sha256 = "1wdrdg2j16pmqhk0ify20s5pngijh7zc6hyxhh8w8v5k8v3pz5vk";
+    hash = "sha256-c5d/x0azbMQRhN1Dw/6BMj57iwbCuwgmxPWaIMVrufE=";
     inherit pname version;
   };
 
diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix
index b806592383b3..8aef9eceb9a2 100644
--- a/pkgs/development/python-modules/secp256k1/default.nix
+++ b/pkgs/development/python-modules/secp256k1/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "82c06712d69ef945220c8b53c1a0d424c2ff6a1f64aee609030df79ad8383397";
+    hash = "sha256-gsBnEtae+UUiDItTwaDUJML/ah9kruYJAw33mtg4M5c=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix
index 9070acb5eae5..cd3d7b79e978 100644
--- a/pkgs/development/python-modules/serpy/default.nix
+++ b/pkgs/development/python-modules/serpy/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3772b2a9923fbf674000ff51abebf6ea8f0fca0a2cfcbfa0d63ff118193d1ec5";
+    hash = "sha256-N3KyqZI/v2dAAP9Rq+v26o8Pygos/L+g1j/xGBk9HsU=";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/serverlessrepo/default.nix b/pkgs/development/python-modules/serverlessrepo/default.nix
index 39fce6c05da0..1dc4c68d5655 100644
--- a/pkgs/development/python-modules/serverlessrepo/default.nix
+++ b/pkgs/development/python-modules/serverlessrepo/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "671f48038123f121437b717ed51f253a55775590f00fbab6fbc6a01f8d05c017";
+    hash = "sha256-Zx9IA4Ej8SFDe3F+1R8lOlV3VZDwD7q2+8agH40FwBc=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/simplegeneric/default.nix b/pkgs/development/python-modules/simplegeneric/default.nix
index 274b0a6ebb02..cd8514d5e4bb 100644
--- a/pkgs/development/python-modules/simplegeneric/default.nix
+++ b/pkgs/development/python-modules/simplegeneric/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173";
+    hash = "sha256-3JcuBglLmvW4VbPfSmRjleQ9HJ0NOe00W3OTVg0LkXM=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/simplekml/default.nix b/pkgs/development/python-modules/simplekml/default.nix
index 3b0a7b27845f..9c566214803e 100644
--- a/pkgs/development/python-modules/simplekml/default.nix
+++ b/pkgs/development/python-modules/simplekml/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cda687be2754395fcab664e908ebf589facd41e8436d233d2be37a69efb1c536";
+    hash = "sha256-zaaHvidUOV/KtmTpCOv1ifrNQehDbSM9K+N6ae+xxTY=";
   };
 
   # no tests are defined in 1.3.5
diff --git a/pkgs/development/python-modules/sleepyq/default.nix b/pkgs/development/python-modules/sleepyq/default.nix
index 32d9c9ac39a8..b0ccfaceef72 100644
--- a/pkgs/development/python-modules/sleepyq/default.nix
+++ b/pkgs/development/python-modules/sleepyq/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bhzrxpzglfw4qbqfzyxr7dmmavzq4pq0h90jh0aa8vdw7iy7g7v";
+    hash = "sha256-+7zj4+FtI6UAlCBBgC/Bf6ta28ndf4cXJtzR92/PH64=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/smbus-cffi/default.nix b/pkgs/development/python-modules/smbus-cffi/default.nix
index 7387d3478808..2309bb2ce382 100644
--- a/pkgs/development/python-modules/smbus-cffi/default.nix
+++ b/pkgs/development/python-modules/smbus-cffi/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fb4195aaabfc01586863f60d3190b5cb1bf8f12622fd597e23e48768dad6bde8";
+    hash = "sha256-+0GVqqv8AVhoY/YNMZC1yxv48SYi/Vl+I+SHaNrWveg=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/smdebug-rulesconfig/default.nix b/pkgs/development/python-modules/smdebug-rulesconfig/default.nix
index 31656697d052..ab4e41b884e1 100644
--- a/pkgs/development/python-modules/smdebug-rulesconfig/default.nix
+++ b/pkgs/development/python-modules/smdebug-rulesconfig/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "smdebug_rulesconfig";
-    sha256 = "1mpwjfvpmryqqwlbyf500584jclgm3vnxa740yyfzkvb5vmyc6bs";
+    hash = "sha256-ehnm6y5rz++8B+SobveojzJJUAGgOL8ox9jnereT/NY=";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/snapshottest/default.nix b/pkgs/development/python-modules/snapshottest/default.nix
index f8f39d6687bc..c8e12432be9c 100644
--- a/pkgs/development/python-modules/snapshottest/default.nix
+++ b/pkgs/development/python-modules/snapshottest/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0g35ggqw4jd9zmazw55kj6gfjdghv49qx4jw5q231qyqj8fzijmv";
+    hash = "sha256-u8r4HZLY4zAELlySjhPZ8DXpnpGzFP5V/alJwvF7ZTw=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix
index 9e3b9f81e97d..82e7678f05c4 100644
--- a/pkgs/development/python-modules/sockjs-tornado/default.nix
+++ b/pkgs/development/python-modules/sockjs-tornado/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02ff25466b3a46b1a7dbe477340b042770ac078de7ea475a6285a28a75eb1fab";
+    hash = "sha256-Av8lRms6RrGn2+R3NAsEJ3CsB43n6kdaYoWiinXrH6s=";
   };
 
   propagatedBuildInputs = [ tornado ];
diff --git a/pkgs/development/python-modules/socksipy-branch/default.nix b/pkgs/development/python-modules/socksipy-branch/default.nix
index 30d2a9bbdf21..5f374bb89930 100644
--- a/pkgs/development/python-modules/socksipy-branch/default.nix
+++ b/pkgs/development/python-modules/socksipy-branch/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "SocksiPy-branch";
     inherit version;
-    sha256 = "01l41v4g7fy9fzvinmjxy6zcbhgqaif8dhdqm4w90fwcw9h51a8p";
+    hash = "sha256-F6lQYOKMO5A4qbjBhlxU+MHFvvFdVhv3d8m788gOhAY=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/speaklater/default.nix b/pkgs/development/python-modules/speaklater/default.nix
index 27f670f8a8d9..e93e393efc68 100644
--- a/pkgs/development/python-modules/speaklater/default.nix
+++ b/pkgs/development/python-modules/speaklater/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ab5dbfzzgz6cnz4xlwx79gz83id4bhiw67k1cgqrlzfs0va7zjr";
+    hash = "sha256-Wf6jNtDu04wfC/MYHuEiLQ70Xzqd006+Zea//91qZak=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/speaklater3/default.nix b/pkgs/development/python-modules/speaklater3/default.nix
index 4be3379c42ca..59b6e1919350 100644
--- a/pkgs/development/python-modules/speaklater3/default.nix
+++ b/pkgs/development/python-modules/speaklater3/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ySYdS2taMEZyMS0esImb4Cj6yRdgGQqA/szTHTo7UEI=";
+    hash = "sha256-ySYdS2taMEZyMS0esImb4Cj6yRdgGQqA/szTHTo7UEI=";
   };
 
   pythonImportsCheck = [ "speaklater" ];
diff --git a/pkgs/development/python-modules/speedtest-cli/default.nix b/pkgs/development/python-modules/speedtest-cli/default.nix
index 86a36cf2d78e..d2eac27002af 100644
--- a/pkgs/development/python-modules/speedtest-cli/default.nix
+++ b/pkgs/development/python-modules/speedtest-cli/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1w4h7m0isbvfy4zx6m5j4594p5y4pjbpzsr0h4yzmdgd7hip69sy";
+    hash = "sha256-XidzIzzttfo9gSDrf5e8xJdLUiGyVNM/8W4vHUE9kPA=";
   };
 
   # tests require working internet connection
diff --git a/pkgs/development/python-modules/sphinx-comments/default.nix b/pkgs/development/python-modules/sphinx-comments/default.nix
index 217c084115b1..b5bf70c128fd 100644
--- a/pkgs/development/python-modules/sphinx-comments/default.nix
+++ b/pkgs/development/python-modules/sphinx-comments/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00170afff27019fad08e421da1ae49c681831fb2759786f07c826e89ac94cf21";
+    hash = "sha256-ABcK//JwGfrQjkIdoa5JxoGDH7J1l4bwfIJuiayUzyE=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/sphinx-serve/default.nix b/pkgs/development/python-modules/sphinx-serve/default.nix
index e0798d608403..67cacbb34f94 100644
--- a/pkgs/development/python-modules/sphinx-serve/default.nix
+++ b/pkgs/development/python-modules/sphinx-serve/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8d90f6595114108500b1f935d3f4d07bf5192783c67ce83f944ef289099669c9";
+    hash = "sha256-jZD2WVEUEIUAsfk10/TQe/UZJ4PGfOg/lE7yiQmWack=";
   };
 
   doCheck = false; # No tests
diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix
index ec2f2055e333..066436fc21d1 100644
--- a/pkgs/development/python-modules/sphinx-testing/default.nix
+++ b/pkgs/development/python-modules/sphinx-testing/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ef661775b5722d7b00f67fc229104317d35637a4fb4434bf2c005afdf1da4d09";
+    hash = "sha256-72YXdbVyLXsA9n/CKRBDF9NWN6T7RDS/LABa/fHaTQk=";
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
index 51d3b8e199c9..9cdf52761f59 100644
--- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "aa49bf924516f5de8a479994c7be81e077df5599c9da2a082003d5b388e1d450";
+    hash = "sha256-qkm/kkUW9d6KR5mUx76B4HffVZnJ2ioIIAPVs4jh1FA=";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/strategies/default.nix b/pkgs/development/python-modules/strategies/default.nix
index ec4fa4785830..01eb3c3c9203 100644
--- a/pkgs/development/python-modules/strategies/default.nix
+++ b/pkgs/development/python-modules/strategies/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     pname = "strategies";
     inherit (finalAttrs) version;
-    sha256 = "02i4ydrs9k61p8iv2vl2akks8p9gc88rw8031wlwb1zqsyjmb328";
+    hash = "sha256-SIxVpdf4h8UpDwMgnhFiL12k51SCbrEjusHMpHPzJAo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/strict-rfc3339/default.nix b/pkgs/development/python-modules/strict-rfc3339/default.nix
index 275fcd0e6104..87364e77ac4a 100644
--- a/pkgs/development/python-modules/strict-rfc3339/default.nix
+++ b/pkgs/development/python-modules/strict-rfc3339/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5cad17bedfc3af57b399db0fed32771f18fc54bbd917e85546088607ac5e1277";
+    hash = "sha256-XK0Xvt/Dr1ezmdsP7TJ3Hxj8VLvZF+hVRgiGB6xeEnc=";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix
index 6dd724a1e798..19a53fbfcbb7 100644
--- a/pkgs/development/python-modules/stytra/default.nix
+++ b/pkgs/development/python-modules/stytra/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "aab9d07575ef599a9c0ae505656e3c03ec753462df3c15742f1f768f2b578f0a";
+    hash = "sha256-qrnQdXXvWZqcCuUFZW48A+x1NGLfPBV0Lx92jytXjwo=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
index 5e50ffe45720..dbf01956fbec 100644
--- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f847c57302a102eb88e29ed95b8f4efa69582db2966fd806c21376b9a66ad4a8";
+    hash = "sha256-+EfFcwKhAuuI4p7ZW49O+mlYLbKWb9gGwhN2uaZq1Kg=";
   };
 
   propagatedBuildInputs = [ sqlalchemy ];
diff --git a/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix b/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix
index c68c9fe2e18a..8be072c98aea 100644
--- a/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix
+++ b/pkgs/development/python-modules/tensorboard-plugin-wit/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     inherit pname version;
     format = "wheel";
     python = "py3";
-    sha256 = "0nv855qm2fav70lndsrv810pqgg41sbmd70fk86wk18ih825yxzf";
+    hash = "sha256-7ndfBIIRhckNmg6cVpcO5D18QUA762YpOFs5UXEpaFs=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/terminaltables/default.nix b/pkgs/development/python-modules/terminaltables/default.nix
index 7dd13c858f80..e9b6c323b8ef 100644
--- a/pkgs/development/python-modules/terminaltables/default.nix
+++ b/pkgs/development/python-modules/terminaltables/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ba6eca5cb5ba02bba4c9f4f985af80c54ec3dccf94cfcd190154386255e47543";
+    hash = "sha256-um7KXLW6ArukyfT5ha+AxU7D3M+Uz80ZAVQ4YlXkdUM=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/testing-common-database/default.nix b/pkgs/development/python-modules/testing-common-database/default.nix
index 8c7682aa333f..b510592e1959 100644
--- a/pkgs/development/python-modules/testing-common-database/default.nix
+++ b/pkgs/development/python-modules/testing-common-database/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0wvdv0frl7xib05sixjv9m6jywaa2wdhdhsqqdfk45akk2r80pcn";
+    hash = "sha256-ll2AsphTFTJdw1jDBhsXSnEvTU1b9qgLWLEfmh3YbXM=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/testscenarios/default.nix b/pkgs/development/python-modules/testscenarios/default.nix
index 7cc142fd2344..f3ce5451d3da 100644
--- a/pkgs/development/python-modules/testscenarios/default.nix
+++ b/pkgs/development/python-modules/testscenarios/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c257cb6b90ea7e6f8fef3158121d430543412c9a87df30b5dde6ec8b9b57a2b6";
+    hash = "sha256-wlfLa5Dqfm+P7zFYEh1DBUNBLJqH3zC13ebsi5tXorY=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/text-unidecode/default.nix b/pkgs/development/python-modules/text-unidecode/default.nix
index cb8cd5bb8f3d..b2dd0c3f8376 100644
--- a/pkgs/development/python-modules/text-unidecode/default.nix
+++ b/pkgs/development/python-modules/text-unidecode/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93";
+    hash = "sha256-utZgO7FNJ5GTEHcUsoi+IGysVl36SapbEFKU3VxKq5M=";
   };
 
   nativeCheckInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/tflearn/default.nix b/pkgs/development/python-modules/tflearn/default.nix
index 36e2953e0a84..882eb608f063 100644
--- a/pkgs/development/python-modules/tflearn/default.nix
+++ b/pkgs/development/python-modules/tflearn/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "818aa57667693810415dc203ba3f75f1541e931a8dc30b6e8b21563541a70388";
+    hash = "sha256-gYqldmdpOBBBXcIDuj918VQekxqNwwtuiyFWNUGnA4g=";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/threadloop/default.nix b/pkgs/development/python-modules/threadloop/default.nix
index d196d3274fe2..33f8a57dc94d 100644
--- a/pkgs/development/python-modules/threadloop/default.nix
+++ b/pkgs/development/python-modules/threadloop/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8b180aac31013de13c2ad5c834819771992d350267bddb854613ae77ef571944";
+    hash = "sha256-ixgKrDEBPeE8KtXINIGXcZktNQJnvduFRhOud+9XGUQ=";
   };
 
   propagatedBuildInputs = [ tornado ];
diff --git a/pkgs/development/python-modules/tidyexc/default.nix b/pkgs/development/python-modules/tidyexc/default.nix
index f6892f76cd1e..971f226bb03b 100644
--- a/pkgs/development/python-modules/tidyexc/default.nix
+++ b/pkgs/development/python-modules/tidyexc/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1gl1jmihafawg7hvnn4xb20vd2x5qpvca0m1wr2gk0m2jj42yiq6";
+    hash = "sha256-BkcviJSigvlE5qECxfbFpYu2gVidWLvheVw5BWOVgb4=";
   };
 
   nativeBuildInputs = [ flit ];
diff --git a/pkgs/development/python-modules/timeout-decorator/default.nix b/pkgs/development/python-modules/timeout-decorator/default.nix
index 272001642a89..9971472638d6 100644
--- a/pkgs/development/python-modules/timeout-decorator/default.nix
+++ b/pkgs/development/python-modules/timeout-decorator/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6a2f2f58db1c5b24a2cc79de6345760377ad8bdc13813f5265f6c3e63d16b3d7";
+    hash = "sha256-ai8vWNscWySizHneY0V2A3eti9wTgT9SZfbD5j0Ws9c=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/tlslite/default.nix b/pkgs/development/python-modules/tlslite/default.nix
index 88e170587cc5..9142ad6c7653 100644
--- a/pkgs/development/python-modules/tlslite/default.nix
+++ b/pkgs/development/python-modules/tlslite/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9b9a487694c239efea8cec4454a99a56ee1ae1a5f3af0858ccf8029e2ac2d42d";
+    hash = "sha256-m5pIdpTCOe/qjOxEVKmaVu4a4aXzrwhYzPgCnirC1C0=";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/toml/default.nix b/pkgs/development/python-modules/toml/default.nix
index 3c1483d936f4..01582ed87251 100644
--- a/pkgs/development/python-modules/toml/default.nix
+++ b/pkgs/development/python-modules/toml/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f";
+    hash = "sha256-s72h0QjV3Zn0og0k2cNI6RxNt6sbdJIAve0vg5zL5o8=";
   };
 
   # This package has a test script (built for Travis) that involves a)
diff --git a/pkgs/development/python-modules/traceback2/default.nix b/pkgs/development/python-modules/traceback2/default.nix
index 008f7280b39e..24c99db82e17 100644
--- a/pkgs/development/python-modules/traceback2/default.nix
+++ b/pkgs/development/python-modules/traceback2/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0c1h3jas1jp1fdbn9z2mrgn3jj0hw1x3yhnkxp7jw34q15xcdb05";
+    hash = "sha256-BazGegmYDC7P7dNCP3rgEEg57MtV/GRXc+HKoJUcMDA=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/treelog/default.nix b/pkgs/development/python-modules/treelog/default.nix
index c3140c16f81c..3759ffe21921 100644
--- a/pkgs/development/python-modules/treelog/default.nix
+++ b/pkgs/development/python-modules/treelog/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "0hnivz4p4llky6djxgcsr9r3j4vr46mkjvp0ksybhpx0fsnhdi81";
+    hash = "sha256-AcUGrXagX7i8nuBuOasheRM5csqavS6b8ZNScsnf0UI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/twiggy/default.nix b/pkgs/development/python-modules/twiggy/default.nix
index 3d50f8dcccee..c56664fcff15 100644
--- a/pkgs/development/python-modules/twiggy/default.nix
+++ b/pkgs/development/python-modules/twiggy/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Twiggy";
     inherit version;
-    sha256 = "7938840275972f6ce89994a5bdfb0b84f0386301a043a960af6364952e78ffe4";
+    hash = "sha256-eTiEAnWXL2zomZSlvfsLhPA4YwGgQ6lgr2NklS54/+Q=";
   };
 
   propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/twofish/default.nix b/pkgs/development/python-modules/twofish/default.nix
index e741b97d071d..b7686d8960b8 100644
--- a/pkgs/development/python-modules/twofish/default.nix
+++ b/pkgs/development/python-modules/twofish/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1yihp2n42amrxw0wk9f66llpb3w5kwhgkcdg9krkzcik1nsqp7dh";
+    hash = "sha256-sJ2LtQ0zsj/zTK+x+SCfhY91KTXGpckB77kqQay4MPo=";
   };
 
   propagatedBuildInputs = [ javaobj-py3 ];
diff --git a/pkgs/development/python-modules/txamqp/default.nix b/pkgs/development/python-modules/txamqp/default.nix
index eb2ff68a2b25..f9fa535f0a35 100644
--- a/pkgs/development/python-modules/txamqp/default.nix
+++ b/pkgs/development/python-modules/txamqp/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "txAMQP";
     inherit version;
-    sha256 = "0jd9864k3csc06kipiwzjlk9mq4054s8kzk5q1cfnxj8572s4iv4";
+    hash = "sha256-ZEeixSlIdutYwGX+iTQpgOCaJpWfxxunAUyzMYlBqUk=";
   };
 
   propagatedBuildInputs = [ twisted ];
diff --git a/pkgs/development/python-modules/txgithub/default.nix b/pkgs/development/python-modules/txgithub/default.nix
index 433b9cdbd58f..23bd4a232934 100644
--- a/pkgs/development/python-modules/txgithub/default.nix
+++ b/pkgs/development/python-modules/txgithub/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16gbizy8vkxasxylwzj4p66yw8979nvzxdj6csidgmng7gi2k8nx";
+    hash = "sha256-3aIp4jvP1teiZka2/rdNJyHujblEfk5916rPjfyP65k=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix
index 9c3afe6c8917..b362f6b7343d 100644
--- a/pkgs/development/python-modules/ukpostcodeparser/default.nix
+++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "UkPostcodeParser";
     inherit version;
-    sha256 = "930264efa293db80af0103a4fe9c161b06365598d24bb6fe5403f3f57c70530e";
+    hash = "sha256-kwJk76KT24CvAQOk/pwWGwY2VZjSS7b+VAPz9XxwUw4=";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/umalqurra/default.nix b/pkgs/development/python-modules/umalqurra/default.nix
index 0dce7dc7ce96..b3667908a452 100644
--- a/pkgs/development/python-modules/umalqurra/default.nix
+++ b/pkgs/development/python-modules/umalqurra/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "719f6a36f908ada1c29dae0d934dd0f1e1f6e3305784edbec23ad719397de678";
+    hash = "sha256-cZ9qNvkIraHCna4Nk03Q8eH24zBXhO2+wjrXGTl95ng=";
   };
 
   # No tests included
diff --git a/pkgs/development/python-modules/unidic-lite/default.nix b/pkgs/development/python-modules/unidic-lite/default.nix
index c2530aa94334..524a6dcdb79f 100644
--- a/pkgs/development/python-modules/unidic-lite/default.nix
+++ b/pkgs/development/python-modules/unidic-lite/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "0idj4yp0sl27ylr2wzkybbh0wj7c843lp7cljw5d1m7xv5r4b7fv";
+    hash = "sha256-251Fctn91NAKl5SdSwdB7EgO4Fp+fi4y9UdQDa4nskU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/unrpa/default.nix b/pkgs/development/python-modules/unrpa/default.nix
index 32d48882f881..2c6a25792aa6 100644
--- a/pkgs/development/python-modules/unrpa/default.nix
+++ b/pkgs/development/python-modules/unrpa/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0yl4qdwp3in170ks98qnldqz3r2iyzil5g1775ccg98qkh95s724";
+    hash = "sha256-RBxdEpwYpcdYOSe8QuP3UeTxcaMWo6QnOMHGcXnDhHo=";
   };
 
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/untokenize/default.nix b/pkgs/development/python-modules/untokenize/default.nix
index d20b84fd01de..6b71c534c249 100644
--- a/pkgs/development/python-modules/untokenize/default.nix
+++ b/pkgs/development/python-modules/untokenize/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3865dbbbb8efb4bb5eaa72f1be7f3e0be00ea8b7f125c69cbd1f5fda926f37a2";
+    hash = "sha256-OGXbu7jvtLteqnLxvn8+C+AOqLfxJcacvR9f2pJvN6I=";
   };
 
   # the deprecated ast.Constant.s alias was removed in Python 3.14
diff --git a/pkgs/development/python-modules/uonet-request-signer-hebe/default.nix b/pkgs/development/python-modules/uonet-request-signer-hebe/default.nix
index 33e236f9adc3..5ceed5f2da7b 100644
--- a/pkgs/development/python-modules/uonet-request-signer-hebe/default.nix
+++ b/pkgs/development/python-modules/uonet-request-signer-hebe/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fidopnpAt5CXPsLbx+V8wrJCQQ/WIO6AqxpsYLDv8qM=";
+    hash = "sha256-fidopnpAt5CXPsLbx+V8wrJCQQ/WIO6AqxpsYLDv8qM=";
   };
 
   propagatedBuildInputs = [ pyopenssl ];
diff --git a/pkgs/development/python-modules/update-checker/default.nix b/pkgs/development/python-modules/update-checker/default.nix
index f6100125a88a..ea2c1499c1bc 100644
--- a/pkgs/development/python-modules/update-checker/default.nix
+++ b/pkgs/development/python-modules/update-checker/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "update_checker";
     inherit version;
-    sha256 = "6a2d45bb4ac585884a6b03f9eade9161cedd9e8111545141e9aa9058932acb13";
+    hash = "sha256-ai1Fu0rFhYhKawP56t6RYc7dnoERVFFB6aqQWJMqyxM=";
   };
 
   propagatedBuildInputs = [ requests ];
diff --git a/pkgs/development/python-modules/uptime-kuma-monitor/default.nix b/pkgs/development/python-modules/uptime-kuma-monitor/default.nix
index 643571fc0d76..a18a15cc6a70 100644
--- a/pkgs/development/python-modules/uptime-kuma-monitor/default.nix
+++ b/pkgs/development/python-modules/uptime-kuma-monitor/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "uptime_kuma_monitor";
     inherit version;
-    sha256 = "0zi4856hj5ar4yidh7366kx3xnh8qzydw9z8vlalcn98jf3jlnk9";
+    hash = "sha256-aVoqh5MoWUYV3egn3vzHCNo++jRmHNiiJ1kVCU1BJH4=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix
index 75c0fa5829bc..eba7c586d673 100644
--- a/pkgs/development/python-modules/urlgrabber/default.nix
+++ b/pkgs/development/python-modules/urlgrabber/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "075af8afabae6362482d254e5ac3ffa595d1766117b684e53d9c25c2e937e139";
+    hash = "sha256-B1r4r6uuY2JILSVOWsP/pZXRdmEXtoTlPZwlwuk34Tk=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix
index d216f69ac3bd..df1945b34d3b 100644
--- a/pkgs/development/python-modules/vidstab/default.nix
+++ b/pkgs/development/python-modules/vidstab/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "865c4a097e2a8527aa8bfc96ab0bcc0d280a88cc93eabcc36531268f5d343ce1";
+    hash = "sha256-hlxKCX4qhSeqi/yWqwvMDSgKiMyT6rzDZTEmj100POE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/visitor/default.nix b/pkgs/development/python-modules/visitor/default.nix
index 0b27081fc870..3558ce2fcad6 100644
--- a/pkgs/development/python-modules/visitor/default.nix
+++ b/pkgs/development/python-modules/visitor/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "02j87v93c50gz68gbgclmbqjcwcr7g7zgvk7c6y4x1mnn81pjwrc";
+    hash = "sha256-LHN5A7K2hk68YWfu9887mXEm8aqUvfWQ+Q8UNtI+SAo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix
index b9c660082aaa..02fb0a0c1cba 100644
--- a/pkgs/development/python-modules/web/default.nix
+++ b/pkgs/development/python-modules/web/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5ce684caa240654cae5950da8b4b7bc178812031e08f990518d072bd44ab525e";
+    hash = "sha256-XOaEyqJAZUyuWVDai0t7wXiBIDHgj5kFGNByvUSrUl4=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/webencodings/default.nix b/pkgs/development/python-modules/webencodings/default.nix
index 334ba54b0ba5..68aa95b9c3e2 100644
--- a/pkgs/development/python-modules/webencodings/default.nix
+++ b/pkgs/development/python-modules/webencodings/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923";
+    hash = "sha256-s2ocJF8tMEll604KgoSDeSQdwEuGWvzEqrFnSFh+GSM=";
   };
 
   nativeCheckInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/wget/default.nix b/pkgs/development/python-modules/wget/default.nix
index 51dc2d9ce639..8f9124280d5e 100644
--- a/pkgs/development/python-modules/wget/default.nix
+++ b/pkgs/development/python-modules/wget/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "35e630eca2aa50ce998b9b1a127bb26b30dfee573702782aa982f875e3f16061";
+    hash = "sha256-NeYw7KKqUM6Zi5saEnuyazDf7lc3AngqqYL4dePxYGE=";
     extension = "zip";
   };
 
diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix
index 56b0c55356d9..652f1574c5d0 100644
--- a/pkgs/development/python-modules/whichcraft/default.nix
+++ b/pkgs/development/python-modules/whichcraft/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage (finalAttrs: {
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    sha256 = "11yfkzyplizdgndy34vyd5qlmr1n5mxis3a3svxmx8fnccdvknxc";
+    hash = "sha256-rNu5G2PWoV771kMNHXstNuRKcWl+k+Gbfe1Hev2fzoc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/zerorpc/default.nix b/pkgs/development/python-modules/zerorpc/default.nix
index 1ee354d22bc4..86beb58e8993 100644
--- a/pkgs/development/python-modules/zerorpc/default.nix
+++ b/pkgs/development/python-modules/zerorpc/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d2ee247a566fc703f29c277d767f6f61f1e12f76d0402faea4bd815f32cbf37f";
+    hash = "sha256-0u4kelZvxwPynCd9dn9vYfHhL3bQQC+upL2BXzLL838=";
   };
 
   propagatedBuildInputs = [

From 21b6f1711281976313dc4f8e36709dc36ffa8a01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 Oct 2026 03:51:29 +0000
Subject: [PATCH 63/78] slurm: 26-05-4-1 -> 26-05-5-1

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

diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix
index da8744b94ec6..05ba36cd6379 100644
--- a/pkgs/by-name/sl/slurm/package.nix
+++ b/pkgs/by-name/sl/slurm/package.nix
@@ -45,7 +45,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "slurm";
-  version = "26-05-4-1";
+  version = "26-05-5-1";
 
   # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
   # because the latter does not keep older releases.
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "slurm";
     # The release tags use - instead of .
     tag = "slurm-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
-    hash = "sha256-R3kHM9CohiJljffYKEe4CdNltKNQkcRuPFqOT0y+3n0=";
+    hash = "sha256-CI5xO7BYu2m+bFuveskvu+h1BL+LoP+pgSG3slRy1h0=";
   };
 
   outputs = [

From dfd4d3172dca36a9a9972631581272ff7f457ec9 Mon Sep 17 00:00:00 2001
From: Yoshihiro Imai <y.imai@aist.go.jp>
Date: Wed, 14 Oct 2026 11:54:29 +0900
Subject: [PATCH 64/78] rocqPackages.rocqnavi: switch build to dune

---
 .../rocq-modules/rocqnavi/default.nix         | 86 +++++++++++--------
 1 file changed, 51 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/rocq-modules/rocqnavi/default.nix b/pkgs/development/rocq-modules/rocqnavi/default.nix
index ea2e62cadf47..63073373031f 100644
--- a/pkgs/development/rocq-modules/rocqnavi/default.nix
+++ b/pkgs/development/rocq-modules/rocqnavi/default.nix
@@ -6,42 +6,58 @@
 }:
 
 with lib;
-mkRocqDerivation {
-  pname = "rocqnavi";
-  owner = "affeldt-aist";
+let
+  minVersion = "0.6.0";
+  isNumericVersion = v: v != null && (builtins.match "[0-9]+\\.[0-9]+(\\.[0-9]+)?" v) != null;
+  isUnsupportedOldVersion = isNumericVersion version && versions.isLt minVersion version;
+in
+if isUnsupportedOldVersion then
+  throw ''
+    rocqnavi: version "${version}" is not supported by this Nix package.
+    rocqnavi < ${minVersion} used a Makefile-only layout that is no longer built here.
+    Use version >= ${minVersion}, or "master".
+  ''
+else
+  mkRocqDerivation {
+    pname = "rocqnavi";
+    owner = "affeldt-aist";
+    opam-name = "rocq-navi";
 
-  inherit version;
-  defaultVersion =
-    let
-      case = case: out: { inherit case out; };
-    in
-    with versions;
-    switch rocq-core.rocq-version [
-      (case (range "9.0" "9.3") "0.5.0")
-    ] null;
-  release = {
-    "0.5.0".hash = "sha256-pmK4gD5ccerjr2UVgwGIVbjH/RiXdYQq79/XFetiHZg=";
-  };
-  releaseRev = v: "rocqnavi." + v;
+    inherit version;
+    defaultVersion =
+      let
+        case = case: out: { inherit case out; };
+      in
+      with versions;
+      switch rocq-core.rocq-version [
+        (case (range "9.0" "9.3") "0.6.0")
+      ] null;
+    release = {
+      "0.6.0".hash = "sha256-Ahu54GDrY9NclLCv667S+fNC9xD0ZiZF0CmKgg7kziM=";
+    };
+    releaseRev = v: "rocqnavi." + v;
 
-  nativeBuildInputs =
-    let
-      ocamlpkgs = rocq-core.ocamlPackages;
-    in
-    [
-      ocamlpkgs.yojson
-      ocamlpkgs.dune-glob
-    ];
+    nativeBuildInputs =
+      let
+        ocamlpkgs = rocq-core.ocamlPackages;
+      in
+      [
+        ocamlpkgs.yojson
+        ocamlpkgs.dune-glob
+      ];
 
-  ## Does the package contain OCaml code?
-  mlPlugin = true;
-  buildPhase = "make";
-  preInstallPhase = "mkdir $(out)/bin";
-  installFlags = [ "BINDIR=$(out)/bin" ];
+    ## Does the package contain OCaml code?
+    mlPlugin = true;
+    useDune = true;
+    installPhase = ''
+      runHook preInstall
+      dune install --prefix=$out --libdir $OCAMLFIND_DESTDIR rocq-navi
+      runHook postInstall
+    '';
 
-  meta = {
-    description = "Rocqnavi: an HTML documentation generator for Rocq prover";
-    maintainers = with maintainers; [ cohencyril ];
-    license = licenses.gpl2;
-  };
-}
+    meta = {
+      description = "Rocqnavi: an HTML documentation generator for Rocq prover";
+      maintainers = with maintainers; [ cohencyril ];
+      license = licenses.gpl2;
+    };
+  }

From b7b6d27cdfb8256fc8973c64f71b0c8977514235 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 Oct 2026 06:25:34 +0000
Subject: [PATCH 65/78] avalanche-cli: 1.9.6 -> 1.9.7

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

diff --git a/pkgs/by-name/av/avalanche-cli/package.nix b/pkgs/by-name/av/avalanche-cli/package.nix
index 959786285291..2ac2a328b11b 100644
--- a/pkgs/by-name/av/avalanche-cli/package.nix
+++ b/pkgs/by-name/av/avalanche-cli/package.nix
@@ -14,17 +14,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "avalanche-cli";
-  version = "1.9.6";
+  version = "1.9.7";
 
   src = fetchFromGitHub {
     owner = "ava-labs";
     repo = "avalanche-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bAZJRFlry7vYTTf95kTOJwcjYelN40n264oeykx7nxc=";
+    hash = "sha256-7ZNYO3SU+s6+VAq0h3EJHgUxAZ4BScbSlQwswKYQzqQ=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-0+YwlCHjiU46y333RSuaha4pLKFTYlj+M9+TFAALamY=";
+  vendorHash = "sha256-BNb3zifYaCkxiEoGnG8p0Z5gYtsdYIm22quvweFo0Jk=";
 
   env = {
     # Fix error: 'Caught SIGILL in blst_cgo_init'

From c256faff992d5a0aff8e91d8f254ab0d059db2d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 Oct 2026 08:19:53 +0000
Subject: [PATCH 66/78] mimir: 3.2.1 -> 3.2.2

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

diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix
index b317fc393f22..ba8c5a5e1f56 100644
--- a/pkgs/by-name/mi/mimir/package.nix
+++ b/pkgs/by-name/mi/mimir/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "mimir";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchFromGitHub {
     rev = "mimir-${finalAttrs.version}";
     owner = "grafana";
     repo = "mimir";
-    hash = "sha256-/i4nF4YGKvNRt/JkB4pOIIrXvZhPTvM8GEePEGP7hY8=";
+    hash = "sha256-Sz6q7Py3iJv8i1Xt9j71uSKztXLR1wwx/MbKXrpQ3AY=";
   };
 
   vendorHash = null;

From 46b891356e132cd8e036d8022cf2c9d417ed6840 Mon Sep 17 00:00:00 2001
From: Thomas Bemme <thomas.bemme@gmail.com>
Date: Wed, 14 Oct 2026 10:42:07 +0200
Subject: [PATCH 67/78] librewolf-unwrapped: 157.0.1-1 -> 158.0-1

---
 pkgs/by-name/li/librewolf-unwrapped/librewolf.nix |  4 ++--
 pkgs/by-name/li/librewolf-unwrapped/src.json      | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix
index 2dde23ea7ba5..2e612438e6ce 100644
--- a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix
+++ b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix
@@ -35,8 +35,8 @@ rec {
       patch -p1 < ${source}/$patch_name
     done <${source}/assets/patches.txt
 
-    sed -i 's/5bc8c9bbe8c0eabe408d9a7cd7a8e6e09eee0ead817607643882b38a36d07c91/bddacbe056ce7458663a39dc99d5bb3434099aa69cae793cf0c57d4e54f5a6a4/g' third_party/rust/glean-core/.cargo-checksum.json
-    sed -i 's/c20989b1aa336b0849e96ec1b2beea1eab825ffd192c2c3a636e20f830b811d0/0b43fbc5f86c6c247c5189af58be425a829c3b09018c6b26589661eec9a5ad24/g' third_party/rust/glean-core/.cargo-checksum.json
+    sed -i 's/ada8f059f0fa8a3a82315606318429d3a70200bbb2886d1a1bcaad2856a6303b/70a4a176b6494fce419e590180bc9c631945282ded0ab05bc1591bdd37b65093/g' third_party/rust/glean-core/.cargo-checksum.json
+    sed -i 's/1753c69b71ae24a9b339d98e9b71166740a15506cfc46245251eb63c0222568f/af3ae3d026bd2e26fd9cc7c710847ac4f853b0c899412ddc9ee7e0ef1027de87/g' third_party/rust/glean-core/.cargo-checksum.json
 
     rm toolkit/components/ml/content/backends/OpenAIPipeline.mjs
     rm -rf toolkit/components/ml/vendor/openai
diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json
index a9b99b9e190c..38e735de59e9 100644
--- a/pkgs/by-name/li/librewolf-unwrapped/src.json
+++ b/pkgs/by-name/li/librewolf-unwrapped/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "157.0.1-1",
+  "packageVersion": "158.0-1",
   "source": {
-    "rev": "157.0.1-1",
-    "hash": "sha256-4jzQrMj6yJ85jxp430QS/Z6l3vRyLrJWdnPYGF4K9mQ="
+    "rev": "158.0-1",
+    "hash": "sha256-mms+zReSvmzzqhkiL9HrnaS5ZUPoNVB++2WT8/ppYNQ="
   },
   "firefox": {
-    "version": "157.0.1",
-    "hash": "sha512-wBkgKy+H0ls2Bbv3Jm87tNWXReSFNvKX0/AMw1JKHNLrpBalo80Ozuawdi0PNb88X8zihuvHvHQSY769DxAoWA=="
+    "version": "158.0",
+    "hash": "sha512-FLj/3DJaI0Bh2xTeqb0UR4bcLIRGil3+K7cLuVWPY/c0J88kTq9GEBDuAd/fBPLK5ouunwe0ggYDpLzURi95YA=="
   }
 }

From fa25501d269d34e0b42b8e8ff3c78d7d20014e51 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 14 Oct 2026 12:12:25 +0300
Subject: [PATCH 68/78] python3Packages.imagededup: modernize

---
 .../python-modules/imagededup/default.nix        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/imagededup/default.nix b/pkgs/development/python-modules/imagededup/default.nix
index 4ec51494bc37..45f341788b42 100644
--- a/pkgs/development/python-modules/imagededup/default.nix
+++ b/pkgs/development/python-modules/imagededup/default.nix
@@ -14,6 +14,7 @@
   torch,
   torchvision,
   tqdm,
+  writableTmpDirAsHomeHook,
 }:
 let
   MobileNetV3 = fetchurl {
@@ -29,7 +30,7 @@ let
     hash = "sha256-I6uLzVvb72GnpDuRrcrYH2Iv1/NvtJNaVpgo13iIxE4=";
   };
 in
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "imagededup";
   version = "0.3.3.post2";
   pyproject = true;
@@ -37,7 +38,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "idealo";
     repo = "imagededup";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-+/83xsfbrny8x7szVQezix+FBYvoeYXNfTA+Go18ASY=";
   };
 
@@ -47,12 +48,12 @@ buildPythonPackage rec {
       --replace-fail 'exclude = ["tests*"]' 'exclude = ["tests*", "mkdocs*"]'
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     cython
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     matplotlib
     pillow
     pywavelets
@@ -65,11 +66,10 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-mock
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ];
 
   preCheck = ''
-    export HOME=$(mktemp -d)
-
     # Checks with CNN are preloaded to avoid downloads in the check phase
     mkdir -p $HOME/.cache/torch/hub/checkpoints/
     ln -s ${MobileNetV3} $HOME/.cache/torch/hub/checkpoints/${MobileNetV3.name}
@@ -86,9 +86,9 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "https://idealo.github.io/imagededup/";
-    changelog = "https://github.com/idealo/imagededup/releases/tag/${src.tag}";
+    changelog = "https://github.com/idealo/imagededup/releases/tag/${finalAttrs.src.tag}";
     description = "Finding duplicate images made easy";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ stunkymonkey ];
   };
-}
+})

From da3419146ddb3ea76a83cee612a11bd97abebd8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 Oct 2026 09:13:54 +0000
Subject: [PATCH 69/78] silverbullet: 2.11.1 -> 2.12.1

---
 pkgs/by-name/si/silverbullet/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/si/silverbullet/package.nix b/pkgs/by-name/si/silverbullet/package.nix
index 869105dadb39..2dbd9bb2619e 100644
--- a/pkgs/by-name/si/silverbullet/package.nix
+++ b/pkgs/by-name/si/silverbullet/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "silverbullet";
-  version = "2.11.1";
+  version = "2.12.1";
 
   src = fetchFromGitHub {
     owner = "silverbulletmd";
     repo = "silverbullet";
     rev = finalAttrs.version;
-    hash = "sha256-+8q0gQ4pRdGHPE7woH/+cteLoUQ5qhEIGI+AhwkXN5E=";
+    hash = "sha256-tXzfqelNwlG3iVIkhVDmXjDR6iKaUbVH5NQicDyHsDQ=";
   };
 
-  cargoHash = "sha256-t2RDrdZsCMReDGUUu3r59OAosZNY3TMlvjo/uM2xL8g=";
+  cargoHash = "sha256-v0CJqq3Rz2dMyl8mA1hj1brnvbRc8rVo8UhOIQnNWFo=";
 
   cargoBuildFlags = [
     "-p"
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     pname = "silverbullet-frontend";
     inherit (finalAttrs) version src;
 
-    npmDepsHash = "sha256-IALStufO5TwhQbkIgSqwTYcQAL7Q+vmLDjlVYzMTyCA=";
+    npmDepsHash = "sha256-1bzN7tsERaRUc9J3Yr23mj6kP/eZ9pW771ODUEW75lo=";
 
     patches = [
       (replaceVars ./override-version.patch { inherit (finalAttrs) version; })

From c10517edf4a9778d14a515bfc123398c8cc5b0aa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 14 Oct 2026 11:16:58 +0200
Subject: [PATCH 70/78] python316: init at 3.16.0a1

https://docs.python.org/3.16/whatsnew/changelog.html#python-3-16-0-alpha-1
---
 doc/languages-frameworks/python.section.md    |  1 +
 .../python/cpython/3.16/no-ldconfig.patch     | 40 +++++++++++++++++++
 .../interpreters/python/cpython/default.nix   |  2 +-
 .../interpreters/python/default.nix           | 12 ++++++
 pkgs/top-level/all-packages.nix               |  7 ++++
 5 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/python/cpython/3.16/no-ldconfig.patch

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index ecda096fd2a2..3ad93703b9b7 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -54,6 +54,7 @@ sets are
 * `pkgs.python313Packages`
 * `pkgs.python314Packages`
 * `pkgs.python315Packages`
+* `pkgs.python316Packages`
 * `pkgs.pypy27Packages`
 * `pkgs.pypy310Packages`
 
diff --git a/pkgs/development/interpreters/python/cpython/3.16/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.16/no-ldconfig.patch
new file mode 100644
index 000000000000..da7231dc7e87
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.16/no-ldconfig.patch
@@ -0,0 +1,40 @@
+diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+index f4fb05c29b4..c6a119e8e72 100644
+--- a/Lib/ctypes/util.py
++++ b/Lib/ctypes/util.py
+@@ -352,34 +352,7 @@ def find_library(name, is64 = False):
+     else:
+ 
+         def _findSoname_ldconfig(name):
+-            import struct
+-            if struct.calcsize('l') == 4:
+-                machine = os.uname().machine + '-32'
+-            else:
+-                machine = os.uname().machine + '-64'
+-            mach_map = {
+-                'x86_64-64': 'libc6,x86-64',
+-                'ppc64-64': 'libc6,64bit',
+-                'sparc64-64': 'libc6,64bit',
+-                's390x-64': 'libc6,64bit',
+-                'ia64-64': 'libc6,IA-64',
+-                }
+-            abi_type = mach_map.get(machine, 'libc6')
+-
+-            # XXX assuming GLIBC's ldconfig (with option -p)
+-            regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
+-            regex = os.fsencode(regex % (re.escape(name), abi_type))
+-            try:
+-                with subprocess.Popen(['/sbin/ldconfig', '-p'],
+-                                      stdin=subprocess.DEVNULL,
+-                                      stderr=subprocess.DEVNULL,
+-                                      stdout=subprocess.PIPE,
+-                                      env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
+-                    res = re.search(regex, p.stdout.read())
+-                    if res:
+-                        return os.fsdecode(res.group(1))
+-            except OSError:
+-                pass
++            return None
+ 
+         def _findLib_ld(name):
+             # See issue #9998 for why this is needed
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 767b4f05a19e..81d7d51857f3 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -589,7 +589,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Ensure that modern platform features are enabled on Darwin in spite of having no version suffix.
     sed -E -i -e 's|Darwin/\[12\]\[0-9\]\.\*|Darwin/*|' configure
   ''
-  + optionalString (pythonAtLeast "3.11") ''
+  + optionalString (pythonAtLeast "3.11" && pythonOlder "3.16") ''
     # Also override the auto-detection in `configure`.
     substituteInPlace configure \
       --replace-fail 'libmpdec_machine=universal' 'libmpdec_machine=${
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index cc39505b74aa..44d2861b022a 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -86,6 +86,18 @@
       inherit passthruFun;
     };
 
+    python316 = callPackage ./cpython {
+      self = __splicedPackages.python315;
+      sourceVersion = {
+        major = "3";
+        minor = "16";
+        patch = "0";
+        suffix = "a1";
+      };
+      hash = "sha256-3KqQKUNrcj4zQSxoyhfwEwvnMFjkejp8BJy4zfYDTuk=";
+      inherit passthruFun;
+    };
+
     # Minimal versions of Python (built without optional dependencies)
     python3Minimal =
       (callPackage ./cpython (
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07fa48430d7c..b4f641e83b5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4456,6 +4456,11 @@ with pkgs;
     pythonAttr = "python315FreeThreading";
     enableGIL = false;
   };
+  python316FreeThreading = python315.override {
+    self = python316FreeThreading;
+    pythonAttr = "python316FreeThreading";
+    enableGIL = false;
+  };
 
   pythonInterpreters = callPackage ./../development/interpreters/python { };
   inherit (pythonInterpreters)
@@ -4464,6 +4469,7 @@ with pkgs;
     python313
     python314
     python315
+    python316
     python3Minimal
     pypy27
     pypy310
@@ -4479,6 +4485,7 @@ with pkgs;
   python313Packages = recurseIntoAttrs python313.pkgs;
   python314Packages = recurseIntoAttrs python314.pkgs;
   python315Packages = python315.pkgs;
+  python316Packages = python316.pkgs;
   pypyPackages = pypy.pkgs;
   pypy2Packages = pypy2.pkgs;
   pypy27Packages = pypy27.pkgs;

From 17f06ca2804d654311f1a3e144406a2257857792 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 10 Sep 2026 19:00:01 +0300
Subject: [PATCH 71/78] kdePackages.kquickimageedit: 0.6.1 -> 0.7.0.1

---
 pkgs/development/libraries/kquickimageedit/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kquickimageedit/default.nix b/pkgs/development/libraries/kquickimageedit/default.nix
index 561d4cd3d357..2db1b21b8712 100644
--- a/pkgs/development/libraries/kquickimageedit/default.nix
+++ b/pkgs/development/libraries/kquickimageedit/default.nix
@@ -6,19 +6,20 @@
   kdePackages,
   qtbase,
   qtdeclarative,
+  libhwy,
   opencv,
 }:
 
 stdenv.mkDerivation rec {
   pname = "kquickimageeditor";
-  version = "0.6.1";
+  version = "0.7.0.1";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "libraries";
     repo = "kquickimageeditor";
     rev = "v${version}";
-    sha256 = "sha256-MluY8nkMtg1uLAStDZFDxyJoeDrcp3smZ4U5IG5sXMk=";
+    sha256 = "sha256-xNMXEVU/fflaHbDSgTwsj1QcH77CUFCgPJI5f60TEEg=";
   };
 
   nativeBuildInputs = [
@@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
     kdePackages.kirigami
     qtbase
     qtdeclarative
+    libhwy
     (opencv.override {
       enableCuda = false; # fails to compile, disabled in case someone sets config.cudaSupport
       enabledModules = [

From 5d51d74e594dfe9fee3c19ada9270b675982a4b4 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 10 Sep 2026 19:00:16 +0300
Subject: [PATCH 72/78] kdePackages.cxx-rust-cssparser: 1.0.0 -> 1.1.0

---
 pkgs/kde/misc/cxx-rust-cssparser/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/kde/misc/cxx-rust-cssparser/default.nix b/pkgs/kde/misc/cxx-rust-cssparser/default.nix
index 17b0cf8a5f0e..6d229cb2b9d4 100644
--- a/pkgs/kde/misc/cxx-rust-cssparser/default.nix
+++ b/pkgs/kde/misc/cxx-rust-cssparser/default.nix
@@ -11,14 +11,14 @@
 
 mkKdeDerivation rec {
   pname = "cxx-rust-cssparser";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "libraries";
     repo = "cxx-rust-cssparser";
     tag = "v${version}";
-    hash = "sha256-zYY9GmQb/Qbbu8AhOGHfrrQ563cIrnx9KMGkdledURw=";
+    hash = "sha256-0GO299lTzKh6YwNytuDHu+JlBT+d9E4R1VDWrXueVlM=";
   };
 
   extraNativeBuildInputs = [
@@ -41,7 +41,7 @@ mkKdeDerivation rec {
       src
       cargoRoot
       ;
-    hash = "sha256-CdOvP7VxS2JMD3MlRtc6QNUCGiVMGxiKayLG6vn6n+8=";
+    hash = "sha256-Ukb/LbMMHfeazHiTpwKKAZV2nx5tXZZxJYbLGe9RaVM=";
   };
 
   dontWrapQtApps = true;

From 102e1171e4bcef1ee2d9dce43932c8b0608aea76 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 10 Sep 2026 19:00:30 +0300
Subject: [PATCH 73/78] kdePackages.plasma-wayland-protocols: 1.21.0 -> 1.23.0

---
 pkgs/kde/misc/plasma-wayland-protocols/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/kde/misc/plasma-wayland-protocols/default.nix b/pkgs/kde/misc/plasma-wayland-protocols/default.nix
index e60ca8416764..2e830245417f 100644
--- a/pkgs/kde/misc/plasma-wayland-protocols/default.nix
+++ b/pkgs/kde/misc/plasma-wayland-protocols/default.nix
@@ -5,11 +5,11 @@
 }:
 mkKdeDerivation rec {
   pname = "plasma-wayland-protocols";
-  version = "1.21.0";
+  version = "1.23.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/plasma-wayland-protocols/plasma-wayland-protocols-${version}.tar.xz";
-    hash = "sha256-aYp7KLcRJwMU45biSK6GCHz+rtATcgCQY5lb5uHchbo=";
+    hash = "sha256-FsWtkXveLteVlC2sunZlSBndxqFWaEIyXvNOC1U+8Tg=";
   };
 
   meta.license = with lib.licenses; [

From 88b6dc79b98093896b5a50396c9434a78949a07f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 10 Sep 2026 20:06:20 +0300
Subject: [PATCH 74/78] kdePackages: Plasma 6.7.5 -> 6.8.0

---
 .../services/desktop-managers/plasma6.nix     |   2 -
 nixos/tests/plasma6.nix                       |  20 +-
 pkgs/kde/default.nix                          |   7 +-
 pkgs/kde/generated/dependencies.json          | 105 ++--
 pkgs/kde/generated/licenses.json              |  49 +-
 pkgs/kde/generated/projects.json              |  18 +-
 pkgs/kde/generated/sources/plasma.json        | 452 +++++++++---------
 pkgs/kde/misc/kup/default.nix                 |  25 -
 pkgs/kde/plasma/default.nix                   |   4 +-
 pkgs/kde/plasma/kdeplasma-addons/default.nix  |   2 +-
 pkgs/kde/plasma/kgamma/default.nix            |   9 -
 pkgs/kde/plasma/kinfocenter/default.nix       |   7 +-
 pkgs/kde/plasma/krdp/default.nix              |   4 +-
 pkgs/kde/plasma/kscreenlocker/default.nix     |   2 -
 pkgs/kde/plasma/kup/default.nix               |   9 +
 ...-executable-name-for-.desktop-search.patch | 114 -----
 pkgs/kde/plasma/kwin-x11/default.nix          |  47 --
 ...-executable-name-for-.desktop-search.patch |  71 +--
 pkgs/kde/plasma/kwin/default.nix              |   8 +
 .../kwin/plasma-setup-xwayland-path.patch     |  23 +
 pkgs/kde/plasma/plasma-bigscreen/default.nix  |   3 +
 pkgs/kde/plasma/plasma-workspace/default.nix  |   9 +-
 .../plasma-workspace/dependency-paths.patch   | 103 +---
 .../plasma/plasma-workspace/fontconfig.patch  |  69 ---
 pkgs/kde/plasma/powerdevil/default.nix        |  10 -
 pkgs/kde/plasma/wacomtablet/default.nix       |  16 -
 .../plasma/xdg-desktop-portal-kde/default.nix |   2 +
 27 files changed, 396 insertions(+), 794 deletions(-)
 delete mode 100644 pkgs/kde/misc/kup/default.nix
 delete mode 100644 pkgs/kde/plasma/kgamma/default.nix
 create mode 100644 pkgs/kde/plasma/kup/default.nix
 delete mode 100644 pkgs/kde/plasma/kwin-x11/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
 delete mode 100644 pkgs/kde/plasma/kwin-x11/default.nix
 create mode 100644 pkgs/kde/plasma/kwin/plasma-setup-xwayland-path.patch
 delete mode 100644 pkgs/kde/plasma/plasma-workspace/fontconfig.patch
 delete mode 100644 pkgs/kde/plasma/wacomtablet/default.nix

diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index f6106d3e83fe..81a9f87f4b2c 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -152,7 +152,6 @@ in
           plasma-browser-integration
           plasma-workspace-wallpapers
           konsole
-          kwin-x11
           (lib.getBin qttools) # Expose qdbus in PATH
           ark
           elisa
@@ -223,7 +222,6 @@ in
       ++ lib.optional config.services.colord.enable colord-kde
       ++ lib.optional config.services.hardware.bolt.enable plasma-thunderbolt
       ++ lib.optional config.services.samba.enable kdenetwork-filesharing
-      ++ lib.optional config.services.xserver.wacom.enable wacomtablet
       ++ lib.optional config.services.flatpak.enable flatpak-kcm;
 
     environment.pathsToLink = [
diff --git a/nixos/tests/plasma6.nix b/nixos/tests/plasma6.nix
index 330dea78edcf..4ab206844462 100644
--- a/nixos/tests/plasma6.nix
+++ b/nixos/tests/plasma6.nix
@@ -13,8 +13,6 @@
       imports = [ ./common/user-account.nix ];
       services.xserver.enable = true;
       services.displayManager.plasma-login-manager.enable = true;
-      # FIXME: this should be testing Wayland
-      services.displayManager.defaultSession = "plasmax11";
       services.desktopManager.plasma6.enable = true;
       environment.plasma6.excludePackages = [ pkgs.kdePackages.elisa ];
       services.displayManager.autoLogin = {
@@ -27,19 +25,13 @@
     { nodes, ... }:
     let
       user = nodes.machine.users.users.alice;
-      xdo = "${pkgs.xdotool}/bin/xdotool";
     in
     ''
       with subtest("Wait for login"):
           start_all()
-          machine.wait_for_file("/run/user/1000/xauth_*")
-          machine.wait_until_succeeds("test -s /run/user/1000/xauth_*")
-          machine.succeed("xauth merge /run/user/1000/xauth_*")
-          machine.succeed("su - ${user.name} -c 'xauth merge /run/user/1000/xauth_*'")
 
       with subtest("Check plasmashell started"):
           machine.wait_until_succeeds("pgrep plasmashell")
-          machine.wait_for_window("^Desktop ")
 
       with subtest("Check that KDED is running"):
           machine.succeed("pgrep kded6")
@@ -48,21 +40,15 @@
           machine.fail("which elisa")
 
       with subtest("Run Dolphin"):
-          machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 dolphin >&2 &'")
-          machine.wait_for_window(" Dolphin")
+          machine.execute("su - ${user.name} -c 'WAYLAND_DISPLAY=/run/user/1000/wayland-0 dolphin >&2 &'")
 
       with subtest("Run Konsole"):
-          machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 konsole >&2 &'")
-          machine.wait_for_window("Konsole")
+          machine.execute("su - ${user.name} -c 'WAYLAND_DISPLAY=/run/user/1000/wayland-0 konsole >&2 &'")
 
       with subtest("Run systemsettings"):
-          machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 systemsettings >&2 &'")
-          machine.wait_for_window("Settings")
+          machine.execute("su - ${user.name} -c 'WAYLAND_DISPLAY=/run/user/1000/wayland-0 systemsettings >&2 &'")
 
       with subtest("Wait to get a screenshot"):
-          machine.execute(
-              "${xdo} key Alt+F1 sleep 10"
-          )
           machine.screenshot("screen")
     '';
 }
diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix
index 3b481a23d166..6bec1e90a222 100644
--- a/pkgs/kde/default.nix
+++ b/pkgs/kde/default.nix
@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   generateSplicesForMkScope,
   makeScopeWithSplicing',
@@ -81,7 +82,6 @@ let
         kio-snapshot = self.callPackage ./misc/kio-snapshot { };
         klevernotes = self.callPackage ./misc/klevernotes { };
         ktextaddons = self.callPackage ./misc/ktextaddons { };
-        kup = self.callPackage ./misc/kup { };
         marknote = self.callPackage ./misc/marknote { };
         mpvqt = self.callPackage ./misc/mpvqt { };
         phonon = self.callPackage ./misc/phonon { };
@@ -99,6 +99,11 @@ let
         kzones = self.callPackage ./third-party/kzones { };
         wallpaper-engine-plugin = self.callPackage ./third-party/wallpaper-engine-plugin { };
       }
+      // (lib.optionalAttrs config.allowAliases {
+        kgamma = throw "kdePackages.kgamma was removed as it only worked in the X11 session, which is EOL upstream";
+        kwin-x11 = throw "kdePackages.kgamma was removed as it is EOL upstream";
+        wacomtablet = throw "kdePackages.wacomtablet was removed as it only worked in the X11 session, which is EOL upstream";
+      })
     );
 in
 makeScopeWithSplicing' {
diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json
index 172a745d64ad..b25200564e21 100644
--- a/pkgs/kde/generated/dependencies.json
+++ b/pkgs/kde/generated/dependencies.json
@@ -621,8 +621,7 @@
       "kirigami-addons",
       "kitemmodels",
       "qcoro",
-      "qqc2-desktop-style",
-      "qtkeychain"
+      "qqc2-desktop-style"
     ],
     "colord-kde": [
       "extra-cmake-modules",
@@ -636,6 +635,7 @@
     ],
     "crow-translate": [
       "extra-cmake-modules",
+      "kiconthemes",
       "kwayland"
     ],
     "cxx-kde-frameworks": [
@@ -762,6 +762,7 @@
       "kuserfeedback",
       "kwidgetsaddons",
       "kxmlgui",
+      "sonnet",
       "syntax-highlighting"
     ],
     "drkonqi": [
@@ -1677,6 +1678,7 @@
     "kconfigeditor": [
       "extra-cmake-modules",
       "kconfig",
+      "kcoreaddons",
       "kirigami"
     ],
     "kconfigwidgets": [
@@ -1693,7 +1695,6 @@
       "extra-cmake-modules",
       "kcodecs",
       "kconfig",
-      "kcoreaddons",
       "ki18n"
     ],
     "kcoreaddons": [
@@ -1715,7 +1716,8 @@
     ],
     "kdav": [
       "extra-cmake-modules",
-      "kio"
+      "kcoreaddons",
+      "ki18n"
     ],
     "kdbusaddons": [
       "extra-cmake-modules"
@@ -1787,6 +1789,7 @@
     ],
     "kdebugsettings": [
       "extra-cmake-modules",
+      "kcmutils",
       "kcompletion",
       "kconfig",
       "kcoreaddons",
@@ -2305,14 +2308,6 @@
       "kxmlgui",
       "libkdegames"
     ],
-    "kgamma": [
-      "extra-cmake-modules",
-      "kcmutils",
-      "kconfig",
-      "kconfigwidgets",
-      "kdoctools",
-      "ki18n"
-    ],
     "kgeography": [
       "extra-cmake-modules",
       "kconfigwidgets",
@@ -2684,6 +2679,7 @@
     ],
     "kio-snapshot": [
       "extra-cmake-modules",
+      "ki18n",
       "kio"
     ],
     "kio-stash": [
@@ -2731,6 +2727,13 @@
       "kirigami",
       "kitemmodels"
     ],
+    "kirigami-workbench": [
+      "extra-cmake-modules",
+      "kcoreaddons",
+      "ki18n",
+      "ktexteditor",
+      "kxmlgui"
+    ],
     "kiriki": [
       "extra-cmake-modules",
       "kconfig",
@@ -3227,6 +3230,7 @@
       "kdbusaddons",
       "kdeclarative",
       "kfilemetadata",
+      "kguiaddons",
       "ki18n",
       "kio",
       "kirigami",
@@ -3336,7 +3340,8 @@
       "kirigami",
       "kirigami-addons",
       "knotifications",
-      "kosmindoormap"
+      "kosmindoormap",
+      "qqc2-desktop-style"
     ],
     "konlineaccounts": [
       "extra-cmake-modules",
@@ -3510,7 +3515,6 @@
       "kiconthemes",
       "kitemviews",
       "kjobwidgets",
-      "kldap",
       "kmailtransport",
       "kmime",
       "kontactinterface",
@@ -3955,6 +3959,7 @@
     ],
     "ksshaskpass": [
       "extra-cmake-modules",
+      "kconfig",
       "kcoreaddons",
       "kdoctools",
       "ki18n",
@@ -4125,7 +4130,6 @@
     "ktnef": [
       "extra-cmake-modules",
       "kcalendarcore",
-      "kcalutils",
       "kcontacts"
     ],
     "ktorrent": [
@@ -4380,43 +4384,6 @@
       "wayland",
       "wayland-protocols"
     ],
-    "kwin-x11": [
-      "aurorae",
-      "breeze",
-      "breeze-icons",
-      "extra-cmake-modules",
-      "kcmutils",
-      "kconfig",
-      "kconfigwidgets",
-      "kcoreaddons",
-      "kcrash",
-      "kdeclarative",
-      "kdecoration",
-      "kdoctools",
-      "kglobalaccel",
-      "kglobalacceld",
-      "ki18n",
-      "kidletime",
-      "kirigami",
-      "knewstuff",
-      "knighttime",
-      "knotifications",
-      "kpackage",
-      "kscreenlocker",
-      "kservice",
-      "ksvg",
-      "kwayland",
-      "kwidgetsaddons",
-      "kwindowsystem",
-      "kxmlgui",
-      "libplasma",
-      "libqaccessibilityclient",
-      "plasma-activities",
-      "plasma-wayland-protocols",
-      "plasma-workspace",
-      "wayland",
-      "wayland-protocols"
-    ],
     "kwin-zones": [
       "extra-cmake-modules",
       "kconfig",
@@ -4569,7 +4536,6 @@
       "kcoreaddons",
       "ki18n",
       "kitemmodels",
-      "ktextaddons",
       "kwidgetsaddons"
     ],
     "libkmahjongg": [
@@ -4874,7 +4840,6 @@
       "akonadi-calendar",
       "extra-cmake-modules",
       "kcalendarcore",
-      "kcalutils",
       "kconfigwidgets",
       "kcontacts",
       "kcrash",
@@ -4909,8 +4874,7 @@
       "libgravatar",
       "libkdepim",
       "libkleo",
-      "pimcommon",
-      "qca"
+      "pimcommon"
     ],
     "milou": [
       "extra-cmake-modules",
@@ -5064,6 +5028,14 @@
     "oxygen-sounds": [
       "extra-cmake-modules"
     ],
+    "package-compatibility-helper": [
+      "extra-cmake-modules",
+      "kcoreaddons",
+      "ki18n",
+      "kio",
+      "kirigami",
+      "kirigami-addons"
+    ],
     "palapeli": [
       "extra-cmake-modules",
       "karchive",
@@ -5739,6 +5711,7 @@
       "selenium-webdriver-at-spi",
       "solid",
       "sonnet",
+      "union",
       "wayland",
       "wayland-protocols"
     ],
@@ -6446,23 +6419,6 @@
       "mauikit-accounts",
       "mauikit-filebrowsing"
     ],
-    "wacomtablet": [
-      "extra-cmake-modules",
-      "kcmutils",
-      "kconfig",
-      "kcoreaddons",
-      "kdbusaddons",
-      "kdoctools",
-      "kglobalaccel",
-      "ki18n",
-      "kio",
-      "knotifications",
-      "kwidgetsaddons",
-      "kwindowsystem",
-      "kxmlgui",
-      "libplasma",
-      "plasma5support"
-    ],
     "washipad": [
       "extra-cmake-modules",
       "kcoreaddons",
@@ -6509,6 +6465,7 @@
       "extra-cmake-modules",
       "kcoreaddons",
       "kcrash",
+      "kdbusaddons",
       "ki18n",
       "kpipewire",
       "kstatusnotifieritem",
@@ -6547,5 +6504,5 @@
       "kwindowsystem"
     ]
   },
-  "version": "929dcd4d"
+  "version": "8d0272c8"
 }
\ No newline at end of file
diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json
index cf2383a40669..ea965aa27596 100644
--- a/pkgs/kde/generated/licenses.json
+++ b/pkgs/kde/generated/licenses.json
@@ -232,9 +232,9 @@
   ],
   "blinken": [
     "CC0-1.0",
+    "Font-exception-2.0",
     "GFDL-1.2-only",
-    "GPL-2.0-or-later",
-    "LicenseRef-SJFonts"
+    "GPL-2.0-or-later"
   ],
   "bluedevil": [
     "BSD-2-Clause",
@@ -330,7 +330,6 @@
   "calligra": [
     "BSD-2-Clause",
     "BSD-3-Clause",
-    "BSD-3-Clauses",
     "BSL-1.0",
     "CC0-1.0",
     "CPL-1.0",
@@ -1200,10 +1199,6 @@
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-LGPL"
   ],
-  "kgamma": [
-    "CC0-1.0",
-    "GPL-2.0-or-later"
-  ],
   "kgeography": [
     "CC0-1.0"
   ],
@@ -1273,6 +1268,7 @@
     "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
+    "GPL-2.0-or-later",
     "LGPL-2.0-or-later",
     "LGPL-2.1-only",
     "LGPL-3.0-only",
@@ -1795,6 +1791,7 @@
   ],
   "korganizer": [
     "BSD-3-Clause",
+    "CC-BY-3.0",
     "CC0-1.0",
     "GPL-2.0-or-later",
     "LGPL-2.0-only",
@@ -1969,6 +1966,7 @@
     "LicenseRef-KDE-Accepted-LGPL"
   ],
   "kscreen": [
+    "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
@@ -2029,6 +2027,7 @@
     "GPL-2.0-or-later"
   ],
   "ksshaskpass": [
+    "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-or-later"
   ],
@@ -2152,6 +2151,13 @@
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-LGPL"
   ],
+  "kup": [
+    "CC0-1.0",
+    "GPL-2.0-only",
+    "GPL-2.0-or-later",
+    "GPL-3.0-only",
+    "LicenseRef-KDE-Accepted-GPL"
+  ],
   "kuserfeedback": [
     "BSD-3-Clause",
     "CC0-1.0",
@@ -2160,6 +2166,7 @@
   "kwallet": [
     "BSD-3-Clause",
     "CC0-1.0",
+    "GPL-2.0-or-later",
     "GPL-3.0-only",
     "LGPL-2.0-only",
     "LGPL-2.0-or-later",
@@ -2242,22 +2249,6 @@
     "LicenseRef-KDE-Accepted-LGPL",
     "MIT"
   ],
-  "kwin-x11": [
-    "BSD-2-Clause",
-    "BSD-3-Clause",
-    "CC0-1.0",
-    "GPL-2.0-only",
-    "GPL-2.0-or-later",
-    "GPL-3.0-only",
-    "LGPL-2.0-only",
-    "LGPL-2.0-or-later",
-    "LGPL-2.1-only",
-    "LGPL-2.1-or-later",
-    "LGPL-3.0-only",
-    "LicenseRef-KDE-Accepted-GPL",
-    "LicenseRef-KDE-Accepted-LGPL",
-    "MIT"
-  ],
   "kwindowsystem": [
     "CC0-1.0",
     "LGPL-2.0-or-later",
@@ -2320,7 +2311,7 @@
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-or-later",
-    "ICS",
+    "ISC",
     "LGPL-2.0-only"
   ],
   "libkdepim": [
@@ -2375,11 +2366,8 @@
   "libkscreen": [
     "BSD-3-Clause",
     "CC0-1.0",
-    "GPL-2.0-only",
     "GPL-2.0-or-later",
-    "GPL-3.0-only",
-    "LGPL-2.1-or-later",
-    "LicenseRef-KDE-Accepted-GPL"
+    "LGPL-2.1-or-later"
   ],
   "libksieve": [
     "BSD-3-Clause",
@@ -2421,7 +2409,6 @@
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-GPL",
     "LicenseRef-KDE-Accepted-LGPL",
-    "LicenseRef-Qt-Commercial",
     "Qt-LGPL-exception-1.1"
   ],
   "lokalize": [
@@ -2786,9 +2773,11 @@
     "LicenseRef-KDE-Accepted-GPL"
   ],
   "plasma-integration": [
+    "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
+    "GPL-2.0-or-later",
     "GPL-3.0-only",
     "LGPL-2.0-only",
     "LGPL-2.0-or-later",
@@ -2814,6 +2803,7 @@
     "LicenseRef-Qt-Commercial"
   ],
   "plasma-login-manager": [
+    "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
@@ -3258,7 +3248,6 @@
     "LicenseRef-KDE-Accepted-LGPL",
     "MIT"
   ],
-  "wacomtablet": [],
   "xdg-desktop-portal-kde": [
     "BSD-2-Clause",
     "CC0-1.0",
diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json
index 43ee4c5bad80..52356ed3073a 100644
--- a/pkgs/kde/generated/projects.json
+++ b/pkgs/kde/generated/projects.json
@@ -4376,8 +4376,8 @@
   "kup": {
     "description": "Backup scheduler for the Plasma desktop",
     "name": "kup",
-    "project_path": "system/kup",
-    "repo_path": "system/kup"
+    "project_path": "workspace/kup",
+    "repo_path": "plasma/kup"
   },
   "kuser": {
     "description": "KDE User Manager",
@@ -4571,6 +4571,12 @@
     "project_path": "localization/l10n-templates",
     "repo_path": "localization/l10n-templates"
   },
+  "l10n-umbrella": {
+    "description": "Umbrella repository to allow checking out the most current version of all languages",
+    "name": "l10n-umbrella",
+    "project_path": "localization/l10n-umbrella",
+    "repo_path": "localization/l10n-umbrella"
+  },
   "labplot": {
     "description": "LabPlot is a FREE, open source and cross-platform Data Visualization and Analysis software accessible to everyone.",
     "name": "labplot",
@@ -7980,7 +7986,7 @@
     "repo_path": "websites/l10n-kde-org"
   },
   "websites-labplot-org": {
-    "description": "Website for Labplot - labplot.org",
+    "description": "Website for LabPlot - labplot.org",
     "name": "websites-labplot-org",
     "project_path": "websites/labplot-org",
     "repo_path": "websites/labplot-org"
@@ -8105,6 +8111,12 @@
     "project_path": "websites/libregraphicsmeeting-org-2026",
     "repo_path": "websites/libregraphicsmeeting-org-2026"
   },
+  "websites-libregraphicsmeeting-org-2027": {
+    "description": "Website for Libre Graphics Meeting 2027",
+    "name": "websites-libregraphicsmeeting-org-2027",
+    "project_path": "websites/libregraphicsmeeting-org-2027",
+    "repo_path": "websites/libregraphicsmeeting-org-2027"
+  },
   "websites-linux-kde-org": {
     "description": "Website for KDE Linux - linux.kde.org",
     "name": "websites-linux-kde-org",
diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index 9c67f3ccf25d..acfed3b8beb2 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,377 +1,367 @@
 {
   "aurorae": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/aurorae-6.7.5.tar.xz",
-    "hash": "sha256-fkMF1OKGmAJPzXl1VMythL/U7U5b3LD0K12nf6skRBY="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/aurorae-6.8.0.tar.xz",
+    "hash": "sha256-sBLjiU6xz+jLC/IOy0iqwYzWVTWZQaU4f1IeO7naK5E="
   },
   "bluedevil": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/bluedevil-6.7.5.tar.xz",
-    "hash": "sha256-H2wLATJ7S14t3PEf2OSz5mukksnGbGGpXU3f0liFDV8="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/bluedevil-6.8.0.tar.xz",
+    "hash": "sha256-Is+AubHrbhA5xkad2j9pMoM/GS9ATUt+ffR/GFQgCi8="
   },
   "breeze": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/breeze-6.7.5.tar.xz",
-    "hash": "sha256-qgXAwxyFLtWxNzJ+d5j9djpUxkOHXV2AcGJUdeCvaXY="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/breeze-6.8.0.tar.xz",
+    "hash": "sha256-a9sFRxJsoln4i7KIaEIjZMbgrj57EDR5+sDfg1/94oc="
   },
   "breeze-grub": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/breeze-grub-6.7.5.tar.xz",
-    "hash": "sha256-vRRxauUtlG43gzs6AtJZ9SaGg6+DgsISMMHOfXZ/Ayo="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/breeze-grub-6.8.0.tar.xz",
+    "hash": "sha256-7BI4I9DcU6cWenEPJyLP2isdvE+bYH2V1tTYEM0qrLw="
   },
   "breeze-gtk": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/breeze-gtk-6.7.5.tar.xz",
-    "hash": "sha256-Tg6ROwUV3nVJIVXQKMCGxKUio/aOu29PqxD4vGRs1Rg="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/breeze-gtk-6.8.0.tar.xz",
+    "hash": "sha256-YgRrlTjlQqNoLhlaw0CWBcuqFvA//HjRt3Fd4qHiQJw="
   },
   "breeze-plymouth": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/breeze-plymouth-6.7.5.tar.xz",
-    "hash": "sha256-nLBe9P7VrBm8NfXEsY7EJeSZ+uR9UtNEgh+/OEdMRKA="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/breeze-plymouth-6.8.0.tar.xz",
+    "hash": "sha256-BlT1UPrVZX1PzP+c/Y10qQjfl8WUw+FmCmK6INE/c0w="
   },
   "discover": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/discover-6.7.5.tar.xz",
-    "hash": "sha256-6YMP/+vFTHgdywdttKuUYu4n3df9N2lAOiEXQ2NuH2c="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/discover-6.8.0.tar.xz",
+    "hash": "sha256-239FU4Uub7vK9Un8d/wsCFbl5yF3Rczxq4tHPh1a1uQ="
   },
   "drkonqi": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/drkonqi-6.7.5.tar.xz",
-    "hash": "sha256-nQK5vYU0rJjbt3pzJIESZU4t7jqxzzzFnmm6eAJ6tCM="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/drkonqi-6.8.0.tar.xz",
+    "hash": "sha256-J6QdxBgd86CvUyKWFUFpLYAgurgpRidtq1f5JGY8768="
   },
   "flatpak-kcm": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/flatpak-kcm-6.7.5.tar.xz",
-    "hash": "sha256-rPJdTH7tQeDQupyJfm2uCBuQIfm8t148pTLvVAb/oK0="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/flatpak-kcm-6.8.0.tar.xz",
+    "hash": "sha256-yc1Kw12j/LMdMhDMO2QcqqjMMkq7nZVxQ3rsrWrJJXU="
   },
   "kactivitymanagerd": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kactivitymanagerd-6.7.5.tar.xz",
-    "hash": "sha256-blSbDazSh5cVNpbk7if44ZrubzcR+U7jebj66Oz9k3o="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kactivitymanagerd-6.8.0.tar.xz",
+    "hash": "sha256-PqFfPOY8vnSyBvW17JY7CIpkB8eYjiL1VElMj41Yc/A="
   },
   "kde-cli-tools": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kde-cli-tools-6.7.5.tar.xz",
-    "hash": "sha256-GPPEIbMFADyvc/np++wJ+/MPRy2+gf7DKARsyniDox0="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kde-cli-tools-6.8.0.tar.xz",
+    "hash": "sha256-CxlIRs1zh4IEiupoNA15Ee46Gyumj2yFOtfApJAIieY="
   },
   "kde-gtk-config": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kde-gtk-config-6.7.5.tar.xz",
-    "hash": "sha256-ZZD++tKeN759Ue2J6duvZ4hK4KP+0U+NWKwTUsDAUD0="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kde-gtk-config-6.8.0.tar.xz",
+    "hash": "sha256-tJVlgV74hyiIFpF54RDuzcUtip1cn0eFuAtRwMDFB3w="
   },
   "kdecoration": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kdecoration-6.7.5.tar.xz",
-    "hash": "sha256-f/H+KFTKCKIaG6R/GwyX0S6iTx22GGMTGcukAjylPYY="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kdecoration-6.8.0.tar.xz",
+    "hash": "sha256-OdRsSV4JTvcMvNL1H62vXZb658NfPaY/McY4pDkSz3g="
   },
   "kdeplasma-addons": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kdeplasma-addons-6.7.5.tar.xz",
-    "hash": "sha256-G8HIYUh3M/SURpXVCcgfGbkKTYDFglzG32M7AxPj6Mw="
-  },
-  "kgamma": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kgamma-6.7.5.tar.xz",
-    "hash": "sha256-tFrWYIaTA0BGtlv2ijhD85T3je8CxvBZvGnF3gfKzlc="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kdeplasma-addons-6.8.0.tar.xz",
+    "hash": "sha256-+NYAD7TLDOfxcr2b/k29R2MgC3HzbIfDkAUYkHWvdIY="
   },
   "kglobalacceld": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kglobalacceld-6.7.5.tar.xz",
-    "hash": "sha256-g+mk4ibmlf4VRM+hmpZZxfEAC+RsZp/jqeKZApxsKr8="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kglobalacceld-6.8.0.tar.xz",
+    "hash": "sha256-Ama756LODH+Fml59FR3xjtzVu2v7EWgfMr+C5YOyCc0="
   },
   "kinfocenter": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kinfocenter-6.7.5.tar.xz",
-    "hash": "sha256-4660tvcjf93/Tmj019cVdyzEe9CsN2/r4krj1xdoBBY="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kinfocenter-6.8.0.tar.xz",
+    "hash": "sha256-VsozQooUx5Y+db4cOQJeYrcCU7Dg/cUAByo435QRp2E="
   },
   "kmenuedit": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kmenuedit-6.7.5.tar.xz",
-    "hash": "sha256-LZgBt/iZiARkcsKzI4XYSKCpgJX7F41Y1uO1CQztm4s="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kmenuedit-6.8.0.tar.xz",
+    "hash": "sha256-EVjips/dgUXpk+YF2Si+rlbXrDbo257DkPNTw2Mcd34="
   },
   "knighttime": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/knighttime-6.7.5.tar.xz",
-    "hash": "sha256-XLI+c25L5JUuY8hVz7RYUOEIXWUOZ7fK48v5chkhy58="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/knighttime-6.8.0.tar.xz",
+    "hash": "sha256-66E0N9XMdp5di39Paap9C67gFu6cosjVOfwGOt+ZByo="
   },
   "kpipewire": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kpipewire-6.7.5.tar.xz",
-    "hash": "sha256-IK852UUNSVRoxWpQkwgQ2CE398zTpxBZLgK29iB1j1U="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kpipewire-6.8.0.tar.xz",
+    "hash": "sha256-ydqPxSFuvUX4YDNb/PnaNrtguj7JQW6/kyIXXbMKJWA="
   },
   "krdp": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/krdp-6.7.5.tar.xz",
-    "hash": "sha256-SD+x2f/WlU57EqpDIXY6MXJuXA2qwQ4TXNE6UDztUzA="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/krdp-6.8.0.tar.xz",
+    "hash": "sha256-oID3lvTpGWPpE3CO4U9D1t6xWP6cy4ZHaZSgxlMsz7Q="
   },
   "kscreen": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kscreen-6.7.5.tar.xz",
-    "hash": "sha256-oXQiEKDPTqdpWfcIxVGAslc2SOnNNctOOPNJ/laUyd8="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kscreen-6.8.0.tar.xz",
+    "hash": "sha256-LAocguWwUN4cyp7B4CTdCdjrN9wbGKbUtZEk4uTKK8g="
   },
   "kscreenlocker": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kscreenlocker-6.7.5.tar.xz",
-    "hash": "sha256-bEHOLLedK4XU++WjphwJ5Axw5ahprm8DUsfhyztEYGs="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kscreenlocker-6.8.0.tar.xz",
+    "hash": "sha256-rsK050HYtqaYU/scsO/WoOn00qDrFPI3EpGAlqBt708="
   },
   "ksshaskpass": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/ksshaskpass-6.7.5.tar.xz",
-    "hash": "sha256-3rVpi1aCvBXSJEbbnPhkGFfQvXeF4UW3tukkemjTX9I="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/ksshaskpass-6.8.0.tar.xz",
+    "hash": "sha256-PTglTk6YLqkS4tzVmeGfIH6uD400v9sbdwmAsBaObx8="
   },
   "ksystemstats": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/ksystemstats-6.7.5.tar.xz",
-    "hash": "sha256-J8+5oYkkS4l64j86hoHnxLRcxn7Cf6/4lheD7c4W8fw="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/ksystemstats-6.8.0.tar.xz",
+    "hash": "sha256-dZ5gRhjmDXRgjSZ/hlzORGfbQdbVjLDIImBgBmoV0N4="
+  },
+  "kup": {
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kup-6.8.0.tar.xz",
+    "hash": "sha256-CHmo7bO+ytNGE9uNdcuFTK9EpgUaU7z6TR+1nQ9RDVw="
   },
   "kwallet-pam": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kwallet-pam-6.7.5.tar.xz",
-    "hash": "sha256-1x9ZRe8whvVvUvUxUIwqs2MHj7vVrkCEvTZHBJ5u6U8="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kwallet-pam-6.8.0.tar.xz",
+    "hash": "sha256-nPgw6e5mL41QD18xT4tjlBXZF8HPvrfBUhrAkykuQQ4="
   },
   "kwayland": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kwayland-6.7.5.tar.xz",
-    "hash": "sha256-jUyDUkkZ3Ie13sVG0PsUxZHAOVeIjLeyQKSp0bvcgmk="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kwayland-6.8.0.tar.xz",
+    "hash": "sha256-QOQKHiMjnsjC1m3yhqa+c67Tbr95eiszgS47oH3kGrU="
   },
   "kwayland-integration": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kwayland-integration-6.7.5.tar.xz",
-    "hash": "sha256-M7SGLZgo5pKO8Z4GFermKVTsb5p8SCyujtT6hMucvgA="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kwayland-integration-6.8.0.tar.xz",
+    "hash": "sha256-N3aaqbzUeqBKUQy88NUXAQ/bsXweH3B925Aoc6F/iQM="
   },
   "kwin": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kwin-6.7.5.tar.xz",
-    "hash": "sha256-a6qRC3Mtk8SMkPnBzGhcyT0LjeDN8TjCQZLARbw6SOI="
-  },
-  "kwin-x11": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kwin-x11-6.7.5.tar.xz",
-    "hash": "sha256-mVI2uQ4+kmJqSZHc6kfJ/Pqb8WP98B8qvgDkZ/yfIpE="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kwin-6.8.0.tar.xz",
+    "hash": "sha256-S/rzHimo+f3yMdw7u5sJsM4Hyun+56Ac/IZCXs55Ylg="
   },
   "kwrited": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/kwrited-6.7.5.tar.xz",
-    "hash": "sha256-+KqQVzTQzN55aITPywazYITkQfsZnqWqsrySz6TAUG0="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/kwrited-6.8.0.tar.xz",
+    "hash": "sha256-1IdwulO0Fxw6ZUfv5ubkpPXE7C2IfIQ2lTKr6JMZufI="
   },
   "layer-shell-qt": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/layer-shell-qt-6.7.5.tar.xz",
-    "hash": "sha256-zNz+xwgcqVb3pSyRE6TfOiJldb++mLVqKppNfX4Z6PA="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/layer-shell-qt-6.8.0.tar.xz",
+    "hash": "sha256-kc7VYYYvDYSDatSuXDSRS7UyV2yIYHuvTsLJV7iVtB0="
   },
   "libkscreen": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/libkscreen-6.7.5.tar.xz",
-    "hash": "sha256-3zF+A6z638vGiYG3gTF1AQP6301cXfY2jJ6R5phnchk="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/libkscreen-6.8.0.tar.xz",
+    "hash": "sha256-CaMCQq0CeXgzP0dzrmQB+aZmxtv4D6JfdMi+LersuUk="
   },
   "libksysguard": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/libksysguard-6.7.5.tar.xz",
-    "hash": "sha256-kGm88/5OSR6ndNDXDrF/mbVnKZhxBFo4VD/KvNtW38Q="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/libksysguard-6.8.0.tar.xz",
+    "hash": "sha256-dC+g8Kk0ROYvpPshkG0jcWuGPx1GCwpKgu8fWAJdBbo="
   },
   "libplasma": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/libplasma-6.7.5.tar.xz",
-    "hash": "sha256-J7KIIyVKpInAlMQKMUzhV1/XkG7rUh5ja7j9LcKYHy8="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/libplasma-6.8.0.tar.xz",
+    "hash": "sha256-tUffEU6llSYLPGyLBZNco4nwgoQmddksOFnyVR8U3Hc="
   },
   "milou": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/milou-6.7.5.tar.xz",
-    "hash": "sha256-tDx8t2UQmpGtnvfVhWxFhLOANJg3uvY8zKS0WmeSWrU="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/milou-6.8.0.tar.xz",
+    "hash": "sha256-BzjISMpI2Q9S1Byeg3FoZBXm9H/4z5X7TBTepJlly0A="
   },
   "ocean-sound-theme": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/ocean-sound-theme-6.7.5.tar.xz",
-    "hash": "sha256-RS5asE9eLXy/k1fk4Sut+Ek679pDe6Ew6zjJ5RExO3I="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/ocean-sound-theme-6.8.0.tar.xz",
+    "hash": "sha256-3V5dJU+qkAVOLMPpMl24ICqWXCRZKSHVL2jNX8o3Gk4="
   },
   "oxygen": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/oxygen-6.7.5.tar.xz",
-    "hash": "sha256-/6S5aRl/bgmm7k9GiSXmciNmbXYe6YAajqYS4Jt1YDc="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/oxygen-6.8.0.tar.xz",
+    "hash": "sha256-43MCpyGc+t/bRir1mSrrB/0wrjlqXMbpqPGg4K4mgTY="
   },
   "oxygen-sounds": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/oxygen-sounds-6.7.5.tar.xz",
-    "hash": "sha256-DMW2AATY/rix3gMstdPAVsmPYqhxNYm5C0ceWUPjGtk="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/oxygen-sounds-6.8.0.tar.xz",
+    "hash": "sha256-dhYKOmPPYVuE6as1S9F1KovaLwC0A8WLDlHeZcus7kY="
   },
   "plasma-activities": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-activities-6.7.5.tar.xz",
-    "hash": "sha256-2T8xtvM3M604AwmPT2IuVePvUstc2X5iGnuAPm8OP3w="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-activities-6.8.0.tar.xz",
+    "hash": "sha256-MrRulOMDf0JgYYfUKWT7hBABQQigHSna6/FKGqY3UEM="
   },
   "plasma-activities-stats": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-activities-stats-6.7.5.tar.xz",
-    "hash": "sha256-mJY5binVhBx6D0KBTO0Bq1j8rUBqVS3e4slQ8gVUms8="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-activities-stats-6.8.0.tar.xz",
+    "hash": "sha256-arGJBG2bvkTEyKS7fq8vlZPAxpKqF9Dj6CB6f2WM7Ww="
   },
   "plasma-bigscreen": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-bigscreen-6.7.5.tar.xz",
-    "hash": "sha256-/QC4/9ahwP1wWKzQYJgRCwC1yh3HIBZwWPrWXSq1C9w="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-bigscreen-6.8.0.tar.xz",
+    "hash": "sha256-uThWEPkPGboJhvxQFl0ESdyAK8A2qVfY3VA6bf4eRm4="
   },
   "plasma-browser-integration": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-browser-integration-6.7.5.tar.xz",
-    "hash": "sha256-2IvfhamQtP+BngiEPHT6oXcV0UQZmBu+JPaOx8/wuM4="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-browser-integration-6.8.0.tar.xz",
+    "hash": "sha256-rFRrnMyQiUv3CbqjC3Oi4QygVoEcVdiuiBucWZoi23E="
   },
   "plasma-desktop": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-desktop-6.7.5.tar.xz",
-    "hash": "sha256-B5/Pa4fXv2Xj8qRnDWBfrJRpNEwnmihamK1UkzLXtT4="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-desktop-6.8.0.tar.xz",
+    "hash": "sha256-YnLsOdn0Zhyo0EOjPC+3HMB5acmikFWRJrK+0QcTQ6o="
   },
   "plasma-dialer": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-dialer-6.7.5.tar.xz",
-    "hash": "sha256-VQTqVFJOojKqyl42zlQuN2dAwY0Cn+RR1Y8htQY8Acs="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-dialer-6.8.0.tar.xz",
+    "hash": "sha256-zeOR4ml6HYGswzidyh4JNzGUdrxZ4Me24XnkC9S6bi4="
   },
   "plasma-disks": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-disks-6.7.5.tar.xz",
-    "hash": "sha256-NBJc0x5VnU0P70m7M6b/wYAxEqF0la4b+89ei+2kZMQ="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-disks-6.8.0.tar.xz",
+    "hash": "sha256-A/bgLdwwSwrudMpCrmA5qA+6USEQOaVcg5YyBByYzNM="
   },
   "plasma-firewall": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-firewall-6.7.5.tar.xz",
-    "hash": "sha256-rbxqYtJyo4ZkYSdLt43kng+DyZcSJfYZrbMEI5m+aZc="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-firewall-6.8.0.tar.xz",
+    "hash": "sha256-c0xOAIwCBAX8iJ0+TdBWyjftWnu+5TxiZUTH9OkIkDA="
   },
   "plasma-integration": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-integration-6.7.5.tar.xz",
-    "hash": "sha256-B4bEny81d0Tg9M/aSfVShPqhqX2oWmZ8ps8dirB6/4k="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-integration-6.8.0.tar.xz",
+    "hash": "sha256-EhsLyIBZ9hxFQV2rEu/70kWltbub6IVmA/NSw/k6mts="
   },
   "plasma-keyboard": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-keyboard-6.7.5.tar.xz",
-    "hash": "sha256-DdkSEjCObGmZ21W5W1tGLK3Cdmk1Jy6cry8Ti5oGN4g="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-keyboard-6.8.0.tar.xz",
+    "hash": "sha256-e9FP5byTC4nKBhw0+rRM4VY4p8h0ZqpFsbq54NUEPGo="
   },
   "plasma-login-manager": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-login-manager-6.7.5.tar.xz",
-    "hash": "sha256-btfDu6wcebwaIcMwkjgEqmw/cg+v1qzLGmofraaE6E8="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-login-manager-6.8.0.tar.xz",
+    "hash": "sha256-aegp9J/fQKagIMfV2GA+tQoc12/riMdwzwYR94ydmBg="
   },
   "plasma-mobile": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-mobile-6.7.5.tar.xz",
-    "hash": "sha256-4l1TcHvjv4aq0rJxK83LkTP3x1pUxDRyTeVmOqeLdz8="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-mobile-6.8.0.tar.xz",
+    "hash": "sha256-gyNSWkDI56P7+fsAK8llViftU80wI5H77l1UPbTzkK8="
   },
   "plasma-nano": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-nano-6.7.5.tar.xz",
-    "hash": "sha256-mlNW9lJtrsCHPI3TXZjYgSLCvHc562n7lYUUamdy8gI="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-nano-6.8.0.tar.xz",
+    "hash": "sha256-i0qOPQcYS/I5mRJ0oBnI5PA+79s3RoTTnwQ4J+vMrlg="
   },
   "plasma-nm": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-nm-6.7.5.tar.xz",
-    "hash": "sha256-ZGn/ieJtRFZSkslo31lbOmjzU3ByVbpIclwbripn874="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-nm-6.8.0.tar.xz",
+    "hash": "sha256-Wn+a6UkgV55eruYBMjulcj98xjheGJrlcdxsklIRcow="
   },
   "plasma-pa": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-pa-6.7.5.tar.xz",
-    "hash": "sha256-T+KFeWk4WM2vNNW34ltEHT5lMFj/GFechZbrilciGiU="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-pa-6.8.0.tar.xz",
+    "hash": "sha256-7xWm0LL/l7E72C82ll6NJlpEOOm2hVR2dP+nLiFgzKQ="
   },
   "plasma-sdk": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-sdk-6.7.5.tar.xz",
-    "hash": "sha256-stbPs22+akCPIsndq9rmI+t6oN4VSFgn8wpyWmRebg8="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-sdk-6.8.0.tar.xz",
+    "hash": "sha256-3IqgmXqhjU18inFKM6bkzPqEHGYiwFEUoH4/nZTOzvU="
   },
   "plasma-setup": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-setup-6.7.5.tar.xz",
-    "hash": "sha256-ZLwDLvnoplSfwt2LX6ZBGOJdplLj3orbHJdO+9MyWN0="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-setup-6.8.0.tar.xz",
+    "hash": "sha256-5NAGFJefWt0NTCHc9HwWGW+ueDX7aAf9Vi6W7c1Aq+k="
   },
   "plasma-systemmonitor": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-systemmonitor-6.7.5.tar.xz",
-    "hash": "sha256-Vwjo8OGDPggpFEoUq6HxdyYmYcxXsgxKWjS/1pc9Hxs="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-systemmonitor-6.8.0.tar.xz",
+    "hash": "sha256-Pk1OkTZ7zmUdPmDOotnb0lrcRlOUWzK/zawJT/Ax0sc="
   },
   "plasma-thunderbolt": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-thunderbolt-6.7.5.tar.xz",
-    "hash": "sha256-2BecNT+J3g7uaWGeMAud+bd4j85IZM+yzhJV8LxpFmQ="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-thunderbolt-6.8.0.tar.xz",
+    "hash": "sha256-0NLJqwZlC073XcqVJRc0jru1emzA7tMmSO2wpn4J9Aw="
   },
   "plasma-vault": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-vault-6.7.5.tar.xz",
-    "hash": "sha256-KiW7K9dcnZKJTT51oZsrywGtqpN5gFeflCLowd+E3aU="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-vault-6.8.0.tar.xz",
+    "hash": "sha256-/OJohKV6suD2pt9KcNWnZCu0ejeH6mrJ1mFDyfuFE2I="
   },
   "plasma-welcome": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-welcome-6.7.5.tar.xz",
-    "hash": "sha256-iUE3+GU9MxH65QugxwvcTIA2+PFQgqWD2bO7TvUbGLo="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-welcome-6.8.0.tar.xz",
+    "hash": "sha256-YAh6r1YCopcnfrihnB+pSdBERW3vGiAS0XJo3QTa9Do="
   },
   "plasma-workspace": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-workspace-6.7.5.tar.xz",
-    "hash": "sha256-lKsh4iQ7eHb2XDFfHlRQgcZDf1vQoEHKT7bCUzrodMk="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-workspace-6.8.0.tar.xz",
+    "hash": "sha256-AWd87eipRoGpa9DuGyEazdqkZ4z3uJqmcLlJvfaMGXM="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma-workspace-wallpapers-6.7.5.tar.xz",
-    "hash": "sha256-xIGsS5N6KxsIDDJz4FV80MnVe2RBVrlBkCSD/Y4WRrU="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma-workspace-wallpapers-6.8.0.tar.xz",
+    "hash": "sha256-HAkCUE0cJ6uGysWqNU6+PCeX5EMCAFEdg/8e0xEc5mM="
   },
   "plasma5support": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plasma5support-6.7.5.tar.xz",
-    "hash": "sha256-3NWNKAucP5VwsXkBNPaSN07K5jPNFcYLHudpR9VUPoA="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plasma5support-6.8.0.tar.xz",
+    "hash": "sha256-CUo5WWIsy0raLNV32dbx8ybyw6OmYwZ12SGKowB3JCQ="
   },
   "plymouth-kcm": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/plymouth-kcm-6.7.5.tar.xz",
-    "hash": "sha256-znI9Z+a4zXG26zU+h8EPaYoJXqfUVb7nA9i6WeeT5X4="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/plymouth-kcm-6.8.0.tar.xz",
+    "hash": "sha256-v2sgbTQIDLwfDOnffHmIQTT31+WodQRzTTl+uYIHJ/s="
   },
   "polkit-kde-agent-1": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/polkit-kde-agent-1-6.7.5.tar.xz",
-    "hash": "sha256-+3Md2XnAKWmUte/jewqc3uxecE+RVlVAkw7/29fv7lg="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/polkit-kde-agent-1-6.8.0.tar.xz",
+    "hash": "sha256-giurGe+sJJ1xa23kQJdg/PvFzQbgYqMcI8kuQ9n8kFo="
   },
   "powerdevil": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/powerdevil-6.7.5.tar.xz",
-    "hash": "sha256-anOPzPAeTRsQ/qaP+LQEpAb5W8Nvy1k7zHD6+xxTJYs="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/powerdevil-6.8.0.tar.xz",
+    "hash": "sha256-ICe0Mzn67t0pyJUg77pU4cP0aQDSdbLUj8nGlXWx1X4="
   },
   "print-manager": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/print-manager-6.7.5.tar.xz",
-    "hash": "sha256-8WWDkKcQTyuAYXbxiOo48UjnkAy5KLTd/K4GFq9S9s4="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/print-manager-6.8.0.tar.xz",
+    "hash": "sha256-Ax86w/o/1PQ4m7g5xQEoHOz2r8oJDXP7wykYkd8C9N0="
   },
   "qqc2-breeze-style": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/qqc2-breeze-style-6.7.5.tar.xz",
-    "hash": "sha256-eI8GmMkEESzDO/b4+0RrLk/XIx04wJVcvDuqUNN10e4="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/qqc2-breeze-style-6.8.0.tar.xz",
+    "hash": "sha256-6ShDFHNpg28+NI4m3VuTBzmhwTu2f5MOCjQ8ve0RhwU="
   },
   "sddm-kcm": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/sddm-kcm-6.7.5.tar.xz",
-    "hash": "sha256-t2QdFZlvWQ3yfY+CDf/HnYPOnk4ZqI8Dux2GUfqiWIc="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/sddm-kcm-6.8.0.tar.xz",
+    "hash": "sha256-NILpUJmJ8Nu4KK5NJ2H9JiKlm9K5jQpMqEKHvLhR0Zc="
   },
   "spacebar": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/spacebar-6.7.5.tar.xz",
-    "hash": "sha256-agcuPs2EmlEhSCQfJEktDYEDMd6r4K/gCntSbvqmSjE="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/spacebar-6.8.0.tar.xz",
+    "hash": "sha256-cYdLSPn8g45Pl87L56WwF6o+1g2bvkPzlY3M8wgd6X4="
   },
   "spectacle": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/spectacle-6.7.5.tar.xz",
-    "hash": "sha256-KmOo2jMfkkng/wCRo48vqUbHuFx7cTO9i2DdUk6OAbg="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/spectacle-6.8.0.tar.xz",
+    "hash": "sha256-WPSyFBcCGwGfWnAbpoHj5R3R2XHHpo8Aa/suJN6MnpU="
   },
   "systemsettings": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/systemsettings-6.7.5.tar.xz",
-    "hash": "sha256-MXohFlcJ1heW+6GfVFQ5dXf/2KqWZVsp3ShqHfJSzds="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/systemsettings-6.8.0.tar.xz",
+    "hash": "sha256-V7cvrNOiz1C9S6CqPnWfkeoY0d/AWeiszEQCP1S+uJ8="
   },
   "union": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/union-6.7.5.tar.xz",
-    "hash": "sha256-3up0mstxA1flb84HGY4947rUvfqVKY4YXjjriTj40sg="
-  },
-  "wacomtablet": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/wacomtablet-6.7.5.tar.xz",
-    "hash": "sha256-9mjx29GNX5BgsBbbxWZ2GbIU5OasBFa+fTIiFMIOnL4="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/union-6.8.0.tar.xz",
+    "hash": "sha256-1zQP/k4mnG7mdqzGyTuSiTKwbuJlSuPnuQS2mftGpGw="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.7.5",
-    "url": "mirror://kde/stable/plasma/6.7.5/xdg-desktop-portal-kde-6.7.5.tar.xz",
-    "hash": "sha256-Xr7cPc9QjoXy97vd/6LMpoBWUP/h3ONQxKHfxdLwfFA="
+    "version": "6.8.0",
+    "url": "mirror://kde/stable/plasma/6.8.0/xdg-desktop-portal-kde-6.8.0.tar.xz",
+    "hash": "sha256-uhiyhViLQn3Bbeoq7l4s0EBzSLggFZdRlxgh3WAE4DY="
   }
 }
\ No newline at end of file
diff --git a/pkgs/kde/misc/kup/default.nix b/pkgs/kde/misc/kup/default.nix
deleted file mode 100644
index 931e16fbe8e1..000000000000
--- a/pkgs/kde/misc/kup/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  lib,
-  mkKdeDerivation,
-  fetchFromGitLab,
-  libgit2,
-}:
-mkKdeDerivation rec {
-  pname = "kup";
-  version = "0.10.0";
-  src = fetchFromGitLab {
-    domain = "invent.kde.org";
-    owner = "system";
-    repo = "kup";
-    rev = "${pname}-${version}";
-    hash = "sha256-G/GXmcQI1OBnCE7saPHeHDAMeL2WR6nVttMlKV2e01I=";
-  };
-
-  extraBuildInputs = [ libgit2 ];
-
-  meta = {
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.pwoelfel ];
-    teams = [ ];
-  };
-}
diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix
index 56b463830ad5..8efe939cad4e 100644
--- a/pkgs/kde/plasma/default.nix
+++ b/pkgs/kde/plasma/default.nix
@@ -14,7 +14,6 @@
   kde-gtk-config = callPackage ./kde-gtk-config { };
   kdecoration = callPackage ./kdecoration { };
   kdeplasma-addons = callPackage ./kdeplasma-addons { };
-  kgamma = callPackage ./kgamma { };
   kglobalacceld = callPackage ./kglobalacceld { };
   kinfocenter = callPackage ./kinfocenter { };
   kmenuedit = callPackage ./kmenuedit { };
@@ -25,11 +24,11 @@
   kscreenlocker = callPackage ./kscreenlocker { };
   ksshaskpass = callPackage ./ksshaskpass { };
   ksystemstats = callPackage ./ksystemstats { };
+  kup = callPackage ./kup { };
   kwallet-pam = callPackage ./kwallet-pam { };
   kwayland = callPackage ./kwayland { };
   kwayland-integration = callPackage ./kwayland-integration { };
   kwin = callPackage ./kwin { };
-  kwin-x11 = callPackage ./kwin-x11 { };
   kwrited = callPackage ./kwrited { };
   layer-shell-qt = callPackage ./layer-shell-qt { };
   libkscreen = callPackage ./libkscreen { };
@@ -73,6 +72,5 @@
   spectacle = callPackage ./spectacle { };
   systemsettings = callPackage ./systemsettings { };
   union = callPackage ./union { };
-  wacomtablet = callPackage ./wacomtablet { };
   xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde { };
 }
diff --git a/pkgs/kde/plasma/kdeplasma-addons/default.nix b/pkgs/kde/plasma/kdeplasma-addons/default.nix
index 17d4bcae96e4..0fb25b26ba90 100644
--- a/pkgs/kde/plasma/kdeplasma-addons/default.nix
+++ b/pkgs/kde/plasma/kdeplasma-addons/default.nix
@@ -19,7 +19,7 @@ mkKdeDerivation rec {
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version cargoRoot;
     src = sources.${pname};
-    hash = "sha256-HfHiue3hWZc243gYI9VfIi5c30itWhU22+ZEwoy8gPY=";
+    hash = "sha256-WluUQ9bXIJKJ6fUTeeyXSa7Lukm7xlkd0LX8RGoLMiM=";
   };
 
   extraNativeBuildInputs = [
diff --git a/pkgs/kde/plasma/kgamma/default.nix b/pkgs/kde/plasma/kgamma/default.nix
deleted file mode 100644
index 98aea358d089..000000000000
--- a/pkgs/kde/plasma/kgamma/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  mkKdeDerivation,
-  libxxf86vm,
-}:
-mkKdeDerivation {
-  pname = "kgamma";
-
-  extraBuildInputs = [ libxxf86vm ];
-}
diff --git a/pkgs/kde/plasma/kinfocenter/default.nix b/pkgs/kde/plasma/kinfocenter/default.nix
index 443a98adb4c8..27b7e2554824 100644
--- a/pkgs/kde/plasma/kinfocenter/default.nix
+++ b/pkgs/kde/plasma/kinfocenter/default.nix
@@ -12,6 +12,7 @@
   pkg-config,
   pciutils,
   pulseaudio,
+  qtgraphs,
   qttools,
   replaceVars,
   systemsettings,
@@ -60,7 +61,11 @@ mkKdeDerivation {
   '';
 
   extraNativeBuildInputs = [ pkg-config ];
-  extraBuildInputs = [ libusb1 ];
+  extraBuildInputs = [
+    qtgraphs
+
+    libusb1
+  ];
 
   qtWrapperArgs = [ "--inherit-argv0" ];
 
diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix
index 1f477f7f9aea..e9d423650493 100644
--- a/pkgs/kde/plasma/krdp/default.nix
+++ b/pkgs/kde/plasma/krdp/default.nix
@@ -3,10 +3,11 @@
   mkKdeDerivation,
   replaceVars,
   openssl,
-  pam,
   pkg-config,
   qtwayland,
   freerdp,
+  libei,
+  pam,
 }:
 mkKdeDerivation {
   pname = "krdp";
@@ -22,6 +23,7 @@ mkKdeDerivation {
     qtwayland
 
     freerdp
+    libei
     pam
   ];
 
diff --git a/pkgs/kde/plasma/kscreenlocker/default.nix b/pkgs/kde/plasma/kscreenlocker/default.nix
index edf549ef75e9..c689025d16c3 100644
--- a/pkgs/kde/plasma/kscreenlocker/default.nix
+++ b/pkgs/kde/plasma/kscreenlocker/default.nix
@@ -1,13 +1,11 @@
 {
   mkKdeDerivation,
   pam,
-  wayland-scanner,
   qqc2-breeze-style,
 }:
 mkKdeDerivation {
   pname = "kscreenlocker";
 
-  extraNativeBuildInputs = [ wayland-scanner ];
   extraBuildInputs = [
     pam
     qqc2-breeze-style
diff --git a/pkgs/kde/plasma/kup/default.nix b/pkgs/kde/plasma/kup/default.nix
new file mode 100644
index 000000000000..c2e585d3e38e
--- /dev/null
+++ b/pkgs/kde/plasma/kup/default.nix
@@ -0,0 +1,9 @@
+{
+  mkKdeDerivation,
+  libgit2,
+}:
+mkKdeDerivation {
+  pname = "kup";
+
+  extraBuildInputs = [ libgit2 ];
+}
diff --git a/pkgs/kde/plasma/kwin-x11/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch b/pkgs/kde/plasma/kwin-x11/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
deleted file mode 100644
index 896c5dcff20b..000000000000
--- a/pkgs/kde/plasma/kwin-x11/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 29ec6fada935ef966e5859082435ed57daa9522d Mon Sep 17 00:00:00 2001
-From: Samuel Dionne-Riel <samuel@dionne-riel.com>
-Date: Tue, 16 Mar 2021 15:03:59 -0400
-Subject: [PATCH] [NixOS] Unwrap executable name for .desktop search
-
-Why is this necessary even though -a "$0" is used in the wrapper?
-Because it's completely bypassing argv0! This looks at the executable
-file in-use according to the kernel!
-
-Wrappers cannot affect the `/proc/.../exe` symlink!
-
-Co-authored-by: Yaroslav Bolyukin <iam@lach.pw>
----
- src/nixos_utils.h     | 41 +++++++++++++++++++++++++++++++++++++++++
- src/service_utils.h   |  4 +++-
- src/waylandwindow.cpp |  5 ++++-
- 3 files changed, 48 insertions(+), 2 deletions(-)
- create mode 100644 src/nixos_utils.h
-
-diff --git a/src/nixos_utils.h b/src/nixos_utils.h
-new file mode 100644
-index 0000000..726065d
---- /dev/null
-+++ b/src/nixos_utils.h
-@@ -0,0 +1,41 @@
-+#ifndef NIXOS_UTILS_H
-+#define NIXOS_UTILS_H
-+
-+// kwin
-+// #include <kwinglobals.h>
-+
-+namespace KWin
-+{
-+
-+static QString unwrapExecutablePath(const QString &in_executablePath)
-+{
-+    // NixOS fixes many packaging issues through "wrapper" scripts that manipulates the environment or does
-+    // miscellaneous trickeries and mischievous things to make the programs work.
-+    // In turn, programs often employs different mischievous schemes and trickeries to do *other things.
-+    // It often happens that they conflict.
-+    // Here, `kwin` tries to detect the .desktop file for a given process.
-+    // `kwin` followed the process `/proc/.../exe` up to the actual binary running.
-+    // It normally would be fine, e.g. /usr/bin/foobar is what's in the desktop file.
-+    // But it's not the truth here! It's extremely likely the resolved path is /nix/store/.../bin/.foobar-wrapped
-+    // rather than what the desktop file points to, something like /nix/store/.../bin/foobar !!
-+    // Since the wrappers for Nixpkgs *always* prepend a dot and append -wrapped, we assume here that we can keep
-+    // `/^(.*)\/\.([^/]*)-wrapped/` until the (equivalent) regex does not match.
-+    // This should canonicalize the wrapper name to the expected name to look for in the desktop file.
-+
-+    // Use a copy of the const string
-+    QString executablePath(in_executablePath);
-+
-+    // While the parts needed are present, "unwrap" one layer of wrapper names.
-+    while (executablePath.endsWith("-wrapped") && executablePath[executablePath.lastIndexOf("/")+1] == QChar('.')) {
-+        // Approximately equivalent to s/-wrapped$//
-+        executablePath.remove(executablePath.length() - 8, 8);
-+        // Approximately equivalent to s;/\.;/;
-+        executablePath.remove(executablePath.lastIndexOf("/")+1, 1);
-+    }
-+
-+    return executablePath;
-+}
-+
-+}// namespace
-+
-+#endif // NIXOS_UTILS_H
-diff --git a/src/utils/serviceutils.h b/src/utils/serviceutils.h
-index 8a70c1f..475b15d 100644
---- a/src/utils/serviceutils.h
-+++ b/src/utils/serviceutils.h
-@@ -19,6 +19,7 @@
- #include <QLoggingCategory>
- //KF
- #include <KApplicationTrader>
-+#include "nixos_utils.h"
- 
- namespace KWin
- {
-@@ -26,8 +27,9 @@ namespace KWin
- const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces");
- const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces");
- 
--static QStringList fetchProcessServiceField(const QString &executablePath, const QString &fieldName)
-+static QStringList fetchProcessServiceField(const QString &in_executablePath, const QString &fieldName)
- {
-+    const QString executablePath = unwrapExecutablePath(in_executablePath);
-     // needed to be able to use the logging category in a header static function
-     static QLoggingCategory KWIN_UTILS ("KWIN_UTILS", QtWarningMsg);
-     const auto servicesFound = KApplicationTrader::query([&executablePath] (const KService::Ptr &service) {
-diff --git a/src/waylandwindow.cpp b/src/waylandwindow.cpp
-index fd2c0c1..ae8cf96 100644
---- a/src/waylandwindow.cpp
-+++ b/src/waylandwindow.cpp
-@@ -10,6 +10,7 @@
- #include "screens.h"
- #include "wayland_server.h"
- #include "workspace.h"
-+#include "nixos_utils.h"
- 
- #include <KWaylandServer/display.h>
- #include <KWaylandServer/clientbuffer.h>
-@@ -173,7 +174,9 @@ void WaylandWindow::updateIcon()
- 
- void WaylandWindow::updateResourceName()
- {
--    const QFileInfo fileInfo(surface()->client()->executablePath());
-+    const QString in_path = surface()->client()->executablePath();
-+    const QString path = unwrapExecutablePath(in_path);
-+    const QFileInfo fileInfo(path);
-     if (fileInfo.exists()) {
-         const QByteArray executableFileName = fileInfo.fileName().toUtf8();
-         setResourceClass(executableFileName, executableFileName);
--- 
-2.32.0
diff --git a/pkgs/kde/plasma/kwin-x11/default.nix b/pkgs/kde/plasma/kwin-x11/default.nix
deleted file mode 100644
index 3a6b832d4ec1..000000000000
--- a/pkgs/kde/plasma/kwin-x11/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  mkKdeDerivation,
-  pkg-config,
-  qt5compat,
-  qtsensors,
-  qttools,
-  qtwayland,
-  libxcvt,
-  libcanberra,
-  libdisplay-info,
-  libgbm,
-  lcms2,
-  python3,
-}:
-mkKdeDerivation {
-  pname = "kwin-x11";
-
-  patches = [
-    ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
-  ];
-
-  postPatch = ''
-    patchShebangs src/plugins/strip-effect-metadata.py
-  '';
-
-  extraNativeBuildInputs = [
-    pkg-config
-    python3
-  ];
-
-  extraBuildInputs = [
-    qt5compat
-    qtsensors
-    qttools
-    qtwayland
-
-    libgbm
-    lcms2
-    libcanberra
-    libdisplay-info
-
-    libxcvt
-  ];
-
-  # plugin QML relies on non-global imports
-  dontQmlLint = true;
-}
diff --git a/pkgs/kde/plasma/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch b/pkgs/kde/plasma/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
index 896c5dcff20b..7d5269cb07b4 100644
--- a/pkgs/kde/plasma/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
+++ b/pkgs/kde/plasma/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
@@ -10,13 +10,6 @@ file in-use according to the kernel!
 Wrappers cannot affect the `/proc/.../exe` symlink!
 
 Co-authored-by: Yaroslav Bolyukin <iam@lach.pw>
----
- src/nixos_utils.h     | 41 +++++++++++++++++++++++++++++++++++++++++
- src/service_utils.h   |  4 +++-
- src/waylandwindow.cpp |  5 ++++-
- 3 files changed, 48 insertions(+), 2 deletions(-)
- create mode 100644 src/nixos_utils.h
-
 diff --git a/src/nixos_utils.h b/src/nixos_utils.h
 new file mode 100644
 index 0000000..726065d
@@ -64,51 +57,25 @@ index 0000000..726065d
 +}// namespace
 +
 +#endif // NIXOS_UTILS_H
-diff --git a/src/utils/serviceutils.h b/src/utils/serviceutils.h
-index 8a70c1f..475b15d 100644
---- a/src/utils/serviceutils.h
-+++ b/src/utils/serviceutils.h
-@@ -19,6 +19,7 @@
- #include <QLoggingCategory>
- //KF
- #include <KApplicationTrader>
+diff --git a/src/wayland/clientconnection.cpp b/src/wayland/clientconnection.cpp
+index 194e0498c0..69ddda9b25 100644
+--- a/src/wayland/clientconnection.cpp
++++ b/src/wayland/clientconnection.cpp
+@@ -19,6 +19,8 @@
+ #include <systemd/sd-login.h>
+ #endif
+
 +#include "nixos_utils.h"
- 
++
  namespace KWin
  {
-@@ -26,8 +27,9 @@ namespace KWin
- const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces");
- const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces");
- 
--static QStringList fetchProcessServiceField(const QString &executablePath, const QString &fieldName)
-+static QStringList fetchProcessServiceField(const QString &in_executablePath, const QString &fieldName)
- {
-+    const QString executablePath = unwrapExecutablePath(in_executablePath);
-     // needed to be able to use the logging category in a header static function
-     static QLoggingCategory KWIN_UTILS ("KWIN_UTILS", QtWarningMsg);
-     const auto servicesFound = KApplicationTrader::query([&executablePath] (const KService::Ptr &service) {
-diff --git a/src/waylandwindow.cpp b/src/waylandwindow.cpp
-index fd2c0c1..ae8cf96 100644
---- a/src/waylandwindow.cpp
-+++ b/src/waylandwindow.cpp
-@@ -10,6 +10,7 @@
- #include "screens.h"
- #include "wayland_server.h"
- #include "workspace.h"
-+#include "nixos_utils.h"
- 
- #include <KWaylandServer/display.h>
- #include <KWaylandServer/clientbuffer.h>
-@@ -173,7 +174,9 @@ void WaylandWindow::updateIcon()
- 
- void WaylandWindow::updateResourceName()
- {
--    const QFileInfo fileInfo(surface()->client()->executablePath());
-+    const QString in_path = surface()->client()->executablePath();
-+    const QString path = unwrapExecutablePath(in_path);
-+    const QFileInfo fileInfo(path);
-     if (fileInfo.exists()) {
-         const QByteArray executableFileName = fileInfo.fileName().toUtf8();
-         setResourceClass(executableFileName, executableFileName);
--- 
-2.32.0
+
+@@ -92,7 +94,7 @@ ClientConnectionPrivate::ClientConnectionPrivate(wl_client *c, Display *display,
+     wl_client_add_destroy_listener(c, &destroyListener);
+
+     wl_client_get_credentials(client, &pid, &user, &group);
+-    executablePath = executablePathFromPid(pid);
++    executablePath = unwrapExecutablePath(executablePathFromPid(pid));
+
+ #if HAVE_SYSTEMD
+     sandboxed = isSandboxed(pid);
diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix
index 55538a99fba5..7f4bbb429471 100644
--- a/pkgs/kde/plasma/kwin/default.nix
+++ b/pkgs/kde/plasma/kwin/default.nix
@@ -10,6 +10,7 @@
   libxcvt,
   xwayland,
   libcanberra,
+  libcap,
   libdisplay-info,
   libei,
   libevdev,
@@ -24,6 +25,7 @@ mkKdeDerivation {
   patches = [
     ./0003-plugins-qpa-allow-using-nixos-wrapper.patch
     ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
+    ./plasma-setup-xwayland-path.patch
   ];
 
   postPatch = ''
@@ -39,6 +41,9 @@ mkKdeDerivation {
   extraNativeBuildInputs = [
     pkg-config
     python3
+
+    # we can't actually have capabilities in the store but it gets mad
+    libcap
   ];
   extraBuildInputs = [
     qtquick3d
@@ -59,6 +64,9 @@ mkKdeDerivation {
     libxcvt
     # we need to provide this so it knows our xwayland supports new features
     xwayland
+
+    # and it needs to be in both because cmake is stupid
+    libcap
   ];
 
   # plugin QML relies on non-global imports
diff --git a/pkgs/kde/plasma/kwin/plasma-setup-xwayland-path.patch b/pkgs/kde/plasma/kwin/plasma-setup-xwayland-path.patch
new file mode 100644
index 000000000000..09bd4f9908a0
--- /dev/null
+++ b/pkgs/kde/plasma/kwin/plasma-setup-xwayland-path.patch
@@ -0,0 +1,23 @@
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -305,7 +305,7 @@ void Application::applyXwaylandScale()
+ #if KWIN_BUILD_X11
+     if (x11Connection()) {
+         // rerun the script that runs xrdb with the new settings
+-        QProcess::startDetached(QString(LIBEXEC_DIR) + QStringLiteral("/plasma-setup-xwayland"));
++        QProcess::startDetached(QStringLiteral("/run/current-system/sw/libexec/plasma-setup-xwayland"));
+     }
+ #endif
+ }
+--- a/src/xwayland/xwayland.cpp
++++ b/src/xwayland/xwayland.cpp
+@@ -596,8 +596,7 @@ void Xwayland::runXWaylandStartupScripts()
+ 
+     QDir scriptDir(XWAYLAND_SESSION_SCRIPTS);
+     QStringList scripts = scriptDir.entryList(QStringList(), QDir::Files, QDir::Name);
+-    scripts << QString(LIBEXEC_DIR) + QStringLiteral("/plasma-setup-xwayland");
+-
++    scripts << QStringLiteral("/run/current-system/sw/libexec/plasma-setup-xwayland");
+     for (const QString &script : std::as_const(scripts)) {
+         const QString path = scriptDir.filePath(script);
+         qCDebug(KWIN_XWL) << "Running Xwayland startup script" << path;
diff --git a/pkgs/kde/plasma/plasma-bigscreen/default.nix b/pkgs/kde/plasma/plasma-bigscreen/default.nix
index f6134e521251..f87dd20705b7 100644
--- a/pkgs/kde/plasma/plasma-bigscreen/default.nix
+++ b/pkgs/kde/plasma/plasma-bigscreen/default.nix
@@ -2,6 +2,7 @@
   lib,
   mkKdeDerivation,
   plasma-workspace,
+  kdeconnect-kde,
   pkg-config,
   qtwebengine,
   libcec,
@@ -31,6 +32,8 @@ mkKdeDerivation {
   extraBuildInputs = [
     qtwebengine
 
+    kdeconnect-kde
+
     libcec
     libcec_platform
     sdl3
diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix
index d7a60c785318..782cc41d9c23 100644
--- a/pkgs/kde/plasma/plasma-workspace/default.nix
+++ b/pkgs/kde/plasma/plasma-workspace/default.nix
@@ -39,9 +39,6 @@ mkKdeDerivation {
       # @QtBinariesDir@ only appears in the *removed* lines of the diff
       QtBinariesDir = null;
     })
-
-    # stop accidentally duplicating fontconfig configs
-    ./fontconfig.patch
   ];
 
   outputs = [
@@ -65,6 +62,7 @@ mkKdeDerivation {
     pkg-config
     spirv-tools
   ];
+
   extraBuildInputs = [
     qtlocation
     qtpositioning
@@ -102,8 +100,5 @@ mkKdeDerivation {
     moveToOutput share/wayland-sessions $sessions
   '';
 
-  passthru.providedSessions = [
-    "plasma"
-    "plasmax11"
-  ];
+  passthru.providedSessions = [ "plasma" ];
 }
diff --git a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
index 30c4d995220f..ce2767c3f5bc 100644
--- a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
+++ b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
@@ -11,32 +11,6 @@ index e5c987879b..d26287a906 100644
      //    p.start(QStringLiteral("fuser"), {QStringLiteral("-m"), devicePath});
  }
  
-diff --git a/kcms/fonts/fontinit.cpp b/kcms/fonts/fontinit.cpp
-index e27e21a7bd..abbf7f32e1 100644
---- a/kcms/fonts/fontinit.cpp
-+++ b/kcms/fonts/fontinit.cpp
-@@ -27,7 +27,7 @@ Q_DECL_EXPORT void kcminit()
- 
-     const QByteArray input = "Xft.dpi: " + QByteArray::number(dpi);
-     QProcess p;
--    p.start(QStringLiteral("xrdb"), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")});
-+    p.start(QStringLiteral("@xrdb@"), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")});
-     p.setProcessChannelMode(QProcess::ForwardedChannels);
-     p.write(input);
-     p.closeWriteChannel();
-diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
-index a150527de6..4798518162 100644
---- a/kcms/fonts/fonts.cpp
-+++ b/kcms/fonts/fonts.cpp
-@@ -151,7 +151,7 @@ void KFonts::save()
-     if (fontsAASettings()->forceFontDPI() == 0 && forceFontDPIChanged && KWindowSystem::isPlatformX11()) {
-         QProcess proc;
-         proc.setProcessChannelMode(QProcess::ForwardedChannels);
--        proc.start(u"xrdb"_s, QStringList{u"-quiet"_s, u"-remove"_s, u"-nocpp"_s});
-+        proc.start(u"@xrdb@"_s, QStringList{u"-quiet"_s, u"-remove"_s, u"-nocpp"_s});
-         if (proc.waitForStarted()) {
-             proc.write("Xft.dpi\n");
-             proc.closeWriteChannel();
 diff --git a/kcms/kfontinst/kcmfontinst/FcQuery.cpp b/kcms/kfontinst/kcmfontinst/FcQuery.cpp
 index 32ba97a4d6..c26f45f2e0 100644
 --- a/kcms/kfontinst/kcmfontinst/FcQuery.cpp
@@ -50,40 +24,6 @@ index 32ba97a4d6..c26f45f2e0 100644
  }
  
  void CFcQuery::procExited()
-diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
-index 0a3fb44698..d44b63350b 100644
---- a/kcms/krdb/krdb.cpp
-+++ b/kcms/krdb/krdb.cpp
-@@ -425,7 +425,7 @@ void runRdb(unsigned int flags)
-             contents += "Xft.dpi: "_L1 + QString::number(dpi) + u'\n';
-         else {
-             KProcess queryProc;
--            queryProc << QStringLiteral("xrdb") << QStringLiteral("-query");
-+            queryProc << QStringLiteral("@xrdb@") << QStringLiteral("-query");
-             queryProc.setOutputChannelMode(KProcess::OnlyStdoutChannel);
-             queryProc.start();
-             if (queryProc.waitForFinished()) {
-@@ -445,7 +445,7 @@ void runRdb(unsigned int flags)
-                 }
- 
-                 KProcess loadProc;
--                loadProc << QStringLiteral("xrdb") << QStringLiteral("-quiet") << QStringLiteral("-load") << QStringLiteral("-nocpp");
-+                loadProc << QStringLiteral("@xrdb@") << QStringLiteral("-quiet") << QStringLiteral("-load") << QStringLiteral("-nocpp");
-                 loadProc.start();
-                 if (loadProc.waitForStarted()) {
-                     loadProc.write(db);
-@@ -463,9 +463,9 @@ void runRdb(unsigned int flags)
- 
-     KProcess proc;
- #ifndef NDEBUG
--    proc << QStringLiteral("xrdb") << QStringLiteral("-merge") << tmpFile.fileName();
-+    proc << QStringLiteral("@xrdb@") << QStringLiteral("-merge") << tmpFile.fileName();
- #else
--    proc << u"xrdb"_s << u"-quiet"_s << u"-merge"_s << tmpFile.fileName();
-+    proc << u"@xrdb@"_s << u"-quiet"_s << u"-merge"_s << tmpFile.fileName();
- #endif
-     proc.execute();
- 
 diff --git a/ksmserver/plasma-restoresession.service.in b/ksmserver/plasma-restoresession.service.in
 index 2c52a4b87d..fd7fdc8ac1 100644
 --- a/ksmserver/plasma-restoresession.service.in
@@ -95,22 +35,27 @@ index 2c52a4b87d..fd7fdc8ac1 100644
 -ExecStart=-@QtBinariesDir@/qdbus org.kde.ksmserver /KSMServer org.kde.KSMServerInterface.restoreSession
 +ExecStart=-@qdbus@ org.kde.ksmserver /KSMServer org.kde.KSMServerInterface.restoreSession
  Slice=session.slice
-diff --git a/startkde/kcminit/plasma-kcminit-phase1.service.in b/startkde/kcminit/plasma-kcminit-phase1.service.in
-index 7218628ce9..9126475ea4 100644
---- a/startkde/kcminit/plasma-kcminit-phase1.service.in
-+++ b/startkde/kcminit/plasma-kcminit-phase1.service.in
-@@ -6,5 +6,5 @@ PartOf=graphical-session.target
+diff --git a/startkde/plasma-setup-xwayland/main.cpp b/startkde/plasma-setup-xwayland/main.cpp
+index 639488cdb5..7b7669a957 100644
+--- a/startkde/plasma-setup-xwayland/main.cpp
++++ b/startkde/plasma-setup-xwayland/main.cpp
+@@ -85,9 +85,9 @@ int main(int argc, char **argv)
+ 
+     KProcess proc;
+ #ifndef NDEBUG
+-    proc << QStringLiteral("xrdb") << QStringLiteral("-merge") << tmpFile.fileName();
++    proc << QStringLiteral("@xrdb@") << QStringLiteral("-merge") << tmpFile.fileName();
+ #else
+-    proc << u"xrdb"_s << u"-quiet"_s << u"-merge"_s << tmpFile.fileName();
++    proc << u"@xrdb@"_s << u"-quiet"_s << u"-merge"_s << tmpFile.fileName();
+ #endif
+     proc.execute();
  
- [Service]
- Type=oneshot
--ExecStart=@QtBinariesDir@/qdbus org.kde.kcminit /kcminit org.kde.KCMInit.runPhase1
-+ExecStart=@qdbus@ org.kde.kcminit /kcminit org.kde.KCMInit.runPhase1
- Slice=session.slice
 diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
-index f9104619bf..af9fc09a67 100644
+index 736817f53f..fe8da16679 100644
 --- a/startkde/startplasma.cpp
 +++ b/startkde/startplasma.cpp
-@@ -57,7 +57,7 @@ void sigtermHandler(int signalNumber)
+@@ -64,7 +64,7 @@ void sigtermHandler(int signalNumber)
  void messageBox(const QString &text)
  {
      out << text;
@@ -119,12 +64,12 @@ index f9104619bf..af9fc09a67 100644
  }
  
  QStringList allServices(const QLatin1String &prefix)
-@@ -552,7 +552,7 @@ QProcess *setupKSplash()
-         if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
-             p = new QProcess;
-             p->setProcessChannelMode(QProcess::ForwardedChannels);
--            p->start(QStringLiteral("ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
-+            p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
-         }
+@@ -560,7 +560,7 @@ QProcess *setupKSplash()
+     if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
+         p = new QProcess;
+         p->setProcessChannelMode(QProcess::ForwardedChannels);
+-        p->start(QStringLiteral("ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
++        p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
      }
      return p;
+ }
diff --git a/pkgs/kde/plasma/plasma-workspace/fontconfig.patch b/pkgs/kde/plasma/plasma-workspace/fontconfig.patch
deleted file mode 100644
index 8d5fa1161d86..000000000000
--- a/pkgs/kde/plasma/plasma-workspace/fontconfig.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/kcms/fonts/kxftconfig.cpp b/kcms/fonts/kxftconfig.cpp
-index b67d885de7..29cc3a00d8 100644
---- a/kcms/fonts/kxftconfig.cpp
-+++ b/kcms/fonts/kxftconfig.cpp
-@@ -310,6 +310,10 @@ bool KXftConfig::apply()
-             m_excludePixelRange.from = (int)point2Pixel(m_excludeRange.from);
-             m_excludePixelRange.to = (int)point2Pixel(m_excludeRange.to);
- 
-+            // Ensure m_doc is the config file we want
-+            m_doc.clear();
-+            parseConfigFile(m_file);
-+
-             FcAtomic *atomic = FcAtomicCreate((const unsigned char *)(QFile::encodeName(m_file).data()));
- 
-             ok = false;
-@@ -618,7 +622,7 @@ void KXftConfig::readContents()
-                 }
-             }
-         } else if (childNodesCount == 3) { // CPD: Is target "font" or "pattern" ????
--            if (u"font" != e.attribute(u"target"_s)) {
-+            if (u"font" != e.attribute(u"target"_s) && u"pattern" != e.attribute(u"target"_s)) {
-                 break;
-             }
- 
-@@ -692,7 +696,7 @@ void KXftConfig::applySubPixelType()
-         QDomElement editNode = m_doc.createElement(u"edit"_s);
-         QDomText typeText = m_doc.createTextNode(toStr(m_subPixel.type));
- 
--        matchNode.setAttribute(u"target"_s, u"font"_s);
-+        matchNode.setAttribute(u"target"_s, u"pattern"_s);
-         editNode.setAttribute(u"mode"_s, u"assign"_s);
-         editNode.setAttribute(u"name"_s, u"rgba"_s);
-         editNode.appendChild(typeNode);
-@@ -724,7 +728,7 @@ void KXftConfig::applyHintStyle()
-         QDomElement matchNode = m_doc.createElement(u"match"_s), typeNode = m_doc.createElement(u"const"_s), editNode = m_doc.createElement(u"edit"_s);
-         QDomText typeText = m_doc.createTextNode(toStr(m_hint.style));
- 
--        matchNode.setAttribute(u"target"_s, u"font"_s);
-+        matchNode.setAttribute(u"target"_s, u"pattern"_s);
-         editNode.setAttribute(u"mode"_s, u"assign"_s);
-         editNode.setAttribute(u"name"_s, u"hintstyle"_s);
-         editNode.appendChild(typeNode);
-@@ -744,7 +748,7 @@ void KXftConfig::applyHinting()
-     QDomElement matchNode = m_doc.createElement(u"match"_s), typeNode = m_doc.createElement(u"bool"_s), editNode = m_doc.createElement(u"edit"_s);
-     QDomText typeText = m_doc.createTextNode(m_hinting.set ? u"true"_s : u"false"_s);
- 
--    matchNode.setAttribute(u"target"_s, u"font"_s);
-+    matchNode.setAttribute(u"target"_s, u"pattern"_s);
-     editNode.setAttribute(u"mode"_s, u"assign"_s);
-     editNode.setAttribute(u"name"_s, u"hinting"_s);
-     editNode.appendChild(typeNode);
-@@ -778,7 +782,7 @@ void KXftConfig::applyExcludeRange(bool pixel)
-                     boolNode = m_doc.createElement(u"bool"_s);
-         QDomText fromText = m_doc.createTextNode(fromString), toText = m_doc.createTextNode(toString), boolText = m_doc.createTextNode(u"false"_s);
- 
--        matchNode.setAttribute(u"target"_s, u"font"_s); // CPD: Is target "font" or "pattern" ????
-+        matchNode.setAttribute(u"target"_s, u"pattern"_s); // CPD: Is target "font" or "pattern" ????
-         fromTestNode.setAttribute(u"qual"_s, u"any"_s);
-         fromTestNode.setAttribute(u"name"_s, pixel ? u"pixelsize"_s : u"size"_s);
-         fromTestNode.setAttribute(u"compare"_s, u"more_eq"_s);
-@@ -840,7 +844,7 @@ void KXftConfig::applyAntiAliasing()
-         QDomElement editNode = m_doc.createElement(u"edit"_s);
-         QDomText typeText = m_doc.createTextNode(m_antiAliasing.state == AntiAliasing::Enabled ? u"true"_s : u"false"_s);
- 
--        matchNode.setAttribute(u"target"_s, u"font"_s);
-+        matchNode.setAttribute(u"target"_s, u"pattern"_s);
-         editNode.setAttribute(u"mode"_s, u"assign"_s);
-         editNode.setAttribute(u"name"_s, u"antialias"_s);
-         editNode.appendChild(typeNode);
diff --git a/pkgs/kde/plasma/powerdevil/default.nix b/pkgs/kde/plasma/powerdevil/default.nix
index 30793431642a..ae2b56a004f2 100644
--- a/pkgs/kde/plasma/powerdevil/default.nix
+++ b/pkgs/kde/plasma/powerdevil/default.nix
@@ -3,20 +3,10 @@
   pkg-config,
   ddcutil,
   qtwayland,
-  fetchpatch,
 }:
 mkKdeDerivation {
   pname = "powerdevil";
 
-  patches = [
-    # backport fix for spurious low battery notifications
-    # FIXME: remove in 6.7.6
-    (fetchpatch {
-      url = "https://invent.kde.org/plasma/powerdevil/-/commit/54f8a4a848fa02d06fefc5543f35224eef73670c.diff";
-      hash = "sha256-YWUyOhFRUwzi+ISM2+TGctNDSUYc851U/b5hKkTmWXY=";
-    })
-  ];
-
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     ddcutil
diff --git a/pkgs/kde/plasma/wacomtablet/default.nix b/pkgs/kde/plasma/wacomtablet/default.nix
deleted file mode 100644
index 59f9cfe04906..000000000000
--- a/pkgs/kde/plasma/wacomtablet/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  mkKdeDerivation,
-  pkg-config,
-  libwacom,
-  xf86-input-wacom,
-}:
-mkKdeDerivation {
-  pname = "wacomtablet";
-
-  extraNativeBuildInputs = [ pkg-config ];
-  extraBuildInputs = [
-    libwacom
-    xf86-input-wacom
-  ];
-  meta.mainProgram = "kde_wacom_tabletfinder";
-}
diff --git a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix
index 0614c0c191d5..8a20f7c0bdde 100644
--- a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix
+++ b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix
@@ -3,6 +3,7 @@
   pkg-config,
   qtwayland,
   cups,
+  pipewire,
 }:
 mkKdeDerivation {
   pname = "xdg-desktop-portal-kde";
@@ -11,5 +12,6 @@ mkKdeDerivation {
   extraBuildInputs = [
     qtwayland
     cups
+    pipewire
   ];
 }

From bf4259af941e319ff0b4bf41375643bcd9ad5d4a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 14 Oct 2026 01:44:48 -0400
Subject: [PATCH 75/78] openssl_3_5: drop the missing MinGW patch

714f328f9496 (openssl: fix 3.6.1 build on mingw) deleted
`3.5/fix-mingw-linking.patch`, but c1d68ce984c2 (openssl_3_5: init at
3.5.5) then carried over the reference to it. Every MinGW package
depending on `openssl` has failed to evaluate since:

    error: path '.../openssl/3.5/fix-mingw-linking.patch' does not exist

The patch was never for 3.5, and should not have been in the `3.5/`
directory: fdd903c161dd (openssl: fix mingwW64 build) added it for
`openssl_3_6` (3.6.0), to adjust `test_n` in `test/bioprinttest.c`, a `%n`
test that 3.5.8 does not have. 3.6.1 has the fix upstream. Drop the
reference.

Assisted-by: Claude Code (Claude Opus 5.5)
---
 pkgs/development/libraries/openssl/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index db07f3f7cc3d..83f8bc57ee5a 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -431,9 +431,6 @@ in
         else
           ./3.5/use-etc-ssl-certs.patch
       )
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isMinGW [
-      ./3.5/fix-mingw-linking.patch
     ];
 
     withDocs = true;

From b6d40be72313dbf9165a246e4e3040dc0df61d93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 Oct 2026 10:40:38 +0000
Subject: [PATCH 76/78] frp: 0.71.0 -> 0.71.1

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

diff --git a/pkgs/by-name/fr/frp/package.nix b/pkgs/by-name/fr/frp/package.nix
index 4db8e9ded394..c1a9aa581ad1 100644
--- a/pkgs/by-name/fr/frp/package.nix
+++ b/pkgs/by-name/fr/frp/package.nix
@@ -10,15 +10,15 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "frp";
-  version = "0.71.0";
+  version = "0.71.1";
   src = fetchFromGitHub {
     owner = "fatedier";
     repo = "frp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-q6E77uwV28CUR9LXPDp4DXuBiIvfonybyKIi+aZQvEE=";
+    hash = "sha256-s+D8CL0wGfnl9xPHFQ0poIHaV55hpKHKOt/be27YJvA=";
   };
 
-  vendorHash = "sha256-TrO0ZVLazqtUpGREb6kjGiTZhGo3R1QK5iHFlojE7po=";
+  vendorHash = "sha256-2JLUcSfvZjwTWPbvdJbhgi6eE9m4ep+75vLpF7ILrRQ=";
 
   doCheck = false;
 

From 7f29f74a6294e5838698ead94a1f24bd9df940e3 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 14 Oct 2026 07:28:09 -0400
Subject: [PATCH 77/78] nix: Apply upstreamed patch to link `ntdll` on Windows

`libutil` calls `NtCreateFile` and `RtlNtStatusToDosError`, which live
in `ntdll`, without linking it. It only links because the monolithic
MinGW gcc, configured for the `mcf` threading model, appends `-lntdll`
to every link through its specs. With a toolchain that does not, such as
`gccNGPackages`, it fails:

    undefined reference to `NtCreateFile'
    undefined reference to `RtlNtStatusToDosError'

Apply NixOS/nix#16306, which is on Nix's master and maintenance branches
but not in any releases yet, to 2.31, 2.34 and 2.35. Only on Windows, so
`nix` is not rebuilt anywhere else; `nixVersions.git` already has it.

Assisted-by: Claude Code (Claude Opus 5.5)
---
 pkgs/tools/package-management/nix/default.nix | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 1c0e916253c5..abd2596ab0e1 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -5,6 +5,7 @@
   nixDependencies,
   generateSplicesForMkScope,
   fetchFromGitHub,
+  fetchpatch,
   runCommand,
   pkgs,
   pkgsi686Linux,
@@ -150,6 +151,25 @@ let
       test = "shebang.sh";
     }
   ];
+
+  # `libutil` calls `NtCreateFile` and `RtlNtStatusToDosError` without linking
+  # `ntdll`, so it only links with a toolchain that adds `-lntdll` implicitly.
+  # Windows only, so that `nix` is not rebuilt for every other platform.
+  #
+  # Temporary: fixed in https://github.com/NixOS/nix/pull/16306 and backported,
+  # but not yet released. Drop this from each version once its next release,
+  # which will include the backport, is packaged:
+  #
+  # - 2.31: https://github.com/NixOS/nix/pull/16604
+  # - 2.34: https://github.com/NixOS/nix/pull/16607
+  # - 2.35: https://github.com/NixOS/nix/pull/16608
+  windowsPatches = lib.optionals stdenv.hostPlatform.isWindows [
+    (fetchpatch {
+      name = "libutil-link-ntdll-on-windows.patch";
+      url = "https://github.com/NixOS/nix/commit/4b247ec7f961686e60da6f012e4e128e30e8c82f.patch";
+      hash = "sha256-WDx0xknyin7ayQUIA5Zafk2tEySVIVqUZ0RdsQKAN8Q=";
+    })
+  ];
 in
 lib.makeExtensible (
   self:
@@ -167,7 +187,7 @@ lib.makeExtensible (
             hash = "sha256-yAvNBedw4FB+Z5myhfGsnRT8F1QqeEoXGbm7EmTW/Og=";
           };
         }).appendPatches
-          [ ];
+          windowsPatches;
 
       nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything;
 
@@ -183,7 +203,7 @@ lib.makeExtensible (
             hash = "sha256-ZJwg/qG4M1Impy774HKMZ3Hsq7vlBJy7sXl1fI9QDXI=";
           });
         }).appendPatches
-          [ ];
+          windowsPatches;
 
       nix_2_34 = addTests "nix_2_34" self.nixComponents_2_34.nix-everything;
 
@@ -199,7 +219,7 @@ lib.makeExtensible (
             hash = "sha256-qtlx8ywd1qj2ToZTNBunXE7JUajLtw44ja3r7+d47D4=";
           });
         }).appendPatches
-          [ ];
+          windowsPatches;
 
       nix_2_35 = addTests "nix_2_35" self.nixComponents_2_35.nix-everything;
 

From e23fbe08f9456a7f3fae69b52bcef1c3ce56850a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 14 Oct 2026 15:18:17 +0300
Subject: [PATCH 78/78] kdePackages.ktnef: fix build, for real this time

This was supposed to be in the Plasma 6.8 PR but I am stupid.
---
 pkgs/kde/gear/ktnef/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/kde/gear/ktnef/default.nix b/pkgs/kde/gear/ktnef/default.nix
index 81bd5c70b616..9d4f0c51afd3 100644
--- a/pkgs/kde/gear/ktnef/default.nix
+++ b/pkgs/kde/gear/ktnef/default.nix
@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  kcalutils,
+}:
 mkKdeDerivation {
   pname = "ktnef";
+
+  extraBuildInputs = [ kcalutils ];
 }