From a73ba5c93a5acd8b4b8082ececffdcd99af72520 Mon Sep 17 00:00:00 2001
From: Bert Proesmans <bproesmans@hotmail.com>
Date: Tue, 20 May 2025 20:28:36 +0000
Subject: [PATCH 001/357] nixos/kanidm: bind ca-bundle to validate url on
 provisioning

The provisioning script can be configured to validate the server certificate,
but the unit lockdown prevents access to the trusted certificate authority
(ca) bundle.
The system trusted ca store path is added to the bind paths as solution.
---
 nixos/modules/services/security/kanidm.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix
index 14927f439ca5..53b3bb1ced9e 100644
--- a/nixos/modules/services/security/kanidm.nix
+++ b/nixos/modules/services/security/kanidm.nix
@@ -887,7 +887,14 @@ in
         (
           defaultServiceConfig
           // {
-            BindReadOnlyPaths = mergePaths (defaultServiceConfig.BindReadOnlyPaths ++ secretPaths);
+            BindReadOnlyPaths = mergePaths (
+              defaultServiceConfig.BindReadOnlyPaths
+              ++ secretPaths
+              ++ (lib.optionals (cfg.provision.enable && !cfg.provision.acceptInvalidCerts) [
+                "-/etc/ssl"
+                "-/etc/static/ssl"
+              ])
+            );
           }
         )
         {

From 2d226ea311808e32559bfec22f21be240e559a93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 18:53:37 +0000
Subject: [PATCH 002/357] spdx-license-list-data: 3.26.0 -> 3.27.0

---
 pkgs/by-name/sp/spdx-license-list-data/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spdx-license-list-data/package.nix b/pkgs/by-name/sp/spdx-license-list-data/package.nix
index c75633ed90bf..84d0f164eb8a 100644
--- a/pkgs/by-name/sp/spdx-license-list-data/package.nix
+++ b/pkgs/by-name/sp/spdx-license-list-data/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "spdx-license-list-data";
-  version = "3.26.0";
+  version = "3.27.0";
 
   src = fetchFromGitHub {
     owner = "spdx";
     repo = "license-list-data";
     rev = "v${version}";
-    hash = "sha256-Zz171OlSa8bzxQUinyO/FF4QjBc4wKp0EUEXwzJewEU=";
+    hash = "sha256-TRrsxk+gtxI9KqJvFzD0Cfy1h5cZAJ2kT9KUARjlXcY=";
   };
 
   # List of file formats to package.

From cba8a70efd735e1b791dd2772cee0763bb383ddc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jul 2025 19:23:03 +0000
Subject: [PATCH 003/357] ocamlPackages.spdx_licenses: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/development/ocaml-modules/spdx_licenses/default.nix b/pkgs/development/ocaml-modules/spdx_licenses/default.nix
index a8e9b9eb2b4d..a2b10cdf6a62 100644
--- a/pkgs/development/ocaml-modules/spdx_licenses/default.nix
+++ b/pkgs/development/ocaml-modules/spdx_licenses/default.nix
@@ -6,13 +6,13 @@
 
 buildDunePackage rec {
   pname = "spdx_licenses";
-  version = "1.3.0";
+  version = "1.4.0";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
     url = "https://github.com/kit-ty-kate/spdx_licenses/releases/download/v${version}/spdx_licenses-${version}.tar.gz";
-    hash = "sha256-UkKAJ+MCCKr68p4sgTZ8/6NMJibWGCG6tQruMpMsjzA=";
+    hash = "sha256-slXewgDbf1US8kk/NaxOoicnkwdliUOq+SemkjvyUis=";
   };
 
   meta = {

From b6e148251f44e30e14cefb5ddf92fce657a06a8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jul 2025 19:29:32 +0000
Subject: [PATCH 004/357] mdk-sdk: 0.33.0 -> 0.33.1

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

diff --git a/pkgs/by-name/md/mdk-sdk/package.nix b/pkgs/by-name/md/mdk-sdk/package.nix
index 2a2561901079..559790e85cde 100644
--- a/pkgs/by-name/md/mdk-sdk/package.nix
+++ b/pkgs/by-name/md/mdk-sdk/package.nix
@@ -33,11 +33,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mdk-sdk";
-  version = "0.33.0";
+  version = "0.33.1";
 
   src = fetchurl {
     url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux.tar.xz";
-    hash = "sha256-d23Mq1uJg4LpbcxywOKZbwyUs3DIRtGrUZY1qBV85VE=";
+    hash = "sha256-4pxH9ZytnAAyBIRP72f64jBOBBSQ6MY0HpdkCy1kFHg=";
   };
 
   nativeBuildInputs = [ autoPatchelfHook ];

From 87f6213006df821ac218d982d32fcb7cb9cef5e6 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Sun, 6 Jul 2025 01:28:23 +0200
Subject: [PATCH 005/357] floorp: disable LTO

Fixes https://github.com/NixOS/nixpkgs/issues/418473
---
 pkgs/applications/networking/browsers/floorp/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix
index a27fde9b1d01..f79c5abe291c 100644
--- a/pkgs/applications/networking/browsers/floorp/default.nix
+++ b/pkgs/applications/networking/browsers/floorp/default.nix
@@ -67,6 +67,8 @@
     webrtcSupport = true;
     enableOfficialBranding = false;
     geolocationSupport = true;
+    # https://github.com/NixOS/nixpkgs/issues/418473
+    ltoSupport = false;
   }
 ).overrideAttrs
   (prev: {

From b9c5f0d4b1a4687e8f01b1e228a3bedeba1fd073 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Jul 2025 01:44:09 +0000
Subject: [PATCH 006/357] ocamlPackages.unisim_archisec: 0.0.10 -> 0.0.11

---
 pkgs/development/ocaml-modules/unisim_archisec/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/unisim_archisec/default.nix b/pkgs/development/ocaml-modules/unisim_archisec/default.nix
index 5a8e8f48e2bf..3da7a2ce79a2 100644
--- a/pkgs/development/ocaml-modules/unisim_archisec/default.nix
+++ b/pkgs/development/ocaml-modules/unisim_archisec/default.nix
@@ -6,11 +6,11 @@
 
 buildDunePackage {
   pname = "unisim_archisec";
-  version = "0.0.10";
+  version = "0.0.11";
 
   src = fetchurl {
-    url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.10/unisim_archisec-0.0.10.tbz";
-    sha256 = "sha256-lMWiShhl3YWI764EgHqoXXce+NGRe2clOBVrq9OqLfg=";
+    url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.11/unisim_archisec-0.0.11.tbz";
+    sha256 = "sha256-stzs1BQ7M+q2R82CUdzvP0FVBUvupychbm8z89o4ORY=";
   };
 
   duneVersion = "3";

From 86d0bfc85d063c3c66b04b7724b00f01d8ce7619 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 00:04:05 +0000
Subject: [PATCH 007/357] ocamlPackages.sail: 0.19 -> 0.19.1

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

diff --git a/pkgs/development/ocaml-modules/sail/default.nix b/pkgs/development/ocaml-modules/sail/default.nix
index 8b2c4aaf817e..6231826baa92 100644
--- a/pkgs/development/ocaml-modules/sail/default.nix
+++ b/pkgs/development/ocaml-modules/sail/default.nix
@@ -16,7 +16,7 @@
   lem,
   linksem,
   yojson,
-  version ? "0.19",
+  version ? "0.19.1",
 }:
 
 buildDunePackage {
@@ -25,7 +25,7 @@ buildDunePackage {
 
   src = fetchurl {
     url = "https://github.com/rems-project/sail/releases/download/${version}/sail-${version}.tbz";
-    hash = "sha256-VFjmmsCl2fUnONGUZQnFAYl/VIesy5YQsfIMMDBdI+A=";
+    hash = "sha256-Xplpi2NnwBgTPJCq7Szv8XPeINtuYcM+KxlZSh1IKjI=";
   };
 
   minimalOCamlVersion = "4.08";

From bceb6f25dfbe461461c1866d0242810dc12c1882 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 00:44:27 +0000
Subject: [PATCH 008/357] redwax-tool: 0.9.9 -> 1.0.0

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

diff --git a/pkgs/by-name/re/redwax-tool/package.nix b/pkgs/by-name/re/redwax-tool/package.nix
index bb9a8886df71..7c8ceea3c008 100644
--- a/pkgs/by-name/re/redwax-tool/package.nix
+++ b/pkgs/by-name/re/redwax-tool/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "redwax-tool";
-  version = "0.9.9";
+  version = "1.0.0";
 
   src = fetchurl {
     url = "https://archive.redwax.eu/dist/rt/redwax-tool-${version}/redwax-tool-${version}.tar.gz";
-    hash = "sha256-gA9YWR3v66lSn4KkwG49l7V4/HUTrBXXl1uDCLr1tu8=";
+    hash = "sha256-KIVr0FnCmZUuxenXCvAlLxQVQJ5XndAidVaiGevENoM=";
   };
 
   nativeBuildInputs = [

From e56bfd3c4fa6a3ece52dc2cd93ef275204abaa90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 01:54:05 +0000
Subject: [PATCH 009/357] marble-shell-theme: 48.0.1 -> 48.3.2

---
 pkgs/by-name/ma/marble-shell-theme/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/marble-shell-theme/package.nix b/pkgs/by-name/ma/marble-shell-theme/package.nix
index ec96fa07a0ba..a4d954b826fe 100644
--- a/pkgs/by-name/ma/marble-shell-theme/package.nix
+++ b/pkgs/by-name/ma/marble-shell-theme/package.nix
@@ -14,13 +14,13 @@ assert lib.assertMsg (colors != [ ]) "The `colors` list can not be empty";
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "marble-shell-theme";
-  version = "48.0.1";
+  version = "48.3.2";
 
   src = fetchFromGitHub {
     owner = "imarkoff";
     repo = "Marble-shell-theme";
     tag = finalAttrs.version;
-    hash = "sha256-t/p8/Phl+DXbSVT8l3fonZQeoUTtrcfe4HiKB3D8KXw=";
+    hash = "sha256-EYQmtVq852YG4Pmk6Nj4RF+aZUJmIZwhegHIR+Xxu8A=";
   };
 
   nativeBuildInputs = [

From c85a9d305c62e680cd72868765e37e016e58156f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 04:03:53 +0000
Subject: [PATCH 010/357] bicep: 0.36.1 -> 0.36.177

---
 pkgs/by-name/bi/bicep/deps.json   | 28 ++++++++++++++--------------
 pkgs/by-name/bi/bicep/package.nix |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/bi/bicep/deps.json b/pkgs/by-name/bi/bicep/deps.json
index 38319800e8f0..7c1e3084ef9b 100644
--- a/pkgs/by-name/bi/bicep/deps.json
+++ b/pkgs/by-name/bi/bicep/deps.json
@@ -11,8 +11,8 @@
   },
   {
     "pname": "Azure.Bicep.Types.Az",
-    "version": "0.2.771",
-    "hash": "sha256-VByaJddUXteY5SNE6EsMW6s1p8bJZuM3DdPZ9jPOBkE="
+    "version": "0.2.784",
+    "hash": "sha256-F3Vu7AdbwbMz2msxYcrG7uedrsdtDtKU7+s3n+/bqRw="
   },
   {
     "pname": "Azure.Bicep.Types.K8s",
@@ -46,28 +46,28 @@
   },
   {
     "pname": "Azure.Deployments.Core",
-    "version": "1.384.0",
-    "hash": "sha256-GkARRAP79e4QtCCVF+YU8o2Lr/tMtlJB2q3UvZJ5zvw="
+    "version": "1.393.0",
+    "hash": "sha256-ndgyA2iYbE/S4HBwos01ozoVqKrXogz5rggQ5D/21jA="
   },
   {
     "pname": "Azure.Deployments.DiffEngine",
-    "version": "1.384.0",
-    "hash": "sha256-i+3LW2XtndizGWCjrLAfhmckicU6fFzSEhJeNL4+Rh4="
+    "version": "1.393.0",
+    "hash": "sha256-tLvsvnmcPsIF+vrxkYGV83MJsplGotEt8lVlhuTorBo="
   },
   {
     "pname": "Azure.Deployments.Engine",
-    "version": "1.384.0",
-    "hash": "sha256-l1yKQPexJO11HMKWhFWFdWmUidJAgzhFrudxHVF+KdA="
+    "version": "1.393.0",
+    "hash": "sha256-3z5kQNEEaiVH4YP03oa/+huk88i7KKcgIhubkHXPp6U="
   },
   {
     "pname": "Azure.Deployments.Expression",
-    "version": "1.384.0",
-    "hash": "sha256-FFu6uNZWXH/54EpyM2KH9cm3YYF66Lnq+w7470oTqhk="
+    "version": "1.393.0",
+    "hash": "sha256-8pjakM5oz5JowKXMj13ErIfz0NBbM7pkHcoUG9jY4Tc="
   },
   {
     "pname": "Azure.Deployments.Extensibility",
-    "version": "1.384.0",
-    "hash": "sha256-lOz0lIdB7RCqQJJrpjRocgJCN/luHj0GFbIrsUN5SWU="
+    "version": "1.393.0",
+    "hash": "sha256-IaiaDrvhyJb45WtAT0mhKG8DDs5QxCC5KzQjQq+vSRY="
   },
   {
     "pname": "Azure.Deployments.Extensibility.Core",
@@ -91,8 +91,8 @@
   },
   {
     "pname": "Azure.Deployments.Templates",
-    "version": "1.384.0",
-    "hash": "sha256-yuWJqgh0hDzQNOjMhN1Wg0MxDgvMpFaNCsvumtldrZA="
+    "version": "1.393.0",
+    "hash": "sha256-FtOufi5hNlz3H+kpbNaw89FPtZ8qpFX2DAfBZP/z1Io="
   },
   {
     "pname": "Azure.Identity",
diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix
index 11b584851861..4519dd48ad54 100644
--- a/pkgs/by-name/bi/bicep/package.nix
+++ b/pkgs/by-name/bi/bicep/package.nix
@@ -10,13 +10,13 @@
 
 buildDotnetModule rec {
   pname = "bicep";
-  version = "0.36.1";
+  version = "0.36.177";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "bicep";
     rev = "v${version}";
-    hash = "sha256-I7FBJhRLzRCsDS4pKJqi/IwuRCpjbJeeYY0BjQ2UiMk=";
+    hash = "sha256-ah8g1mU2etQ/zoXcGbS+xRkTb4DjPmofe2ubZSNRhNU=";
   };
 
   patches = [

From 6aa87a71ddc55bc3b8a966ffb6efbbf5d65455ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 12:35:21 +0000
Subject: [PATCH 011/357] tkdiff: 5.7 -> 6.0

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

diff --git a/pkgs/by-name/tk/tkdiff/package.nix b/pkgs/by-name/tk/tkdiff/package.nix
index 73e450828c7b..e04905eee2d3 100644
--- a/pkgs/by-name/tk/tkdiff/package.nix
+++ b/pkgs/by-name/tk/tkdiff/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tkdiff";
-  version = "5.7";
+  version = "6.0";
 
   src = fetchzip {
     url = "mirror://sourceforge/tkdiff/tkdiff-${
       builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version
     }.zip";
-    hash = "sha256-ZndpolvaXoCAzR4KF+Bu7DJrXyB/C2H2lWp5FyzOc4M=";
+    hash = "sha256-fBPeXL6G9LZZHIapj/lncNrUU02ocnqDOOJfvlKIyRA=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

From 6907e0de8026402771b3b2c15d95efdb747367ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 15:44:33 +0000
Subject: [PATCH 012/357] zxtune: 5100 -> 5101

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

diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix
index af2cc20449e9..7a5d8fb09c8c 100644
--- a/pkgs/by-name/zx/zxtune/package.nix
+++ b/pkgs/by-name/zx/zxtune/package.nix
@@ -48,7 +48,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "zxtune";
-  version = "5100";
+  version = "5101";
 
   outputs = [ "out" ];
 
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     owner = "zxtune";
     repo = "zxtune";
     rev = "r${version}";
-    hash = "sha256-SNHnpLAbiHCo11V090EY/vLH4seoZWpMHMMBLGkr88E=";
+    hash = "sha256-C+1tmQ8cKGpigWDh5p0mqv9B7/Tv8iJ4JVc835Q4y40=";
   };
 
   passthru.updateScript = nix-update-script {

From 10ca1d5883a4f71c316c8f1dbd8a031744bd7f63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 23:56:42 +0000
Subject: [PATCH 013/357] ios-webkit-debug-proxy: 1.9.1 -> 1.9.2

---
 pkgs/by-name/io/ios-webkit-debug-proxy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix
index 416af017b6cd..6ed2b751bf78 100644
--- a/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix
+++ b/pkgs/by-name/io/ios-webkit-debug-proxy/package.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ios-webkit-debug-proxy";
-  version = "1.9.1";
+  version = "1.9.2";
 
   outputs = [
     "out"
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "google";
     repo = "ios-webkit-debug-proxy";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-94gYTv5v4YNwbiUJ/9PIHU+Bnvf5uN12+oMFWKj+J1Y=";
+    hash = "sha256-42hNAMokjfo7Vi1xclFcjUmioMFQW64HYTMvvTVk5hY=";
   };
 
   patches = [

From 0b3c70cf94d9712997db0033d6b24a0b0a63c72d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 11:47:27 +0000
Subject: [PATCH 014/357] acr-cli: 0.15 -> 0.16

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

diff --git a/pkgs/by-name/ac/acr-cli/package.nix b/pkgs/by-name/ac/acr-cli/package.nix
index 0b5f19ac355e..502b0cfa1003 100644
--- a/pkgs/by-name/ac/acr-cli/package.nix
+++ b/pkgs/by-name/ac/acr-cli/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule rec {
   pname = "acr-cli";
-  version = "0.15";
+  version = "0.16";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "acr-cli";
     tag = "v${version}";
-    hash = "sha256-5uEaptJSB5mb12vqeSGkRj4oRed+0VgcJx4vpTBQCAU=";
+    hash = "sha256-H802VfEy3+bi6VB6z+FyMIFOazHh67mp3/9GuxcU/CU=";
   };
 
   vendorHash = null;

From 42072f4a8360f0229b64270cfdcd29e09fc0b499 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 12:32:46 +0000
Subject: [PATCH 015/357] gmm: 5.4.2 -> 5.4.4

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

diff --git a/pkgs/by-name/gm/gmm/package.nix b/pkgs/by-name/gm/gmm/package.nix
index 051c413fced8..3118fdfc76e4 100644
--- a/pkgs/by-name/gm/gmm/package.nix
+++ b/pkgs/by-name/gm/gmm/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gmm";
-  version = "5.4.2";
+  version = "5.4.4";
 
   src = fetchurl {
     url = "mirror://savannah/getfem/stable/${pname}-${version}.tar.gz";
-    sha256 = "sha256-UgbnMmQ/aTQQkCiy8XNmDywu3LDuJpIo1pSsym4iyIo=";
+    sha256 = "sha256-FesZQwEbkmZaqzsC7PPO3hz4nqFakAb4HyuizWYqoCs=";
   };
 
   meta = with lib; {

From 288d679dad58b08953117d7ff5b7e33b42be59b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 13:07:24 +0000
Subject: [PATCH 016/357] prometheus-frr-exporter: 1.7.0 -> 1.8.0

---
 pkgs/by-name/pr/prometheus-frr-exporter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
index 36910ca276c9..07d444d3e24b 100644
--- a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
@@ -5,12 +5,12 @@
 }:
 
 let
-  version = "1.7.0";
+  version = "1.8.0";
   src = fetchFromGitHub {
     owner = "tynany";
     repo = "frr_exporter";
     rev = "v${version}";
-    hash = "sha256-F3N2TJmcFxks2yP52yzeWfiVwQQO54EDAdzUCqXVrbM=";
+    hash = "sha256-pzNketG3YwKPAfNXObQPmpiAXuuA3wNdTG/dzUWULFo=";
   };
 in
 buildGoModule {

From 031d34fdaac9620806b4b10d04c92cb508975a0c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 13:28:41 +0000
Subject: [PATCH 017/357] vrpn: 07.35 -> 07.36

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

diff --git a/pkgs/by-name/vr/vrpn/package.nix b/pkgs/by-name/vr/vrpn/package.nix
index 18b4013ce58d..44ba9f09ee6e 100644
--- a/pkgs/by-name/vr/vrpn/package.nix
+++ b/pkgs/by-name/vr/vrpn/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vrpn";
-  version = "07.35";
+  version = "07.36";
 
   src = fetchFromGitHub {
     owner = "vrpn";
     repo = "vrpn";
     rev = "version_${version}";
-    hash = "sha256-vvlwhm5XHWD4Nh1hwY427pe36RQaqTDJiEtkCxHeCig=";
+    hash = "sha256-eXmj9Wqm+ytsnypC+MrOLnJg9zlri5y0puavamZqFmY=";
   };
 
   nativeBuildInputs = [

From b2b41c57b58958ba5781251ee7c7138bde03d9a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Jul 2025 15:39:17 +0000
Subject: [PATCH 018/357] ipatool: 2.1.6 -> 2.2.0

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

diff --git a/pkgs/by-name/ip/ipatool/package.nix b/pkgs/by-name/ip/ipatool/package.nix
index 91610e91f4e3..3504ec2936d5 100644
--- a/pkgs/by-name/ip/ipatool/package.nix
+++ b/pkgs/by-name/ip/ipatool/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "ipatool";
-  version = "2.1.6";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "majd";
     repo = "ipatool";
     rev = "v${version}";
-    hash = "sha256-NdxYrTy8SzPmy3C9wOQYMdzKKumDMeYe+k8Nu2ku/RY=";
+    hash = "sha256-z6f5PNxAH+8mS2kWjhST0LFhwTR01m7rR5O95ee+p2E=";
   };
 
-  vendorHash = "sha256-/uB4mviMaPyYX59XrRqigOI0YK3necdRC2ZPErai1NU=";
+  vendorHash = "sha256-f6mXTePiM5kZUdrYqvbN5pyNp1OGNMeJZMUJ3pvaRrc=";
 
   ldflags = [
     "-s"

From 41deb3621113450de8f2e6bdeca761e48f140409 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Jul 2025 03:19:18 +0000
Subject: [PATCH 019/357] gnu-shepherd: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/by-name/gn/gnu-shepherd/package.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix
index 24a3df668951..16b0c584e9ec 100644
--- a/pkgs/by-name/gn/gnu-shepherd/package.nix
+++ b/pkgs/by-name/gn/gnu-shepherd/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnu-shepherd";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchurl {
     url = "mirror://gnu/shepherd/shepherd-${version}.tar.gz";
-    hash = "sha256-PEdQaaArSQGEkeWlu6tbekJNdsega9v0ev0AXchoBfg=";
+    hash = "sha256-/HTf2kmaaV5lD8WDnTmtU44uMjlJuJBK/Pr/o0FxvjM=";
   };
 
   configureFlags = [ "--localstatedir=/" ];

From 16f3086dc8f6d25dca1c3afda5708c47798bf8df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Jul 2025 10:24:25 +0000
Subject: [PATCH 020/357] localstack: 4.5.0 -> 4.6.0

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

diff --git a/pkgs/by-name/lo/localstack/package.nix b/pkgs/by-name/lo/localstack/package.nix
index d168086a37c8..73a3614dc8bd 100644
--- a/pkgs/by-name/lo/localstack/package.nix
+++ b/pkgs/by-name/lo/localstack/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "localstack";
-  version = "4.5.0";
+  version = "4.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "localstack";
     repo = "localstack";
     tag = "v${version}";
-    hash = "sha256-lqFT2Ad92ZjsuKIuaFZ/tes2xJ8PBl0XUvqRmppWL0c=";
+    hash = "sha256-95jg/FmeES64DSMPvWWaNXIxOTOtwvvXixZAgxWMqYo=";
   };
 
   build-system = with python3.pkgs; [

From f6ffcf17ef90daae09109c9d4dbe9453f8f7085c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Jul 2025 13:40:56 +0000
Subject: [PATCH 021/357] apt: 3.1.2 -> 3.1.3

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

diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix
index 0e7f33d3ba14..3771f87e99c2 100644
--- a/pkgs/by-name/ap/apt/package.nix
+++ b/pkgs/by-name/ap/apt/package.nix
@@ -34,14 +34,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "apt";
-  version = "3.1.2";
+  version = "3.1.3";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "apt-team";
     repo = "apt";
     rev = finalAttrs.version;
-    hash = "sha256-Mz8WCOPdEVStH9WLmpHAN22bsn59h8eQoK0h7ssDQrQ=";
+    hash = "sha256-1ZGYGXqWBR+kGCNMf6Kkm/v6ncOi7KA8kQ0uxE4SSSg=";
   };
 
   # cycle detection; lib can't be split

From f4602eeec1b40661d756fe1bd4f690c4c209273f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Jul 2025 13:47:49 +0000
Subject: [PATCH 022/357] pgmoneta: 0.17.2 -> 0.18.0

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

diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix
index 31a0471e48d3..69853c84d2c6 100644
--- a/pkgs/by-name/pg/pgmoneta/package.nix
+++ b/pkgs/by-name/pg/pgmoneta/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pgmoneta";
-  version = "0.17.2";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "pgmoneta";
     repo = "pgmoneta";
     rev = version;
-    hash = "sha256-d0F+gbYZ9qWRvbOXdKRQS0Rkcvsa5zzu2kiqwLiXpxw=";
+    hash = "sha256-FAW3WmFnJ4Dql1tbVqWIie5nH7XlBKu0efMQrRuPSJc=";
   };
 
   nativeBuildInputs = [

From 2015ab9cba62c960661fa36f7b36aea975ef13e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Jul 2025 15:22:56 +0000
Subject: [PATCH 023/357] tarlz: 0.28 -> 0.28.1

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

diff --git a/pkgs/by-name/ta/tarlz/package.nix b/pkgs/by-name/ta/tarlz/package.nix
index ceb5cf32e3a7..5ce46b3cb209 100644
--- a/pkgs/by-name/ta/tarlz/package.nix
+++ b/pkgs/by-name/ta/tarlz/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tarlz";
-  version = "0.28";
+  version = "0.28.1";
   outputs = [
     "out"
     "man"
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://savannah/lzip/tarlz/tarlz-${finalAttrs.version}.tar.lz";
-    sha256 = "sha256-6kE/UanxWMuqqidFGiA10ukyInXarPI39/aENHwJ8ik=";
+    sha256 = "sha256-qzySt/fxDJU5vHvmkfumSK8h1MieVdgexm12H43Ytak=";
   };
 
   enableParallelBuilding = true;

From 10f846d425bce4fb784e2555464eae09cfb70d99 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Jul 2025 17:05:12 +0000
Subject: [PATCH 024/357] junicode: 2.211 -> 2.216

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

diff --git a/pkgs/by-name/ju/junicode/package.nix b/pkgs/by-name/ju/junicode/package.nix
index 9291a73abeb0..51895596f40f 100644
--- a/pkgs/by-name/ju/junicode/package.nix
+++ b/pkgs/by-name/ju/junicode/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "junicode";
-  version = "2.211";
+  version = "2.216";
 
   src = fetchzip {
     url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip";
-    hash = "sha256-ZFJqNIsuWVph3U73lbcXVKXgzt+5cPxetvcAAzt0jvg=";
+    hash = "sha256-DiO5+IQfhBuzK3GE41XCm5ik0f/fyibt6V0714uDiYE=";
   };
 
   outputs = [

From dec847a345a5dc8acc056a2c494c8fc4516311ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Jul 2025 23:18:14 +0000
Subject: [PATCH 025/357] google-alloydb-auth-proxy: 1.13.3 -> 1.13.4

---
 pkgs/by-name/go/google-alloydb-auth-proxy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix
index eb476c93d1e9..af99a05038e3 100644
--- a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix
+++ b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "google-alloydb-auth-proxy";
-  version = "1.13.3";
+  version = "1.13.4";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "alloydb-auth-proxy";
     tag = "v${version}";
-    hash = "sha256-NqsIx3+dlDY/WPZJloezZDdFrs/IQ3aqcTKYBD9k3Hk=";
+    hash = "sha256-swohqZFzVvaXy84Y7aKwcSr4YfmZuZ63zyHgjit9oJI=";
   };
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-aRnrn9D561OMlfMQiPwTSUyflozU5D/zzApoITiAH7E=";
+  vendorHash = "sha256-ng2BLLlTu5X30GSELWbmRSRzZAaF21T2u3fLK6fE1kM=";
 
   checkFlags = [
     "-short"

From 975e7f985f527531416c95eae9b7c020e9c2d6d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Jul 2025 06:32:14 +0000
Subject: [PATCH 026/357] checkstyle: 10.25.1 -> 10.26.1

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

diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix
index b730eeeeaced..2f16fcd5513c 100644
--- a/pkgs/by-name/ch/checkstyle/package.nix
+++ b/pkgs/by-name/ch/checkstyle/package.nix
@@ -7,12 +7,12 @@
 }:
 
 stdenvNoCC.mkDerivation rec {
-  version = "10.25.1";
+  version = "10.26.1";
   pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "sha256-dRihSzEcq/IEBwrvrXoYfx13PHhdzPt7ldv0EuU1RiE=";
+    sha256 = "sha256-5BwkQzcjujEKMOQdpPRJwQWtR8qyrp5r5eBmBqZH28o=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

From 245a054c9058d26aac650b1261b9a54746781647 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Jul 2025 08:58:19 +0000
Subject: [PATCH 027/357] micronaut: 4.9.0 -> 4.9.1

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

diff --git a/pkgs/by-name/mi/micronaut/package.nix b/pkgs/by-name/mi/micronaut/package.nix
index 23b615df94a2..f68f3e860a6b 100644
--- a/pkgs/by-name/mi/micronaut/package.nix
+++ b/pkgs/by-name/mi/micronaut/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "micronaut";
-  version = "4.9.0";
+  version = "4.9.1";
 
   src = fetchzip {
     url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
-    sha256 = "sha256-OjdszWegkZ1qj6+46LV+dVsCggfvHlBRnkhJJkRa+cg=";
+    sha256 = "sha256-BzqOyUTJTvpp/LDZ/jUyvgknRvytAT8Z+K4TTgsnxSc=";
   };
 
   nativeBuildInputs = [

From cf1fee816101964d95096063252b1203281192ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Jul 2025 12:36:47 +0000
Subject: [PATCH 028/357] numcpp: 2.14.1 -> 2.14.2

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

diff --git a/pkgs/by-name/nu/numcpp/package.nix b/pkgs/by-name/nu/numcpp/package.nix
index c5972f050cc0..cf45ff2e3ffb 100644
--- a/pkgs/by-name/nu/numcpp/package.nix
+++ b/pkgs/by-name/nu/numcpp/package.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "numcpp";
-  version = "2.14.1";
+  version = "2.14.2";
 
   src = fetchFromGitHub {
     owner = "dpilger26";
     repo = "NumCpp";
     tag = "Version_${finalAttrs.version}";
-    hash = "sha256-8ghHTRneLeiFgzF9zHFjFu46qopc3l2Svku1H06XQTw=";
+    hash = "sha256-A2x7Ar/Ihk4iGb7J93hGULtfoI8xidkGtpkVWgicSFI=";
   };
 
   patches = [ ./pytest-CMakeLists.patch ];

From eb94edd79e50ad88b0b5002e3d110c55e6f8d60a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Jul 2025 18:24:39 +0000
Subject: [PATCH 029/357] youtrack: 2025.1.82518 -> 2025.1.86199

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

diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix
index d9695edac7e5..2b7a94b95cea 100644
--- a/pkgs/by-name/yo/youtrack/package.nix
+++ b/pkgs/by-name/yo/youtrack/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "youtrack";
-  version = "2025.1.82518";
+  version = "2025.1.86199";
 
   src = fetchzip {
     url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip";
-    hash = "sha256-xltAkkD6JuRk+Bl3yP9l44ix/6+rTVuhgKqlroIUIFs=";
+    hash = "sha256-+sHxagy9+H6DEnpdtRTNMy6GLSSCopaeqlXWJodAim0=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

From a80b91eed6434e5eeef286e926023b79061aa6d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Jul 2025 00:37:46 +0000
Subject: [PATCH 030/357] openturns: 1.25 -> 1.25.1

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

diff --git a/pkgs/by-name/op/openturns/package.nix b/pkgs/by-name/op/openturns/package.nix
index 2d19f3859f79..cef3211f0053 100644
--- a/pkgs/by-name/op/openturns/package.nix
+++ b/pkgs/by-name/op/openturns/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openturns";
-  version = "1.25";
+  version = "1.25.1";
 
   src = fetchFromGitHub {
     owner = "openturns";
     repo = "openturns";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-lAFfOwriDdYvfRK/5vEQ/v97o3l/aH8jPHCVf9vlfV4=";
+    hash = "sha256-TwM6RvXG4+IBNxH2Ajg9atcaOGlC4kzusH8+6VbI6m4=";
   };
 
   nativeBuildInputs = [

From 62e0397aaa6d57504e2c3451b327ce76dfe89446 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Jul 2025 03:30:26 +0000
Subject: [PATCH 031/357] flrig: 2.0.07 -> 2.0.08

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

diff --git a/pkgs/by-name/fl/flrig/package.nix b/pkgs/by-name/fl/flrig/package.nix
index 3951bf1d30f4..84db6d5f18ac 100644
--- a/pkgs/by-name/fl/flrig/package.nix
+++ b/pkgs/by-name/fl/flrig/package.nix
@@ -9,12 +9,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.07";
+  version = "2.0.08";
   pname = "flrig";
 
   src = fetchurl {
     url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
-    sha256 = "sha256-Rls6w9DWaepmJrppH2j+gVF2C3bSirnlBHcFMrGA9e8=";
+    sha256 = "sha256-+erxQBZKHzMOQPM/VAk+Iw9ItPZnW9Ndiu0HQ08Szm8=";
   };
 
   buildInputs = [

From 978962236bd5e6b28a0b28d5f93de5309c71aaa9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Jul 2025 04:29:10 +0000
Subject: [PATCH 032/357] rocketchat-desktop: 4.7.0 -> 4.7.1

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

diff --git a/pkgs/by-name/ro/rocketchat-desktop/package.nix b/pkgs/by-name/ro/rocketchat-desktop/package.nix
index 672ef4df2118..f62ff9c2c6d5 100644
--- a/pkgs/by-name/ro/rocketchat-desktop/package.nix
+++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix
@@ -10,11 +10,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "rocketchat-desktop";
-  version = "4.7.0";
+  version = "4.7.1";
 
   src = fetchurl {
     url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb";
-    hash = "sha256-ixEJ2NUIEaiuGk4j7c2howrFXU9OGSB9jFI9kjkdN8E=";
+    hash = "sha256-6Wr4058jeU+hJafJmV9NQEkAt699E4fyKmtUwqkIQCw=";
   };
 
   nativeBuildInputs = [

From 12da12f8abb21874e8b3aacaaafbd982872172cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 12 Jul 2025 07:07:55 +0000
Subject: [PATCH 033/357] fzy: 1.0 -> 1.1

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

diff --git a/pkgs/by-name/fz/fzy/package.nix b/pkgs/by-name/fz/fzy/package.nix
index 98842aa0cb97..78cdea800f9f 100644
--- a/pkgs/by-name/fz/fzy/package.nix
+++ b/pkgs/by-name/fz/fzy/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fzy";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchFromGitHub {
     owner = "jhawthorn";
     repo = "fzy";
     rev = version;
-    sha256 = "1gkzdvj73f71388jvym47075l9zw61v6l8wdv2lnc0mns6dxig0k";
+    sha256 = "sha256-ZGAt8rW21WFGuf/nE44ZrL68L/RmTYCBzuXWhidqJB8=";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

From 61df4f3c305db8cb9ee6e6fb8ab42b8f721ef855 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Jul 2025 21:22:48 +0000
Subject: [PATCH 034/357] bootstrap-studio: 7.1.1 -> 7.1.2

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

diff --git a/pkgs/by-name/bo/bootstrap-studio/package.nix b/pkgs/by-name/bo/bootstrap-studio/package.nix
index c98eb7e5e54c..da5c80cd647e 100644
--- a/pkgs/by-name/bo/bootstrap-studio/package.nix
+++ b/pkgs/by-name/bo/bootstrap-studio/package.nix
@@ -6,10 +6,10 @@
 
 let
   pname = "bootstrap-studio";
-  version = "7.1.1";
+  version = "7.1.2";
   src = fetchurl {
     url = "https://releases.bootstrapstudio.io/${version}/Bootstrap%20Studio.AppImage";
-    sha256 = "sha256-R9cgCLJGFO8B1PB/7YHtWyXidElW84hJCwxRME5kYGc=";
+    sha256 = "sha256-tn5MkRSS2SLqVU5SQOH0WYN15wll7nREFA9rkXTPAtQ=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in

From c7d1cc7e1b8ef056ee8b012b1b0fa622f57365ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 12:55:08 +0000
Subject: [PATCH 035/357] solo5: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/by-name/so/solo5/package.nix b/pkgs/by-name/so/solo5/package.nix
index 0bc92af21db6..ac12a6e7ed97 100644
--- a/pkgs/by-name/so/solo5/package.nix
+++ b/pkgs/by-name/so/solo5/package.nix
@@ -14,7 +14,7 @@
 }:
 
 let
-  version = "0.9.1";
+  version = "0.9.2";
   # list of all theoretically available targets
   targets = [
     "genode"
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz";
-    hash = "sha256-aHCY/mrEn3tNXC6e1fzzLHcrzYkKzgF7t1qc3QtnaVE=";
+    hash = "sha256-HiYi6VECDVZXJboTt6DwggyUyUhdlU4C7fwqYzvKWZs=";
   };
 
   hardeningEnable = [ "pie" ];

From 868a4c215e016234ed2ffe9c631e11967e7584ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Jul 2025 23:33:22 +0000
Subject: [PATCH 036/357] traccar: 6.7.3 -> 6.8.1

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

diff --git a/pkgs/by-name/tr/traccar/package.nix b/pkgs/by-name/tr/traccar/package.nix
index dda2896d7d88..b0464ba61b15 100644
--- a/pkgs/by-name/tr/traccar/package.nix
+++ b/pkgs/by-name/tr/traccar/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "traccar";
-  version = "6.7.3";
+  version = "6.8.1";
   nativeBuildInputs = [ pkgs.makeWrapper ];
 
   src = fetchzip {
     stripRoot = false;
     url = "https://github.com/traccar/traccar/releases/download/v${version}/traccar-other-${version}.zip";
-    hash = "sha256-XUlGxOT9udJUy9tcdKeqvY2EbGokDcp+Wv3ShfHPoGA=";
+    hash = "sha256-bc4IJCEMM5qd1gOvNKcmX1dcyB4DTS4bpKkHTL+qtEQ=";
   };
 
   installPhase = ''

From 12f4b9085ea436d2006580f9ec4f12c20651ba2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Jul 2025 00:29:12 +0000
Subject: [PATCH 037/357] commonsLang: 3.17.0 -> 3.18.0

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

diff --git a/pkgs/by-name/co/commonsLang/package.nix b/pkgs/by-name/co/commonsLang/package.nix
index a3077e666774..baded0fb551b 100644
--- a/pkgs/by-name/co/commonsLang/package.nix
+++ b/pkgs/by-name/co/commonsLang/package.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "3.17.0";
+  version = "3.18.0";
   pname = "commons-lang";
 
   src = fetchurl {
     url = "mirror://apache/commons/lang/binaries/commons-lang3-${finalAttrs.version}-bin.tar.gz";
-    hash = "sha256-CLk3Er7X9Icl2TxE1wxx5+ZhrzkPIvDz5rph46886jY=";
+    hash = "sha256-rdX5zWVkN1FdGcivRgWDIvm7wzdZGoEQJ/cG34TuWxQ=";
   };
 
   installPhase = ''

From af63bf44b3de490c73f80e06c6b6bfc433e07e9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Jul 2025 07:48:15 +0000
Subject: [PATCH 038/357] dpkg: 1.22.20 -> 1.22.21

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

diff --git a/pkgs/by-name/dp/dpkg/package.nix b/pkgs/by-name/dp/dpkg/package.nix
index c8b0adb974dd..33928eba46c0 100644
--- a/pkgs/by-name/dp/dpkg/package.nix
+++ b/pkgs/by-name/dp/dpkg/package.nix
@@ -19,12 +19,12 @@
 
 stdenv.mkDerivation rec {
   pname = "dpkg";
-  version = "1.22.20";
+  version = "1.22.21";
 
   src = fetchgit {
     url = "https://git.launchpad.net/ubuntu/+source/dpkg";
     rev = "applied/${version}";
-    hash = "sha256-Sw4darMZNFWwvDVBuf0EEdG5Qo2ceiooBrbXWJfCw4o=";
+    hash = "sha256-UiXZfwvgsgyXR6olNzKelt/3Fgtp7KU8UbTRRkDl8wY=";
   };
 
   configureFlags = [

From 67598fd72a9d3e2f4c467de93c67cc985347872e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 16 Jul 2025 19:53:58 +0000
Subject: [PATCH 039/357] boxflat: 1.33.0 -> 1.34.2

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

diff --git a/pkgs/by-name/bo/boxflat/package.nix b/pkgs/by-name/bo/boxflat/package.nix
index a9683c07e1b9..12a888610bc9 100644
--- a/pkgs/by-name/bo/boxflat/package.nix
+++ b/pkgs/by-name/bo/boxflat/package.nix
@@ -14,14 +14,14 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "boxflat";
-  version = "1.33.0";
+  version = "1.34.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lawstorant";
     repo = "boxflat";
     tag = "v${version}";
-    hash = "sha256-efEEp2FDXrMrNFalwqNiOhSgQq3uFHNJEA+o34yiS5E=";
+    hash = "sha256-u1rhZfYCQC0qm79cMCCBvlHC4F9rwkL6X72rylPhJwE=";
   };
 
   build-system = [ python3Packages.setuptools ];

From c0553b8070f3fc0eb11af5da5df0d5949d309de8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 17 Jul 2025 00:30:05 +0000
Subject: [PATCH 040/357] cadaver: 0.26 -> 0.27

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

diff --git a/pkgs/by-name/ca/cadaver/package.nix b/pkgs/by-name/ca/cadaver/package.nix
index 398dece270f5..6ce29fe32980 100644
--- a/pkgs/by-name/ca/cadaver/package.nix
+++ b/pkgs/by-name/ca/cadaver/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cadaver";
-  version = "0.26";
+  version = "0.27";
 
   src = fetchurl {
     url = "https://notroj.github.io/cadaver/cadaver-${version}.tar.gz";
-    hash = "sha256-kjbkPN81BdnvBhhf2kMlKEAQXAwC2TcLbhB32GY1e1U=";
+    hash = "sha256-Eq/GKyPhKRJw6V6CHcqw1XRrpEYcv8hNCMKuursqtU8=";
   };
 
   configureFlags = [

From daee60c911eb656975da791e465e192b668e7589 Mon Sep 17 00:00:00 2001
From: David Wronek <david@mainlining.org>
Date: Thu, 17 Jul 2025 13:11:35 +0200
Subject: [PATCH 041/357] stalwart-mail: fix 16 KB page size on ARM systems

---
 pkgs/by-name/st/stalwart-mail/package.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index 472a7824561a..5293ad98e752 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -60,12 +60,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ++ lib.optionals withFoundationdb [ "foundationdb" ]
     ++ lib.optionals stalwartEnterprise [ "enterprise" ];
 
-  env = {
-    OPENSSL_NO_VENDOR = true;
-    ZSTD_SYS_USE_PKG_CONFIG = true;
-    ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
-    ROCKSDB_LIB_DIR = "${rocksdb}/lib";
-  };
+  env =
+    {
+      OPENSSL_NO_VENDOR = true;
+      ZSTD_SYS_USE_PKG_CONFIG = true;
+      ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
+      ROCKSDB_LIB_DIR = "${rocksdb}/lib";
+    }
+    // lib.optionalAttrs
+      (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isArmv7))
+      {
+        JEMALLOC_SYS_WITH_LG_PAGE = 16;
+      };
 
   postInstall = ''
     mkdir -p $out/etc/stalwart

From e35652e06637cda0f40fd8da1e194480fe5255b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 00:32:51 +0000
Subject: [PATCH 042/357] freeciv: 3.1.5 -> 3.2.0

---
 pkgs/games/freeciv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index 19bc95582e47..53b9ec1de824 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -34,13 +34,13 @@
 
 stdenv.mkDerivation rec {
   pname = "freeciv";
-  version = "3.1.5";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "freeciv";
     repo = "freeciv";
     rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-+kAV9Jz0aQpzeVUFp3so+rYbWOn52NuxRwE8kP5hzM8=";
+    hash = "sha256-IlJ51ryoQ7qzIY9n8dmPQdwH8aPjXvRXXO2COOxWRcc=";
   };
 
   postPatch = ''

From 14de5eff5a34d19ed63d9dd9b00eb173dc9ec2cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 02:44:15 +0000
Subject: [PATCH 043/357] converseen: 0.14.0.0 -> 0.15.0.2

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

diff --git a/pkgs/by-name/co/converseen/package.nix b/pkgs/by-name/co/converseen/package.nix
index 470c2535842e..a12927fec4d7 100644
--- a/pkgs/by-name/co/converseen/package.nix
+++ b/pkgs/by-name/co/converseen/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "converseen";
-  version = "0.14.0.0";
+  version = "0.15.0.2";
 
   src = fetchFromGitHub {
     owner = "Faster3ck";
     repo = "Converseen";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-i7r6AyOk+WtMjlDc5/tDvaUV6yMKaQ7xZ9z9s+KBmts=";
+    hash = "sha256-zBTADXacQ9hIc6+3QpPseYSGsCnslNJY+ZCa5BJZUjg=";
   };
 
   strictDeps = true;

From 2d7b6afac6eace12647ae9df9e35d3613d82db34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 17:22:14 +0000
Subject: [PATCH 044/357] wxsqlite3: 4.10.9 -> 4.10.11

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

diff --git a/pkgs/by-name/wx/wxsqlite3/package.nix b/pkgs/by-name/wx/wxsqlite3/package.nix
index e2718ae3759a..393f0d4534d8 100644
--- a/pkgs/by-name/wx/wxsqlite3/package.nix
+++ b/pkgs/by-name/wx/wxsqlite3/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wxsqlite3";
-  version = "4.10.9";
+  version = "4.10.11";
 
   src = fetchFromGitHub {
     owner = "utelle";
     repo = "wxsqlite3";
     rev = "v${version}";
-    hash = "sha256-vxRbCImGEb9Y5lpiGgkMsOpgjcwMlDLs2LNmS3liy4A=";
+    hash = "sha256-AjBtwA94yN4PYaWiL71SbdBjRV5ehBvf5IP6aru9dgM=";
   };
 
   nativeBuildInputs = [

From 86337846bdc84d5d896a9953a556ccd8a6a4d71d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 20:43:23 +0000
Subject: [PATCH 045/357] sysdig-cli-scanner: 1.22.4 -> 1.22.5

---
 .../sysdig-cli-scanner.versions.nix            | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
index bd110c742501..fd62ac70d5b0 100644
--- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
+++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
@@ -1,23 +1,23 @@
 {
-  version = "1.22.4";
+  version = "1.22.5";
 
   x86_64-linux = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.4/linux/amd64/sysdig-cli-scanner";
-    hash = "sha256-SQGV5W+Mfu7zs30znbiZw1seIuoHDI/UKsOn+2f0Tgg=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.5/linux/amd64/sysdig-cli-scanner";
+    hash = "sha256-hcjCHWhT/qkSVsVgBP52Ad0UBtjuzHsm4I3MTzzWKn0=";
   };
 
   aarch64-linux = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.4/linux/arm64/sysdig-cli-scanner";
-    hash = "sha256-PdP+IaOYttoKzuLr64MP5aM2b+qzqGIbSI08i5zbe0E=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.5/linux/arm64/sysdig-cli-scanner";
+    hash = "sha256-BThHWsBDVz/r0r0+IywhNM2R/MdLSTUnNwuMeC/YxVI=";
   };
 
   x86_64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.4/darwin/amd64/sysdig-cli-scanner";
-    hash = "sha256-0etfyJm1V57mrjKG0B9wFquA4dCbKcg78Y318ZclVdk=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.5/darwin/amd64/sysdig-cli-scanner";
+    hash = "sha256-dhhURD+R1nnPNu7sB7Q5aHfXzk/GvBToWmPDcf5Rw3k=";
   };
 
   aarch64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.4/darwin/arm64/sysdig-cli-scanner";
-    hash = "sha256-UwDlqWnX+SMaM/H/bfh6hzO15O8fn950Hvt8wubop2w=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.5/darwin/arm64/sysdig-cli-scanner";
+    hash = "sha256-vPsTww130K03gXIH9M9N6cfOus/DwjFwbJoknBPyqC8=";
   };
 }

From 21844eb65937c33e2b0e608e217bc8f66e9e1dab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Jul 2025 01:08:58 +0000
Subject: [PATCH 046/357] gauge-unwrapped: 1.6.18 -> 1.6.19

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

diff --git a/pkgs/by-name/ga/gauge-unwrapped/package.nix b/pkgs/by-name/ga/gauge-unwrapped/package.nix
index 46df45b420ea..f8204659afe1 100644
--- a/pkgs/by-name/ga/gauge-unwrapped/package.nix
+++ b/pkgs/by-name/ga/gauge-unwrapped/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule rec {
   pname = "gauge";
-  version = "1.6.18";
+  version = "1.6.19";
 
   patches = [
     # adds a check which adds an error message when trying to
@@ -18,10 +18,10 @@ buildGoModule rec {
     owner = "getgauge";
     repo = "gauge";
     tag = "v${version}";
-    hash = "sha256-kO+cTpRBmtWHfHNWYBFMatrB+YmdfI1l0dgx4WdLkCo=";
+    hash = "sha256-bfmzRZliLU6p/pbKhdXrwukwp0ApsPeOMRUWvovIZ3Q=";
   };
 
-  vendorHash = "sha256-bOsuFGxYTxQ2qju4JsXFsk8/SrDxo5/PthwuLZSMfsI=";
+  vendorHash = "sha256-c9uYVxlC2YEgSsNkte3yJpX8HmTnTMjw2PJAe5IROmY=";
 
   excludedPackages = [
     "build"

From 72db7a828d470dde2117505b1e335a5810020210 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Jul 2025 01:45:12 +0000
Subject: [PATCH 047/357] tartube-yt-dlp: 2.5.100 -> 2.5.156

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

diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix
index 2d2538da0257..2037aad1bd37 100644
--- a/pkgs/applications/video/tartube/default.nix
+++ b/pkgs/applications/video/tartube/default.nix
@@ -16,14 +16,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "tartube";
-  version = "2.5.100";
+  version = "2.5.156";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "axcore";
     repo = "tartube";
     tag = "v${version}";
-    sha256 = "sha256-zocFQRpYbWxG/EoZW419v6li8HBo/9woTBYDbzHR4qQ=";
+    sha256 = "sha256-4M1tYq8nVC1/+SQMtt0D0YfLW1uYWPcGx7XjuvbBxFw=";
   };
 
   nativeBuildInputs = [

From f5055e80c36a84e217613dea5fb122a26774310b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Jul 2025 08:05:34 +0000
Subject: [PATCH 048/357] svelte-language-server: 0.17.16 -> 0.17.17

---
 .../svelte-language-server/package-lock.json  | 61 ++++++++-----------
 .../sv/svelte-language-server/package.nix     |  6 +-
 2 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/pkgs/by-name/sv/svelte-language-server/package-lock.json b/pkgs/by-name/sv/svelte-language-server/package-lock.json
index ad55564d9c0a..5f433b74f117 100644
--- a/pkgs/by-name/sv/svelte-language-server/package-lock.json
+++ b/pkgs/by-name/sv/svelte-language-server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "svelte-language-server",
-  "version": "0.17.16",
+  "version": "0.17.17",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "svelte-language-server",
-      "version": "0.17.16",
+      "version": "0.17.17",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.25",
@@ -110,17 +110,13 @@
       "license": "MIT"
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+      "version": "0.3.12",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
+      "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/sourcemap-codec": "^1.5.0",
         "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
@@ -132,25 +128,16 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
+      "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "version": "0.3.29",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
+      "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -239,9 +226,9 @@
       "license": "MIT"
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.18",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.18.tgz",
-      "integrity": "sha512-KJ65INaxqxmU6EoCiJmRPZC9H9RVWCRd349tXM2M3O5NA7cY6YL7c0bHAHQ93NOfTObEQ004kd2QVHs/r0+m4g==",
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
       "dev": true,
       "license": "MIT"
     },
@@ -253,9 +240,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "18.19.112",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.112.tgz",
-      "integrity": "sha512-i+Vukt9POdS/MBI7YrrkkI5fMfwFtOjphSmt4WXYLfwqsfr6z/HdCx7LqT9M7JktGob8WNgj8nFB4TbGNE4Cog==",
+      "version": "18.19.120",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.120.tgz",
+      "integrity": "sha512-WtCGHFXnVI8WHLxDAt5TbnCM4eSE+nI0QN2NJtwzcgMhht2eNz6V9evJrk+lwC8bCY8OWV5Ym8Jz7ZEyGnKnMA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1709,9 +1696,9 @@
       }
     },
     "node_modules/svelte2tsx": {
-      "version": "0.7.40",
-      "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.40.tgz",
-      "integrity": "sha512-Fgqe2lzC9DWT/kQTIXqN39O2ot9rUqzUu9dqpbuI6EsaEJ6+RSXVmXnxcNYMlKb2LRPDoIg9TVzXYWwi0zhCmQ==",
+      "version": "0.7.41",
+      "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.41.tgz",
+      "integrity": "sha512-/TUwpyn/Qc1wcGuayf2GSwvZ7htdAOzpo0JFFm96srKnRXoTD0gy4n06g+XgH8w016S3lPtyFVtFAm+0yJ0BZw==",
       "license": "MIT",
       "dependencies": {
         "dedent-js": "^1.0.1",
@@ -1842,9 +1829,9 @@
       "license": "MIT"
     },
     "node_modules/vscode-css-languageservice": {
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.6.tgz",
-      "integrity": "sha512-fU4h8mT3KlvfRcbF74v/M+Gzbligav6QMx4AD/7CbclWPYOpGb9kgIswfpZVJbIcOEJJACI9iYizkNwdiAqlHw==",
+      "version": "6.3.7",
+      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.7.tgz",
+      "integrity": "sha512-5TmXHKllPzfkPhW4UE9sODV3E0bIOJPOk+EERKllf2SmAczjfTmYeq5txco+N3jpF8KIZ6loj/JptpHBQuVQRA==",
       "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.18",
diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix
index 5bc549af5e0a..3e40ec351ddf 100644
--- a/pkgs/by-name/sv/svelte-language-server/package.nix
+++ b/pkgs/by-name/sv/svelte-language-server/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
 }:
 let
-  version = "0.17.16";
+  version = "0.17.17";
 in
 buildNpmPackage {
   pname = "svelte-language-server";
@@ -12,10 +12,10 @@ buildNpmPackage {
 
   src = fetchurl {
     url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz";
-    hash = "sha256-CvTP46+jXfeM+jLKBsW/uYtwpJs5KhE+E6I3aY7PQFw=";
+    hash = "sha256-VVZdRJEKjjuT9HPeAhsG7/5Z63cjWNYMbRiYIez/DLs=";
   };
 
-  npmDepsHash = "sha256-xPOllyDdrk+33UFHUkmStC0pnNvtK4oEn+Vdp6dPabI=";
+  npmDepsHash = "sha256-pKiGKthx9dn55uRbJt5CsnB9Nlt67mXNJQArbrj57oc=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json

From 012b3276b38ad6d54fcdf523c327080be628269d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Jul 2025 08:34:23 +0000
Subject: [PATCH 049/357] cloudlog: 2.6.19 -> 2.6.20

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

diff --git a/pkgs/by-name/cl/cloudlog/package.nix b/pkgs/by-name/cl/cloudlog/package.nix
index 287ebeb2b4fa..c2336c82ba1b 100644
--- a/pkgs/by-name/cl/cloudlog/package.nix
+++ b/pkgs/by-name/cl/cloudlog/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cloudlog";
-  version = "2.6.19";
+  version = "2.6.20";
 
   src = fetchFromGitHub {
     owner = "magicbug";
     repo = "Cloudlog";
     rev = version;
-    hash = "sha256-nSozkRj4aeZZJ/H0zfzzlH4rWGVThC03ByA4FF6IgT4=";
+    hash = "sha256-weCD5CgNarAxQ6LzLQTKjg+p2D/JmlWWpsqMHbnP7Iw=";
   };
 
   postPatch = ''

From f32ab6f2bfbaf507243e19f5254c5c86651b9263 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Jul 2025 12:34:04 +0000
Subject: [PATCH 050/357] hevea: 2.36 -> 2.37

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

diff --git a/pkgs/by-name/he/hevea/package.nix b/pkgs/by-name/he/hevea/package.nix
index 0fb630a81fa6..ba31818f024b 100644
--- a/pkgs/by-name/he/hevea/package.nix
+++ b/pkgs/by-name/he/hevea/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "hevea";
-  version = "2.36";
+  version = "2.37";
 
   src = fetchurl {
     url = "https://hevea.inria.fr/distri/hevea-${version}.tar.gz";
-    sha256 = "sha256-XWdZ13AqKVx2oSwbKhoWdUqw7B/+1z/J0LE4tB5yBkg=";
+    sha256 = "sha256-tuk/B/WBedZbTrfoxKXV9otKJfEEwCmmL8kVTpPhr1k=";
   };
 
   strictDeps = true;

From fe9d86b713153501ed715b4cdf2daa77fe4e9672 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Jul 2025 12:37:44 +0000
Subject: [PATCH 051/357] qtractor: 1.5.6 -> 1.5.7

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

diff --git a/pkgs/by-name/qt/qtractor/package.nix b/pkgs/by-name/qt/qtractor/package.nix
index 13441605c32b..0d13c24edbe4 100644
--- a/pkgs/by-name/qt/qtractor/package.nix
+++ b/pkgs/by-name/qt/qtractor/package.nix
@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation rec {
   pname = "qtractor";
-  version = "1.5.6";
+  version = "1.5.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz";
-    hash = "sha256-9JC+kLMnG7Fzti0RAlo/lGtuu6WF4vN4nzcZBN+kuZI=";
+    hash = "sha256-dQcyba5QZRmi1GgFyTOmqzFiliBKyNu187xXM1+OnpI=";
   };
 
   nativeBuildInputs = [

From 1f24b23b22dea1b13fc3d72128de38e8d6f1af1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Jul 2025 19:28:01 +0000
Subject: [PATCH 052/357] marp-cli: 4.2.0 -> 4.2.1

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

diff --git a/pkgs/by-name/ma/marp-cli/package.nix b/pkgs/by-name/ma/marp-cli/package.nix
index dc2672df0f23..0e5bcd309322 100644
--- a/pkgs/by-name/ma/marp-cli/package.nix
+++ b/pkgs/by-name/ma/marp-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "marp-cli";
-  version = "4.2.0";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "marp-team";
     repo = "marp-cli";
     rev = "v${version}";
-    hash = "sha256-LWKPwrpcpsZ/KtNu2p7go1MgyXUtgFIRGsThKnagu3c=";
+    hash = "sha256-M1ixUaL/CvzeDi59TA3+1qdn6/t2P/BvrINi0i3BCUM=";
   };
 
-  npmDepsHash = "sha256-7on+dJWOUW43miopZKvJ2B1bs0jvTiQOe30yaN6e9lc=";
+  npmDepsHash = "sha256-+17trU4goJgimTYPXbZQVwZyDtyOJIRtXjzduAxxR4o=";
   npmPackFlags = [ "--ignore-scripts" ];
   makeCacheWritable = true;
 

From 2fa35382fcb80873fe62f762eadb28ffaa6b4619 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 20 Jul 2025 14:28:52 +0200
Subject: [PATCH 053/357] maintainers: drop jyp

Inactive since 2021. Not a member of the nixos org (anymore), thus can't
be pinged for review.
---
 maintainers/maintainer-list.nix                             | 6 ------
 pkgs/development/python-modules/astunparse/default.nix      | 1 -
 pkgs/development/python-modules/bz2file/default.nix         | 1 -
 pkgs/development/python-modules/gast/default.nix            | 1 -
 pkgs/development/python-modules/gensim/default.nix          | 1 -
 pkgs/development/python-modules/smart-open/default.nix      | 1 -
 .../development/python-modules/tensorflow-estimator/bin.nix | 1 -
 pkgs/development/python-modules/tensorflow/bin.nix          | 1 -
 8 files changed, 13 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2ca9edb79453..db361a06fb97 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12884,12 +12884,6 @@
     githubId = 20658981;
     name = "Jarosław Wygoda";
   };
-  jyp = {
-    email = "jeanphilippe.bernardy@gmail.com";
-    github = "jyp";
-    githubId = 27747;
-    name = "Jean-Philippe Bernardy";
-  };
   jzellner = {
     email = "jeffz@eml.cc";
     github = "sofuture";
diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix
index 77f2cc10ad10..6311e3739344 100644
--- a/pkgs/development/python-modules/astunparse/default.nix
+++ b/pkgs/development/python-modules/astunparse/default.nix
@@ -28,6 +28,5 @@ buildPythonPackage rec {
     description = "This is a factored out version of unparse found in the Python source distribution";
     homepage = "https://github.com/simonpercivall/astunparse";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ jyp ];
   };
 }
diff --git a/pkgs/development/python-modules/bz2file/default.nix b/pkgs/development/python-modules/bz2file/default.nix
index bd8b79a9a13e..a98ddf851823 100644
--- a/pkgs/development/python-modules/bz2file/default.nix
+++ b/pkgs/development/python-modules/bz2file/default.nix
@@ -20,6 +20,5 @@ buildPythonPackage rec {
   meta = {
     description = "Bz2file is a Python library for reading and writing bzip2-compressed files";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ jyp ];
   };
 }
diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix
index a47a7500f4ed..d892c461be4a 100644
--- a/pkgs/development/python-modules/gast/default.nix
+++ b/pkgs/development/python-modules/gast/default.nix
@@ -36,7 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/serge-sans-paille/gast/";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
-      jyp
       cpcloud
     ];
   };
diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index d2dd45791885..05311cf6f846 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -61,6 +61,5 @@ buildPythonPackage rec {
     homepage = "https://radimrehurek.com/gensim/";
     changelog = "https://github.com/RaRe-Technologies/gensim/blob/${version}/CHANGELOG.md";
     license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ jyp ];
   };
 }
diff --git a/pkgs/development/python-modules/smart-open/default.nix b/pkgs/development/python-modules/smart-open/default.nix
index 45632ab37969..8d4a7f756ca0 100644
--- a/pkgs/development/python-modules/smart-open/default.nix
+++ b/pkgs/development/python-modules/smart-open/default.nix
@@ -73,6 +73,5 @@ buildPythonPackage rec {
     description = "Library for efficient streaming of very large file";
     homepage = "https://github.com/RaRe-Technologies/smart_open";
     license = licenses.mit;
-    maintainers = with maintainers; [ jyp ];
   };
 }
diff --git a/pkgs/development/python-modules/tensorflow-estimator/bin.nix b/pkgs/development/python-modules/tensorflow-estimator/bin.nix
index 1acfcec9a878..0d43ea9fdc9a 100644
--- a/pkgs/development/python-modules/tensorflow-estimator/bin.nix
+++ b/pkgs/development/python-modules/tensorflow-estimator/bin.nix
@@ -28,6 +28,5 @@ buildPythonPackage rec {
     description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting";
     homepage = "http://tensorflow.org";
     license = licenses.asl20;
-    maintainers = with maintainers; [ jyp ];
   };
 }
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 4057bfea3be7..be84a4ea8065 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -229,7 +229,6 @@ buildPythonPackage rec {
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
-      jyp
       abbradar
     ];
     badPlatforms = [ "x86_64-darwin" ];

From af21fbd51604cb3fe65d7f4cb926b35bd4de83b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 12:40:54 +0000
Subject: [PATCH 054/357] txr: 301 -> 302

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

diff --git a/pkgs/by-name/tx/txr/package.nix b/pkgs/by-name/tx/txr/package.nix
index ff2ee07752a0..6e3d2cd71410 100644
--- a/pkgs/by-name/tx/txr/package.nix
+++ b/pkgs/by-name/tx/txr/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "txr";
-  version = "301";
+  version = "302";
 
   src = fetchurl {
     url = "https://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-n0irroNVb5UICjspaASO6IGs+zfiD3gK6LyLA+Bppiw=";
+    hash = "sha256-8N4BLtYiGOBJ0Jo5rmqTh1mNjqwSp8LX2dkGwnw271Q=";
   };
 
   buildInputs = [ libffi ];

From 9c1784c4e99340f3aced7572e7ef3f633321d284 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 14:20:46 +0000
Subject: [PATCH 055/357] ibmcloud-cli: 2.34.2 -> 2.35.0

---
 pkgs/tools/admin/ibmcloud-cli/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/admin/ibmcloud-cli/default.nix b/pkgs/tools/admin/ibmcloud-cli/default.nix
index 4cb22081bdb9..06cfd115a343 100644
--- a/pkgs/tools/admin/ibmcloud-cli/default.nix
+++ b/pkgs/tools/admin/ibmcloud-cli/default.nix
@@ -30,19 +30,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ibmcloud-cli";
-  version = "2.34.2";
+  version = "2.35.0";
 
   src = fetchurl {
     url = "https://download.clis.cloud.ibm.com/ibm-cloud-cli/${finalAttrs.version}/binaries/IBM_Cloud_CLI_${finalAttrs.version}_${platform}.tgz";
     hash =
       {
-        "x86_64-darwin" = "sha256-StOJEaQyPAObCz6DPO5i0Kj6s5RoHzyEWMh2C0sov3U=";
-        "aarch64-darwin" = "sha256-sur1M0PoRibj551iExCSyXYXlEGwjDqA2n7BP8JtCIU=";
-        "x86_64-linux" = "sha256-UoP9kPe+00jdwCQYbZB2z1OorZ8cvlQLjY0wWx/RukI=";
-        "aarch64-linux" = "sha256-FIYqbubVyuzn1yQ7jejG82ZHvPZD7NmTWUV1TD1LbuE=";
-        "i686-linux" = "sha256-JC8UIvMpENbucZ8aVeOr2PsqKa9xg2UXh7zLTPVQ1yg=";
-        "powerpc64le-linux" = "sha256-q8VqZkfCf6+K1aGheYgxQB06i8ua1AMojPp8U3flcmo=";
-        "s390x-linux" = "sha256-4wYEJZ/+65+1j3JdctY2ZIC5cNKLl8Kc3c9Azlh7HaM=";
+        "x86_64-darwin" = "sha256-YQEmeUi+I82NsI4tYRJG3C+iHBXB2pe4O5J5BGM8qck=";
+        "aarch64-darwin" = "sha256-tsaveUBBe2VvvIWLPKfOXICVBTh3XlpmVr/AV1wz2hs=";
+        "x86_64-linux" = "sha256-C2WaIxGSsaa2nJQn0TdjsX9jqppTuIZJxjHqf+P4/iQ=";
+        "aarch64-linux" = "sha256-yfWVLHGr4F0DwTwTKq7Ae/VqXbAyEGryXylwNbnmOSg=";
+        "i686-linux" = "sha256-M3Ec+JyAI06ifPfEoYxWPvtZ/iffFLSiVLuTOHm+WUo=";
+        "powerpc64le-linux" = "sha256-KYNrCaUJ1QBJwjZAgLlOkDuFO+llUkXF62zj8QbhBnE=";
+        "s390x-linux" = "sha256-9i+zdpVBfFCN9JUMgs7WekHTm+PZhwVDimO55BFHSLE=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From 6d8bc6e0f6ef359e34c227762db15abff87635fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Jul 2025 20:38:42 +0000
Subject: [PATCH 056/357] brewtarget: 4.1.2 -> 4.1.3

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

diff --git a/pkgs/by-name/br/brewtarget/package.nix b/pkgs/by-name/br/brewtarget/package.nix
index 2839145ea063..6ccbf7403907 100644
--- a/pkgs/by-name/br/brewtarget/package.nix
+++ b/pkgs/by-name/br/brewtarget/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "brewtarget";
-  version = "4.1.2";
+  version = "4.1.3";
 
   src = fetchFromGitHub {
     owner = "Brewtarget";
     repo = "brewtarget";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-a22XXxCuJuaGyRPj15JlLErA7ANrCgzy1vqy+IHzxDk=";
+    hash = "sha256-VVdihVdNIAtPlugqGWDWvxMdOFGLnRmewPt6BgvbxBk=";
     fetchSubmodules = true;
   };
 

From b38cf32e0f986526bc263dd8178ed9fc408f41a3 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 21 Jul 2025 00:17:18 +0200
Subject: [PATCH 057/357] vscode-extension-update: Fix usage of experimental
 Nix features

---
 .../vscode_extension_update.py                | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vs/vscode-extension-update/vscode_extension_update.py b/pkgs/by-name/vs/vscode-extension-update/vscode_extension_update.py
index d1e179e23e2a..9859c4d3d430 100755
--- a/pkgs/by-name/vs/vscode-extension-update/vscode_extension_update.py
+++ b/pkgs/by-name/vs/vscode-extension-update/vscode_extension_update.py
@@ -89,16 +89,31 @@ class VSCodeExtensionUpdater:
         """
         Retrieves a raw Nix attribute value.
         """
-        return self.execute_command(["nix", "eval", "--raw", "-f", ".", attribute_path])
+        return self.execute_command([
+            "nix",
+            "--extra-experimental-features",
+            "nix-command",
+            "eval",
+            "--raw",
+            "-f",
+            ".",
+            attribute_path
+        ])
 
     def get_nix_system(self) -> str:
         """
         Retrieves system from Nix.
         """
-        return self._get_nix_attribute("system")
+        return self._get_nix_attribute("stdenv.hostPlatform.system")
 
     def get_supported_nix_systems(self) -> list[str]:
-        nix_config = self.execute_command(["nix", "config", "show"])
+        nix_config = self.execute_command([
+            "nix",
+            "--extra-experimental-features",
+            "nix-command",
+            "config",
+            "show"
+        ])
         system = None
         extra_platforms = []
         for line in nix_config.splitlines():
@@ -120,6 +135,8 @@ class VSCodeExtensionUpdater:
     def _get_nix_vscode_extension_src_hash(self, system: str) -> str:
         url = self.execute_command([
             "nix",
+            "--extra-experimental-features",
+            "nix-command",
             "eval",
             "--raw",
             "-f",
@@ -131,6 +148,8 @@ class VSCodeExtensionUpdater:
         sha256 = self.execute_command(["nix-prefetch-url", url])
         return self.execute_command([
             "nix",
+            "--extra-experimental-features",
+            "nix-command",
             "hash",
             "convert",
             "--to",
@@ -183,6 +202,8 @@ class VSCodeExtensionUpdater:
             return json.loads(
                 self.execute_command([
                     "nix",
+                    "--extra-experimental-features",
+                    "nix-command",
                     "eval",
                     "--json",
                     "-f",

From 6e57a010e1e23e65063f4f6ca82bd97065876818 Mon Sep 17 00:00:00 2001
From: Adrian Pistol <vifino@posteo.net>
Date: Mon, 21 Jul 2025 11:04:11 +0200
Subject: [PATCH 058/357] wolfssl: 5.7.6 -> 5.8.2

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

diff --git a/pkgs/by-name/wo/wolfssl/package.nix b/pkgs/by-name/wo/wolfssl/package.nix
index b7c1bca77bf5..29acc4ffc8ed 100644
--- a/pkgs/by-name/wo/wolfssl/package.nix
+++ b/pkgs/by-name/wo/wolfssl/package.nix
@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wolfssl-${variant}";
-  version = "5.7.6";
+  version = "5.8.2";
 
   src = fetchFromGitHub {
     owner = "wolfSSL";
     repo = "wolfssl";
     tag = "v${finalAttrs.version}-stable";
-    hash = "sha256-q3V2cxk7dBRJoE8EpfWxkYmXPfDzoMwrX1JLazrHOuA=";
+    hash = "sha256-rWBfpI6tdpKvQA/XdazBvU5hzyai5PtKRBpM4iplZDU=";
   };
 
   postPatch = ''

From 5545fa182780d112d423e5627b8d951b2b40c372 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 22 Jul 2025 04:05:31 +0200
Subject: [PATCH 059/357] wolfssl: disable tests on loongarch64

---
 pkgs/by-name/wo/wolfssl/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/wo/wolfssl/package.nix b/pkgs/by-name/wo/wolfssl/package.nix
index b7c1bca77bf5..3e443cc51935 100644
--- a/pkgs/by-name/wo/wolfssl/package.nix
+++ b/pkgs/by-name/wo/wolfssl/package.nix
@@ -92,7 +92,9 @@ stdenv.mkDerivation (finalAttrs: {
     util-linux
   ];
 
-  doCheck = true;
+  # FAILURES:
+  #    497: test_wolfSSL_EVP_PBE_scrypt
+  doCheck = !stdenv.hostPlatform.isLoongArch64;
 
   nativeCheckInputs = [
     openssl

From 5db41209e37b1cb64077c4fb037fa475e4a6fce4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Jul 2025 13:28:18 +0000
Subject: [PATCH 060/357] postgresqlPackages.timescaledb-apache: 2.21.0 ->
 2.21.1

---
 pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index e2fbf6c86804..2fe5cf171589 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -13,13 +13,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
-  version = "2.21.0";
+  version = "2.21.1";
 
   src = fetchFromGitHub {
     owner = "timescale";
     repo = "timescaledb";
     tag = finalAttrs.version;
-    hash = "sha256-t3BPy1rmV3f/OFDHqiRh1E9tNH7dc1LCTktvkSSZLro=";
+    hash = "sha256-oZaEUz6g/8oVdVyPCkAE0quzYBxO911MZcgd8rFFA3c=";
   };
 
   nativeBuildInputs = [ cmake ];

From 05f3a735a0be3fbc15bb9bf8259abf5156ae9520 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Jul 2025 15:27:02 +0000
Subject: [PATCH 061/357] free42: 3.3.6 -> 3.3.8

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

diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix
index d0d313e882c6..a35cd314e94f 100644
--- a/pkgs/by-name/fr/free42/package.nix
+++ b/pkgs/by-name/fr/free42/package.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "free42";
-  version = "3.3.6";
+  version = "3.3.8";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "thomasokken";
     repo = "free42";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-77A7YpoGLpzEU01c635DveybS5qvvC/sKdxmwV9HHAc=";
+    hash = "sha256-L6WZM5/+ujM6hv85ppt9YiqHLkd0vYFx3nFVcJwzEBM=";
   };
 
   nativeBuildInputs = [

From 9127e920e39057b37c89d8061ff8769c1acbc530 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Jul 2025 20:06:06 +0000
Subject: [PATCH 062/357] upcloud-cli: 3.20.2 -> 3.21.0

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

diff --git a/pkgs/by-name/up/upcloud-cli/package.nix b/pkgs/by-name/up/upcloud-cli/package.nix
index 8ae5be32171b..c0e8a0c90e1d 100644
--- a/pkgs/by-name/up/upcloud-cli/package.nix
+++ b/pkgs/by-name/up/upcloud-cli/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "upcloud-cli";
-  version = "3.20.2";
+  version = "3.21.0";
 
   src = fetchFromGitHub {
     owner = "UpCloudLtd";
     repo = "upcloud-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M2xGrJKZRlC3YS6JBvLRahX2gm12kctM3waQ1sQ/BHQ=";
+    hash = "sha256-GN/GIqppSXDexe2KRH1RoVpm8HUkvsnul3H+q4OcjOA=";
   };
 
-  vendorHash = "sha256-EytU3BuAdW3p54SOvgnfohODbd11PYLk4HC5Ix393XU=";
+  vendorHash = "sha256-Z2Eumhsn/YmHopgpKBFGs4HmDdUl/cr+R6bRaeCFQtE=";
 
   ldflags = [
     "-s -w -X github.com/UpCloudLtd/upcloud-cli/v3/internal/config.Version=${finalAttrs.version}"

From 531ddd0ad96b17fd3fdb6c058a0b256f82bf57ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 22 Jul 2025 21:00:02 +0000
Subject: [PATCH 063/357] angie: 1.9.1 -> 1.10.1

---
 pkgs/servers/http/angie/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix
index 3f0fd90f7034..8df5eeb09b1c 100644
--- a/pkgs/servers/http/angie/default.nix
+++ b/pkgs/servers/http/angie/default.nix
@@ -9,12 +9,12 @@
 }@args:
 
 callPackage ../nginx/generic.nix args rec {
-  version = "1.9.1";
+  version = "1.10.1";
   pname = if withQuic then "angieQuic" else "angie";
 
   src = fetchurl {
     url = "https://download.angie.software/files/angie-${version}.tar.gz";
-    hash = "sha256-rxHMBt/r58F4MjdbNIqNeGrwUs785f+vqqiYSE4YzjY=";
+    hash = "sha256-VxhmxhN56wB57x5/vJEeLddv5USsXv8oNLSVh+XO4+8=";
   };
 
   configureFlags =

From 4a0b69624cd27a6a69d1f09cad24c6e098d4db7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Jul 2025 09:15:25 +0000
Subject: [PATCH 064/357] schemacrawler: 16.26.2 -> 16.26.3

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

diff --git a/pkgs/by-name/sc/schemacrawler/package.nix b/pkgs/by-name/sc/schemacrawler/package.nix
index a6e9808d6846..4117d2a3df5e 100644
--- a/pkgs/by-name/sc/schemacrawler/package.nix
+++ b/pkgs/by-name/sc/schemacrawler/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "schemacrawler";
-  version = "16.26.2";
+  version = "16.26.3";
 
   src = fetchzip {
     url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip";
-    hash = "sha256-JQHV88+B7lNKgi8Isbk3gv3JN13YzVjeiPU8qauEhY0=";
+    hash = "sha256-mkibPu2uR5GCm8FAs3e1fypf35JErsqKO+1/vRZ16Kg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 8e7760c8715654c0b0dcc5a066f719d2d107ec2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Jul 2025 13:16:49 +0000
Subject: [PATCH 065/357] redis-plus-plus: 1.3.14 -> 1.3.15

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

diff --git a/pkgs/by-name/re/redis-plus-plus/package.nix b/pkgs/by-name/re/redis-plus-plus/package.nix
index 40cd5a4224e1..a073ee7409d7 100644
--- a/pkgs/by-name/re/redis-plus-plus/package.nix
+++ b/pkgs/by-name/re/redis-plus-plus/package.nix
@@ -13,13 +13,13 @@ assert enableShared || enableStatic;
 
 stdenv.mkDerivation rec {
   pname = "redis-plus-plus";
-  version = "1.3.14";
+  version = "1.3.15";
 
   src = fetchFromGitHub {
     owner = "sewenew";
     repo = "redis-plus-plus";
     rev = version;
-    sha256 = "sha256-GN+GrV53+JPEbVefH0EXzS1PyGEdQGFcPEctdWOI5uk=";
+    sha256 = "sha256-0q+pQ2tS04RYKsikTG5QMuTPW3f6+fFIPuJZVf/aIw0=";
   };
 
   patches = [

From 0657e56507c6d1171345b80ef4459bfb5f5c1bb5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Jul 2025 17:13:58 +0000
Subject: [PATCH 066/357] diamond: 2.1.12 -> 2.1.13

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

diff --git a/pkgs/by-name/di/diamond/package.nix b/pkgs/by-name/di/diamond/package.nix
index 3df9a9234b9a..8f4d70d146c4 100644
--- a/pkgs/by-name/di/diamond/package.nix
+++ b/pkgs/by-name/di/diamond/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "diamond";
-  version = "2.1.12";
+  version = "2.1.13";
 
   src = fetchFromGitHub {
     owner = "bbuchfink";
     repo = "diamond";
     rev = "v${version}";
-    sha256 = "sha256-C4hr0Strv7h76NzcOLB0tfbqKSk+Us6cwoJlstYfvto=";
+    sha256 = "sha256-1y1eBOmWxZSPKX/VWo1tyimDxqyabOpyP6fX1CcL9sU=";
   };
 
   nativeBuildInputs = [ cmake ];

From 996ee9dc0f62aa9896bf0319d70bdd0926f5c515 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Jul 2025 22:59:34 +0000
Subject: [PATCH 067/357] youtubeuploader: 1.25.1 -> 1.25.3

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

diff --git a/pkgs/by-name/yo/youtubeuploader/package.nix b/pkgs/by-name/yo/youtubeuploader/package.nix
index c8063d9fe8fc..29d6aca72f0b 100644
--- a/pkgs/by-name/yo/youtubeuploader/package.nix
+++ b/pkgs/by-name/yo/youtubeuploader/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "youtubeuploader";
-  version = "1.25.1";
+  version = "1.25.3";
 
   src = fetchFromGitHub {
     owner = "porjo";
     repo = "youtubeuploader";
     tag = "v${version}";
-    hash = "sha256-hffi1/+j5u8/7kOaEGcE0iSMWt3nPmNaE2lg0WBu/BM=";
+    hash = "sha256-89vVorUPgutIp+k2YmUrQXs8tF4eLQt5zupKu1BArkw=";
   };
 
   vendorHash = "sha256-wVfJnN9QgF7c2aI3OghfJW9Z6McZ+irgMRSkWvVi1DM=";

From a27e9b49daeff6875342081c142e7d16e7b603ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Jul 2025 02:04:35 +0000
Subject: [PATCH 068/357] exoscale-cli: 1.85.3 -> 1.85.4

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

diff --git a/pkgs/by-name/ex/exoscale-cli/package.nix b/pkgs/by-name/ex/exoscale-cli/package.nix
index 8bba4ff51e33..791e962fd122 100644
--- a/pkgs/by-name/ex/exoscale-cli/package.nix
+++ b/pkgs/by-name/ex/exoscale-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "exoscale-cli";
-  version = "1.85.3";
+  version = "1.85.4";
 
   src = fetchFromGitHub {
     owner = "exoscale";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-NAAKm6uaeg3GwbjXn82rENO8Rh6HR7Vu8cm3Yf1X8X4=";
+    sha256 = "sha256-rulleAbiwnUABnHLpfHFjGXK3/DxFJLmse3NIClSpMQ=";
   };
 
   vendorHash = null;

From 570a5081de3d76edc525f2ec69fe51b813d903e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Jul 2025 04:13:40 +0000
Subject: [PATCH 069/357] rat-king-adventure: 2.2.2 -> 2.2.3

---
 .../shattered-pixel-dungeon/rat-king-adventure/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
index 3d080a6d9d90..9c6f74bd0a0e 100644
--- a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
@@ -5,13 +5,13 @@
 
 callPackage ../generic.nix rec {
   pname = "rat-king-adventure";
-  version = "2.2.2";
+  version = "2.2.3";
 
   src = fetchFromGitHub {
     owner = "TrashboxBobylev";
     repo = "Rat-King-Adventure";
     rev = version;
-    hash = "sha256-9vK5wD/pA/xa4lpRrpHdiwbiRdaBkIB6TKAOIfHrjz0=";
+    hash = "sha256-6KmJRcYUjEdFym8nkCtg841CyKKYV1gACMJv/zOQ2Oc=";
   };
 
   desktopName = "Rat King Adventure";

From 4727309dccdfd57da86a13b358bd8ac9ad889a35 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Jul 2025 12:35:35 +0000
Subject: [PATCH 070/357] kid3: 3.9.6 -> 3.9.7

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

diff --git a/pkgs/by-name/ki/kid3/package.nix b/pkgs/by-name/ki/kid3/package.nix
index f19d9f75b03d..741ed26eca8c 100644
--- a/pkgs/by-name/ki/kid3/package.nix
+++ b/pkgs/by-name/ki/kid3/package.nix
@@ -42,11 +42,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "kid3";
-  version = "3.9.6";
+  version = "3.9.7";
 
   src = fetchurl {
     url = "mirror://kde/stable/kid3/${finalAttrs.version}/kid3-${finalAttrs.version}.tar.xz";
-    hash = "sha256-zyf/zENpyZQNp7/BL9EN+9pSa4GH5bYmYqvoBp/CbCc=";
+    hash = "sha256-+c/u99Td3nitiXiHbLNSWEOjAlBPVHwiXpwiyB1xB2A=";
   };
 
   nativeBuildInputs = [

From c435a6afe2c8c5a0b09bc11831df4632e0ad5812 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Jul 2025 20:24:29 +0000
Subject: [PATCH 071/357] elasticmq-server-bin: 1.6.12 -> 1.6.14

---
 pkgs/servers/elasticmq-server-bin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix
index 722ccef77757..a02eb7068a47 100644
--- a/pkgs/servers/elasticmq-server-bin/default.nix
+++ b/pkgs/servers/elasticmq-server-bin/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "elasticmq-server";
-  version = "1.6.12";
+  version = "1.6.14";
 
   src = fetchurl {
     url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-${finalAttrs.version}.jar";
-    sha256 = "sha256-1zfsH82BCMBDW5+rXMgsC4p6Sfugak5W7d8z1xMXG9c=";
+    sha256 = "sha256-HVllLHz6zutonaLFwgyQKYSZxfp5QMslxf/PlzGWyG4=";
   };
 
   # don't do anything?

From 62da9933f28139eda70adac64c52f3658cb88540 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 02:13:51 +0000
Subject: [PATCH 072/357] autobrr: 1.63.1 -> 1.64.0

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

diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix
index 9f49e3e6f408..800b349488c8 100644
--- a/pkgs/by-name/au/autobrr/package.nix
+++ b/pkgs/by-name/au/autobrr/package.nix
@@ -13,12 +13,12 @@
 
 let
   pname = "autobrr";
-  version = "1.63.1";
+  version = "1.64.0";
   src = fetchFromGitHub {
     owner = "autobrr";
     repo = "autobrr";
     tag = "v${version}";
-    hash = "sha256-yQ7gS2nKqMiEGDifiCe/Mfat3xx+LYrJiPC7ltVeQlU=";
+    hash = "sha256-1P6YvwmVDbtSAK5yEpHJM6XjROGtPHj1gC2vremb8PM=";
   };
 
   autobrr-web = stdenvNoCC.mkDerivation {
@@ -41,7 +41,7 @@ let
         sourceRoot
         ;
       fetcherVersion = 1;
-      hash = "sha256-TbdRJqLdNI7wchUsx2Kw1LlDyv50XlCiKyn6rhZyN1U=";
+      hash = "sha256-KiM/G9W1C+VnMx1uaQFE2dOPHJYU53B8i+7BqUTzo0w=";
     };
 
     postBuild = ''
@@ -61,7 +61,7 @@ buildGoModule rec {
     src
     ;
 
-  vendorHash = "sha256-kaHTH3gR0bTD89L8GLgntiOJ8S5dIzvpU27ma4cb/Do=";
+  vendorHash = "sha256-JX4VkvFgNeq2QhgxgYloPF5XOQUQxM/cKAWp1L+kT/c=";
 
   preBuild = ''
     cp -r ${autobrr-web}/* web/dist

From df8afd7f48664148bb0db83ed9e4919955fff827 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 06:47:21 +0000
Subject: [PATCH 073/357] jhentai: 8.0.8+295 -> 8.0.9

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

diff --git a/pkgs/by-name/jh/jhentai/package.nix b/pkgs/by-name/jh/jhentai/package.nix
index d51bb99fe94e..b430a92a6727 100644
--- a/pkgs/by-name/jh/jhentai/package.nix
+++ b/pkgs/by-name/jh/jhentai/package.nix
@@ -14,13 +14,13 @@
 
 flutter329.buildFlutterApplication rec {
   pname = "jhentai";
-  version = "8.0.8+295";
+  version = "8.0.9";
 
   src = fetchFromGitHub {
     owner = "jiangtian616";
     repo = "JHenTai";
     tag = "v${version}";
-    hash = "sha256-GK+iceh/G3afLbhGXqXx5IwFHsQKoIQsf3ybogp9ZFo=";
+    hash = "sha256-Yclj0oJ35iuqopRgJRgmi5r/WSNfT4080WW99nvnO/0=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;

From 1535cf9dbf77421327e99a425634e09bdd4f25e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 08:06:09 +0000
Subject: [PATCH 074/357] cherry-studio: 1.4.8 -> 1.5.3

---
 .../ch/cherry-studio/missing-hashes.json      | 76 +++++++------------
 pkgs/by-name/ch/cherry-studio/package.nix     |  6 +-
 2 files changed, 29 insertions(+), 53 deletions(-)

diff --git a/pkgs/by-name/ch/cherry-studio/missing-hashes.json b/pkgs/by-name/ch/cherry-studio/missing-hashes.json
index ddcb113bd194..f01f67d065d3 100644
--- a/pkgs/by-name/ch/cherry-studio/missing-hashes.json
+++ b/pkgs/by-name/ch/cherry-studio/missing-hashes.json
@@ -1,55 +1,31 @@
 {
   "@cherrystudio/mac-system-ocr@npm:0.2.2": "39373e837b35b18d181ab9be112bdbd717d99138f6e907e201814316f28eb93db208f9c69e2b73b344c436dd600d1193cfd6d6e7c9bd7b4f2c70b954d88ce450",
-  "@esbuild/aix-ppc64@npm:0.25.2": "e25252d47d27d5e15a09ba7e7e906fe35d90a363e1eec7bc1e054c066bea6f89364139385008f78e8b4523ebaecb1f7a678213c8fcc2cd0309d539bbc455fd05",
-  "@esbuild/aix-ppc64@npm:0.25.3": "5e3ec55997c8d3c9c0fa565cbd04f1566795fe47626d63f6a593a39190402869a2561c772d1db5621719fa9db174f4cbc201032447b97a1cc28e69a9426a893e",
-  "@esbuild/android-arm64@npm:0.25.2": "b387ab30ec70902c81ca1231a7838ccc993ad8dff9561a5ec7d7d4e5f03426153d42e496985a02539bce55f6d1048156f36e24a29f61fa5fd8e0587f62696703",
-  "@esbuild/android-arm64@npm:0.25.3": "d840843df6b82cc918abea3e706235ae256caa7b6feaf4b78f47d97cfc476ffc905d5e4263f066ae96dcc997bdc4e33458ed3436d6a38d147cd401071dc92d10",
-  "@esbuild/android-arm@npm:0.25.2": "8e7efb22407ad9a985ff5a09dc0d2b895126c6ccca470db671ca0a3e3026f79666af20ce5d296311f5d056e95ca71e743feeae526f94dcaacb5a6969f9963283",
-  "@esbuild/android-arm@npm:0.25.3": "185f4827b86ebc797ec74a98a75256a401eda92af862d217c10268816e8c4feeb49d82e965916dd2df238d7f3eda98325085e8d36cccf63c6cb2d3a11b3c6ee0",
-  "@esbuild/android-x64@npm:0.25.2": "66256eee6168c2f903c45c82863f1377f525dc7de0fc902fca412a44d0abbb8a25761fb9e10c8663b25b0f816d86b7e353d2b77ab39eae95234333f9d233ddc4",
-  "@esbuild/android-x64@npm:0.25.3": "0328941aaedafe3e0164a93a0e57178ca5fbe5a336709bd24270329a504bdb76bfc4b7a63e07c2f6fdea1fbd4b25d53320ca5665351d477e8e77b2fd071732ee",
-  "@esbuild/darwin-arm64@npm:0.25.2": "36a568a779000133d077e2272181232f52939c3e0b0b986ad3f3fd6ab29628c148e88cd857f6de41a16e22e6a252bb16680f91c00c7d813690fa9bc060f58386",
-  "@esbuild/darwin-arm64@npm:0.25.3": "c10ed8ec813cad217666f556481baa0c4286f2a0567ca662fbf3088cb960421729eaf6b5a8504b9c956a1497f88141549af5f7c0f907a27a2c546e75fb4c678e",
-  "@esbuild/darwin-x64@npm:0.25.2": "b761a20f8db7bf0499f6cba51c72104e733d9186d6f34a7f5e4590c02ecc2f9b84cd02c4e7bd3dade4156b7f92015cdbddc516dd1e4859233e3155cb0fecda58",
-  "@esbuild/darwin-x64@npm:0.25.3": "9828c988e7a54e63c7afca426348bd09d5c70b4ec799908ec5310347a14c94900f58e14f2b2eeea87d68b382078977bd5d5629546b307e8ac093168a7c72712d",
-  "@esbuild/freebsd-arm64@npm:0.25.2": "8f869d6200dba388ac4c008c7a5b6522f44797370a12f94fd19e37b6cd76bdbdf48d0fa893b5ce200a538a151281e9f71e985f82ec8b8c96f16075e45266c718",
-  "@esbuild/freebsd-arm64@npm:0.25.3": "4b20547db6bc1dea0e14f4bb96fb474d6e80e8d01c4fdc141d77a1693be06aee5ea3d4968f80276f87037086822c336defa358cb315bd671a7af9c672a081811",
-  "@esbuild/freebsd-x64@npm:0.25.2": "6cdfb6c6d6f6ead324a9ee75ab1068305672207cf1d3189bcf5599ec158e0eb07d74ff63597e389777163b4399da1cc6164b918a7ea9e798e7fd45eee6aad9bb",
-  "@esbuild/freebsd-x64@npm:0.25.3": "083edc9e2de8f3dc407b52836b49ebea29d0d543786c706b744c77646f5fde53327b786d156b79b859fb61eaac191733d275a183807c8599d51cd4416d00f5d6",
-  "@esbuild/linux-arm64@npm:0.25.2": "a0d51ec6e91e97461916eb6c25b12a8ea6b58ec2f3d91199c0c3f02ec569e98ff1389700250d4664d8394d3d5b5a051d695b34bfe77ab4a12985dfc18f315b73",
-  "@esbuild/linux-arm64@npm:0.25.3": "bad206365faf883e5f7615daef3d65b7a82d6c9e401fd67353352c532a42310dcf6491dbf0e094c8007fb6d73e45183bb63cc10585cfaadc1386fbf78c529dc1",
-  "@esbuild/linux-arm@npm:0.25.2": "5a4cf4045a2a5949dc8875dbad9a82fde7333d3f59b66d8cb614b34b76a7fb715a8d74e41f0788104bcef0436108ca548d71a543f582073e0458e20370dbb802",
-  "@esbuild/linux-arm@npm:0.25.3": "4659e20bf62737bb6ba5e54f36f87260e8092f6c55aed6a73457cb002f7af990bb205ca48d0c19078540a210b65a1db1a1cecd7a4ed06f4fe4eb1c0d27c30bd0",
-  "@esbuild/linux-ia32@npm:0.25.2": "535c1755ed95a47b05b865361d2efbef3490f05815743c0d2372f55a2e14f0cc1d5ed6e5dd6f91c7aea871ea2f64cea021eea6e714027148489c54edc6e2b19f",
-  "@esbuild/linux-ia32@npm:0.25.3": "96cf22e5979c95aff499cf0ebd576e21964d9a7412bf5cd4eb1ab71cb555aef2b4d5d3e8aae34ab80354125f1ec571f0ddb3f728f9e19cebbeceff75bb9d0686",
-  "@esbuild/linux-loong64@npm:0.25.2": "8ff82f5cdd7a9490dfb3be64c990841d2a8e1a0ce83d76fa8d5e9b0ba7aa91ca725f338ff43b4d69a18744905f1730adf87a7f8359ae839030663e0bbe2807e2",
-  "@esbuild/linux-loong64@npm:0.25.3": "9d12d8deaf0bdd5d64c062c65eb0e3ea24ab98b1e6ec34b2b14bb3902e5e3504442c3273f6dc05228f6104650ddaf0d37ba86033f19e7b065766c3d528c0f6a3",
-  "@esbuild/linux-mips64el@npm:0.25.2": "382520bf655329d04f65e041f9bf774d11a2232bdf5125934732db915c179b1172ec3429722d9f02f46ee5bad7b70372872bfd003d7c1cc5ec95b7ca6ec8a983",
-  "@esbuild/linux-mips64el@npm:0.25.3": "f117b06fe2d39b08571fd84ed191801cc9501342a514d5d83494219ad14bee9713b6332d0836f192c224b1f9a01405f3d6e2d22952e399bababd527bfeac9c0f",
-  "@esbuild/linux-ppc64@npm:0.25.2": "c5736195867e9c441cabd0a2cbaa62f91c4e4963ed7490018d09a932d549e1d281411ddf9dbd4a4b68f0c0298c1321ba15fd4e493cdc3dea3e14b7a6207b12f8",
-  "@esbuild/linux-ppc64@npm:0.25.3": "ef777920724eecd3bb20f9718901498001ed8b28ced1a6c9a8e947c5ae412d31856761556b9d89bdae1cd9af3ff53f9c83756fac3b4e99b53ebdce44c5ff0cdd",
-  "@esbuild/linux-riscv64@npm:0.25.2": "c72879775daded232fb2e36a6fe26058ec1ccd1f5dd6a76b4e8da700c6dd20cb15b684bce34569cadd41f25a0a53bd2037994279856bb3148f8c16055adcaf68",
-  "@esbuild/linux-riscv64@npm:0.25.3": "87d71b5c361f7d95c173f8c1051e8dce165ff3d6100ef0e5cbd090f8249c58d7f5a38e93774d081afe4fecf3a6e725102dbf9ffa51e5b4960ccd1b072cf86e10",
-  "@esbuild/linux-s390x@npm:0.25.2": "d8810561312c4c7705f3c580ef8cd38e2768feb19ebf2899595a227f59dfb6ca35182f8ad7ca65d503cc5d9c688fe742002243387aa09b98b8c32aabc522ac4e",
-  "@esbuild/linux-s390x@npm:0.25.3": "9972d82725c5818fca8ef1625c3f55a8033c2d678c809a01580780fd5171025e4f90b60fdfe6ff925a1738bb6cff85dea104fdce57badf0a270ed1d290345e23",
-  "@esbuild/linux-x64@npm:0.25.2": "32c8a5f7d0640655ebf60f379ee2b037fe83f3f0edad911a9098505e6ac589c5f2873ff441017183626a19d334e3bb59f58411f2d5474eb7222917575593abea",
-  "@esbuild/linux-x64@npm:0.25.3": "434e21ed68e25e2043295fca9c382461bf50f031c45480a1482f297412f95ebfb183339001444e5d1e6b14358571c395f17ddb8bb9bbd22aefe82740463bc18c",
-  "@esbuild/netbsd-arm64@npm:0.25.2": "0b7f77ec46163feac839b17b94e7db87edf61441bd9a67115722bf72781021c8220576a2e2c70bbca45b89a1e69a6b132f5489b59e84241b197272c1ee080304",
-  "@esbuild/netbsd-arm64@npm:0.25.3": "4dbc6ef9a5ddcf44f2df0fe39c662189eb4cea38fe5778ecc81cc29af68fba2ac077c5b308ad84b8263bb6bea9f03732507b79966d051d860a2344b8fe8ddc4d",
-  "@esbuild/netbsd-x64@npm:0.25.2": "6d6686f5d2eb79b042bd4f38dc95e73a8e290a057be1b6afc42867830c9cf2313600b4fd53287f2f418c9f454bf5df02154b16dcfbfc33a6eb2ce9722a4eecc1",
-  "@esbuild/netbsd-x64@npm:0.25.3": "d42fca551f67c20b18d11cae67fed9675b90293c901b3b152d6e0c1153db1443f7b8a4f7786797b1946d19881db64b50f32e883d756ce3fdf8b844a1c71611f3",
-  "@esbuild/openbsd-arm64@npm:0.25.2": "8a08c16440c6389623bbacb717412635aff61a1552c917e707d71da1dc92c618eea9a9aa1606a4a4f322216f100ede658523baec2e82b1f11b4efd523d491173",
-  "@esbuild/openbsd-arm64@npm:0.25.3": "3aee3b70a7f41ce2355d93bd955718683861ffe9e6b5550c37caa28b8b16e6414222c806f413c37eb553c3990a22b8fdb88721c619f553d809db92cd070ed383",
-  "@esbuild/openbsd-x64@npm:0.25.2": "43baf3248bb460e169cb1b5f26f5eb720088fa0d467c77f4f72c6cfa8e6d7b7794c52ed5e4a9a2113db53313c5fec86e352c94939abf601ab22d5e6e9addc4e5",
-  "@esbuild/openbsd-x64@npm:0.25.3": "d158b78f95feb68c6217f114a3178058aa93933e83897546ffecb6b9ab8e0fe5fed69940651b6c42c1ac9064a42a29fa1c2da316dc64ab146107c2c2599e68c6",
-  "@esbuild/sunos-x64@npm:0.25.2": "0babbb99d3bc3ed818b2b01fbf65ebbf5930defb850e5a5a94a3ba5fc7bc2463d561c07af0d3ac6d6d0197c86682750ceb47abf7d293dd3222b1bd33da9f8aa5",
-  "@esbuild/sunos-x64@npm:0.25.3": "8b6bd4c43c023d0dcb9966349ec1f2ccdfb6163aea2c1c06060806795ed1fb083e22cb9e80e7853ba8c62a74d1bafa36dabab70881e7d6782c2dfb237f93bcc0",
-  "@esbuild/win32-arm64@npm:0.25.2": "205aab6fc7b0ca7ee992cd24d73550110c1f79dc2ca724384bb52aa95111248df022375cd648314bd7eeb42083d576c55572f3d39d4ddcd82fc7372f1e7688b0",
-  "@esbuild/win32-arm64@npm:0.25.3": "c49c827b8cae7eb2a4a6b38a1321c0c1bca1693826c7268d3c3b9361df360b897f583e91b9acff3eeb0c9f477d39c00a2d89c71436b64091442e74011a41f2ed",
-  "@esbuild/win32-ia32@npm:0.25.2": "aa38c0e082e3111e84929a64638cce1c3e1114218726e41c99bf239f2c05be94fb6fe1083366aa342bbd8e75fd449a6a3bcae9b6b3b84066a3a3882dcbaa0090",
-  "@esbuild/win32-ia32@npm:0.25.3": "84acc7f9d65de4875bfe09976620e94327bef444b1b8a795d98173ca777a2070b775763bd927ee475503455b2c1109bf5c911fdfe7c73de7d32124ccf3858afd",
-  "@esbuild/win32-x64@npm:0.25.2": "2f2d147c610a3c3ab0f0f97132e4421464d3d38b835d989e8c324b7397e2592cd05485ec1998ae352f06d3191dd1d71c24f94f63f7c70cd8ea8a4c85441502a9",
-  "@esbuild/win32-x64@npm:0.25.3": "2b88dffa4814240cf7d88a6dee449361ae411a0d9cc6ebc327de59f4f6662a65fb2ef62fa38258bae422933d97a416db50ec4f04875ddf61d15f47bc0ec1ab22",
+  "@esbuild/aix-ppc64@npm:0.25.8": "37fc14b17214c1f6bf41175029b62a43664a6a5a5b802614fe1d837bbf7abf5eaf2f6b735b6a446ebcfabb632e038c8ad9cccd87a259c45a1846689f8527874a",
+  "@esbuild/android-arm64@npm:0.25.8": "e367e989238292ccee72013511dde1aef2d2160d8d5d669a12272f693cf9a0970fac9d7835178b3c46ed6936a0c4b29d21d58ed11851a3697bf98b4320be4b74",
+  "@esbuild/android-arm@npm:0.25.8": "cbfa2c802d8931e5f4d06582f20573cb34774ab713b4712c37eb15bfab6f90b693878b661de2a3bb9c81eecf45b37e0ddf2e9c79ef4ff932bbc37da588c40183",
+  "@esbuild/android-x64@npm:0.25.8": "1d4b900dd2f43790415745d20ae6cadb53e9412911578aaf43462277169c22800eca1f49a9f8ce9c37236e1691279494f91967d28310720707911910ec765013",
+  "@esbuild/darwin-arm64@npm:0.25.8": "a8a50e303056e668e99370a88d1744de4a83e62e2f3f7fcf2ff611142346505229568b0ec5edda93ec96e33e842a585880a312790553202750f123d9636fa97d",
+  "@esbuild/darwin-x64@npm:0.25.8": "9806fe9d54f3228a01f535e7c51aea26bd1bab3c5d64d5f77f4606de44f361f049222776d32bfd262d45991b7aecca645ed576ea338edbf4f8044b22b3e331ad",
+  "@esbuild/freebsd-arm64@npm:0.25.8": "8e6cbdd45819390ecdb62a70a4f119a9269a90895f3e1237788b36a512248a756233ef59f55f9033658af372a196f0edc3567f078f1387e150238d2bd51f733b",
+  "@esbuild/freebsd-x64@npm:0.25.8": "3f920c686037f825859a2fe82104085f4b254b77821cc71a71db512ef0679dd01481c136c3f7057ba7250daff2458aa3ffd101cc28cb5fff2d55270ba5930ec8",
+  "@esbuild/linux-arm64@npm:0.25.8": "234edc9f815cdc74d21c6a90a3542c941deeaf3a24b408c74a4651616bd270383ba5a15eaef837ab347a374032c7028fc29e4f1da0becb33f0b8dd8f744934d7",
+  "@esbuild/linux-arm@npm:0.25.8": "dc6dc225ae278cb3383e11d9829d22f301e1b79f2ed4efde1a01896ae67e45efde98caa61f10cb425a809e9b61e9a4651b60d2b6a3e9ad6174519e8ce74bc02a",
+  "@esbuild/linux-ia32@npm:0.25.8": "1c780012035552e27adea34d11f959a3ddd4a4d576cddd03d320b1db18110e777c1adca2c6d10affd587a4454900d3ffcad9371956855e56739babdc2e4edcd3",
+  "@esbuild/linux-loong64@npm:0.25.8": "d3d39691d301d144c7d61f52163a2fe64caaf928f4117d906707dc1456f3d88d1a7a3b16fb988ccfc0b0bc203f4bcd56665a9c7405dc380b3165a26ab195b9ec",
+  "@esbuild/linux-mips64el@npm:0.25.8": "437e51b2be977cf7774114e04c141e3c0f1ceb7f12b961b7b3ac7f99c4e203afdd74c41e072ecdc4bab3cde4f14feedd78653727d1b2013ed3611bd89117ee8c",
+  "@esbuild/linux-ppc64@npm:0.25.8": "29d2e344b1c8b767518d25b23eb9e98d85deae1f2def2e01c1939536ac7d1fc9e92749a8d29b29277b3340d3613e4b0f96213c6aa2de7e06885a19d3d269870a",
+  "@esbuild/linux-riscv64@npm:0.25.8": "82b2ef7fd5a00b465da97bd797246269d7460ed710c0533517a1f8ad8e32527f405509b2ce27e29f8f3df1affa04e45cf5d1a71205f69dab5c1a27118cf10fb8",
+  "@esbuild/linux-s390x@npm:0.25.8": "74168a6e8927d12c883dba56006f5277f8888c7b1b5e4d132a3c235b8629c3015b4715968ba128a79ff55c9f08a23df84fe44047e8cda4366b9699c5c45f27a4",
+  "@esbuild/linux-x64@npm:0.25.8": "d531002ac2ead0bdb293ec1a4eceea687d37815e298196af2471107cdd4c1f76ef7d12417052b51852b80f66111abfb5ad8375c58b97da92306b975e9a8f0649",
+  "@esbuild/netbsd-arm64@npm:0.25.8": "55626924ae946a6225707062648aabb79c70d61e7e094b067338ea1adf72493b502e99e59440fe0d3abfe20eb36c33f78115815d63e72fa99f5e90146c2ee5d9",
+  "@esbuild/netbsd-x64@npm:0.25.8": "d03122aaa3e9a8bda686bc4120820805b5d9701099458a2c928ee1a292fabcc47df0cb178c8c428edb78a058e75cf7c0d80fa25b71fb91db43d73fe6e4062c41",
+  "@esbuild/openbsd-arm64@npm:0.25.8": "113ed8722788986b5b703c791bb9c954e80a861b92f453c66c79318d71cc6eac509c1dc79d20671b4af92165eee05a28eb7b3122537d8701447d30f58c428942",
+  "@esbuild/openbsd-x64@npm:0.25.8": "dfa68d80d68ae825de85aeccc118724ced6b232dcf25da6d862ba03abda2f55e75483dccbf8cb3a7338e7882a05e5425fcf5a902b7dced72c9f1a9c2650912bd",
+  "@esbuild/openharmony-arm64@npm:0.25.8": "8dab5710d93ad4a78a34a0016f6ea0bf2e16489845f9895ecaf354c1c3db209bed8f05a31309b95c358bfeaea53829605f4e315e9a53dae4d9fdb58e31ca4688",
+  "@esbuild/sunos-x64@npm:0.25.8": "ccc940bd687d1f6d320d2538ac594b7fe5e291e194380a8b392dd2348d738cf8d322f9f62bcea82b3809f98796a0a004cd02ba9c4d563e5e336665e1ec8e1e1d",
+  "@esbuild/win32-arm64@npm:0.25.8": "b0a9a86548d4a62e68b12a89e21aaadda3d6d3e96541a2714b74df370cc344e1a2d91604998a26951da28c2f932bd2ee033adc9346bb232622c3ac419107136a",
+  "@esbuild/win32-ia32@npm:0.25.8": "5880e933c8fb8dc1de1225128c171ea64f4b27fe52fc11ed9cfe6b0ca8ae091c2703d4cb629f08c06731810c46f48cf881516d0d54b3ac408dec34586ea84d27",
+  "@esbuild/win32-x64@npm:0.25.8": "9e98fe0e7eef7a0e774ab761c59d520ea1c997a7a6e4c7f9cbc967471a4a7ffb14bc27c60d2aa10796c4e945c3da2613fcc297054566fe3f5191e1250691d622",
   "@libsql/darwin-arm64@npm:0.4.7": "161ac6b537e39e33c65a7f06c16152ccd5077129b8321b5d0082e008054c47dbc32563d39a47e223d09994457211582ff3760ffa5523f2dd3cfac1dd726a577a",
   "@libsql/darwin-x64@npm:0.4.7": "45c85d00566507f19474f9ae4b6453fa8fff10994147751df2dd2177edf9961520af54156d2d41b23cdfaaf2b219ea4ebd4b44a868e890088fc2283c1224752b",
   "@libsql/linux-arm64-gnu@npm:0.4.7": "c4126b0d717b45a8d1d66797bd7447fdaf53631277dac0250e0aa0267e279493b114b3823407e49da0e2928d6595d3a28370acb99c43424e8bc7e11434cae5f8",
diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index c380e4bc42f3..5d088ec167bf 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cherry-studio";
-  version = "1.4.8";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "CherryHQ";
     repo = "cherry-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1uATq0ov0qn5yVmKPyxqb5KNj3bQBe/pEu2+JLuuv34=";
+    hash = "sha256-HaRu4jiop/PQ6Zr4FZ1yrY+hIwU9p9xAUZ08kH2gE6c=";
   };
 
   postPatch = ''
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-YgDrdUylQNTsgtOKQUzV5aQD9vbK6LFMguvgBLN6i70=";
+    hash = "sha256-OG/6GnemS3ePk4t2Y099tfi9Hw+jbMqabBCsax1Yq68=";
   };
 
   nativeBuildInputs = [

From 99b93f7d9fa9f68691ed6dab642aa922a4b3ca83 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 25 Jul 2025 12:43:23 +0200
Subject: [PATCH 075/357] grafana: 12.0.2+security-01 -> 12.1.0

ChangeLog: https://github.com/grafana/grafana/releases/tag/v12.1.0
Closes #428093
---
 pkgs/servers/monitoring/grafana/default.nix   | 11 ++--
 .../monitoring/grafana/missing-hashes.json    | 51 ++++++++++---------
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index d2097de24765..a4cf06a4f8d5 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -14,6 +14,7 @@
   nixosTests,
   xcbuild,
   faketty,
+  nodejs,
 }:
 
 let
@@ -40,7 +41,7 @@ let
 in
 buildGoModule rec {
   pname = "grafana";
-  version = "12.0.2+security-01";
+  version = "12.1.0";
 
   subPackages = [
     "pkg/cmd/grafana"
@@ -52,12 +53,13 @@ buildGoModule rec {
     owner = "grafana";
     repo = "grafana";
     rev = "v${version}";
-    hash = "sha256-aMbxBDLikmUBZwfZQPLcCCk8BpMeQ7Pj1li4p28aZ88=";
+    hash = "sha256-yraCuPLe68ryCgFzOZPL1H/JYynEvxijjgxMmQvcPZE=";
   };
 
   # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
   env = {
     CYPRESS_INSTALL_BINARY = 0;
+    PUPPETEER_SKIP_DOWNLOAD = 1;
 
     # The build OOMs on memory constrained aarch64 without this
     NODE_OPTIONS = "--max_old_space_size=4096";
@@ -66,14 +68,14 @@ buildGoModule rec {
   missingHashes = ./missing-hashes.json;
   offlineCache = yarn-berry_4.fetchYarnBerryDeps {
     inherit src missingHashes;
-    hash = "sha256-vQdiQyxebtVrO76Pl4oC3DM37owhtQgZqYWaiIyKysQ=";
+    hash = "sha256-+0L68wHR2nCp1g1PqyLIYatc+CIbvLqVUDa7CoyV/fo=";
   };
 
   disallowedRequisites = [ offlineCache ];
 
   postPatch = patchGoVersion;
 
-  vendorHash = "sha256-cJxvZPJmf5YY+IWE7rdoGUkXxDeE6b0troGsdpsQzeU=";
+  vendorHash = "sha256-a31jJN1NIHihFwbtBuLzV4lRKYWv8GtIHh6EwVMWdbM=";
 
   proxyVendor = true;
 
@@ -85,6 +87,7 @@ buildGoModule rec {
     # required to run old node-gyp
     (python3.withPackages (ps: [ ps.distutils ]))
     faketty
+    nodejs
     yarn-berry_4
     yarn-berry_4.yarnBerryConfigHook
   ]
diff --git a/pkgs/servers/monitoring/grafana/missing-hashes.json b/pkgs/servers/monitoring/grafana/missing-hashes.json
index 938b085d529c..8fb585b13fe0 100644
--- a/pkgs/servers/monitoring/grafana/missing-hashes.json
+++ b/pkgs/servers/monitoring/grafana/missing-hashes.json
@@ -1,29 +1,30 @@
 {
-  "@esbuild/aix-ppc64@npm:0.25.0": "f9a1263789c799c54255f102aa7e5eb92ff2938e5f1e28d7270ae9388d7f0b07a89c6928201089e9917da3531c3370675cbdf3ee213dbb46c219168826dcbf07",
-  "@esbuild/android-arm64@npm:0.25.0": "b935e4909cfecaf6166268edb337ac481eb79760230efe9893d09dfffc242915307edc890220ff1fe6378f9a6dc88043971a8282929e21ee92d5bb32d1ff33ad",
-  "@esbuild/android-arm@npm:0.25.0": "109a800ac79c78770cbc5f76c6ba8d2c3a3324c408748016429b5c8aad211463e33d8c0ed7a740f55d8df7a1bac4e78bc5029521f07e740731b7564c688c2206",
-  "@esbuild/android-x64@npm:0.25.0": "033e21f87df0b0a50b6f54de5ba2dc20c232f008fc62c377c8a359dc27c6d96eaaf57fab8c87c829e36fb49249811bcb0dfb0df958fc2cd1a2311fe443db7a2c",
-  "@esbuild/darwin-arm64@npm:0.25.0": "d82d5f8b724a77ee7d65b7d47159930015135c7fb0fc7dc3ad056203bb97a1a933f516fd91f0213420a80c0a9ddfec954c952c554edf00629d9bc964313a3836",
-  "@esbuild/darwin-x64@npm:0.25.0": "ae029503666bfa48c6cbcbc991ac9d841e1f03f056f71782b78e57ac4083022eb505deab330651ee05deab76688cf3139bdbea84caea6491fcaf5caa2b912946",
-  "@esbuild/freebsd-arm64@npm:0.25.0": "9f72aaa0c1845f3ada5a6a1cffa43c7683c25313455aa997ca8b233316a87d163722d8c26a0e86663c5ebbdca6ab91cf1975f0c0e7fbe062087cbef92c666b04",
-  "@esbuild/freebsd-x64@npm:0.25.0": "b96749a6d7da71fff98309655eb85b09de84416ae5c09a02e803342bba25c81e0ac181212bac49fa8d8cc28bfa5e1fbb8d349f2b4722e2ca2df2e4a383d17935",
-  "@esbuild/linux-arm64@npm:0.25.0": "1dbf78595fed87287eccde8fb9a5e35d448ab3b7cd84c03fdfa47c250701a62160d7aa45b4de9ca5e11039975680829644529636bbe254e1627836c5227efca2",
-  "@esbuild/linux-arm@npm:0.25.0": "b1a165678166d006b32f965cb51719403fdea18c9ec2e498807f0b273b46a3a555b214d5d5f832393471180e1d39ca9f06e7bfe3c2c97c0cbc30314a38b422c0",
-  "@esbuild/linux-ia32@npm:0.25.0": "21a136d8301fac7f23724061832426efddc2f9769b29b37e88443245ed0406f0b1f9bc05a02b6d0cf7b3e2e8ec2c8e1e8d99b3178a01ace6974369930f0020f6",
-  "@esbuild/linux-loong64@npm:0.25.0": "f87baa1534a52b24198d9d845821f37bec9c4afb08307ee66c3f1d223d3c684151749f4a0eeb96f3905d365bea9f6256787256ff35b9f80fdd51ed7d4f8356b6",
-  "@esbuild/linux-mips64el@npm:0.25.0": "2bfdec2d2730879795f6884d8f8a38a0297f0cd46bc3357c568fc59432d49d7e26c723d9b8111c799517628cafb469e30fa968387105079aa4b4b4d4192638bf",
-  "@esbuild/linux-ppc64@npm:0.25.0": "bca7b660b91939b5d9f4942b4f2e404efad88fa166c51ba49474b3b5ba200213e1c44499c419d2b13c5afe01b560f361b46d201acc146d76515b953be497bd4f",
-  "@esbuild/linux-riscv64@npm:0.25.0": "dfb00cd66f717315b9afab667a484c67a69a7a3f6bb9e4662cd3dd0b7465da3feb5182bca414ce0ad0f7a95d0a1fd248c792561c63008d483146eff8af6e678c",
-  "@esbuild/linux-s390x@npm:0.25.0": "4c5872f244ade04c71f1d0f14bd0d3ef0cd24c5404e55e33964fa5ce7b6f2e1283e9d9adb5356db76468cd85724f6cfdb1cd9674ad630344a7d01ca614bf59e3",
-  "@esbuild/linux-x64@npm:0.25.0": "22f6bfbb856653ee8cff0a93ce63947fd3bd4565c8bc7e9d437845fc4b44a2b3954b5e412b4aa4b63e62977beca12e0214b2607c7bc8c4ce359bd10118755df4",
-  "@esbuild/netbsd-arm64@npm:0.25.0": "a8286e8b687857779047d005d4a540a693a2e173893a34273773d0272e9908006e10085a52788f54775ca231ad231e8a7af9270dbd8203b9182dbe2c7fee68b6",
-  "@esbuild/netbsd-x64@npm:0.25.0": "e618540e5e086cabc260010e62110a8afb5b0dfc445e5cd6db843d8a7541403decee971265c5cf59e6f1268b03e8fb50e27b65f709faf647c4e20e0916f19621",
-  "@esbuild/openbsd-arm64@npm:0.25.0": "60cc4ce058e03389155dd34f777d4d5cae1fb62f9bb9659c615ce5d70e8093a58aa89a9ebb8fde4d2dba56e5771c6aaf4442db45f4a1c9d54d6c36a149b857d0",
-  "@esbuild/openbsd-x64@npm:0.25.0": "7ba16accc220c711d1bcbb17ada40de4503f9ed54b8a42957345a8a9b9a7c55eac550b234c6a5a812acf50386f2972fb6a5b0381b38f76cff4b3c44ba38ae1ac",
-  "@esbuild/sunos-x64@npm:0.25.0": "e6cbfb0a93b9f78ef991ff43af2ab33faacf382d9b8db44bf53a80b3fc27a9d0f598061b9a77de1db9481d69fd43a3fd4b20a40a2938923fa52cabdcac84e972",
-  "@esbuild/win32-arm64@npm:0.25.0": "47bd8e32c90da8472515ddc625e6284cf745b1b9eeecf16e2e699b94b3d11c2d773b16944c8de33d857a8e59426601063a3df04433cb670ed3e8421def07d96b",
-  "@esbuild/win32-ia32@npm:0.25.0": "072874686fe049446bba0ec18285414275ac74e8232307a856966ede8a822e72ab9f6119f7352f8feb51c629a20065dbc88f4412120480fe5bcc039dd439d0a7",
-  "@esbuild/win32-x64@npm:0.25.0": "ce021c1bb895345ee30f363d89e1f3631040fb44d2e27e614b65dc697090c30c5b66b80aa9d6e5e3b3153010b37e523d6ef34c7b4f2248192b1b4bdd30701b3f",
+  "@esbuild/aix-ppc64@npm:0.25.6": "57ecd2ad4128117f7983047573052e937fa66ec503322f8b865a870319bb0f9ab678a3177bd1c601de8321f13d02f51224b881c947720724777d119af71e717b",
+  "@esbuild/android-arm64@npm:0.25.6": "99060a51fd5ed6454d59afe7542ac8ef3cb8b9dea8d57e535df61a5d8b314e5c32367326079ccc30789ecb7d875c8ff44ac299df2f26a3f60a73200f17170383",
+  "@esbuild/android-arm@npm:0.25.6": "b68ff7acb5ce0af02f8fa48ff715bdfa842a7b3dbead62ef7537a633fd8eb91eaed91b535f63e682e4a7a32cf6faa6ecb3301d9b1e71e1e07a696ed350dfd85d",
+  "@esbuild/android-x64@npm:0.25.6": "8c991eab1a81864577438cc199a7925210e78cc04142906e63222617ec9fb0a7a20b30b0d53bd258de8a922bf175edbf713b8e4185720bb66625a842c7258cca",
+  "@esbuild/darwin-arm64@npm:0.25.6": "bb22081bf2255546bad72a9b28bbcea8a208844b2ba3470da3527ff1b5a9c3cde7a027604ce9128b52843a4d4edfede4b6e03a5dcbdc86ebcc2c4cfd62734708",
+  "@esbuild/darwin-x64@npm:0.25.6": "2d9fefd41d3f375052500ca7f6ba9d31d1da413eb72d84cb021588c6be75f237684fcb1fbb20c445e3e96a7daf89055d63c1f13cec52057342364236439932ec",
+  "@esbuild/freebsd-arm64@npm:0.25.6": "854227c6f0d14096e6c54f9604e15713a6de8734e2bc9aaae195fbd3c50a82e40e728363cdf9bf1607978aacad94ed1ec20007d9df4265d6e285edde88ae6ff4",
+  "@esbuild/freebsd-x64@npm:0.25.6": "d023337780e5f0078b2166b0d6788c3443b98c9f298565f525fca0bd06a28e752393bcfa9b4472bbe33a0d83156770270a809d1590e21d5fd259c4ed556f231f",
+  "@esbuild/linux-arm64@npm:0.25.6": "038569ce10254ab7f8ddca547a4e1b98fa1acfd9343a47f8e62f2183a78e06dff03324b0f47d3f3cc10b87b8493c58a4882fbe5420e3348531eae4810ec3609e",
+  "@esbuild/linux-arm@npm:0.25.6": "05f48c125d52b3ee845ca0569b5a1b48081c505b4568d7e33f59c6ce3e557b3e2322cd7c734519b1251c6809e72fd260095302185d5d874c639188d8abebeb6e",
+  "@esbuild/linux-ia32@npm:0.25.6": "5c28b2d7ba7fbf4f8583a51eb480164db4274415a2e8de4a4f32a46e422b7bd45d42711ed7c7198fb8ea3311fcfc4721d75094d3b5500c3a83632cced0a98b40",
+  "@esbuild/linux-loong64@npm:0.25.6": "165fd44c49df4fd74c2837e74da4afee09964200c07eef295b2a77302825b5ae13b05c47de6356b90ef63256a1bfffd0d645290c8005cd28a29dd6e726c43528",
+  "@esbuild/linux-mips64el@npm:0.25.6": "6acfc822783d5fd211a271456e152d68a8f2f760f1691c18b19144ab2b9fefbb9a82f4afa966dad2773e5d79ea15e3a060736f069bd5b19bec4950eeaf3b0f52",
+  "@esbuild/linux-ppc64@npm:0.25.6": "a787a00358a4539163ebd374a580fa6b5b3c04a067f53c9471bba61a0af552923804f60143909348c6845a399cb79df6950cea7f368f9f9e8d85f57f04c3c779",
+  "@esbuild/linux-riscv64@npm:0.25.6": "2d108701eb3e61aeffa77c75c86e4255ecc6ca6d9024ce8fdcf727bf7d70f90b1c0d94a13e9694f0fd61265c69e6bd2ef03fa3dae766e186e4cad4813140b43b",
+  "@esbuild/linux-s390x@npm:0.25.6": "74f713e0b818198a4139498ac016260be7fd938bf720cdb56d6835e34f2f564383ed87ef848851186e8a02b564356728659457c45f83b7f28a27a5010e866df0",
+  "@esbuild/linux-x64@npm:0.25.6": "5f073daa3abfcddc143942e888ea0c4faaaf4fdf9f2dd7af5823771c93da3797b43d7305b7031f3de30c9e395ff94a6186d34843fd8070fff9ae53846c86d8fc",
+  "@esbuild/netbsd-arm64@npm:0.25.6": "8074332fb3cb2ec1164df3f2ceffce051a776f1013cecfbcbadaaac709f1c9b8237b493add7c9a7c41a85ebe3e9af284a2e2a133cea81b84da8ad806dac56218",
+  "@esbuild/netbsd-x64@npm:0.25.6": "cc6ee54137f70e41d0dfff45b163242e2b53f91076c0fdb34716282d52334ed77228f146855f71135e6e1be437d1e9eefb1175a34520b7697adb6ed1aa4788b9",
+  "@esbuild/openbsd-arm64@npm:0.25.6": "90b137de2876135feeda2d20804d7760a155449c7d7a002f02a100d7998ac6aa60cce6ca944abb7265bc23df27d85f3760d9d879a74b4b3693e7299b9af484a5",
+  "@esbuild/openbsd-x64@npm:0.25.6": "8ef6d5d8818421bc1657b46e6daa1ffd28acf8c049a39089d0a8a6adc5ecc649fd905b7042e26cfa46e701981afc0b35e3a94e25691f3272bda8b98df9bb1da7",
+  "@esbuild/openharmony-arm64@npm:0.25.6": "9a68ff38623cded0c4042b1fdbf1e6ca56c8725760c0a39f1c508a31e12582c91544cc4ea6da0935ae524948c5e7834daee8cad778d87db0b26b71b44aed079b",
+  "@esbuild/sunos-x64@npm:0.25.6": "5fb554255d90c417d28f3d735658478f8e0a3e9ab9960ef585a36f1ff9ac1d101d848f6131c335a62cadc17d5bc46787b8b35c3c0cbd94d0b2482a723f1cac9a",
+  "@esbuild/win32-arm64@npm:0.25.6": "84371851571fbd20fa32e1559581c0cd0f083a91cf4462f414862db4d506d73364eaab2a5fadb9d5b7016d3f5bbd1246f611c453ea52dca8f01c1b9b7c903b56",
+  "@esbuild/win32-ia32@npm:0.25.6": "0549959d25fc9b2d03e1d7ba5767171956d91977ff06c4656ba6f9b56319f7e31ca26d2cb393c56f9cee41446d78e1f4b77e94e490006236559e6daaff6abb80",
+  "@esbuild/win32-x64@npm:0.25.6": "0c7e62abb6e2a3ab8960ee598a108d68b6a23a68c629b0a14b450e87fa123b6beb8ce1b228cdbb7a15f8b13155016d3ece5e78232287a47270f7e72ac014a0e4",
   "@nx/nx-darwin-arm64@npm:20.7.1": "fc5f1e310a8b31c030404791fbddcbfdf072e1342dee50c6795d21e807752560b936ccec02609f25d806aeb44f0935d5dae45a224ac44b9e9e679db57a786616",
   "@nx/nx-darwin-x64@npm:20.7.1": "b0f4595a3b4dd62cd5b95b461e74bbec82e02a74bdaade5c7418eb52bbc2204dd613d92f0c860cf5dd473d38c90b8b31d42aab3a1afdd78b1ba89b20155080c1",
   "@nx/nx-freebsd-x64@npm:20.7.1": "e8b193a009241264426172d82918f7aaf6b47de17e5eb43185a77d4e795b755c70c1d9e60c44f2ab43394105db710386aa2f3b8f3f524e8cd490ab9df5442a61",

From cb8342229dd839da480cc7cb018a6a73a971fe27 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 18:57:10 +0000
Subject: [PATCH 076/357] suitesparse-graphblas: 10.1.0 -> 10.1.1

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

diff --git a/pkgs/by-name/su/suitesparse-graphblas/package.nix b/pkgs/by-name/su/suitesparse-graphblas/package.nix
index 3c4289727824..767d7b45b720 100644
--- a/pkgs/by-name/su/suitesparse-graphblas/package.nix
+++ b/pkgs/by-name/su/suitesparse-graphblas/package.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "suitesparse-graphblas";
-  version = "10.1.0";
+  version = "10.1.1";
 
   outputs = [
     "out"
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "DrTimothyAldenDavis";
     repo = "GraphBLAS";
     rev = "v${version}";
-    hash = "sha256-XJZftjmSQJNzcMCd/kLaXkDsEoGk1+24X70ox4E1EZM=";
+    hash = "sha256-De2ZDP4Lsik3+Wz6yvm+ro4Q7Q8L5ZDdBaYXHg4LO20=";
   };
 
   nativeBuildInputs = [

From fb8cc934ee6633d98de0931b5cb6b01d32407024 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 25 Jul 2025 20:55:46 +0200
Subject: [PATCH 077/357] libation: 12.3.1 -> 12.4.9, add updateScript

---
 pkgs/by-name/li/libation/deps.json   | 251 +++++++++++++--------------
 pkgs/by-name/li/libation/package.nix |  16 +-
 2 files changed, 128 insertions(+), 139 deletions(-)

diff --git a/pkgs/by-name/li/libation/deps.json b/pkgs/by-name/li/libation/deps.json
index ed15ed24cf79..427bb5cf9aba 100644
--- a/pkgs/by-name/li/libation/deps.json
+++ b/pkgs/by-name/li/libation/deps.json
@@ -1,28 +1,28 @@
 [
   {
     "pname": "AAXClean",
-    "version": "2.0.1.1",
-    "hash": "sha256-3xjH9bEapK/LXsJnnAbIHJyIv2BaWyS61gOrsLcv/Xo="
+    "version": "2.0.1.3",
+    "hash": "sha256-a7H1BVqHU25wxkrLJm0ZkWtcxXTHX9s3lDuWVQv29Ak="
   },
   {
     "pname": "AAXClean.Codecs",
-    "version": "2.0.1.1",
-    "hash": "sha256-4tN56SIHiAkvGCTffUoIGRrmfV2pzetITIMbtmj2cXw="
+    "version": "2.0.1.3",
+    "hash": "sha256-3+kSgIMB0b6K8YiJE1olvyyiGcjPiW3eUntDuVn9q90="
   },
   {
     "pname": "AudibleApi",
-    "version": "9.4.0.1",
-    "hash": "sha256-M8+6dTpNXkY/wIXlyVAqzjXFy9HpR32fDbvc2kCTJwU="
+    "version": "9.4.1.1",
+    "hash": "sha256-l0i0JB4ghxLbCAWd6ni7coVpYiGvLrKIMUNhaiA0aWU="
   },
   {
     "pname": "Avalonia",
-    "version": "11.2.8",
-    "hash": "sha256-GbZIXopQh6VSRLAg47TRWHvMYEl5/c7rtvNmFnlDhAo="
+    "version": "11.3.2",
+    "hash": "sha256-eDptsmrO7QxIvHm5kCs9ZE/N1tAuIBvaJMKiAcsu9yk="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
-    "version": "2.1.22045.20230930",
-    "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
+    "version": "2.1.25547.20250602",
+    "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
   },
   {
     "pname": "Avalonia.BuildServices",
@@ -31,78 +31,73 @@
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.2.8",
-    "hash": "sha256-jcCErs44R9tl6zjMkRxdwU9lBxv13MOZMi9Hcm7Tals="
+    "version": "11.3.2",
+    "hash": "sha256-Lr943SkpYMZz3+TPA7vc/mtbQH0r/eLewZFNGNf3i2M="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.2.8",
-    "hash": "sha256-bAbHI5bKyTYksXsnOS5poBBxdhYQE/HSj52YxqGvkok="
-  },
-  {
-    "pname": "Avalonia.Controls.ItemsRepeater",
-    "version": "11.1.5",
-    "hash": "sha256-k4ZYqXFtyLet3wJB4ZJvaPYbcl0K0oKK04yoesbmCXQ="
+    "version": "11.3.2",
+    "hash": "sha256-PFz2fgrBzXQWPLj9X1wdDKDH2iy/54E4NBa+yO7DTfQ="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.2.8",
-    "hash": "sha256-Mr2x3hm3ArlQwGlWO9MuFWUelf4EVmVPAGANm1MxM1o="
+    "version": "11.3.2",
+    "hash": "sha256-A3LV30ekjXWdo/pRldL4S68AAA6BTuLU8ZGCinkNrvk="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.2.8",
-    "hash": "sha256-3+88G0O1LrQSCSxI6s0aFD34nhgqTH1b3rMXBaXqY0M="
+    "version": "11.3.2",
+    "hash": "sha256-fMXY9p16o/wpUXFjRngf96gVwSlX/WCY0fn3nE/TmIY="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.2.8",
-    "hash": "sha256-X9VxRmeK6Vu8c9ILtF/KyDi0B0CmjeZcTRnwouCYOWg="
+    "version": "11.3.2",
+    "hash": "sha256-Mxvpd5JKmIpjQCZmuiSb6IkKfwQhA3o712Ubdx0gP28="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.2.8",
-    "hash": "sha256-YVjhd2fjOamYdYEh4jGGZy06xPAq3juTH2nC7cOlGOA="
+    "version": "11.3.2",
+    "hash": "sha256-HLVKaAVIRnm77lk7LJfrbiEmGWVIim7XMMoZAyGVUFA="
   },
   {
     "pname": "Avalonia.ReactiveUI",
-    "version": "11.2.8",
-    "hash": "sha256-ReMIcC/paWEVWVI8saKhy9j/W4NN89+MNY80GHztUAQ="
+    "version": "11.3.2",
+    "hash": "sha256-lYKhqoKqEZB4tttXehK5KoBMkwVeTxAThh87dns4C/c="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.2.8",
-    "hash": "sha256-v30kDbStvHAS4IOV0wEkWYXOdh4SdjaDEcKVD+6xpzc="
+    "version": "11.3.2",
+    "hash": "sha256-NIkrj4pMvxVvznexzEXmNI8KXWLSXmVbHHWpwz9h3M8="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.2.8",
-    "hash": "sha256-V84jNsrMNguAt9ZdSEf74F4OTC3WyXLuLrkByxfHJe4="
+    "version": "11.3.2",
+    "hash": "sha256-cBJo/tTewA2/LSygJ5aAyPPr11KpLPwS1I6kQxDMy24="
   },
   {
     "pname": "Avalonia.Themes.Fluent",
-    "version": "11.2.8",
-    "hash": "sha256-qHwn8BPAPHxNJ3Ya3xPUhEzItXVjNbI5YjEsNqQLJ8s="
+    "version": "11.3.2",
+    "hash": "sha256-wwMxvJCMdRqnNYmsvzE+122D02HszLsfazPyik1yrBI="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.2.8",
-    "hash": "sha256-vEFjwS+X6EkxVXDFk97b4S4AjbLVjPD3dYVADrBnoXo="
+    "version": "11.3.2",
+    "hash": "sha256-c8QtpXv+B1CTkW9ovxOZwjRZAkD4KZzIvhIhI5WJXdo="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.2.8",
-    "hash": "sha256-3XYJXXT9IMECwCNbrzV49x0pyJZx6Vbib53Vbe9Gfjg="
+    "version": "11.3.2",
+    "hash": "sha256-FNs+O2knXcmUpfDjd/9JcNmpzEi8g3UQ3pQHItnN2U8="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.2.8",
-    "hash": "sha256-+m8pNxda2vyFVBR+7IhkTaQ4Zm7gqkT0XgKSp+lWWmA="
+    "version": "11.3.2",
+    "hash": "sha256-OCH5bwJ7Zje0/L7qtDcFa+yje/uwm2pYNE169J866/I="
   },
   {
     "pname": "BouncyCastle.Cryptography",
-    "version": "2.3.1",
-    "hash": "sha256-r/vNfB00Cjqt1/eFeFdYAoblVhcUuxBRuVUEtqLIT3E="
+    "version": "2.4.0",
+    "hash": "sha256-DoDZNWtYM+0OLIclOEZ+tjcGXymGlXvdvq2ZMPmiAJA="
   },
   {
     "pname": "CommandLineParser",
@@ -111,8 +106,8 @@
   },
   {
     "pname": "CsvHelper",
-    "version": "33.0.1",
-    "hash": "sha256-4MwA/WerpI0VYWiaEudNCNnE1v6/k2tPmLbRjmgijV4="
+    "version": "33.1.0",
+    "hash": "sha256-pEfX4o63xupI7uuwe6qa05One0pJ7UbzzJqLh4Shju8="
   },
   {
     "pname": "Dinah.Core",
@@ -136,8 +131,8 @@
   },
   {
     "pname": "Enums.NET",
-    "version": "4.0.1",
-    "hash": "sha256-ZTWgmbLlOvF9rKQAa4cwPBA0NLZhZ0rwrgZtg/RuJY8="
+    "version": "5.0.0",
+    "hash": "sha256-8cRZVOuu38cso7mNAEifxnN+v0W3T7xB+uR4SBvTkwc="
   },
   {
     "pname": "ExtendedNumerics.BigDecimal",
@@ -146,33 +141,33 @@
   },
   {
     "pname": "Google.Protobuf",
-    "version": "3.30.2",
-    "hash": "sha256-GbyaRLeBNyvJrx4+SkgewClk1nCTtdE7sNqnSjk8VBM="
+    "version": "3.31.1",
+    "hash": "sha256-UEcn4H8F+zK0AjSmz1aTyyMksLxJOGNf2IROtF+DydA="
   },
   {
     "pname": "HarfBuzzSharp",
-    "version": "7.3.0.3",
-    "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
+    "version": "8.3.1.1",
+    "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "7.3.0.3",
-    "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
+    "version": "8.3.1.1",
+    "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "7.3.0.3",
-    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
+    "version": "8.3.1.1",
+    "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
-    "version": "7.3.0.3",
-    "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
+    "version": "8.3.1.1",
+    "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Win32",
-    "version": "7.3.0.3",
-    "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
+    "version": "8.3.1.1",
+    "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo="
   },
   {
     "pname": "HtmlAgilityPack",
@@ -261,8 +256,8 @@
   },
   {
     "pname": "Microsoft.Data.Sqlite.Core",
-    "version": "9.0.4",
-    "hash": "sha256-OJs5gZSKnmDabm6UehVhzYFtsgEmScyNrzbQ+ojiRoI="
+    "version": "9.0.7",
+    "hash": "sha256-cTD6Q27SIKDZ9FYN5FrrfJ7qwo4We7seLz7Ex3F6ENI="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore",
@@ -271,8 +266,8 @@
   },
   {
     "pname": "Microsoft.EntityFrameworkCore",
-    "version": "9.0.4",
-    "hash": "sha256-zjIBv5cnhTVzG7YE+tqSI+havSCAHQdCE3Ha4JjecuQ="
+    "version": "9.0.7",
+    "hash": "sha256-AUKHfIjr2whZ3hIz0oANmesJM/7pDBdywSXWkQ/Psio="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Abstractions",
@@ -281,8 +276,8 @@
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Abstractions",
-    "version": "9.0.4",
-    "hash": "sha256-CaGhHINjggzaZSmdP51BBM4osWKpbck/2DgoMVCR3bc="
+    "version": "9.0.7",
+    "hash": "sha256-SeCmWrkFFnvQSDcTyzSwb3yxe4Fix/OCxg0GomS7ZNA="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Analyzers",
@@ -291,13 +286,13 @@
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Analyzers",
-    "version": "9.0.4",
-    "hash": "sha256-Htc1qQ8dTS+tGDaT0gQVsZNtVar3p/LT54YcFkoHTLI="
+    "version": "9.0.7",
+    "hash": "sha256-sc5+4wh4FoMdtbg8mHI0pEQgEQl6tAKT1Usep5/j4xo="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Design",
-    "version": "9.0.4",
-    "hash": "sha256-mwW5DH+pX0cRx+wRHoh850u2b6/SxvvhBkKjwe8wRiQ="
+    "version": "9.0.7",
+    "hash": "sha256-pcASogSqabBEtqlBfRO//MJ7A9gx8ya4mbqyOA6NWf0="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Relational",
@@ -306,28 +301,28 @@
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Relational",
-    "version": "9.0.4",
-    "hash": "sha256-cZ8qUtvGgICA8F2XS9sNci14AzLC84mcGv6GibifYKc="
+    "version": "9.0.7",
+    "hash": "sha256-jgzudU4gzKnb/+v77+9PQ0bRN1IuJ48+gaZ4ykxkC7M="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Sqlite",
-    "version": "9.0.4",
-    "hash": "sha256-9KBVCa/lr6UX2WFrMAU+S4WD0AG51kLI6YP9GxQmZK8="
+    "version": "9.0.7",
+    "hash": "sha256-I2A/O3THFuIqygxzhE+xUySD1FNqu5SRv+/yaywuOd0="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core",
-    "version": "9.0.4",
-    "hash": "sha256-pka9/9W+B4gVY7H7VJ3qCSaEJJW5Thqd6LAdQaIMRQ0="
+    "version": "9.0.7",
+    "hash": "sha256-nZTEqAhpmsNNhWy+zWSqJWI19LWXornmf75abEd7Z3k="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Tools",
-    "version": "9.0.4",
-    "hash": "sha256-sUyI6VH/QpBNwz2bjQZlCTP41MjC4SlxCDqr063VVsM="
+    "version": "9.0.7",
+    "hash": "sha256-PyTUZx0OoLB945Tiz1hYV5uvpKjl9TFxpvKEW4L5n40="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
-    "version": "9.0.4",
-    "hash": "sha256-/VJBbIJzRXjzQ07s4Bicb+WNV0ZAC+/naG2nLVxFvjU="
+    "version": "9.0.7",
+    "hash": "sha256-6k/RzXSpQEoLHXAlEpV3KJ/zXknkguWEZ5SWY7z/4SM="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
@@ -336,8 +331,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
-    "version": "9.0.4",
-    "hash": "sha256-5uynkW+dK61Zp1+vs5uW6mwpnkZl7mH/bGSQoGjJH2c="
+    "version": "9.0.7",
+    "hash": "sha256-Amw5+liq7vmRc3YMEvbFErUiUyMB+tEKgx0/g4nCepE="
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
@@ -346,8 +341,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
-    "version": "9.0.4",
-    "hash": "sha256-01yWDq/dHgU1Trx2OqVsXK/yobwVTClJXB07LrPc8lU="
+    "version": "9.0.7",
+    "hash": "sha256-Su+YntNqtLuY0XEYo1vfQZ4sA0wrHu0ZrcM33blvHWI="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
@@ -356,8 +351,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "9.0.4",
-    "hash": "sha256-5hwq73FCWAJJ8Yb1VHaaryJJhUUiVsetPTrPLlo8N9o="
+    "version": "9.0.7",
+    "hash": "sha256-45ZR8liM/A6II+WPX9X6v9+g2auAKInPbVvY6a79VLk="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
@@ -376,8 +371,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.FileExtensions",
-    "version": "9.0.4",
-    "hash": "sha256-i6BP99iTLEVt7aSw2Fu0ogUnY6FlVMat+BMIlndHCkQ="
+    "version": "9.0.7",
+    "hash": "sha256-9+XLNylnsYd/IcLZfDyW/Q+nuYB51BQJeyA+ZMsKan0="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Json",
@@ -386,18 +381,18 @@
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Json",
-    "version": "9.0.4",
-    "hash": "sha256-scTrZeY5CKX9kMcN7MYQPJVgEFwDTvO+JOk+G3wXrjs="
+    "version": "9.0.7",
+    "hash": "sha256-4lWXlwwGPgv3nrL5V890LPVKxSDM8w4UJYYQlSA28/M="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "9.0.4",
-    "hash": "sha256-ck7PqIL/3vodYky+d7YX218n+detOoEjZeMr1EqTFPg="
+    "version": "9.0.7",
+    "hash": "sha256-/TCCT7WPZpEWP9E3M441y+SZsmdqQ/WMTgL+ce7p2hw="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "9.0.4",
-    "hash": "sha256-6WcGpsAYRhrpHloEom0oVP7Ff4Gh/O1XWJETJJ3LvEQ="
+    "version": "9.0.7",
+    "hash": "sha256-Ltlh01iGj6641DaZSFif/2/2y3y9iFk7GEd+HuRnxPs="
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
@@ -411,8 +406,8 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "9.0.4",
-    "hash": "sha256-ziWOK9GykM9HufwYy18FYu6AyOncLOeumi3F/4W3AVE="
+    "version": "9.0.7",
+    "hash": "sha256-yRnJOylILhZMOj3J7W0pR8h7igyUrz6SilQSMxDpj/w="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
@@ -421,8 +416,8 @@
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
-    "version": "9.0.4",
-    "hash": "sha256-OkAq+1NUG0d1Ww6zT/hZWcPB5+fCr8AJIWmkpX7CQxU="
+    "version": "9.0.7",
+    "hash": "sha256-e/oPQDche6WBSJlVwNIhSu4qknO2TmMMkhX+OqbYGFA="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Physical",
@@ -431,8 +426,8 @@
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Physical",
-    "version": "9.0.4",
-    "hash": "sha256-whn/jRYaH56Lha20yChG5wgIllttTq2EtOwyDW+ZDO4="
+    "version": "9.0.7",
+    "hash": "sha256-L7XMdKdZa4UT01TKEjunha3RAK5BBi2E020wRbrvUOU="
   },
   {
     "pname": "Microsoft.Extensions.FileSystemGlobbing",
@@ -441,8 +436,8 @@
   },
   {
     "pname": "Microsoft.Extensions.FileSystemGlobbing",
-    "version": "9.0.4",
-    "hash": "sha256-lzNTCxATfJvnsl1hlAxhI4cibixYYBq99fK9b9tEo0A="
+    "version": "9.0.7",
+    "hash": "sha256-KjxkTcn1aNZUdoFb6v/xhdG92D5FmwdW2MFL1xAH1x8="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
@@ -451,18 +446,18 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "9.0.4",
-    "hash": "sha256-Vj+NGOamKeuMrLNUWlVKFFkz7IKGIv6h1A5X4CK9D5E="
+    "version": "9.0.7",
+    "hash": "sha256-7n8guHFss8HPnJuAByfzn9ipguDz7dack/udL1uH3h0="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "9.0.4",
-    "hash": "sha256-n0ZRhQ7U/5Kv1hVqUXGoa5gfrhzcy77yFhfonjq6VFc="
+    "version": "9.0.7",
+    "hash": "sha256-G8x9e+2D2FzUsYNkXHd4HKQ71iEv5njFiGlvS+7OXLQ="
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "9.0.4",
-    "hash": "sha256-QyjtRCG+L9eyH/UWHf/S+7/ZiSOmuGNoKGO9nlXmjxI="
+    "version": "9.0.7",
+    "hash": "sha256-nfUnZxx1tKERUddNNyxhGTK7VDTNZIJGYkiOWSHCt/M="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
@@ -471,13 +466,13 @@
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "9.0.4",
-    "hash": "sha256-v/Ygyo1TMTUbnhdQSV2wzD4FOgAEWd1mpESo3kZ557g="
+    "version": "9.0.7",
+    "hash": "sha256-Vv1EuoBSfjCJ7EKzxh10/nA/rpaFU8D8+bdZZQWzw2I="
   },
   {
     "pname": "Microsoft.IO.RecyclableMemoryStream",
-    "version": "3.0.0",
-    "hash": "sha256-WBXkqxC5g4tJ481sa1uft39LqA/5hx5yOfiTfMRMg/4="
+    "version": "3.0.1",
+    "hash": "sha256-unFg/5EcU/XKJbob4GtQC43Ydgi5VjeBGs7hfhj4EYo="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
@@ -526,8 +521,8 @@
   },
   {
     "pname": "NPOI",
-    "version": "2.7.3",
-    "hash": "sha256-xDVGyQoUaynZ0LS7+/gIM3JJO88jakE2vKxTFsVAngo="
+    "version": "2.7.4",
+    "hash": "sha256-HrKC49BTCxR2/jJRWgwuLsOTvq1KynRnBR2Xklsokcs="
   },
   {
     "pname": "Octokit",
@@ -541,13 +536,13 @@
   },
   {
     "pname": "Polly",
-    "version": "8.5.2",
-    "hash": "sha256-IrN06ddOIJ0VYuVefe3LvfW0kX20ATRQkEBg9CBomRA="
+    "version": "8.6.2",
+    "hash": "sha256-JWPe3Une30ljf2z4aeshNSjz2CfIQZWw3IHiPvFgy6E="
   },
   {
     "pname": "Polly.Core",
-    "version": "8.5.2",
-    "hash": "sha256-PAwsWqrCieCf/7Y87fV7XMKoaY2abCQNtI+4oyyMifk="
+    "version": "8.6.2",
+    "hash": "sha256-jX1i7tkQwaY74qgVarx6vLeLIg7zonQwisFvm6nWrHs="
   },
   {
     "pname": "ReactiveUI",
@@ -604,11 +599,6 @@
     "version": "7.0.0",
     "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo="
   },
-  {
-    "pname": "Serilog.Sinks.ZipFile",
-    "version": "3.1.1",
-    "hash": "sha256-W4oXuOZF+Ic6rKma2PkmKW5O7GvuzooNsiB17p5H6lQ="
-  },
   {
     "pname": "SharpZipLib",
     "version": "1.4.2",
@@ -626,8 +616,8 @@
   },
   {
     "pname": "SixLabors.ImageSharp",
-    "version": "3.1.8",
-    "hash": "sha256-cE9BQfbCvJ0Mf+fQiTD8elOZEPcfZHjDz2BHdiO+D08="
+    "version": "3.1.10",
+    "hash": "sha256-6bVTSCxLY8Dt+9lpo4F4xEtMv5oPve2vS76O/lcuIok="
   },
   {
     "pname": "SkiaSharp",
@@ -871,8 +861,8 @@
   },
   {
     "pname": "System.Text.Json",
-    "version": "9.0.4",
-    "hash": "sha256-oIOqfOIIUXXVkfFiTCI9wwIJBETQqF7ZcOJv2iYuq1s="
+    "version": "9.0.7",
+    "hash": "sha256-f3leKX3r7JoUbKo6tnuIsPVYJHNbElHWffhyqk1+2C0="
   },
   {
     "pname": "System.Threading",
@@ -891,7 +881,12 @@
   },
   {
     "pname": "Tmds.DBus.Protocol",
-    "version": "0.20.0",
-    "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
+    "version": "0.21.2",
+    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
+  },
+  {
+    "pname": "ZString",
+    "version": "2.6.0",
+    "hash": "sha256-9Q/L1SPmI+oVxvUBIz202mUn+UVsoV/y2OfhopHXzeo="
   }
 ]
diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix
index cfa6b499eaa5..ba5a77382408 100644
--- a/pkgs/by-name/li/libation/package.nix
+++ b/pkgs/by-name/li/libation/package.nix
@@ -8,17 +8,18 @@
   glew,
   gtk3,
   xorg,
+  nix-update-script,
 }:
 
 buildDotnetModule rec {
   pname = "libation";
-  version = "12.3.1";
+  version = "12.4.9";
 
   src = fetchFromGitHub {
     owner = "rmcrackan";
     repo = "Libation";
     tag = "v${version}";
-    hash = "sha256-jir1r78HbAhlOiCj6pSw0+o4V9ceCkJQWnKtt6VzLDY=";
+    hash = "sha256-o5bmu5OU5Md85AucbNrm30dGCj+prWwmWDL3R6Dp8Mk=";
   };
 
   sourceRoot = "${src.name}/Source";
@@ -64,20 +65,13 @@ buildDotnetModule rec {
   dontDotnetFixup = true;
 
   preFixup = ''
-    # remove binaries for other platform, like upstream does
-    pushd $out/lib/libation
-    rm -f *.x86.dll *.x64.dll
-    ${lib.optionalString (stdenv.system != "x86_64-linux") "rm -f *.x64.so"}
-    ${lib.optionalString (stdenv.system != "aarch64-linux") "rm -f *.arm64.so"}
-    ${lib.optionalString (stdenv.system != "x86_64-darwin") "rm -f *.x64.dylib"}
-    ${lib.optionalString (stdenv.system != "aarch64-darwin") "rm -f *.arm64.dylib"}
-    popd
-
     wrapDotnetProgram $out/lib/libation/Libation $out/bin/libation
     wrapDotnetProgram $out/lib/libation/LibationCli $out/bin/libationcli
     wrapDotnetProgram $out/lib/libation/Hangover $out/bin/hangover
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     changelog = "https://github.com/rmcrackan/Libation/releases/tag/v${version}";
     description = "Audible audiobook manager";

From 3f5d7d413434f815598485ef94d794dfe65069c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 00:10:11 +0000
Subject: [PATCH 078/357] python3Packages.netbox-reorder-rack: 1.1.3 -> 1.1.4

---
 .../python-modules/netbox-reorder-rack/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/netbox-reorder-rack/default.nix b/pkgs/development/python-modules/netbox-reorder-rack/default.nix
index 56e8f2ab6969..91923acc031f 100644
--- a/pkgs/development/python-modules/netbox-reorder-rack/default.nix
+++ b/pkgs/development/python-modules/netbox-reorder-rack/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "netbox-reorder-rack";
-  version = "1.1.3";
+  version = "1.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "netbox-community";
     repo = "netbox-reorder-rack";
     tag = "v${version}";
-    hash = "sha256-G1WGmEsKfz9HT6D6cCWJADm7pFaIV/jKYkYudEmUWJk=";
+    hash = "sha256-lWC+Br66POJe3M8L+Pt5D1pWBr9qSpRLn2TcVMXKje4=";
   };
 
   build-system = [

From 47498b82b4648f9413021ca8ea3c5fca8f50e743 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 08:04:59 +0000
Subject: [PATCH 079/357] redux: 1.3.5 -> 1.4.1

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

diff --git a/pkgs/by-name/re/redux/package.nix b/pkgs/by-name/re/redux/package.nix
index 5c282338ec1d..898ab2d94097 100644
--- a/pkgs/by-name/re/redux/package.nix
+++ b/pkgs/by-name/re/redux/package.nix
@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation rec {
   pname = "redux";
-  version = "1.3.5";
+  version = "1.4.1";
 
   src =
     if releasePath != null then
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
             lib.replaceStrings [ "." ] [ "_" ] version
           }_Demo_Linux_x86_64.tar.gz"
         ];
-        sha256 = "sha256-eznsdLzgdJ7MyWe5WAEg1MHId5VlfyanoZ6+I9nI/0I=";
+        sha256 = "sha256-q9hxDI8tgjIFaZyrguXn57C4vh0oeSQBY8koq8cPDlg=";
       };
 
   nativeBuildInputs = [

From 15e8c2a2f2d222a50c23f9fdfcea5ca27637bba1 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Thu, 17 Jul 2025 20:12:38 +0200
Subject: [PATCH 080/357] cjdns: 21.4 -> 22.1

---
 pkgs/by-name/cj/cjdns/package.nix | 40 +++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix
index e095b3f3b35f..5c90ca7b4714 100644
--- a/pkgs/by-name/cj/cjdns/package.nix
+++ b/pkgs/by-name/cj/cjdns/package.nix
@@ -2,11 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   rustPlatform,
   nodejs,
   which,
-  python3,
-  libuv,
   util-linux,
   nixosTests,
   libsodium,
@@ -16,26 +15,34 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cjdns";
-  version = "21.4";
+  version = "22.1";
 
   src = fetchFromGitHub {
     owner = "cjdelisle";
     repo = "cjdns";
-    rev = "cjdns-v${version}";
-    sha256 = "sha256-vI3uHZwmbFqxGasKqgCl0PLEEO8RNEhwkn5ZA8K7bxU=";
+    tag = "cjdns-v${version}";
+    hash = "sha256-0imQrkcvIA+2Eq/zlC65USMR7T3OUKwQxrB1KtVexyU=";
   };
 
   patches = [
     (replaceVars ./system-libsodium.patch {
       libsodium_include_dir = "${libsodium.dev}/include";
     })
+    # Remove mkpasswd since it is failing the build
+    (fetchpatch {
+      url = "https://github.com/cjdelisle/cjdns/commit/6391dba3f5fdab45df4b4b6b71dbe9620286ce32.patch";
+      hash = "sha256-XVA4tdTVMLrV6zuGoBCkOgQq6NXh0x7u8HgmaxFeoRI=";
+    })
+    (fetchpatch {
+      url = "https://github.com/cjdelisle/cjdns/commit/436d9a9784bae85734992c2561c778fbd2f5ac32.patch";
+      hash = "sha256-THcYNGVbMx/xf3/5UIxEhz3OlODE0qiYgDBOlHunhj8=";
+    })
   ];
 
-  cargoHash = "sha256-LJEKjhyAsK6b7mKObX8tNJdKt53iagMD/YLzoY5GVPw=";
+  cargoHash = "sha256-f96y6ZW0HxC+73ts5re8GIo2aigQgK3gXyF7fMrcJ0o=";
 
   nativeBuildInputs = [
     which
-    python3
     nodejs
     pkg-config
   ]
@@ -43,10 +50,7 @@ rustPlatform.buildRustPackage rec {
     # for flock
     lib.optional stdenv.hostPlatform.isLinux util-linux;
 
-  buildInputs = [
-    libuv
-    libsodium
-  ];
+  buildInputs = [ libsodium ];
 
   env.SODIUM_USE_PKG_CONFIG = 1;
   env.NIX_CFLAGS_COMPILE = toString (
@@ -61,10 +65,22 @@ rustPlatform.buildRustPackage rec {
     ]
   );
 
+  cargoTestFlags = [
+    # don't run doctests since they fail with "cannot find type `Ctx` in this scope"
+    "--lib"
+    "--bins"
+    "--tests"
+  ];
+
+  checkFlags = [
+    # Tests don't seem to work - "called `Result::unwrap()` on an `Err` value: DecryptErr: NO_SESSION"
+    "--skip=crypto::crypto_auth::tests::test_wireguard_iface_encrypt_decrypt"
+    "--skip=crypto::crypto_auth::tests::test_wireguard_iface_encrypt_decrypt_with_auth"
+  ];
+
   passthru.tests.basic = nixosTests.cjdns;
 
   meta = with lib; {
-    broken = true; # outdated, incompatible with supported python versions
     homepage = "https://github.com/cjdelisle/cjdns";
     description = "Encrypted networking for regular people";
     license = licenses.gpl3Plus;

From 83bc8f05d912e700f94a238ab1a1126b40a581d4 Mon Sep 17 00:00:00 2001
From: Joshua Perry <josh@6bit.com>
Date: Sat, 26 Jul 2025 15:28:29 -0600
Subject: [PATCH 081/357] edgetx: 2.11.0-rc3 -> 2.11.2

adds pl18u and st16 simulators
---
 pkgs/by-name/ed/edgetx/package.nix | 4 ++--
 pkgs/by-name/ed/edgetx/targets.nix | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix
index 7e3a704eab36..42dd8342713b 100644
--- a/pkgs/by-name/ed/edgetx/package.nix
+++ b/pkgs/by-name/ed/edgetx/package.nix
@@ -40,14 +40,14 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "edgetx";
-  version = "2.11.0-rc3";
+  version = "2.11.2";
 
   src = fetchFromGitHub {
     owner = "EdgeTX";
     repo = "edgetx";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-ipiGkc+R7/itmnRRrlrc4iXn+fLWm4OKc227NfevFhI=";
+    hash = "sha256-F3T1lX0FSSUIQxSlqLQHj7JrfF+20Ndv63zDA0sRzFQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ed/edgetx/targets.nix b/pkgs/by-name/ed/edgetx/targets.nix
index d835799ff0b7..3e988ffb2ce9 100644
--- a/pkgs/by-name/ed/edgetx/targets.nix
+++ b/pkgs/by-name/ed/edgetx/targets.nix
@@ -32,6 +32,8 @@
   "el18"
   "pl18"
   "pl18ev"
+  "pl18u"
+  "st16"
   "x10"
   "x10express"
   "x12s"

From 222178f5b2c6c9926137855a36373e942ac14ab3 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sat, 26 Jul 2025 20:25:29 -0700
Subject: [PATCH 082/357] =?UTF-8?q?mozillavpn:=202.29.0=20=E2=86=92=202.30?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/by-name/mo/mozillavpn/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix
index 4fc9428ab227..9b8bf69fa8a2 100644
--- a/pkgs/by-name/mo/mozillavpn/package.nix
+++ b/pkgs/by-name/mo/mozillavpn/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mozillavpn";
-  version = "2.29.0";
+  version = "2.30.0";
   src = fetchFromGitHub {
     owner = "mozilla-mobile";
     repo = "mozilla-vpn-client";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-Oh3qV5/fQNLjv3qnhRrgRV0d+homlGmEpTSeou3lZfE=";
+    hash = "sha256-dwVgwEs1prEXOYuYlO1m5lJD5AKolW0Stj2HOZC+Y+o=";
   };
   patches = [ ];
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src patches;
-    hash = "sha256-Flsa93Nko/sHr9z+YW7xDFMVLOzJE4oJFAl841gpPpw=";
+    hash = "sha256-dap2t7nINWaTTahiPUFVkgAlkDuVt0w0mz13ycqwLcI=";
   };
 
   buildInputs = [
@@ -90,6 +90,8 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system"
 
     ln -s '${finalAttrs.netfilter.goModules}' linux/netfilter/vendor
+
+    patchShebangs scripts/utils/xlifftool.py
   '';
 
   cmakeFlags = [

From 27128e1cbc40886c7efde1e62716aa4485a35e54 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 27 Jul 2025 09:08:54 +0200
Subject: [PATCH 083/357] maintainers: drop `anatolypopov`

---
 maintainers/maintainer-list.nix                   | 6 ------
 pkgs/applications/editors/jetbrains/bin/ides.json | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 39f8ece163fa..d61841665307 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1488,12 +1488,6 @@
     name = "Anas Elgarhy";
     keys = [ { fingerprint = "E10B D192 9231 08C7 3C35 7EC3 83E0 3DC6 F383 4086"; } ];
   };
-  AnatolyPopov = {
-    email = "aipopov@live.ru";
-    github = "AnatolyPopov";
-    githubId = 2312534;
-    name = "Anatolii Popov";
-  };
   andehen = {
     email = "git@andehen.net";
     github = "andehen";
diff --git a/pkgs/applications/editors/jetbrains/bin/ides.json b/pkgs/applications/editors/jetbrains/bin/ides.json
index 2d5495d68b69..2c17995dfa3b 100644
--- a/pkgs/applications/editors/jetbrains/bin/ides.json
+++ b/pkgs/applications/editors/jetbrains/bin/ides.json
@@ -73,7 +73,7 @@
     "meta": {
       "isOpenSource": true,
       "description": "Free Java, Kotlin, Groovy and Scala IDE from jetbrains",
-      "maintainers": [ "edwtjo", "gytis-ivaskevicius", "steinybot", "AnatolyPopov", "tymscar" ],
+      "maintainers": [ "edwtjo", "gytis-ivaskevicius", "steinybot", "tymscar" ],
       "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.",
       "homepage": "https://www.jetbrains.com/idea/"
     }
@@ -85,7 +85,7 @@
     "meta": {
       "isOpenSource": false,
       "description": "Paid-for Java, Kotlin, Groovy and Scala IDE from jetbrains",
-      "maintainers": [ "edwtjo", "gytis-ivaskevicius", "steinybot", "AnatolyPopov", "tymscar" ],
+      "maintainers": [ "edwtjo", "gytis-ivaskevicius", "steinybot", "tymscar" ],
       "longDescription": "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ.",
       "homepage": "https://www.jetbrains.com/idea/"
     }

From 44eabba4971a9627887271a750bc5c152907325d Mon Sep 17 00:00:00 2001
From: Pascal Jungblut <mail@pascalj.de>
Date: Mon, 21 Jul 2025 21:38:46 +0200
Subject: [PATCH 084/357] maintainers: add pascalj

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 39f8ece163fa..92982ce19307 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19337,6 +19337,12 @@
     githubId = 821972;
     name = "Parth Mehrotra";
   };
+  pascalj = {
+    email = "nix@pascalj.de";
+    github = "pascalj";
+    githubId = 330168;
+    name = "Pascal Jungblut";
+  };
   paschoal = {
     email = "paschoal@gmail.com";
     github = "paschoal";

From cfb99f1c895b6999f2e77cb088882a499f3006c3 Mon Sep 17 00:00:00 2001
From: Pascal Jungblut <pascal.jungblut@guardsquare.com>
Date: Wed, 23 Jul 2025 23:35:15 +0200
Subject: [PATCH 085/357] zsign: init at 0.7

zsign is a codesign alternative for Linux, MacOS and Windows
---
 pkgs/by-name/zs/zsign/package.nix | 61 +++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 pkgs/by-name/zs/zsign/package.nix

diff --git a/pkgs/by-name/zs/zsign/package.nix b/pkgs/by-name/zs/zsign/package.nix
new file mode 100644
index 000000000000..fb76fb5a4982
--- /dev/null
+++ b/pkgs/by-name/zs/zsign/package.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenv,
+  openssl,
+  pkg-config,
+  minizip,
+  zlib,
+  versionCheckHook,
+}:
+let
+  platformName = if stdenv.hostPlatform.isLinux then "linux" else "macos";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zsign";
+  version = "0.7";
+
+  src = fetchFromGitHub {
+    owner = "zhlynn";
+    repo = "zsign";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CAG9ewROyIGN5VOZbs0X1W88HdZ3H1sxaRJ7JpDbw3o=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/build/${platformName}";
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    openssl
+    minizip
+    zlib
+  ];
+
+  makeFlags = [
+    "BINDIR=bin/"
+    "CXX=${stdenv.cc.targetPrefix}c++"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin/
+    cp bin/zsign $out/bin/
+
+    runHook postInstall
+  '';
+
+  enableParallelBuilding = true;
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  meta = {
+    description = "Cross-platform codesign alternative for iOS 12+";
+    homepage = "https://github.com/zhlynn/zsign";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pascalj ];
+    mainProgram = "zsign";
+    platforms = with lib.platforms; darwin ++ linux;
+  };
+})

From 7476494b3b16a4861035ef4a876d47050b7f1505 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Sun, 27 Jul 2025 13:35:51 +0200
Subject: [PATCH 086/357] nixos/cjdns: update for cjdns 22.1 compatibility

---
 nixos/modules/services/networking/cjdns.nix |  4 ++--
 nixos/tests/cjdns.nix                       | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 1b9f53c9b28a..43ea76d5d710 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -49,7 +49,7 @@ let
         k: v:
         lib.optionalString (
           v.hostname != ""
-        ) "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}"
+        ) "echo $(${pkgs.cjdns}/bin/cjdnstool util key2ip6 ${v.publicKey}) ${v.hostname}"
       ) (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo)
     )}
   '';
@@ -268,7 +268,7 @@ in
 
         if [ -z "$CJDNS_PRIVATE_KEY" ]; then
             shopt -s lastpipe
-            ${pkg}/bin/makekeys | { read private ipv6 public; }
+            ${pkg}/bin/cjdnstool util keygen | { read private ipv6 public; }
 
             install -m 600 <(echo "CJDNS_PRIVATE_KEY=$private") /etc/cjdns.keys
             install -m 444 <(echo -e "CJDNS_IPV6=$ipv6\nCJDNS_PUBLIC_KEY=$public") /etc/cjdns.public
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index 52762f853e20..4bff3b15035f 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -105,7 +105,7 @@ in
 
     def cjdns_ip(machine):
         res = machine.succeed("ip -o -6 addr show dev tun0")
-        ip = re.split("\s+|/", res)[3]
+        ip = re.split("\\s+|/", res)[3]
         machine.log("has ip {}".format(ip))
         return ip
 
@@ -116,14 +116,14 @@ in
 
     # ping a few times each to let the routing table establish itself
 
-    alice.succeed("ping -c 4 {}".format(carol_ip6))
-    bob.succeed("ping -c 4 {}".format(carol_ip6))
+    alice.wait_until_succeeds("ping -c 4 {}".format(carol_ip6))
+    bob.wait_until_succeeds("ping -c 4 {}".format(carol_ip6))
 
-    carol.succeed("ping -c 4 {}".format(alice_ip6))
-    carol.succeed("ping -c 4 {}".format(bob_ip6))
+    carol.wait_until_succeeds("ping -c 4 {}".format(alice_ip6))
+    carol.wait_until_succeeds("ping -c 4 {}".format(bob_ip6))
 
-    alice.succeed("ping -c 4 {}".format(bob_ip6))
-    bob.succeed("ping -c 4 {}".format(alice_ip6))
+    alice.wait_until_succeeds("ping -c 4 {}".format(bob_ip6))
+    bob.wait_until_succeeds("ping -c 4 {}".format(alice_ip6))
 
     alice.wait_for_unit("httpd.service")
 

From 0639f762d9ddff0032975235dff17f89a2a17006 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Thu, 17 Jul 2025 20:13:20 +0200
Subject: [PATCH 087/357] cjdns: remove usage of with lib

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

diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix
index 5c90ca7b4714..8334caec4890 100644
--- a/pkgs/by-name/cj/cjdns/package.nix
+++ b/pkgs/by-name/cj/cjdns/package.nix
@@ -80,11 +80,11 @@ rustPlatform.buildRustPackage rec {
 
   passthru.tests.basic = nixosTests.cjdns;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/cjdelisle/cjdns";
     description = "Encrypted networking for regular people";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ehmry ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ehmry ];
+    platforms = lib.platforms.linux;
   };
 }

From 4b5c5664cc66ff707cb09431d00ad528cc85950f Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 23 Jul 2025 11:30:15 +0200
Subject: [PATCH 088/357] cjdns: enable darwin support

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

diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix
index 8334caec4890..34199ed5b181 100644
--- a/pkgs/by-name/cj/cjdns/package.nix
+++ b/pkgs/by-name/cj/cjdns/package.nix
@@ -85,6 +85,6 @@ rustPlatform.buildRustPackage rec {
     description = "Encrypted networking for regular people";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ ehmry ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

From ac71292aa1deb1df1914029f45b1321d647da21a Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 23 Jul 2025 22:18:34 +0200
Subject: [PATCH 089/357] cjdns-tools: enable darwin support

---
 pkgs/by-name/cj/cjdns-tools/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/cj/cjdns-tools/package.nix b/pkgs/by-name/cj/cjdns-tools/package.nix
index 9e68412928e6..90ab4d61ae82 100644
--- a/pkgs/by-name/cj/cjdns-tools/package.nix
+++ b/pkgs/by-name/cj/cjdns-tools/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     description = "Tools for cjdns managment";
     license = licenses.gpl3Plus;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     mainProgram = "cjdns-tools";
   };
 }

From 72626fff03ab539951e0f0855acac2cad232c477 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Wed, 23 Jul 2025 22:18:59 +0200
Subject: [PATCH 090/357] cjdns-tools: remove usage of with lib

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

diff --git a/pkgs/by-name/cj/cjdns-tools/package.nix b/pkgs/by-name/cj/cjdns-tools/package.nix
index 90ab4d61ae82..43c2fb28cafb 100644
--- a/pkgs/by-name/cj/cjdns-tools/package.nix
+++ b/pkgs/by-name/cj/cjdns-tools/package.nix
@@ -37,12 +37,12 @@ stdenv.mkDerivation {
     cp -r node_modules $out/node_modules
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/cjdelisle/cjdns";
     description = "Tools for cjdns managment";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "cjdns-tools";
   };
 }

From dc07ea2a1d69fdc95c2824916ffed2439cbba719 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 27 Jul 2025 14:34:16 -0400
Subject: [PATCH 091/357] python3Packages.msrplib: init at
 0.20.1-unstable-2021-06-01

NGI project.

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../python-modules/msrplib/default.nix        | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/msrplib/default.nix

diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix
new file mode 100644
index 000000000000..0ccdbdd1b87c
--- /dev/null
+++ b/pkgs/development/python-modules/msrplib/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  unstableGitUpdater,
+}:
+
+buildPythonPackage rec {
+  pname = "msrplib";
+  version = "0.20.1-unstable-2021-06-01";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "AGProjects";
+    repo = "python3-msrplib";
+    # no tag pushed for version 0.21.1 release, and commit title is wrong
+    rev = "5bd069620d436d5a65e1c369e43cc6b88857fb9e";
+    hash = "sha256-z0gF/oQW/h3qiCL1cFWBPK7JYzLCNAD7/dg7HfY4rig=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  # only test requires networking
+  doCheck = false;
+
+  pythonImportsCheck = [ "msrplib" ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "MSRP (RFC4975) client library";
+    homepage = "https://github.com/AGProjects/python3-msrplib";
+    license = lib.licenses.lgpl21Plus;
+    teams = [
+      lib.teams.ngi
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c85cb1d2f56b..f887dbad4271 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9595,6 +9595,8 @@ self: super: with self; {
 
   msrestazure = callPackage ../development/python-modules/msrestazure { };
 
+  msrplib = callPackage ../development/python-modules/msrplib { };
+
   mss = callPackage ../development/python-modules/mss { };
 
   msticpy = callPackage ../development/python-modules/msticpy { };

From 3084dc1a0077c28fc2a6d5eead53e05a315d1e14 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 27 Jul 2025 14:19:01 -0400
Subject: [PATCH 092/357] python3Packages.xcaplib: init at
 2.0.1-unstable-2025-03-20

NGI project.

Co-authored-by: Acid Bong <acidbong@tilde.club>
Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../python-modules/xcaplib/default.nix        | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/xcaplib/default.nix

diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix
new file mode 100644
index 000000000000..d046f8500bd8
--- /dev/null
+++ b/pkgs/development/python-modules/xcaplib/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  lxml,
+  twisted,
+  python3-application,
+  unstableGitUpdater,
+}:
+
+buildPythonPackage rec {
+  pname = "xcaplib";
+  # latest commit is needed for python 3.13 compat.
+  version = "2.0.1-unstable-2025-03-20";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "AGProjects";
+    repo = "python3-xcaplib";
+    rev = "925846f2520d823f0b83279ceca6202808a4ca4f";
+    hash = "sha256-8EtXwHMQcPzPfP8JpB6gTV7PADHz+bJIJMhvR3DkPkk=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    lxml
+    twisted
+    python3-application
+  ];
+
+  # the one and only upstream test relies on networking
+  doCheck = false;
+
+  pythonImportsCheck = [ "xcaplib" ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "XCAP (RFC4825) client library";
+    homepage = "https://github.com/AGProjects/python3-xcaplib";
+    license = lib.licenses.lgpl21Plus;
+    teams = [ lib.teams.ngi ];
+    maintainers = [ lib.maintainers.ethancedwards8 ];
+    mainProgram = "xcapclient3";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c85cb1d2f56b..fa9482931839 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19768,6 +19768,8 @@ self: super: with self; {
 
   xboxapi = callPackage ../development/python-modules/xboxapi { };
 
+  xcaplib = callPackage ../development/python-modules/xcaplib { };
+
   xcffib = callPackage ../development/python-modules/xcffib { };
 
   xdg = callPackage ../development/python-modules/xdg { };

From 63dcaabc15023c52a519b86bd41a42d276cd28cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 27 Jul 2025 19:17:50 +0000
Subject: [PATCH 093/357] ocamlPackages.pure-html: 3.11.0 -> 3.11.1

---
 pkgs/development/ocaml-modules/dream-html/pure.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/dream-html/pure.nix b/pkgs/development/ocaml-modules/dream-html/pure.nix
index af5b2b6025c7..fd0f4573d7af 100644
--- a/pkgs/development/ocaml-modules/dream-html/pure.nix
+++ b/pkgs/development/ocaml-modules/dream-html/pure.nix
@@ -7,13 +7,13 @@
 
 buildDunePackage rec {
   pname = "pure-html";
-  version = "3.11.0";
+  version = "3.11.1";
 
   src = fetchFromGitHub {
     owner = "yawaramin";
     repo = "dream-html";
     tag = "v${version}";
-    hash = "sha256-YBzL9B1mDbomGr1kT6RW+wg4y0JH6IiIlJYVMRptFFg=";
+    hash = "sha256-L/q3nxUONPdZtzmfCfP8nnNCwQNSpeYI0hqowioGYNg=";
   };
 
   propagatedBuildInputs = [ uri ];

From 560547479b6126e63e52023d0f3cc9d7dea22429 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sun, 27 Jul 2025 22:57:33 +0300
Subject: [PATCH 094/357] koboldcpp: 1.96 -> 1.96.2

Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.96.2
Diff: https://github.com/LostRuins/koboldcpp/compare/v1.96...v1.96.2
---
 pkgs/by-name/ko/koboldcpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 773bc43ed13d..06e3363e98ff 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -41,13 +41,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.96";
+  version = "1.96.2";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/kHx2v9g0o5eh38d9hlhc724vQNTXVpaX1GeQouJPhk=";
+    hash = "sha256-OSAFJ2z6vSTTOovgcF/TZvug51uydmZmkjamN/xv2dc=";
   };
 
   enableParallelBuilding = true;

From f1e584bca043d2962cae468e968987c3ee3fb355 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sun, 27 Jul 2025 22:58:52 +0300
Subject: [PATCH 095/357] koboldcpp: remove `env.NIX_C{XX,}FLAGS_COMPILE`

---
 pkgs/by-name/ko/koboldcpp/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 06e3363e98ff..02111ec70a3f 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -89,12 +89,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     (lib.optionals cublasSupport "CUDA_DOCKER_ARCH=${builtins.head cudaArches}")
   ];
 
-  env = {
-    # Fixes an issue where "fprintf" is being called with a format string that isn't a string literal
-    NIX_CFLAGS_COMPILE = lib.optionalString vulkanSupport "-Wno-error=format-security";
-    NIX_CXXFLAGS_COMPILE = lib.optionalString vulkanSupport "-Wno-error=format-security";
-  };
-
   installPhase = ''
     runHook preInstall
 

From ebc5946d59bf11c988d27151be0c33bb9ed92bcf Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 27 Jul 2025 12:50:43 +0300
Subject: [PATCH 096/357] maintainers: drop omasanori

---
 maintainers/maintainer-list.nix    | 5 -----
 maintainers/team-list.nix          | 1 -
 pkgs/by-name/ia/iay/package.nix    | 1 -
 pkgs/by-name/km/kmscon/package.nix | 2 +-
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 39f8ece163fa..fc5430ef7375 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18837,11 +18837,6 @@
     githubId = 9091609;
     name = "Omar Jatoi";
   };
-  omasanori = {
-    github = "omasanori";
-    githubId = 167209;
-    name = "Masanori Ogino";
-  };
   omgbebebe = {
     email = "omgbebebe@gmail.com";
     github = "omgbebebe";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 8e1dac52dfd2..ea8d2eeb52e5 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -1144,7 +1144,6 @@ with lib.maintainers;
   sage = {
     members = [
       timokau
-      omasanori
       raskin
       collares
     ];
diff --git a/pkgs/by-name/ia/iay/package.nix b/pkgs/by-name/ia/iay/package.nix
index b0a03f3e89ae..8871896521b9 100644
--- a/pkgs/by-name/ia/iay/package.nix
+++ b/pkgs/by-name/ia/iay/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [
       aaqaishtyaq
-      omasanori
     ];
     mainProgram = "iay";
   };
diff --git a/pkgs/by-name/km/kmscon/package.nix b/pkgs/by-name/km/kmscon/package.nix
index b0d67da025c6..6a9d1eb43b8d 100644
--- a/pkgs/by-name/km/kmscon/package.nix
+++ b/pkgs/by-name/km/kmscon/package.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
     mainProgram = "kmscon";
     homepage = "https://www.freedesktop.org/wiki/Software/kmscon/";
     license = licenses.mit;
-    maintainers = with maintainers; [ omasanori ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }

From 8221e7f78fef1fba046e51696d8b5a69104156ea Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Sun, 27 Jul 2025 17:38:25 +0200
Subject: [PATCH 097/357] mcp-nixos: init at 1.0.0

---
 pkgs/by-name/mc/mcp-nixos/package.nix         | 63 +++++++++++++++++++
 .../mcp-nixos/tests-mock-nix-channels.patch   | 35 +++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 pkgs/by-name/mc/mcp-nixos/package.nix
 create mode 100644 pkgs/by-name/mc/mcp-nixos/tests-mock-nix-channels.patch

diff --git a/pkgs/by-name/mc/mcp-nixos/package.nix b/pkgs/by-name/mc/mcp-nixos/package.nix
new file mode 100644
index 000000000000..bc44ee41e5be
--- /dev/null
+++ b/pkgs/by-name/mc/mcp-nixos/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "mcp-nixos";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "utensils";
+    repo = "mcp-nixos";
+    tag = "v${version}";
+    hash = "sha256-NwP+zM1VGLOzIm+mLZVK9/9ImFwuiWhRJ9QK3hGpQsY=";
+  };
+
+  patches = [
+    # This patch mocks nix channel listing network calls in tests
+    ./tests-mock-nix-channels.patch
+  ];
+
+  build-system = [ python3Packages.hatchling ];
+
+  dependencies = with python3Packages; [
+    beautifulsoup4
+    mcp
+    requests
+  ];
+
+  nativeCheckInputs = with python3Packages; [
+    anthropic
+    pytestCheckHook
+    pytest-asyncio
+    python-dotenv
+  ];
+
+  disabledTestMarks = [
+    # Require network access
+    "integration"
+  ];
+
+  disabledTestPaths = [
+    # Require network access
+    "tests/test_nixhub_evals.py"
+    "tests/test_mcp_behavior_evals.py"
+    "tests/test_option_info_improvements.py"
+    # Requires configured channels
+    "tests/test_dynamic_channels.py"
+  ];
+
+  pythonImportsCheck = [ "mcp_nixos" ];
+
+  meta = {
+    description = "MCP server for NixOS";
+    homepage = "https://github.com/utensils/mcp-nixos";
+    changelog = "https://github.com/utensils/mcp-nixos/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.amadejkastelic ];
+    mainProgram = "mcp-nixos";
+  };
+}
diff --git a/pkgs/by-name/mc/mcp-nixos/tests-mock-nix-channels.patch b/pkgs/by-name/mc/mcp-nixos/tests-mock-nix-channels.patch
new file mode 100644
index 000000000000..b7fc92841ab8
--- /dev/null
+++ b/pkgs/by-name/mc/mcp-nixos/tests-mock-nix-channels.patch
@@ -0,0 +1,35 @@
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 0a11295..1172182 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -3,6 +3,30 @@
+ import pytest  # pylint: disable=unused-import
+ 
+ 
++@pytest.fixture(autouse=True)
++def mock_get_channels(monkeypatch):
++    """Mock get_channels function to return fixed channels for all tests."""
++    def mock_channels():
++        return {
++            "unstable": "latest-43-nixos-unstable",
++            "25.05": "latest-43-nixos-25.05",
++            "25.11": "latest-43-nixos-25.11",
++            "24.11": "latest-43-nixos-24.11",
++            "stable": "latest-43-nixos-25.05",
++            "beta": "latest-43-nixos-25.05"
++        }
++
++    # Patch the function in the server module
++    monkeypatch.setattr('mcp_nixos.server.get_channels', mock_channels)
++
++    # Also patch any imported references in test modules
++    monkeypatch.setattr('tests.test_channel_handling.get_channels', mock_channels)
++    monkeypatch.setattr('tests.test_dynamic_channels.get_channels', mock_channels, raising=False)
++    monkeypatch.setattr('tests.test_mcp_behavior_comprehensive.get_channels', mock_channels, raising=False)
++    monkeypatch.setattr('tests.test_real_world_scenarios.get_channels', mock_channels, raising=False)
++    monkeypatch.setattr('tests.test_server_comprehensive.get_channels', mock_channels, raising=False)
++
++
+ def pytest_addoption(parser):
+     """Add test filtering options."""
+     parser.addoption("--unit", action="store_true", help="Run unit tests only")

From a08b10181a4339358ac6fb706bc11feee8f6e76e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 07:00:22 +0000
Subject: [PATCH 098/357] go-task: 3.44.0 -> 3.44.1

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

diff --git a/pkgs/by-name/go/go-task/package.nix b/pkgs/by-name/go/go-task/package.nix
index b9da79f98aed..60b2e5ee857f 100644
--- a/pkgs/by-name/go/go-task/package.nix
+++ b/pkgs/by-name/go/go-task/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-task";
-  version = "3.44.0";
+  version = "3.44.1";
 
   src = fetchFromGitHub {
     owner = "go-task";
     repo = "task";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hZi1BSVv3Z+OzJyNvruyDbxYjTgfERnssWZaK0HGQmc=";
+    hash = "sha256-KqVGVC3jg6UihB8O6g7SpcE5pc11IQ0HcXSRD2E2Tfo=";
   };
 
-  vendorHash = "sha256-8OLWIAikKqmj3tXRO7Ro3VFItKDrhVh6n8pHbBM9Nrc=";
+  vendorHash = "sha256-IvuXL3FS/69NYxkZZHsnOl27DXpZnuOIkhivdMsG45Q=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From cae6502fceca96b5ad1a1898a0c8335920bc4516 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 28 Jul 2025 09:25:40 +0200
Subject: [PATCH 099/357] python313Packages.dnfile: 0.15.1 -> 0.16.4

Diff: https://github.com/malwarefrank/dnfile/compare/refs/tags/v0.15.1...refs/tags/v0.16.4

Changelog: https://github.com/malwarefrank/dnfile/blob/v0.16.4/HISTORY.rst
---
 pkgs/development/python-modules/dnfile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dnfile/default.nix b/pkgs/development/python-modules/dnfile/default.nix
index e4577f402dbf..4edf3e8ba16b 100644
--- a/pkgs/development/python-modules/dnfile/default.nix
+++ b/pkgs/development/python-modules/dnfile/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "dnfile";
-  version = "0.15.1";
+  version = "0.16.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "malwarefrank";
     repo = "dnfile";
     tag = "v${version}";
-    hash = "sha256-AdGXcdoBNWZ4f8NBP50Fp3in1FTVPFDifGhjeAfp46M=";
+    hash = "sha256-xizjWY+ByGDOI7HyzT5U4vqmPT2woU7z/3eV0KXDb8Y=";
     fetchSubmodules = true;
   };
 

From 750dab33d0e702e6a79e2d781c9537d53425b967 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 08:54:39 +0000
Subject: [PATCH 100/357] clementine: 1.4.1-45-g34eb666c0 ->
 1.4.1-48-g12e851937

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

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 55ccaffa5ae1..666777ce9f4a 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -49,13 +49,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clementine";
-  version = "1.4.1-45-g34eb666c0";
+  version = "1.4.1-48-g12e851937";
 
   src = fetchFromGitHub {
     owner = "clementine-player";
     repo = "Clementine";
     tag = finalAttrs.version;
-    hash = "sha256-5qZpQW8ZsyKpIww51sqghcrkhhh78TcpmMoctHgcoQo=";
+    hash = "sha256-L8ANz4lGXO7q9MyFJjhZr4cQpOkAl7NHbrzOm7lPVBs=";
   };
 
   nativeBuildInputs = [

From 78dce13c2b42632add5d4a5ed2fb0c052454e888 Mon Sep 17 00:00:00 2001
From: ppom <>
Date: Mon, 28 Jul 2025 12:00:00 +0200
Subject: [PATCH 101/357] reaction: 2.1.1 -> 2.1.2

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

diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix
index 89c94bde7872..d730ccc6d2b1 100644
--- a/pkgs/by-name/re/reaction/package.nix
+++ b/pkgs/by-name/re/reaction/package.nix
@@ -7,17 +7,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "reaction";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "ppom";
     repo = "reaction";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-F/vewPUqBXq5HsD2aWPEpvTlt4MAPmaGadZMR568HFQ=";
+    hash = "sha256-lcd0yY8o5eGa1bP5WsA9K/K7gtjRVorS/Rm0bno0AOY=";
   };
 
-  cargoHash = "sha256-YvTeZJqVMRr0Iw8jynWigQPs1Y+gMao4zQnNdQxhGlM=";
+  cargoHash = "sha256-ZRTgzVz8ia763cMBx9U1NIy9W6gDUVhwNr6wDqU1Ulo=";
 
   nativeBuildInputs = [
     installShellFiles

From 56c1e24d076604afa9ce7c3d1aaec2c791af6cd5 Mon Sep 17 00:00:00 2001
From: Glib Shpychka <23005347+gshpychka@users.noreply.github.com>
Date: Mon, 28 Jul 2025 15:23:52 +0300
Subject: [PATCH 102/357] usbguard: update option description

---
 nixos/modules/services/security/usbguard.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix
index 80780510e21c..ef06910b1497 100644
--- a/nixos/modules/services/security/usbguard.nix
+++ b/nixos/modules/services/security/usbguard.nix
@@ -50,11 +50,7 @@ in
     services.usbguard = {
       enable = lib.mkEnableOption "USBGuard daemon";
 
-      package = lib.mkPackageOption pkgs "usbguard" {
-        extraDescription = ''
-          If you do not need the Qt GUI, use `pkgs.usbguard-nox` to save disk space.
-        '';
-      };
+      package = lib.mkPackageOption pkgs "usbguard" { };
 
       ruleFile = lib.mkOption {
         type = lib.types.nullOr lib.types.path;

From c25ea6a439019671c6b70a1b2f1f72af1ea8c41f Mon Sep 17 00:00:00 2001
From: prtzl <matej.blagsic@protonmail.com>
Date: Sun, 27 Jul 2025 18:21:09 +0200
Subject: [PATCH 103/357] gcc-arm-embedded-14: 14.2.Rel1 -> 14.3.Rel1

---
 .../gc/gcc-arm-embedded-14/info-fix.patch     | 12 -------
 .../gc/gcc-arm-embedded-14/package.nix        | 35 +++----------------
 2 files changed, 4 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/by-name/gc/gcc-arm-embedded-14/info-fix.patch

diff --git a/pkgs/by-name/gc/gcc-arm-embedded-14/info-fix.patch b/pkgs/by-name/gc/gcc-arm-embedded-14/info-fix.patch
deleted file mode 100644
index 5304fcc73002..000000000000
--- a/pkgs/by-name/gc/gcc-arm-embedded-14/info-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/share/info/porting.info
-+++ b/share/info/porting.info
-@@ -16,9 +16,7 @@ a permission notice identical to this one.
- manual into another language, under the above conditions for modified
- versions.
- START-INFO-DIR-ENTRY
--START-INFO-DIR-ENTRY
- * Embed with GNU: (porting-).         Embed with GNU
--END-INFO-DIR-ENTRY
- END-INFO-DIR-ENTRY
- 
-    Copyright (C) 1993, 1994, 1995 Cygnus Support
diff --git a/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix
index 253705829c2e..c8c93ee3372c 100644
--- a/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix
+++ b/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix
@@ -6,19 +6,16 @@
   libxcrypt-legacy,
   xz,
   zstd,
-  makeBinaryWrapper,
-  darwin,
 }:
 
 stdenv.mkDerivation rec {
   pname = "gcc-arm-embedded";
-  version = "14.2.rel1";
+  version = "14.3.rel1";
 
   platform =
     {
       aarch64-darwin = "darwin-arm64";
       aarch64-linux = "aarch64";
-      x86_64-darwin = "darwin-x86_64";
       x86_64-linux = "x86_64";
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -28,25 +25,13 @@ stdenv.mkDerivation rec {
     # hashes obtained from location ${url}.sha256asc
     sha256 =
       {
-        aarch64-darwin = "c7c78ffab9bebfce91d99d3c24da6bf4b81c01e16cf551eb2ff9f25b9e0a3818";
-        aarch64-linux = "87330bab085dd8749d4ed0ad633674b9dc48b237b61069e3b481abd364d0a684";
-        x86_64-darwin = "2d9e717dd4f7751d18936ae1365d25916534105ebcb7583039eff1092b824505";
-        x86_64-linux = "62a63b981fe391a9cbad7ef51b17e49aeaa3e7b0d029b36ca1e9c3b2a9b78823";
+        aarch64-darwin = "30f4d08b219190a37cded6aa796f4549504902c53cfc3c7e044a8490b6eba1f7";
+        aarch64-linux = "2d465847eb1d05f876270494f51034de9ace9abe87a4222d079f3360240184d3";
+        x86_64-linux = "8f6903f8ceb084d9227b9ef991490413014d991874a1e34074443c2a72b14dbd";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
 
-  nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
-    makeBinaryWrapper
-    darwin.sigtool
-  ];
-
-  patches = [
-    # fix double entry in share/info/porting.info
-    # https://github.com/NixOS/nixpkgs/issues/363902
-    ./info-fix.patch
-  ];
-
   dontConfigure = true;
   dontBuild = true;
   dontPatchELF = true;
@@ -75,17 +60,6 @@ stdenv.mkDerivation rec {
           ]
         } "$f" || true
       done
-    ''
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
-      find "$out" -executable -type f | while read executable; do
-        ( \
-          install_name_tool \
-            -change "/usr/local/opt/zstd/lib/libzstd.1.dylib" "${lib.getLib zstd}/lib/libzstd.1.dylib" \
-            -change "/usr/local/opt/xz/lib/liblzma.5.dylib" "${lib.getLib xz}/lib/liblzma.5.dylib" \
-            "$executable" \
-          && codesign -f -s - "$executable" \
-        ) || true
-      done
     '';
 
   meta = with lib; {
@@ -106,7 +80,6 @@ stdenv.mkDerivation rec {
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
-      "x86_64-darwin"
       "aarch64-darwin"
     ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];

From 0c0a0e52ceea7e65955a4a26bd29a5c1487f1295 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 15:36:49 +0000
Subject: [PATCH 104/357] jmol: 16.3.27 -> 16.3.31

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

diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index 4d7ce8463485..423d4f1c676a 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -31,7 +31,7 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "16.3.27";
+  version = "16.3.31";
   pname = "jmol";
 
   src =
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     in
     fetchurl {
       url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
-      hash = "sha256-VRyMMkSwdXX80DudS+4uCZBnxypgmR/75PyK/vEJyrs=";
+      hash = "sha256-VrxF3edZHEyaTfeSbBg8Po7/DOqEdtaXhdLg6KEu9kc=";
     };
 
   patchPhase = ''

From 0a99451fb1bbd778bf9a9f83f83825bf273923f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 16:30:27 +0000
Subject: [PATCH 105/357] bluemap: 5.8 -> 5.10

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

diff --git a/pkgs/by-name/bl/bluemap/package.nix b/pkgs/by-name/bl/bluemap/package.nix
index bf58ad0b2e46..40ce46ad9c40 100644
--- a/pkgs/by-name/bl/bluemap/package.nix
+++ b/pkgs/by-name/bl/bluemap/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "bluemap";
-  version = "5.8";
+  version = "5.10";
 
   src = fetchurl {
     url = "https://github.com/BlueMap-Minecraft/BlueMap/releases/download/v${version}/BlueMap-${version}-cli.jar";
-    hash = "sha256-9sIs4+YMiGPmIuHABDUl/QWjyjKxLFd4kzwJ8PYwPsk=";
+    hash = "sha256-vz6ReXfgqWYnyFQNBgqaWLZ0sOJqHOmFcAnuwbbOmGA=";
   };
 
   dontUnpack = true;

From aeaaf47524d9eaf7bb524f6a534f057f83c4835e Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Wed, 23 Jul 2025 20:35:59 +0200
Subject: [PATCH 106/357] pnpm.fetchDeps: assert fetcherVersion to only allow
 supported values

Right now we only support versions 1 and 2. Anything other than these
values is effectively a no-op. Let's assert that `fetcherVersion` must
be supported by fetchDeps. This would also allow removal of versions in
the future.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/development/tools/pnpm/fetch-deps/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix
index 399683e25850..158112a69262 100644
--- a/pkgs/development/tools/pnpm/fetch-deps/default.nix
+++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix
@@ -12,6 +12,11 @@
 
 let
   pnpm' = pnpm;
+
+  supportedFetcherVersions = [
+    1 # First version. Here to preserve backwards compatibility
+    2 # Ensure consistent permissions. See https://github.com/NixOS/nixpkgs/pull/422975
+  ];
 in
 {
   fetchDeps = lib.makeOverridable (
@@ -50,6 +55,10 @@ in
       "pnpm.fetchDeps: `fetcherVersion` is not set, see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."
     ) true;
 
+    assert (lib.throwIf (!(builtins.elem fetcherVersion supportedFetcherVersions))
+      "pnpm.fetchDeps `fetcherVersion` is not set to a supported value (${lib.concatStringsSep ", " (builtins.map toString supportedFetcherVersions)}), see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."
+    ) true;
+
     stdenvNoCC.mkDerivation (
       finalAttrs:
       (

From c8bc0523103f6ce0d9f7ace8f40d56d24fee969e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Jul 2025 20:12:08 +0000
Subject: [PATCH 107/357] python3Packages.timezonefinder: 6.6.2 -> 7.0.1

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

diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix
index a844e96f36b9..90ee140bf0ca 100644
--- a/pkgs/development/python-modules/timezonefinder/default.nix
+++ b/pkgs/development/python-modules/timezonefinder/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "timezonefinder";
-  version = "6.6.2";
+  version = "7.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jannikmi";
     repo = "timezonefinder";
     tag = version;
-    hash = "sha256-5BScSnMYKPwVn4lO4qFeqPik1TAFu9AhOnmUADBW+3U=";
+    hash = "sha256-Pp4VHCaYH4yZh25Z8ETTpPW8YHeBro+st/5MM4XDwxk=";
   };
 
   build-system = [

From 8a26beb4be4c1b897ba6b794a0a8f1f82cdbe181 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 29 Jul 2025 02:11:35 +0200
Subject: [PATCH 108/357] psitransfer: use finalAttrs pattern

---
 pkgs/by-name/ps/psitransfer/package.nix | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix
index 63f57bd75ac8..8da34ca2375c 100644
--- a/pkgs/by-name/ps/psitransfer/package.nix
+++ b/pkgs/by-name/ps/psitransfer/package.nix
@@ -6,18 +6,22 @@
   vips,
 }:
 
-let
+buildNpmPackage (finalAttrs: {
   pname = "psitransfer";
   version = "2.2.0";
+
   src = fetchFromGitHub {
     owner = "psi-4ward";
     repo = "psitransfer";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-5o4QliAXgSZekIy0CNWfEuOxNl0uetL8C8RKUJ8HsNA=";
   };
+
+  npmDepsHash = "sha256-EW/Fej58LE/nbJomPtWvEjDveAUdo0jIWwC+ziN0gy0=";
+
   app = buildNpmPackage {
-    pname = "${pname}-app";
-    inherit version src;
+    pname = "psitransfer-app";
+    inherit (finalAttrs) version src;
 
     npmDepsHash = "sha256-q7E+osWIf6VZ3JvxCXoZYeF28aMgmKP6EzQkksUUjeY=";
 
@@ -31,11 +35,6 @@ let
       cp -r ../public/app $out
     '';
   };
-in
-buildNpmPackage {
-  inherit pname version src;
-
-  npmDepsHash = "sha256-EW/Fej58LE/nbJomPtWvEjDveAUdo0jIWwC+ziN0gy0=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
@@ -44,7 +43,7 @@ buildNpmPackage {
 
   postPatch = ''
     rm -r public/app
-    cp -r ${app} public/app
+    cp -r ${finalAttrs.app} public/app
   '';
 
   dontBuild = true;
@@ -56,4 +55,4 @@ buildNpmPackage {
     maintainers = with lib.maintainers; [ hyshka ];
     mainProgram = "psitransfer";
   };
-}
+})

From 8eee960161e54b3aa84384247f46e993881d7632 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 29 Jul 2025 02:16:02 +0200
Subject: [PATCH 109/357] psitransfer: use tag in fetchFromGitHub

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

diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix
index 8da34ca2375c..b8aa9b669c93 100644
--- a/pkgs/by-name/ps/psitransfer/package.nix
+++ b/pkgs/by-name/ps/psitransfer/package.nix
@@ -13,7 +13,7 @@ buildNpmPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "psi-4ward";
     repo = "psitransfer";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-5o4QliAXgSZekIy0CNWfEuOxNl0uetL8C8RKUJ8HsNA=";
   };
 

From c87822031ad4f559a816b2f8d301bea83b345b7b Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 29 Jul 2025 02:17:27 +0200
Subject: [PATCH 110/357] psitransfer: add meta.changelog

---
 pkgs/by-name/ps/psitransfer/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix
index b8aa9b669c93..3d2acae9149c 100644
--- a/pkgs/by-name/ps/psitransfer/package.nix
+++ b/pkgs/by-name/ps/psitransfer/package.nix
@@ -49,8 +49,9 @@ buildNpmPackage (finalAttrs: {
   dontBuild = true;
 
   meta = {
-    homepage = "https://github.com/psi-4ward/psitransfer";
     description = "Simple open source self-hosted file sharing solution";
+    homepage = "https://github.com/psi-4ward/psitransfer";
+    changelog = "https://github.com/psi-4ward/psitransfer/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ hyshka ];
     mainProgram = "psitransfer";

From 640d1f3005fcb34e762a5f675685efd8c87b9157 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 29 Jul 2025 02:18:35 +0200
Subject: [PATCH 111/357] psitransfer: add updateScript

---
 pkgs/by-name/ps/psitransfer/package.nix | 2 ++
 pkgs/by-name/ps/psitransfer/update.sh   | 8 ++++++++
 2 files changed, 10 insertions(+)
 create mode 100755 pkgs/by-name/ps/psitransfer/update.sh

diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix
index 3d2acae9149c..529d71891438 100644
--- a/pkgs/by-name/ps/psitransfer/package.nix
+++ b/pkgs/by-name/ps/psitransfer/package.nix
@@ -48,6 +48,8 @@ buildNpmPackage (finalAttrs: {
 
   dontBuild = true;
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "Simple open source self-hosted file sharing solution";
     homepage = "https://github.com/psi-4ward/psitransfer";
diff --git a/pkgs/by-name/ps/psitransfer/update.sh b/pkgs/by-name/ps/psitransfer/update.sh
new file mode 100755
index 000000000000..c4d410c717bf
--- /dev/null
+++ b/pkgs/by-name/ps/psitransfer/update.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix-update
+
+set -euo pipefail
+
+nix-update psitransfer --src-only --version-regex='^v(\d+\.\d+\.\d+)$'
+nix-update psitransfer.app --version=skip
+nix-update psitransfer --version=skip

From 61a2aa95f771d7b01ddc1c38a9910bdd5771845a Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 29 Jul 2025 00:22:31 +0000
Subject: [PATCH 112/357] psitransfer: 2.2.0 -> 2.3.0

Changelog: https://github.com/psi-4ward/psitransfer/releases/tag/v2.3.0
Diff: https://github.com/psi-4ward/psitransfer/compare/v2.2.0...v2.3.0
---
 pkgs/by-name/ps/psitransfer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix
index 529d71891438..64779298eaca 100644
--- a/pkgs/by-name/ps/psitransfer/package.nix
+++ b/pkgs/by-name/ps/psitransfer/package.nix
@@ -8,22 +8,22 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "psitransfer";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "psi-4ward";
     repo = "psitransfer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5o4QliAXgSZekIy0CNWfEuOxNl0uetL8C8RKUJ8HsNA=";
+    hash = "sha256-XUEvR8dWwFBbZdwVM8PQnYBc17SvGF5uO04vb/nAR2A=";
   };
 
-  npmDepsHash = "sha256-EW/Fej58LE/nbJomPtWvEjDveAUdo0jIWwC+ziN0gy0=";
+  npmDepsHash = "sha256-BZpd/fsuV77uj2bGZcqBpIuOq3YlUw2bxovOfu8b9iE=";
 
   app = buildNpmPackage {
     pname = "psitransfer-app";
     inherit (finalAttrs) version src;
 
-    npmDepsHash = "sha256-q7E+osWIf6VZ3JvxCXoZYeF28aMgmKP6EzQkksUUjeY=";
+    npmDepsHash = "sha256-zEGYv6TaHzgPCB3mHP2UMh8VkFqSBdrLuP5KjuEU0p8=";
 
     postPatch = ''
       # https://github.com/psi-4ward/psitransfer/pull/284

From 483fcf37e8165b68f5ef2d69099859dda712b18e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 00:30:31 +0000
Subject: [PATCH 113/357] ocamlPackages.jsont: 0.1.1 -> 0.2.0

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

diff --git a/pkgs/development/ocaml-modules/jsont/default.nix b/pkgs/development/ocaml-modules/jsont/default.nix
index 9703155b11f7..01913c23e458 100644
--- a/pkgs/development/ocaml-modules/jsont/default.nix
+++ b/pkgs/development/ocaml-modules/jsont/default.nix
@@ -9,13 +9,13 @@
 
 buildTopkgPackage rec {
   pname = "jsont";
-  version = "0.1.1";
+  version = "0.2.0";
 
   minimalOCamlVersion = "4.14.0";
 
   src = fetchzip {
     url = "https://erratique.ch/software/jsont/releases/jsont-${version}.tbz";
-    hash = "sha256-bLbTfRVz/Jzuy2LnQeTEHQGojfA34M+Xj7LODpBAVK4=";
+    hash = "sha256-dXHl+bLuIrlrQ5Np37+uVuETFBb3j8XeDVEK9izoQFk=";
   };
 
   # docs say these dependendencies are optional, but buildTopkgPackage doesn’t

From 9f7e584fc5547df2f5736c595d0272721a287d47 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 00:31:42 +0000
Subject: [PATCH 114/357] ocamlPackages.bytesrw: 0.1.0 -> 0.2.0

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

diff --git a/pkgs/development/ocaml-modules/bytesrw/default.nix b/pkgs/development/ocaml-modules/bytesrw/default.nix
index 4894c14df29f..7a6c555baf4a 100644
--- a/pkgs/development/ocaml-modules/bytesrw/default.nix
+++ b/pkgs/development/ocaml-modules/bytesrw/default.nix
@@ -11,13 +11,13 @@
 
 buildTopkgPackage rec {
   pname = "bytesrw";
-  version = "0.1.0";
+  version = "0.2.0";
 
   minimalOCamlVersion = "4.14.0";
 
   src = fetchzip {
     url = "https://erratique.ch/software/bytesrw/releases/bytesrw-${version}.tbz";
-    hash = "sha256-leH3uo5Q8ba22A/Mbl9pio0tW/IxCTGp77Cra7l4D80=";
+    hash = "sha256-DMQXclJV5uz/2a6XVHVnBkYgXpGRI83uzmzeed3fDxQ=";
   };
 
   # docs say these are optional, but buildTopkgPackage doesn’t handle missing

From 2fdbb72b8a7838ee097bf0b0979340127593145a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 00:37:54 +0000
Subject: [PATCH 115/357] ocamlPackages.brr: 0.0.7 -> 0.0.8

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

diff --git a/pkgs/development/ocaml-modules/brr/default.nix b/pkgs/development/ocaml-modules/brr/default.nix
index 79dc048be4f4..12a8a1635fd9 100644
--- a/pkgs/development/ocaml-modules/brr/default.nix
+++ b/pkgs/development/ocaml-modules/brr/default.nix
@@ -12,10 +12,10 @@
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-brr";
-  version = "0.0.7";
+  version = "0.0.8";
   src = fetchurl {
     url = "https://erratique.ch/software/brr/releases/brr-${version}.tbz";
-    hash = "sha256-rcWuW6avI/RJZNAlxKOsPSEtDQZ1hb51oKpSk3iG7oY=";
+    hash = "sha256-g4ROHy9rHlaEFi5+euyRuEKK5HwKJWPmFkdvFhdIYgg=";
   };
   buildInputs = [
     ocaml

From 4fcfcfd1428690dd80e768034f4a78ddec21516b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 00:38:01 +0000
Subject: [PATCH 116/357] ocamlPackages.fmt: 0.10.0 -> 0.11.0

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

diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix
index b46f9acd8800..d33e709f731a 100644
--- a/pkgs/development/ocaml-modules/fmt/default.nix
+++ b/pkgs/development/ocaml-modules/fmt/default.nix
@@ -14,12 +14,12 @@ if lib.versionOlder ocaml.version "4.08" then
 else
 
   stdenv.mkDerivation rec {
-    version = "0.10.0";
+    version = "0.11.0";
     pname = "ocaml${ocaml.version}-fmt";
 
     src = fetchurl {
       url = "https://erratique.ch/software/fmt/releases/fmt-${version}.tbz";
-      sha256 = "sha256-eDgec+FW2F85LzfkKFqsmYd3MWWZsBIXMhlXT3xdKZc=";
+      sha256 = "sha256-hXz9R6VLUkKc2bPiZl5EFzzRvTtDW+znFy+YStU3ahs=";
     };
 
     nativeBuildInputs = [

From 59314d382d19788f20a510062795edb2add1c437 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 03:36:56 +0000
Subject: [PATCH 117/357] nuclei-templates: 10.2.5 -> 10.2.6

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

diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix
index 179385cb77fe..13c6cdd72f8f 100644
--- a/pkgs/by-name/nu/nuclei-templates/package.nix
+++ b/pkgs/by-name/nu/nuclei-templates/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nuclei-templates";
-  version = "10.2.5";
+  version = "10.2.6";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     tag = "v${version}";
-    hash = "sha256-fJykVJHfuSmnSuR/Sxup8pr+KKwqQoYqLeNLoXMau4E=";
+    hash = "sha256-76PtEYXvZxKEBky0fqdWmjWxrKHfYLBWe+3nqqXUNOw=";
   };
 
   installPhase = ''

From 260a1c31f96c793f7b4d3263b261ca70e72d6265 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 08:59:10 +0000
Subject: [PATCH 118/357] python3Packages.roadrecon: 1.6.2 -> 1.7.0

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

diff --git a/pkgs/development/python-modules/roadrecon/default.nix b/pkgs/development/python-modules/roadrecon/default.nix
index 748a0fabd13d..3eb00bdd7ec2 100644
--- a/pkgs/development/python-modules/roadrecon/default.nix
+++ b/pkgs/development/python-modules/roadrecon/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "roadrecon";
-  version = "1.6.2";
+  version = "1.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AbZnYM02s8DXTLzakuyb3WSh6UvUSxanMYkfdJATK7M=";
+    hash = "sha256-JJJPQcgZOdqyAXYgLmCQuNBhSGwg8WIDW8+2jfVyvyc=";
   };
 
   pythonRelaxDeps = [ "flask" ];

From bcb1cebf0f40478126d19ef5788bfa8fd401701c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 16:01:15 +0000
Subject: [PATCH 119/357] ocamlPackages.qcheck-multicoretests-util: 0.8 -> 0.9

---
 pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
index 1e5201206a35..c80b7484d0c2 100644
--- a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
+++ b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
@@ -7,13 +7,13 @@
 
 buildDunePackage rec {
   pname = "qcheck-multicoretests-util";
-  version = "0.8";
+  version = "0.9";
 
   src = fetchFromGitHub {
     owner = "ocaml-multicore";
     repo = "multicoretests";
     rev = version;
-    hash = "sha256-4aAukkhyxJ4EojLF+rrxSRRz4isUelcVEYNP2UYR7WY=";
+    hash = "sha256-ekHit4MaDb6lUZzGGZ1bm7brUlUgpfIBSpsOvDSxNhw=";
   };
 
   propagatedBuildInputs = [ qcheck-core ];

From 9d712bafa1870c3221d01fea5fc2c6be2f1609ec Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Mon, 23 Jun 2025 12:54:10 -0400
Subject: [PATCH 120/357] isle-portable: init at 0-unstable-2025-07-25

---
 pkgs/by-name/is/isle-portable/package.nix | 105 ++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 pkgs/by-name/is/isle-portable/package.nix

diff --git a/pkgs/by-name/is/isle-portable/package.nix b/pkgs/by-name/is/isle-portable/package.nix
new file mode 100644
index 000000000000..51ae8c09c832
--- /dev/null
+++ b/pkgs/by-name/is/isle-portable/package.nix
@@ -0,0 +1,105 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenv,
+  unstableGitUpdater,
+
+  # Native Build Inputs
+  cmake,
+  python3,
+  pkg-config,
+
+  # Build Inputs
+  xorg,
+  wayland,
+  libxkbcommon,
+  wayland-protocols,
+  glew,
+  qt6,
+  mesa,
+  alsa-lib,
+  sdl3,
+  iniparser,
+
+  # Options
+  imguiDebug ? false,
+  addrSan ? false,
+  emscriptenHost ? "",
+}:
+stdenv.mkDerivation (finalAttrs: {
+  strictDeps = true;
+  name = "isle-portable";
+  version = "0-unstable-2025-07-25";
+
+  src = fetchFromGitHub {
+    owner = "isledecomp";
+    repo = "isle-portable";
+    rev = "89f2f5cefee1a107330bbf93048f7da73f5754f7";
+    hash = "sha256-h+IkzDSZjt8Kcjb5RMOjCCJh9a0gkMBAYXzIYMv6mZM=";
+    fetchSubmodules = true;
+  };
+
+  postPatch = lib.optionalString stdenv.isDarwin ''
+    substituteInPlace packaging/macos/CMakeLists.txt \
+      --replace-fail "fixup_bundle" "#fixup_bundle"
+  '';
+
+  outputs = [
+    "out"
+    "lib"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    qt6.wrapQtAppsHook
+    python3
+    pkg-config
+  ];
+
+  buildInputs = [
+    qt6.qtbase
+    sdl3
+    iniparser
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    xorg.libX11
+    xorg.libXext
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXinerama
+    xorg.libXcursor
+    wayland
+    libxkbcommon
+    wayland-protocols
+    glew
+    mesa
+    alsa-lib
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "DOWNLOAD_DEPENDENCIES" false)
+    (lib.cmakeBool "ISLE_DEBUG" imguiDebug)
+    (lib.cmakeFeature "ISLE_EMSCRIPTEN_HOST" emscriptenHost)
+  ];
+
+  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
+
+  meta = {
+    description = "Portable decompilation of Lego Island";
+    homepage = "https://github.com/isledecomp/isle-portable";
+    license = with lib.licenses; [
+      # The original code for the portable project
+      lgpl3Plus
+      # The decompilation code
+      mit
+      unfree
+    ];
+    platforms = with lib.platforms; windows ++ linux ++ darwin;
+    mainProgram = "isle";
+    maintainers = with lib.maintainers; [
+      RossSmyth
+    ];
+  };
+})

From 47bff47c4ee2a65eb0fe64525dcd371219c693d1 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 29 Jul 2025 15:04:02 -0600
Subject: [PATCH 121/357] freefilesync: 14.3 -> 14.4

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

diff --git a/pkgs/by-name/fr/freefilesync/package.nix b/pkgs/by-name/fr/freefilesync/package.nix
index cae6b454a237..c71d6aae4146 100644
--- a/pkgs/by-name/fr/freefilesync/package.nix
+++ b/pkgs/by-name/fr/freefilesync/package.nix
@@ -42,7 +42,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "freefilesync";
-  version = "14.3";
+  version = "14.4";
 
   src = fetchurl {
     url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
       rm -f $out
       tryDownload "$url"
     '';
-    hash = "sha256-F8oIoG+SaHwhT7aA+iYp9/eWyGf6CiDIGm6Y2px0wlI=";
+    hash = "sha256-Jx/Q/RsCTy06kJfJeatqrEoTMz7wLZvPQ3bzFClvKWc=";
   };
 
   sourceRoot = ".";
@@ -73,12 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  # https://freefilesync.org/forum/viewtopic.php?t=12163
-  postPatch = ''
-    substituteInPlace zen/socket.h zen/sys_error.h \
-      --replace-fail "#undef G_GNUC_UNUSED" ""
-  '';
-
   nativeBuildInputs = [
     copyDesktopItems
     pkg-config

From 6004fc370e4380ce9982d35d0d52b0588683abc2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 21:50:31 +0000
Subject: [PATCH 122/357] airwindows: 0-unstable-2025-07-19 ->
 0-unstable-2025-07-27

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

diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix
index 87bbb32856cf..f0c14298cdfa 100644
--- a/pkgs/by-name/ai/airwindows/package.nix
+++ b/pkgs/by-name/ai/airwindows/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation {
   pname = "airwindows";
-  version = "0-unstable-2025-07-19";
+  version = "0-unstable-2025-07-27";
 
   src = fetchFromGitHub {
     owner = "airwindows";
     repo = "airwindows";
-    rev = "6761d77156cc93073ac578613f5c245676189948";
-    hash = "sha256-67+docPO0alsPEp3BApW9rOlXAQOa0wHdvZ5gykpNYo=";
+    rev = "52565448b14ea481682b4c67cd6f4732fb6bc644";
+    hash = "sha256-VJhxe7hKjECUsyNfX32yGdEX4hkGD3CaO+QnNnXGBhc=";
   };
 
   # we patch helpers because honestly im spooked out by where those variables

From 598d1fd5003537c5f87840b5edbb2335bcb267c5 Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Sun, 27 Jul 2025 01:28:30 +0800
Subject: [PATCH 123/357] virtualbox: fix 3D acceleration

---
 .../virtualization/virtualbox/default.nix          | 14 ++++++++++----
 .../virtualbox/fix-graphics-driver-loading.patch   | 13 +++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/virtualization/virtualbox/fix-graphics-driver-loading.patch

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 24cd144288f5..94cbc1aa4e34 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -49,7 +49,6 @@
   open-watcom-bin,
   makeself,
   perl,
-  vulkan-loader,
   javaBindings ? true,
   jdk, # Almost doesn't affect closure size
   pythonBindings ? false,
@@ -163,11 +162,11 @@ stdenv.mkDerivation (finalAttrs: {
     libtpms
     python3
     xz
+    libGL
   ]
   ++ optional javaBindings jdk
   ++ optional pythonBindings python3 # Python is needed even when not building bindings
   ++ optional pulseSupport libpulseaudio
-  ++ optionals headless [ libGL ]
   ++ optionals (!headless) [
     qtbase
     qttools
@@ -213,6 +212,13 @@ stdenv.mkDerivation (finalAttrs: {
     grep 'libasound\.so\.2'     src include -rI --files-with-match | xargs sed -i -e '
       s@"libasound\.so\.2"@"${alsa-lib.out}/lib/libasound.so.2"@g'
 
+    substituteInPlace src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.cpp \
+      --replace-fail \"libGL.so.1\" \"${libGL.out}/lib/libGL.so.1\"
+
+    # this works in conjunction with fix-graphics-driver-loading.patch
+    substituteInPlace src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp \
+      --replace-fail \"VBoxDxVk\" \"$out/libexec/virtualbox/VBoxDxVk.so\"
+
     export USER=nix
     set +x
   '';
@@ -260,6 +266,7 @@ stdenv.mkDerivation (finalAttrs: {
       ./qt-dependency-paths.patch
       # https://github.com/NixOS/nixpkgs/issues/123851
       ./fix-audio-driver-loading.patch
+      ./fix-graphics-driver-loading.patch
     ];
 
   postPatch = ''
@@ -394,8 +401,7 @@ stdenv.mkDerivation (finalAttrs: {
     # If hardening is disabled, wrap the VirtualBoxVM binary instead of patching
     # the source code (see postPatch).
     + optionalString (!headless && !enableHardening) ''
-      wrapQtApp $out/libexec/virtualbox/VirtualBoxVM \
-         --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ vulkan-loader ]}"
+      wrapQtApp $out/libexec/virtualbox/VirtualBoxVM
     '';
 
   passthru = {
diff --git a/pkgs/applications/virtualization/virtualbox/fix-graphics-driver-loading.patch b/pkgs/applications/virtualization/virtualbox/fix-graphics-driver-loading.patch
new file mode 100644
index 000000000000..c11dfbf293cd
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/fix-graphics-driver-loading.patch
@@ -0,0 +1,13 @@
+diff --git a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp
+index 1a43382..c376d6e 100644
+--- a/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp
++++ b/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-dx11.cpp
+@@ -3376,7 +3376,7 @@ static DECLCALLBACK(int) vmsvga3dBackInit(PPDMDEVINS pDevIns, PVGASTATE pThis, P
+     AssertReturn(pBackend, VERR_NO_MEMORY);
+     pThisCC->svga.p3dState->pBackend = pBackend;
+ 
+-    rc = RTLdrLoadSystem(VBOX_D3D11_LIBRARY_NAME, /* fNoUnload = */ true, &pBackend->hD3D11);
++    rc = RTLdrLoad(VBOX_D3D11_LIBRARY_NAME, &pBackend->hD3D11);
+     AssertRC(rc);
+     if (RT_SUCCESS(rc))
+     {

From 069ad13822ac1a8454446673b3c7634cb2e39fea Mon Sep 17 00:00:00 2001
From: Cobalt <cobalt@cobalt.rocks>
Date: Wed, 30 Jul 2025 03:07:28 +0200
Subject: [PATCH 124/357] nixos/outline: add support for S3 Transfer
 Acceleration

An optional extension for anyone using the transfer acceleration, either
on S3 or as a workaround for non-public S3 services.
---
 nixos/modules/services/web-apps/outline.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/modules/services/web-apps/outline.nix b/nixos/modules/services/web-apps/outline.nix
index 642f806b9763..ac7e69dddf95 100644
--- a/nixos/modules/services/web-apps/outline.nix
+++ b/nixos/modules/services/web-apps/outline.nix
@@ -166,6 +166,13 @@ in
             type = lib.types.str;
             description = "S3 access key.";
           };
+          accelerateUrl = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+            description = ''
+              URL for AWS S3 [transfer acceleration](https://docs.aws.amazon.com/AmazonS3/latest/userguide/transfer-acceleration.html).
+            '';
+          };
           secretKeyFile = lib.mkOption {
             type = lib.types.path;
             description = "File path that contains the S3 secret key.";
@@ -682,6 +689,10 @@ in
             AWS_S3_ACL = cfg.storage.acl;
           })
 
+          (lib.mkIf (cfg.storage.storageType == "s3" && cfg.storage.accelerateUrl != null) {
+            AWS_S3_ACCELERATE_URL = cfg.storage.accelerateUrl;
+          })
+
           (lib.mkIf (cfg.slackAuthentication != null) {
             SLACK_CLIENT_ID = cfg.slackAuthentication.clientId;
           })

From e583257f1682721d05780bd10fdc3f4baf736516 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 30 Jul 2025 17:59:51 +0200
Subject: [PATCH 125/357] asterisk: 18.26.1 -> 18.26.2, 20.11.1 -> 20.15.0,
 22.1.1 -> 22.5.0

---
 pkgs/servers/asterisk/versions.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json
index 367ba20f8fc7..3b8142f6e35d 100644
--- a/pkgs/servers/asterisk/versions.json
+++ b/pkgs/servers/asterisk/versions.json
@@ -1,18 +1,18 @@
 {
   "asterisk_18": {
-    "sha256": "5df5d1c3885428b8bf03e78d7b8c3079d4512679137ef1d47e865dc2058aa825",
-    "version": "18.26.1"
+    "sha256": "745689c84d63ae94dfa0b3d4bdde3c6907b72472018532f757d9c0d169705964",
+    "version": "18.26.2"
   },
   "asterisk_20": {
-    "sha256": "5ad25c136c7772f0ad10ae02d59f19b32c0cf64027278e3de6a6314ee24d5ff9",
-    "version": "20.11.1"
+    "sha256": "7c45cf254c7442748fa14ba4e31ae8f09cd2ad958168577de091c0bf0b0a2d2e",
+    "version": "20.15.0"
   },
   "asterisk_21": {
-    "sha256": "8df00a37b448fdaf63ffe25be0df02112211c1617efcb00b21cdb58f1baed89d",
-    "version": "21.6.1"
+    "sha256": "16051efbcc6fb95c0408f0ecc9dcf2d78a9346323f5d1fcd9723faedcb0f3fd8",
+    "version": "21.10.0"
   },
   "asterisk_22": {
-    "sha256": "e697740d91c33bf02d506d4da04635da48bfb0b5bb79bf8863c1a9b8f791264f",
-    "version": "22.1.1"
+    "sha256": "944967288ec01587feeef42869a97baa37ab635bea7d539df16f70d3af48c613",
+    "version": "22.5.0"
   }
 }

From 5a751204bc37373fd31f00f9077be2636220ad4a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 30 Jul 2025 18:01:21 +0200
Subject: [PATCH 126/357] asterisk: fix regex escapes in update script

---
 pkgs/servers/asterisk/update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/asterisk/update.py b/pkgs/servers/asterisk/update.py
index 1e5029416938..8a127be3952e 100755
--- a/pkgs/servers/asterisk/update.py
+++ b/pkgs/servers/asterisk/update.py
@@ -10,7 +10,7 @@ from pathlib import Path
 URL = "https://downloads.asterisk.org/pub/telephony/asterisk/"
 
 page = requests.get(URL)
-changelog = re.compile("^ChangeLog-\d+\.\d+\.\d+\.md$")
+changelog = re.compile(r"^ChangeLog-\d+\.\d+\.\d+\.md$")
 changelogs = [a.get_text() for a in BeautifulSoup(page.text, 'html.parser').find_all('a') if changelog.match(a.get_text())]
 major_versions = {}
 for changelog in changelogs:

From 1b2c6b9f402a8464098afdb5bfc84c7d15c7de57 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 30 Jul 2025 18:08:27 +0200
Subject: [PATCH 127/357] asterisk: update dependencies

---
 pkgs/servers/asterisk/default.nix | 32 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index da2845f8ea80..1f4854c0b9c3 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -147,7 +147,7 @@ let
       postInstall = ''
         # Install sample configuration files for this version of Asterisk
         make samples
-        ${lib.optionalString (lib.versionAtLeast version "17.0.0") "make install-headers"}
+        make install-headers
       '';
 
       meta = with lib; {
@@ -163,19 +163,20 @@ let
       };
     };
 
-  pjproject_2_14_1 =
-    fetchurl {
-      url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.14.1/pjproject-2.14.1.tar.bz2";
-      hash = "sha256-MtsK8bOc0fT/H/pUydqK/ahMIVg8yiRDt3TSM1uhUFQ=";
-    }
-    // {
-      pjsip_patches = [ ];
-    };
+  pjproject_2_14_1 = fetchurl {
+    url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.14.1/pjproject-2.14.1.tar.bz2";
+    hash = "sha256-MtsK8bOc0fT/H/pUydqK/ahMIVg8yiRDt3TSM1uhUFQ=";
+  };
 
-  mp3-202 = fetchsvn {
+  pjproject_2_15_1 = fetchurl {
+    url = "https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.15.1/pjproject-2.15.1.tar.bz2";
+    hash = "sha256-WLuDzsTUMfSNAG5FXYIWaEUPjPa2yV8JDe9HBi+jpgw=";
+  };
+
+  mp3-204 = fetchsvn {
     url = "http://svn.digium.com/svn/thirdparty/mp3/trunk";
-    rev = "202";
-    sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy";
+    rev = "204";
+    hash = "sha256-Viec0LwFPfR7ewy+2hc/LIUR1LiDZfYos3RUbc+tyNk=";
   };
 
   asterisk-opus = fetchFromGitHub {
@@ -183,7 +184,7 @@ let
     repo = "asterisk-opus";
     # No releases, points to master as of 2022-04-06
     rev = "a959f072d3f364be983dd27e6e250b038aaef747";
-    sha256 = "sha256-CASlTvTahOg9D5jccF/IN10LP/U8rRy9BFCSaHGQfCw=";
+    hash = "sha256-CASlTvTahOg9D5jccF/IN10LP/U8rRy9BFCSaHGQfCw=";
   };
 
   # auto-generated by update.py
@@ -191,14 +192,13 @@ let
     _:
     { version, sha256 }:
     let
-      pjsip = pjproject_2_14_1;
+      pjsip = if lib.versionAtLeast version "20" then pjproject_2_15_1 else pjproject_2_14_1;
     in
     common {
       inherit version sha256;
-      inherit (pjsip) pjsip_patches;
       externals = {
         "externals_cache/${pjsip.name}" = pjsip;
-        "addons/mp3" = mp3-202;
+        "addons/mp3" = mp3-204;
       };
     }
   ) (lib.importJSON ./versions.json);

From 055527e4b0a91453fb7b3b0c3eb2ca0edc47657b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 30 Jul 2025 18:34:03 +0200
Subject: [PATCH 128/357] asterisk: expose version 22

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf6b29737dbb..9e99bbfcff22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10138,6 +10138,7 @@ with pkgs;
     asterisk-lts
     asterisk_18
     asterisk_20
+    asterisk_22
     ;
 
   asterisk-ldap = lowPrio (asterisk.override { ldapSupport = true; });

From be6b520cbb852461b8491f3a3bff8b98d8c7e59e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Jul 2025 05:33:38 +0000
Subject: [PATCH 129/357] ocamlPackages.ocp-index: 1.3.7 -> 1.4.0

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

diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix
index 1fa391f607f8..a8a540f718b9 100644
--- a/pkgs/development/tools/ocaml/ocp-index/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-index/default.nix
@@ -10,7 +10,7 @@
 
 buildDunePackage rec {
   pname = "ocp-index";
-  version = "1.3.7";
+  version = "1.4.0";
 
   minimalOCamlVersion = "4.08";
 
@@ -18,7 +18,7 @@ buildDunePackage rec {
     owner = "OCamlPro";
     repo = "ocp-index";
     rev = version;
-    hash = "sha256-FbkVJRbFNSho/E59QMUoGK+TrdnnacmykJWWG2JVDVA=";
+    hash = "sha256-pv6aBJjRkibISpZEnlfyn72smcYEbZoPQoQH2p/JwH0=";
   };
 
   nativeBuildInputs = [ cppo ];

From 980c775a884b06355161d2fcde89d5ab66a6b942 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Jul 2025 08:42:06 +0000
Subject: [PATCH 130/357] xan: 0.51.0 -> 0.52.0

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

diff --git a/pkgs/by-name/xa/xan/package.nix b/pkgs/by-name/xa/xan/package.nix
index 150f87b4e975..c8d54d8fd162 100644
--- a/pkgs/by-name/xa/xan/package.nix
+++ b/pkgs/by-name/xa/xan/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "xan";
-  version = "0.51.0";
+  version = "0.52.0";
 
   src = fetchFromGitHub {
     owner = "medialab";
     repo = "xan";
     tag = version;
-    hash = "sha256-wfA8yyIFzwYkd/nuSOFv6Z7aDhBZiYzs2E/Pxouqicw=";
+    hash = "sha256-Enjtp/35rhSsndLFaQw8sGsO43mOes3Se8ElbdcSv0E=";
   };
 
-  cargoHash = "sha256-8FJTiZuLRvHdDAYf3M0tWfT7BtCVuBlnIzmUMgBo8aA=";
+  cargoHash = "sha256-m3aiX34W6GHgnT6kkb1CsLXyVH5FnxSOh5etCCJJsAs=";
 
   # FIXME: tests fail and I do not have the time to investigate. Temporarily disable
   # tests so that we can manually run and test the package for packaging purposes.

From deeba19b337d2b880c999b9b28a7533c15914f40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Jul 2025 10:55:48 +0000
Subject: [PATCH 131/357] bazel-watcher: 0.26.3 -> 0.26.8

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

diff --git a/pkgs/by-name/ba/bazel-watcher/package.nix b/pkgs/by-name/ba/bazel-watcher/package.nix
index 361c213c4e31..d3bf003c1db9 100644
--- a/pkgs/by-name/ba/bazel-watcher/package.nix
+++ b/pkgs/by-name/ba/bazel-watcher/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "bazel-watcher";
-  version = "0.26.3";
+  version = "0.26.8";
 
   src = fetchFromGitHub {
     owner = "bazelbuild";
     repo = "bazel-watcher";
     rev = "v${version}";
-    hash = "sha256-Hefg6PZfmuGUCEuYNwpJOkwPqt87qd1GpEG+IutPhDo=";
+    hash = "sha256-lAIIu6DWFQOwY6KFDaNVZg/H1pn2/eFmoqjtSGqBhMk=";
   };
 
-  vendorHash = "sha256-H1Bqw5hbOLS4oJeQOdIXQ9c2H8jGtoW1J75BIkTNR9k=";
+  vendorHash = "sha256-wbQY493O2d/fa46/qvCzBpv9OY1YPQjTEqHtT0A9EV0=";
 
   # The dependency github.com/fsnotify/fsevents requires CGO
   env.CGO_ENABLED = if stdenv.hostPlatform.isDarwin then "1" else "0";

From d53e733896200efeead319f1749389885751a3b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 31 Jul 2025 14:42:37 +0200
Subject: [PATCH 132/357] apkg: 0.5.0 -> 0.6.1

https://gitlab.nic.cz/packaging/apkg/-/blob/v0.6.1/docs/news.md
---
 pkgs/by-name/ap/apkg/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ap/apkg/package.nix b/pkgs/by-name/ap/apkg/package.nix
index 6eadbd4a401a..c1a182bd2746 100644
--- a/pkgs/by-name/ap/apkg/package.nix
+++ b/pkgs/by-name/ap/apkg/package.nix
@@ -10,7 +10,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "apkg";
-  version = "0.5.0";
+  version = "0.6.1";
   format = "pyproject";
 
   src = fetchFromGitLab {
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
     owner = "packaging";
     repo = "apkg";
     tag = "v${version}";
-    hash = "sha256-VQNUzbWIDo/cbCdtx8JxN5UUMBW3mQ2B42In4b3AA+A=";
+    hash = "sha256-rFcHgNaZBTKO0tU7O8fz2eOD731sLHWxhh0x5mMo9uw=";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -35,7 +35,9 @@ python3Packages.buildPythonApplication rec {
     toml # config files
   ];
 
-  nativeBuildInputs = with python3Packages; [ hatchling ];
+  nativeBuildInputs = with python3Packages; [
+    setuptools # required for build
+  ];
 
   makeWrapperArgs = [
     # deps for `srcpkg` operation for other distros; could be optional
@@ -52,7 +54,6 @@ python3Packages.buildPythonApplication rec {
 
   nativeCheckInputs = with python3Packages; [
     pytest
-    dunamai
   ];
   checkPhase = ''
     runHook preCheck

From 3e08ae0ca4f907717a9cfa6446193bf0c88bf546 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@redhat.com>
Date: Mon, 28 Jul 2025 16:03:37 +0200
Subject: [PATCH 133/357] conmon-rs: 0.6.6 -> 0.7.1

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
---
 pkgs/by-name/co/conmon-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/conmon-rs/package.nix b/pkgs/by-name/co/conmon-rs/package.nix
index 3f7cbe960220..a2afd871e51b 100644
--- a/pkgs/by-name/co/conmon-rs/package.nix
+++ b/pkgs/by-name/co/conmon-rs/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "conmon-rs";
-  version = "0.6.6";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "conmon-rs";
     rev = "v${version}";
-    hash = "sha256-1kGAUAmiPI9zE8LE7G2r0Gy0YM+BUy2MxY7IQOu2ZDQ=";
+    hash = "sha256-NydA6IiIGX2Pc/49bstEGeA/X+zRIVNGbxhDfPwrWgM=";
   };
 
   nativeBuildInputs = [
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   ];
   doCheck = false;
 
-  cargoVendorDir = ".cargo-vendor";
+  cargoHash = "sha256-qP4AIPST1s6fiGq6FM2aXpEfkm4G/cOSYJyhtqF2k1E=";
 
   meta = with lib; {
     description = "OCI container runtime monitor written in Rust";

From 0e190f8bbde7206a5156b44c77be3021571bc72f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Sun, 27 Jul 2025 19:34:12 +0200
Subject: [PATCH 134/357] tk-safe: init at 25.8.1

---
 pkgs/by-name/tk/tk-safe/package.nix | 103 ++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 pkgs/by-name/tk/tk-safe/package.nix

diff --git a/pkgs/by-name/tk/tk-safe/package.nix b/pkgs/by-name/tk/tk-safe/package.nix
new file mode 100644
index 000000000000..155077cfe0d1
--- /dev/null
+++ b/pkgs/by-name/tk/tk-safe/package.nix
@@ -0,0 +1,103 @@
+{
+  stdenv,
+  lib,
+  fetchurl,
+  squashfsTools,
+  autoPatchelfHook,
+  copyDesktopItems,
+  alsa-lib,
+  nss,
+  libdrm,
+  libgbm,
+  libGL,
+  libxkbcommon,
+  pcsclite,
+  makeDesktopItem,
+  makeWrapper,
+  wrapGAppsHook3,
+  udev,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tk-safe";
+  version = "25.8.1";
+
+  # To update, check https://search.apps.ubuntu.com/api/v1/package/tk-safe and copy the anon_download_url and version.
+  src = fetchurl {
+    url = "https://api.snapcraft.io/api/v1/snaps/download/rLNeIGEaag0TKFQLO0TxF3ARXg3rcTNx_18.snap";
+    hash = "sha256-OrDbxLcmbL/yTANCMHcJsdGE+LK8rondGQvj+YBqS0E=";
+  };
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "tk-safe";
+      icon = "tk-safe";
+      exec = "tk-safe";
+      desktopName = "TK-Safe";
+      comment = meta.description;
+      genericName = "Eletronic medical record (ePA)";
+      categories = [ "Utility" ];
+    })
+  ];
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    copyDesktopItems
+    makeWrapper
+    squashfsTools
+    wrapGAppsHook3
+  ];
+
+  unpackPhase = ''
+    runHook preUnpack
+
+    unsquashfs $src
+
+    runHook postUnpack
+  '';
+
+  sourceRoot = "squashfs-root";
+
+  postPatch = ''
+    rm -rf lib usr
+  '';
+
+  buildInputs = [
+    alsa-lib
+    nss
+    libdrm
+    libgbm
+    libxkbcommon
+    udev
+    pcsclite
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,opt/tk-safe}
+    mv * $out/opt/tk-safe
+    ln -s $out/opt/tk-safe/app/tk-safe $out/bin/tk-safe
+
+    mkdir -p $out/share/icons/hicolor/1024x1024/apps
+    ln -s $out/opt/tk-safe/meta/gui/icon.png $out/share/icons/hicolor/1024x1024/apps/tk-safe.png
+
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    wrapProgram $out/opt/tk-safe/app/tk-safe \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}"
+  '';
+
+  meta = {
+    description = "Electronic medical record (ePA) by Techniker Krankenkasse (TK)";
+    homepage = "https://snapcraft.io/tk-safe";
+    license = lib.licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+    # Vendored copy of Electron.
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ felschr ];
+    mainProgram = "tk-safe";
+  };
+}

From fa7974487e51793455714e2369e1702bc9a13275 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Thu, 31 Jul 2025 17:48:51 -0600
Subject: [PATCH 135/357] signal-desktop: 7.62.0 -> 7.64.0

https://github.com/signalapp/Signal-Desktop/releases/tag/v7.64.0
---
 pkgs/by-name/si/signal-desktop/libsignal-node.nix |  8 ++++----
 pkgs/by-name/si/signal-desktop/package.nix        | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index 5bcff1b97190..95e1d952e4da 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -24,23 +24,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.76.0";
+  version = "0.76.7";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8V+q28hv7LDsS3SdH27PVHtnAneB55xYqFkhRapkcOI=";
+    hash = "sha256-7UXOCgjZYOOMMnBk1pvORJVTClQo9vbhSteKBE5RHw8=";
   };
 
-  cargoHash = "sha256-z8PbpE+kID+kOmlimuvxTrzoWpbWTKpP6HHnhZDATWM=";
+  cargoHash = "sha256-beeR/tISks99+o/kdqaq96nznwoiNduyB/BBVvNTEn0=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-/DL3sQeeZO4l16/rx7BrWEUGUIAdHft+gO3oJ1WQJUE=";
+    hash = "sha256-nbGeT0Fyu9T/3EFoIDaAESIl9JOIOq2jC53GWU1Ofeo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index c1b088fb3e57..8f1b51c813c6 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -52,13 +52,13 @@ let
     '';
   });
 
-  version = "7.62.0";
+  version = "7.64.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-79Mh5jx7cSr8AVL/oqjuTWQ+DHmyXL19rKlbyNMySt0=";
+    hash = "sha256-jBSL9g7+lgyG4luKP84MaWfS+dniBzp3lRimgKtWrI8=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -122,15 +122,15 @@ stdenv.mkDerivation (finalAttrs: {
     fetcherVersion = 1;
     hash =
       if withAppleEmojis then
-        "sha256-r+MktwnhmZOUc1NMumrfkTpmUUHUXKB10XKSkxg3GYU="
+        "sha256-xAmIfTv270g6FoNPCauPBT2H3XTgK6MOjIIwRk0U9PY="
       else
-        "sha256-raCVDqhtTTsdIn1vjbKW+ULrBefD8+kgJkKHls90KNs=";
+        "sha256-Wmqu+tkoT13PEQ6QA2KczLtgbxgCWwZ6pNuE1klWLCk=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1752702364;
+    SOURCE_DATE_EPOCH = 1753917014;
   };
 
   preBuild = ''

From 5e86203316c9d5b2aca43fcd76b6cad2350d9fa3 Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Fri, 1 Aug 2025 10:55:02 +0200
Subject: [PATCH 136/357] renovate: Enable strict shell checks in tests

Closes #373166.
---
 nixos/tests/renovate.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/tests/renovate.nix b/nixos/tests/renovate.nix
index d6adb3f76801..94974b00fd07 100644
--- a/nixos/tests/renovate.nix
+++ b/nixos/tests/renovate.nix
@@ -30,8 +30,7 @@
         enable = true;
         settings.server.HTTP_PORT = 3000;
       };
-      # Uncomment the next line to lint service scripts (Note: breaks VM startup; see #373166)
-      #systemd.enableStrictShellChecks = true;
+      systemd.enableStrictShellChecks = true;
     };
 
   testScript = ''

From 7999bd11a9db0d9da20df9c419dc9caa13b35bbb Mon Sep 17 00:00:00 2001
From: faukah <fau@faukah.com>
Date: Tue, 29 Jul 2025 20:29:04 +0200
Subject: [PATCH 137/357] basalt: init at 0.9.0

---
 pkgs/by-name/ba/basalt/package.nix | 34 ++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 pkgs/by-name/ba/basalt/package.nix

diff --git a/pkgs/by-name/ba/basalt/package.nix b/pkgs/by-name/ba/basalt/package.nix
new file mode 100644
index 000000000000..cc2ba0960497
--- /dev/null
+++ b/pkgs/by-name/ba/basalt/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "basalt";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "erikjuhani";
+    repo = "basalt";
+    tag = "basalt/v${finalAttrs.version}";
+    hash = "sha256-r34MlNSLZAHqNWlFMGNxT6zTSX+IKKQmJ4klEB4kjek=";
+  };
+
+  cargoHash = "sha256-TpbJ1HCBocgLAXGb5dBbZNMlOYXR9IGBRtfShgwlMIo=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "TUI Application to manage Obsidian notes directly from the terminal";
+    homepage = "https://github.com/erikjuhani/basalt";
+    changelog = "https://github.com/erikjuhani/basalt/blob/${finalAttrs.src.tag}/basalt/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ faukah ];
+    mainProgram = "basalt";
+  };
+})

From 2387b8411fc7d2e4d34a51ee23f1b6ab632197cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 10:05:32 +0000
Subject: [PATCH 138/357] amp-cli: 0.0.1752566512-ga67426 ->
 0.0.1754036264-ga0aa13

---
 pkgs/by-name/am/amp-cli/package-lock.json | 128 ++++++----------------
 pkgs/by-name/am/amp-cli/package.nix       |   6 +-
 2 files changed, 36 insertions(+), 98 deletions(-)

diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json
index d4a5e1b037d5..f9b8e30165b6 100644
--- a/pkgs/by-name/am/amp-cli/package-lock.json
+++ b/pkgs/by-name/am/amp-cli/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "@sourcegraph/amp": "^0.0.1752566512-ga67426"
+        "@sourcegraph/amp": "^0.0.1754036264-ga0aa13"
       }
     },
     "node_modules/@colors/colors": {
@@ -28,15 +28,26 @@
         "kuler": "^2.0.0"
       }
     },
+    "node_modules/@luxass/strip-json-comments": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@luxass/strip-json-comments/-/strip-json-comments-1.4.0.tgz",
+      "integrity": "sha512-Zl343to4u/t8jz1q7R/1UY6hLX+344cwPLEXsIYthVwdU5zyjuVBGcpf2E24+QZkwFfRfmnHTcscreQzWn3hiA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1752566512-ga67426",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1752566512-ga67426.tgz",
-      "integrity": "sha512-nz+iPJwZs0ONCnh/pCX2sfm47nCCegl9OLMUx2Z3ZW604ZTQ8w0IeiBs1Gzjlt8EnXlBR8tWY6f5ff+DT8UihA==",
+      "version": "0.0.1754036264-ga0aa13",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1754036264-ga0aa13.tgz",
+      "integrity": "sha512-76U1LuEOPUuJcVyMvRkblfvQChJutVZcgCJ4DB/rwke2yxXp2rhdqAOd1bHc2qWrH/nlWX+2BBZY1wTZgAVxRg==",
       "dependencies": {
-        "@vscode/ripgrep": "1.15.11",
+        "ansi-regex": "^6.1.0",
         "commander": "^11.1.0",
         "fuse.js": "^7.0.0",
+        "jsonc-parse": "^1.5.5",
         "open": "^10.1.2",
+        "open-simplex-noise": "^2.5.0",
         "runes": "^0.4.3",
         "string-width": "^6.1.0",
         "winston": "^3.17.0",
@@ -55,27 +66,6 @@
       "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==",
       "license": "MIT"
     },
-    "node_modules/@vscode/ripgrep": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/@vscode/ripgrep/-/ripgrep-1.15.11.tgz",
-      "integrity": "sha512-G/VqtA6kR50mJkIH4WA+I2Q78V5blovgPPq0VPYM0QIRp57lYMkdV+U9VrY80b3AvaC72A1z8STmyxc8ZKiTsw==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "https-proxy-agent": "^7.0.2",
-        "proxy-from-env": "^1.1.0",
-        "yauzl": "^2.9.2"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
-      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/ansi-regex": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
@@ -94,15 +84,6 @@
       "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
       "license": "MIT"
     },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "license": "MIT",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/bundle-name": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
@@ -172,23 +153,6 @@
         "node": ">=16"
       }
     },
-    "node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.3"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/default-browser": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
@@ -247,15 +211,6 @@
       "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==",
       "license": "MIT"
     },
-    "node_modules/fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-      "license": "MIT",
-      "dependencies": {
-        "pend": "~1.2.0"
-      }
-    },
     "node_modules/fecha": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz",
@@ -277,19 +232,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/https-proxy-agent": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -362,6 +304,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/jsonc-parse": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/jsonc-parse/-/jsonc-parse-1.5.5.tgz",
+      "integrity": "sha512-6xSVqUb+VBwXSJoyDPzgK1toG+JoOcfjWrmZNBL5ZmKnokV9dLshqyLU8NkcLavKbT5tKEr+3T0d4/7d+wVdVw==",
+      "license": "MIT",
+      "dependencies": {
+        "@luxass/strip-json-comments": "^1.3.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/kuler": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
@@ -418,17 +372,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-      "license": "MIT"
-    },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "license": "MIT"
+    "node_modules/open-simplex-noise": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/open-simplex-noise/-/open-simplex-noise-2.5.0.tgz",
+      "integrity": "sha512-co7x8uWxGcgFtsJNBFqI9ylq+5Isotz2hZR7dsD5Sl+RDPGBeMEG41KAfF+5gF10ksi9Pg6DNpMHEoyTKLbejQ==",
+      "license": "Unlicense"
     },
     "node_modules/readable-stream": {
       "version": "3.6.2",
@@ -621,16 +569,6 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
-    },
-    "node_modules/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-      "license": "MIT",
-      "dependencies": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
     }
   }
 }
diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index 2cd9ba71ddf7..6f406ebe5665 100644
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@@ -9,11 +9,11 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "amp-cli";
-  version = "0.0.1752566512-ga67426";
+  version = "0.0.1754036264-ga0aa13";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-TgSqpczEFIW6doWzgfPg2y+o+64ntPMbTJ0FVzCGNOg=";
+    hash = "sha256-+pvxRLoluRk6/XfPr5luW2oIAjWTCYMJo53wHzQh598=";
   };
 
   postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
     chmod +x bin/amp-wrapper.js
   '';
 
-  npmDepsHash = "sha256-avgj8q1pyepWSt4RFK1+9Fqwtc7Z1Voz2RUYKuViZA0=";
+  npmDepsHash = "sha256-Xm/uZAf9bDasHGIhcS2G8JUo3GyTdnErjzU7clkFQW0=";
 
   propagatedBuildInputs = [
     ripgrep

From 993466428d08f7c127d640f9ef706b4713fc5ca6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 10:47:51 +0000
Subject: [PATCH 139/357] yandex-cloud: 0.153.0 -> 0.156.0

---
 pkgs/by-name/ya/yandex-cloud/sources.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json
index 893fd5e89534..a4203bd39239 100644
--- a/pkgs/by-name/ya/yandex-cloud/sources.json
+++ b/pkgs/by-name/ya/yandex-cloud/sources.json
@@ -1,25 +1,25 @@
 {
-  "version": "0.153.0",
+  "version": "0.156.0",
   "binaries": {
     "aarch64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.153.0/darwin/arm64/yc",
-      "hash": "sha256-UKivp0FiR1cNTQ8VPYnvQ9dRVVjoUKgwCLl7+WEncxQ="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.156.0/darwin/arm64/yc",
+      "hash": "sha256-9jApY8rdHmiE4GmDqP0Px5gkug4WXWtq+gEzvnvdhlo="
     },
     "aarch64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.153.0/linux/arm64/yc",
-      "hash": "sha256-DGmhc6jRu9K4PIdrHN75VcqqfTsoii/hw7+lelFSeP8="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.156.0/linux/arm64/yc",
+      "hash": "sha256-Fk0qtD6KkBB0jJlRjxvAm8FSlS/bVv5BywbmYrT/ZqY="
     },
     "i686-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.153.0/linux/386/yc",
-      "hash": "sha256-O5CUX4r699adT3gq3bcjRvW+F1nUFddt6iSp+WloYVs="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.156.0/linux/386/yc",
+      "hash": "sha256-fxsbRwJoHrIBXArIRzBXD9HRmjeZOTQDnkhDqVEy8lc="
     },
     "x86_64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.153.0/darwin/amd64/yc",
-      "hash": "sha256-lPnRt8/8hZEwWeXbOGVfLgSfEAj7vEAHn86M6Z/DT3w="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.156.0/darwin/amd64/yc",
+      "hash": "sha256-CRkop4UxhSgnRL9dgx509r2oYNPmsDSJ8AVSFSRwLfY="
     },
     "x86_64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.153.0/linux/amd64/yc",
-      "hash": "sha256-JfJ0QcKQviz7wBz21pIGJ/hxGixV5qkDObwT5WBzaZ0="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.156.0/linux/amd64/yc",
+      "hash": "sha256-QwkEoSXhx782rQWikkxRifLqJuwrrqr0s5/AO2O0W4U="
     }
   }
 }

From d242203a661b0e37fa1b41355a3fda95a57f7a33 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 11:06:43 +0000
Subject: [PATCH 140/357] postgresqlPackages.pg_net: 0.19.3 -> 0.19.4

---
 pkgs/servers/sql/postgresql/ext/pg_net.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix
index 9186a6b4efa5..af3745667aec 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_net.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_net";
-  version = "0.19.3";
+  version = "0.19.4";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "pg_net";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PZYIwkXp1rOzRCDZivJFMuEQBYJaaibUN/WkL+6crSg=";
+    hash = "sha256-uHsfRQ5RKhTvqokF94s/RzTQ23BRTBV+yyIW41Djjgo=";
   };
 
   buildInputs = [ curl ];

From d82c4943a09e641ea4ab791de436901d49f411e6 Mon Sep 17 00:00:00 2001
From: Keegan Carruthers-Smith <keegan.csmith@gmail.com>
Date: Fri, 1 Aug 2025 14:56:30 +0200
Subject: [PATCH 141/357] amp-cli: update entrypoint

---
 pkgs/by-name/am/amp-cli/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index 6f406ebe5665..c3b6363e056b 100644
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@@ -40,7 +40,7 @@ buildNpmPackage (finalAttrs: {
     # Create a wrapper script that will be installed by npm
     cat > bin/amp-wrapper.js << EOF
     #!/usr/bin/env node
-    require('@sourcegraph/amp/dist/amp.js')
+    import('@sourcegraph/amp/dist/main.js')
     EOF
     chmod +x bin/amp-wrapper.js
   '';

From 46f092e4a896202631134f952099c3dc67bf3798 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 13:17:51 +0000
Subject: [PATCH 142/357] prometheus-mongodb-exporter: 0.45.0 -> 0.46.0

---
 pkgs/servers/monitoring/prometheus/mongodb-exporter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix
index 998902639683..925f76a1d908 100644
--- a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "mongodb_exporter";
-  version = "0.45.0";
+  version = "0.46.0";
 
   src = fetchFromGitHub {
     owner = "percona";
     repo = "mongodb_exporter";
     rev = "v${version}";
-    hash = "sha256-rHSILxd0Zl8+3CzaR4c1PBKDjI8P7Tp5A11eTXUdTH0=";
+    hash = "sha256-5ebIXJ9SPFXV6mecn1M7e3rnFwOisKtuhHGiCRfWPKQ=";
   };
 
-  vendorHash = "sha256-CUD6tTcWxLY/oGlRWSWjDcRQw0ecZYcUtGdav/UbctU=";
+  vendorHash = "sha256-8D5UUhrCfXrQVbr10aMNvM80zOUG+VNhdHdUSqPCrzA=";
 
   ldflags = [
     "-s"

From c94b89a9718841622252fbe94221685753854e31 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 13:34:54 +0000
Subject: [PATCH 143/357] nats-server: 2.11.6 -> 2.11.7

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

diff --git a/pkgs/by-name/na/nats-server/package.nix b/pkgs/by-name/na/nats-server/package.nix
index 83e138183ed6..c8e6c469c364 100644
--- a/pkgs/by-name/na/nats-server/package.nix
+++ b/pkgs/by-name/na/nats-server/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "nats-server";
-  version = "2.11.6";
+  version = "2.11.7";
 
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = "nats-server";
     rev = "v${version}";
-    hash = "sha256-E1gEH4wiGvPE8v2wUkojNIBKUCwmchqo+Hi3hsweCBk=";
+    hash = "sha256-S+IRHTJVpRcKgrBOuBI4fAMDmV0m/RkFu0Yjs7I9caE=";
   };
 
-  vendorHash = "sha256-b2L1Ef/vqS+OpZTaBbJ/saHWCFjq0jmLrvs4ujgk4ro=";
+  vendorHash = "sha256-VXwyGqPlROKK3K0Bu74L/xJjqAT5+JInAmXNmlVXsWQ=";
 
   doCheck = false;
 

From 70f70049999dced622574b89aaf6f9abd920d75e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 1 Aug 2025 13:46:29 +0000
Subject: [PATCH 144/357] zafiro-icons: migrate to by-name and switch to
 libsForQt5

---
 .../za/zafiro-icons/package.nix}              | 22 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 ----
 2 files changed, 11 insertions(+), 15 deletions(-)
 rename pkgs/{data/icons/zafiro-icons/default.nix => by-name/za/zafiro-icons/package.nix} (79%)

diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/by-name/za/zafiro-icons/package.nix
similarity index 79%
rename from pkgs/data/icons/zafiro-icons/default.nix
rename to pkgs/by-name/za/zafiro-icons/package.nix
index 44858afeb9e3..27147a4c3c8c 100644
--- a/pkgs/data/icons/zafiro-icons/default.nix
+++ b/pkgs/by-name/za/zafiro-icons/package.nix
@@ -3,7 +3,7 @@
   stdenvNoCC,
   fetchFromGitHub,
   gtk3,
-  breeze-icons,
+  libsForQt5,
   gnome-icon-theme,
   numix-icon-theme,
   numix-icon-theme-circle,
@@ -12,15 +12,15 @@
   gitUpdater,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "zafiro-icons";
   version = "1.3";
 
   src = fetchFromGitHub {
     owner = "zayronxio";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-IbFnlUOSADYMNMfvRuRPndxcQbnV12BqMDb9bJRjnoU=";
+    repo = "zafiro-icons";
+    tag = finalAttrs.version;
+    hash = "sha256-IbFnlUOSADYMNMfvRuRPndxcQbnV12BqMDb9bJRjnoU=";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    breeze-icons
+    libsForQt5.breeze-icons
     gnome-icon-theme
     numix-icon-theme
     numix-icon-theme-circle
@@ -67,11 +67,11 @@ stdenvNoCC.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Icon pack flat with light colors";
     homepage = "https://github.com/zayronxio/Zafiro-icons";
-    license = with licenses; [ gpl3 ];
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ romildo ];
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ romildo ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f4de0910ec4..900f4a33fedd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11637,10 +11637,6 @@ with pkgs;
 
   xlsx2csv = with python3Packages; toPythonApplication xlsx2csv;
 
-  zafiro-icons = callPackage ../data/icons/zafiro-icons {
-    inherit (plasma5Packages) breeze-icons;
-  };
-
   zeal-qt5 = libsForQt5.callPackage ../data/documentation/zeal { };
   zeal = zeal-qt5;
   zeal-qt6 = qt6Packages.callPackage ../data/documentation/zeal {

From 5a4a82021875d253ed7f6006a6464e0745f67f02 Mon Sep 17 00:00:00 2001
From: Jason Yundt <jason@jasonyundt.email>
Date: Sun, 13 Jul 2025 08:45:24 -0400
Subject: [PATCH 145/357] vkquake: properly enable user directory support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

302c3a7a168c41555dd35576a0ab5c872ba226b3 added this line to
pkgs/games/quakespasm/vulkan.nix:

>   buildFlags = [ "DO_USERDIRS=1" ];

At the time, Nixpkgs was shipping version 0.97.3 of vkQuake. That
version of vkQuake only used make as its build system. buildFlags passes
additional flags to make, so it made sense to use buildFlags at the
time.

As of this vkQuake commit [1], vkQuake now uses Meson as its main build
system and has a Meson option for enabling user directory support.
Setting buildFlags no longer seems to work. In order to enable user
directory support, it seems that we now need to use mesonFlags instead
of buildFlags.

[1]: <https://github.com/Novum/vkQuake/commit/8875ada7dfe2809f4fead2f3881749f231961005>

---

This change can be tested by doing the following:

1. Make sure that ~/.vkquake/ contains a valid id1 subdirectory.

2. Change directory into a directory that doesn’t contain an id1
subdirectory by running this command:

  cd /var/empty

3. Start vkQuake by running this command:

  nix-shell -p '(import <path to nixpkgs> { }).vkquake' --run vkquake

Before this change was made, if you followed those instructions, then
vkQuake would give you an error about not being able to load gfx.wad:

> $ nix-shell -p '(import "/home/jayman/Documents/Home/VC/Git/Partially mine/nixpkgs/repo" { }).vkquake' --run vkquake
> Command line: vkquake
> Found SDL version 2.32.56
> Detected 12 CPUs.
> Initializing vkQuake 1.32.3
> Built with GCC 14.3.0
> Host_Init
> Playing shareware version.
>
> ERROR-OUT BEGIN
>
>
> QUAKE ERROR: W_LoadWadFile: couldn't load gfx.wad
>
> Basedir is: /var/empty
>
> Check that this has an id1 subdirectory containing pak0.pak and pak1.pak, or use the -basedir command-line option to specify another directory.
>
>
> (zenity:55857): Gtk-WARNING **: 10:05:55.434: Unknown key gtk-modules in /home/jayman/.config/gtk-4.0/settings.ini
>
> (zenity:55857): Adwaita-WARNING **: 10:05:56.380: Using GtkSettings:gtk-application-prefer-dark-theme with libadwaita is unsupported. Please use AdwStyleManager:color-scheme instead.
> $ echo "$?"
> 1

Now that this change has been made, if you follow those instructions,
then vkQuake will start successfully, and Quake’s first demo will start
to play.
---
 pkgs/games/quakespasm/vulkan.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index 1f3f25a9b119..1f1db3b66a0d 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
   ];
 
-  buildFlags = [ "DO_USERDIRS=1" ];
+  mesonFlags = [ "-Ddo_userdirs=enabled" ];
 
   env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
     NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [

From b5fda38b50f6428edc0b0f9a48da9083fbc5a628 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 1 Aug 2025 14:29:17 +0000
Subject: [PATCH 146/357] punes: migrate to by-name

punes: create overrides
---
 pkgs/by-name/pu/punes-qt6/package.nix         |  7 +++++
 .../pu/punes/package.nix}                     | 30 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  4 ---
 3 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/by-name/pu/punes-qt6/package.nix
 rename pkgs/{applications/emulators/punes/default.nix => by-name/pu/punes/package.nix} (80%)

diff --git a/pkgs/by-name/pu/punes-qt6/package.nix b/pkgs/by-name/pu/punes-qt6/package.nix
new file mode 100644
index 000000000000..8b89e6951278
--- /dev/null
+++ b/pkgs/by-name/pu/punes-qt6/package.nix
@@ -0,0 +1,7 @@
+{
+  punes,
+}:
+
+punes.override {
+  withQt6 = true;
+}
diff --git a/pkgs/applications/emulators/punes/default.nix b/pkgs/by-name/pu/punes/package.nix
similarity index 80%
rename from pkgs/applications/emulators/punes/default.nix
rename to pkgs/by-name/pu/punes/package.nix
index 1267a40b4b26..02b06b13a3c9 100644
--- a/pkgs/applications/emulators/punes/default.nix
+++ b/pkgs/by-name/pu/punes/package.nix
@@ -12,12 +12,14 @@
   libX11,
   libXrandr,
   sndio,
-  qtbase,
-  qtsvg,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
+  qt6Packages,
+  withQt6 ? false,
 }:
 
+let
+  qtPackages = if withQt6 then qt6Packages else libsForQt5;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "punes";
   version = "0.111";
@@ -25,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "punesemu";
     repo = "puNES";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-TIXjYkInWV3yVnvXrdHcmeWYeps5TcvkG2Xjg4roIds=";
   };
 
@@ -50,16 +52,20 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
+  ]
+  ++ (with qtPackages; [
     qttools
     wrapQtAppsHook
-  ];
+  ]);
 
   buildInputs = [
     ffmpeg
     libGLU
+  ]
+  ++ (with qtPackages; [
     qtbase
     qtsvg
-  ]
+  ])
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
     libX11
@@ -74,20 +80,20 @@ stdenv.mkDerivation (finalAttrs: {
     "-DENABLE_RELEASE=ON"
     "-DENABLE_FFMPEG=ON"
     "-DENABLE_OPENGL=ON"
-    "-DENABLE_QT6_LIBS=${if lib.versionAtLeast qtbase.version "6.0" then "ON" else "OFF"}"
+    (lib.strings.cmakeBool "ENABLE_QT6_LIBS" withQt6)
   ];
 
   passthru.updateScript = gitUpdater {
     rev-prefix = "v";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Qt-based Nintendo Entertainment System emulator and NSF/NSFe Music Player";
     mainProgram = "punes";
     homepage = "https://github.com/punesemu/puNES";
     changelog = "https://github.com/punesemu/puNES/blob/v${finalAttrs.version}/ChangeLog";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = with platforms; linux ++ freebsd ++ openbsd ++ windows;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = with lib.platforms; linux ++ freebsd ++ openbsd ++ windows;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f4de0910ec4..0c545341a794 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1424,10 +1424,6 @@ with pkgs;
     in
     ppsspp.override argset;
 
-  punes = libsForQt5.callPackage ../applications/emulators/punes { };
-
-  punes-qt6 = qt6Packages.callPackage ../applications/emulators/punes { };
-
   py65 = with python3.pkgs; toPythonApplication py65;
 
   rmg-wayland = callPackage ../by-name/rm/rmg/package.nix {

From bb704e81aa0399b156a6fb4c120d024eb4c32bda Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Wed, 23 Jul 2025 09:02:02 -0500
Subject: [PATCH 147/357] pricehist: migrate to by-name

pricehist: refactor package definitions and meta

pricehist: add suggested changes
---
 .../pr/pricehist/package.nix}                 | 30 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 21 deletions(-)
 rename pkgs/{tools/misc/pricehist/default.nix => by-name/pr/pricehist/package.nix} (63%)

diff --git a/pkgs/tools/misc/pricehist/default.nix b/pkgs/by-name/pr/pricehist/package.nix
similarity index 63%
rename from pkgs/tools/misc/pricehist/default.nix
rename to pkgs/by-name/pr/pricehist/package.nix
index cf5eb82a00ec..16a5c29fc227 100644
--- a/pkgs/tools/misc/pricehist/default.nix
+++ b/pkgs/by-name/pr/pricehist/package.nix
@@ -1,18 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitLab,
-  requests,
-  lxml,
-  cssselect,
-  curlify,
-  poetry-core,
-  pytest-mock,
-  responses,
-  pytestCheckHook,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "pricehist";
   version = "1.4.7";
   format = "pyproject";
@@ -20,32 +12,32 @@ buildPythonApplication rec {
   src = fetchFromGitLab {
     owner = "chrisberkhout";
     repo = "pricehist";
-    rev = version;
+    tag = version;
     hash = "sha256-SBRJxNnA+nOxO6h97WZZHwhxoXeNtb5+rDayn4Hw6so=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     requests
     lxml
     cssselect
     curlify
+  ];
+
+  build-system = with python3Packages; [
     poetry-core
   ];
 
-  nativeBuildInputs = [
-  ];
-
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3Packages; [
     responses
     pytest-mock
     pytestCheckHook
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool for fetching and formatting historical price data, with support for multiple data sources and output formats";
     homepage = "https://gitlab.com/chrisberkhout/pricehist";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "pricehist";
-    maintainers = with maintainers; [ chrpinedo ];
+    maintainers = with lib.maintainers; [ chrpinedo ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f4de0910ec4..f66b69534fd8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1125,8 +1125,6 @@ with pkgs;
     withUsdView = true;
   };
 
-  pricehist = python3Packages.callPackage ../tools/misc/pricehist { };
-
   py7zr = with python3Packages; toPythonApplication py7zr;
 
   qFlipper = libsForQt5.callPackage ../tools/misc/qflipper { };

From ed9ecbf8000da4646ca9a5c1e7e19c8ef11b0b18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 14:48:59 +0000
Subject: [PATCH 148/357] balena-cli: 22.1.4 -> 22.1.5

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

diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix
index 8233c42c1bf3..cf9405112dd5 100644
--- a/pkgs/by-name/ba/balena-cli/package.nix
+++ b/pkgs/by-name/ba/balena-cli/package.nix
@@ -22,16 +22,16 @@ let
 in
 buildNpmPackage' rec {
   pname = "balena-cli";
-  version = "22.1.4";
+  version = "22.1.5";
 
   src = fetchFromGitHub {
     owner = "balena-io";
     repo = "balena-cli";
     rev = "v${version}";
-    hash = "sha256-tf9VQN2eI+YXTeQBwIXlxCL3mRi1JcYS+n5wA/L1mQY=";
+    hash = "sha256-5ltVQHye4miXA7W201n4XakP1eVyfFWzzaP+I7iKwOg=";
   };
 
-  npmDepsHash = "sha256-Nqpj04OdTynAtDLcXHJLa+eFzC/juwws6a67Ds/eIZQ=";
+  npmDepsHash = "sha256-oYwysy/gBJZ3akTjkdZEaX3KfdBmoaXEPbdXZNs8Ds8=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

From cad80bb19bb8ea0237502aa8a31fe22aaf3c3587 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 14:50:10 +0000
Subject: [PATCH 149/357] c3c: 0.7.3 -> 0.7.4

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

diff --git a/pkgs/by-name/c3/c3c/package.nix b/pkgs/by-name/c3/c3c/package.nix
index 588d1fe1c35d..7300e0a4079c 100644
--- a/pkgs/by-name/c3/c3c/package.nix
+++ b/pkgs/by-name/c3/c3c/package.nix
@@ -19,13 +19,13 @@ in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
 
   pname = "c3c${optionalString debug "-debug"}";
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchFromGitHub {
     owner = "c3lang";
     repo = "c3c";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MOnYWlGcxLX+agChuk0BPq8BWsVvNP2QYqaGk24lb5Q=";
+    hash = "sha256-LIwav9ZvNRn4tGh+MGEhimSIKROU3H+R1pc3oyGDb18=";
   };
 
   cmakeBuildType = if debug then "Debug" else "Release";

From 9f3f8ea93c60f5d8940874c1b0892906d32435f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 15:37:15 +0000
Subject: [PATCH 150/357] python3Packages.bx-python: 0.13.0 -> 0.14.0

---
 pkgs/development/python-modules/bx-python/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix
index d2ce7f9bebdc..fce67e6cffba 100644
--- a/pkgs/development/python-modules/bx-python/default.nix
+++ b/pkgs/development/python-modules/bx-python/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "bx-python";
-  version = "0.13.0";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bxlab";
     repo = "bx-python";
     tag = "v${version}";
-    hash = "sha256-I5yc8i9xoievaZbgwHSQQSVvs1VnNa66Q883T4dCYYw=";
+    hash = "sha256-WZjCPggAlC+L/SagC4TXJXNrFG85BmjO7FaV2GxrYYA=";
   };
 
   postPatch = ''
@@ -64,7 +64,7 @@ buildPythonPackage rec {
   meta = {
     description = "Tools for manipulating biological data, particularly multiple sequence alignments";
     homepage = "https://github.com/bxlab/bx-python";
-    changelog = "https://github.com/bxlab/bx-python/releases/tag/v${version}";
+    changelog = "https://github.com/bxlab/bx-python/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ jbedo ];
     platforms = [ "x86_64-linux" ];

From 0a5dc11317014977164dc036eaa09c810b561b27 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 1 Aug 2025 20:06:36 +0400
Subject: [PATCH 151/357] python312Packages.rioxarray: fix build

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

diff --git a/pkgs/development/python-modules/rioxarray/default.nix b/pkgs/development/python-modules/rioxarray/default.nix
index 3aca60897592..6623edcdb7ae 100644
--- a/pkgs/development/python-modules/rioxarray/default.nix
+++ b/pkgs/development/python-modules/rioxarray/default.nix
@@ -56,6 +56,8 @@ buildPythonPackage rec {
     # Fails with small numerical errors on GDAL 3.11
     "test_rasterio_vrt_gcps"
     "test_reproject__gcps"
+    # https://github.com/corteva/rioxarray/issues/862
+    "test_merge_datasets__mask_and_scale"
   ]
   ++ lib.optionals stdenv.hostPlatform.isAarch64 [
     # numerical errors

From 540c54a66f9a5b4e2bb2d6de9ba8054af93f5209 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Fri, 18 Jul 2025 14:43:47 +0900
Subject: [PATCH 152/357] shogihome: fix sandbox build on darwin

Darwin build only fails on sandbox mode.
This patch is taken from podman-desktop package.
See a1fcfb6d83b30d987bd727013def82cdf9f27976 for detail
---
 pkgs/by-name/sh/shogihome/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix
index 5af201cc1e01..2976a4a0651f 100644
--- a/pkgs/by-name/sh/shogihome/package.nix
+++ b/pkgs/by-name/sh/shogihome/package.nix
@@ -71,12 +71,15 @@ buildNpmPackage (finalAttrs: {
     rm electron-dist/libvulkan.so.1
     cp '${lib.getLib vulkan-loader}/lib/libvulkan.so.1' electron-dist
   ''
+  # Explicitly set identity to null to avoid signing on arm64 macs with newer electron-builder.
+  # See: https://github.com/electron-userland/electron-builder/pull/9007
   + ''
     npm run electron:pack
 
     ./node_modules/.bin/electron-builder \
         --dir \
         --config .electron-builder.config.mjs \
+        -c.mac.identity=null \
         -c.electronDist=electron-dist \
         -c.electronVersion=${electron.version}
 

From 3a6dd565eda940ab85274675f62be27df48eb188 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Fri, 18 Jul 2025 16:11:50 +0900
Subject: [PATCH 153/357] shogihome: fix broken resource path on darwin

d2358d770d1718d8b18752f72bd5dea96f6df9ed was regression for darwin
---
 pkgs/by-name/sh/shogihome/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix
index 2976a4a0651f..67098fb93a3b 100644
--- a/pkgs/by-name/sh/shogihome/package.nix
+++ b/pkgs/by-name/sh/shogihome/package.nix
@@ -40,8 +40,9 @@ buildNpmPackage (finalAttrs: {
 
     substituteInPlace .electron-builder.config.mjs \
       --replace-fail 'AppImage' 'dir'
-
-    # Workaround for https://github.com/electron/electron/issues/31121
+  ''
+  # Workaround for https://github.com/electron/electron/issues/31121
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace src/background/window/path.ts \
       --replace-fail 'process.resourcesPath' "'$out/share/lib/shogihome/resources'"
   '';

From 8559510d8d2e130edb86958cb56cf8ae746fb168 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 26 Jul 2025 07:32:17 -0500
Subject: [PATCH 154/357] ktextaddons: migrate to by-name

ktextaddons: refactor for by-name
---
 .../kt/ktextaddons/package.nix}               | 30 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 14 insertions(+), 18 deletions(-)
 rename pkgs/{development/libraries/ktextaddons/default.nix => by-name/kt/ktextaddons/package.nix} (58%)

diff --git a/pkgs/development/libraries/ktextaddons/default.nix b/pkgs/by-name/kt/ktextaddons/package.nix
similarity index 58%
rename from pkgs/development/libraries/ktextaddons/default.nix
rename to pkgs/by-name/kt/ktextaddons/package.nix
index a0ce40842593..ba772e95f50f 100644
--- a/pkgs/development/libraries/ktextaddons/default.nix
+++ b/pkgs/by-name/kt/ktextaddons/package.nix
@@ -1,30 +1,28 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchurl,
   cmake,
-  extra-cmake-modules,
-  karchive,
-  kconfigwidgets,
-  kcoreaddons,
-  ki18n,
-  kxmlgui,
-  qtkeychain,
+  libsForQt5,
 }:
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ktextaddons";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
+    url = "mirror://kde/stable/ktextaddons/ktextaddons-${finalAttrs.version}.tar.xz";
     hash = "sha256-mB7Hh2Ljrg8D2GxDyHCa1s6CVmg5DDkhwafEqtSqUeM=";
   };
 
   nativeBuildInputs = [
     cmake
+  ]
+  ++ (with libsForQt5; [
     extra-cmake-modules
-  ];
-  buildInputs = [
+    wrapQtAppsHook
+  ]);
+
+  buildInputs = with libsForQt5; [
     karchive
     kconfigwidgets
     kcoreaddons
@@ -33,10 +31,10 @@ mkDerivation rec {
     qtkeychain
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Various text handling addons for KDE applications";
     homepage = "https://invent.kde.org/libraries/ktextaddons/";
-    license = licenses.gpl2Plus;
-    maintainers = [ ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15b7b79653f4..a8b60395b183 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8459,8 +8459,6 @@ with pkgs;
   };
   libkrb5 = krb5; # TODO(de11n) Try to make krb5 reuse libkrb5 as a dependency
 
-  ktextaddons = libsForQt5.callPackage ../development/libraries/ktextaddons { };
-
   l-smash = callPackage ../development/libraries/l-smash {
     stdenv = gccStdenv;
   };

From 13e24e1acf6d5410998e29ad61f73f8453999ece Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 16:53:34 +0000
Subject: [PATCH 155/357] updatecli: 0.103.0 -> 0.105.0

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

diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix
index 940ac1df1285..5cc247e4f912 100644
--- a/pkgs/by-name/up/updatecli/package.nix
+++ b/pkgs/by-name/up/updatecli/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "updatecli";
-  version = "0.103.0";
+  version = "0.105.0";
 
   src = fetchFromGitHub {
     owner = "updatecli";
     repo = "updatecli";
     rev = "v${version}";
-    hash = "sha256-OgIwGo+oOVneaJ7REgMJ79KPdUXVpcw7kCVLQeBw1/Q=";
+    hash = "sha256-VE5sU3R9dVi97fyc+bafZUz/9v6iPfw3MRsjCm8ifuo=";
   };
 
-  vendorHash = "sha256-3aIw64uv/NgB8/tpysmnSAMbussENhLge70QQ4A86cY=";
+  vendorHash = "sha256-HdeFXQGisz0q/ZZv1UMo9ig9zBzH6Uyap8c1vl4zl5w=";
 
   # tests require network access
   doCheck = false;

From 2972b714bd2f069a3bcc2e739858da37349e0ede Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 17:21:52 +0000
Subject: [PATCH 156/357] python3Packages.ec2-metadata: 2.14.0 -> 2.15.0

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

diff --git a/pkgs/development/python-modules/ec2-metadata/default.nix b/pkgs/development/python-modules/ec2-metadata/default.nix
index be0329c25413..48594a7d3be5 100644
--- a/pkgs/development/python-modules/ec2-metadata/default.nix
+++ b/pkgs/development/python-modules/ec2-metadata/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "ec2-metadata";
-  version = "2.14.0";
+  version = "2.15.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "ec2_metadata";
     inherit version;
-    hash = "sha256-svgzgXIgcu+ij2XcN+cmwKvToFMvIns/pqKtaEYMf+s=";
+    hash = "sha256-sGayaAkcpANp/dZEuQo07L/XgiW85vDiafC/nOOrG3U=";
   };
 
   build-system = [

From 95863e09ca81ede1872f74311fc5edf27554c242 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Fri, 1 Aug 2025 10:31:07 -0700
Subject: [PATCH 157/357] signalbackup-tools: 20250729 -> 20250801

Diff: https://github.com/bepaald/signalbackup-tools/compare/refs/tags/20250729...refs/tags/20250801
---
 pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index 8b825ed8d039..f53ad07c989f 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20250729";
+  version = "20250801";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     tag = version;
-    hash = "sha256-IHQrtS75c6fAJeRD4fDc9m1Za95h1kvAZ3B7XFwDxdA=";
+    hash = "sha256-1iQi7DHHmKttibvO6naDExkp+Yk5iNY6ekG+QZE4nqI=";
   };
 
   nativeBuildInputs = [

From 0cfc9697ef27ed7ce130ed01a724e572957a8354 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 17:56:34 +0000
Subject: [PATCH 158/357] python3Packages.oelint-parser: 8.2.2 -> 8.2.4

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

diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix
index 0acf6101ea62..a48a7a53c902 100644
--- a/pkgs/development/python-modules/oelint-parser/default.nix
+++ b/pkgs/development/python-modules/oelint-parser/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "oelint-parser";
-  version = "8.2.2";
+  version = "8.2.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-parser";
     tag = version;
-    hash = "sha256-KrN7xJhb2EWRBxzl6GY+kW86oLVnzxdLYRSS9F9F/EY=";
+    hash = "sha256-MFbDK/uahH4ZNRY3f8vW0uMFC2frlYtqVOZHT3NwA30=";
   };
 
   pythonRelaxDeps = [ "regex" ];

From 1e3ba86fc6d15c23b07eb8a928c1253b4db68335 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 18:36:20 +0000
Subject: [PATCH 159/357] terraform-providers.google-beta: 6.45.0 -> 6.46.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index fd5a20139ff9..264884fa9c69 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -534,11 +534,11 @@
     "vendorHash": "sha256-n6UUSCQt3mJESEfqVHX4sfr1XqOXu+u7Qejjps6RmBs="
   },
   "google-beta": {
-    "hash": "sha256-O+rAH2VzDEr+uwyAAg74oS/HeytPLOm+1LTC7aswhIA=",
+    "hash": "sha256-HWtH/F4Bf86jzb27jSSpE7h77CH9FpGTF5tpGSxuX+g=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "repo": "terraform-provider-google-beta",
-    "rev": "v6.45.0",
+    "rev": "v6.46.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-QQI1BfUgDRYwlqOC2+e/EMcDsEbZV8cAUnscnW8xVLk="
   },

From 145399dc2726acd89e01c7b984c79508694bca53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 18:50:57 +0000
Subject: [PATCH 160/357] terragrunt: 0.83.2 -> 0.84.0

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

diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix
index 47afde20dcf4..06c6e7980e6d 100644
--- a/pkgs/by-name/te/terragrunt/package.nix
+++ b/pkgs/by-name/te/terragrunt/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "terragrunt";
-  version = "0.83.2";
+  version = "0.84.0";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "terragrunt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UkBwAhxvxZZT4594UzSmtHmnhxD0qIsy3alGM7I44IU=";
+    hash = "sha256-5GgMiWh9ZvVbZu/WMrggQMl7dq6A5p36sEDSkPWGCTM=";
   };
 
   nativeBuildInputs = [

From 2ec1bcf83496e742468540b0599c5514f6a00b71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 19:03:51 +0000
Subject: [PATCH 161/357] rancher: 2.11.3 -> 2.12.0

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

diff --git a/pkgs/by-name/ra/rancher/package.nix b/pkgs/by-name/ra/rancher/package.nix
index a195736dfb47..e5ada61609f9 100644
--- a/pkgs/by-name/ra/rancher/package.nix
+++ b/pkgs/by-name/ra/rancher/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "rancher";
-  version = "2.11.3";
+  version = "2.12.0";
 
   src = fetchFromGitHub {
     owner = "rancher";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-MprXgoshJwbRrWhQRNCOzR9u/Kbkowrkpn0dedWhoRk=";
+    hash = "sha256-K0uMo/sRol2F02iV7b9NcmZcQGZ9iSEIdbZgT+Ea+/c=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
     "-static"
   ];
 
-  vendorHash = "sha256-41Axi0vNGa+N+wzMbV8HeIuvVEpf5ErO/6KezqEEDhA=";
+  vendorHash = "sha256-l+mrardcka7ETcriFZHTxU+LTXwwQoED9yIar0S2gHA=";
 
   postInstall = ''
     mv $out/bin/cli $out/bin/rancher

From 6db9397866d258e53ef9db87fd0a3b171ae97a1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 19:28:46 +0000
Subject: [PATCH 162/357] mympd: 22.0.2 -> 22.0.3

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

diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix
index 54495d4ca2ec..76b9aa0356b0 100644
--- a/pkgs/by-name/my/mympd/package.nix
+++ b/pkgs/by-name/my/mympd/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mympd";
-  version = "22.0.2";
+  version = "22.0.3";
 
   src = fetchFromGitHub {
     owner = "jcorporation";
     repo = "myMPD";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-wvv4EeV0hLrQ9BhWAyoMnR8tjU67OwahcR+xo10lWE8=";
+    sha256 = "sha256-dQroukc25q81sMIbXsmGjaOT3FoRZwoZ6QkCBZ3plX4=";
   };
 
   nativeBuildInputs = [

From ca85b1f8cdbf73d9c479af12a58927af59f63b2c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 19:37:13 +0000
Subject: [PATCH 163/357] zoekt: 3.7.2-2-unstable-2025-06-27 ->
 3.7.2-2-unstable-2025-07-30

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

diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix
index b8294fa5dfd3..0dbe063837fb 100644
--- a/pkgs/by-name/zo/zoekt/package.nix
+++ b/pkgs/by-name/zo/zoekt/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule {
   pname = "zoekt";
-  version = "3.7.2-2-unstable-2025-06-27";
+  version = "3.7.2-2-unstable-2025-07-30";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "zoekt";
-    rev = "7ffb936f26b187de0f9e021993b82ff2196c0368";
-    hash = "sha256-chIY56m0sagwMJIeoFLNlAINHuBtzIm8PfJ/z4A/L6k=";
+    rev = "6d2e296f2a289c3477c0d3f9f5806354c13626a1";
+    hash = "sha256-X0sKv74gj1UNThYkj0NCwnlHVWrQK3Np4IcFWG5dYlc=";
   };
 
-  vendorHash = "sha256-1WfQbvT5pKZRfs2DWv6+jBpHKGpcxhYAnc+NXvMT6WE=";
+  vendorHash = "sha256-Yc1NZKb1V9NaZddnTnNOaqdNxOHKagl7Xpxj+mZf81I=";
 
   nativeCheckInputs = [
     gitMinimal

From 9f6a7099782be412877bf261593e5027b036659b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 19:38:40 +0000
Subject: [PATCH 164/357] linuxPackages.corefreq: 2.0.7 -> 2.0.8

---
 pkgs/os-specific/linux/corefreq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/corefreq/default.nix b/pkgs/os-specific/linux/corefreq/default.nix
index b5f8edef4af8..83fde10c2631 100644
--- a/pkgs/os-specific/linux/corefreq/default.nix
+++ b/pkgs/os-specific/linux/corefreq/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "corefreq";
-  version = "2.0.7";
+  version = "2.0.8";
 
   src = fetchFromGitHub {
     owner = "cyring";
     repo = "CoreFreq";
     rev = version;
-    hash = "sha256-k9tw32yG8WGGCY0/5WWvRTBzz+jka7PZ9WU05rwnunI=";
+    hash = "sha256-8uCs/Jj208qUtmpiorxtii+0VOfK/EgrcylmJMkcqUQ=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

From 7cd6bf70f73f9c97db4750595f3e02b7dc4308f2 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 1 Aug 2025 22:13:32 +0200
Subject: [PATCH 165/357] libdigidocpp: use fetchFromGitHub

---
 pkgs/by-name/li/libdigidocpp/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/libdigidocpp/package.nix b/pkgs/by-name/li/libdigidocpp/package.nix
index 649e389eef9f..ef22c2bfd4dd 100644
--- a/pkgs/by-name/li/libdigidocpp/package.nix
+++ b/pkgs/by-name/li/libdigidocpp/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   cmake,
   libtool,
   libxml2,
@@ -19,9 +19,11 @@ stdenv.mkDerivation rec {
   version = "4.2.0";
   pname = "libdigidocpp";
 
-  src = fetchurl {
-    url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
-    hash = "sha256-d3AqTTVi3lzzu9Tw7p+KilNa0Q7cJBGwb6VoNNLeskE=";
+  src = fetchFromGitHub {
+    owner = "open-eid";
+    repo = "libdigidocpp";
+    tag = "v${version}";
+    hash = "sha256-o/2hF82uRaBDp7I9urn8R6r9YQMkp241M1v92qD66NM=";
   };
 
   nativeBuildInputs = [

From a0e73947b25f59f49faddecde6e7528e0d8b76b1 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 1 Aug 2025 22:24:00 +0200
Subject: [PATCH 166/357] libdigidocpp: drop patchelf workaround

It seems sufficient to configure cmake with PKCS11_MODULE, no need to
patchelf anymore.

The path being baked in can be verified by looking at the
`$(nix-build -A libdigidocpp.bin)/bin/digidoc-tool --help` output,
and the default of the `--pkcs11` arg printed there.
---
 pkgs/by-name/li/libdigidocpp/package.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/li/libdigidocpp/package.nix b/pkgs/by-name/li/libdigidocpp/package.nix
index ef22c2bfd4dd..e314cd04e524 100644
--- a/pkgs/by-name/li/libdigidocpp/package.nix
+++ b/pkgs/by-name/li/libdigidocpp/package.nix
@@ -49,19 +49,16 @@ stdenv.mkDerivation rec {
     "bin"
   ];
 
+  cmakeFlags = [
+    (lib.cmakeFeature "PKCS11_MODULE" "${lib.getLib opensc}/lib/opensc-pkcs11.so")
+  ];
+
   # This wants to link to ${CMAKE_DL_LIBS} (ltdl), and there doesn't seem to be
   # a way to tell CMake where this should be pulled from.
   # A cleaner fix would probably be to patch cmake to use
   # `-L${libtool.lib}/lib -ltdl` for `CMAKE_DL_LIBS`, but that's a world rebuild.
   env.NIX_LDFLAGS = "-L${libtool.lib}/lib";
 
-  # libdigidocpp.so's `PKCS11Signer::PKCS11Signer()` dlopen()s "opensc-pkcs11.so"
-  # itself, so add OpenSC to its DT_RUNPATH after the fixupPhase shrinked it.
-  # https://github.com/open-eid/cmake/pull/35 might be an alternative.
-  postFixup = ''
-    patchelf --add-rpath ${opensc}/lib/pkcs11 $lib/lib/libdigidocpp.so
-  '';
-
   meta = with lib; {
     description = "Library for creating DigiDoc signature files";
     mainProgram = "digidoc-tool";

From ef522442c5f9e8124b8c9896f2b514c12da7f4b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 20:53:14 +0000
Subject: [PATCH 167/357] cargo-pgrx: 0.15.0 -> 0.16.0

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

diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix
index 7992893bbdd3..451dfd6b10ee 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix
@@ -60,9 +60,9 @@ in
   # Not to be used with buildPgrxExtension, where it should be pinned.
   # When you make an extension use the latest version, *copy* this to a separate pinned attribute.
   cargo-pgrx = generic {
-    version = "0.15.0";
-    hash = "sha256-sksRfNV6l8YbdI6fzrEtanpDVV4sh14JXLqYBydHwy0=";
-    cargoHash = "sha256-c+n1bJMO9254kT4e6exVNhlIouzkkzrRIOVzR9lZeg4=";
+    version = "0.16.0";
+    hash = "sha256-emNR7fXNVD9sY/Mdno7mwpH6l/7AD28cBUsFRn9je50=";
+    cargoHash = "sha256-3eyBDWDoCzSU0tbab8qbjSnBkkN0oOgd7YbuyHLEHYw=";
   };
 }
 // lib.mapAttrs (_: generic) (import ./pinned.nix)

From ac6331ad51badd1e8922618347c1f96b1fdf2368 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 1 Aug 2025 22:08:49 +0200
Subject: [PATCH 168/357] libdigidocpp: fix INTERFACE_INCLUDE_DIRECTORIES path
 in cmake file

This is used by qdigidoc 4.8.0 and points to the lib output, but needs
to point to the dev output.
---
 pkgs/by-name/li/libdigidocpp/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/li/libdigidocpp/package.nix b/pkgs/by-name/li/libdigidocpp/package.nix
index e314cd04e524..c48e82aff3ad 100644
--- a/pkgs/by-name/li/libdigidocpp/package.nix
+++ b/pkgs/by-name/li/libdigidocpp/package.nix
@@ -59,6 +59,13 @@ stdenv.mkDerivation rec {
   # `-L${libtool.lib}/lib -ltdl` for `CMAKE_DL_LIBS`, but that's a world rebuild.
   env.NIX_LDFLAGS = "-L${libtool.lib}/lib";
 
+  # Prevent cmake from creating a file that sets INTERFACE_INCLUDE_DIRECTORIES to the wrong location,
+  # causing downstream build failures.
+  postFixup = ''
+    sed '/^  INTERFACE_INCLUDE_DIRECTORIES/s|"[^"]*/include"|"${placeholder "dev"}/include"|' \
+      -i "$dev"/lib/cmake/libdigidocpp/libdigidocpp-config.cmake
+  '';
+
   meta = with lib; {
     description = "Library for creating DigiDoc signature files";
     mainProgram = "digidoc-tool";

From 5989fab4816635f02e7c73ddc5eedcac71bd6260 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 1 Aug 2025 21:37:00 +0200
Subject: [PATCH 169/357] qdigidoc: 4.7.0 -> 4.8.0

This switches to Qt6.

Changelog: https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.8.0

Also, update TSL.
---
 pkgs/tools/security/qdigidoc/default.nix      |  28 +--
 .../security/qdigidoc/vendor/config.json      |  16 +-
 .../tools/security/qdigidoc/vendor/config.rsa |  10 +-
 .../security/qdigidoc/vendor/eu-lotl.xml      | 221 +++++++-----------
 pkgs/top-level/all-packages.nix               |   2 +-
 5 files changed, 112 insertions(+), 165 deletions(-)

diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix
index c1d9df16d312..67d1f21b5dce 100644
--- a/pkgs/tools/security/qdigidoc/default.nix
+++ b/pkgs/tools/security/qdigidoc/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
-  mkDerivation,
-  fetchurl,
+  stdenv,
+  fetchFromGitHub,
   cmake,
   flatbuffers,
   gettext,
@@ -11,25 +11,27 @@
   openldap,
   openssl,
   pcsclite,
-  qtbase,
-  qtsvg,
-  qttools,
+  qt6,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "qdigidoc";
-  version = "4.7.0";
+  version = "4.8.0";
 
-  src = fetchurl {
-    url = "https://github.com/open-eid/DigiDoc4-Client/releases/download/v${version}/qdigidoc4-${version}.tar.gz";
-    hash = "sha256-XP7KqhIYriHQzQrw77zUp/I9nnh9EqK0m9+N+69Lh5c=";
+  src = fetchFromGitHub {
+    owner = "open-eid";
+    repo = "DigiDoc4-Client";
+    tag = "v${version}";
+    hash = "sha256-3irEJnVzbmJbznyTIkDMw5t0SfegpCi51rQ0UxFXzBY=";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [
     cmake
     gettext
     pkg-config
-    qttools
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -39,8 +41,8 @@ mkDerivation rec {
     openldap
     openssl
     pcsclite
-    qtbase
-    qtsvg
+    qt6.qtbase
+    qt6.qtsvg
   ];
 
   # qdigidoc needs a (somewhat recent) config, as well as a TSL list for signing to work.
diff --git a/pkgs/tools/security/qdigidoc/vendor/config.json b/pkgs/tools/security/qdigidoc/vendor/config.json
index 136a53e68a53..09857ce2a26d 100644
--- a/pkgs/tools/security/qdigidoc/vendor/config.json
+++ b/pkgs/tools/security/qdigidoc/vendor/config.json
@@ -1,9 +1,9 @@
 {
   "META-INF": {
     "VER": 1,
-    "SERIAL": 186,
+    "SERIAL": 188,
     "URL": "https://id.eesti.ee/config.json",
-    "DATE": "20250321070515Z"
+    "DATE": "20250722064215Z"
   },
   "TSL-URL": "https://ec.europa.eu/tools/lotl/eu-lotl.xml",
   "TSL-CERTS": [
@@ -45,14 +45,14 @@
   "QDIGIDOC-SUPPORTED": "4.0.0.23",
   "QDIGIDOC-LATEST": "3.13.6.1525",
   "QDIGIDOC4-SUPPORTED": "4.5.0.0",
-  "QDIGIDOC4-LATEST": "4.7.0.0",
+  "QDIGIDOC4-LATEST": "4.8.0.0",
   "QESTEIDUTIL-SUPPORTED": "4.0.0.23",
   "QESTEIDUTIL-LATEST": "3.12.10.1265",
-  "WIN-LATEST": "24.12.0.8373",
-  "WIN-DOWNLOAD": "https://installer.id.ee/media/win/Open-EID-24.12.0.8373.exe",
+  "WIN-LATEST": "25.6.9.8395",
+  "WIN-DOWNLOAD": "https://installer.id.ee/media/win/Open-EID-25.6.9.8395.exe",
   "WIN-UPGRADECODE": "{f1c4d351-269d-4bee-8cdb-6ea70c968875}",
-  "OSX-LATEST": "24.9.0.1949",
-  "OSX-DOWNLOAD": "https://installer.id.ee/media/osx/Open-EID_24.9.0.1949.dmg",
+  "OSX-LATEST": "25.5.0.1954",
+  "OSX-DOWNLOAD": "https://installer.id.ee/media/osx/Open-EID_25.5.0.1954.dmg",
   "CERT-BUNDLE": [
     "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",
@@ -71,7 +71,7 @@
     "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",
-    "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"
+    "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"
   ],
   "LDAP-CERTS": [
     "MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTflMrY="
diff --git a/pkgs/tools/security/qdigidoc/vendor/config.rsa b/pkgs/tools/security/qdigidoc/vendor/config.rsa
index e58eace25e59..e07cd5e064c5 100644
--- a/pkgs/tools/security/qdigidoc/vendor/config.rsa
+++ b/pkgs/tools/security/qdigidoc/vendor/config.rsa
@@ -1,5 +1,5 @@
-snzZCsIC8T05QePCP3en1SDkbmFnseFHJyVUymiZgfIxwxNhqQP+IaYubO6qZd3SCp1PRlA0A8Pn
-rHnnE15JuBa1JhRRXSi0jSTIR08zBu6AnUVigyMoAhKQOst3sRsZTWngWrcQW24ertsQssC7dL1i
-QFiYld6IMAHQX1B/GWSUlbezJcpawEum7YjqqZepcYFBMtU6B37rEEqPgWI7CZPeUy21KQmtoVmH
-jiGAL20cVlmNGHjybD1FoPzteK884D4Rw9sYIu3LF1wLZkVHHbSQnYwiQ5wJGIcBzG5t3OOU4eGN
-IY8kuRjDPE95+POFMYMrPWlufodqsonnutPv3Q==
+uN+IaPh/pmA96fd2aUXZeNai8XkAYnUy69Rhd2Bvu0kGnQg4oH2sYWmJCzaQECGbI86nlt/UXIqC
+ZDvJqGaK5jqhvUwNcb/RubN8tsOdM4xn/Bg7tPeQPcbCaM38EHIwRfNFKr+vuWrna/KUynWP0PHD
+Mpsq1MxtNT/L4WFNf2zKvtfiI0lRPQcBCRgrA21BVTZRu5nbAkLc5w1OliTwauQgx7GFh7M+gYms
+bkAZSaJJJQczbCn2xizG0HrBn/lQ/EZYlL432Wai7tJL0maZcXoRGJfvZQkDAdzyfDBOK291JnCW
+/tjoLEMwDBYLxoL2mztivwdT1W8HLUyi7jvhpQ==
diff --git a/pkgs/tools/security/qdigidoc/vendor/eu-lotl.xml b/pkgs/tools/security/qdigidoc/vendor/eu-lotl.xml
index 7fa5d3c05f2a..14f981a87c83 100644
--- a/pkgs/tools/security/qdigidoc/vendor/eu-lotl.xml
+++ b/pkgs/tools/security/qdigidoc/vendor/eu-lotl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><TrustServiceStatusList xmlns="http://uri.etsi.org/02231/v2#" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" xmlns:ns3="http://uri.etsi.org/02231/v2/additionaltypes#" xmlns:ns4="http://uri.etsi.org/01903/v1.3.2#" xmlns:ns5="http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#" xmlns:ns6="http://uri.etsi.org/01903/v1.4.1#" Id="ID0001" TSLTag="http://uri.etsi.org/19612/TSLTag">
     <SchemeInformation>
         <TSLVersionIdentifier>5</TSLVersionIdentifier>
-        <TSLSequenceNumber>361</TSLSequenceNumber>
+        <TSLSequenceNumber>368</TSLSequenceNumber>
         <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUlistofthelists</TSLType>
         <SchemeOperatorName>
             <Name xml:lang="en">European Commission</Name>
@@ -589,21 +589,6 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>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</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIF3DCCA5SgAwIBAgIBCjA9BgkqhkiG9w0BAQowMKANMAsGCWCGSAFlAwQCA6EaMBgGCSqGSIb3DQEBCDALBglghkgBZQMEAgOiAwIBQDBWMSYwJAYDVQQDDB1HZXJtYW4gVHJ1c3RlZCBMaXN0IFNpZ25lciAxMDEfMB0GA1UECgwWRmVkZXJhbCBOZXR3b3JrIEFnZW5jeTELMAkGA1UEBgwCREUwHhcNMjMwNjIzMDgwMDAwWhcNMjUwNjIzMDgwMDAwWjBWMSYwJAYDVQQDDB1HZXJtYW4gVHJ1c3RlZCBMaXN0IFNpZ25lciAxMDEfMB0GA1UECgwWRmVkZXJhbCBOZXR3b3JrIEFnZW5jeTELMAkGA1UEBgwCREUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDRm8FwhXI6jMkfv4zesuR91pKnr0Wm8q/nQ9i4C5HGJdGAB8aFl/c86712QaKOdDP9HPAUoyjbOCYEpOOKl2JEHvCKukPwq+dly1MkFUXXXkuQzY8APSariCV9og5JaBXKdrs/Z4k7wd1HZiw3bORIAb783hOahn9YVgn6G7tFvK9we+CfCIq54hTiXFesSYXPnfkJOkC69LVRxKn3VtpuOzI53O4fU2L1CBiFTlQckGxfeeXto+JL1qAuE4WRk9p65ng7FcoKqfncCXCfNGRKX4CPPjod3Vlx75xnO1je7b+ztjrsim2y5y0yD5V0tBb3HehXTDMjqqOFFb/B4i6H5rwttU6i1M5O45a6H7KvssRnOEfEDK5X3EfBusHjRTEbDpgJz/J40vLN4Cg1rBWmkvQFbDKYn0sEVdCcy+K+N67l/PGJVptzmGN6T+15PGyVWhzBymuOQVdlpekG+Y6rUZnMK9/ttmTj9HbbVB1RelZwDaQJBTeGKUy4uihJeq3JdSrInS+JwpEnptsIHMj/iunB1XE8cF5xkycetnWyZCfLWheWDxV4mmFmjTpKdPrdjoRTzuoZ3LcJf+xOH7aQacRQsx14mbmd5+GRXlLQI1olUb5MkBlV9UgzN974rBRDtDDCioWIBkUBlND5088qBznrKrQcvjs47l69k4HVHQIDAQABo1UwUzAdBgNVHQ4EFgQULOqbenQeh8fRB/1hNOUGrFsFjBswDgYDVR0PAQH/BAQDAgFAMBQGA1UdJQEB/wQKMAgGBgQAkTcDADAMBgNVHRMBAf8EAjAAMD0GCSqGSIb3DQEBCjAwoA0wCwYJYIZIAWUDBAIDoRowGAYJKoZIhvcNAQEIMAsGCWCGSAFlAwQCA6IDAgFAA4ICAQBqpICPlZzbyx0wY6Vw4ZD+WXHMkvkNEsuMIytA/LSA6iRceKo+43RLLz0/YvFux/UCWzJp2t1gProFdjIC3M9EWCNOQd7gMyJcygkHixDYuFLB2D/DXwGt2TdphLIosFlulvyLaIYE7PejAlG74Q+AJ6uoses7UU48GfoIka23WEdvC1brgXY6zogvxxMy4u0oCmim+YgtOE6XMQVfEiTVSgljrGbjTsKBUm+H2jK9Os1GOmBKt4NkD+PE9nPNuTUUwCKrjYvBw9wCHL1j5bmMiGRJ3bNvuSsIlot1bz4DCNksLIxgY1dgaP8g/m1OzAq4adtHiEQKZJrtZUsZ1PM22wsUvXlxEYeZ6H7pv/ZKT6zlroTzrsY9fKf7OGqgScIuPPklwc+EzONUtDwvB7bSuLoDHrYA/8VJwNB2QuCGwARlhI8mYQRsqHCUKmHbKeTOR4Z1+slylpSoHTbctHwWSelgWHgcX4sZYA7tx669OiWMVQvQglrm6SzQu2P/odyG2h1Jg4+o2kS66t4zJrCCp5T3ch4FS/87dYNr+Ik/zAWxYYvQJoeyQHxd0fHS/qBN48Vr4vLUZbWtNYLq669hrpYjxVXtWIxBz4Wf6VD70uDNYPbXOrwao3ron1g61gREpGqqd9Gw4hHih/74j66tA3hj5kb1Dz41IGLg4YhQ4g==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>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</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>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</X509Certificate>
@@ -614,6 +599,16 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>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</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIGAzCCA7egAwIBAgIBDjBBBgkqhkiG9w0BAQowNKAPMA0GCWCGSAFlAwQCAwUAoRwwGgYJKoZIhvcNAQEIMA0GCWCGSAFlAwQCAwUAogMCAUAwVjEmMCQGA1UEAwwdR2VybWFuIFRydXN0ZWQgTGlzdCBTaWduZXIgMTQxHzAdBgNVBAoMFkZlZGVyYWwgTmV0d29yayBBZ2VuY3kxCzAJBgNVBAYTAkRFMB4XDTI1MDQyOTA3NDUxM1oXDTI3MDQyOTA3NDUxM1owVjEmMCQGA1UEAwwdR2VybWFuIFRydXN0ZWQgTGlzdCBTaWduZXIgMTQxHzAdBgNVBAoMFkZlZGVyYWwgTmV0d29yayBBZ2VuY3kxCzAJBgNVBAYTAkRFMIICIDALBgkqhkiG9w0BAQoDggIPADCCAgoCggIBAL7YYJr/2Aep/qIzTi2y5uYDW86oJT/l9nEwiW4ZDaeb6YMrsAk+x4HpoHKAVRIwPzCM2o5lKLMFapbgh1+eUc7fuK24ApWD30vm70M6AUD8u1o5QogJ0Z699NEP0alaJjhNJNcSmrh2bVanuWATmF2gzLFNNht8pXux+a9maHOUSxBFL1aX0IMehEqkAWeITeHQ5FiXo8vy+ij9MaKvFuyCEkQ8RZzi68B9a3Aywxgaq0sXJFRFZAMU8ihOA7FFf/1C4Ymw//2ZpTfwicRVrE8dd/HLa87iH349dJAqALuLh4rvuH0gSbd31J6qC2VwLAml2XFED0Jag7fx0ozTskfT8PN70Is32HX1VnV7Kljq40lsgwgop0DJyGUVsglprPcgfqvp4TzUTnXvVOxDGaXbnATOTCjxVAloxRMMo8lCf87mTcCEiT8kWxFyvHTrRxzrcJxq1CzxdpuliLzkjoTFlauGKPH5dDhy9F08eZBc4KBBqZ7ni/P5UCVObdA92A/Y/+YYJfIMkiqqSM2370s/xT9br86umed9IJEVLL1AvqM9Uip89MGK9flW7GFWjs1okjAXD11SaptZge1dGja+cwX1apz1ywsjwx8KhrAsKt00LKqLzyphcfKMi2r3n5KkeEe5SCiRnXe7ErFPpmCqTysBBi1npTUL/YesdgCxAgMBAAGjdjB0MB0GA1UdDgQWBBQUNc/EoS6HWAugPIha2Q4OCT0snjAfBgNVHSMEGDAWgBQUNc/EoS6HWAugPIha2Q4OCT0snjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIGQDAUBgNVHSUBAf8ECjAIBgYEAJE3AwAwQQYJKoZIhvcNAQEKMDSgDzANBglghkgBZQMEAgMFAKEcMBoGCSqGSIb3DQEBCDANBglghkgBZQMEAgMFAKIDAgFAA4ICAQA4yK0WShV11Jav8maUpWwQw5TnY+X4rZxM/TjAZrjY0GshfS+U5V69ERrOpwniwNsDcM9a8OB/ID0l4+JVxLT3i9l68TVkLa+PXzktD3KA2lBKPxj9fLzu/tVae2VslPjHTkRMXfBNIiQh7khdR4EP+zMAtzPztqfoDlM2Vsphzsy5drbbU87g/OPmfXE8bcjdofMax4ZoAxKbwXZUS7BYzdzHbGJIbdVfka9Ru98cKVYZbRMrxHa/vRqUuzu2A+Z/G8aXq67ha7yveVTt//yiy1qtQ65Wnx9BTNIwYEouINFuU4yqiIc7OBS1aQHX0rN2CS2rdwsbt6T3woXZkKP8zau8BBhGAy4rcD1T4W59M/j6Yk69wIRYw+0rX2uivvu9wuao/khQMdFOtvCOUc2nYBX/SnxGYKbcR3hr6JGJBNrAoXRlZJ4ZJaALkhMdH85w1fOOaeF5Aw+gP+3NH7Q1iBeJbQfAwWc2HSZRZpGkGlYv6b0tolUa0RV2m6gP0GDXTtiIlCHG3n9onaNJlWbxsfebr9H0b5DCRMaxLmfhabm1RBGv+IeYoxZrlVWa5plyD4lZ//Q9sRH7TmakRhxQkoT1F/48Z5e5MqSMKzQhScfNsraiU0452tXi1PofGIhr7x+IMPqTNK8Zwl74h1gRhlRkdDRJjtSGuxYuOBiQYQ==</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>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</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>https://tl.bundesnetzagentur.de/TL-DE.XML</TSLLocation>
                 <AdditionalInformation>
@@ -949,16 +944,6 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>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</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIGGDCCBACgAwIBAgIFFGXw/iIwDQYJKoZIhvcNAQELBQAwgYcxCzAJBgNVBAYTAkZJMREwDwYDVQQHDAhIZWxzaW5raTE9MDsGA1UECgw0RmlubmlzaCBUcmFuc3BvcnQgYW5kIENvbW11bmljYXRpb25zIEFnZW5jeSBUcmFmaWNvbTEmMCQGA1UEAwwdVHJhZmljb20gVEwgc2lnbmluZyBrZXkgMjAxOWIwHhcNMTkwMTA3MDAwMDAwWhcNMjIxMjA3MDAwMDAwWjCBhzELMAkGA1UEBhMCRkkxETAPBgNVBAcMCEhlbHNpbmtpMT0wOwYDVQQKDDRGaW5uaXNoIFRyYW5zcG9ydCBhbmQgQ29tbXVuaWNhdGlvbnMgQWdlbmN5IFRyYWZpY29tMSYwJAYDVQQDDB1UcmFmaWNvbSBUTCBzaWduaW5nIGtleSAyMDE5YjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMqrGKaM2HB2Ad2weDp3u5vwmKkJ2UV/KJS3fgLpP/S/WbY9PK7ha4jyIHyIMH0sOZk909c69dIy/YyjsKQ5ac66oJ6qGwuLf6mWef/sgKJGpDuk93wLQVQJhLhmIf2AN2E0UffZ7s0lwXmXrm68svwjQAitLBGP3V/DQaJPDphWhLVYRQeixvr5BtlvgsuQ86mmKvZyGiFEjuMiJ97t/qYmpbXx1Qee9cJhiEeyHIHWCdktR47IBoWHfIKCHXrQogKM7jhG9T8mSAF0OO+MoXGVjO9jEOdtu30p/tOeuFnyqp6VMlVbWxMwBJJ6UCekRfxZ1PIybZmNV9upKKmgfaM6Hwso654d9k6ouid3s8mYwUJyxwNkRvbmTx/CZvxZbfYyRNM4BvxY7o40IijNdnYyRYkDyYs7s1izNGnZXhKi/2MkEyXWgI5VkqUJN/q6h29Lpkler/iO5TAihrCNR/DxpTyTzEuNtYJfIKtC7WwLRQd8lvPCEkLW7q+Bqr8lHFRMczX+1HkPqiNZACzMi9dv3Rseagvj1jWP6rsJ8c0v7vCH1Dv9fDD28HCfkPENT9ZDuLpaINjBmXkO6oPAf+DF1WVKC928vZhfubgv2E0pgxha1YwNZoGia2NF9KovpHPEHQNfsTg6Yifa6U6/n85XKlOXohAqI/m+oTxbYcdFAgMBAAGjgYgwgYUwHQYDVR0OBBYEFAtHGIYmCX/sNtLEJomf3GHZ8rxHMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADAjBgNVHREEHDAahhhodHRwczovL3d3dy50cmFmaWNvbS5maS8wEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4ICAQBxZyendahjaTs9lLiWhFO04NLXkQBr/BnXsb/vlN4NOCaaPX0rFEyJ3TGp6aEvYbJQ35YMXA/d3XPwUK6cPemKarx12CqntLzbfTIqmgB8OZsc4OVkTOCKrz9TS2a96+aIf/MCs2Wa1pMRL3ES+es98WXBUGbLX6Kl1zGO9UKVRWsyFzBWDuLQ7M4c0ewjwy6n9yGtDNRjjruKZYMl1Qi8Z54iNMvuNf6zSpqU1VI2Rowo0ryZM7DNGIzUx7XDDglr3zmZLgsvI2xCk6QS39nDVAmsFAHA6aICKgJGw3dgjAYFQvr9c0zmSkUK5hrrTDnlD63Z0mF0RJYCjtxghphoRAnK1VqVWp0DsYmM9wBGuE2QQL5W5vDgBNuobqwSS3/Ws0cUlv8PrNu8xL+2e776dDAS5Wq0TwecSAotE6ioRAn7RiD8JzUfQ0auKhzt/yvXmQLRwMIUjEvzwz70rbhh5q7wzk4V28EsMG0V8gS58QxwWe0oKFvO3+iEsJB0BsJ4qZtUF+P6C3eGVnDQsy4V927xqk4ctirI8NDRig0ilhD8KscyPhLS/ObcY0Fw89iPQFoVRGYpy0hQModyWK10ktjNJNfCTpdi1+46dZ+qiEwQcJsExNitvqeeK+AkJXXmQ3NLips3gawC7jiycsIv56/2O+TFsiGe1bDKkN3YMg==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>MIIFoDCCA4igAwIBAgIFFJlsq/cwDQYJKoZIhvcNAQENBQAwQTELMAkGA1UEBhMCRkkxETAPBgNVBAoMCFRyYWZpY29tMQ0wCwYDVQQLDAROQ1NDMRAwDgYDVQQDDAdOQ1NDLUZJMB4XDTIyMDMyMzAwMDAwMFoXDTI1MDYwMTAwMDAwMFowQTELMAkGA1UEBhMCRkkxETAPBgNVBAoMCFRyYWZpY29tMQ0wCwYDVQQLDAROQ1NDMRAwDgYDVQQDDAdOQ1NDLUZJMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnZ5B41gIHmXSl+qf9NwZm5PHO1cLwIW+duZRGJPcjPh137tdDUhtor5YdN2/L1zIDTO8vdxVp/1E3Kbvrz5IrADBsK4GKWLi6NnwTNyelcNYwo9qm+baHNTMCA4j5e2Q8gcrsZEBBczQgozl5V+wfezCWAklcyMuaxRLp9MDrEPO11wqogqdU1nPLbBIO8/q+dPuADbdhMpr+ONLmn9JjPD8Ql52fpztAUS7yhkwu5fSyuwL1IgAHtR8j114NU/EowgMwtaIU8+NoR4aRoGY39arz6GG0H+oRPLygVTbTd5WvZy9yDTCz36rX2w0eBDL3uPnIpwKnCC3ooL1xp6NKkJ+8RSmqVmIKXJx7Em6UQAXqIG400K0/TUDZYBOb7m+lihHtne/+lkg5bCD1P3J4KEh21wH9LGV5l1xLMxVd26K4Rgq0dtK9x8J4D1donXPw2vwbzWuR8gbFLFoeVLNhkXF94XUFx7CZiCfzeic3SSOBsfqxL3f1hmQ+zghCy6dNgvEWJYAhX+qska011KG9yYybSJlrW230GhHDHcFEr/ngRsv63reibL+vKPWDUFF0X4DdMU9JpJ3V3dZ+t4Hu7QEwcHCAIi3sqkoYAp9936FISjgEg48RYnL//60o3FS0sdgqIptRzOvYOfzLgPx9VCqR0jyA8bPGHWka2TsW3cCAwEAAaOBnjCBmzAdBgNVHQ4EFgQUV+j3x/J6bedMKKHx3d+0XTqay+kwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBsAwEQYDVR0gBAowCDAGBgRVHSAAMDkGA1UdEQQyMDCBFHRzbF9saXN0QHRyYWZpY29tLmZphhhodHRwczovL3d3dy50cmFmaWNvbS5maS8wEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBDQUAA4ICAQBsDe4DdYrYASj4TbUIvaQovRnV+OUOOOUzGz4GAgo4idNEFWGijaO8eVYBI8ZeeNkb4wILuT3Vx53hk/lZApnHg2NbWBxUUid2OLz1Yzev27eiQ0TlUG0z+S30mAMOyr0k7eLfG+iTGbNylHww6YLxGmciIaFmChu+5IsSZ/94zf4P7uhhSnr/qkxJomivaQezP/YnyLB1gYVMbRnsDQK8rugFf4Dt9Pjch2N3PP69YbBmprUH6pVLiG6QI65v504506vGVa3Yh6eJcPFvX21Z9nu5XGlJb9GJGjE0ZG1PhFQNxBSZf8jI3duiqUG0UmI1eYh9jb9x0JSxn1k+lnSb56kYZ9Dk4v9Ips8mMJdS35uBBLwWboqDV0kk9QXr1et13I/MG8GwF8m5XCCXYtJ4P/GudvaaIVQnM183ly3BAIQL33lWuEc4VJzwif37NtYLkWL9+dmurScCvKm1G2jJw//wwlupXS89tHHYUHnhJon08+YXYl0NF37DaFWCjNPiFGA+yCFVa2fxiJy+Qw6+odPpV1ibTivt/n7/IdlXmaU1NXcy/TQbjjbU9Qb+v2iN71VWA2Tp5PX2XBNJZVSka5W3u/BCOx4+lq1BfHP6qtx1WDVdfy4w2j+goMZ86DZwqpt3QGFWVNJ54UpyVwBf264KSh2OijXTw96WH4EAPA==</X509Certificate>
@@ -969,6 +954,16 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>MIIFpDCCA4ygAwIBAgIFFGLFzFswDQYJKoZIhvcNAQENBQAwQzELMAkGA1UEBhMCRkkxETAPBgNVBAoMCFRyYWZpY29tMQ0wCwYDVQQLDAROQ1NDMRIwEAYDVQQDDAlOQ1NDLUZJX0IwHhcNMjIwMzIzMDAwMDAwWhcNMjUxMjMxMDAwMDAwWjBDMQswCQYDVQQGEwJGSTERMA8GA1UECgwIVHJhZmljb20xDTALBgNVBAsMBE5DU0MxEjAQBgNVBAMMCU5DU0MtRklfQjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKQdLyKXBz7JkNM0nJsbQGLPykRP2FC2PvygTVOyPrDoxogFLTJMteVf+vghd0HMToBbauqnh7CFiX+Gy1uPr2pLEamog7Jp4hnzh/qgGcASMJ2txfnbo2dEpFTBToMhzo246YVr6v09UzhKKkZpBMe12a9zsRsB0PlSq26ghUVd92fOH9+xMnsqP+6ze8TPSODkZxWXfQIk5cxhW/GwQKgC6K81zKTaUGPpYZLSX6RIuuCy+lQIsw9R0J3EoOW/GiZDO8vozODCfgs0o9GvWYtVtSl8NucbvJXrU9+d62uBi2aEMrfEWlC+MuQCufV0DJ7RNpwRVTD7nLNR8amvFl8hrY/wnsnKp7dEVUzbEfwsyPCd9jr+oGyPQ8uu8sM+blF3LZfHHluQxvPTcoQJEdyiYiBRNygSIKijhY5VDYdEWl6KEsC4muc33avnYlLqxDPYZ2zQBsCGfeXOB6S/YbFdp7SUzLtX/+YsdHYGYr0FMsXdvF83hfD+tEo5z3gM4ol/GdS7UIffddsgNkd1xOJ+w9fu5JYvMuBj43FR4DN5qFmFtHJZz8kTRE3EmDmpIazVq+vhI1NX76GXTAZ3B8Y4aU3Hk/0yBQ1j0hIx3m3S6mHo2j9le4Pgf+1It1pqOusYp761yr4K1TIqPGSLTxSSjZsD84b7sfMNuP1qSJCJAgMBAAGjgZ4wgZswHQYDVR0OBBYEFKggL21nCmKk6q1HZQdvdvTOfIXMMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADA5BgNVHREEMjAwgRR0c2xfbGlzdEB0cmFmaWNvbS5maYYYaHR0cHM6Ly93d3cudHJhZmljb20uZmkvMBEGA1UdJQQKMAgGBgQAkTcDADANBgkqhkiG9w0BAQ0FAAOCAgEAAmxnsR1WEq+stXXzBTmLPC0qbxr/Cqs2jRVFNHx6mLFfG0DDiatK/lGwKlLLolK/OO997FPytcJ9UsNss7cdOVjqk1LZLFygr9ppPjs5G1aRawZtVaeSvbQqyfjaCCvJqPORe4L1bDN5BC2A5jkece32UM7T9gJJva910qS83R62Otk85yOwVJ9TBmkTu6oHTm40jbcfiz5MLzKZB0l4W78Hyxl8qEtjZAp6q1WUxUegxPR2GsXIM0P6gGztM/MdOCAA56HOiSXWxk2u9yj0aamM2xkuQsnVWlf9crfhhdc036dtful+00F2gx7lq9uXGUqvZqRovWuqqpoM9ng094obeHmxe8HfTgaMKfL0K19BD6i1n6lpBEoXUEtKJmxzdCG4FnDufvbWf5qXBluh+yb8HuuMbUaw5UYqgmKhvx5rv1tVpeR/Y8lA7YeBoG6kCiOy/HfN9WN+EevrFRNoCJbZW9ezuunRWJeHYNU2hWJFBRUme3FzMaqMtmIxBw93orcvc3o5N0ASF1INwf5q6GRRXpp9pZSwPzz4iqdsIN5P4PxhtKJoapC0eyRy+nG8EZFZ/5g2YBi4YykpTR22pdDxeOC4TvB4XTFDOTfk6Fzl5GFkVxv5d7Dag7NHIF8WO++VPYNQoJcZAX9fNn0EFQ/0SJNtmu4HfJ1bsyjESOI=</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>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</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>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</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>https://dp.trustedlist.fi/fi-tl.xml</TSLLocation>
                 <AdditionalInformation>
@@ -983,9 +978,15 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                     </OtherInformation>
                     <OtherInformation>
                         <SchemeOperatorName>
+                            <Name xml:lang="en">Finnish Transport and Communications Agency Traficom</Name>
+                            <Name xml:lang="en">Finnish Transport and Communications Agency</Name>
                             <Name xml:lang="en">Traficom</Name>
-                            <Name xml:lang="sv">Traficom</Name>
+                            <Name xml:lang="fi">Liikenne- ja viestintävirasto Traficom</Name>
+                            <Name xml:lang="fi">Liikenne- ja viestintävirasto</Name>
                             <Name xml:lang="fi">Traficom</Name>
+                            <Name xml:lang="sv">Transport- och kommunikationsverket Traficom</Name>
+                            <Name xml:lang="sv">Transport- och kommunikationsverket</Name>
+                            <Name xml:lang="sv">Traficom</Name>
                         </SchemeOperatorName>
                     </OtherInformation>
                     <OtherInformation>
@@ -1239,7 +1240,7 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                         </DigitalId>
                     </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
-                <TSLLocation>http://files.dcenr.gov.ie/rh/Irelandtslsigned.xml</TSLLocation>
+                <TSLLocation>https://eidas.gov.ie/Irelandtslsigned.xml</TSLLocation>
                 <AdditionalInformation>
                     <OtherInformation>
                         <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
@@ -1266,31 +1267,6 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>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</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>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</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>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</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>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</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFzTCCBLWgAwIBAgIDIq6KMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMjEwNjE2MDkwNDMzWhcNMjIwNjE2MDkwNDMzWjCBhzELMAkGA1UEBhMCSVMxFjAUBgNVBAsTDWVpbmthc2tpbHJpa2kxFDASBgNVBAsMC0F1w7BrZW5uaW5nMQswCQYDVQQLEwIxMTETMBEGA1UEBRMKMTExMTg4MzAwOTEoMCYGA1UEAwwfU3ZhdmEgR2Vyw7B1ciBJbmdpbXVuZGFyZMOzdHRpcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOKxHqgk/8c0AmyC/6we1zwJCqxA8U5kGt6qvS21HEveJKUk1zAbGqadAeDukbfTivDNhd7KedaTEOL7RfVN+cQJqwWAfcJUbdhMR6IguxtC4Hnc3WXMWRFuKRuGzEILZBhI5nD+HzyxESMj/EBSKe+TFsoxRc2WNx+9b6Yfd97Q4zlrWK3sXwc3JqTX8CKYzJzB7w4XKe/1WASPlFDp7chRlLmJmwkD4SXTUbB71FKmBQX4/daR8lCGFiwbMR2TT4ZleAJt8vF6hn7ekelMRuvHk3nTgy1IXtObfBydm6UHUZBoqHmV173F23spTd/pc2TcUiEmbKeqTqXEyZ4MpOkCAwEAAaOCAkgwggJEMAwGA1UdEwEB/wQCMAAwdwYIKwYBBQUHAQEEazBpMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5hdWRrZW5uaS5pczBCBggrBgEFBQcwAoY2aHR0cDovL2NkcC5pc2xhbmRzcm90LmlzL3NraWxyaWtpL2Z1bGxnaWx0YXVka2VubmkucDdiMIIBDwYDVR0gBIIBBjCCAQIwgf8GCWCCYAECAQEBAjCB8TCBtwYIKwYBBQUHAgIwgaoagadUaGlzIGNlcnRpZmljYXRlIGlzIGludGVuZGVkIGZvciBhdXRoZW50aWNhdGlvbi4gVGhpcyBjZXJ0ZmljYXRlIGZ1bGZpbHMgdGhlIHJlcXVpcmVtZW50cyBmb3IgYSBxdWFsaWZpZWQgY2VydGlmaWNhdGUgYXMgZGVmaW5lZCBpbiBhY3QgMjgvMjAwMSBhbmQgRGlyZWN0aXZlIDk5LzkzL0VDLjA1BggrBgEFBQcCARYpaHR0cDovL2NwLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvY3AwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFMIpPob/hsTaNR9ppqT/AYM8SjOpMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuYXVka2VubmkuaXMvZnVsbGdpbHRhdWRrZW5uaS9sYXRlc3QuY3JsMB0GA1UdDgQWBBRP0xNSYRfoAKJosUeOWiO5qKs5vjANBgkqhkiG9w0BAQsFAAOCAQEAxTp8gmBY2Gla0+rHE4DW5Ze459sth1HrG8G1KkCoz4BZzczdRrf2zmcYgcmQ31p1+2LzNMGnVy3nVw5rTqFDV8S8aEBzkwiC9syKgkbXMwjwIZKKCGQtSq/NqmsffLbY1K+IWVp0bwiERmo0IdXf+AjsPrZceHd8T0gCLkH991H+yKIGncD1pqDFAUPr4s6eQANFxCtqgEBbCk0s/e60RRwwhbTP+b8EH02kPWa6v6mH8tgICbykW16uxSTZi7ZF9emkI8coxFrC3MKFj14jAciAPRTQmeauePnkZzjM0ypcP1O6NdcMKz44EmKBzfcxKFfoJZepU8Cq8Z4HOd88SA==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>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</X509Certificate>
@@ -1301,8 +1277,13 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>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</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>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</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
-                <TSLLocation>https://www.fjarskiptastofa.is/library/skrar/tsl/tsl.pdf</TSLLocation>
+                <TSLLocation>https://tsl.fjarskiptastofa.is/library/skrar/tsl/tsl.pdf</TSLLocation>
                 <AdditionalInformation>
                     <OtherInformation>
                         <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
@@ -1315,7 +1296,7 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                     </OtherInformation>
                     <OtherInformation>
                         <SchemeOperatorName>
-                            <Name xml:lang="en">The Electronic Communications Office of Iceland</Name>
+                            <Name xml:lang="en">Electronic Communications Office of Iceland</Name>
                             <Name xml:lang="is">Fjarskiptastofa</Name>
                         </SchemeOperatorName>
                     </OtherInformation>
@@ -1329,31 +1310,6 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIF8DCCBNigAwIBAgIDFT0uMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMTcwNjI3MDkwMjA0WhcNMTkwNjI3MDkwMjA0WjCBqjELMAkGA1UEBhMCSVMxFjAUBgNVBAoTDU5leXRlbmRhc3RvZmExFzAVBgNVBAsTDnN0YXJmc3NraWxyaWtpMRQwEgYDVQQLDAtBdcOwa2VubmluZzEKMAgGA1UECxMBNzEeMBwGA1UEBRMVMTExMTg4MzAwOTo2OTA2MDUzNDEwMSgwJgYDVQQDDB9TdmF2YSBHZXLDsHVyIEluZ2ltdW5kYXJkw7N0dGlyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAynhUWV19neexV6+81RRyyDVE/JCJ650gy5GhYXLS3rWbOY+viHmw7u4R1UMbVKOF7BLsZOrfyvQzOeTrUo9siR7tNDSYp+q4YXdP0QXigT3wyh3ANoVO24eetemfpGBCI7bLxXZ0l+y7OvSpe9kkqJgw+R4OTgIUWiEpGYIM20wkdo89OQxFaNP6Sp6BzORCUca//KETpeMDEZ6j0H1YAPjxI0SbfraLJMkI9bs+uuS44B4SqBPTpHOqxUUQDR7DlLtNr2xNoFrJP+ks7+Lo/bjnSTfJaNby4Lp9YVO5/t0hVO7D1gCeIr1SWhWc42i499XBKGZmXhtKQR2xBRYHjQIDAQABo4ICSDCCAkQwDAYDVR0TAQH/BAIwADB3BggrBgEFBQcBAQRrMGkwIwYIKwYBBQUHMAGGF2h0dHA6Ly9vY3NwLmF1ZGtlbm5pLmlzMEIGCCsGAQUFBzAChjZodHRwOi8vY2RwLmlzbGFuZHNyb3QuaXMvc2tpbHJpa2kvZnVsbGdpbHRhdWRrZW5uaS5wN2IwggEPBgNVHSAEggEGMIIBAjCB/wYJYIJgAQIBAQECMIHxMIG3BggrBgEFBQcCAjCBqhqBp1RoaXMgY2VydGlmaWNhdGUgaXMgaW50ZW5kZWQgZm9yIGF1dGhlbnRpY2F0aW9uLiBUaGlzIGNlcnRmaWNhdGUgZnVsZmlscyB0aGUgcmVxdWlyZW1lbnRzIGZvciBhIHF1YWxpZmllZCBjZXJ0aWZpY2F0ZSBhcyBkZWZpbmVkIGluIGFjdCAyOC8yMDAxIGFuZCBEaXJlY3RpdmUgOTkvOTMvRUMuMDUGCCsGAQUFBwIBFilodHRwOi8vY3AuYXVka2VubmkuaXMvZnVsbGdpbHRhdWRrZW5uaS9jcDAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUwik+hv+GxNo1H2mmpP8BgzxKM6kwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5hdWRrZW5uaS5pcy9mdWxsZ2lsdGF1ZGtlbm5pL2xhdGVzdC5jcmwwHQYDVR0OBBYEFG6yb/WC3J34QuEWui4vIu5hNOzdMA0GCSqGSIb3DQEBCwUAA4IBAQBzjFitVx9xn1zhcgBiq5vJwfUecYU+f1Pt7Hsg9cP+oM/cNAu1wifGDcWszsdnsIKbpEbAm4gn/Izb64PcEUlfXb3rdchCtUK2strD5UGHkyv7z3fWnEj8dbe1Z/1t5U2gnph/uGc2FzaKKb9M4wL0Dt7NFC3yBcPnFxYNHLAP+H9+byQLeTkPdFHgEatGoe03YDmQvT/DMNIKGhrlBpyW286VEZLrJjU168iYUU+YWWw2PaMmtPG6TQDOlQUyCrF4pgXTOA4FKwiR7pCDQqrcu9IwI5FaFp2gAKKEfpPffxf4FMk+T6mDYyRjg6Qf2zXSyhb/DQUS8mo+Y9qOwffC</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>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</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>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</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>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</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFzTCCBLWgAwIBAgIDIq6KMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNVBAYTAklTMRMwEQYDVQQFEwo1MjEwMDAyNzkwMRUwEwYDVQQKEwxBdWRrZW5uaSBoZi4xJzAlBgNVBAsTHlV0Z2VmYW5kaSBmdWxsZ2lsZHJhIHNraWxyaWtqYTEaMBgGA1UEAxMRRnVsbGdpbHQgYXVka2VubmkwHhcNMjEwNjE2MDkwNDMzWhcNMjIwNjE2MDkwNDMzWjCBhzELMAkGA1UEBhMCSVMxFjAUBgNVBAsTDWVpbmthc2tpbHJpa2kxFDASBgNVBAsMC0F1w7BrZW5uaW5nMQswCQYDVQQLEwIxMTETMBEGA1UEBRMKMTExMTg4MzAwOTEoMCYGA1UEAwwfU3ZhdmEgR2Vyw7B1ciBJbmdpbXVuZGFyZMOzdHRpcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOKxHqgk/8c0AmyC/6we1zwJCqxA8U5kGt6qvS21HEveJKUk1zAbGqadAeDukbfTivDNhd7KedaTEOL7RfVN+cQJqwWAfcJUbdhMR6IguxtC4Hnc3WXMWRFuKRuGzEILZBhI5nD+HzyxESMj/EBSKe+TFsoxRc2WNx+9b6Yfd97Q4zlrWK3sXwc3JqTX8CKYzJzB7w4XKe/1WASPlFDp7chRlLmJmwkD4SXTUbB71FKmBQX4/daR8lCGFiwbMR2TT4ZleAJt8vF6hn7ekelMRuvHk3nTgy1IXtObfBydm6UHUZBoqHmV173F23spTd/pc2TcUiEmbKeqTqXEyZ4MpOkCAwEAAaOCAkgwggJEMAwGA1UdEwEB/wQCMAAwdwYIKwYBBQUHAQEEazBpMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5hdWRrZW5uaS5pczBCBggrBgEFBQcwAoY2aHR0cDovL2NkcC5pc2xhbmRzcm90LmlzL3NraWxyaWtpL2Z1bGxnaWx0YXVka2VubmkucDdiMIIBDwYDVR0gBIIBBjCCAQIwgf8GCWCCYAECAQEBAjCB8TCBtwYIKwYBBQUHAgIwgaoagadUaGlzIGNlcnRpZmljYXRlIGlzIGludGVuZGVkIGZvciBhdXRoZW50aWNhdGlvbi4gVGhpcyBjZXJ0ZmljYXRlIGZ1bGZpbHMgdGhlIHJlcXVpcmVtZW50cyBmb3IgYSBxdWFsaWZpZWQgY2VydGlmaWNhdGUgYXMgZGVmaW5lZCBpbiBhY3QgMjgvMjAwMSBhbmQgRGlyZWN0aXZlIDk5LzkzL0VDLjA1BggrBgEFBQcCARYpaHR0cDovL2NwLmF1ZGtlbm5pLmlzL2Z1bGxnaWx0YXVka2VubmkvY3AwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFMIpPob/hsTaNR9ppqT/AYM8SjOpMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuYXVka2VubmkuaXMvZnVsbGdpbHRhdWRrZW5uaS9sYXRlc3QuY3JsMB0GA1UdDgQWBBRP0xNSYRfoAKJosUeOWiO5qKs5vjANBgkqhkiG9w0BAQsFAAOCAQEAxTp8gmBY2Gla0+rHE4DW5Ze459sth1HrG8G1KkCoz4BZzczdRrf2zmcYgcmQ31p1+2LzNMGnVy3nVw5rTqFDV8S8aEBzkwiC9syKgkbXMwjwIZKKCGQtSq/NqmsffLbY1K+IWVp0bwiERmo0IdXf+AjsPrZceHd8T0gCLkH991H+yKIGncD1pqDFAUPr4s6eQANFxCtqgEBbCk0s/e60RRwwhbTP+b8EH02kPWa6v6mH8tgICbykW16uxSTZi7ZF9emkI8coxFrC3MKFj14jAciAPRTQmeauePnkZzjM0ypcP1O6NdcMKz44EmKBzfcxKFfoJZepU8Cq8Z4HOd88SA==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>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</X509Certificate>
@@ -1364,8 +1320,13 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>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</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>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</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
-                <TSLLocation>https://www.fjarskiptastofa.is/library/skrar/tsl/tsl.xml</TSLLocation>
+                <TSLLocation>https://tsl.fjarskiptastofa.is/library/skrar/tsl/tsl.xml</TSLLocation>
                 <AdditionalInformation>
                     <OtherInformation>
                         <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
@@ -1378,7 +1339,7 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                     </OtherInformation>
                     <OtherInformation>
                         <SchemeOperatorName>
-                            <Name xml:lang="en">The Electronic Communications Office of Iceland</Name>
+                            <Name xml:lang="en">Electronic Communications Office of Iceland</Name>
                             <Name xml:lang="is">Fjarskiptastofa</Name>
                         </SchemeOperatorName>
                     </OtherInformation>
@@ -1503,6 +1464,11 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>MIID3TCCAsWgAwIBAgIFEgJr+EMwDQYJKoZIhvcNAQELBQAweTELMAkGA1UEBhMCTFQxSTBHBgNVBAoMQENvbW11bmljYXRpb25zIFJlZ3VsYXRvcnkgQXV0aG9yaXR5IG9mIHRoZSBSZXB1YmxpYyBvZiBMaXRodWFuaWExHzAdBgNVBAMMFkRhcml1cyBNaWNoYWxjZXZpxI1pdXMwHhcNMjUwMzE5MDAwMDAwWhcNMjkwMzE5MDAwMDAwWjB5MQswCQYDVQQGEwJMVDFJMEcGA1UECgxAQ29tbXVuaWNhdGlvbnMgUmVndWxhdG9yeSBBdXRob3JpdHkgb2YgdGhlIFJlcHVibGljIG9mIExpdGh1YW5pYTEfMB0GA1UEAwwWRGFyaXVzIE1pY2hhbGNldmnEjWl1czCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKi6HwWhlRC3S0crrF8OpGpgazh2GL7Nm11dWVztTN+cH/rv6Nq7iKbUOrhVGoiVPx6mIMe+lU2WGtS+LYxu65zJRtcM3KGiquFuWwBR+BSNMD5j1cWDGkwY2OwkiOMndnD856tedneVmagy9eUBfucK+z/knp7ohhSneM83Zsk28v39/akViOwsuw1WwfiybkXmtBKCFIQg32KHPZ5po4n7FhLNFdezGWwjG0dDZZ/PKQfRIWGdItH2oxbP2cJTIEiaCtRd9ZzepaC9bo7c6EAZ/HeEcDsd0JqCey92EXA2vI+riXGl3UstA38TEBbtj5+0mUQlOSPUheDou7CA1EcCAwEAAaNsMGowHQYDVR0OBBYEFCQPtsUDe8aL9BmUAS6JfcpZU7z4MAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADAbBgNVHSUEFDASBggrBgEFBQcDAgYGBACRNwMAMA0GCSqGSIb3DQEBCwUAA4IBAQCnSU2u2AOenwLpSn+nAufx6rUDBqzXE8/KC4b0e9AbsnXMEKwb/rUWn+KnQX6+X4+Vuuvu8CuiAGyYEzn/NDWV7qR0ZGF5gxGHvr0ijlhvGlwWmuKkgeO4IOqEVTYrJnnEDlk3bTNABC1fJEK+8CyfR9gPddgOgRTh2J+1h3VpOW2b9CdLoFDZMGXRZvogvoKMGte883yJl+FuKGhU0aRmfeDiVfyBGUH1R5olMqSd4F1FMgLfxzSV/Ud6XacXod5L6wubrtTi5wHtQ3cCRd6We127jijHVtqyA/Fwy3DeaYWB285OxzlO3+Q+e0AQJflYHOAwps33VfuuWRfnEM93</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIDQDCCAiigAwIBAgIFEjkEClswDQYJKoZIhvcNAQELBQAwOTELMAkGA1UEBhMCTFQxDDAKBgNVBAoMA1JSVDEcMBoGA1UEAwwTQXVyaW1hcyBNYWNpamF1c2thczAeFw0yNTA3MDkwMDAwMDBaFw0zMDA3MDkwMDAwMDBaMDkxCzAJBgNVBAYTAkxUMQwwCgYDVQQKDANSUlQxHDAaBgNVBAMME0F1cmltYXMgTWFjaWphdXNrYXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDDtqErPgH5YFEErjqJB2+PFE7t41596aAcNjnqEe6gcayXU7Cx3aex6BoPEnDQMhqxj8enUWJEx6fafeZgPAbSZ7HQ5/BsWcpIWK3l4GWjRV3Tx0p8rS588/yQjmoHqHTFNyxIYz+nK69lY/WyRjl3Fay7Nof4iv53MxMLGzCvP5l9Iyi2TKx/jcyAWbydUsA2/63mZhK73eG3Q1CpVvU0VN0A8qWW01VPalk5rYlx8ToBznjSkO4ZfKnfyh87Tl7lHDuQQM7CzaISos1bw1i8Ua2IN/YkZbS3/HLT6IhMbtUl8fYWE6e/DU++SkCZilK6MRU1SveaHlW9swwe45xTAgMBAAGjTzBNMB0GA1UdDgQWBBSRyRpOXkaNOg8jFNjJSeBmi2eoqDAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIGwDARBgNVHSAECjAIMAYGBFUdIAAwDQYJKoZIhvcNAQELBQADggEBAMJVOCWiCOxxumwvXWK+ikLfhpT1sIAnrXss/MSecAzMvw0VlB7kIVguYVUW+KpOSYdRFzBsojAhgJR5hZ7cg+KLP5xD/i2ZXVR3AFmAxeEb+RXHZb9goCce2QGgPS9NQk0VLtvT8HtRBwOj6WT6GUnMPL4sOF5ZS3fB5rs7Od/XOCfHcfFn4GjUV5ExLrOyVZP2AsiSrdk48nW5VUZTzlse5d7Gx1cOLYDiAbhw9z1hwvY3MZejGeJwJkKLx/v+TXOqzbgBWId3ipHR+VjR2hCDUvTaiSSVCMKDt/lsdzGIiqyppR2hqkR/LCLdiyNUx3BKNInZPo0047wDkzHCVpc=</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>https://elektroninisparasas.lt/LT-TSL.xml</TSLLocation>
                 <AdditionalInformation>
@@ -1531,21 +1497,6 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFyjCCA7KgAwIBAgIILpHpW3o+uucwDQYJKoZIhvcNAQENBQAwezELMAkGA1UEBhMCTFUxEDAOBgNVBAcTB0JlbHZhdXgxDjAMBgNVBAoTBUlMTkFTMSEwHwYDVQQLExhEaWdpdGFsIFRydXN0IERlcGFydG1lbnQxDjAMBgNVBAMTBUlMTkFTMRcwFQYDVQRhEw5WQVRMVS0yMjk1OTQ2MzAeFw0yMTAxMjUxMjAyMDBaFw0yNDAxMjUxMjAyMDBaMHsxCzAJBgNVBAYTAkxVMRAwDgYDVQQHEwdCZWx2YXV4MQ4wDAYDVQQKEwVJTE5BUzEhMB8GA1UECxMYRGlnaXRhbCBUcnVzdCBEZXBhcnRtZW50MQ4wDAYDVQQDEwVJTE5BUzEXMBUGA1UEYRMOVkFUTFUtMjI5NTk0NjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvsB0pGx4nxqQG7beQiyRav7tuR7oWxilegXIwQ6cbNIZ4hA0B6jiODcAqhoRIn09kEdLmH/aQxiWFiw2eXPHTun7F+1fVuae2arJAWtr16c6x9ScB3o4MCv6z4QQbF+Dvsq1Tjm2A7A9J2Tbj/4RZ5QuiaOFp01emaPzDQJoalowpP9Be+TbvCrz8pzQgtX+nR0df2dUxBYxdLifKTNFXGtfK0VT+j1WK/hbT8rHn4fAcVSbBN6W1G16AQgTsYSyUzmrd60KTc/WOxdk0kLBnJMLS4g5STEB/gCUEwhQVE4lgoAUFCOfqOUaVRu7FIXs4djmi1EBNZipkVWeVeVxM3NLX+x63HdNq8Z3Ei5GUuyEz+b+p3SAMQISzcHUVC0oZnxmapbQAQLqAuxsORVCYQstRrDxlTrU+qOSi0LM9XcqEKEggNS2GVn39vVlrrUV/dNHgy9uFXcRj3Qj+6RLF2IrO0/RPIt6I8tBvxnzeXYxLbwDhMGJFFHqOSMZXRh/onMV4i3n+M467c2EaLg2+yj40sDdbNKZ8ZWkAKtNWUv3N/xA2BVC7eqx+qnPUz+pPaHPr8gKBL9oL7D/uD8H+aKRTLqcWBwl1vZNvlwP8BfrGllDd8FeDQ4GE/GFwSizFgQJ/UlBnXtGeV1GZbkr1fFMjfNQo7biprzfeLzOSWQIDAQABo1IwUDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBT32GzxQiIsVwveYyekqyfDBOcicDAOBgNVHQ8BAf8EBAMCBkAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBDQUAA4ICAQCKA605U47QUN+IR7wBd1F57N49RXyjx/j70TK1tV0f9MAum4Gp0r5lroomEt6uLt4TavMWoLTg4WTGopjs3/Ay2Ge0LPqw7g35iT4Nlls2Id52PDRmSvowF+ZvRgoZZ+l4zF1d/wZzBl7doeQd1kQn7i0LZkyHqiv7u9DMJvqNZ2oKhDVx1D+JEAGjIiS+pJAqcSvhO+fZTHYxg7E234Df8N3EnDqecyf5963FzSdZ/qPF6+RfgU+h4IXHW4bTWfYmi1diBdUfk2cgFCWMMFLBccNozZ8mSSAP3L0/kRd4fGi1J7Jz2HA94FSIk/JycQ3W6wPj4YA7NgR0QoNMudRzScnMOhL6Le/ag9i7TNoXZ3DYs+LrU8P5NoB5bjvGckFnYyb8BU/ElHqwzzmbRztnLxcemjaVW/b2IIEcaAMw4iYfeiOQQnpbCTnrxBuXnebW7+lcLVTOkIDeadlBa8hPBWHdJinPDJqeZGFCAlR9yHPtNpM6hyGHq6dKzLnbyAaC63NhlLoKJx+ojNskQv5odYZgaYY4GQvpSNP+Ao8H17RjARzLSdGAx0cEAe4isIiaVt1aJJ3D38Mt77wIWtQUhoGk/EWrfagCqHOLmmFbkDnBIkGWfBqAeNfyJ2s1S2XFRnPpLOgb/3N7wl0wdAVnqHZBMEAxc/3Fw7ell22VEw==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFyjCCA7KgAwIBAgIIN96pSLYjpaUwDQYJKoZIhvcNAQENBQAwezELMAkGA1UEBhMCTFUxEDAOBgNVBAcTB0JlbHZhdXgxDjAMBgNVBAoTBUlMTkFTMSEwHwYDVQQLExhEaWdpdGFsIFRydXN0IERlcGFydG1lbnQxDjAMBgNVBAMTBUlMTkFTMRcwFQYDVQRhEw5WQVRMVS0yMjk1OTQ2MzAeFw0yMTA5MTYwODAzMDBaFw0yNDA5MTYwODAzMDBaMHsxCzAJBgNVBAYTAkxVMRAwDgYDVQQHEwdCZWx2YXV4MQ4wDAYDVQQKEwVJTE5BUzEhMB8GA1UECxMYRGlnaXRhbCBUcnVzdCBEZXBhcnRtZW50MQ4wDAYDVQQDEwVJTE5BUzEXMBUGA1UEYRMOVkFUTFUtMjI5NTk0NjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCZX10hzC0iWywty8kEH/h19gZ3xp/N4mJ7YaFNT1fn5jwwYsfXCzWWKvuqGEXst2B6tCr44eKfYkoF5JD6wmK00YFYNn8Hfnj3s1BTKcin31a9ku43TzSD3sgqqdsmiDXAqS8mSfwSf1KHwDny01vuf1TDbalXOCn2RtTxXviDZ55osUnxfrBVp0B78tDlsYbYF5MLmKPbxIn5TejyZvuTmKvLqiMtcY2+1y4Uk3XDrRCODKFUdM/sB9uDZF6Q82lS5bSWftQ5wJyhgwhBhBF7yielX+ZrpD+jQe5cwwL2IRPQetoBW7EecNcRh8ZG5GAjYiunWYgbdyZRxOxmXjEfBYKqThTrO7FA7h7voV+6I0uNMSF5ufbjZLPuwqaWVeeWtTHUVfiyQZ/+Cg5FM6qvIEdGmYM60K0EUg+eyRoDCp6+LqZzNuMKFR/B3uS+ss+fVCCFujXzHflnmwzbrzLSL2oyx/S58q/HddPAj48Uqspy/94z7SimRZ12h+msswwHUub3IOBYJ0L/WShUFXJn0us2tL/G2xtvkipXOmq7WvdY4y+Iktfa2ENKeVY66Lu94rVlbR0gJrCPLp+qYQMxogj+X13fHaPqsoLk3+vA2p+zuso9/rK3cfMqDBTX+xHRv0un2pMe1owVJFIRivrHAy95lN5PQV+B7Rgck7c2TQIDAQABo1IwUDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQoqvweA03M5WOqjl6myOlS/LnDMjAOBgNVHQ8BAf8EBAMCBkAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBDQUAA4ICAQAcsug8LqMaQp2nIgxXVozMluKNznpuMDe+xtYzlomB3SOOOgrB51sRdzdVSaUF9NEH+Iuj1DvilNXmo7Q7UL3CCW3PNKDxWvwv+fYB/iiImyha+0P7afRyCIkwJxWIDS+hOzD45C9sgKXkLWuROAjeOJMSKjfPDSrGkkY9UahGBcVl71MsRlBn2f95rwAEZCgCPqP2w0Jgq5xVW8Pih11eti6H5rt/jcCC3bQmbkmwYInvV2wUq7KfDeaFQvA9+xoQZph+CFs+RVvbmQe6KtAxAS8VzY2sPLPt/SA0vvKozLVLfJ5zbEMHAQnVtQc7lHHH3+rRMGRBAmJ9eG1uER7vJEbvWjRvk1jKdiH7NSVTShj0v+2OrnXdh23fcUirVqPNjOqdmZ7zdf0mDpuj4iFfQkznMcHytpXhXAdYvuSzrOSMbFMyhp7cIgsBfPL4gDdlgC68JPOdRp1sbOn9InUqhpTrWeNDcsGB3PHxDrBN2jpsH+M5pAYMhqYxsVeVcAJQoJcVom+gNe+R+s1c4BCvdhcWCfe2J6sS9hCuLcruLQ60MCXE7vYoWC3hPOIROxDtLyZsVJLtFmOTYXzyDIvgewvAwGlDgihD0RhTPqVnMaUuvc/A7r6r0T7is5ejcKkanYn84STa3g72osgC7nP6DbjG9i2htIFzqy3twtOQiw==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFyjCCA7KgAwIBAgIIQqo2XTziviwwDQYJKoZIhvcNAQENBQAwezELMAkGA1UEBhMCTFUxEDAOBgNVBAcTB0JlbHZhdXgxDjAMBgNVBAoTBUlMTkFTMSEwHwYDVQQLExhEaWdpdGFsIFRydXN0IERlcGFydG1lbnQxDjAMBgNVBAMTBUlMTkFTMRcwFQYDVQRhEw5WQVRMVS0yMjk1OTQ2MzAeFw0yMTA5MTYwODU0MDBaFw0yNDA5MTYwODU0MDBaMHsxCzAJBgNVBAYTAkxVMRAwDgYDVQQHEwdCZWx2YXV4MQ4wDAYDVQQKEwVJTE5BUzEhMB8GA1UECxMYRGlnaXRhbCBUcnVzdCBEZXBhcnRtZW50MQ4wDAYDVQQDEwVJTE5BUzEXMBUGA1UEYRMOVkFUTFUtMjI5NTk0NjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDMFVzLD8dlcSH8Y+acLPpSPIwbKh5t59sqvX409UEbhLvIs3g8nJ6YO5Npnl2NrQ7C9FewcYzhsotljFnJlyIf2ljito8JOR2z9pgi/q6rJWmnJ2kcwx8hoVi+BlWRJa2/aB11mhWi75Y7DgxKC55obcqf7JVncHHQaW8V0qtI21pvW4KtrBLzMLHihO4SonLEJ96U+AuEEMfPEIYwh9hE0wHIZPHn6FPWVPXduNn/1sgP5b3rsHhQdwoFVwP/vzrh4Fn2qJLiZXFm7T7t5msK0Zvjt/0xL/TXr+Pa1I3j6hrszrxE9pfY9NZ5uJaHf/Qa+14SrANvxkZVu+pOYBZQIzjnlGftMouBlWfOh7RHW+SjeRLCVKPGViCoGxfd0/BFdHR3ry40JnYjU20mk9ifwpgtfDc1iXnuwVTH7MeHY8lXG3EAposINYQ+Y+XzIskt+4ArX7ym26GM0LN+eLXQJyVUD+mjhpSXAFNLJSIDxoXG7P68ysRBe8YSlfhURohPrcE/2CAbZcH/NEzXjpe2EpJsPGfnEU1bFc0SR+BoivSsRFIMbE3NeUVzs+0j2XduYEr4DH9hb3t1ASQoeW09m4TPxd6fA8cGaBmk/KuX3xynJRLxfNju8Ky6vGykiAmnOQH6pcXy+n58nu+19umJBsIDKzV5VjGKS1khznkfmQIDAQABo1IwUDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRkCOkYEDB6+U1QinT+vv0jXbmFDDAOBgNVHQ8BAf8EBAMCBkAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBDQUAA4ICAQB6cbQ5VuGRgX5Dx5KXjYNKZhxwRqcYHpJvk8cXoWIFkk+jkk5hnnSsson2Rpjya8R4VCyYY/56bLxicIs+n7panEaUIqvAZbUqe/lfGfjNo7wqsNV7ovqxVCagyeGHHtWvVhw87NSXpr9tyafIdbSvuBS0Yk6xog3trzqvQIPkv+XzH6lpKPONmFxa7jnQjOsib76kT6ZCYulSo7xpgEOprzxwNIR0NJAtwTjGkkMY8v6qR8vJ1JQRjk6P6a+ivulmIryeEev4hmh5Iwfc4HcCskmaSigN2kRdvIZNN22tB8Tz3FRt/EuMOiwS36w3UBCFUhCXwioiMHl9eUo4pwyo6XrO7ZIROlZntOgvGYFSxelO5qKjs3OhX0fdW/qfstoJ6GglEM0HVk+gQJyU17lNdXA1DBKhMrfhDYumZQXiCSXnSIYGu2UzY/LnkyD/wgQxJ5m44E1gLsbtVp8lOHlDhByxbe3bvHLtbhd60nG5rHobU7yWeJL5actBgmBfEvkv5GJHy0n0ZEs0bUiav9laqwz4QauVv5d00ODk3KhdRnaz8pyihRuq0MWOZXdbTJsc5ABnweWVkABM1RlB2NZ1+hGuZq7lQXqZKMhFaHIX25kqLd652WvKanVTbS6MGWdIEjGWI4EHQqWilpUSHv9wsi1J5wqOJsaqxMz6udCioA==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>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</X509Certificate>
@@ -1556,6 +1507,11 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>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</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIICjDCCAhOgAwIBAgIUaLo3ZSTI6j1b5dQbKzfhN/epMKowCgYIKoZIzj0EAwQwfjELMAkGA1UEBhMCTFUxEDAOBgNVBAcMB0JlbHZhdXgxDjAMBgNVBAoMBUlMTkFTMSQwIgYDVQQLDBtOYXRpb25hbCBEaWdpdGFsIFRydXN0IEJvZHkxDjAMBgNVBAMMBUlMTkFTMRcwFQYDVQRhDA5WQVRMVS0yMjk1OTQ2MzAeFw0yNTA0MTEwNTQ2MzBaFw0yODA0MTAwNTQ2MzBaMH4xCzAJBgNVBAYTAkxVMRAwDgYDVQQHDAdCZWx2YXV4MQ4wDAYDVQQKDAVJTE5BUzEkMCIGA1UECwwbTmF0aW9uYWwgRGlnaXRhbCBUcnVzdCBCb2R5MQ4wDAYDVQQDDAVJTE5BUzEXMBUGA1UEYQwOVkFUTFUtMjI5NTk0NjMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATBSIwHyUDeq63bYo7RMX4JkbjUImjbBpblt5ioTpptvkoR1PyNojZaTnbWp1TzEwpehzzTYrwBN4uIE+vkV8Nue8PhJoh62iTDNXfYzfVZkou/ucqvC+SEB7lyn0JlhRSjUjBQMB0GA1UdDgQWBBSVtslX3RDZMeUu/A8f3QT8HcuHzTAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwCgYIKoZIzj0EAwQDZwAwZAIwJbzVladMHwIBBctEoahSV6Jr+1HkgR5vmP05kJsOa7kI2gX3zIdaXTsSJi27D8qJAjAnWNhUIKphR8joW+3c17Lr7aYhiba1j+Qljv88ErCAGVohBURK5EhlYMqWo579/y0=</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>https://trusted-list.lu/tsl.pdf</TSLLocation>
                 <AdditionalInformation>
@@ -1586,21 +1542,6 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFyjCCA7KgAwIBAgIILpHpW3o+uucwDQYJKoZIhvcNAQENBQAwezELMAkGA1UEBhMCTFUxEDAOBgNVBAcTB0JlbHZhdXgxDjAMBgNVBAoTBUlMTkFTMSEwHwYDVQQLExhEaWdpdGFsIFRydXN0IERlcGFydG1lbnQxDjAMBgNVBAMTBUlMTkFTMRcwFQYDVQRhEw5WQVRMVS0yMjk1OTQ2MzAeFw0yMTAxMjUxMjAyMDBaFw0yNDAxMjUxMjAyMDBaMHsxCzAJBgNVBAYTAkxVMRAwDgYDVQQHEwdCZWx2YXV4MQ4wDAYDVQQKEwVJTE5BUzEhMB8GA1UECxMYRGlnaXRhbCBUcnVzdCBEZXBhcnRtZW50MQ4wDAYDVQQDEwVJTE5BUzEXMBUGA1UEYRMOVkFUTFUtMjI5NTk0NjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvsB0pGx4nxqQG7beQiyRav7tuR7oWxilegXIwQ6cbNIZ4hA0B6jiODcAqhoRIn09kEdLmH/aQxiWFiw2eXPHTun7F+1fVuae2arJAWtr16c6x9ScB3o4MCv6z4QQbF+Dvsq1Tjm2A7A9J2Tbj/4RZ5QuiaOFp01emaPzDQJoalowpP9Be+TbvCrz8pzQgtX+nR0df2dUxBYxdLifKTNFXGtfK0VT+j1WK/hbT8rHn4fAcVSbBN6W1G16AQgTsYSyUzmrd60KTc/WOxdk0kLBnJMLS4g5STEB/gCUEwhQVE4lgoAUFCOfqOUaVRu7FIXs4djmi1EBNZipkVWeVeVxM3NLX+x63HdNq8Z3Ei5GUuyEz+b+p3SAMQISzcHUVC0oZnxmapbQAQLqAuxsORVCYQstRrDxlTrU+qOSi0LM9XcqEKEggNS2GVn39vVlrrUV/dNHgy9uFXcRj3Qj+6RLF2IrO0/RPIt6I8tBvxnzeXYxLbwDhMGJFFHqOSMZXRh/onMV4i3n+M467c2EaLg2+yj40sDdbNKZ8ZWkAKtNWUv3N/xA2BVC7eqx+qnPUz+pPaHPr8gKBL9oL7D/uD8H+aKRTLqcWBwl1vZNvlwP8BfrGllDd8FeDQ4GE/GFwSizFgQJ/UlBnXtGeV1GZbkr1fFMjfNQo7biprzfeLzOSWQIDAQABo1IwUDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBT32GzxQiIsVwveYyekqyfDBOcicDAOBgNVHQ8BAf8EBAMCBkAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBDQUAA4ICAQCKA605U47QUN+IR7wBd1F57N49RXyjx/j70TK1tV0f9MAum4Gp0r5lroomEt6uLt4TavMWoLTg4WTGopjs3/Ay2Ge0LPqw7g35iT4Nlls2Id52PDRmSvowF+ZvRgoZZ+l4zF1d/wZzBl7doeQd1kQn7i0LZkyHqiv7u9DMJvqNZ2oKhDVx1D+JEAGjIiS+pJAqcSvhO+fZTHYxg7E234Df8N3EnDqecyf5963FzSdZ/qPF6+RfgU+h4IXHW4bTWfYmi1diBdUfk2cgFCWMMFLBccNozZ8mSSAP3L0/kRd4fGi1J7Jz2HA94FSIk/JycQ3W6wPj4YA7NgR0QoNMudRzScnMOhL6Le/ag9i7TNoXZ3DYs+LrU8P5NoB5bjvGckFnYyb8BU/ElHqwzzmbRztnLxcemjaVW/b2IIEcaAMw4iYfeiOQQnpbCTnrxBuXnebW7+lcLVTOkIDeadlBa8hPBWHdJinPDJqeZGFCAlR9yHPtNpM6hyGHq6dKzLnbyAaC63NhlLoKJx+ojNskQv5odYZgaYY4GQvpSNP+Ao8H17RjARzLSdGAx0cEAe4isIiaVt1aJJ3D38Mt77wIWtQUhoGk/EWrfagCqHOLmmFbkDnBIkGWfBqAeNfyJ2s1S2XFRnPpLOgb/3N7wl0wdAVnqHZBMEAxc/3Fw7ell22VEw==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFyjCCA7KgAwIBAgIIN96pSLYjpaUwDQYJKoZIhvcNAQENBQAwezELMAkGA1UEBhMCTFUxEDAOBgNVBAcTB0JlbHZhdXgxDjAMBgNVBAoTBUlMTkFTMSEwHwYDVQQLExhEaWdpdGFsIFRydXN0IERlcGFydG1lbnQxDjAMBgNVBAMTBUlMTkFTMRcwFQYDVQRhEw5WQVRMVS0yMjk1OTQ2MzAeFw0yMTA5MTYwODAzMDBaFw0yNDA5MTYwODAzMDBaMHsxCzAJBgNVBAYTAkxVMRAwDgYDVQQHEwdCZWx2YXV4MQ4wDAYDVQQKEwVJTE5BUzEhMB8GA1UECxMYRGlnaXRhbCBUcnVzdCBEZXBhcnRtZW50MQ4wDAYDVQQDEwVJTE5BUzEXMBUGA1UEYRMOVkFUTFUtMjI5NTk0NjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCZX10hzC0iWywty8kEH/h19gZ3xp/N4mJ7YaFNT1fn5jwwYsfXCzWWKvuqGEXst2B6tCr44eKfYkoF5JD6wmK00YFYNn8Hfnj3s1BTKcin31a9ku43TzSD3sgqqdsmiDXAqS8mSfwSf1KHwDny01vuf1TDbalXOCn2RtTxXviDZ55osUnxfrBVp0B78tDlsYbYF5MLmKPbxIn5TejyZvuTmKvLqiMtcY2+1y4Uk3XDrRCODKFUdM/sB9uDZF6Q82lS5bSWftQ5wJyhgwhBhBF7yielX+ZrpD+jQe5cwwL2IRPQetoBW7EecNcRh8ZG5GAjYiunWYgbdyZRxOxmXjEfBYKqThTrO7FA7h7voV+6I0uNMSF5ufbjZLPuwqaWVeeWtTHUVfiyQZ/+Cg5FM6qvIEdGmYM60K0EUg+eyRoDCp6+LqZzNuMKFR/B3uS+ss+fVCCFujXzHflnmwzbrzLSL2oyx/S58q/HddPAj48Uqspy/94z7SimRZ12h+msswwHUub3IOBYJ0L/WShUFXJn0us2tL/G2xtvkipXOmq7WvdY4y+Iktfa2ENKeVY66Lu94rVlbR0gJrCPLp+qYQMxogj+X13fHaPqsoLk3+vA2p+zuso9/rK3cfMqDBTX+xHRv0un2pMe1owVJFIRivrHAy95lN5PQV+B7Rgck7c2TQIDAQABo1IwUDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQoqvweA03M5WOqjl6myOlS/LnDMjAOBgNVHQ8BAf8EBAMCBkAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBDQUAA4ICAQAcsug8LqMaQp2nIgxXVozMluKNznpuMDe+xtYzlomB3SOOOgrB51sRdzdVSaUF9NEH+Iuj1DvilNXmo7Q7UL3CCW3PNKDxWvwv+fYB/iiImyha+0P7afRyCIkwJxWIDS+hOzD45C9sgKXkLWuROAjeOJMSKjfPDSrGkkY9UahGBcVl71MsRlBn2f95rwAEZCgCPqP2w0Jgq5xVW8Pih11eti6H5rt/jcCC3bQmbkmwYInvV2wUq7KfDeaFQvA9+xoQZph+CFs+RVvbmQe6KtAxAS8VzY2sPLPt/SA0vvKozLVLfJ5zbEMHAQnVtQc7lHHH3+rRMGRBAmJ9eG1uER7vJEbvWjRvk1jKdiH7NSVTShj0v+2OrnXdh23fcUirVqPNjOqdmZ7zdf0mDpuj4iFfQkznMcHytpXhXAdYvuSzrOSMbFMyhp7cIgsBfPL4gDdlgC68JPOdRp1sbOn9InUqhpTrWeNDcsGB3PHxDrBN2jpsH+M5pAYMhqYxsVeVcAJQoJcVom+gNe+R+s1c4BCvdhcWCfe2J6sS9hCuLcruLQ60MCXE7vYoWC3hPOIROxDtLyZsVJLtFmOTYXzyDIvgewvAwGlDgihD0RhTPqVnMaUuvc/A7r6r0T7is5ejcKkanYn84STa3g72osgC7nP6DbjG9i2htIFzqy3twtOQiw==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIFyjCCA7KgAwIBAgIIQqo2XTziviwwDQYJKoZIhvcNAQENBQAwezELMAkGA1UEBhMCTFUxEDAOBgNVBAcTB0JlbHZhdXgxDjAMBgNVBAoTBUlMTkFTMSEwHwYDVQQLExhEaWdpdGFsIFRydXN0IERlcGFydG1lbnQxDjAMBgNVBAMTBUlMTkFTMRcwFQYDVQRhEw5WQVRMVS0yMjk1OTQ2MzAeFw0yMTA5MTYwODU0MDBaFw0yNDA5MTYwODU0MDBaMHsxCzAJBgNVBAYTAkxVMRAwDgYDVQQHEwdCZWx2YXV4MQ4wDAYDVQQKEwVJTE5BUzEhMB8GA1UECxMYRGlnaXRhbCBUcnVzdCBEZXBhcnRtZW50MQ4wDAYDVQQDEwVJTE5BUzEXMBUGA1UEYRMOVkFUTFUtMjI5NTk0NjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDMFVzLD8dlcSH8Y+acLPpSPIwbKh5t59sqvX409UEbhLvIs3g8nJ6YO5Npnl2NrQ7C9FewcYzhsotljFnJlyIf2ljito8JOR2z9pgi/q6rJWmnJ2kcwx8hoVi+BlWRJa2/aB11mhWi75Y7DgxKC55obcqf7JVncHHQaW8V0qtI21pvW4KtrBLzMLHihO4SonLEJ96U+AuEEMfPEIYwh9hE0wHIZPHn6FPWVPXduNn/1sgP5b3rsHhQdwoFVwP/vzrh4Fn2qJLiZXFm7T7t5msK0Zvjt/0xL/TXr+Pa1I3j6hrszrxE9pfY9NZ5uJaHf/Qa+14SrANvxkZVu+pOYBZQIzjnlGftMouBlWfOh7RHW+SjeRLCVKPGViCoGxfd0/BFdHR3ry40JnYjU20mk9ifwpgtfDc1iXnuwVTH7MeHY8lXG3EAposINYQ+Y+XzIskt+4ArX7ym26GM0LN+eLXQJyVUD+mjhpSXAFNLJSIDxoXG7P68ysRBe8YSlfhURohPrcE/2CAbZcH/NEzXjpe2EpJsPGfnEU1bFc0SR+BoivSsRFIMbE3NeUVzs+0j2XduYEr4DH9hb3t1ASQoeW09m4TPxd6fA8cGaBmk/KuX3xynJRLxfNju8Ky6vGykiAmnOQH6pcXy+n58nu+19umJBsIDKzV5VjGKS1khznkfmQIDAQABo1IwUDAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRkCOkYEDB6+U1QinT+vv0jXbmFDDAOBgNVHQ8BAf8EBAMCBkAwEQYDVR0lBAowCAYGBACRNwMAMA0GCSqGSIb3DQEBDQUAA4ICAQB6cbQ5VuGRgX5Dx5KXjYNKZhxwRqcYHpJvk8cXoWIFkk+jkk5hnnSsson2Rpjya8R4VCyYY/56bLxicIs+n7panEaUIqvAZbUqe/lfGfjNo7wqsNV7ovqxVCagyeGHHtWvVhw87NSXpr9tyafIdbSvuBS0Yk6xog3trzqvQIPkv+XzH6lpKPONmFxa7jnQjOsib76kT6ZCYulSo7xpgEOprzxwNIR0NJAtwTjGkkMY8v6qR8vJ1JQRjk6P6a+ivulmIryeEev4hmh5Iwfc4HcCskmaSigN2kRdvIZNN22tB8Tz3FRt/EuMOiwS36w3UBCFUhCXwioiMHl9eUo4pwyo6XrO7ZIROlZntOgvGYFSxelO5qKjs3OhX0fdW/qfstoJ6GglEM0HVk+gQJyU17lNdXA1DBKhMrfhDYumZQXiCSXnSIYGu2UzY/LnkyD/wgQxJ5m44E1gLsbtVp8lOHlDhByxbe3bvHLtbhd60nG5rHobU7yWeJL5actBgmBfEvkv5GJHy0n0ZEs0bUiav9laqwz4QauVv5d00ODk3KhdRnaz8pyihRuq0MWOZXdbTJsc5ABnweWVkABM1RlB2NZ1+hGuZq7lQXqZKMhFaHIX25kqLd652WvKanVTbS6MGWdIEjGWI4EHQqWilpUSHv9wsi1J5wqOJsaqxMz6udCioA==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>MIIHAzCCBOugAwIBAgIDT11tMA0GCSqGSIb3DQEBCwUAME4xCzAJBgNVBAYTAkxVMRYwFAYDVQQKDA1MdXhUcnVzdCBTLkEuMScwJQYDVQQDDB5MdXhUcnVzdCBHbG9iYWwgUXVhbGlmaWVkIENBIDMwHhcNMjIxMTAzMDkxMjA3WhcNMjUxMTAzMDkxMjA3WjCB/DEnMCUGCSqGSIb3DQEJARYYYWxhaW4ud2FobEBpbG5hcy5ldGF0Lmx1MQswCQYDVQQGEwJMVTELMAkGA1UEBxMCTFUxDjAMBgNVBAoTBUlMTkFTMRMwEQYDVQQLEwpMVTIyOTU5NDYzMSEwHwYDVQQLExhEaWdpdGFsIHRydXN0IGRlcGFydG1lbnQxEzARBgNVBAMTCkFsYWluIFdhaGwxDTALBgNVBAQTBFdhaGwxDjAMBgNVBCoTBUFsYWluMR0wGwYDVQQFExQxMTEwNTg4Nzc1MDAzMTU3MDEyNzEcMBoGA1UEDBMTUHJvZmVzc2lvbmFsIFBlcnNvbjCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKgU3Zw21aIZ3vu/4ZzHZBNzQYQZI/jbqiSDRYqUiFS0UzWJy5Uk0hFe7IDj3CK6904Mpyn0ppqBkU9Tpfl7k2OtmW3hhgitt/9XyuB1l29ndn7JXvlpSGGzMURw2FMzT6pFGmFWjwFgHYHSOLBsppIa3bzp+yTMpDvYU8sg2XM6L+UceCGRnZR9OjWmh2kacKJ4H2DSfZ7PaasPlLsDt5X0AdM+UtJetibosqLZ+gIR4Pw9d0D4lQ6qlnpV6utzFVz2/BJJyp3ulI6CNTl3x1z/PHbF7DSgIBu7CEFNzJHD8W6eAOTqTGGBGXlX2w4agWQsJda9o1C8UgMVYHNewHmZovGo5lYV4Nd6+VosBlCSAbBRBL9f+KpL7btRt3x8xxgQhr2nx55VJAA7Jaha30ioVYh0R+HuMfhP1e9v956paa/wsN5h/Gf7bLvUCpybV0ftESAcPh2ZetRdV6Zzy0+hAi8/BYDCoXy9ca4BA/8PNGSr2dNKPv8ux4BxK1cv4wIDAQABo4IBuTCCAbUwHwYDVR0jBBgwFoAUY4/CiwOxq47YU0eWHZmoffasqHUwgYEGCCsGAQUFBwEDBHUwczAIBgYEAI5GAQEwCAYGBACORgEEMEgGBgQAjkYBBTA+MDwWNmh0dHBzOi8vd3d3Lmx1eHRydXN0Lmx1L3VwbG9hZC9kYXRhL3JlcG9zaXRvcnkvUERTLnBkZhMCRU4wEwYGBACORgEGMAkGBwQAjkYBBgEwZgYIKwYBBQUHAQEEWjBYMCcGCCsGAQUFBzABhhtodHRwOi8vcWNhLm9jc3AubHV4dHJ1c3QubHUwLQYIKwYBBQUHMAKGIWh0dHA6Ly9jYS5sdXh0cnVzdC5sdS9MVEdRQ0EzLmNydDBOBgNVHSAERzBFMDgGCCuBKwEBCgMaMCwwKgYIKwYBBQUHAgEWHmh0dHBzOi8vcmVwb3NpdG9yeS5sdXh0cnVzdC5sdTAJBgcEAIvsQAECMDMGA1UdHwQsMCowKKAmoCSGImh0dHA6Ly9jcmwubHV4dHJ1c3QubHUvTFRHUUNBMy5jcmwwEQYDVR0OBAoECEl3P0PPIZMqMA4GA1UdDwEB/wQEAwIGQDANBgkqhkiG9w0BAQsFAAOCAgEAS0rLIhBuTO5ELEs/LmjS8tEqxnm2XtjpQKKcxKJdkqXfbUxcN/3g0/ZSIjugaUY3DoipJWDppWjiVQ9ZnZUSsrlXgScpzPwITrBZoOdYdmxbqBg4HqpjjIcSqvjPqfCy858FzxnF2dgxzjchhu/Bl8ZAQf0BlG9n+s/uWG2/d5oA0EgyLMEq7tTGuG2GGGrt8TU2XmdkdT8DACRGm4P+s6mpEAejL99umdJxUbotccFu2uYU8e3ps2RHdk3h4tsGgIXIOqhLGukhrxh+bNTtcORtphJlxx4LM03Dg1HNqCwMb0WY4cmj9ejIzJteMJJ1CbuZoFx0fux1FL3Cv9QkKxMNPXytKjJBHI22jSBKTjB+bF9EwSRXYlIqonODkjDKCYeFAG10azm1dYF96HSqoFpTG6RYtHFYNm0UJzp8UiJVYHNPMZnuwI70tkr0ROf5tfWbHBKWXpYGaAVaMu81qnldYTp0knX69Hz5wBx5DQLpidx2uDkiUJ5u701Cwszy0nO5qnEex3azW4gOZRcA/sF+pjLkPKSkTTyEQqYA/0FoECgACdMRhRGBiXykZdar8f1rvHdHbiL1Zn4wrUylnSKi8NtRgQWX64X1QZCJp5oX+SCuSzauX+AK+ZmFtXUmi1XLgoVJxgJHTLlmtVWqdPFMl3M13ntMV1SvYT8DsXo=</X509Certificate>
@@ -1611,6 +1552,11 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>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</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIICjDCCAhOgAwIBAgIUaLo3ZSTI6j1b5dQbKzfhN/epMKowCgYIKoZIzj0EAwQwfjELMAkGA1UEBhMCTFUxEDAOBgNVBAcMB0JlbHZhdXgxDjAMBgNVBAoMBUlMTkFTMSQwIgYDVQQLDBtOYXRpb25hbCBEaWdpdGFsIFRydXN0IEJvZHkxDjAMBgNVBAMMBUlMTkFTMRcwFQYDVQRhDA5WQVRMVS0yMjk1OTQ2MzAeFw0yNTA0MTEwNTQ2MzBaFw0yODA0MTAwNTQ2MzBaMH4xCzAJBgNVBAYTAkxVMRAwDgYDVQQHDAdCZWx2YXV4MQ4wDAYDVQQKDAVJTE5BUzEkMCIGA1UECwwbTmF0aW9uYWwgRGlnaXRhbCBUcnVzdCBCb2R5MQ4wDAYDVQQDDAVJTE5BUzEXMBUGA1UEYQwOVkFUTFUtMjI5NTk0NjMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATBSIwHyUDeq63bYo7RMX4JkbjUImjbBpblt5ioTpptvkoR1PyNojZaTnbWp1TzEwpehzzTYrwBN4uIE+vkV8Nue8PhJoh62iTDNXfYzfVZkou/ucqvC+SEB7lyn0JlhRSjUjBQMB0GA1UdDgQWBBSVtslX3RDZMeUu/A8f3QT8HcuHzTAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIGQDARBgNVHSUECjAIBgYEAJE3AwAwCgYIKoZIzj0EAwQDZwAwZAIwJbzVladMHwIBBctEoahSV6Jr+1HkgR5vmP05kJsOa7kI2gX3zIdaXTsSJi27D8qJAjAnWNhUIKphR8joW+3c17Lr7aYhiba1j+Qljv88ErCAGVohBURK5EhlYMqWo579/y0=</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>https://trusted-list.lu/tsl.xml</TSLLocation>
                 <AdditionalInformation>
@@ -1651,6 +1597,11 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>MIIFszCCA5ugAwIBAgIQREON56Jz1XRnY/6v2uHdxDANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCTFYxOTA3BgNVBAoMMFZBUyBMYXR2aWphcyBWYWxzdHMgcmFkaW8gdW4gdGVsZXbEq3ppamFzIGNlbnRyczEaMBgGA1UEYQwRTlRSTFYtNDAwMDMwMTEyMDMxGzAZBgNVBAMMEmVQYXJha3N0cyBJQ0EgMjAyMTAeFw0yNDEyMTkxMTA4MzFaFw0yODEyMTkxMTA4MzFaMHExCzAJBgNVBAYTAkxWMTUwMwYDVQQKDCxEaWdpdMSBbMSBcyBkcm/FocSrYmFzIHV6cmF1ZHrEq2JhcyBrb21pdGVqYTErMCkGA1UEAwwiTGF0dmlhbiBUcnVzdCBMaXN0IFNjaGVtZSBPcGVyYXRvcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ/A0ewgHlsdDanMiG+kN+ShkrWyN6M6v+JvQvvaRQLkt1StuDHbJw7RKcljZabjc2CYou6oZTu8mZkK6ps8VJZJ1DuuYwmPrENCkWI5flogM5dkNFzLhuSonoonqNEyJK344B/KurtKGiAHv1gG1U2nj9QETPPnq1CM2gz85mjk526azocFhmCnDOUZoawfwSmzV1B2VNVq0uik3ZUgk3WdWtwtiDwGPg36WDpaEOqXUdEdiePYsP6PaE5pgKnZDf2febs0u0wHC3c1k8EhuB8F4OZizE4mtS5AOxCehND0Ash5INkvYNnH3HcAkTVYxLAENUUahGR8PZcZFDb1NdkCAwEAAaOCATQwggEwMAwGA1UdEwEB/wQCMAAwEQYDVR0lBAowCAYGBACRNwMAMB0GA1UdDgQWBBSXG0PCnC4DR7s0WQ0ef0mKgFCG2zAfBgNVHSMEGDAWgBQZ6YJzV916YDK/6HQZJhX3rYD0FzAOBgNVHQ8BAf8EBAMCBkAwdQYIKwYBBQUHAQEEaTBnMD8GCCsGAQUFBzAChjNodHRwOi8vd3d3LmVwYXJha3N0cy5sdi9jZXJ0L2VQYXJha3N0c19JQ0FfMjAyMS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmVwYXJha3N0cy5sdjBGBgNVHR8EPzA9MDugOaA3hjVodHRwOi8vd3d3LmVwYXJha3N0cy5sdi9jcmwvZVBhcmFrc3RzX0lDQV8yMDIxXzE3LmNybDANBgkqhkiG9w0BAQsFAAOCAgEAW2dB1PN0Lrf/Upz+sV+07psL9B1P1ob7LPdYSAx6fPZyqywKTHsKyWqWbjxAHCMp8nPcuAEtlYjZ+Spc0RrfIVCbw/pasfNct48WMvkBJ86jZ+YgQlG5QcfK9cpBsPdf5He7/4GoxGM7nvEoas2tPs1foVGfBCsDUEhGj6Hwr7t8zwTtzglmUSMnnCTMiR8mLQPy8aXAB0D4w+06rsS3AhLRuRGb0aSyyFKW9x7X9JSyC1O9sF7D6y/sLa0ae1/VBUaJEgNBXH6UINdZEa05CYmblaUMHBarZpLlzOi7Fo+4lTV9e4gpOyw4q9AokmsVWYSna71GepoPQefGP1Pgy8Flv8fpk3Z5lSd45vKYPr/aUdnzbAcUfOv4PwLj/DL12wB0Phtwq/VC5P+PT9THJZx5VT4v10naDP1KoDr+SW/dcEwgVLWvDAtiA18cQtS5fP2eaMCciY8fn738DOzwq3NBIbpUkw9S/8wWEUHSir5bUhl2K/lo2kTsZ41HJBNY5OfgiHDwvz32xNYoExtyqXPiBxV4BJVxbZLmL92KYVJ24jaYoX1QE+4j3Vo8cu7EylK+ri+jYdGhjAEoGFCGS4BdS4W3hcYStyMkR9J3zmEQ1aiWyRwYqakinUhN+OPG4PQGybdGspQmjee442hTeQN/IVtuChqZMWatnEqmjuM=</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIFszCCA5ugAwIBAgIQatqKHNZIHZZoLdAWeppTITANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCTFYxOTA3BgNVBAoMMFZBUyBMYXR2aWphcyBWYWxzdHMgcmFkaW8gdW4gdGVsZXbEq3ppamFzIGNlbnRyczEaMBgGA1UEYQwRTlRSTFYtNDAwMDMwMTEyMDMxGzAZBgNVBAMMEmVQYXJha3N0cyBJQ0EgMjAyMTAeFw0yNTA1MjExMzA3MzRaFw0yOTA1MjExMzA3MzRaMHExCzAJBgNVBAYTAkxWMTUwMwYDVQQKDCxEaWdpdMSBbMSBcyBkcm/FocSrYmFzIHV6cmF1ZHrEq2JhcyBrb21pdGVqYTErMCkGA1UEAwwiTGF0dmlhbiBUcnVzdCBMaXN0IFNjaGVtZSBPcGVyYXRvcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKFhax6zUwiAyx/OT4vDB9UAdg2PMoBYuhcJQQCUKXqcMo/j1RJ3Md4rma0QjcJEIG2Ol81sLh7ejznNATG3/XZP7cg+EPTzYpnz+pn7jSY2nA7DfYRRr0OPYYgTAepDRtAV06+cpcwviB//IdjY2MIFpdykmd6BfwKLYHZkARLXSKADyZf310+DD5VBw+9br4jEAXanGS/aqHvKEGONpVB64nP4PZ69ulSYgK/MVJ0avmkbt/avdMInXm46NSHP6tHMOPA+OeWdKvv+FtpypggNptV9+2vVA9nEVO2N4IaIOoDjX16PzLJIVilJ9Ms7ieKHN6fKTrR7LCFUCybqKNcCAwEAAaOCATQwggEwMAwGA1UdEwEB/wQCMAAwEQYDVR0lBAowCAYGBACRNwMAMB0GA1UdDgQWBBQJA+o53eFwHXGwHg8voH14TAiJhjAfBgNVHSMEGDAWgBQZ6YJzV916YDK/6HQZJhX3rYD0FzAOBgNVHQ8BAf8EBAMCBkAwdQYIKwYBBQUHAQEEaTBnMD8GCCsGAQUFBzAChjNodHRwOi8vd3d3LmVwYXJha3N0cy5sdi9jZXJ0L2VQYXJha3N0c19JQ0FfMjAyMS5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmVwYXJha3N0cy5sdjBGBgNVHR8EPzA9MDugOaA3hjVodHRwOi8vd3d3LmVwYXJha3N0cy5sdi9jcmwvZVBhcmFrc3RzX0lDQV8yMDIxXzE3LmNybDANBgkqhkiG9w0BAQsFAAOCAgEAH/RXIOc+eiLkT+8S7a7aHJYpJLsM+AD+4w6cj9p7TTD78105KvuJoeq1VayE3vftSkBcDC94PzRZQiQZ9E9SvSGQtBHE63SocnXLF65vml4qGxUwH9AQ5x13vqKRSRB3WVCztiZ0t9E+zxYnxJzuS3G/j6ULAA9Wn7iVn0+KVUyHTVne0rQwyGK0prbCBm16nCbz1fwLiUnR+jnBqz6d72WEkLXS0TY3W7pev9YV1lp636urmHO+QKjKFlU23AVWOvuYvKFdZGRKFgB/lm66xtrrs0YAoIslb5QUKG6WHoi3oYsYu3IuYcZ51RFq7G7p41FYuOB1tS4OJcncrjiYKLeHcBKCwOo3HveDUkCcq681kSMsZZgIPrhiljXBvQKbFme4IdCJrfWLkmwL2bZoXPt+8PkUkVrtc66Hw4MyXq8YHBpAid1JjefXRgXgV4IcFoW10s8ypAlSdbvyU4veMyPQ7Bx7A/TRG5K54mnKUnClP+fiL6FfLROyKlNbWDxQNP9WWDU9UWl0vwGJz9lVS9mL0cVPKePxDHPCPcTYAbQVEnjdnWoBzYozAVgI7Qrgzm1PBmWtdDIKskQgNzmQcpShXVtdWA9Z96w9HcIMX4VzJYb4mVng1/6zCbBV5nSBfvqOiwZQfHqAi0okrUAWeQhHxluAMMdY09mqH/hBbFo=</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>https://trustlist.gov.lv/tsl/latvian-tsl.xml</TSLLocation>
                 <AdditionalInformation>
@@ -1732,7 +1683,7 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                         </DigitalId>
                     </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
-                <TSLLocation>https://www.rdi.nl/binaries/rdi/documenten/publicaties/bestanden/statisch/tsl/digitale-statuslijst-van-vertrouwensdiensten/current-tsl.xml</TSLLocation>
+                <TSLLocation>https://www.rdi.nl/site/binaries/site-content/collections/documents/current-tsl.xml</TSLLocation>
                 <AdditionalInformation>
                     <OtherInformation>
                         <TSLType>http://uri.etsi.org/TrstSvc/TrustedList/TSLType/EUgeneric</TSLType>
@@ -1835,11 +1786,6 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>MIIDaTCCAlGgAwIBAgIJANYIzUuXA+96MA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAlBMMSAwHgYDVQQKExdOYXRpb25hbCBCYW5rIG9mIFBvbGFuZDEcMBoGA1UEAxMTUG9saXNoIFRTTCBPcGVyYXRvcjAeFw0yMDA3MDYwOTAyNTBaFw0yNTA3MDUwOTAyNTBaME0xCzAJBgNVBAYTAlBMMSAwHgYDVQQKExdOYXRpb25hbCBCYW5rIG9mIFBvbGFuZDEcMBoGA1UEAxMTUG9saXNoIFRTTCBPcGVyYXRvcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMsyEHQSiCpsATgk5+uUw7NlBZeI+BtBYUwqnpwAKmnnVTlhGKqPwCNFw4e1PnDewRpirF3skiBTJ7Ab3UT8caWtLp3njeaecWw4nIe+uISFTS4qudGNMP2KNs2X4DWojzTA//La65OAWfCsYFCGuNLU+sEjbITU/TEGq7ijtXwbtpJt2hSJMGmibDJCj/aSuls+TxzlEBazmjDFeqLBgNE+woScReVGAI2j+DfBFFUQMllrIN96rtCN7yDKE4mjxdV8ZY4XOB+ABb+XBLPThtfZaGf8JfCMIH5fQGCZW1vCTj0K9J6Q5OagUVkC6n3EhmbfX8ZjDRka0FSVtzO/QB0CAwEAAaNMMEowCwYDVR0PBAQDAgeAMBEGA1UdJQQKMAgGBgQAkTcDADAJBgNVHRMEAjAAMB0GA1UdDgQWBBSuieMJHlsW0lxpUa5zD0aKL6xEZTANBgkqhkiG9w0BAQsFAAOCAQEAEUu17bXCPpepjBb7QvMA28GMWQe4Up06tIvZQ4pZ0FRBE3hmbe44A+/3kh17hjd1EMb0ZaPVPl/EkZLqYsDWw8jH1H6ITIM4rW9WJs0VGAXJrX5S50TpvaRCJ0ndlVTPaG2EYKM0XeITX0DL5n1dDPUtfoFCq/KOdOSQJ207/XhiMzOpNTpvf7nOEmn1JBC0DU227UQFxtTjkkBLGLzg+j5EXumk5fZm/cGnKjRT5yi50UXyFTshxv4C906b3hBQkAHu8Unxr3Xfh/cueAku2jKi6270xnA6liDB8vzi7XDe4DfWqJmr8tUnKgqsBl7louMhiV/pqRmuBULnpYhvPg==</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>MIIFaTCCA1GgAwIBAgIJAPkJD06+VcoxMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAlBMMSAwHgYDVQQKExdOYXRpb25hbCBCYW5rIG9mIFBvbGFuZDEcMBoGA1UEAxMTUG9saXNoIFRTTCBPcGVyYXRvcjAeFw0yMjA3MDQwOTExMjdaFw0yNzA3MDMwOTExMjdaME0xCzAJBgNVBAYTAlBMMSAwHgYDVQQKExdOYXRpb25hbCBCYW5rIG9mIFBvbGFuZDEcMBoGA1UEAxMTUG9saXNoIFRTTCBPcGVyYXRvcjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANl4s+Dyf/b4QN9rVmR4r0p7rWnJHf2KQsVFnqaWvx/OrQuwhUcPuzXMBR9CSRcckkXVPfRD/KEl0yiXpjadWzLUI6C85UIfBSn17nWsy25N4q5XjxzrD8xu1P9JDFiXmvNOl8s9pUgYJPKkRck52UQMr+ltVdH7tE6X/LiJ90X7EfU0tZTvTLd16ReI1UEJu54BUN1WziJ/ux7JVS0xUC0alNfwMwq7/VMADlrxSsFopKYTXBbwrr0mK7iVyqLoBJk4UOG7oG2m0r0HwtYQ9cnZSgDVII4tE9zII9uIr5Il7N8rRJBXPB96/5G0bONkPIiI5AshViL+0Z5YF2gOQNu7tedysSY5rzYprQ9KPFL9GlB2xV0YHNpDvKaP4/nZcubs+wGlFTHpJSiSEcTvybdt13qP+W8qCE0dYEfpUZirRX1E/RU5SiTfY7mMXOclQrOXcwzLTo3Avkh7j3Z4+ClJ5GvZdW0l50AurwoeJg0Rm8/Y1oFwrIIx8jHdx9B8mTkEJC89fCtBLpsBACKnstXC/OZsmBmevK+VWwO/P7xBxdrJPIeyh1lEVPcK23/AUlQpi4lZuwpiZ4cm0abErAsILhceQ0jMzy2ZFP35eiVUyAW/FuJTGVsBgw+hsgwUTuH7aJ9gY4n0xZWGvSBhSmDXnR8TYedfdetOKl12og0pAgMBAAGjTDBKMAsGA1UdDwQEAwIHgDARBgNVHSUECjAIBgYEAJE3AwAwCQYDVR0TBAIwADAdBgNVHQ4EFgQUDiu8pAOXGI+AjoQq6URCYPARuVgwDQYJKoZIhvcNAQELBQADggIBAAH932XnAA4tRmTX0SAE1tNM7Q7mPewm1pzgM6MfAnadh7YD9FEmuNoWXTX42FQlAL36JXahGVy2vApcBLJn/QQyE4mh7fGCUl+tRjpHAcwTyhbL9Wprfy1gyNc3h1DQCQggW3HlWwPx2Sz2nHVF4ui8Hc5nl1CPaCUtyT5KRJFvDc8LSTa9SFxVeSaQE5yJVwyUlVqmRyTDUUlbsvWtEd2EPDgPjPMl0t0cd0H/3YvyQbeRGDIfGN82Q96diNQFjaiWlnqMI9ylBumJ1rUepq+bBUvw2ZPJi//G4X6QVagC8FxCNU6FuuPEyWQleBYslVkV8WzLNsIsaDp8TcNnWfHYdWmV/3ufhJa8M2rtFoDYtjvuDNZi9XEwKFbguXIcbQ/H/EsqN5T+O6WYWmEeQoenZnCAwYLCuOfrXrugMMABkMfTpE8txyX7H0NTGXxq9l8CiAK9zg8fEgaaUFQpEZcW1YC+ntnDc6hyhhnLHZE7CbhJVFVZidZvuqo/3IwVyEUhKOt5uFmHvfasBksZKDuaZmQcQU0I2FHF6BdqufmRtkrVAIAQfdZezl0+VDJ469ZkWAoKQBpK7b0xsGX/t4CeXGmVbY4cTYpNI7chGs5QZ2iWKRZC/eEeXZ0UNKul7cmNIertLCDfJngZT7AyknwdsqZzho82HsSxkm3YeLXc</X509Certificate>
@@ -2017,6 +1963,11 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                             <X509Certificate>MIIEBjCCAu6gAwIBAgIUIPiiRCTDfQdWUbb+wxM4dWcR8dcwDQYJKoZIhvcNAQELBQAwgZUxLjAsBgNVBAoMJVN3ZWRpc2ggUG9zdCBhbmQgVGVsZWNvbSBBZ2VuY3kgKFBUUykxEjAQBgNVBAcMCVN0b2NraG9sbTESMBAGA1UECAwJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEuMCwGA1UEAwwlU3dlZGlzaCBQb3N0IGFuZCBUZWxlY29tIEFnZW5jeSAoUFRTKTAeFw0yNDAxMTAxNDU4MjFaFw0yNzAxMDkxNDU4MjFaMIGVMS4wLAYDVQQKDCVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMRIwEAYDVQQHDAlTdG9ja2hvbG0xEjAQBgNVBAgMCVN0b2NraG9sbTELMAkGA1UEBhMCU0UxLjAsBgNVBAMMJVN3ZWRpc2ggUG9zdCBhbmQgVGVsZWNvbSBBZ2VuY3kgKFBUUykwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDU0gU0qb0mNic9938lGYV8xweSkrdpkCpCjhfg4W/9U8XSlZzCIqvU5L8VPk1VC6sCM7uOXJu19U4o4GJ9K0FmZ3egI0v0/uhSYd41vQtGRfezjx56W2mIPCKifN5RT2uKsu15MbMCK4Erc3i/C9f/Ht7XI9IbztTCzKeOUPcZXUCSIVfVjNjrhCeEbFJHDFf400TyRQNjCoY5teS9oNx9vY/TpANTytI5HHTQga9+nkHoUMEOHOmZDLO7fvHF5XbEgFfx7tpLUhQ0Y6BEktw39rY1N8hhySffct/BBUqus7zzm3UCrTNsa9aM7YKK3sphLP/DJCdvSbDa4ABoM2yhAgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgZAMBEGA1UdJQQKMAgGBgQAkTcDADAdBgNVHQ4EFgQUaWKRXtqZNMHTxVFB11/tu2RCNxYwDQYJKoZIhvcNAQELBQADggEBAHESWVJpJB70Gk5xz5drmObnGxtztPZDQMXFuek01t5v07DeCspKWTs/wybSJnEM1y9tsQtJ3UvaPQf2Pec0rJUrxgB3PdfXyyxNgeUVPxquYK61Mech458IIIN33ai6Ui5isv0M+d2LY0pFD0XLgGi2vR76q3Hd5Vhg7ozeRgKMHhPsRPrRgG9yW06ytSiFAbA3LDM8fpN7AyUsRhKj8XbbFpKsEOydSOycA98KwlTEJ5gxPcIY7t/DUhqMB2JuUYI/ch+FJogkqx2ontY8jNZknghVS9hM5BjGbOGN8vnLrG3mYfL6rriUpW09OVhr/f+3O3bbuQS40gf0kE6v/Yc=</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIEBjCCAu6gAwIBAgIUOzkTfz3FusEX4xAXgwcZ/M50a8wwDQYJKoZIhvcNAQELBQAwgZUxLjAsBgNVBAoMJVN3ZWRpc2ggUG9zdCBhbmQgVGVsZWNvbSBBZ2VuY3kgKFBUUykxEjAQBgNVBAcMCVN0b2NraG9sbTESMBAGA1UECAwJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEuMCwGA1UEAwwlU3dlZGlzaCBQb3N0IGFuZCBUZWxlY29tIEFnZW5jeSAoUFRTKTAeFw0yNTA2MDMxMzEzMTJaFw0yODA2MDIxMzEzMTJaMIGVMS4wLAYDVQQKDCVTd2VkaXNoIFBvc3QgYW5kIFRlbGVjb20gQWdlbmN5IChQVFMpMRIwEAYDVQQHDAlTdG9ja2hvbG0xEjAQBgNVBAgMCVN0b2NraG9sbTELMAkGA1UEBhMCU0UxLjAsBgNVBAMMJVN3ZWRpc2ggUG9zdCBhbmQgVGVsZWNvbSBBZ2VuY3kgKFBUUykwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC51eNJziwSKI6P7qH8hNNe2QfPs+xMKBGl0qz3lfr6e8fiLWhHzzS/Tk8XrudUqwaXXrXJBOuZibHSdmvpUBm8E8ytwjTieeZ9+1wcVRB1t6vINoj1XinZcKfIxXhRPao7bJNAIAM9WXoaYv3viLy3Ag7LQ7ArATL5j1DMfUnQ4yVS0ux6tysj+bVUdyvEstRs8ZaXyHyAGTJlTDrnI5dnko0EKSxQt9qRxhTQF0R0XX3be3Qpjaf1QJDUYSbqmROLVsvhy4jvHLvnn6M1Iocj3YKyYHqdVUYpHnfzsjK1i9n2MoUsaz+qRi6PyjbaRf4qyC4DNvJEs5dD29e6c3U/AgMBAAGjTDBKMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgZAMBEGA1UdJQQKMAgGBgQAkTcDADAdBgNVHQ4EFgQUvYZ2D4cNzdpEAQGF5Dkyrw+5CdcwDQYJKoZIhvcNAQELBQADggEBAHHgmMreIQi29ugS6hXcGlRbQ4Ob3xrtNgN99XiVdLHgBp+WvCFSEzgTOvwZgmRTdcu5a2gAVBxVqshKCOa6qe80746JMKVwvI0/ed4ZbYZqxJTAMPPAp1tru50YfXewP44phNmu4HaUdab8KI5ZeF03LTzezzUtZRrMmShkoAvOMjDuylrybGYfL0P/g5I10Q+akPDmewNnNPRFkC3gqH6JAsnE/HlazuG6FghD/UsvWN3U9fB2CesLRmfQ2kJGs17oM3+QYZNr89yWnFogmz8CaNhKyeBM+3iCQpS2Zcucs1RA9tWmuF/19HIqf1imHctBKyhxYGjwEDEaNR6s11Q=</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>https://trustedlist.pts.se/SE-TL.xml</TSLLocation>
                 <AdditionalInformation>
@@ -2083,26 +2034,21 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
             </OtherTSLPointer>
             <OtherTSLPointer>
                 <ServiceDigitalIdentities>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>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</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>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</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
-                    <ServiceDigitalIdentity>
-                        <DigitalId>
-                            <X509Certificate>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</X509Certificate>
-                        </DigitalId>
-                    </ServiceDigitalIdentity>
                     <ServiceDigitalIdentity>
                         <DigitalId>
                             <X509Certificate>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</X509Certificate>
                         </DigitalId>
                     </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIFEDCCA3igAwIBAgIFFD9H/fswDQYJKoZIhvcNAQELBQAwgYUxCzAJBgNVBAYTAlNLMRMwEQYDVQQHDApCcmF0aXNsYXZhMScwJQYDVQQKDB5Ow6Fyb2Ruw70gYmV6cGXEjW5vc3Ruw70gw7pyYWQxHzAdBgNVBAMMFlRydXN0ZWQgTGlzdCBzaWduZXIgMTAxFzAVBgNVBAUTDk5UUlNLLTM2MDYxNzAxMB4XDTI1MDQwMTAwMDAwMFoXDTMzMDYzMDAwMDAwMFowgYUxCzAJBgNVBAYTAlNLMRMwEQYDVQQHDApCcmF0aXNsYXZhMScwJQYDVQQKDB5Ow6Fyb2Ruw70gYmV6cGXEjW5vc3Ruw70gw7pyYWQxHzAdBgNVBAMMFlRydXN0ZWQgTGlzdCBzaWduZXIgMTAxFzAVBgNVBAUTDk5UUlNLLTM2MDYxNzAxMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEApDjddVizt4f6yEj5CPwlcWFzchFVkz8sLxfIPKPVxWq5OEietBCbzJ9Kn7QhqozEqnXYGF9x3iULzgS7SXZDKW2CvSnmjgx19SgUQ04p1ybK6YUZoniYKLkiW6Tye5MbUzC3ARJFO5KphW+IYn6ZOaScWmS+TVRz/DRIxR76p/gFrdtHA4l24nAmwtmiEcPlouMBI8zau2TxLYpfFlUxiVLFa4ueaWOt5+WLVSu3/8aZ8TPfHEBGTT4Qw65rBkCVj9US6UgED9ZURr42g6OPtKlSHdp3PQmyFsZsY80QsMBP94K9nEYhigQekHpncsW9SEfLGArilrvaKFei073N+F44PZuSFlHE1DXQ4CsLXYUDaQieZDibHUw3ZAkzr6ouLoGOvD9DidAaGoVkE4iHYH98M+IrnkwvgmP5TOWvs8bNBYQC0GzQTOVo4TxN6nnCKXWzHpAZGbNgDG3UWItMHtLZTBH727GRe6R1B9KIqpY+C/nBc8FxlzQ0aq6ZxOw/AgMBAAGjgYQwgYEwHQYDVR0OBBYEFBFY5rJma48Bbq2TgHGkjS6OrMnrMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADAfBgNVHREEGDAWgRRwb2RhdGVsbmFAbmJ1Lmdvdi5zazARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggGBAF3ewHpgk322ht0lT9qHertoEN1OtxbjYBkenmT3cydyILB9nYLFBZ7TL5VjzRtDC+8XOtsJXGVVko9/fj9tL+KodnmDlOjlp/Ovzwejwvakr6Ev4d1sVEHH4NSfxZ715LExd+LgQBf+gVE8ziSY3Kek6Af88y/6MRAs2lLa8/OK6m3g0+rdGD0xFj88c0DwiFmkFho/WKCLNgdtUIAZcbhi0Ufs7JD9cF7/+pLEt9o9Vl9n95UR5DFs/Afoi4sMsmYjUBPqSsMs1Uz0hH1loo3ZiXJuzGzMF/PqQJDRNT0u+K4GbXYW3oX1enB26XGuArGRCQ1Es8Wp0QkS8SppeVcnTXEOQXJ2y8Oy2JKMcvfxuCiiGHzl9IpSeOBR7KLEe2/Vr84FPlBrRTw6KNHsN8JV+svtXnH28XCx9TuCEo151HfbzPfWM45U7yLbLW6zqgSh1/6sJiUcRh4Ro8ctzkEwDUlbHYDeHm1tSOrsfsbQ56SAt/3gr2vnQLqJ+AtoEg==</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
+                    <ServiceDigitalIdentity>
+                        <DigitalId>
+                            <X509Certificate>MIIFEDCCA3igAwIBAgIFFEBkr74wDQYJKoZIhvcNAQELBQAwgYUxCzAJBgNVBAYTAlNLMRMwEQYDVQQHDApCcmF0aXNsYXZhMScwJQYDVQQKDB5Ow6Fyb2Ruw70gYmV6cGXEjW5vc3Ruw70gw7pyYWQxHzAdBgNVBAMMFlRydXN0ZWQgTGlzdCBzaWduZXIgMTExFzAVBgNVBAUTDk5UUlNLLTM2MDYxNzAxMB4XDTI1MDQwMTAwMDAwMFoXDTMzMTIzMTAwMDAwMFowgYUxCzAJBgNVBAYTAlNLMRMwEQYDVQQHDApCcmF0aXNsYXZhMScwJQYDVQQKDB5Ow6Fyb2Ruw70gYmV6cGXEjW5vc3Ruw70gw7pyYWQxHzAdBgNVBAMMFlRydXN0ZWQgTGlzdCBzaWduZXIgMTExFzAVBgNVBAUTDk5UUlNLLTM2MDYxNzAxMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAlarWmFZjmcK5QgO9Yp6ED0N/jVynXIL5b+yrUD9Ce2JMeLvD+BkLNOZElOhmB0Hbu2NVVi03qItvpDSHO65YCvWg3uYuBQF+eaJzrus0O2ugqD7M2QWsJSf1Tq9oJYH76KXZx4oK4ee8WbTR3WUcmgucUEJN/DipVHELGJkw3pnE74SyiHqp4DgBM8sohlFE2DjSTXx2RU+/3C96rZZiy6958YBWbCwbkICYqDeYxrb5Vq2uCpXg7jZN35VUroIxTi7gNJuJ9J9AqWdzW0Ya9hPG9Sq331X8Ik3999S893TgRp6m+6CLkdtNXpb38Iw2gqD4PUu2EqRkAAs1gdgzmtOAposSWdw+eqprzHaTkydLGO9K48MHx6sup+mvqbCIPhvAmFHNhJqDSkl/1nEzHo9+0EmoeI2relHsMXSRYGDRB+GvkTg9AvCLFKyrdlGwWC+C41Hb75Wxu+jaTr6m+YaiEr3Ugah+KjIEtQcBV5eBKDXUE9Ixy3KbsGrXaWIRAgMBAAGjgYQwgYEwHQYDVR0OBBYEFDfQBjSuiF+/zrSVcnULj+/f6jZeMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgbAMBEGA1UdIAQKMAgwBgYEVR0gADAfBgNVHREEGDAWgRRwb2RhdGVsbmFAbmJ1Lmdvdi5zazARBgNVHSUECjAIBgYEAJE3AwAwDQYJKoZIhvcNAQELBQADggGBACUI1IW6Hk8THL64SN1ZDq4wdxvghFhsVSW6esMr1DG1Fqd4JVIVqlVZhEz8r/hvxcYoabw0KvaFf3AZr74B4tinPUM+fnOAX8PHDO9beWSVvQe1Z9VsAVOPNimPggrLSufIdADkdpU6E44Zy5Xo9iBz31vGVPG3Igii9TPAcmaBGRuuPxN9ChxURC9TfAK3nL+WL+rKbP20rktKhrpRsqIbYdRS0LVyeyMBmr87bZY4OOTxW+wayjHVApTSURwFvJ7+WbhIrKRB5GUtdlcx3Bs0Tj9oICB3tOVCKCXtA9EgGjsEOFUTk1careWFaoGrS81h0X3nbZw3UTk+P1HKwmOzvqgOJ7P5YAzRzl0ozegxH66IP+fCBr15rnBclhbD+Meq45Bk8Q/q03f2AWEdbE5g15N/M9i3eGmsyLoMoDgPTSzE1n4IlJVh45f3GLAcAF9XOZMPZAUlbV/Zamsf/kBYqRUAmpwZIsFh3yBnY20yyUI05PajsX6vKfGqkcpoQQ==</X509Certificate>
+                        </DigitalId>
+                    </ServiceDigitalIdentity>
                 </ServiceDigitalIdentities>
                 <TSLLocation>http://tl.nbu.gov.sk/kca/tsl/tsl.xml</TSLLocation>
                 <AdditionalInformation>
@@ -2117,8 +2063,7 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                     </OtherInformation>
                     <OtherInformation>
                         <SchemeOperatorName>
-                            <Name xml:lang="en">NATIONAL SECURITY AUTHORITY</Name>
-                            <Name xml:lang="sk">NÁRODNÝ BEZPEČNOSTNÝ ÚRAD</Name>
+                            <Name xml:lang="en">National Security Authority</Name>
                             <Name xml:lang="sk">Národný bezpečnostný úrad</Name>
                         </SchemeOperatorName>
                     </OtherInformation>
@@ -2193,12 +2138,12 @@ Europska Komisija održava ovo web-mjesto kao sredstvo za postizanje interoperab
                 </AdditionalInformation>
             </OtherTSLPointer>
         </PointersToOtherTSL>
-        <ListIssueDateTime>2025-03-25T08:15:38Z</ListIssueDateTime>
+        <ListIssueDateTime>2025-07-15T11:30:15Z</ListIssueDateTime>
         <NextUpdate>
-            <dateTime>2025-09-16T22:00:38Z</dateTime>
+            <dateTime>2026-01-13T12:30:15Z</dateTime>
         </NextUpdate>
         <DistributionPoints>
             <URI>https://ec.europa.eu/tools/lotl/eu-lotl.xml</URI>
         </DistributionPoints>
     </SchemeInformation>
-<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Id="id-494f6ed7f094453f309c5d56abbd5783"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/><ds:Reference Id="ref-enveloped-signature" URI=""><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/><ds:DigestValue>/3XJfW9DQhgsLMxFD60WuvnzZUjVgyesSjnEBk8rOy+VfoIDE3buk0Szpfn8rL8vyrcqOramGFOuwpNubzIv/A==</ds:DigestValue></ds:Reference><ds:Reference Type="http://uri.etsi.org/01903#SignedProperties" URI="#xades-id-494f6ed7f094453f309c5d56abbd5783"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/><ds:DigestValue>VEONv58dRfmZ4NRVX6NM0quYNyTkTjO2TzMbf/dpMRfrcza4x9gQsndC8+T2xBfQl54dsBGjDjWScyvWth0T8Q==</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue Id="value-id-494f6ed7f094453f309c5d56abbd5783">g1ULuPnX8JYLUDbjWDU/ov0nC9MKPDGPpXpwtGe0cb+1GIz9Zvz9g/g0qiOX8KYW6vCnpbuf9BrQQX0td/b8HVXhAykpKIeo8NN9ZgTTM5Lp6q7kJ45+1Ge/y47WouWZ9/OuMufLlVRksk4b0zSZGPzGzomz2kBu/VJePJ9c/x+odsWO50berakM7CRHRBwcvKXKuUKTbNoeLTAjhYOnjJtYitl1mJDQnGf9C6RjMP2CzErR5VT6OPS1OAhO+4yK/DJyItBd8feizhzvTf2Y6yml5+hAktKLmKUt4WsnugeYrn2/GFcWCGYnwsQ319a+k/T2TNBdpudnUV1dNiGNDRI0ji1Q9DiTU2Ya8q9Kp2W+ZA8CqdjIlrN+X1vPp3QUbgsZLfvsRoUgb7xl3oPzzCLvu3IZTFEzLbyFlMCN2zcs3qEeD7Q5lGoCFrWftGn8AsamKK32iai2+NJJpsDIMrHgnnagapuwHdT8iSHmkOZHz1OiDb83nYwWq+zRv/n0ni5NTr3+jaqn2LWKRyEItr6vBNCpuQPFoNEHZg0CYBWEK6GSbWByg0dnaIxWn2lkTjRFoaveEvHxhl3zSlyHZ3X2FilHEbIyE1keu/0WLfz5be8v7i/ATrbkcq0t7FC9rVetH/eUoV13FMMc2HcpSTFSVwBY3uP+HtybXYSn3zc=</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIIoDCCBoigAwIBAgIUc8IcSUtVEKAMMvHm9QWU05kXsPUwDQYJKoZIhvcNAQENBQAwXzELMAkGA1UEBhMCUFQxKjAoBgNVBAoMIURpZ2l0YWxTaWduIENlcnRpZmljYWRvcmEgRGlnaXRhbDEkMCIGA1UEAwwbRElHSVRBTFNJR04gUVVBTElGSUVEIENBIEcxMB4XDTIzMTExNzEwMTE0NloXDTI3MTExNzEwMTE0NlowggEVMQswCQYDVQQGEwJMVTFDMEEGA1UECww6Q2VydGlmaWNhdGUgUHJvZmlsZSAtIFF1YWxpZmllZCBDZXJ0aWZpY2F0ZSAtIE9yZ2FuaXphdGlvbjE5MDcGA1UECwwwRGlyZWN0b3JhdGUtR2VuZXJhbCBmb3IgRGlnaXRhbCBTZXJ2aWNlcyAoRElHSVQpMSMwIQYDVQRhDBpMRUlYRy0yNTQ5MDBaTllBMUZMVVE5VTM5MzEcMBoGA1UECgwTRVVST1BFQU4gQ09NTUlTU0lPTjElMCMGCSqGSIb3DQEJARYWZGlnaXQtZG1vQGVjLmV1cm9wYS5ldTEcMBoGA1UEAwwTRVVST1BFQU4gQ09NTUlTU0lPTjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKWYeBA9kYARElGnHoJRNpbby44G+TSJcgHI9QtyXlYjB234hSAYyJvW+gKvoownskrogfUP6GOmQgEFZX335Y0sBwfppVemEoe9H9Aj/cpT14IqdB05V4a88ASRfR0Va1xmQJrDsBZWqZHx0EEHBctIF5BjyTMAcQybha+4AOIotp3dF/7ZA3Cu4GYbN9BuQyyqfqrjMduDzzDjVwKC17aEsLev60C1FnIJ/FVEda3lJSGilD5JyUceTaRcot1rw6gjKrOVhwP/UHfevJ3JCsQsuAzkf7ivzHzYuPPPR9Ussecwr7O95Fr4wbPYIyX2AOTlieAC7GMVXHN1/+4LH74ndvoJYEScXwmN9Skib3+G6TquOCQxvNXzHPZb95btCoSnVprCn14O3CXUTZMEKkhPuKW8dI6pR2JSGbtT+xBkcc1wYVlUnzE3d+YK5SSevUT2COwJM+AcjSoUaRTBINsD/ezDDvv7vtbF1XccaJjoCNkurzayTsMszGDvAF171LY69lNY6yK0uzrS+3c/hEHctXa5KIC3PpWrBGQ5mw73KerRvnAhzDZemVquPk1D59aJNfHoHXmy1bS52rHWYOwHH+2qbODdh8GkHwHXBzSpFit1Kg2brpavhztNaGlj6GsLFAbr8okCUJllOOLQ8Tfy9Vnn5Rq0+7VTdd8dAxg9AgMBAAGjggKaMIICljAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFHNJ8UAcFAR8mhJ/+i/NXGcjGOkUMIGGBggrBgEFBQcBAQR6MHgwRgYIKwYBBQUHMAKGOmh0dHBzOi8vcWNhLWcxLmRpZ2l0YWxzaWduLnB0L0RJR0lUQUxTSUdOUVVBTElGSUVEQ0FHMS5wN2IwLgYIKwYBBQUHMAGGImh0dHBzOi8vcWNhLWcxLmRpZ2l0YWxzaWduLnB0L29jc3AwIQYDVR0RBBowGIEWZGlnaXQtZG1vQGVjLmV1cm9wYS5ldTBfBgNVHSAEWDBWMDcGCysGAQQBgcd8BAEBMCgwJgYIKwYBBQUHAgEWGmh0dHBzOi8vcGtpLmRpZ2l0YWxzaWduLnB0MBAGDisGAQQBgcd8BAIBAQEGMAkGBwQAi+xAAQMwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMIG8BggrBgEFBQcBAwSBrzCBrDAVBggrBgEFBQcLAjAJBgcEAIvsSQECMAgGBgQAjkYBATAIBgYEAI5GAQQwEwYGBACORgEGMAkGBwQAjkYBBgIwagYGBACORgEFMGAwLhYoaHR0cHM6Ly9xY2EtZzEuZGlnaXRhbHNpZ24ucHQvUERTX2VuLnBkZhMCZW4wLhYoaHR0cHM6Ly9xY2EtZzEuZGlnaXRhbHNpZ24ucHQvUERTX3B0LnBkZhMCcHQwSwYDVR0fBEQwQjBAoD6gPIY6aHR0cHM6Ly9xY2EtZzEuZGlnaXRhbHNpZ24ucHQvRElHSVRBTFNJR05RVUFMSUZJRURDQUcxLmNybDAdBgNVHQ4EFgQUlO5hwcl9/63issm59r+TIHeJSZwwDgYDVR0PAQH/BAQDAgZAMA0GCSqGSIb3DQEBDQUAA4ICAQCn8qjJhTe3SsD7cB8S8kDzt+CBnJJm7bOFc9t9IU6iKntVtjPU4T+cYiPk8TnT+/w7dBphRzjZCL1sDfSJGQ5JPBw+hBPuvzEqP4xVi5i4Jhg/GpYSaa2+dkFXlKe6Sd+ii/RnwBSnfqVfNZtasj7yX+oujGau5LSUPIkQxDrMie8KjsNtlkFjQDoioGAx8b0u6WyhAuqwEacCznft20Dim3sC7XJw8GHumrnW52rUzl4sbXoTBAt8F1zPCbEbjU0oc8SbFNPIChh+9sHUorEmHIlcg30LBHihkDCx4mK8J60Jybk57D4U2RO29VsJfDmnvNxfJZxfLHEJ2tkh+AMqlJXPDlvXQ+rZ1NmLHrbXkcHOlqR3F8BakTi2Mi5AZZfkfjZjkigEStN6Enaq6gwF7EsslqEKmhSQ8XlhxWSRqljK/cnEUw+NhrvR4WuKlvYmxlCLQj6q89Hh121aUGUhL2L2WCVBjVXqux7s4mvECDzrucl5ilaVT32HO3g8qNLGD5lum53U5v/Nv68ItyHH96unztwBebmgox8giVRdzPhmPrpSfbmeNNDKj1p9SCeOvd3P9jCUvChVvH2P2ZUjc24tWe+tzclsCJi7GbKr6kjHc1jFudjehflAbm1IZAYdDNrhXamnsRVsz7iSH20eygCArlwSQ//WIQZPFrRffg==</ds:X509Certificate></ds:X509Data></ds:KeyInfo><ds:Object><xades:QualifyingProperties xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" Target="#id-494f6ed7f094453f309c5d56abbd5783"><xades:SignedProperties Id="xades-id-494f6ed7f094453f309c5d56abbd5783"><xades:SignedSignatureProperties><xades:SigningTime>2025-03-25T18:29:09Z</xades:SigningTime><xades:SigningCertificate><xades:Cert><xades:CertDigest><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/><ds:DigestValue>MChItQCvaWcTKbZ1lIIXL2BVbmm0YgKgZVrgIx0FFUhNIdTlv6RylET5voFVvbYBiGh3nUr2rsAQouSJzYkTaQ==</ds:DigestValue></xades:CertDigest><xades:IssuerSerial><ds:X509IssuerName>CN=DIGITALSIGN QUALIFIED CA G1,O=DigitalSign Certificadora Digital,C=PT</ds:X509IssuerName><ds:X509SerialNumber>660862747298009142807362633871991440505734410485</ds:X509SerialNumber></xades:IssuerSerial></xades:Cert></xades:SigningCertificate></xades:SignedSignatureProperties><xades:SignedDataObjectProperties><xades:DataObjectFormat ObjectReference="#ref-enveloped-signature"><xades:MimeType>text/xml</xades:MimeType></xades:DataObjectFormat></xades:SignedDataObjectProperties></xades:SignedProperties></xades:QualifyingProperties></ds:Object></ds:Signature></TrustServiceStatusList>
\ No newline at end of file
+<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Id="id-cb9511c1a395eb511caea13889680eef"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/><ds:Reference Id="ref-enveloped-signature" URI=""><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/><ds:DigestValue>Ds++/hry0qiUKIzJRZTM8YgAO8O9kpBeDuPr0N09Teaks1886kDPzfb3SswfcZ3MB4pC7CeYlpd0tLwe3xP7eA==</ds:DigestValue></ds:Reference><ds:Reference Type="http://uri.etsi.org/01903#SignedProperties" URI="#xades-id-cb9511c1a395eb511caea13889680eef"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/><ds:DigestValue>iVirXgZPl72aTBE/D8pmlvDtu25juWdyumfsMvbhQO5ymxPvvBuYvNb3iUuMm5P6WYtTbkpUb6tQbBfU86XWug==</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue Id="value-id-cb9511c1a395eb511caea13889680eef">LUGYiIOVAq8tuYbvx6t27SuA5aXTBJFkJd7KNF3uCru6TVGU3nRgSzpdW6Gw7hvkL2/ksfdFkaA4Y8js9S6xwICy1Gj7NdwhB/tP09SKhoiL7eu1m+7uhtdw6pTQ5W4lL5bEx/HiyGTYDMN7fQn5/Z2EAiD00sDJxwh9lIAUpsctAqtmu1MfG+HKL4Z1HaR3Ts+ZaVnmC6VoLZoj9/Cr4p/C9/6SZau/stYN0zHQk4X5DJFf16hxhwj9c1MaoKMCGXIS3OtArQJyP2YvMrIFcxtZuV83Nmt6fVfjSulsYPFCmAtsobngURwJAS7y0G3pV/q7Oo6owsXCrjlLP5ziWifL/6ltul3gnoBc/zKw7b6MPBhnYCMQQOL7AXVFUooJ9rbSS2zR7uHunOhQQgvxOQJ916YDU1bNV9QPbTgjVb9EEBKJvV6vLv0CLUEeVda0zWYNiZVxXFZ0nlO3wsliBx8bNR4oackACWCqUMIWuGtOAGJ6exMgcGJYgSW/mP7YNr2dC06Iv1zHaNwEljOaEVGsCfweuahOBOwR02C/mwFusch7c5+KcVBPyEx6ue9XunV5398by+afDc/hkIIt853c1XRpdgA6B+yM0ebpMSmvavbY/siPI9+i7NAaxlbTVbj+B/aFjFnJPPwIC/h+KoeaRWDNSfZ6a3jcVbDg/NE=</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>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</ds:X509Certificate></ds:X509Data></ds:KeyInfo><ds:Object><xades:QualifyingProperties xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" Target="#id-cb9511c1a395eb511caea13889680eef"><xades:SignedProperties Id="xades-id-cb9511c1a395eb511caea13889680eef"><xades:SignedSignatureProperties><xades:SigningTime>2025-07-15T15:42:59Z</xades:SigningTime><xades:SigningCertificate><xades:Cert><xades:CertDigest><ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/><ds:DigestValue>MChItQCvaWcTKbZ1lIIXL2BVbmm0YgKgZVrgIx0FFUhNIdTlv6RylET5voFVvbYBiGh3nUr2rsAQouSJzYkTaQ==</ds:DigestValue></xades:CertDigest><xades:IssuerSerial><ds:X509IssuerName>CN=DIGITALSIGN QUALIFIED CA G1,O=DigitalSign Certificadora Digital,C=PT</ds:X509IssuerName><ds:X509SerialNumber>660862747298009142807362633871991440505734410485</ds:X509SerialNumber></xades:IssuerSerial></xades:Cert></xades:SigningCertificate></xades:SignedSignatureProperties><xades:SignedDataObjectProperties><xades:DataObjectFormat ObjectReference="#ref-enveloped-signature"><xades:MimeType>text/xml</xades:MimeType></xades:DataObjectFormat></xades:SignedDataObjectProperties></xades:SignedProperties></xades:QualifyingProperties></ds:Object></ds:Signature></TrustServiceStatusList>
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f4de0910ec4..0bfb14e807bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4191,7 +4191,7 @@ with pkgs;
 
   qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
 
-  qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { };
+  qdigidoc = callPackage ../tools/security/qdigidoc { };
 
   qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { };
 

From fe40329c1c85a9eaa95fae8b68dba50f4112453b Mon Sep 17 00:00:00 2001
From: Patrick Chilton <chpatrick@gmail.com>
Date: Fri, 1 Aug 2025 23:06:34 +0200
Subject: [PATCH 170/357] anyk: 3.43.0 -> 3.44.0

---
 pkgs/by-name/an/anyk/version.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/anyk/version.json b/pkgs/by-name/an/anyk/version.json
index 0296e225c0ae..6bed10760e38 100644
--- a/pkgs/by-name/an/anyk/version.json
+++ b/pkgs/by-name/an/anyk/version.json
@@ -1,5 +1,5 @@
 {
-  "url": "https://web.archive.org/web/20250603123530/https://nav.gov.hu/pfile/programFile?path=%252Fnyomtatvanyok%252Fletoltesek%252Fnyomtatvanykitolto_programok%252Fnyomtatvany_apeh%252Fkeretprogramok%252FAbevJava",
-  "sha256": "0f25ppjq98kcib6d5c0qrwx9pcakj6g2cgsxh9x7cl149c0fy8d5",
-  "version": "3.43.0"
+  "url": "https://web.archive.org/web/20250801205917/https://nav.gov.hu/pfile/programFile?path=%252Fnyomtatvanyok%252Fletoltesek%252Fnyomtatvanykitolto_programok%252Fnyomtatvany_apeh%252Fkeretprogramok%252FAbevJava",
+  "sha256": "0b0b197ifqwsnnw375gvnhdsvmgqwmw5fkfcfw0wmh0f6xjdapam",
+  "version": "3.44.0"
 }

From 3c895f734f5b9aeb6f14bcf3e386adff3f0c2dc4 Mon Sep 17 00:00:00 2001
From: prtzl <matej.blagsic@protonmail.com>
Date: Fri, 1 Aug 2025 23:16:17 +0200
Subject: [PATCH 171/357] gcc-arm-embedded-14: format

---
 .../gc/gcc-arm-embedded-14/package.nix        | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix
index c8c93ee3372c..2174e828a598 100644
--- a/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix
+++ b/pkgs/by-name/gc/gcc-arm-embedded-14/package.nix
@@ -44,23 +44,22 @@ stdenv.mkDerivation rec {
     rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || :
   '';
 
-  preFixup =
-    lib.optionalString stdenv.hostPlatform.isLinux ''
-      find $out -type f | while read f; do
-        patchelf "$f" > /dev/null 2>&1 || continue
-        patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
-        patchelf --set-rpath ${
-          lib.makeLibraryPath [
-            "$out"
-            stdenv.cc.cc
-            ncurses6
-            libxcrypt-legacy
-            xz
-            zstd
-          ]
-        } "$f" || true
-      done
-    '';
+  preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
+    find $out -type f | while read f; do
+      patchelf "$f" > /dev/null 2>&1 || continue
+      patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
+      patchelf --set-rpath ${
+        lib.makeLibraryPath [
+          "$out"
+          stdenv.cc.cc
+          ncurses6
+          libxcrypt-legacy
+          xz
+          zstd
+        ]
+      } "$f" || true
+    done
+  '';
 
   meta = with lib; {
     description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";

From 98895ed3c2c3f686f2bd1e235b2a18689ffa51b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 21:45:32 +0000
Subject: [PATCH 172/357] tetragon: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/by-name/te/tetragon/package.nix b/pkgs/by-name/te/tetragon/package.nix
index fb8fb7c8e86e..f4e3b6e7f626 100644
--- a/pkgs/by-name/te/tetragon/package.nix
+++ b/pkgs/by-name/te/tetragon/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tetragon";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "tetragon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HOVQdKUIBLq9/2hTokZKvLZOgRQu5/lAwYy1yQa1bus=";
+    hash = "sha256-riuSByvMpbukA+pwbzecnyUvZGtPR6lLEA1s2oBnI+A=";
   };
 
   nativeBuildInputs = [

From 8cb2f98ca5ac7deba5fca07cf13fb3be49e69e79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 22:28:22 +0000
Subject: [PATCH 173/357] python3Packages.databricks-sdk: 0.59.0 -> 0.61.0

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

diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix
index 23cb3e727d4c..40a71fe2ad25 100644
--- a/pkgs/development/python-modules/databricks-sdk/default.nix
+++ b/pkgs/development/python-modules/databricks-sdk/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "databricks-sdk";
-  version = "0.59.0";
+  version = "0.61.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "databricks";
     repo = "databricks-sdk-py";
     tag = "v${version}";
-    hash = "sha256-yH/hePmPc+CG4cqcMwFUuNoJxzZUCXryQlr2Pc8CoqI=";
+    hash = "sha256-zXvCl5mYJMIEi6/Z4r3SA96/FX74zH8HgkbCy4L4B6w=";
   };
 
   build-system = [

From fbc0d2857bc44a00351bb22bea91efab99137b04 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 30 Jul 2025 19:39:20 -0400
Subject: [PATCH 174/357] python3Packages.ds-xbom-lib: init at 6.0.0b3

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../python-modules/ds-xbom-lib/default.nix    | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/ds-xbom-lib/default.nix

diff --git a/pkgs/development/python-modules/ds-xbom-lib/default.nix b/pkgs/development/python-modules/ds-xbom-lib/default.nix
new file mode 100644
index 000000000000..20464510118e
--- /dev/null
+++ b/pkgs/development/python-modules/ds-xbom-lib/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "ds-xbom-lib";
+  version = "6.0.0b3";
+  pyproject = true;
+
+  # pypi because library is embedded into another project's repo
+  src = fetchPypi {
+    inherit version;
+    pname = "ds_xbom_lib";
+    hash = "sha256-/L0AFAuIDzbyXwpg0bigy2AR4GT0RSdXrjPAEbEO7cI=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "xbom_lib" ];
+
+  # no tests
+  doCheck = false;
+
+  meta = {
+    description = "xBOM library for owasp depscan";
+    homepage = "https://pypi.org/project/ds-xbom-lib/";
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+    teams = [ lib.teams.ngi ];
+    license = with lib.licenses; [ mit ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 23323d8d82ea..e19afd3ed358 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4354,6 +4354,8 @@ self: super: with self; {
 
   ds-store = callPackage ../development/python-modules/ds-store { };
 
+  ds-xbom-lib = callPackage ../development/python-modules/ds-xbom-lib { };
+
   ds4drv = callPackage ../development/python-modules/ds4drv { };
 
   dscribe = callPackage ../development/python-modules/dscribe { };

From 809f7dd59eec2454057c83e42a69fe754fb295dd Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 30 Jul 2025 19:43:12 -0400
Subject: [PATCH 175/357] python3Packages.ds-reporting-lib: init at 6.0.0b3

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../ds-reporting-lib/default.nix              | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/ds-reporting-lib/default.nix

diff --git a/pkgs/development/python-modules/ds-reporting-lib/default.nix b/pkgs/development/python-modules/ds-reporting-lib/default.nix
new file mode 100644
index 000000000000..26697a6033ae
--- /dev/null
+++ b/pkgs/development/python-modules/ds-reporting-lib/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "ds-reporting-lib";
+  version = "6.0.0b3";
+  pyproject = true;
+
+  # pypi because library is embedded into another project's repo
+  src = fetchPypi {
+    inherit version;
+    pname = "ds_reporting_lib";
+    hash = "sha256-0C/UgAM7VIWEjuRq1ZCTL5CjJ6OK+0/Yw+AN4j7jj6E=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "reporting_lib" ];
+
+  # no tests
+  doCheck = false;
+
+  meta = {
+    description = "Reporting library for owasp depscan";
+    homepage = "https://pypi.org/project/ds-reporting-lib/";
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+    teams = [ lib.teams.ngi ];
+    license = with lib.licenses; [ mit ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e19afd3ed358..12af7ed30324 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4354,6 +4354,8 @@ self: super: with self; {
 
   ds-store = callPackage ../development/python-modules/ds-store { };
 
+  ds-reporting-lib = callPackage ../development/python-modules/ds-reporting-lib { };
+
   ds-xbom-lib = callPackage ../development/python-modules/ds-xbom-lib { };
 
   ds4drv = callPackage ../development/python-modules/ds4drv { };

From 2d696e88de69ae02638358bd0d16ec1fececb160 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 30 Jul 2025 19:52:32 -0400
Subject: [PATCH 176/357] python3Packages.ds-analysis-lib: init at 6.0.0b3

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../ds-analysis-lib/default.nix               | 59 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +-
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/ds-analysis-lib/default.nix

diff --git a/pkgs/development/python-modules/ds-analysis-lib/default.nix b/pkgs/development/python-modules/ds-analysis-lib/default.nix
new file mode 100644
index 000000000000..66df91b9d28e
--- /dev/null
+++ b/pkgs/development/python-modules/ds-analysis-lib/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  appthreat-vulnerability-db,
+  custom-json-diff,
+  cvss,
+  rich,
+  toml,
+  writableTmpDirAsHomeHook,
+  pytestCheckHook,
+  pytest-cov-stub,
+}:
+
+buildPythonPackage rec {
+  pname = "ds-analysis-lib";
+  version = "6.0.0b3";
+  pyproject = true;
+
+  # pypi because library is embedded into another project's repo
+  src = fetchPypi {
+    inherit version;
+    pname = "ds_analysis_lib";
+    hash = "sha256-XZZzAxQJk65Xoq6z2OadlHUN0REYTjKmSvwz17tvVqc=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    appthreat-vulnerability-db
+    custom-json-diff
+    cvss
+    rich
+    toml
+  ];
+
+  pythonImportsCheck = [ "analysis_lib" ];
+
+  # relies on data files that pypi doesn't include
+  disabledTestPaths = [
+    "tests/test_analysis.py"
+    "tests/test_csaf.py"
+  ];
+
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+    pytestCheckHook
+    pytest-cov-stub
+  ];
+
+  meta = {
+    description = "Analysis library for owasp depscan";
+    homepage = "https://pypi.org/project/ds-analysis-lib/";
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+    teams = [ lib.teams.ngi ];
+    license = with lib.licenses; [ mit ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 12af7ed30324..6a6e094c536a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4352,10 +4352,12 @@ self: super: with self; {
 
   dropmqttapi = callPackage ../development/python-modules/dropmqttapi { };
 
-  ds-store = callPackage ../development/python-modules/ds-store { };
+  ds-analysis-lib = callPackage ../development/python-modules/ds-analysis-lib { };
 
   ds-reporting-lib = callPackage ../development/python-modules/ds-reporting-lib { };
 
+  ds-store = callPackage ../development/python-modules/ds-store { };
+
   ds-xbom-lib = callPackage ../development/python-modules/ds-xbom-lib { };
 
   ds4drv = callPackage ../development/python-modules/ds4drv { };

From 46879c2cf0132afbad1b5ba6eac2153345b3d199 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Wed, 30 Jul 2025 19:56:27 -0400
Subject: [PATCH 177/357] dep-scan: add ngi team

dep-scan is an ngi project. We would like to know about it :)

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/de/dep-scan/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix
index 10bcae2eea10..bd5eb2b73298 100644
--- a/pkgs/by-name/de/dep-scan/package.nix
+++ b/pkgs/by-name/de/dep-scan/package.nix
@@ -70,6 +70,7 @@ python3.pkgs.buildPythonApplication rec {
     changelog = "https://github.com/owasp-dep-scan/dep-scan/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
+    teams = [ lib.teams.ngi ];
     mainProgram = "dep-scan";
   };
 }

From f18a3a22ff1ac351863a167d424a576b7c0c2aa4 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Mon, 28 Jul 2025 21:14:57 -0400
Subject: [PATCH 178/357] dep-scan: bump, fix error when scanning projects

This version is required in order to can use manifest v6 of vdb.

It also requires access to the cdxgen binary.

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/de/dep-scan/package.nix | 54 +++++++++++++++-------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix
index bd5eb2b73298..58fa53c24581 100644
--- a/pkgs/by-name/de/dep-scan/package.nix
+++ b/pkgs/by-name/de/dep-scan/package.nix
@@ -1,41 +1,34 @@
 {
   lib,
   fetchFromGitHub,
-  python3,
+  python3Packages,
+  writableTmpDirAsHomeHook,
+  makeWrapper,
+  cdxgen,
 }:
 
-let
-  appthreat-vulnerability-db = (
-    python3.pkgs.appthreat-vulnerability-db.overrideAttrs (oldAttrs: rec {
-      version = "5.8.1";
-      src = oldAttrs.src.override {
-        tag = "v${version}";
-        hash = "sha256-/Yo0yyDp2vd9KJhy3LGRml55eqTiaHSSuSoe2h2bSw0=";
-      };
-    })
-  );
-
-in
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "dep-scan";
-  version = "5.5.0";
+  version = "6.0.0b3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "owasp-dep-scan";
     repo = "dep-scan";
     tag = "v${version}";
-    hash = "sha256-lgqS8GY5JuHL3strNcb0B3mGieFkQTzGuRyV4dBp5e4=";
+    hash = "sha256-GdrFsECcBZ2J47ojM33flqOtrY3avchGpsZk6pt8Aks=";
   };
 
-  pythonRelaxDeps = [ "oras" ];
+  build-system = with python3Packages; [ setuptools ];
 
-  build-system = with python3.pkgs; [ setuptools ];
-
-  dependencies = with python3.pkgs; [
+  dependencies = with python3Packages; [
     appthreat-vulnerability-db
+    custom-json-diff
     cvss
     defusedxml
+    ds-analysis-lib
+    ds-reporting-lib
+    ds-xbom-lib
     jinja2
     oras
     packageurl-python
@@ -47,23 +40,34 @@ python3.pkgs.buildPythonApplication rec {
     toml
   ];
 
-  nativeCheckInputs = with python3.pkgs; [
+  nativeCheckInputs = with python3Packages; [
     httpretty
     pytest-cov-stub
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ];
 
   pythonImportsCheck = [ "depscan" ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   disabledTests = [
     # Test is not present
     "test_query_metadata2"
   ];
 
+  # depscan --src shiftleft/scan-slim -o containertests -t docker
+  #
+  # WARNING [2025-07-28 20:17:35,654] cdxgen command not found. Please install using npm install @cyclonedx/cdxgen or set PATH variable
+  # WARNING [2025-07-28 20:17:35,654] /nix/store/56bxjw4rgdqa82f61w70z92qq6b14ass-dep-scan-5.5.0/lib/python3.13/site-packages/depscan/lib/local_bin/cdxgen command not found. Please install using npm install @cyclonedx/cdxgen or set PATH variable
+  # INFO [2025-07-28 20:17:35,654] Generating Software Bill-of-Materials for container image shiftleft/scan-slim. This might take a few mins ...
+  # WARNING [2025-07-28 20:17:35,654] Unable to locate cdxgen command.
+  makeWrapperArgs = [
+    "--prefix PATH : ${
+      lib.makeBinPath [
+        cdxgen
+      ]
+    }"
+  ];
+
   meta = {
     description = "Security and risk audit tool based on known vulnerabilities, advisories, and license limitations for project dependencies";
     homepage = "https://github.com/owasp-dep-scan/dep-scan";

From 247c441939be35c200003c3eafb2dcf84d95a6e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 00:34:55 +0000
Subject: [PATCH 179/357] pluto: 5.22.1 -> 5.22.2

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

diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix
index f8b578935218..1a0709c6e043 100644
--- a/pkgs/by-name/pl/pluto/package.nix
+++ b/pkgs/by-name/pl/pluto/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "pluto";
-  version = "5.22.1";
+  version = "5.22.2";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
     rev = "v${version}";
-    hash = "sha256-mq18PUyVFhi3ePju6EvYg4VowwAHJwhvpI67BX8BqRY=";
+    hash = "sha256-hjYWxeTa0i6Gv+dFUH8AO9740pOZ27hP4Tb44EfXubg=";
   };
 
   vendorHash = "sha256-59mRVfQ2rduTvIJE1l/j3K+PY3OEMfNpjjYg3hqNUhs=";

From fc3b1b73ccd8c1474eb335c7109cdfb899c3e168 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 01:47:17 +0000
Subject: [PATCH 180/357] syrics: 0.1.2.2 -> 0.1.2.3

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

diff --git a/pkgs/by-name/sy/syrics/package.nix b/pkgs/by-name/sy/syrics/package.nix
index 0758403cf3ba..2447eba72ecd 100644
--- a/pkgs/by-name/sy/syrics/package.nix
+++ b/pkgs/by-name/sy/syrics/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "syrics";
-  version = "0.1.2.2";
+  version = "0.1.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "akashrchandran";
     repo = "syrics";
     tag = "v${version}";
-    hash = "sha256-Ck7pTUgOdib0WqPnvTU6NHKWhMYsIZBY0rzUtFi0q/A=";
+    hash = "sha256-uOk/9PzQgLXAy8eSp739fArq1/C7ZqdY9GoOJ3LObJ8=";
   };
 
   build-system = [

From 5c2f1994ab64fd5b5525ec85006239a01d5727ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 01:56:33 +0000
Subject: [PATCH 181/357] prometheus-artifactory-exporter: 1.15.1 -> 1.16.0

---
 pkgs/servers/monitoring/prometheus/artifactory-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix
index 5f409cc0e964..945569c6b5b4 100644
--- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix
@@ -7,14 +7,14 @@
 
 buildGoModule rec {
   pname = "artifactory_exporter";
-  version = "1.15.1";
+  version = "1.16.0";
   rev = "v${version}";
 
   src = fetchFromGitHub {
     owner = "peimanja";
     repo = pname;
     rev = rev;
-    hash = "sha256-9ghp7VQoZk8/WjWVs7T0TUOCj/HLTYQn27h2DrW+KjE=";
+    hash = "sha256-qW0q1ivKk1cAI9OteRarU+XiQkljsjplLpfRgAeOuMg=";
   };
 
   vendorHash = "sha256-CQ7JvXcutj63UzaYk/jbmd9G2whN48Xv1PCllaI9Nuo=";

From afcc6731551cf93376d0be2defb0c0d2ecd9bf14 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 02:00:49 +0000
Subject: [PATCH 182/357] rekor-cli: 1.3.10 -> 1.4.0

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

diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix
index 7f1df1a9aa6c..e28edd4be66a 100644
--- a/pkgs/tools/security/rekor/default.nix
+++ b/pkgs/tools/security/rekor/default.nix
@@ -14,13 +14,13 @@ let
     }:
     buildGoModule rec {
       inherit pname;
-      version = "1.3.10";
+      version = "1.4.0";
 
       src = fetchFromGitHub {
         owner = "sigstore";
         repo = "rekor";
         rev = "v${version}";
-        hash = "sha256-fxBLh7QrBBkUsVrONeFmrXtmRGNgkH7WnncMQ+E56Ok=";
+        hash = "sha256-uGPjeBnai1QP/U9uu4wVMUVjd8Nx1sl4r83xrOdEoF0=";
         # populate values that require us to use git. By doing this in postFetch we
         # can delete .git afterwards and maintain better reproducibility of the src.
         leaveDotGit = true;
@@ -33,7 +33,7 @@ let
         '';
       };
 
-      vendorHash = "sha256-2ddpzKzVlmOgxsBtLB28fKZ2o4QvtrNZC+1wOny3Amk=";
+      vendorHash = "sha256-lHaRabQzeh69GXQc3Spe1mLi7zyGSjhICH3ZENMJUfI=";
 
       nativeBuildInputs = [ installShellFiles ];
 

From 8e7bfb3667774f68b82b161284bbf6bbd535842c Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 2 Aug 2025 10:56:07 +0800
Subject: [PATCH 183/357] luau: 0.684 -> 0.685

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

diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix
index 3bff322fe999..efb6fa2451d1 100644
--- a/pkgs/by-name/lu/luau/package.nix
+++ b/pkgs/by-name/lu/luau/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luau";
-  version = "0.684";
+  version = "0.685";
 
   src = fetchFromGitHub {
     owner = "luau-lang";
     repo = "luau";
     tag = finalAttrs.version;
-    hash = "sha256-Z+6zB4idX56eTZE8LN5EW2SFBTqhGXVgylhggeC3EJo=";
+    hash = "sha256-7yyWJLTVp4Ni5H+jJwaPNDgq9DrRgGG8hNVkEAV4c5A=";
   };
 
   nativeBuildInputs = [ cmake ];

From b3fc17da07e5fe31b768eeb4c7a76ad1ce8a441d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 03:28:13 +0000
Subject: [PATCH 184/357] python3Packages.json-repair: 0.47.8 -> 0.48.0

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

diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix
index ba62fed35951..bbfc0d73b8fd 100644
--- a/pkgs/development/python-modules/json-repair/default.nix
+++ b/pkgs/development/python-modules/json-repair/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "json-repair";
-  version = "0.47.8";
+  version = "0.48.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mangiucugna";
     repo = "json_repair";
     tag = "v${version}";
-    hash = "sha256-f3SKBzK3a4rx6lekUIZ+Bz8jHvM/i/Q3u/qHDD2YWMI=";
+    hash = "sha256-tt7LueyCGKK/HD5fKsuMZiEPGLMLqOrB9p9SyLpUqgo=";
   };
 
   build-system = [ setuptools ];

From 138e0867a1b6cc013ba3188f4db466a867f54eda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 04:14:24 +0000
Subject: [PATCH 185/357] terraform-providers.keycloak: 5.3.0 -> 5.4.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index fd5a20139ff9..bcb41f1c96d4 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -723,13 +723,13 @@
     "vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU="
   },
   "keycloak": {
-    "hash": "sha256-IgSc6GhXpyH1LCElGALMmEE7MACTvwOzLLQgWl5qEcc=",
+    "hash": "sha256-59+rVoS49w6aGFqpvcgoiYAFebsQLjXbPrhvZHMYV3s=",
     "homepage": "https://registry.terraform.io/providers/keycloak/keycloak",
     "owner": "keycloak",
     "repo": "terraform-provider-keycloak",
-    "rev": "v5.3.0",
+    "rev": "v5.4.0",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-n78cEI1JKtPKZmNnAHykt9oRixZUjddpAIWD3ct3e1c="
+    "vendorHash": "sha256-pnOwYupql5EWoA0l72RENXeAQELaFHlDorJLQKJUz+c="
   },
   "kubectl": {
     "hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=",

From 1c2da28ba73e7bd19b1e8f4730dfd7e14dedccad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 04:49:27 +0000
Subject: [PATCH 186/357] heimdall-proxy: 0.16.6 -> 0.16.7

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

diff --git a/pkgs/by-name/he/heimdall-proxy/package.nix b/pkgs/by-name/he/heimdall-proxy/package.nix
index bdb9b52bbca6..f8ef29960c67 100644
--- a/pkgs/by-name/he/heimdall-proxy/package.nix
+++ b/pkgs/by-name/he/heimdall-proxy/package.nix
@@ -4,7 +4,7 @@
   lib,
 }:
 let
-  version = "0.16.6";
+  version = "0.16.7";
 in
 buildGoModule {
   pname = "heimdall-proxy";
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "dadrus";
     repo = "heimdall";
     tag = "v${version}";
-    hash = "sha256-IWK8iNhNw0deaj2OYlArmqBftDmSlGtVzXbu0KwB8O8=";
+    hash = "sha256-YFqaCXx/x2LfdqaJZFTGkK/k7qIRWKXA1t/KZeWLDGw=";
   };
 
-  vendorHash = "sha256-OG7AqHS3UXBDvIT+F8USIc33MVE/i8eHVjYOY9ZWzIw=";
+  vendorHash = "sha256-E/tdRS96rPWZHwtG22TFB1p7CUaFsya7nI8cAEuYvJo=";
 
   tags = [ "sqlite" ];
 

From 14a8180cd79b88c4e3745eaa114d312db63cf0b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 04:58:35 +0000
Subject: [PATCH 187/357] inputplumber: 0.60.7 -> 0.60.8

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

diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix
index d455c21931cd..ca2237400471 100644
--- a/pkgs/by-name/in/inputplumber/package.nix
+++ b/pkgs/by-name/in/inputplumber/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "inputplumber";
-  version = "0.60.7";
+  version = "0.60.8";
 
   src = fetchFromGitHub {
     owner = "ShadowBlip";
     repo = "InputPlumber";
     tag = "v${version}";
-    hash = "sha256-3o5Y6fbshC3oTerf8M+yuo01BbQAilkT7TdrlwO6YBs=";
+    hash = "sha256-k3SkjLjtCRionDwi2S/pZ40ShKgbsbQhBuLAs3Kd458=";
   };
 
-  cargoHash = "sha256-Tk3NCcturMHIs9hdGqwC87kqnhg/PvriCNSkYcq9+aM=";
+  cargoHash = "sha256-i9mFQ12z3YE6Kb89Tt27reG1Y3rUmzTkAlT4Zd8rgXg=";
 
   nativeBuildInputs = [
     pkg-config

From 35a0fe5c6052f0273393334e2a30f770b40090ea Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Fri, 1 Aug 2025 21:33:31 -0400
Subject: [PATCH 188/357] code-cursor: 1.2.2 -> 1.3.8

---
 pkgs/by-name/co/code-cursor/package.nix | 27 +++++++++----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index 02de5e2a9464..11111b5322ea 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -16,20 +16,20 @@ let
 
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/linux/x64/Cursor-1.2.2-x86_64.AppImage";
-      hash = "sha256-mQr1QMw4wP+kHvE9RWPkCKtHObbr0jpyOxNw3LfTPfc=";
+      url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/linux/x64/Cursor-1.3.8-x86_64.AppImage";
+      hash = "sha256-qR1Wu3H0JUCKIoUP/QFC1YyYiRaQ9PVN7ZT9TjHwn1k=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/linux/arm64/Cursor-1.2.2-aarch64.AppImage";
-      hash = "sha256-EGvm/VW+NDTmOB1o2j3dpq4ckWbroFWEbF9Pezr8SZQ=";
+      url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/linux/arm64/Cursor-1.3.8-aarch64.AppImage";
+      hash = "sha256-UrUstEFP8W8Y9WUCR5kt3434bKCBBK/NaSu2UK8+gII=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/darwin/x64/Cursor-darwin-x64.dmg";
-      hash = "sha256-IDJklB8wMfrPpc2SO02iVBBE9d7fLN7JotVpPyCQkyE=";
+      url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/darwin/x64/Cursor-darwin-x64.dmg";
+      hash = "sha256-FGjqbOdr1HSjVlDYP/+vp4bVQoqdJww3U4t59QLg1kk=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/faa03b17cce93e8a80b7d62d57f5eda6bb6ab9fa/darwin/arm64/Cursor-darwin-arm64.dmg";
-      hash = "sha256-GxiNf58Kf5/l01eBhXRWMLMxAnj1txDQwSe5ei6nTgg=";
+      url = "https://downloads.cursor.com/production/a1fa6fc7d2c2f520293aad84aaa38d091dee6fef/darwin/arm64/Cursor-darwin-arm64.dmg";
+      hash = "sha256-tsVPS48APst7kbEh7cjhJ2zYKcKBDdjH+NXMpAe4Ixs=";
     };
   };
 
@@ -39,12 +39,12 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = finalCommandLineArgs;
 
-  version = "1.2.2";
+  version = "1.3.8";
   pname = "cursor";
 
   # You can find the current VSCode version in the About dialog:
   # workbench.action.showAboutDialog (Help: About)
-  vscodeVersion = "1.96.2";
+  vscodeVersion = "1.99.3";
 
   executableName = "cursor";
   longName = "Cursor";
@@ -98,13 +98,6 @@ in
     nativeBuildInputs =
       (oldAttrs.nativeBuildInputs or [ ]) ++ lib.optionals hostPlatform.isDarwin [ undmg ];
 
-    preInstall =
-      (oldAttrs.preInstall or "")
-      + lib.optionalString hostPlatform.isLinux ''
-        mkdir -p bin
-        ln -s ../cursor bin/cursor
-      '';
-
     passthru = (oldAttrs.passthru or { }) // {
       inherit sources;
     };

From 314ad593a1abd8d663e6d8ea078885e06437dd54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 06:42:50 +0000
Subject: [PATCH 189/357] dnsmonster: 1.0.0 -> 1.0.2

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

diff --git a/pkgs/by-name/dn/dnsmonster/package.nix b/pkgs/by-name/dn/dnsmonster/package.nix
index 64c40c4d9f54..6ed3b9484a4c 100644
--- a/pkgs/by-name/dn/dnsmonster/package.nix
+++ b/pkgs/by-name/dn/dnsmonster/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "dnsmonster";
-  version = "1.0.0";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "mosajjal";
     repo = "dnsmonster";
     tag = "v${version}";
-    hash = "sha256-0WHTrqnc3vYQro+nSsQipAPVymR8L4uOwtd9GJHxhVM=";
+    hash = "sha256-sg+88WbjlfcPgWQ9RnmLr6/VWwXEjsctfWt4TGx1oNc=";
   };
 
-  vendorHash = "sha256-QCG/rhs4Y3lLDVU15cBNUZqbKc4faNAqKMhMOFwK2SY=";
+  vendorHash = "sha256-PIiSpxfZmhxWkHUnoDYKppI7/gzGm0RKh7u9HK4zrEU=";
 
   buildInputs = [ libpcap ];
 

From d1e68bdf62a53dac3d69e3bea2f51ba1607222cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 06:44:40 +0000
Subject: [PATCH 190/357] cri-o-unwrapped: 1.33.2 -> 1.33.3

---
 pkgs/applications/virtualization/cri-o/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 2587f9c78c0e..a2768df39488 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -17,13 +17,13 @@
 
 buildGoModule rec {
   pname = "cri-o";
-  version = "1.33.2";
+  version = "1.33.3";
 
   src = fetchFromGitHub {
     owner = "cri-o";
     repo = "cri-o";
     rev = "v${version}";
-    hash = "sha256-QHWE0BVsGFk1UOo51wZUl24bisS9GzCeWkE7yM3dYec=";
+    hash = "sha256-nDBXXsvzoaJwbeLAXwCdJcxSZjo9Y7CcPBpkNTN2ey0=";
   };
   vendorHash = null;
 

From 5ba3f27dcea52d6ab9fe4710fa22fd1365272111 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 07:02:24 +0000
Subject: [PATCH 191/357] tutanota-desktop: 293.250630.0 -> 299.250725.1

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

diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
index adec12140bbf..e616657fd66b 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "tutanota-desktop";
-  version = "293.250630.0";
+  version = "299.250725.1";
 
   src = fetchurl {
     url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
-    hash = "sha256-USyNM4cQs+ugwkDwsookR3rDn2+6uir6NnL651jM85I=";
+    hash = "sha256-nZ9LdXqGAEeCM/1tzfz0jnq6AyamobmP/vNgJoHjfhs=";
   };
 
   extraPkgs = pkgs: [ pkgs.libsecret ];

From 90158bcd9217009fd03af82a93a1ee6e6eaeb93f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 07:19:27 +0000
Subject: [PATCH 192/357] python3Packages.polyline: 2.0.1 -> 2.0.3

---
 pkgs/development/python-modules/polyline/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/polyline/default.nix b/pkgs/development/python-modules/polyline/default.nix
index 7e1ab2c2e40c..fbe56c2c4d69 100644
--- a/pkgs/development/python-modules/polyline/default.nix
+++ b/pkgs/development/python-modules/polyline/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "polyline";
-  version = "2.0.1";
+  version = "2.0.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "frederickjansen";
     repo = "polyline";
     tag = "v${version}";
-    hash = "sha256-fbGGfZdme4OiIGNlXG1uVl1xP+rPVI9l5hjHM0gwAsE=";
+    hash = "sha256-HUdjebUMcYGW+7dyOpVgBnBcesmqDWpw1NgYigOxmQ8=";
   };
 
   nativeBuildInputs = [
@@ -42,7 +42,7 @@ buildPythonPackage rec {
       essentially a port of https://github.com/mapbox/polyline.
     '';
     homepage = "https://github.com/frederickjansen/polyline";
-    changelog = "https://github.com/frederickjansen/polyline/releases/tag/${version}";
+    changelog = "https://github.com/frederickjansen/polyline/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ ersin ];
   };

From 1cbeff3b97285ed2b08332ff6aaa523e0d90c365 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 07:59:46 +0000
Subject: [PATCH 193/357] libretro.stella: 0-unstable-2025-06-26 ->
 0-unstable-2025-07-28

---
 pkgs/applications/emulators/libretro/cores/stella.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix
index 748f6d250486..89334982a8e4 100644
--- a/pkgs/applications/emulators/libretro/cores/stella.nix
+++ b/pkgs/applications/emulators/libretro/cores/stella.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella";
-  version = "0-unstable-2025-06-26";
+  version = "0-unstable-2025-07-28";
 
   src = fetchFromGitHub {
     owner = "stella-emu";
     repo = "stella";
-    rev = "c6ce6e80e87c828701629980e8a7119f3b08c5ab";
-    hash = "sha256-403Z0W9OQYbb8+O8kSWbpHkqywVhXbqqIyfsGlgEi+M=";
+    rev = "211b4902d5b4440b0aa567dade4eebf77cd868aa";
+    hash = "sha256-l2b2Lu9l5CwmfDsJazOdQ9mowxfAqJY4SEgtDxCnYxY=";
   };
 
   makefile = "Makefile";

From 36a73196db55d65c41d6b9ce5a8d20d391f97701 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 08:16:01 +0000
Subject: [PATCH 194/357] tbls: 1.86.1 -> 1.87.0

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

diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix
index a999a427f4ac..36f5f50048bf 100644
--- a/pkgs/by-name/tb/tbls/package.nix
+++ b/pkgs/by-name/tb/tbls/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "tbls";
-  version = "1.86.1";
+  version = "1.87.0";
 
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = "tbls";
     tag = "v${version}";
-    hash = "sha256-v7tZTg2tTL21YLCrdk6O8rw1/czsq7JTcpMpBHwrnyk=";
+    hash = "sha256-u7zb0ohZlXlnJlgsXEp7ttNtAB4ZF3NXe3lPGpClp5M=";
   };
 
-  vendorHash = "sha256-9IvnIFOlLdqmntisNomO5K6PU8gw7CSuEb46zG5ox2A=";
+  vendorHash = "sha256-6v3ypD+YWvCST5rM6YHUBGeQ5F1lwb2GKPcq/3XJeiY=";
 
   excludedPackages = [ "scripts/jsonschema" ];
 

From 41feed076dcea3df19f74f98fd4635fa3dbbb476 Mon Sep 17 00:00:00 2001
From: Arsenii Zorin <me@wrb.bz>
Date: Sat, 2 Aug 2025 11:21:45 +0300
Subject: [PATCH 195/357] pulumi-bin: 3.186.0 -> 3.187.0

---
 pkgs/tools/admin/pulumi-bin/data.nix | 98 ++++++++++++++--------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix
index 45c19b912675..020d230dea87 100644
--- a/pkgs/tools/admin/pulumi-bin/data.nix
+++ b/pkgs/tools/admin/pulumi-bin/data.nix
@@ -1,12 +1,12 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.186.0";
+  version = "3.187.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.186.0-linux-x64.tar.gz";
-        sha256 = "0ybg8dp8n0k46xhslj9h49mvw4hnl5h86w1kllcm579pn402lnm0";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.187.0-linux-x64.tar.gz";
+        sha256 = "0i5rva842w13b7p1fagarm38qbgfkw7n5ry1m84jpjza8nf1hc8n";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.41.0-linux-amd64.tar.gz";
@@ -25,12 +25,12 @@
         sha256 = "0ar9f81mda8m7cxcb0c920x3i41fvw5va9c6zv0793jna9aphskm";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.23.0-linux-amd64.tar.gz";
-        sha256 = "1pz92kgp8asyj8zk5c2byy79xf5zvri4cjp7a7nywdqsqpfw6d17";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.23.2-linux-amd64.tar.gz";
+        sha256 = "1q18zxsjrdcgcazi53lk7z72pyy30g07z5vgn5l3c7myi1m0ypwc";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.1.0-linux-amd64.tar.gz";
-        sha256 = "1fwfvjjds143f79a9qjpr5vycahy11cd7zydrqgaan9q2djp3kq3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.2.0-linux-amd64.tar.gz";
+        sha256 = "0zz1zqi3gh09s2q7v5c43jf924yighqmrkyfn4n8hby0gvjd5jyv";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.2-linux-amd64.tar.gz";
@@ -73,8 +73,8 @@
         sha256 = "0yzdsz3qmvsim63ndfyw3rikvd3acpwd63hav3n95qc91p7gf92j";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.38.0-linux-amd64.tar.gz";
-        sha256 = "13s55pl27q8lxlizzdz73i1h4cvi4pvszfns9jk8wsh2kc1h1qxz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.39.0-linux-amd64.tar.gz";
+        sha256 = "12g19dkp3vnk3gi44635iv41my1hx8cdpjazj03qhbzgqaplkslg";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-linux-amd64.tar.gz";
@@ -89,16 +89,16 @@
         sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.23.1-linux-amd64.tar.gz";
-        sha256 = "1rgkab1ira6jpgk0vzby5vp4bvymsz8ysb4q7lnb4zgb19yrd682";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.24.0-linux-amd64.tar.gz";
+        sha256 = "0f17cii2cnq3l3nhgxna76y2x0fxq2zwny1mgh33k11qkn43wllh";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-linux-amd64.tar.gz";
         sha256 = "08i1k8m59dp56lafx8b0ggmgxl7dfqv8f4nljy4dh95h3bs7fdl2";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.1.0-linux-amd64.tar.gz";
-        sha256 = "01405rg0srcpcm242g74c2hjm12b5xxs6srikiqh62gjzw45p6ci";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.1.1-linux-amd64.tar.gz";
+        sha256 = "1l9kjc8xi2hfxskgczxn1a090zg38lpycx7c6kf709ffk5ymjvic";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.10-linux-amd64.tar.gz";
@@ -163,8 +163,8 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.186.0-darwin-x64.tar.gz";
-        sha256 = "0dc8y8z724w35rlz4mjr4gqswpx3vbx6bhiii29ycrakgvs0a8dj";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.187.0-darwin-x64.tar.gz";
+        sha256 = "00wxqx6z2g07ksnv2hcbfj015fjihdgsrggh044x3j813wcn61xv";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.41.0-darwin-amd64.tar.gz";
@@ -183,12 +183,12 @@
         sha256 = "1v251h3hfj9hpw08qd1xn2y7wlz1kgbmxvxg47p2ld50ycn752hz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.23.0-darwin-amd64.tar.gz";
-        sha256 = "092v230cj5nx1vr7k87cchyk1qnd9c629xrzh2jc483i8b5f19gp";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.23.2-darwin-amd64.tar.gz";
+        sha256 = "1yqjkfhv624bs5qmqrsk7651f43gim11hvj443j2vv5c5aj6315i";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.1.0-darwin-amd64.tar.gz";
-        sha256 = "0knw6l997znyk6x05i7f5haaxl40jpm0vwhhf11rypqhl16k5019";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.2.0-darwin-amd64.tar.gz";
+        sha256 = "0gd14svl000plsm35fj8gk8ps8jdv51a7kqq5fv6d18v132b085k";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.2-darwin-amd64.tar.gz";
@@ -231,8 +231,8 @@
         sha256 = "0843nw4w6l2sz0yp5ny39scbx4yz1hzm9c1099cxn764xdbv6w5x";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.38.0-darwin-amd64.tar.gz";
-        sha256 = "0vr71abg73xh8b7j7w2gb4c18f72jsz9pzg2ihr29a18mdx9l78b";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.39.0-darwin-amd64.tar.gz";
+        sha256 = "004ll28fgg18p2q5kv1brbdjn1s2wrd1ysfl5hprvjnni3vnf8pn";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-darwin-amd64.tar.gz";
@@ -247,16 +247,16 @@
         sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.23.1-darwin-amd64.tar.gz";
-        sha256 = "1wpqvj9rd57q1jlgry99ibyhrdqh8qz3ynckqlj61ipf4lr0z80z";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.24.0-darwin-amd64.tar.gz";
+        sha256 = "0ccsm2i69vcbwr9yvs3bh3jsmjq7h490aj3i2n3qq96yyb65fd3f";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-darwin-amd64.tar.gz";
         sha256 = "1pdvqyfv4cn25h0hg830r2mv5d7g16032badf6f16azscdri81lv";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.1.0-darwin-amd64.tar.gz";
-        sha256 = "0ryk92y7nnkj8ahdd0mp3j0fd192nyplr83r9xbrkdx8dgs30xac";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.1.1-darwin-amd64.tar.gz";
+        sha256 = "00f7ql3am9xmx3vqvv0sg6qrqzgmglngw29drr2rnzjl82m8kazn";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.10-darwin-amd64.tar.gz";
@@ -321,8 +321,8 @@
     ];
     aarch64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.186.0-linux-arm64.tar.gz";
-        sha256 = "0nfyig3w2k3xj9x5v0vcdxbdp87rr6iwg9ch8dh9nx4jqkch52ny";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.187.0-linux-arm64.tar.gz";
+        sha256 = "1papgkpxwvbh6b1w3nm9j0wa3q6jg0sqczc0jfs7wh9a30flq2w7";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.41.0-linux-arm64.tar.gz";
@@ -341,12 +341,12 @@
         sha256 = "1dvn2p7b5i95kcma4zdw258cg74pz9fx2nx9rbaf37pfczrqyzhl";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.23.0-linux-arm64.tar.gz";
-        sha256 = "0k93ff9mc5qcrxz6f6l85hnymyw16hnxin6cp65ymcaam0xv432s";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.23.2-linux-arm64.tar.gz";
+        sha256 = "0lqg84wss12riigs1lmmpxhhg7bji1c0nacb9lb9k64x5m3z4kyv";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.1.0-linux-arm64.tar.gz";
-        sha256 = "10w4i3mqlxzvhy4bk7g9kz5bj8xv0yxh6b47n138lqxp8q1cc4yw";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.2.0-linux-arm64.tar.gz";
+        sha256 = "18rls6dgx7mx1qa7q6qrj0pq9dpvxbapzfdwx38irv68fhny2sw1";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.2-linux-arm64.tar.gz";
@@ -389,8 +389,8 @@
         sha256 = "15aivjbj4sl8pck9d339mgngs3habz8vr4gd7hy4i04vykxwiwmg";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.38.0-linux-arm64.tar.gz";
-        sha256 = "1cn7n1na4igb69wi3yyxmhiai7p8c1qn47cgwpzqj1l279jjx2vk";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.39.0-linux-arm64.tar.gz";
+        sha256 = "1lszi6b2gq6pgsyrjj9xs89qnc8w7yl2w8fnxgqwp78w516jz3bd";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-linux-arm64.tar.gz";
@@ -405,16 +405,16 @@
         sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.23.1-linux-arm64.tar.gz";
-        sha256 = "189dxlwnzmygmclbaqlp599cfp7byg329fxjkp3nb8g05sij0407";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.24.0-linux-arm64.tar.gz";
+        sha256 = "1llc16iwm347wi1gl15rngry5vbbh0w01d65l9ivn5r7ziwdchfg";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-linux-arm64.tar.gz";
         sha256 = "0kqxz7y1n9zzpw3rv15kb55qvp14rvxh0vymddlrja7iqcvb8nd8";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.1.0-linux-arm64.tar.gz";
-        sha256 = "1jr3i8d975814ylan8x0fwm53sscxdlzn1nz0jqfz5qgjahzc9cq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.1.1-linux-arm64.tar.gz";
+        sha256 = "19hhlbdwx22yg0x5g6310z2mjsv0wfgwc420a5r6f40jr3fwfnyz";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.10-linux-arm64.tar.gz";
@@ -479,8 +479,8 @@
     ];
     aarch64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.186.0-darwin-arm64.tar.gz";
-        sha256 = "0ihk3k2b06hjyspmhfsrv16ybm42zibf4qyw19r5r9spjknk70lg";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.187.0-darwin-arm64.tar.gz";
+        sha256 = "1lw9xf9dlzri6hn485nkn8vv6dqwjys2wny9g6gddznp1xbwz1x6";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.41.0-darwin-arm64.tar.gz";
@@ -499,12 +499,12 @@
         sha256 = "0kil9gkd3mmr1hnbz5k3na98rxy4qvzrvriiib6mgq7vg9rjb2q3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.23.0-darwin-arm64.tar.gz";
-        sha256 = "1vkqy73n2371b7r1j5d3apm3kih4la39fswbw9w765s2nkpg8zi3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.23.2-darwin-arm64.tar.gz";
+        sha256 = "13wa8gvasq9ypyivsni09x63fyw19pxwn18c7cndkfckp2h6j9i7";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.1.0-darwin-arm64.tar.gz";
-        sha256 = "0ndkxq2vpppq2ygq0b81w72hnx8sb6ckdhcrx62gp9nfq5ya8y69";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.2.0-darwin-arm64.tar.gz";
+        sha256 = "1xn0saw5r9hbhhhb1jfkv88fczs988ca2ivglzg96cjnn9g2vgyi";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.5.2-darwin-arm64.tar.gz";
@@ -547,8 +547,8 @@
         sha256 = "09wwvhxchd5qkvq3rk6k742arfk3y5ysxvcygn56pvbwjlzjc654";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.38.0-darwin-arm64.tar.gz";
-        sha256 = "1kammj8rsawv2qjw7a01skf7qdzjgprfkapbgypfsqcmlsmphy93";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.39.0-darwin-arm64.tar.gz";
+        sha256 = "1v9rppazl6bcbjs8l3mrwp6h5y4ir10ar4m3jkimimamf29wss8v";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-darwin-arm64.tar.gz";
@@ -563,16 +563,16 @@
         sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.23.1-darwin-arm64.tar.gz";
-        sha256 = "0njqqjslzgdks3cjv8bgg915llrssz4zxvnmcxb30cx44141lkav";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.24.0-darwin-arm64.tar.gz";
+        sha256 = "056hhrdfclvy5l5dvhlrjw2dd5d6gl4ph9c4mhkmrx0mvrjax7zl";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-darwin-arm64.tar.gz";
         sha256 = "17fl8apnlz4ifjzp1sq0fi4y1knxh1x2fvhlrg8j568f3svp41f8";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.1.0-darwin-arm64.tar.gz";
-        sha256 = "1jy9rbll0d5g4w8llys3ggj3mz59d2ljwakg1vqsq1cflly67af0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.1.1-darwin-arm64.tar.gz";
+        sha256 = "13n9mdhfnnrcfaasr2ca0myyrk09mbazllzhrrxkriahw64a878h";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.10-darwin-arm64.tar.gz";

From 029fc42bf9377a07debb92153dd4547c9a37893e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 08:22:44 +0000
Subject: [PATCH 196/357] ultrastardx: 2025.6.0 -> 2025.8.0

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

diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix
index f70e5cfd7e67..d2b8dbb253c6 100644
--- a/pkgs/by-name/ul/ultrastardx/package.nix
+++ b/pkgs/by-name/ul/ultrastardx/package.nix
@@ -45,13 +45,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "ultrastardx";
-  version = "2025.6.0";
+  version = "2025.8.0";
 
   src = fetchFromGitHub {
     owner = "UltraStar-Deluxe";
     repo = "USDX";
     rev = "v${version}";
-    hash = "sha256-0M5z40DLZsw/MPjhxsXGwkJnd1dnV59UjR15UXQCChM=";
+    hash = "sha256-rliUJNhvbXbD+ELxwutCoQs6BO1DyJ8J/+mmYHPuvQE=";
   };
 
   nativeBuildInputs = [

From d6349bba0a6634147ed9b03cd578208f16fb194d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 08:48:35 +0000
Subject: [PATCH 197/357] kubeshark: 52.7.8 -> 52.8.0

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

diff --git a/pkgs/by-name/ku/kubeshark/package.nix b/pkgs/by-name/ku/kubeshark/package.nix
index f5c1ae167e9a..aa58ad0bb3c0 100644
--- a/pkgs/by-name/ku/kubeshark/package.nix
+++ b/pkgs/by-name/ku/kubeshark/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "kubeshark";
-  version = "52.7.8";
+  version = "52.8.0";
 
   src = fetchFromGitHub {
     owner = "kubeshark";
     repo = "kubeshark";
     rev = "v${version}";
-    hash = "sha256-bGfqJ+XXflO2FcYRDkdDrDchpuIF2VBsVQkApd+2YoU=";
+    hash = "sha256-p7kTawHggRR1fdd8nAPRCGuvVgRKZ6n8U22D/731xJ8=";
   };
 
-  vendorHash = "sha256-kzyQW4bVE7oMOlHVG7LKG1AMTRYa5GLiiEhdarIhMSo=";
+  vendorHash = "sha256-4s1gxJo2w5BibZ9CJP7Jl9Z8Zzo8WpBokBnRN+zp8b4=";
 
   ldflags =
     let

From 8120f80286b0b6e648a0e5c12f35ab0960c9d629 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sat, 2 Aug 2025 11:03:27 +0200
Subject: [PATCH 198/357] readest: 0.9.67 -> 0.9.69

Changelog: https://github.com/readest/readest/releases/tag/v0.9.69
Diff: https://github.com/readest/readest/compare/v0.9.67...v0.9.69
---
 pkgs/by-name/re/readest/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index 734db5102332..53078e3fdf0d 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -20,13 +20,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "readest";
-  version = "0.9.67";
+  version = "0.9.69";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gcysscFxNg5OOPhO9i3Flo6/ajBJ3lVEfHDlw0632Yg=";
+    hash = "sha256-dbGGxkv3Fcabu7nsEEgYVstgoMfUEVnucmawKWgCVUw=";
     fetchSubmodules = true;
   };
 
@@ -40,12 +40,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-VOqFo06HV+XFjzR3l3klmR8vLXrG6KgD8UF9mQVf9uA=";
+    hash = "sha256-0wcmtCMTVmJU8yxpdi2decnFmKdbCl2grNlZ/FyKx8I=";
   };
 
   pnpmRoot = "../..";
 
-  cargoHash = "sha256-Pf5jxPZY2NZXvWFzBhISrprJ8GpF5olwnlGabcWKf1U=";
+  cargoHash = "sha256-rt5QeKK7SChvz3Wi+Y2YY1fWak5xs2p3muJgPxcYUrs=";
 
   cargoRoot = "../..";
 

From 457d518c8eedb08d0c65fc18c02e080c9e40f47e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 09:11:47 +0000
Subject: [PATCH 199/357] rqlite: 8.41.0 -> 8.43.0

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

diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix
index 84668d194e72..632faac488b9 100644
--- a/pkgs/by-name/rq/rqlite/package.nix
+++ b/pkgs/by-name/rq/rqlite/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "rqlite";
-  version = "8.41.0";
+  version = "8.43.0";
 
   src = fetchFromGitHub {
     owner = "rqlite";
     repo = "rqlite";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3jzQ6Kby/v/cBxc1+ejm5PdmhZVVWvBrDEeuf7hqVKw=";
+    hash = "sha256-+liwTJP4JEVQCMHegg4Ewk4K+MEjbwZ8wo3aoRZo+S0=";
   };
 
-  vendorHash = "sha256-8Oejfec9QAYRkFGyEB9R/msiwzV+pgDFS+UNfvvTie4=";
+  vendorHash = "sha256-81Ueq2/aH0KNEuaNjpMVP1MIX68jY33G+v2oDzNvvo8=";
 
   subPackages = [
     "cmd/rqlite"

From b8eaaa332a76aef5887e15afd9777f6a74abd1f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 09:13:37 +0000
Subject: [PATCH 200/357] python3Packages.jsonschema-rs: 0.30.0 -> 0.32.0

---
 pkgs/development/python-modules/jsonschema-rs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/jsonschema-rs/default.nix b/pkgs/development/python-modules/jsonschema-rs/default.nix
index dbeae90c20ea..1319f33a8ad9 100644
--- a/pkgs/development/python-modules/jsonschema-rs/default.nix
+++ b/pkgs/development/python-modules/jsonschema-rs/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "jsonschema-rs";
-  version = "0.30.0";
+  version = "0.32.0";
 
   pyproject = true;
 
@@ -21,12 +21,12 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "jsonschema_rs";
-    hash = "sha256-KfmI0ik3HWrv1WDFsT5xvxyRyXKg2DpmxeuUHOR9MZM=";
+    hash = "sha256-BQDPoBn6WNwaxS1gWSol021My7Oiz0DIspHujY9/7Mc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-LNT2wQnOaVMBrI+fW6wbIRaTYPvw3ESinI5KY8wjp1o=";
+    hash = "sha256-MbIBiV0xOKvDrQPnovTLgGgvdJIHPw19faJFmMqWIMw=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From 54cbd51f2b583130bde376d337ccb3cc67466ba2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 09:39:52 +0000
Subject: [PATCH 201/357] nu_scripts: 0-unstable-2025-07-24 ->
 0-unstable-2025-07-29

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

diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix
index 126fa60bc070..e5de63121864 100644
--- a/pkgs/by-name/nu/nu_scripts/package.nix
+++ b/pkgs/by-name/nu/nu_scripts/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "nu_scripts";
-  version = "0-unstable-2025-07-24";
+  version = "0-unstable-2025-07-29";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = "nu_scripts";
-    rev = "bd128cf5257bf3f6c3453cbb4fd431d01d3467db";
-    hash = "sha256-8sJc7oF0m/hi/Uqm1X6ciIYAk5zW8hm0byX2RVZS6V8=";
+    rev = "365b8839bad8c7d77c2361f2fc0d8b27bf14df92";
+    hash = "sha256-YasyvTR9DCZpHFNNrBxBR1MshLvJO8DUDXmYptVzzXk=";
   };
 
   installPhase = ''

From 6611b65be369655f1e121b95d958ac5c35aac8a7 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Sat, 2 Aug 2025 11:41:54 +0200
Subject: [PATCH 202/357] freeplane: 1.12.10 -> 1.12.12

---
 pkgs/by-name/fr/freeplane/deps.json   | 845 +++++++++++++-------------
 pkgs/by-name/fr/freeplane/package.nix |  14 +-
 2 files changed, 435 insertions(+), 424 deletions(-)

diff --git a/pkgs/by-name/fr/freeplane/deps.json b/pkgs/by-name/fr/freeplane/deps.json
index 8510b3e0f7bf..f061ee3c311e 100644
--- a/pkgs/by-name/fr/freeplane/deps.json
+++ b/pkgs/by-name/fr/freeplane/deps.json
@@ -2,9 +2,9 @@
  "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
  "!version": 1,
  "https://josm.openstreetmap.de": {
-  "repository/releases/org/openstreetmap/jmapviewer#jmapviewer/2.24": {
-   "jar": "sha256-jZWcMEdLs+8TYtvdtdu9Sna0GH+qFkdI/H9DoHoV5fw=",
-   "pom": "sha256-nMRkdVlwC/Yd93bHGbExI5EWZEQz2u6DR3nC4ehNEGY="
+  "repository/releases/org/openstreetmap/jmapviewer#jmapviewer/2.25": {
+   "jar": "sha256-wakzx954YYis5ZLv1JmNpV979XDD9CIVl3WBqUNlYgs=",
+   "pom": "sha256-D19BQ6RxSbnoijyseiNU76ypEqQIqiadYOsHBpNf7xU="
   }
  },
  "https://plugins.gradle.org/m2": {
@@ -48,13 +48,13 @@
    "jar": "sha256-ml2+P18suRhUyGgsq4AXivpBKrNaWrcYvznOAbNDXZM=",
    "pom": "sha256-G5+9TzJacembJ5CA1jCE8S2ITUIIGvKY+eVT4f4M10o="
   },
-  "org/owasp#dependency-check-gradle/12.1.0": {
-   "jar": "sha256-lpnSAK5/W2yxJP/Gsy+AD/ixlwvrfssNAvU1N4PI3Yk=",
-   "module": "sha256-oCxOdPcgCaEBaeNIFLRSaVuf+oS4IeYHTpRHtUH6JBw=",
-   "pom": "sha256-5Zh/Zru7t4nISOD7qS2hrvdNhetumFr0dyiEOfG16yc="
+  "org/owasp#dependency-check-gradle/12.1.2": {
+   "jar": "sha256-4/NzY4ck4qP4ptH3kAcrjvM3bw72aZmxjwQDPJ76uFk=",
+   "module": "sha256-ZAProwyqLPXWfz2wMN/5JOP3fzKOZQyy+wMWheWB5Xc=",
+   "pom": "sha256-BqLjHk/osGKNWLnthNf681feuIY5XWep5kxMJ0D2dfs="
   },
-  "org/owasp/dependencycheck#org.owasp.dependencycheck.gradle.plugin/12.1.0": {
-   "pom": "sha256-7XJcyDm/q+ovn+YWfQlsi2+80VYMY4ibl+5JxkIK0DU="
+  "org/owasp/dependencycheck#org.owasp.dependencycheck.gradle.plugin/12.1.2": {
+   "pom": "sha256-Ovh77S/Hdk4FmeGGKTG5GoL5MX9vP3PnI2e56ETPEzc="
   },
   "org/xbib/gradle/plugin/jflex#org.xbib.gradle.plugin.jflex.gradle.plugin/1.2.1": {
    "pom": "sha256-rdhfPghFWqbgA7rr8sZfkLsJ3vnoE6oH3TGltArns0w="
@@ -106,20 +106,23 @@
   "com/fasterxml#oss-parent/61": {
    "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ="
   },
-  "com/fasterxml/jackson#jackson-base/2.17.2": {
-   "pom": "sha256-fPnFn70UyQVnRxN7kNcKleh3YN/huCRWufAjF9W1b68="
+  "com/fasterxml#oss-parent/65": {
+   "pom": "sha256-2wuaUmqeMDxjuptYSWicYfs4kkf6cjEFS5DgvwC0MR4="
   },
-  "com/fasterxml/jackson#jackson-base/2.18.2": {
-   "pom": "sha256-71dLcvW0iUgET2g3a4dMiK4JoCncjgX2Shwwvftt4Uo="
+  "com/fasterxml/jackson#jackson-base/2.18.3": {
+   "pom": "sha256-1bv9PIRFIw5Ji2CS3oCa/WXPUE0BOTLat7Pf1unzpP0="
+  },
+  "com/fasterxml/jackson#jackson-base/2.19.0": {
+   "pom": "sha256-Noz4ykJkRni737F6sUfJC8QyWaWZUJfD8cT7au9Mdcg="
   },
   "com/fasterxml/jackson#jackson-bom/2.17.1": {
    "pom": "sha256-n0RhIo4SkQPu16MC3BABqy5Mgt086pFcKn27jMYe/SU="
   },
-  "com/fasterxml/jackson#jackson-bom/2.17.2": {
-   "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
+  "com/fasterxml/jackson#jackson-bom/2.18.3": {
+   "pom": "sha256-8dTGrrMhGGUMgF/pu8XulA+o8s19DwT6Q2BVHponspA="
   },
-  "com/fasterxml/jackson#jackson-bom/2.18.2": {
-   "pom": "sha256-UkfNwwFyXT9n9+8EkDconVr3CdaXK89LFwluRUjSlWs="
+  "com/fasterxml/jackson#jackson-bom/2.19.0": {
+   "pom": "sha256-sR/LPvM6wH5oDObYXxfELWoz2waG+6z68OQ0j8Y5cbI="
   },
   "com/fasterxml/jackson#jackson-parent/2.17": {
    "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
@@ -127,72 +130,75 @@
   "com/fasterxml/jackson#jackson-parent/2.18.1": {
    "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw="
   },
-  "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#jackson-parent/2.19": {
+   "pom": "sha256-bNk0tNFdfz7hONl7I8y4Biqd5CJX7YelVs7k1NvvWxo="
   },
-  "com/fasterxml/jackson/core#jackson-annotations/2.18.2": {
-   "jar": "sha256-WBvWEADvdkiUP3gcoFaJ5W0D9gUnSDZajis6m10/oy8=",
-   "module": "sha256-4Ruvm1NubflNqmNaEBPsPgabhmuOES3cKqBEahVQUNw=",
-   "pom": "sha256-CyvWlOqJJn7qSBJqilskplI0xkM4dULSRGnRlb+6HPg="
+  "com/fasterxml/jackson/core#jackson-annotations/2.18.3": {
+   "jar": "sha256-iqV0DYC1pQJVCLQbutuqH7N3ImfGKLLjBoGk9F+LiTE=",
+   "module": "sha256-RkWF2yH0irFZ6O9XnNfo5tMHoEdhGZZRw+zBf05ydF0=",
+   "pom": "sha256-ucmLqeKephtpPUyMgBlo/qriILKyACNkp7zsUkmYOEs="
   },
-  "com/fasterxml/jackson/core#jackson-core/2.17.2": {
-   "jar": "sha256-choYkkHasFJdnoWOXLYE0+zA7eCB4t531vNPpXeaW0Y=",
-   "module": "sha256-OCgvt1xzPSOV3TTcC1nsy7Q6p8wxohomFrqqivy38jY=",
-   "pom": "sha256-F4IeGYjoMnB6tHGvGjBvSl7lATTyLY0nF7WNqFnrNbs="
+  "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-core/2.18.2": {
-   "jar": "sha256-2AVK58DRwtL1XSjkYCbr5YkogfP6tfQ5IzGEOBw7Sh8=",
-   "module": "sha256-ynjGBDZ2f8w2zhRrd05PUKnLn2MtExcsRLrojgwDz6I=",
-   "pom": "sha256-4GWwA50h9N/ORr1DEEx9dtWFa9cy4qqGDMWkonDtct4="
+  "com/fasterxml/jackson/core#jackson-core/2.18.3": {
+   "jar": "sha256-BWvE0+XlPOghRQ+pez+eD43eElz22miENTux8JWC4dk=",
+   "module": "sha256-mDbVp/Iba8VNfybeh8izBd3g5PGEsqyJUOmhsd9Hw0A=",
+   "pom": "sha256-N9xrj2ORpHCawhXKmPojQcbdZWE8InfZak/YKi9Q48k="
   },
-  "com/fasterxml/jackson/core#jackson-databind/2.17.2": {
-   "jar": "sha256-wEmT8zwPhFNCZTeE8U84Nz0AUoDmNZ21+AhwHPrnPAw=",
-   "module": "sha256-9HC96JRNV9axUMqov1O7mCqZ6x1lkecxr8uXKrPddx8=",
-   "pom": "sha256-0kUGmLrpC+M48rmfrtppTNRQrbUhJCE+elO0Ehm1QGI="
+  "com/fasterxml/jackson/core#jackson-core/2.19.0": {
+   "jar": "sha256-2o6Fm6yUh0UoEWol8gxoVg5Ch6y/J2KHEbik+WsChDA=",
+   "module": "sha256-WT2jX9rflNEYYvfErCjcq52J1bzd2y2jOe7WFXxVbYk=",
+   "pom": "sha256-zOajQFk4YjqBCJX/b94vBMnDuTegVihx4aY0lr4Pr6s="
   },
-  "com/fasterxml/jackson/core#jackson-databind/2.18.2": {
-   "jar": "sha256-SzZOaFDciRcvzx1N0muP9UiO2kT/RlfiLdJlID3Vqzw=",
-   "module": "sha256-jH2sL3J4GNiEeoKqTqxrAXTXnPBN+Q3iJGBy5t005wA=",
-   "pom": "sha256-STo9tkR7eo7Ls3JCNMbOZ31y20sE9roAjw6+rqe+Wp0="
+  "com/fasterxml/jackson/core#jackson-databind/2.18.3": {
+   "jar": "sha256-UQvdp1p6YYbFvzO4USOUiKFFCQauV1cSHy4cxIp+EI8=",
+   "module": "sha256-ZCqggPhbIAV3ifrPKsaibhR4NbUDPidSDstpe8RD/Lo=",
+   "pom": "sha256-5Y9IrBTk29SFldaeILrTUBnsEoFRTvfvFV4YByraYX8="
   },
-  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.17.2": {
-   "jar": "sha256-lBvNixOBuzsNcm+rQWJPqOzg7nts8oYK2V6BV85nM3Y=",
-   "module": "sha256-snbSUVf4i+6mnT9ENGWFZLcfMazeHUsaFPiYS+lTw0M=",
-   "pom": "sha256-7eVVk8YoXTmdlgc6GQy5v/QlZ5WqjWO5AXcrsxI+SDs="
+  "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.18.2": {
-   "jar": "sha256-OBocBxHku4hWGmwACLWpRUZWKMoHdkzNZqDZfuB61hI=",
-   "module": "sha256-evxmQXLDpubGw1hHZaAyncb+q7/mu6ibrq2L0un77Hs=",
-   "pom": "sha256-9W9UNh5DSV7TuiShoG8OO3QZA+Q+0TLxpq086QErhBU="
+  "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.18.3": {
+   "jar": "sha256-PKAOR8/LQ+eUON3PyPxzXp66w4JPt3aROGCb5r1W5IM=",
+   "module": "sha256-v2AjrStgVyCsbaJ6K16Y7bGjJs0L9jfDpAtiH+jgk80=",
+   "pom": "sha256-a056nStXQq6hOMFcDJ3gRjLxotjebnYe3vizYJK0hko="
   },
-  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.17.2": {
-   "pom": "sha256-5pgyMzCpqCySDlqJtlsPciXI5zPBIqGPeWoEpuMfpcs="
+  "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.18.2": {
-   "pom": "sha256-4h1diLBHShG3H+lBAMT1KVv6F08u5q5LCtArdhZHhkg="
+  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.18.3": {
+   "pom": "sha256-VnParMboVZdt7O3rRtxjOVprGsmkg+Zy8IMc9G/gbiU="
   },
-  "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.2": {
-   "jar": "sha256-4tIC1GBuI66vilqWMtsG9f79W2PSUcP1A/n6qnhTDlw=",
-   "module": "sha256-Jd8o9WC1kI6hAYUATV/Bkyk0hHBj5mcpJID2dbOx7eQ=",
-   "pom": "sha256-FivnrZea9eDHOc1+0BiJ+Br0ggDJ+RJ5lqElrFGzSkc="
+  "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.19.0": {
+   "pom": "sha256-wZ0UHUA3aIQ2Rq7KvAMdPPqalqeH2Cfqmj5KDCguUwI="
   },
-  "com/fasterxml/jackson/module#jackson-module-blackbird/2.18.2": {
-   "jar": "sha256-J3Qnx1kiapAEGfVaUuPmzIO1XHl+6PaxBvAEgOEayOk=",
-   "module": "sha256-toe05zbV2Om55eeZxJRBrhc4fLmhsSKBrZ3N3M2XtLc=",
-   "pom": "sha256-CK/IpGUUijlQojmyZBOWnxFpOaTwWrzVXCE/jTrcqO0="
+  "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-modules-base/2.18.2": {
-   "pom": "sha256-wVCoPSPNizMiqqSYmEh0J5vi3I1f4qN5B9P1arYOJpw="
+  "com/fasterxml/jackson/module#jackson-module-blackbird/2.19.0": {
+   "jar": "sha256-nQONEjKqerSSflrJfjEeRIOGTkwsu6XeiiJNwJwolS0=",
+   "module": "sha256-/icqqTaYKMb5ZkLl5uIewpCJxyxpfl1mRHub3kpZwMQ=",
+   "pom": "sha256-Sq/DwulajgH1B5Q5CfS5yhFYEJzq67OG8fye5lgB/K4="
   },
-  "com/fasterxml/jackson/module#jackson-modules-java8/2.18.2": {
-   "pom": "sha256-s6z7kQ0CPpOkGZr8zeH/nsX6sMVQ3E+WilBXEXrLCzY="
+  "com/fasterxml/jackson/module#jackson-modules-base/2.19.0": {
+   "pom": "sha256-TXai5N8VF0Rh2/NcV3lDS3TOqy8mLU7Rr346crDO+tM="
   },
-  "com/formdev#flatlaf/3.5.4": {
-   "jar": "sha256-PDS2rrLxcKlUxDWGR+tDtotEeiw1H/MRBy9xV6XU4v4=",
-   "module": "sha256-Rjx10DAKwDblv9OLBqPx8Ua/17YdoyYael79bebtqdU=",
-   "pom": "sha256-ymv/5ynY3zr6lZQM0Wz/dL4eiHIHGP5hCsD+Jv4XsWA="
+  "com/fasterxml/jackson/module#jackson-modules-java8/2.19.0": {
+   "pom": "sha256-th9zuCA8++8rHkGf9wDM/arlMgbcx20VBUqPg00roDI="
+  },
+  "com/formdev#flatlaf/3.6": {
+   "jar": "sha256-LfHjGDYAJioV92qkrlrMLBVOiE92cr3aqsZoQqN88/A=",
+   "module": "sha256-MZJXvGPFb4IxtY/Jf0ZbqAU1Rt3WiDeJntVMqpF9lHQ=",
+   "pom": "sha256-NBUIJ5L0Y/5aTGxt1TdHl1Y8Jbemo/uY60YVJuUIIsg="
   },
   "com/formdev#svgSalamander/1.1.4": {
    "jar": "sha256-4PGk2RzE9s4I6LRBsbMmuJjiUDZqn0xIk3EoTHhNMhE=",
@@ -201,12 +207,12 @@
   "com/github/davidmoten#sonatype-parent/0.1": {
    "pom": "sha256-9Q5Goo6n4j+EMErZ/xsqWJskdSy0R9nq7eb1r4T56s4="
   },
-  "com/github/javaparser#javaparser-core/3.26.2": {
-   "jar": "sha256-Pj4MZdV9Enl9vq098euyjnWDc30M0fKomNum/r1Qq4g=",
-   "pom": "sha256-8xK6gXB9VttEhsH5rRpuA8Nqmazx4Imhhup0eKcTRLg="
+  "com/github/javaparser#javaparser-core/3.26.4": {
+   "jar": "sha256-Oy1sRFGyxnXU9L4QeExWgQSVKdEfPE5ZNvCLqQ3UXCc=",
+   "pom": "sha256-vDKMrmvHLHFv5lNrCUAkKpCVlXZkLZ5iX6ZQc+nhV24="
   },
-  "com/github/javaparser#javaparser-parent/3.26.2": {
-   "pom": "sha256-nsnC41jTpp/cpT1S61iqrCnpC+D1ANEMme0rlbkQUDQ="
+  "com/github/javaparser#javaparser-parent/3.26.4": {
+   "pom": "sha256-AxatdXSjC9rK4C5F2I7dpGV4u1pGnL1l14N4fuuCzKg="
   },
   "com/github/package-url#packageurl-java/1.5.0": {
    "jar": "sha256-5FVRcncHrMDFasYtVpZDMuoPE41sw2VtmIuTaRUPUkc=",
@@ -226,19 +232,15 @@
   "com/github/spullara/mustache/java#mustache.java/0.9.6": {
    "pom": "sha256-iZ8UAXo747e/Y3TW524tFaijtMfL7S3reXF1ugyYUfw="
   },
-  "com/google/code/findbugs#jsr305/3.0.2": {
-   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
-   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
-  },
-  "com/google/code/gson#gson-parent/2.12.1": {
-   "pom": "sha256-yeewt+Mb574iaEl5wGgAHGUssRPE5u2JTjm2Q97gf8E="
+  "com/google/code/gson#gson-parent/2.13.1": {
+   "pom": "sha256-+IEKzlDd/j/ag9ESbeZdmdXSUVoUo2uIvrG5mkdpeDY="
   },
   "com/google/code/gson#gson-parent/2.9.0": {
    "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ="
   },
-  "com/google/code/gson#gson/2.12.1": {
-   "jar": "sha256-6+4T1ft0d81/HMAQ4MNW34yoBwlxUkjal/eeNcy0++w=",
-   "pom": "sha256-C1c17IX0UoLx4sdpd5gAQnsVCoFj9AUJOpKAtxyrGXg="
+  "com/google/code/gson#gson/2.13.1": {
+   "jar": "sha256-lIVZQtSZLxEpRtPeHDNOcJI3uBJtgTC/B4B8AYpKISA=",
+   "pom": "sha256-wPZXItdcDljNGDWzBGBG9ga12mmZBBYfjba3j+ubQBo="
   },
   "com/google/code/gson#gson/2.3.1": {
    "pom": "sha256-gvqiGq/oQRqWwbvSKjDi1jnl9PxHFreWu3Dbw3n3Oec="
@@ -251,23 +253,33 @@
    "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=",
    "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw="
   },
+  "com/google/errorprone#error_prone_annotations/2.38.0": {
+   "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=",
+   "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc="
+  },
   "com/google/errorprone#error_prone_parent/2.36.0": {
    "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw="
   },
-  "com/google/guava#failureaccess/1.0.2": {
-   "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=",
-   "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I="
+  "com/google/errorprone#error_prone_parent/2.38.0": {
+   "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w="
+  },
+  "com/google/guava#failureaccess/1.0.3": {
+   "jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=",
+   "pom": "sha256-xUvv839tQtQ+FHItVKUiya1R75f8W3knfmKj6/iC87s="
   },
   "com/google/guava#guava-parent/26.0-android": {
    "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
   },
-  "com/google/guava#guava-parent/33.4.0-jre": {
-   "pom": "sha256-Okme00oNnuDxvMOSMAIaHNTi990EJqtoRPWFRl1B3Nc="
+  "com/google/guava#guava-parent/33.4.0-android": {
+   "pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM="
   },
-  "com/google/guava#guava/33.4.0-jre": {
-   "jar": "sha256-uRjJin5E2+lOvZ/j5Azdqttak+anjrYAi0LfI3JB5Tg=",
-   "module": "sha256-gg6BfobEk6p6/9bLuZHuYJJbbIt0VB90LLIgcPbyBFk=",
-   "pom": "sha256-+pTbQAIt38d1r57PsTDM5RW5b3QNr4LyCvhG2VBUE0s="
+  "com/google/guava#guava-parent/33.4.8-jre": {
+   "pom": "sha256-oDxRmaG+FEQ99/1AuoZzscaq4E3u9miM59Vz6kieOiA="
+  },
+  "com/google/guava#guava/33.4.8-jre": {
+   "jar": "sha256-89f1f2f9Yi9NRo391pKzpeOQkkbCgBesMmNAXw/mF+0=",
+   "module": "sha256-WKM1cwMGmiGTDnuf6bhk3ov7i9RgdDPb5IJjRZYgz/w=",
+   "pom": "sha256-BDZdS27yLIz5NJ/mKAafw+gaLIODUUAu9OlfnnV77rw="
   },
   "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
    "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
@@ -348,9 +360,9 @@
    "jar": "sha256-IfuiL4MOkmjwfPSrLZnoGBq73LDLke4CKOs8uRjc3R0=",
    "pom": "sha256-xSpmFtBO+zDJ7eq57oKwWR5NBNOOAwv4HiUHdlUtIV0="
   },
-  "com/tngtech/archunit#archunit/1.4.0": {
-   "jar": "sha256-9KS0ICiNMQxjgKECjQEThZDYsLRC6lLkr6/GG+g3pII=",
-   "pom": "sha256-djsKKasl8C6bSOJwxd9u0gM1LtaTYL3BYn4cierSNJk="
+  "com/tngtech/archunit#archunit/1.4.1": {
+   "jar": "sha256-apJFjFRDCOQspTTPy9tvGUfqSpyocX4IfNZx0x8tmww=",
+   "pom": "sha256-PEMEhZaX+gSgrnvQr4VeXiPI2qJvYiy8PquqO1b4KDQ="
   },
   "com/twelvemonkeys#twelvemonkeys/3.12.0": {
    "pom": "sha256-ttCYdPvd2bslDReBepMe+OCTvBjnQob/BrBAVBmAxzA="
@@ -389,10 +401,6 @@
    "jar": "sha256-37e64vQEz+C3K00jlEaYy3FrdmUXGBKgpND1kmwPrHk=",
    "pom": "sha256-L/bBfZwGC4nNfvGPpICuJEbrqGhVpjPziSg3/DuEj+8="
   },
-  "commons-beanutils#commons-beanutils/1.9.4": {
-   "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=",
-   "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA="
-  },
   "commons-codec#commons-codec/1.17.1": {
    "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=",
    "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA="
@@ -409,21 +417,21 @@
    "jar": "sha256-4LK5gKhPxlM8XOKR8ZF7MsUH9ivK1kGY//RDaMIZaj0=",
    "pom": "sha256-FaWcDnV8bAfD0baJ1zXI46nsVpXWzrapQdQGKrIpAbc="
   },
-  "commons-io#commons-io/2.11.0": {
-   "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=",
-   "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k="
+  "commons-io#commons-io/2.17.0": {
+   "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=",
+   "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek="
   },
-  "commons-io#commons-io/2.18.0": {
-   "jar": "sha256-88oPjWPEDiOlbVQQHGDV7e4Ta0LYS/uFvHljCTEJz4s=",
-   "pom": "sha256-Y9lpQetE35yQ0q2yrYw/aZwuBl5wcEXF2vcT/KUrz8o="
+  "commons-io#commons-io/2.19.0": {
+   "jar": "sha256-gkJokZtLYvn0DwjFQ4HeWZOwePWGZ+My0XNIrgGdcrk=",
+   "pom": "sha256-VCt6UC7WGVDRuDEStRsWF9NAfjpN9atWqY12Dg+MWVA="
   },
   "commons-lang#commons-lang/2.6": {
    "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=",
    "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE="
   },
-  "commons-logging#commons-logging/1.0.4": {
-   "jar": "sha256-6Ur0l0k4TBH1qlDo0PX+Z5vncSlbUgMDONMoQ8mANR4=",
-   "pom": "sha256-ZdMQUJNStUJRGCJe5gCgH4O6chQtA1AUtdFkvASy0oQ="
+  "commons-logging#commons-logging/1.3.0": {
+   "jar": "sha256-ZtPJgEcLmbDFEdrT38CueyZewfsUTpa8AlOooXX9NNk=",
+   "pom": "sha256-je/afOtIiP/k1OYyeJVqGjxRS3W4Nj1nFqG9Zv6WLH8="
   },
   "commons-logging#commons-logging/1.3.4": {
    "jar": "sha256-vC3+MvHvBlCeagZRRMGt97Qg6r8RqH8wvRJ/j6ozIBY=",
@@ -437,9 +445,9 @@
    "jar": "sha256-aBm3LpRQ2u5e9WMeq1pHT2BFJo2MZjugKAzQZHMtsgM=",
    "pom": "sha256-aNbsZVtGv6PXgOzwYrww3uyoxJTFrptUgJmqMfddj/8="
   },
-  "info/picocli#picocli/4.7.6": {
-   "jar": "sha256-7UQRg/MJuT8QTKngceMUpAYqiTGE4Yo8etcuycuhK6A=",
-   "pom": "sha256-LSJIzM9IetnOII3sdRdF3xXNHhkkpMw9NoQbXxmQxvs="
+  "info/picocli#picocli/4.7.7": {
+   "jar": "sha256-+G4w//0Q0rE7jKqNSyN6fuYfL/zPWxlB3nGLdl0jW/g=",
+   "pom": "sha256-GxjTYxNN9mYx0rn3R1Bo1zQiW6OJzfkIKhvYvakNV9M="
   },
   "io/github/gitbucket#markedj/1.0.20": {
    "jar": "sha256-Z3BPOOp0RFEHaX8AdkPawzNgI7uPsHKlEjtzUb0GlXQ=",
@@ -454,10 +462,10 @@
    "module": "sha256-F/IdmAXYICSjJfG85eAJJPVyjI8+T1mlqZp4qv6DBPM=",
    "pom": "sha256-udAjbx4xj6sN+2wkFWHZN6nHTOYoO5bJ5LYge95HSHo="
   },
-  "io/github/jeremylong#open-vulnerability-clients/7.2.2": {
-   "jar": "sha256-dnIB9RG5mxEBtqsWCHgSIVYGr2QLtjI5i8LZwP/Xg1U=",
-   "module": "sha256-qnMwVlSb0/Nq/fLK6eO7IpbXu7mkVKtsrZmgXtgwPV8=",
-   "pom": "sha256-HZEtJbmqERPi8oNNjI0SoW0GnId7rA1CGOsqTbxJSOk="
+  "io/github/jeremylong#open-vulnerability-clients/7.3.2": {
+   "jar": "sha256-8M3hvTUxM/jO8jfTNc8uqYQsR3vloH7PGp4zL9kmqNU=",
+   "module": "sha256-lLg2srrzyipS9ewwb5NkAAPWl6ixKDr+VnGXXlvB3OI=",
+   "pom": "sha256-JS8hpR7qBz5iK8/PP2wd0euRX0T18zMMdVg4mCAoYvs="
   },
   "jakarta/transaction#jakarta.transaction-api/1.3.3": {
    "jar": "sha256-CwKhlN0E7i4ZLcnalXnhCVXdborHB638kdkvEZsOZ6s=",
@@ -486,30 +494,24 @@
    "jar": "sha256-l9GsqsgkCb5C5iLXpU066dCFF+iu/eo9K6l5EVDC8C0=",
    "pom": "sha256-Hfe28I37gaJo1rk7ZZpqnjicXYwyvfB1Qji6ZIOk6YI="
   },
-  "joda-time#joda-time/2.13.1": {
-   "jar": "sha256-qb5HtGOQ96bausx8BVtP62+48iJUd6cnCoIzspbiZnc=",
-   "pom": "sha256-bhXjdGnZeqLHZ8j9XmZMa8uTOr1GKqDhq36yp41p6QM="
+  "joda-time#joda-time/2.14.0": {
+   "jar": "sha256-Hi2m+etl8gol2aMYaDHtKz+xT3pI4e+CBhNe5YyxQ9M=",
+   "pom": "sha256-YvxXQ2db0rn6tYOmQIC2UIVMKYIU084qocCzlL0IndE="
   },
   "junit#junit/4.13.2": {
    "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
    "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
   },
-  "net/bytebuddy#byte-buddy-agent/1.15.11": {
-   "jar": "sha256-MW0sB5XCpNTEdW8ub5NJg3x0MKw04Ed+rYdNBfXMGeU=",
-   "pom": "sha256-tfoTlvFHl7jYCIJ+d0O6il8gO0iJvjLklj1EvV7XWag="
+  "net/bytebuddy#byte-buddy-agent/1.17.5": {
+   "jar": "sha256-xbkzStguYy9q9g3yK7vbu2LO4Eh39PQ8OLoErtm9mQE=",
+   "pom": "sha256-C4NIL7Ujtb+UdKqCp8XTzhPPOlqatdY6zpVZGfbXzBQ="
   },
-  "net/bytebuddy#byte-buddy-parent/1.15.11": {
-   "pom": "sha256-jcUZ16PnkhEqfNhB6vvsTwDbxjPQha3SDEXwq0dspJY="
+  "net/bytebuddy#byte-buddy-parent/1.17.5": {
+   "pom": "sha256-HoN1gn7n0vXkxwyzHJFn7OxgaTz2pbdzoeZv1NJnU2c="
   },
-  "net/bytebuddy#byte-buddy-parent/1.17.1": {
-   "pom": "sha256-OPWUZ1D9VEbI1XNxjJgTON69VijEMHP/pNI9l7+YU60="
-  },
-  "net/bytebuddy#byte-buddy/1.15.11": {
-   "pom": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4="
-  },
-  "net/bytebuddy#byte-buddy/1.17.1": {
-   "jar": "sha256-Byc/BfkbTSDrVUcHVieuf0CxNEfCDnvtqKqsVdSqp2g=",
-   "pom": "sha256-WMCnRXLL8R+VLlXqc+o1KjPPxAxknIfb3AGAPqXAFfo="
+  "net/bytebuddy#byte-buddy/1.17.5": {
+   "jar": "sha256-cVaMn4OWZ3IZ9lAmj79kk97UhO3NvfLa5hKcpb6B6Ns=",
+   "pom": "sha256-U81D27NbSORHJc1XbSAG4fcfIWh9BA94DMcKCn79QcI="
   },
   "net/gpedro/integrations/slack#slack-webhook/1.4.0": {
    "jar": "sha256-uaZg4gvqtDOShH2SLBMEXFMZ7Mq/QpK5b/kadO6NmGU=",
@@ -521,10 +523,10 @@
   "net/java#jvnet-parent/5": {
    "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
   },
-  "net/sourceforge/plantuml#plantuml/1.2025.2": {
-   "jar": "sha256-HNWZfjU/wjv53c941XuoRsGqijPcTjeHhyyN7DT9Nc4=",
-   "module": "sha256-CLTjkdBHwh6vXj8mVU/IPExtMgTPmnWrU8+XPZ7RwP0=",
-   "pom": "sha256-C73x6Tq5nXeb9km7RGVaOw5bIpdvTo9MsPRgDC+NY14="
+  "net/sourceforge/plantuml#plantuml/1.2025.3": {
+   "jar": "sha256-gmDThB6apgk7iYz8dtfariQK+ICd+elzzFI12tUHQB4=",
+   "module": "sha256-zJgfI+k3jzchQvh17eB0hU/VNjKgUo8JlR2jH6VcD3s=",
+   "pom": "sha256-tTquJXbpQGoEhoGn3V1bGCZlLx7+KZrC31wSHma9h5Q="
   },
   "org/abego/treelayout#org.abego.treelayout.core/1.0.3": {
    "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=",
@@ -540,9 +542,6 @@
   "org/apache#apache/16": {
    "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4="
   },
-  "org/apache#apache/19": {
-   "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8="
-  },
   "org/apache#apache/21": {
    "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
   },
@@ -561,6 +560,9 @@
   "org/apache#apache/30": {
    "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg="
   },
+  "org/apache#apache/31": {
+   "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw="
+  },
   "org/apache#apache/32": {
    "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8="
   },
@@ -606,9 +608,9 @@
    "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=",
    "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY="
   },
-  "org/apache/commons#commons-collections4/4.4": {
-   "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=",
-   "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0="
+  "org/apache/commons#commons-collections4/4.5.0": {
+   "jar": "sha256-APkyY8JnviAbiuUhtEpxNycbFmiENTQL9inbG6wKWEU=",
+   "pom": "sha256-xwD5mOHXpqXArvHUzutrrH0XAt1tbtpzoX1n9dbyRn0="
   },
   "org/apache/commons#commons-compress/1.21": {
    "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0="
@@ -641,9 +643,6 @@
   "org/apache/commons#commons-parent/39": {
    "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac="
   },
-  "org/apache/commons#commons-parent/47": {
-   "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc="
-  },
   "org/apache/commons#commons-parent/48": {
    "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ="
   },
@@ -656,6 +655,9 @@
   "org/apache/commons#commons-parent/62": {
    "pom": "sha256-dM1i1osJqtf7lCTqiCaat2q6DWUIjZVp/yc70gdCdDk="
   },
+  "org/apache/commons#commons-parent/65": {
+   "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424="
+  },
   "org/apache/commons#commons-parent/70": {
    "pom": "sha256-YDNaNOkfSc5QcjsAfXwSUU/Vdm2hff/7ZzLhEx5YzRs="
   },
@@ -668,158 +670,174 @@
   "org/apache/commons#commons-parent/73": {
    "pom": "sha256-TtRFYLB/hEhHnf0eg6Qiuk6D5gs25RsocaxQKm1cG+o="
   },
+  "org/apache/commons#commons-parent/74": {
+   "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss="
+  },
   "org/apache/commons#commons-parent/78": {
    "pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4="
   },
   "org/apache/commons#commons-parent/79": {
    "pom": "sha256-Yo3zAUis08SRz8trc8euS1mJ5VJqsTovQo3qXUrRDXo="
   },
+  "org/apache/commons#commons-parent/81": {
+   "pom": "sha256-NI1OfBMb5hFMhUpxnOekQwenw5vTZghJd7JP0prQ7bQ="
+  },
   "org/apache/commons#commons-pool2/2.12.0": {
    "jar": "sha256-bTvRjfhBDz4xsDGspYLMEJNCNYpionWevQxM3zDQb4s=",
    "pom": "sha256-Nw08lR5xtA48XKda+XK14fD4ms24UwsUYncYq0pEIwA="
   },
-  "org/apache/commons#commons-text/1.13.0": {
-   "jar": "sha256-HjI6UBEn33jtCYfzRdadZdDqf6PU+1s/hKrro6iyDzg=",
-   "pom": "sha256-1GYUvcptEZXDM7qfcwzQhYXE8zKkPqe5C2A1rYBIcdg="
+  "org/apache/commons#commons-text/1.13.1": {
+   "jar": "sha256-dkNL0t13irFA2Es8b/pAxA/mIZkJ9e0di4l3xa6OUMg=",
+   "pom": "sha256-IN2vRd2WmBsCi9dVqlwE0xrjd1pjNB4Wpq2x5oiqAFw="
   },
-  "org/apache/groovy#groovy-all/4.0.23": {
-   "module": "sha256-hpx0QnCDmcotEJnjHCOa+6kF5vsDSNbBuIzsuJFVPmk=",
-   "pom": "sha256-LTljViEu/Hlu58ZxpeTnXTEaTtzsJSUUgWzQWy6HHJM="
+  "org/apache/groovy#groovy-all/4.0.27": {
+   "module": "sha256-Fc5ocrJI5g3mR8b9kjap79f59HHNOXguVMz6Bdq4iHM=",
+   "pom": "sha256-w7yh2Hs4KqZjszYm6tYik3oTuTs8C+K5mxcy6bhUrlY="
   },
-  "org/apache/groovy#groovy-ant/4.0.23": {
-   "jar": "sha256-03osKmTq6WRb2D6/DTF4cCEBObNWJsIJaWrbqmm+AOY=",
-   "module": "sha256-lZ+tIuFAWUDhWWQF48rHF2LteVLAW8WHKP8TbfdYoW8=",
-   "pom": "sha256-DOcZiRRmChDhLufxaW/XR/2OCdm3pNx+szil5i60ZrQ="
+  "org/apache/groovy#groovy-ant/4.0.27": {
+   "jar": "sha256-9z2ms2dNlNybKlfXfIktgrIh9A6ga7DutnljXFwY0po=",
+   "module": "sha256-u6v84WsgmrhY3kDRAdQNab9gofZlluEcIg7Jm6FLEPU=",
+   "pom": "sha256-Zht/dBLX8lU+jTLJir/rpDIUcBcyWX4M8wwgV8HYGLY="
   },
-  "org/apache/groovy#groovy-bom/4.0.23": {
-   "module": "sha256-hKLVj9vLqhYHW25d82DnxJbP7Q8XRrG9Cz+rCY0+ZrU=",
-   "pom": "sha256-+HaQcnrSGjDHQJeRopw7Wl1b6pYah9E52JnTCrQlIag="
+  "org/apache/groovy#groovy-bom/4.0.27": {
+   "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=",
+   "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs="
   },
-  "org/apache/groovy#groovy-cli-picocli/4.0.23": {
-   "jar": "sha256-d2JJtw6gnkyS3o0kh3b9HHQsa7VdNDMJM/r0Z5kV6Xg=",
-   "module": "sha256-wsM0T69gv9+sMuT+8HDwUY9M4XQFRISy5qzIPZRM9JY=",
-   "pom": "sha256-Sci08myKHebrRHUOmfeQYwwPt0gQwctCY6i9cicUnBI="
+  "org/apache/groovy#groovy-cli-picocli/4.0.27": {
+   "jar": "sha256-UweD6i2aNy/KOVx59U4txDe0J/bCO3w2utuva3uAms4=",
+   "module": "sha256-WhvnAXg68GiYkYDT69Lgemhbar38QQiZwLSuG7Cr3FA=",
+   "pom": "sha256-UQyAyRcEXpdyBe1jY6RrAuZwAsKF46m4R3Qt3DNb9+8="
   },
-  "org/apache/groovy#groovy-console/4.0.23": {
-   "jar": "sha256-AekG7RLy7+3gHHR+RylKSN5Ymy4AjN5CIsA7vO/8/pQ=",
-   "module": "sha256-bv/0ptQp3A5Xg868Qm1eTrcBSO4Z+ta2ZtbdtwcYWEQ=",
-   "pom": "sha256-Np6HrFhplmaohJijUETnesmhmfOlxINJytXynNDO6Cw="
+  "org/apache/groovy#groovy-console/4.0.27": {
+   "jar": "sha256-Ra9tAI4YvCr5B8/O9FnbDdm/sqiYrqd1tWR9TQWKxx8=",
+   "module": "sha256-eTOF8Ckx4ByXemAjfJqyH3kZEnLt2t/LQF5GdDiESzU=",
+   "pom": "sha256-IAHFID4l+w4ZnTlZI6f6p4OXz2By163Ii5aDGB+DAjg="
   },
-  "org/apache/groovy#groovy-datetime/4.0.23": {
-   "jar": "sha256-lEYpeJWNyH6mzhD5Ut013RBcV+I4IVPwtgZeCYYpAzQ=",
-   "module": "sha256-CsDYrF7CQz0WKLMJ3Jeb/cGKRmOHajCVDAZUjUPsySU=",
-   "pom": "sha256-5vjMMrjFqjBrZvZcSffomWo3Rko+8rtkmGsgHEj2JUs="
+  "org/apache/groovy#groovy-datetime/4.0.27": {
+   "jar": "sha256-sDyHOh5tdQ1Z1lTA6AczwWypYp02d3f5kaxUXnKwbDw=",
+   "module": "sha256-glm4zb5PPPnRa6cMb2HNVlQr8yPfAsO/OtFrEW0LxKs=",
+   "pom": "sha256-eYT7iIyx9rBJA2mkKaYmX/BR3DCPByNuQU+T5JILKY4="
   },
-  "org/apache/groovy#groovy-dateutil/4.0.23": {
-   "jar": "sha256-PF3nVBm1uaITN/qaYLfso4ZFiJKQrasHbByvH48+Lgc=",
-   "module": "sha256-Qz325heiod7xQ4rvT3IJJrvKd4VFuhzGV0D8g+i/w54=",
-   "pom": "sha256-7t/DG8DOYOusX/1MtqHkuvQBXt+J1SW9aem3fS6Md88="
+  "org/apache/groovy#groovy-dateutil/4.0.27": {
+   "jar": "sha256-+PBuCYpJYMUnoakNEPz5vEGzHH1g0TVPnNib0p0wP3E=",
+   "module": "sha256-NJtDfD4Aj3VubH57NWrhAtkjadHGTeeSCkZ+jV7M7A0=",
+   "pom": "sha256-yA7zeFtjtHABCSdiQdfcyjOoHwgK1d6H5qYIYARMe3s="
   },
-  "org/apache/groovy#groovy-docgenerator/4.0.23": {
-   "jar": "sha256-7CHYZzHdNksc+K2dOZtEHzcmry5SGatftw3SgMXVfiA=",
-   "module": "sha256-pkRSDL42yTBlUlJkTA+GXVr8FhMeZuTLA+Jt8PNG8K0=",
-   "pom": "sha256-lo2giiFmN6FvzJRDDIfpnnn5xOy2jvma7c+FevKqAdw="
+  "org/apache/groovy#groovy-docgenerator/4.0.27": {
+   "jar": "sha256-kU4SNWl6KM2mxqvcAraauEK3fJM0syDQK/+Lex56fqg=",
+   "module": "sha256-uCxu/OGZsxrk2wHhfqd1TD4jF38bBTZt5wtz80h9IKU=",
+   "pom": "sha256-vppWDOMF38WnRn0lq88VXMrIIkXj+4ldnDHQ1LcE660="
   },
-  "org/apache/groovy#groovy-groovydoc/4.0.23": {
-   "jar": "sha256-TyXQyGJA9MYnajVHF6XAv4iJQZZlEnO/vd7iCzGnX3E=",
-   "module": "sha256-dEsci/1trLvklmgmIVXb3ABijc3NSiJVpRkZFV+wGBU=",
-   "pom": "sha256-UD+8eHefEL42BajfvgI0dG+1NckBEY9BPkn0pSknkh8="
+  "org/apache/groovy#groovy-groovydoc/4.0.27": {
+   "jar": "sha256-OWP+R3p3QSWOkCPh6L8ofth0nq9i/TYcGHRakkhnU9c=",
+   "module": "sha256-7GhQeC3SGW8ec0V1O8OdHsBmN653tuP++O8Jaitk4n0=",
+   "pom": "sha256-78tg2omBn7L6VCv0HBtn2pWk5+Zq4JNreSrVv/DUAsU="
   },
-  "org/apache/groovy#groovy-groovysh/4.0.23": {
-   "jar": "sha256-g56btLaf4j98Z8Z8zzSWT2actDCQ1v7cBjY7ncDgq4c=",
-   "module": "sha256-5/531vXJWGcAHQ7aStPeho8cEcWY2pUDAWOHL3SyiEc=",
-   "pom": "sha256-l7VFjIsLtFSwOhSwbYFcQy3PB1gHcgrKO++hL8DkzK8="
+  "org/apache/groovy#groovy-groovysh/4.0.27": {
+   "jar": "sha256-HQIPYRPm1vuoG0cv/pZ0+wK4ifWFnR0ndboP0ni6JaY=",
+   "module": "sha256-kLQWMcIh2gPUimqL1ZPBBfY92GdqGUXfz/ZvhLrJ4Cs=",
+   "pom": "sha256-njeYl5uP9WSeY6v/Sg0gU/LaUu1xqvAcopCVH+SprTw="
   },
-  "org/apache/groovy#groovy-jmx/4.0.23": {
-   "jar": "sha256-wgsQ3U93zxIis2xvXH27wyWZVGHPrJipJug0HWobBz4=",
-   "module": "sha256-kMuXrTWkpyo07Ze9tbikvlp2xCQDSP7/eM30WJhgkGs=",
-   "pom": "sha256-GePMp9qyslTSpV7PXXaNbwbW401ZREaunrqFNleiJHI="
+  "org/apache/groovy#groovy-jmx/4.0.27": {
+   "jar": "sha256-x3mrHcLm4irTzNHf1ILEAeyNKN3DPkfK4aM8slyYBNc=",
+   "module": "sha256-jCgn3wj5oPHfk7xR+RLCucmGiTgJKmJCDI3TQ4cjaKU=",
+   "pom": "sha256-wHYJC80DBr6m1pZaeE0b8U7tcNhxJQii0Kq5CGScoF4="
   },
-  "org/apache/groovy#groovy-json/4.0.23": {
-   "jar": "sha256-w4yz4w/vpJdopCSrxcxrf+TM3lJplqdYNvoClad5ois=",
-   "module": "sha256-zlGjNH9GW0gYJ/rj07VYxi3/TTiAi/9gJMPYfcsEfyY=",
-   "pom": "sha256-5YjKEramXrR2BxO54jaH9HUpyguSHsSg/juHKf7YweY="
+  "org/apache/groovy#groovy-json/4.0.27": {
+   "jar": "sha256-phRpC7UmNw1LgM7YDp7Pya/Vms/+2PctYvNkeJeNvRQ=",
+   "module": "sha256-IVLs1Lfdjznwjcn/pR+5a2miW9K4xSCPXYpMCOn21q4=",
+   "pom": "sha256-h169MdRTCWOacRF0kzAmgpKwf2R8BEiDkNmEiiq6sHc="
   },
-  "org/apache/groovy#groovy-jsr223/4.0.23": {
-   "jar": "sha256-3IW4JgG6wfVsmnomTalu3VNCawBCPovCn4XeGv/Kw+g=",
-   "module": "sha256-P0iGDCscq2puqp/jz6SmRurEPzwkVVBoz8rHdwaZ86s=",
-   "pom": "sha256-f/+9XOFZa81DNLuFIUcCbBGhhFHRUNOqRV+b/OZrn+M="
+  "org/apache/groovy#groovy-jsr223/4.0.27": {
+   "jar": "sha256-Su+CW3K0JC+AaYfp0aX02nIURkE/7+JHBiT/gV3K9GU=",
+   "module": "sha256-uVBordG/iDJLTwoGZqLRv0InD0h23DEyCV5m1pkX+ZI=",
+   "pom": "sha256-I6FDpGAoYwxaElq5JVt6X/XPqLdoy9/YC1CX4WJEhMw="
   },
-  "org/apache/groovy#groovy-macro/4.0.23": {
-   "jar": "sha256-eAPesddhnC8lvYknkV1DxlcfhVn7niyeAK5Y4A2AEgE=",
-   "module": "sha256-IIf93SW+C5snwVtsB1XKARUhTn5lFPPZWwE/fpsbQZs=",
-   "pom": "sha256-AOuTO0P5QdiJHukcP0sOfK3WiKQavxzmjDQCq1ru+60="
+  "org/apache/groovy#groovy-macro/4.0.27": {
+   "jar": "sha256-McvAS01P+PayYIQm+0gmZHo94B2HFpR6pQ+gYUje0kc=",
+   "module": "sha256-CpyzEoZpulV/YdGyPHJ0UWIgdBK5GgaHPnFxeEmm+vE=",
+   "pom": "sha256-WMZdXzfL9pa0Def4/Q3nkcsBFiHYt3QRFukZ3NEQ7Wk="
   },
-  "org/apache/groovy#groovy-nio/4.0.23": {
-   "jar": "sha256-8EQJOfl07dRsBQYJgAwffV2JlfhtVf78/6ADSVql1rs=",
-   "module": "sha256-wHnD1ZFV0jbe01TqNBVwgd6eLhpsu7VoB6atNYAuX1w=",
-   "pom": "sha256-ThPnTKiVbe8hm9ptr0Gcl/jng3lDN6I5zEXqbkmDdHg="
+  "org/apache/groovy#groovy-nio/4.0.27": {
+   "jar": "sha256-RkNu19Pz3oG4GTZX3BI8W+LD24OtGs4XyIMiPwaTdQM=",
+   "module": "sha256-8XlvEHLcuNGGmxvTHd+Bt/xrsLjFRYIua6/HHx2Gz8s=",
+   "pom": "sha256-YoqvSvG1a9z7y2h4W2mIJW/M29vrsnkXo4DfrJEcVEc="
   },
-  "org/apache/groovy#groovy-servlet/4.0.23": {
-   "jar": "sha256-iTKM0knZeBFBUKlgpeu+kw4NBL1IHm7JwYIRDWHj7AY=",
-   "module": "sha256-CecR1jdDyCyyXfhKT7KAv3OjKFFxYxH1NwDH9XkBhHY=",
-   "pom": "sha256-ZAangH7RTUIle+fNFM6K08li7m4BALKMZNkBSWiT4NU="
+  "org/apache/groovy#groovy-servlet/4.0.27": {
+   "jar": "sha256-oS5lthqdLU5g0HrMqnWcHp/cNV2OVGk/24I+yUuIPjs=",
+   "module": "sha256-7lNfLvqM20a70Ev5ICGqR5exX+5Yp1Ph23RcIYZyR2E=",
+   "pom": "sha256-dbadnnFXw2U8sNccRWBef9U0OkmbEswqlw9Lt8sy/hs="
   },
-  "org/apache/groovy#groovy-sql/4.0.23": {
-   "jar": "sha256-cFF2VyVG6g3Fs3E6tnzJuh59DpUAHSPbsa5zNDrSpBM=",
-   "module": "sha256-4+GHMKJ8wlrsTUhzhKpZybvnhktb2HIph9hziaBlSI0=",
-   "pom": "sha256-gCNijuw6Sknep12Ouke6HsSLhbPpCuHMfHs1Y1SdbBQ="
+  "org/apache/groovy#groovy-sql/4.0.27": {
+   "jar": "sha256-2JP323VT64uOCozVY1+MRIUQwEIiGBarbEZQBgZ/7rw=",
+   "module": "sha256-YNXiKicU7DY/EKJYOiNP0dhq93MtNpxipB3OO8+2sRU=",
+   "pom": "sha256-RQYJbf+uKD6jZ5mdkrkUfS302tRo+N5t+tkuqlfa45A="
   },
-  "org/apache/groovy#groovy-swing/4.0.23": {
-   "jar": "sha256-yo9JKDxW+sPXUNhoXbttVq87YN8w7GnqlOia3Q+GjXA=",
-   "module": "sha256-8PHaHN1nG53un3+ThTf982J73jmIGlK8W6w5RYPppmc=",
-   "pom": "sha256-O4PAXXih6CLIZQfZMTaNJfrDcp0ZhlcbXFIQkBqKkRk="
+  "org/apache/groovy#groovy-swing/4.0.27": {
+   "jar": "sha256-08OyoHXZpMCp7ZRnJujOh6MLEe8qiTwWAPnsWArgkW4=",
+   "module": "sha256-nPl/3E1cL1Wfx1KG+dSSDAdZtVSl1LUnjJtR9zxGOxo=",
+   "pom": "sha256-5Yj5LDzUaQ97UFD7oALD3BJKKcZaJwNVPtzFi4wEsvs="
   },
-  "org/apache/groovy#groovy-templates/4.0.23": {
-   "jar": "sha256-q8ib75YQLQf3l0ASlfTwdM+qFRepASBOsqX8fPHMVD0=",
-   "module": "sha256-PnO4P81hfw2K64bM+Mnlo3fW97S24M/8xgdVcsfiiA0=",
-   "pom": "sha256-qKuf2eefBfVRvOEVhcWErcwXiam05CPy042yzDz29cE="
+  "org/apache/groovy#groovy-templates/4.0.27": {
+   "jar": "sha256-pv/xay9E/t2ANUzAjHaDZDOroxpFQbC3t4fCVbKaOxc=",
+   "module": "sha256-3mlZWvlYYfioM2wfujsW2g8GMNKDAFJS4FT782yJ3tc=",
+   "pom": "sha256-VfWkCTXSahFbuUZ3ghrdYjfp8bhL0EJMiJe9IvbtgM4="
   },
-  "org/apache/groovy#groovy-test-junit5/4.0.23": {
-   "jar": "sha256-WDuxJPyVAAZgV4N3vh8Rs8Ob7WNQE3fUu4KwBadTSz8=",
-   "module": "sha256-M49r7WuBfPeI/dRvP31TambDw+SPLlCRSJ/ELrQZfsc=",
-   "pom": "sha256-ZnVM1+hGBjSriSCV92Dia4rqD9bOHypryd8YWnVj1iw="
+  "org/apache/groovy#groovy-test-junit5/4.0.27": {
+   "jar": "sha256-KmdxRY3Qo5Zn4twrgX8S3xnE/AAlZ/kDdqGMau2Uc2Y=",
+   "module": "sha256-eyEugybFMSzs8JeZpSkJxmuVBwwOBh+4DGjzx9jL03c=",
+   "pom": "sha256-YvqV5QZsz7ms8hq3PVSi1KxClv0bTeNwnex+MF4kMGc="
   },
-  "org/apache/groovy#groovy-test/4.0.23": {
-   "jar": "sha256-aLxU0hlMPDOtkgwukUCyEVwYI+bZxEsE+u4qZIyVoPU=",
-   "module": "sha256-zG0Y9sxey/kba70Jbycb0QvdD2ZM/9ke0tzR0cbq+Zg=",
-   "pom": "sha256-fZekDhFMv4JM/UqbO9DWNw45NDH5EJAwl6/PXbdYT/o="
+  "org/apache/groovy#groovy-test/4.0.27": {
+   "jar": "sha256-Al3rIwJ/iRYRZnmf0aiT2zNeDjSw4H54sN3pg85SV/k=",
+   "module": "sha256-n226HzqM8IFqkgl4R68KsCqwNfvwien1owekDjwvu/U=",
+   "pom": "sha256-knqatTwLubwKBo+wneXBVB4CgNSzShNCqHEml62d0+A="
   },
-  "org/apache/groovy#groovy-xml/4.0.23": {
-   "jar": "sha256-waichweoxOn3FLcZvJp6fCD9XxWJyPtyA/D/iWAt1fs=",
-   "module": "sha256-iiEvvS1D/PRx0/aJwv5hHisWggyDB9k4NoouV+juJDU=",
-   "pom": "sha256-Cs6gRJ5WQ4+XdmY0e+9MNX78GR8zWvMMdYrHe+gv/jc="
+  "org/apache/groovy#groovy-xml/4.0.27": {
+   "jar": "sha256-Jg6AY6VQU6Z1xsr9N22cZVGfKKCaCjWxazJFopnwqr4=",
+   "module": "sha256-8tF8jqgA3LfdPK+/9cgPDdSQMFAjeXL4ss+ZEErEmD8=",
+   "pom": "sha256-PmNflxVUbu2nd1LyWl7lJd/sYAR0TD2NKdlyHOLXRcg="
   },
-  "org/apache/groovy#groovy-yaml/4.0.23": {
-   "jar": "sha256-x5/JXJLAzbQmzDGZX2alEIi2/OwvaRDoZqdIb6WMzTQ=",
-   "module": "sha256-V6i23/V+ky2pCWemRxsjSI8TU2r9GGmOMYLleSHcVyM=",
-   "pom": "sha256-WjMH8Ri5Eol8WUd9+L8kxkxtxt5PmE64+Atw5TTC6bc="
+  "org/apache/groovy#groovy-yaml/4.0.27": {
+   "jar": "sha256-LNISke60B90ZdfhVc0lC8c/TajsGOWHNLPJkm+8buM0=",
+   "module": "sha256-STyQ4OeyyuZYzBPVNHAlkHxBG6S2wZWUhBEmmyDB7Gw=",
+   "pom": "sha256-y3JWUlNKD16QZkBdvXD/IXNV28s0Wv5exidiV4M//b0="
   },
-  "org/apache/groovy#groovy/4.0.23": {
-   "jar": "sha256-sm7pBQf+zajG2m0/2+uLLJmXmsi4qiRZpIE+a+565uY=",
-   "module": "sha256-zRKdl1rlI8lsiQIrZ0qeOeLU0JuqDFtWnPHW6XpRGJQ=",
-   "pom": "sha256-6QZWWlD5nptlBh38D2zLYkLuQn8SIvvI04O2rCjdg10="
+  "org/apache/groovy#groovy/4.0.27": {
+   "jar": "sha256-yRA4EyQL5HpsSLzdp8XtLl/J7LoyUcargSIlgjCpf50=",
+   "module": "sha256-T4W0uBpP8rwXypxle0YgJyrFfPP7zTju45tVMKqQ314=",
+   "pom": "sha256-nfFuSVASaAgbETQHfkqFrWcB9oRx/KBlQxGF3Zl3JDU="
   },
   "org/apache/httpcomponents#httpcomponents-parent/13": {
    "pom": "sha256-5Ch4ZwNYVsc3QgNo3VhuXlfnAgmBNYQM89c+nINj17M="
   },
-  "org/apache/httpcomponents/client5#httpclient5-parent/5.4.2": {
-   "pom": "sha256-d2r5CnR0EULt8vvx+XpMAwrl+QT8PW2H6PNOilmb4Ug="
+  "org/apache/httpcomponents#httpcomponents-parent/14": {
+   "pom": "sha256-Xc62qyBqQZF5Jz8V0NK0cvlHK7t0fGyLfpbar3jMRSc="
   },
-  "org/apache/httpcomponents/client5#httpclient5/5.4.2": {
-   "jar": "sha256-oKnc02lqYoH4LjktOapnS/lmJJZgVBHeKgDURDWn+yY=",
-   "pom": "sha256-Uzeacw5Oy6ug1EvSqXPlqxtjI958xHxPEAmmZmjiPmU="
+  "org/apache/httpcomponents/client5#httpclient5-cache/5.4.3": {
+   "jar": "sha256-SI9P3rZYSKM2abuiUb1fF9MfjEWy0mzqv/FXLAfqYSA=",
+   "pom": "sha256-JJIhjx+xWQYKKn3MbdmQZ0uEzJsU0yB8J49sP8p/+sg="
   },
-  "org/apache/httpcomponents/core5#httpcore5-h2/5.3.3": {
-   "jar": "sha256-oSH0sU7FJeVOKbn123uT9Kl+CId06BxxQ7UZj2fYG+w=",
-   "pom": "sha256-DG+UMCpWYarEjlb6GiyYSNTYyEqTgBa5lvV11y5lyP8="
+  "org/apache/httpcomponents/client5#httpclient5-parent/5.4.3": {
+   "pom": "sha256-5jResynLh+7FgrEPKWsZh5O9FrW1QfTHsf/tnF8UDdg="
   },
-  "org/apache/httpcomponents/core5#httpcore5-parent/5.3.3": {
-   "pom": "sha256-GpQSCJ6gfk/7CvecgWsepVXpx/aoYZvhCajdGWUVQJA="
+  "org/apache/httpcomponents/client5#httpclient5-parent/5.5": {
+   "pom": "sha256-IlLZjPJibTGepzwPNpZXURTxc5UEuwajvJUrt1opyaQ="
   },
-  "org/apache/httpcomponents/core5#httpcore5/5.3.3": {
-   "jar": "sha256-CHt66b3p01GLS10G81YNf9DbBAmGVedrZOeRdzhH1QM=",
-   "pom": "sha256-23qZ78VZF+iY4vdeZAbqWhpMyMcQPoo5zdyFsdPzFCk="
+  "org/apache/httpcomponents/client5#httpclient5/5.5": {
+   "jar": "sha256-SWtLDo1fOoE5pdJjhIbTBHWLrDqcOddpifZjz9k1T8k=",
+   "pom": "sha256-X7Zn7Afcjf7Y9rsUahresLev3459826ILart2wrcd38="
+  },
+  "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/ivy#ivy/2.5.3": {
    "jar": "sha256-lQKqWqvwsUhJJKE+9LXSTxIff5GqtnaPEcydCQbAgDs=",
@@ -873,12 +891,12 @@
    "jar": "sha256-RKYMYQ9OMVJLA9gaaYsezOuhFjIOpRC6v4WVdbLqcjM=",
    "pom": "sha256-NFZNRisHTeJlC4Vb5yPej1WT5ZDLkTK6402dsd/7W+c="
   },
-  "org/apache/pdfbox#fontbox/2.0.27": {
-   "jar": "sha256-3HQphoqvPTE8Ukuaq4RqQF6Jykkn81diyk0aYLzh1/Q=",
-   "pom": "sha256-q/mNDGhURYJaBs5q6wDrs1qRkgrhnO1GEl1afhAoMQY="
+  "org/apache/pdfbox#fontbox/3.0.3": {
+   "jar": "sha256-ZWkMPzmwShTRLBf0mYwVGGzod9Pi7CIscIV348wCgDA=",
+   "pom": "sha256-sik+UDqncEMGEVD4hGg9f2FMz1Fjvi0PBSyinzx2d+I="
   },
-  "org/apache/pdfbox#pdfbox-parent/2.0.27": {
-   "pom": "sha256-4mbfDSSS71+JopUQrkv35b0RW82duwFn+bZaPZzB3Po="
+  "org/apache/pdfbox#pdfbox-parent/3.0.3": {
+   "pom": "sha256-yGXhzv8Jq1Kwh+cmDE8V025bW4vk/+IERvqkCiygvcw="
   },
   "org/apache/velocity#velocity-engine-core/2.4.1": {
    "jar": "sha256-HBkVfRFx1WAIjkhb6XyTp6L36fVuUX8KMCc8XDnfYjE=",
@@ -890,107 +908,107 @@
   "org/apache/velocity#velocity-master/7": {
    "pom": "sha256-lDoEbB/jayizzqEfsNNOi4NrJFQzCH+PqRbAp1I5MYE="
   },
-  "org/apache/xmlgraphics#batik-anim/1.18": {
-   "jar": "sha256-1Ky3ATHr55WDGrJcIQyklh4CK8gHFbIN1b0Vd8alUK4=",
-   "pom": "sha256-udAdQ/cIP4b9v7SfCQYA0enOWcz9xAOiMIlop91w9Pw="
+  "org/apache/xmlgraphics#batik-anim/1.19": {
+   "jar": "sha256-mz9vjITA79iBdAEqj7rEQnaX5YVK7xlNV8XwkQwVKAo=",
+   "pom": "sha256-tWmFS4QjA4cexEs6krxOFMPObUqE9pGLZh3/fYoDMqY="
   },
-  "org/apache/xmlgraphics#batik-awt-util/1.18": {
-   "jar": "sha256-gHudVOah6Ch3KjCdde9R/i3WiB10yKTTmy+35OGq9r4=",
-   "pom": "sha256-3QO+OHceZriPI43skUg5Uc5OOelBUXgI36c4KC3ZrtM="
+  "org/apache/xmlgraphics#batik-awt-util/1.19": {
+   "jar": "sha256-yaye0k4LIJhOfGXOL75JFQA8Z/mulhd7wyvvkBtVepo=",
+   "pom": "sha256-2ySC9bj/7cF4lSmAO5Ravjmd6ut29Caxn+Rh3C5bceU="
   },
-  "org/apache/xmlgraphics#batik-bridge/1.18": {
-   "jar": "sha256-cz7uASO8cpWZTQD9Y+KO12T3PyI+zFgJXuuy6D5vSlA=",
-   "pom": "sha256-X4dFz9NTpUkGVp4csr88DFPrwMTiMR8lxbDmcofFN2I="
+  "org/apache/xmlgraphics#batik-bridge/1.19": {
+   "jar": "sha256-muecWS77qwgEkj3oU2PVJKLLNuvcHyf67sEMGQdCfiY=",
+   "pom": "sha256-42VldphotUrVzrhLt66/qmUsw0uXS+lWx9GjpSUBILc="
   },
-  "org/apache/xmlgraphics#batik-codec/1.18": {
-   "jar": "sha256-rVOyu7iIPWQmjkL/Q8BiChC+QsZXtxl/qUuihUdBmTU=",
-   "pom": "sha256-8IeV/WG1MUkdNS4utjSumdqN2Jjv69cbiq9QZlGHcSk="
+  "org/apache/xmlgraphics#batik-codec/1.19": {
+   "jar": "sha256-smm4zhIMSfsFYOwWdfxdOcsGK1NrDYchkpCnbD2Y8Kc=",
+   "pom": "sha256-5tGODEXoU9XxziPxmctyYezn+hZn6qlIhDxXD3zz0q4="
   },
-  "org/apache/xmlgraphics#batik-constants/1.18": {
-   "jar": "sha256-ug1pkL0VzG3FwwMgq9nep9IB55QEurFcSC7bwi+Vg1g=",
-   "pom": "sha256-DZP4insLCgkw/CWc7SV7dHRyxGGXyRjyC3hbv47esM0="
+  "org/apache/xmlgraphics#batik-constants/1.19": {
+   "jar": "sha256-4dQsTaVt2Lejp5QoX+PtBfky0KK1zj+s4ZjwLMUBMx8=",
+   "pom": "sha256-N4rdbMiIGdEDqD3eYFlOhYysJvl7N7PJSLmyLphe3HI="
   },
-  "org/apache/xmlgraphics#batik-css/1.18": {
-   "jar": "sha256-PWKpsfSS/qRLNumUc2fuIlAQCdomLYGN9aM7GAix4J8=",
-   "pom": "sha256-S2BUJ7CQNDHQC8ca+u7Zx585YzteIfzPfYXNl2Ob4Ak="
+  "org/apache/xmlgraphics#batik-css/1.19": {
+   "jar": "sha256-xmr9asYdYw5i6FnbA2cPp6T3JB2q7im1MWFOaQC5xqk=",
+   "pom": "sha256-EidX+7ZzTsZDYEz65kaFfRCgvUhc+UzCmSRHOFu4t0A="
   },
-  "org/apache/xmlgraphics#batik-dom/1.18": {
-   "jar": "sha256-FcAXuz00Im1vNPT2PfYMLqn4CoGearvaG0kzXVmB2YM=",
-   "pom": "sha256-v/fJZplTYJxRTna0ZyITMgM6YhiZYOyX/LlK9hWE8OU="
+  "org/apache/xmlgraphics#batik-dom/1.19": {
+   "jar": "sha256-Hav4Noey7FpMzUpV41IPfNiGOkwjun9eVO8/iCgZmXo=",
+   "pom": "sha256-K5mGs9k3cyhcnK8JF7MgE2OZeDxKunGJCBSmVM13/zU="
   },
-  "org/apache/xmlgraphics#batik-ext/1.18": {
-   "jar": "sha256-97G0Ff0OTioMQ4sVY5XEA24DK06R1Qj9WyFnRPNinQo=",
-   "pom": "sha256-qpSJUUtRr0f0eDJEmPjyjW62CvSmvJ2jST+GVF+OMbs="
+  "org/apache/xmlgraphics#batik-ext/1.19": {
+   "jar": "sha256-5iZPqmXQDRh+7ZMt/5bkDagOF/6mah2Sr0d23beBElY=",
+   "pom": "sha256-IncwARZK7etkI/pQtW6KYKXMct8RWY4ApgvNokHsMUs="
   },
-  "org/apache/xmlgraphics#batik-gui-util/1.18": {
-   "jar": "sha256-zEuUCX2/YWa4Fki1lT5tRRGEuU0IzoK6oKu7zYLO+gw=",
-   "pom": "sha256-d5ZNO0fCxICHbmBZ/UAMP8qsbbgN13EG0dSwXErk9Fk="
+  "org/apache/xmlgraphics#batik-gui-util/1.19": {
+   "jar": "sha256-3w9U8Np/cteurxDfwHfvFHO9CJxwwh+R3XR30PTCKsk=",
+   "pom": "sha256-NZZU2dACKmT3cctcquOA2W27QZF+8bQolW7+WH1cRRA="
   },
-  "org/apache/xmlgraphics#batik-gvt/1.18": {
-   "jar": "sha256-KT9KwjZmtK5BJE1MKfBZysMG20qFspOqKMOCFHIZANM=",
-   "pom": "sha256-ecnw8VsewBT3IRnYaQCw5Irxu7B1gwRvyTS9UedNvW4="
+  "org/apache/xmlgraphics#batik-gvt/1.19": {
+   "jar": "sha256-yLHqcA0cJt/+OgilQ+/KrcX7d9WUnmqaMAxeNcKJyRU=",
+   "pom": "sha256-vhrlYUQyYzboXUTbiQa/2SrPTkyti4qzSIJKdoK0By0="
   },
-  "org/apache/xmlgraphics#batik-i18n/1.18": {
-   "jar": "sha256-zEoqUDgKbmKV9Z72Ro01Hmdx4632jBLXnGAH5LHLJcw=",
-   "pom": "sha256-cNMSQGEu/uXg76TBhB3KmGWp0R79AlgkVb7ZJMdDadE="
+  "org/apache/xmlgraphics#batik-i18n/1.19": {
+   "jar": "sha256-65XgfCn+snbPkaypz1NitD/hdgE5WqtdimFHptCFlxY=",
+   "pom": "sha256-eUxRqls4AZky+Hca7GZAOSkrv/YRdwwntchvGhigQjM="
   },
-  "org/apache/xmlgraphics#batik-parser/1.18": {
-   "jar": "sha256-wQCWLWYKCkFdTCorunuwLGxirbMKrHBs0YXN+e1wpyw=",
-   "pom": "sha256-crP9DJSt6dGyEusqMsLkCEHWM1PI3GUbwOOrMPpuocM="
+  "org/apache/xmlgraphics#batik-parser/1.19": {
+   "jar": "sha256-YC4zHBx53koEUl11Jm2tuvlpUkhBFVEF0xrVSncx3iA=",
+   "pom": "sha256-O9LRQAEZ/XKB9krKBxOLRbH3aTNHti4vr/abXM8whm0="
   },
-  "org/apache/xmlgraphics#batik-script/1.18": {
-   "jar": "sha256-ibbCDMf+W0Hpz4j+lNTePXh83i1WJWe126FVjCedUDk=",
-   "pom": "sha256-/ZEB+jVDU0nkHbK13DerFiWvtalUWiU62hTschGA2gY="
+  "org/apache/xmlgraphics#batik-script/1.19": {
+   "jar": "sha256-Gqz2RF+F0eApxWkdVVBcoboUBBTLosliDX+C/GruVfM=",
+   "pom": "sha256-ERAq7v8KAv/Pewe9SVGxmnO8rouyI3NcEK2elPHJDgk="
   },
-  "org/apache/xmlgraphics#batik-shared-resources/1.18": {
-   "jar": "sha256-SPR1NHLW5oBaEkMHmE0GNXSstTn4itqSPx+nV6RBZl4=",
-   "pom": "sha256-Svoz4ZynMPkHL99wGf2Xl2Jek37Yb2v5vVhLj5+c/8Q="
+  "org/apache/xmlgraphics#batik-shared-resources/1.19": {
+   "jar": "sha256-4trUfP7/XH1obpd4eZasz4WlsZ9gKsswuD/OnCR97s0=",
+   "pom": "sha256-r3jdpDi4VjtO/a8pfjBA3G7dP2CtSgOrWUbHYXpATMQ="
   },
-  "org/apache/xmlgraphics#batik-svg-dom/1.18": {
-   "jar": "sha256-3rnGUtoLZt1hsdMjv8o8cDTbythVpeQ15gft3Yqs4c0=",
-   "pom": "sha256-H1/fOAl8z+KGPXRRANSBtix5z+nGMAjQmoakpJUItYE="
+  "org/apache/xmlgraphics#batik-svg-dom/1.19": {
+   "jar": "sha256-9cxnMM4bbFUunMwMQbTkwjPMYmC2w6EAOK1B6iE2TCo=",
+   "pom": "sha256-N7QJgMV65VnNyu/1D2JYGSkumwagk2idPxQrDwqNBBE="
   },
-  "org/apache/xmlgraphics#batik-svggen/1.18": {
-   "jar": "sha256-PxgadLzQHmaI2YgIDWPsiOrfjkpR2LTFqj0ZUutCA7M=",
-   "pom": "sha256-cbJdqAfL2FF33vMyLSFqktPIAVRxssZUcObSKRGoN/g="
+  "org/apache/xmlgraphics#batik-svggen/1.19": {
+   "jar": "sha256-a/ie3oFIPaV0sl2GReUS4DCWXo++VgXik4vMqofrtqY=",
+   "pom": "sha256-kyKGVWKEPX5w2nO8ibCivlj8qvmRrGwXNEmjEkWPrjM="
   },
-  "org/apache/xmlgraphics#batik-swing/1.18": {
-   "jar": "sha256-3cDt6rsd0C7PyLajkC01xPFP0+8AD7Vmpa1uIaYaVSY=",
-   "pom": "sha256-JjH0WiYrDTCc7B4Bljwd3C1NTVb8QTHbujfEwz19kn8="
+  "org/apache/xmlgraphics#batik-swing/1.19": {
+   "jar": "sha256-PUmGMnduuTyQi42kTGZIG0vYiJ+YkRLE6o8rtfDZSeE=",
+   "pom": "sha256-cwAYBl0hN4zE7vLduPBE+7EO9RH6qZBNouigqamBQm8="
   },
-  "org/apache/xmlgraphics#batik-transcoder/1.18": {
-   "jar": "sha256-dejwwCr8ZspQn8Wfzaf8necT8Bz4xgwuTIwle1j4XFo=",
-   "pom": "sha256-QPKtgBE2mKPrPGPd44iCQO+sJyVLbh3MPUtGPDQMmSA="
+  "org/apache/xmlgraphics#batik-transcoder/1.19": {
+   "jar": "sha256-EgRfjiHWx/0qcp9CMXIHIz+ONEbzovbqEXEACGSXInQ=",
+   "pom": "sha256-eM71WFmttLqyObaZE/92JfOhd4yiPKhqKpYD8vBTllw="
   },
-  "org/apache/xmlgraphics#batik-util/1.18": {
-   "jar": "sha256-DH5P3YC+i6MSAuqvDr6F7CzVH5yx8htgLRcDWqqEhRw=",
-   "pom": "sha256-CbXNcfjce/yrlkfTwGf+46GvEzOOXJwZyZHQLmR4bEc="
+  "org/apache/xmlgraphics#batik-util/1.19": {
+   "jar": "sha256-PxOJu9vtPEZZpYpQzhIWb9MePQZplN1jtRRNkkX9PbY=",
+   "pom": "sha256-31sAZvdkjeVaV/ejC6fZS+E3+7j+9oQ4Y29931l08ZY="
   },
-  "org/apache/xmlgraphics#batik-xml/1.18": {
-   "jar": "sha256-Ps55UwCtJ2L5vNToM4ZX86rG7X1R/3HQULxPNQ/4ZT8=",
-   "pom": "sha256-gDbYCBft+fe8Sd8n+gCZfFbJokqvkjH8/K5ZL/YDXKk="
+  "org/apache/xmlgraphics#batik-xml/1.19": {
+   "jar": "sha256-m5Nk997HXEHEphFZa9Tcvwi1G3U7ZyZXO1QpmK3exqU=",
+   "pom": "sha256-OI7cd3RQ5/7qUreCfVGQkxz5LFG50d+TkPAufEUf6Iw="
   },
-  "org/apache/xmlgraphics#batik/1.18": {
-   "pom": "sha256-xaC/+m0aTRYFs5xhIsy/8ImD0qdF+q9hwMi/V9u8xTg="
+  "org/apache/xmlgraphics#batik/1.19": {
+   "pom": "sha256-HRpNXZF4DjRChBp5DhBYeAVGiC6uX4NSiLEJjGhvKY4="
   },
-  "org/apache/xmlgraphics#fop-core/2.10": {
-   "jar": "sha256-Yx8P2iNK30RTMdRG3fB4l/fOTT1mZ5CvQKgBfeZqF4w=",
-   "pom": "sha256-NAj1YW1vWtnIlieJjNVdce3wDsz5NWTqDUCSerng4Q4="
+  "org/apache/xmlgraphics#fop-core/2.11": {
+   "jar": "sha256-3RqmFod/gMqjrfDpiCSh1sjZH8oXw2OCLWbuElQ5Fp4=",
+   "pom": "sha256-+Q+LqMBMbWOLTTo1XAZ7Qx38VT4elZ5UfMyG4I87H2c="
   },
-  "org/apache/xmlgraphics#fop-events/2.10": {
-   "jar": "sha256-qGOQIsQhtArsmRy1vzWfkoLssX9I4wu5jk9LNyspoe8=",
-   "pom": "sha256-NHAIdopBgumAb/zKyv6HINRJrfbNLgy2t86jHO3ekGE="
+  "org/apache/xmlgraphics#fop-events/2.11": {
+   "jar": "sha256-n7g3WI7hL+btlykAno0oU3o8unUqCKxu4lbOPRXQ29w=",
+   "pom": "sha256-guKC2rAqbspt4aOyBl+02loIJKYEvWqb/8s5IzrmxeU="
   },
-  "org/apache/xmlgraphics#fop-parent/2.10": {
-   "pom": "sha256-aGqCV9li/F1E+S2GNUvIQYN3htXo3psh/6QMpl0HztY="
+  "org/apache/xmlgraphics#fop-parent/2.11": {
+   "pom": "sha256-5w8WqdhJ04DhPj4U2CRmOerw/jowhYuhHsQNj0ld0LM="
   },
-  "org/apache/xmlgraphics#fop-util/2.10": {
-   "jar": "sha256-0hj6i3fPVkhBg/7CfopEHR0lINdxCFRB28FZ8HV4/p4=",
-   "pom": "sha256-oahMnSiW2qQP94szlM4hzpaorMRiOIpjfCI/NoavXCQ="
+  "org/apache/xmlgraphics#fop-util/2.11": {
+   "jar": "sha256-9k7EMu/+jk/x2qDuj38ckczN08XmKMAiWYCAuptqAWc=",
+   "pom": "sha256-B2qdxnD/ry+8YNElGCV7x220eywmGRr5o5aotME8tH0="
   },
-  "org/apache/xmlgraphics#xmlgraphics-commons/2.10": {
-   "jar": "sha256-hXry0G0ALOIXUyUEJE6o7oMa6wlP6wpHsml/GUlnEeo=",
-   "pom": "sha256-mD18XYcB8GYOiVw7TET0ORjDGaOi/Tas+TNwEJnTUgk="
+  "org/apache/xmlgraphics#xmlgraphics-commons/2.11": {
+   "jar": "sha256-GjeUjr/tqwzSks/FAH5lwvoWpwG5TCBhUnINOnOFYbw=",
+   "pom": "sha256-nK3V48G4PKnsuW32YD269E3mqblhqdqHDasG2ghYMLk="
   },
   "org/apfloat#apfloat-parent/1.10.1": {
    "pom": "sha256-rHDBL+cJtXDurKOZT4NbpGnnJaWbvjYRDTpBImHgUt8="
@@ -999,9 +1017,12 @@
    "jar": "sha256-oUgPVg83NV9sBFjFI72kZljaTNPiPMZOMJ/tzXsHgro=",
    "pom": "sha256-hhppAMWT7SJoYA3RdxPseJHZM8oBnTlQm0bzGBJ0Xcs="
   },
-  "org/assertj#assertj-core/4.0.0-M1": {
-   "jar": "sha256-A4UqtbRBnBsLNomTDNwaxPDEN6DICUqQA3DcsXDPu0Y=",
-   "pom": "sha256-hLFqlsHMdHVcoI+jS8RmCG1HqlWPOugx+z1HaMu9zsQ="
+  "org/assertj#assertj-bom/3.25.3": {
+   "pom": "sha256-kbehm3evVGLHKQuRrHxyxE1kg6/qC2JTaBbpj41T8lc="
+  },
+  "org/assertj#assertj-core/3.27.3": {
+   "jar": "sha256-W4omIF9tXqYK2c5lzkpAoq/kxIq+7GG9B0CgiMJOifU=",
+   "pom": "sha256-jrN+QWt4B+e/833QN8QMBrlWk6dgWcX7m+uFSaTO19w="
   },
   "org/bouncycastle#bcpg-jdk15on/1.69": {
    "jar": "sha256-o5hP9/2VGNAAlONPPT5xSkgj8lBa2hwZs1wSnib2OTQ=",
@@ -1019,11 +1040,6 @@
    "jar": "sha256-G/chsJdYs/VfKlyHW2F47GxB3drYVLDerUsnojbxlDo=",
    "pom": "sha256-UX6wMLtokjoCEZcGeEMDpAyf65/dJx2/61jBfYz6968="
   },
-  "org/checkerframework#checker-qual/3.43.0": {
-   "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=",
-   "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=",
-   "pom": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM="
-  },
   "org/codehaus#codehaus-parent/4": {
    "pom": "sha256-a4cjfejC4XQM+AYnx/POPhXeGTC7JQxVoeypT6PgFN8="
   },
@@ -1075,9 +1091,10 @@
    "jar": "sha256-VPNeiF3UDc/ElmlWosD7QWvNowuSU2D8oRqGLqIhm5I=",
    "pom": "sha256-YdIcDlfkD/vek0h07VsDCiJlqoMXphXOVi9iXPOMz8E="
   },
-  "org/freeplane/lightdev#simplyhtml/0.19.10": {
-   "jar": "sha256-vaV7NmNyspFPGBrL7BDmh6wBl/meWAh1gGNK2wzn/x4=",
-   "pom": "sha256-5nmOM49tyL35rIhfSHEX3r9sCN4j2tLpnUMo4zkNAWo="
+  "org/freeplane/lightdev#simplyhtml/0.19.12": {
+   "jar": "sha256-bti6c1obNGFUCeX8rCksaVnxm4u9ZF1xidxyFMnLdcY=",
+   "module": "sha256-CDKD8blr2gXyCLXG0aGt6P0yxx71216ZZRH8+ddawyI=",
+   "pom": "sha256-CCu5HgAPWap0W65Z8qDFio5imRWlvl6qf0xWVviQ0co="
   },
   "org/glassfish#jakarta.json/2.0.1": {
    "jar": "sha256-UlObOUmLhsqZELDqzGCKjHjejbOELKqEvIcWk3IgLMA=",
@@ -1147,9 +1164,9 @@
    "jar": "sha256-9gszs46desk+qqaKbHD3BruZA2SUsuKt0r/uEdCaxvU=",
    "pom": "sha256-ejSdIXeQw3ML4wjO0eqe4yxOdPcgWOg8K2DloolU3Q0="
   },
-  "org/jsoup#jsoup/1.18.3": {
-   "jar": "sha256-W+HM0yKK5f1u7RvW2Ce6wrxluRwg6ZV9Fupl9znxUwI=",
-   "pom": "sha256-gFse88p/b5ZfNniXEEPQZfPkxSr9XCT9Q53uQsbioCI="
+  "org/jsoup#jsoup/1.20.1": {
+   "jar": "sha256-ybt7LA9JVfx4WlXAVKPWpbFzuQ6krIhm17GmFuOEkc0=",
+   "pom": "sha256-oeGYRMAjusOTjPx5zGLPovp1SonWyooyxL+anx1IhIU="
   },
   "org/jspecify#jspecify/1.0.0": {
    "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=",
@@ -1160,6 +1177,10 @@
    "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="
@@ -1184,42 +1205,42 @@
    "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=",
    "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU="
   },
-  "org/junit#junit-bom/5.7.2": {
-   "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=",
-   "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs="
+  "org/junit#junit-bom/5.12.2": {
+   "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=",
+   "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc="
   },
   "org/junit#junit-bom/5.9.3": {
    "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=",
    "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc="
   },
-  "org/junit/jupiter#junit-jupiter-api/5.11.0": {
-   "jar": "sha256-QqogL8hi92zFr2W0exwLGWHN15zSIWQFpt+ivSCyCXQ=",
-   "module": "sha256-8FlIEOl1rpHe3OqeHiIP8hlcSvnQMyJ6C2VkxsX1m4U=",
-   "pom": "sha256-cTmgP0mFrJoYz6iUyYHkmfDkw3IFGTaMomTqhkc2Te0="
+  "org/junit/jupiter#junit-jupiter-api/5.12.2": {
+   "jar": "sha256-C5ynKOS82a3FfyneuVVv+e1eCLTohDuHWrpOTj4E8JI=",
+   "module": "sha256-VFfyRO3hjRFzbwfrnF8wklrrCW5Cw1m2oEqaDgOyKes=",
+   "pom": "sha256-VmKCFmSJvUCxLDUHuZXkj44CXgmgXn0W3SuY3GQs994="
   },
-  "org/junit/jupiter#junit-jupiter-engine/5.11.0": {
-   "jar": "sha256-cBJCM4PQx50DR8XPK9GZbDChIkD7cp4M36lUhS7Gk8w=",
-   "module": "sha256-KHwllg0eUqQFPj8ksY8eG6tM6K7us8eY3Z+N8p4yNFM=",
-   "pom": "sha256-wiNKZ/6wxv6pFlbG5ovSaeJGolN0jE+NBQyTj+MKn8A="
+  "org/junit/jupiter#junit-jupiter-engine/5.12.2": {
+   "jar": "sha256-9XbAa4rM3pmFBjuLyAUmy5gO7CTe4LciH8jd16zmWAA=",
+   "module": "sha256-0W0wjmqiWjCz75JNnf5PiJqb/ybqvXLvMO6oH864SBU=",
+   "pom": "sha256-PHGRdFCb6dsfqBesY7eLIfH2fQaL5HHaPQR4G9RAKqM="
   },
-  "org/junit/platform#junit-platform-commons/1.11.0": {
-   "jar": "sha256-YJMzpFRfkBjrDFkHHv0wZjqen9zlKBIbZaBMJ+X8Jqc=",
-   "module": "sha256-AjF2P88IOaIFJjYqtOEKJ8ZuvA+yICgexBweQV50vC0=",
-   "pom": "sha256-DJ/cUOXGT0LhF5+q+aYFRXOJqC6/6Ah9us1Kgglf0LE="
+  "org/junit/platform#junit-platform-commons/1.12.2": {
+   "jar": "sha256-5oOgHoXfq+pSDAVqxgFaYWJ1bmAuxlPA2oXiM/CvvBg=",
+   "module": "sha256-ZMeQwnpztFz8b4TMtotI92SQNIZ+Fo1iJ1TUlmkrwic=",
+   "pom": "sha256-TyuKkGXJCcaJLYYi1VO2qwpwMhYkSZ47acEon1nswHc="
   },
-  "org/junit/platform#junit-platform-engine/1.11.0": {
-   "jar": "sha256-p+ZyecZRxRaUlRK1BpFkdabZ4oTNT0ww0Cm0rXOpRNg=",
-   "module": "sha256-pdV2XcmtClTaDff0ggiEgxUt0JQsq1n14WqWCO5DmBI=",
-   "pom": "sha256-uL18viaZMQUQSho0jL3Rfqmcewb4fJc4971vW7e/bPI="
+  "org/junit/platform#junit-platform-engine/1.12.2": {
+   "jar": "sha256-zvDvy1vS4F4rgI04urXGVQicDDABUnN250y2BqeRHsg=",
+   "module": "sha256-+Xsxk2wRnAgtTQOM3resDmVvRR2eXX6Jg9IqJONvoQM=",
+   "pom": "sha256-lICxinlldp0Ag8LLcRBUI/UwKo8Ea7IEfm2/8J84NJA="
   },
-  "org/junit/platform#junit-platform-launcher/1.11.0": {
-   "jar": "sha256-pEU15jmBQjaETiJHIE+JJH0Trwzr3qU6QjFBAN/eGc4=",
-   "module": "sha256-A9Flx6iZgkDQQUU/YQZExuheR1W5WdlPZgt7hl3nQlM=",
-   "pom": "sha256-SzmIKleb316Z7TySABcUdnG47OsT3laQlR/hx8vBpd8="
+  "org/junit/platform#junit-platform-launcher/1.12.2": {
+   "jar": "sha256-3M8sH6Cpd8U60JSthZv93dUk2XWUt2MHrXh95xmFdX8=",
+   "module": "sha256-UKBqBDdOMA57hhWIxdwNAhQh4Z8ToL2ymwYX/y/ehdE=",
+   "pom": "sha256-YZFFzSFdMiJTcr5iW7ooaD10FC/uGl39scZLUv6cC1E="
   },
-  "org/mockito#mockito-core/5.17.0": {
-   "jar": "sha256-3/Wa2MYbAm74bMET+U8jAesGyq+B3sMMeKlqGmVZXF4=",
-   "pom": "sha256-0BzBTnZhxjBHlApC9Qc9Sg7L4qDqXS6jQgS0zAgeFqU="
+  "org/mockito#mockito-core/5.18.0": {
+   "jar": "sha256-o9TkD3/mYBb+QsAN5ONDd310Eyr8hQGODwOsYzSmDyk=",
+   "pom": "sha256-cCZWNGCaFVU3MDM5Ht/rh5Apl0EgpxL+DZrYC6JI790="
   },
   "org/objenesis#objenesis-parent/3.3": {
    "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8="
@@ -1284,32 +1305,32 @@
   "org/ow2#ow2/1.5.1": {
    "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
   },
-  "org/ow2/asm#asm-analysis/9.7": {
-   "jar": "sha256-e8a8vCE3mUigyMRn+w+GQgbluBj2vAtUaHL1yflBVW8=",
-   "pom": "sha256-nDMIDry2Ma5Pd+ti7We/xAy4cujP0Fishj5EXB3Zc98="
+  "org/ow2/asm#asm-analysis/9.8": {
+   "jar": "sha256-5kBzL7zTxicZJaUE8SXjg4Roj037v5LIYi387g0J7bk=",
+   "pom": "sha256-xXR+JccuGwfVJjx1x4rWGmJt0kWPr8r8I/gdMlPuQu0="
   },
-  "org/ow2/asm#asm-tree/9.7": {
-   "jar": "sha256-YvSzvENgRcGstcO6LY7FVuwzaQk9f10Gx0frBLVtUrE=",
-   "pom": "sha256-o06h4+QSjAEDjbQ8aXbojHec9a+EsFBdombf5pZWaOw="
+  "org/ow2/asm#asm-tree/9.8": {
+   "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=",
+   "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c="
   },
-  "org/ow2/asm#asm-util/9.7": {
-   "jar": "sha256-N6ZBTTZkGXPxrxBJN8ldbZIbLdtNYSxmxanysT/BQhE=",
-   "pom": "sha256-XQFNjIcNSHGCW9LdtVZ7Ie9trI7Ei7uNu0ZbCzor9FI="
+  "org/ow2/asm#asm-util/9.8": {
+   "jar": "sha256-i6BGDsso/Q4pgOXz7zQzpROkV7wHf4GlO9x1tYegjRU=",
+   "pom": "sha256-JNCXDhceKRe4Oo8PBdUKHNtcguUIVVtS28ydM2HE8Ow="
   },
-  "org/ow2/asm#asm/9.7": {
-   "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=",
-   "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA="
+  "org/ow2/asm#asm/9.8": {
+   "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=",
+   "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o="
   },
-  "org/owasp#dependency-check-core/12.1.0": {
-   "jar": "sha256-mofDnPjDRsRJAHEIbXbsloJPV2B2H9vN+OzyrMDCF9k=",
-   "pom": "sha256-ZON1R9iBPZ7CLSB61il5hxRe9inAGVke5ZB5cULUJJw="
+  "org/owasp#dependency-check-core/12.1.2": {
+   "jar": "sha256-qX1LAMk/PRgyI1QiAhFoTs8wh1H9ItuRIgbI+d8Ktxg=",
+   "pom": "sha256-U3rrQnAR1FO1rJccSBYTDS4r8NTYxTHJY9AoS6IMxOg="
   },
-  "org/owasp#dependency-check-parent/12.1.0": {
-   "pom": "sha256-PxXWp1NY1RlzM7tlzkTzBbTABCux+72qix7oDVeq+eo="
+  "org/owasp#dependency-check-parent/12.1.2": {
+   "pom": "sha256-eDgbKQ7ISF+9ygCrMRRieAfsHPEmd91B6rQ1wjkf5Jw="
   },
-  "org/owasp#dependency-check-utils/12.1.0": {
-   "jar": "sha256-mhVPJYxK5a3PB2yGno+O5OZwzNPbgA5H76i6Oe6/bWs=",
-   "pom": "sha256-qQnozYVbRk0CQkuvOLVyH6d7taEUhiv/OLHk8R5UXuU="
+  "org/owasp#dependency-check-utils/12.1.2": {
+   "jar": "sha256-PtGxks/N1bF/0CmrkVsRmg8YBmMIbJqRxLrWODNW0tY=",
+   "pom": "sha256-MOL9/jj0ETrGx6ueJqql+4PpwyN7ZtxO+Zka4pNC3Ws="
   },
   "org/redline-rpm#redline/1.2.10": {
    "jar": "sha256-LgdOe9QhdOrqyYzrx4Lw17zI3CpBYXkyrJx51WvIbs0=",
@@ -1330,9 +1351,9 @@
    "jar": "sha256-bQTDhD/JjS7qm6TP8L57gFQMp1xaTgs0Y/0SGcSMxl0=",
    "pom": "sha256-w7H6Icz/7VRUA6U8EPte8MoMrT+ZCLIASoIjaItyLcg="
   },
-  "org/semver4j#semver4j/5.6.0": {
-   "jar": "sha256-5mdE4z5VbxKBbFCr7AQUiLNI+SLSmBnPT2qwntJSp1U=",
-   "pom": "sha256-ruhPcPnpZbcEa5k/DPT3pNbYwHacmQNrh0ZGeu8gEpA="
+  "org/semver4j#semver4j/5.7.0": {
+   "jar": "sha256-rPZqGM1p5967wuqVdjIMLl/dPPVCDaypJLurFO57MQM=",
+   "pom": "sha256-Kii9cDSfbQhsbvGMF+Ac+WsIKM8UNQW72FIHzh58enQ="
   },
   "org/slf4j#slf4j-api/1.7.25": {
    "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4="
@@ -1344,8 +1365,8 @@
    "jar": "sha256-p5UCuKvfvXIoRqJ2kSJqQIhoLW01ZU+bgOKpzKz37Uc=",
    "pom": "sha256-Udh5pZmPWCJ0Dc9VIsDtaXGtXEpeowtw9bVGCT5rQmM="
   },
-  "org/slf4j#slf4j-api/2.0.16": {
-   "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c="
+  "org/slf4j#slf4j-api/2.0.17": {
+   "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8="
   },
   "org/slf4j#slf4j-api/2.1.0-alpha1": {
    "jar": "sha256-mrf/pkYgK0mdBZlaPsgvMbzLelA0XBUU2MtC7IzOo1M=",
@@ -1354,8 +1375,8 @@
   "org/slf4j#slf4j-bom/2.0.12": {
    "pom": "sha256-SH70mE1wFY9Yw3zodmkxukx+VzdYZYhLdWORv9bQDDk="
   },
-  "org/slf4j#slf4j-bom/2.0.16": {
-   "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk="
+  "org/slf4j#slf4j-bom/2.0.17": {
+   "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek="
   },
   "org/slf4j#slf4j-bom/2.1.0-alpha1": {
    "pom": "sha256-qOgTiZePRAcJJBuYPTHvp4cRO+EbgYwsa82e0wlv1IU="
@@ -1373,8 +1394,8 @@
   "org/slf4j#slf4j-parent/2.0.12": {
    "pom": "sha256-fGvEdX5NSZJN3w/sX1zkAvg6bGzz4QUtGVsSgqeFVd4="
   },
-  "org/slf4j#slf4j-parent/2.0.16": {
-   "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU="
+  "org/slf4j#slf4j-parent/2.0.17": {
+   "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs="
   },
   "org/slf4j#slf4j-parent/2.1.0-alpha1": {
    "pom": "sha256-zkc1sfnIId4Lkrjb5AsHHG6jIHMuWTVZxupt+WX4c48="
@@ -1442,17 +1463,17 @@
    "jar": "sha256-hHNzgo4EkLq9+u0rBI7TkI3BqN6C1Mjm66ub/QopTtY=",
    "pom": "sha256-ITSyrni76ndbwyNuSR4IJeKoNzZgrvSGW/8cBoDpnUQ="
   },
-  "org/yaml#snakeyaml/2.2": {
-   "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=",
-   "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y="
-  },
   "org/yaml#snakeyaml/2.3": {
    "jar": "sha256-Y6dv5mtlI2C9TCwQfm8CWNqn1LtJIAi6jCb80jD/kUY=",
    "pom": "sha256-D1omWgYzGwBJ41K+MsoyLeGLF/PU27cGNdQNppLjWC8="
   },
-  "us/springett#cpe-parser/2.1.0": {
-   "jar": "sha256-I2VjRR8JI+4OntCvDOty0oEzAABP1MslsS6sEoxWxHY=",
-   "pom": "sha256-WQfZBRFMPRM15jPy3An0J4PMtTQ29mUzsU+C+12oOtM="
+  "org/yaml#snakeyaml/2.4": {
+   "jar": "sha256-73ea9dKand6MxwzgNB9cb3c14j7f+Whc6qnTU1m3u38=",
+   "pom": "sha256-4VSjIxzWzeaKq/J0/RiWTUmpwaX16e079HHprnvfCOY="
+  },
+  "us/springett#cpe-parser/3.0.0": {
+   "jar": "sha256-Ny/y6W1YbDEN37+Jb89oFLRLPl1ToOAP5BCLjfq45BM=",
+   "pom": "sha256-OfOsz/76fRAagJ7ovEXJSrrrjGrUrDYmyZmDattHOEw="
   },
   "xml-apis#xml-apis-ext/1.3.04": {
    "jar": "sha256-0LSIfcNNV95JB0pYr/rUOaAT0Lr/oagDT47ypeoZFkY=",
diff --git a/pkgs/by-name/fr/freeplane/package.nix b/pkgs/by-name/fr/freeplane/package.nix
index 51950507ec63..70d7bd7a7363 100644
--- a/pkgs/by-name/fr/freeplane/package.nix
+++ b/pkgs/by-name/fr/freeplane/package.nix
@@ -2,7 +2,6 @@
   stdenvNoCC,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   makeBinaryWrapper,
   makeDesktopItem,
   jdk17,
@@ -13,7 +12,7 @@
 
 let
   pname = "freeplane";
-  version = "1.12.10";
+  version = "1.12.12";
 
   jdk = jdk17;
   gradle = gradle_8;
@@ -22,7 +21,7 @@ let
     owner = "freeplane";
     repo = "freeplane";
     rev = "release-${version}";
-    hash = "sha256-08Rl3vhXtlylNDc1gh5aZJ9/RoxeyxpDbklmhMVJuq4=";
+    hash = "sha256-8VFHJ3rEHzCuIYhz6o2LYzlybRZo6n7XGIM0D7BZUkU=";
   };
 
 in
@@ -36,15 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     copyDesktopItems
   ];
 
-  patches = [
-    # freeplane is using the wrong repository for a plugin
-    # remove when https://github.com/freeplane/freeplane/pull/2453 is merged and released
-    (fetchpatch {
-      url = "https://github.com/amadejkastelic/freeplane/commit/973c49b7a73622e434bb86c8caea15383201b58a.patch";
-      hash = "sha256-iztFmISXZu8xKWqpwDYgBSl8ZSpZEtNriwM+EW1+s+Y=";
-    })
-  ];
-
   mitmCache = gradle.fetchDeps {
     inherit pname;
     data = ./deps.json;

From cfb1841a939119e8b3c1d2725d15b94aa4c8f807 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Fri, 18 Jul 2025 18:07:21 +0200
Subject: [PATCH 203/357] netbox_4_3: 4.3.3 -> 4.3.5

Release notes:
  - https://github.com/netbox-community/netbox/releases/tag/v4.3.4
  - https://github.com/netbox-community/netbox/releases/tag/v4.3.5
Full changelog: https://github.com/netbox-community/netbox/compare/v4.3.3...v4.3.5
---
 pkgs/by-name/ne/netbox_4_3/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/netbox_4_3/package.nix b/pkgs/by-name/ne/netbox_4_3/package.nix
index b8a1cf816045..db6fc25b88e1 100644
--- a/pkgs/by-name/ne/netbox_4_3/package.nix
+++ b/pkgs/by-name/ne/netbox_4_3/package.nix
@@ -16,14 +16,14 @@ let
 in
 py.pkgs.buildPythonApplication rec {
   pname = "netbox";
-  version = "4.3.3";
+  version = "4.3.5";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "netbox-community";
     repo = "netbox";
     tag = "v${version}";
-    hash = "sha256-KmnTDTb3k8WtDN7sWjKOriG9i5dHY7BHXty6zPDqPqA=";
+    hash = "sha256-EbbYHtdXcyg12FVuSBx4CAOD0TZ8PHBDQ4nv2mzTZIw=";
   };
 
   patches = [

From 492a3e5b2145db98becd387807a6aed4dcd0a7e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 09:53:03 +0000
Subject: [PATCH 204/357] postgresqlPackages.pgsql-http: 1.6.3 -> 1.7.0

---
 pkgs/servers/sql/postgresql/ext/pgsql-http.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
index 6ea4fb13b678..c1ab46736b9f 100644
--- a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pgsql-http";
-  version = "1.6.3";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "pramsey";
     repo = "pgsql-http";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ij8BaNj2SOwDfjgLxrpLFvvPCzSahXyyckRPGmcqKtE=";
+    hash = "sha256-tgmty8ZYpSEccwQouI/Ho2M495k6DizbMaaJ0+aW03Q=";
   };
 
   buildInputs = [ curl ];

From 74c13b2811618adab992df102fbaa1c64526146c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 10:02:56 +0000
Subject: [PATCH 205/357] terraform-providers.newrelic: 3.64.0 -> 3.65.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index fd5a20139ff9..56e568bbb1cc 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -876,13 +876,13 @@
     "vendorHash": null
   },
   "newrelic": {
-    "hash": "sha256-6IA7p+VCGvMmIVTPswOorToeYRE1eDszVMFPPZdZ4y0=",
+    "hash": "sha256-ymxR4LOgsMg8evg4nBjzJZ5rKi/ql4TLlYb9i9gzKK4=",
     "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
     "owner": "newrelic",
     "repo": "terraform-provider-newrelic",
-    "rev": "v3.64.0",
+    "rev": "v3.65.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ZWtk6FuELMEyUr7YpkCfsTae3eJqoEpit8/vJgoN/gU="
+    "vendorHash": "sha256-+ogtadT0zekeaynXQCwDBrD+bBnKUsyzLGPQyLsCSR8="
   },
   "nexus": {
     "hash": "sha256-Lm5CZ+eBDUNIL2KuK/iKc5dTif7P+E9II714vwvYuyU=",

From 63806079c3e45f7073f3b381861395dbc04f1f68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 10:30:39 +0000
Subject: [PATCH 206/357] python3Packages.pyosohotwaterapi: 1.2.0 -> 1.2.4

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

diff --git a/pkgs/development/python-modules/pyosohotwaterapi/default.nix b/pkgs/development/python-modules/pyosohotwaterapi/default.nix
index 9ba2348636ff..6aee8b17fbdb 100644
--- a/pkgs/development/python-modules/pyosohotwaterapi/default.nix
+++ b/pkgs/development/python-modules/pyosohotwaterapi/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyosohotwaterapi";
-  version = "1.2.0";
+  version = "1.2.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "osohotwateriot";
     repo = "apyosohotwaterapi";
     tag = version;
-    hash = "sha256-GFjA1RtJC2bxSoH2TIZwEdSAvpteYBTbsS81hhp4Y3E=";
+    hash = "sha256-hpbmiSOLawKVSh7BGV70bRi45HCDKmdxEEhCOdJuIww=";
   };
 
   build-system = [

From 3266dd610b69ee0960a3071afba44cf4534fcd8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 10:41:03 +0000
Subject: [PATCH 207/357] snazy: 0.57.2 -> 0.57.3

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

diff --git a/pkgs/by-name/sn/snazy/package.nix b/pkgs/by-name/sn/snazy/package.nix
index 395ead791d4c..19f0b759fd17 100644
--- a/pkgs/by-name/sn/snazy/package.nix
+++ b/pkgs/by-name/sn/snazy/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "snazy";
-  version = "0.57.2";
+  version = "0.57.3";
 
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "snazy";
     rev = version;
-    hash = "sha256-oGj/k7StIuk+T40Dm1SzAIf8QhHTIhkcDUPyK/CAfDI=";
+    hash = "sha256-ACEIqMonc4AD84uTkHQZc2+vXjlXhKNLZqNxWm8RnBw=";
   };
 
-  cargoHash = "sha256-wNdaicys3sGQ00CsPldvyEtgkamywaHohL599FNr6/M=";
+  cargoHash = "sha256-1o6/17H2D8gKpT2EefVfMD2Bp4/R9Xtg+/Eil32GzcM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 871a78c326f5b8aaca8458986aed1b0d8624c32d Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 2 Aug 2025 12:54:17 +0200
Subject: [PATCH 208/357] crispy-doom: refactor

---
 pkgs/by-name/cr/crispy-doom/package.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/cr/crispy-doom/package.nix b/pkgs/by-name/cr/crispy-doom/package.nix
index 16964496ce15..33e25dd195c7 100644
--- a/pkgs/by-name/cr/crispy-doom/package.nix
+++ b/pkgs/by-name/cr/crispy-doom/package.nix
@@ -1,28 +1,27 @@
 {
   lib,
   stdenv,
+  fetchFromGitHub,
   autoreconfHook,
   pkg-config,
+  python3,
   SDL2,
   SDL2_mixer,
   SDL2_net,
-  fetchFromGitHub,
-  python3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "crispy-doom";
   version = "7.0";
 
   src = fetchFromGitHub {
     owner = "fabiangreffrath";
     repo = "crispy-doom";
-    rev = "crispy-doom-${version}";
-    sha256 = "sha256-+rNZsb4GAjzNcIU5xZGBpmP+nXNOP16oVg68nfecMrw=";
+    tag = "crispy-doom-${finalAttrs.version}";
+    hash = "sha256-+rNZsb4GAjzNcIU5xZGBpmP+nXNOP16oVg68nfecMrw=";
   };
 
   postPatch = ''
-    sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am
     for script in $(grep -lr '^#!/usr/bin/env python3$'); do patchShebangs $script; done
   '';
 
@@ -31,24 +30,28 @@ stdenv.mkDerivation rec {
     pkg-config
     python3
   ];
+
   buildInputs = [
     SDL2
     SDL2_mixer
     SDL2_net
   ];
+
   enableParallelBuilding = true;
 
   strictDeps = true;
 
   meta = {
-    homepage = "http://fabiangreffrath.github.io/crispy-doom";
+    homepage = "https://fabiangreffrath.github.io/crispy-homepage";
+    changelog = "https://github.com/fabiangreffrath/crispy-doom/releases/tag/crispy-doom-${finalAttrs.version}";
     description = "Limit-removing enhanced-resolution Doom source port based on Chocolate Doom";
     longDescription = ''
       Crispy Doom is a limit-removing enhanced-resolution Doom source port based on Chocolate Doom.
       Its name means that 640x400 looks \"crisp\" and is also a slight reference to its origin.
     '';
+    mainProgram = "crispy-doom";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ neonfuz ];
   };
-}
+})

From 042b74f928a973af1dabcc8f49a0fb365c43ed38 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sat, 2 Aug 2025 12:59:06 +0200
Subject: [PATCH 209/357] usql: 0.19.21 -> 0.19.25

Diff: https://github.com/xo/usql/compare/refs/tags/v0.19.21...refs/tags/v0.19.25

Changelog: https://github.com/xo/usql/releases/tag/v0.19.25
---
 pkgs/by-name/us/usql/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix
index 34ffa9971475..98e2227a17f4 100644
--- a/pkgs/by-name/us/usql/package.nix
+++ b/pkgs/by-name/us/usql/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "usql";
-  version = "0.19.21";
+  version = "0.19.25";
 
   src = fetchFromGitHub {
     owner = "xo";
     repo = "usql";
     tag = "v${version}";
-    hash = "sha256-Ix1+uq5TpYp6JyT2KML8Ts/ElPeQCKz9qAW9DqQahbE=";
+    hash = "sha256-k6zXXtttW6AXLK/DoRqYOz39kqwamOE/xfT6TOa22jc=";
   };
 
   buildInputs = [
@@ -25,7 +25,7 @@ buildGoModule rec {
     icu
   ];
 
-  vendorHash = "sha256-YXpmzIPs6gvEspC9JrGHw4Yzs8wdtBTsGU9kTOT6c+0=";
+  vendorHash = "sha256-RdIf/1Vu37y+xoF2I8XJYqgeOxGHG+hLe3JOMbVLofw=";
   proxyVendor = true;
 
   # Exclude drivers from the bad group
@@ -44,7 +44,6 @@ buildGoModule rec {
     "sqlite_json1"
     "sqlite_math_functions"
     "sqlite_stat4"
-    "sqlite_userauth"
     "sqlite_vtable"
     "no_adodb"
   ];

From 0e32ddf93251105479747ffe896e9ae12c13893d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 11:15:45 +0000
Subject: [PATCH 210/357] kubernetes-helmPlugins.helm-diff: 3.12.3 -> 3.12.4

---
 .../networking/cluster/helm/plugins/helm-diff.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
index 85845740f75e..b158fb506b4f 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "helm-diff";
-  version = "3.12.3";
+  version = "3.12.4";
 
   src = fetchFromGitHub {
     owner = "databus23";
     repo = "helm-diff";
     rev = "v${version}";
-    hash = "sha256-zYeZwR8hDNYVJGdYjQNrQmyD5AwGcgyO7LzC5bd10k0=";
+    hash = "sha256-w57EhXjaOEZaQV4FcvzjV4rMUVIwLlUJ3XlD+SLcLa8=";
   };
 
-  vendorHash = "sha256-rz5RZiKGM1AdDm4R2IPOYn///fKKmo96u2LROShFPJM=";
+  vendorHash = "sha256-FSyWFJSQBCRpHNrQTPz392H0dE37w1JcwJmoL0dg9fE=";
 
   ldflags = [
     "-s"

From ad61388734935e7b174caccfa3b59357f2c603b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 11:40:19 +0000
Subject: [PATCH 211/357] aliyun-cli: 3.0.291 -> 3.0.292

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

diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix
index f2600a005d89..11be87091125 100644
--- a/pkgs/by-name/al/aliyun-cli/package.nix
+++ b/pkgs/by-name/al/aliyun-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "aliyun-cli";
-  version = "3.0.291";
+  version = "3.0.292";
 
   src = fetchFromGitHub {
     owner = "aliyun";
     repo = "aliyun-cli";
     tag = "v${version}";
-    hash = "sha256-/nrspG9pB8pOnkTpnY3/4872sfe1Wg14MnKftEz4YX0=";
+    hash = "sha256-/bw4ukQRQ7rJLa+Muy7KjgyBh7ffFGSJ/q5Wnd/y7FY=";
     fetchSubmodules = true;
   };
 

From 250a83568cb4642e90e98ab5fd0601a3b73b556d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 11:55:52 +0000
Subject: [PATCH 212/357] kubevpn: 2.8.1 -> 2.9.0

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

diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix
index 6d225d4078fd..c1f0e8c95ce2 100644
--- a/pkgs/by-name/ku/kubevpn/package.nix
+++ b/pkgs/by-name/ku/kubevpn/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubevpn";
-  version = "2.8.1";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "KubeNetworks";
     repo = "kubevpn";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+TyaujgbeQXApxmjYvLnmhBZZUeIZMidzS7mL+Ach3o=";
+    hash = "sha256-vPmN1g3LNTYoFZNaUJWJbP+N+RG0973GLekQOsr+4bU=";
   };
 
   vendorHash = null;

From 8955ea247811532996c876ea79f7df28646063e6 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 2 Aug 2025 12:32:47 +0000
Subject: [PATCH 213/357] overcommit: 0.67.1 -> 0.68.0

---
 pkgs/by-name/ov/overcommit/Gemfile.lock | 4 ++--
 pkgs/by-name/ov/overcommit/gemset.nix   | 4 ++--
 pkgs/by-name/ov/overcommit/package.nix  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ov/overcommit/Gemfile.lock b/pkgs/by-name/ov/overcommit/Gemfile.lock
index 050edecf783c..9323e772ecce 100644
--- a/pkgs/by-name/ov/overcommit/Gemfile.lock
+++ b/pkgs/by-name/ov/overcommit/Gemfile.lock
@@ -5,7 +5,7 @@ GEM
       logger (~> 1.5)
     iniparse (1.5.0)
     logger (1.7.0)
-    overcommit (0.67.1)
+    overcommit (0.68.0)
       childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
       rexml (>= 3.3.9)
@@ -18,4 +18,4 @@ DEPENDENCIES
   overcommit
 
 BUNDLED WITH
-   2.6.6
+   2.6.9
diff --git a/pkgs/by-name/ov/overcommit/gemset.nix b/pkgs/by-name/ov/overcommit/gemset.nix
index 670aeff0c827..eb668c7f889e 100644
--- a/pkgs/by-name/ov/overcommit/gemset.nix
+++ b/pkgs/by-name/ov/overcommit/gemset.nix
@@ -40,10 +40,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1i81n0h8h2mb81kjfvqj493flx7rb809z5w8sbjfd7szsqnq86n7";
+      sha256 = "1l68phk7kixncc13db5yqgkryf69gc3h63vj7l5f2970i1ix5g5z";
       type = "gem";
     };
-    version = "0.67.1";
+    version = "0.68.0";
   };
   rexml = {
     groups = [ "default" ];
diff --git a/pkgs/by-name/ov/overcommit/package.nix b/pkgs/by-name/ov/overcommit/package.nix
index c930a64f2531..a5809b86472c 100644
--- a/pkgs/by-name/ov/overcommit/package.nix
+++ b/pkgs/by-name/ov/overcommit/package.nix
@@ -24,7 +24,7 @@ bundlerApp rec {
       package = overcommit;
       version = (import ./gemset.nix).overcommit.version;
     };
-    updateScript = bundlerUpdateScript pname;
+    updateScript = bundlerUpdateScript "overcommit";
   };
 
   meta = with lib; {
@@ -32,7 +32,7 @@ bundlerApp rec {
     homepage = "https://github.com/sds/overcommit";
     changelog = "https://github.com/sds/overcommit/blob/main/CHANGELOG.md";
     license = licenses.mit;
-    mainProgram = pname;
+    mainProgram = "overcommit";
     maintainers = with maintainers; [
       Br1ght0ne
       anthonyroussel

From bcc64dedcea0e8b9d62bd3780d25d88e811079d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 12:38:11 +0000
Subject: [PATCH 214/357] hashcat: 6.2.6 -> 7.0.0

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

diff --git a/pkgs/by-name/ha/hashcat/package.nix b/pkgs/by-name/ha/hashcat/package.nix
index 24b3b76bb837..06869a15ac5d 100644
--- a/pkgs/by-name/ha/hashcat/package.nix
+++ b/pkgs/by-name/ha/hashcat/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation rec {
   pname = "hashcat";
-  version = "6.2.6";
+  version = "7.0.0";
 
   src = fetchurl {
     url = "https://hashcat.net/files/hashcat-${version}.tar.gz";
-    sha256 = "sha256-sl4Qd7zzSQjMjxjBppouyYsEeyy88PURRNzzuh4Leyo=";
+    sha256 = "sha256-hCtx0NNLAgAFiCR6rp/smg/BMnfyzTpqSSWw8Jszv3U=";
   };
 
   postPatch = ''

From 8e41855fcdea5a4c9e6915fc39cc4c93126b7b74 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 2 Aug 2025 12:46:20 +0000
Subject: [PATCH 215/357] gp-saml-gui: migrate to by-name

gp-saml-gui: refactor buildPythonPackage and meta
---
 .../gp/gp-saml-gui/package.nix}               | 30 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 16 insertions(+), 16 deletions(-)
 rename pkgs/{tools/networking/gp-saml-gui/default.nix => by-name/gp/gp-saml-gui/package.nix} (67%)

diff --git a/pkgs/tools/networking/gp-saml-gui/default.nix b/pkgs/by-name/gp/gp-saml-gui/package.nix
similarity index 67%
rename from pkgs/tools/networking/gp-saml-gui/default.nix
rename to pkgs/by-name/gp/gp-saml-gui/package.nix
index f297f189851f..a33f5e505b14 100644
--- a/pkgs/tools/networking/gp-saml-gui/default.nix
+++ b/pkgs/by-name/gp/gp-saml-gui/package.nix
@@ -2,16 +2,14 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  buildPythonPackage,
+  python3Packages,
   webkitgtk_4_1,
   wrapGAppsHook3,
   glib-networking,
   gobject-introspection,
   openconnect,
-  pygobject3,
-  requests,
 }:
-buildPythonPackage rec {
+python3Packages.buildPythonPackage rec {
   pname = "gp-saml-gui";
   version = "0.1+20240731-${lib.strings.substring 0 7 src.rev}";
   format = "setuptools";
@@ -20,7 +18,7 @@ buildPythonPackage rec {
     owner = "dlenski";
     repo = "gp-saml-gui";
     rev = "c46af04b3a6325b0ecc982840d7cfbd1629b6d43";
-    sha256 = "sha256-4MFHad1cuCWawy2hrqdXOgud0pXpYiV9J3Jwqyg4Udk=";
+    hash = "sha256-4MFHad1cuCWawy2hrqdXOgud0pXpYiV9J3Jwqyg4Udk=";
   };
 
   buildInputs = lib.optional stdenv.hostPlatform.isLinux glib-networking;
@@ -31,12 +29,16 @@ buildPythonPackage rec {
     glib-networking
   ];
 
-  propagatedBuildInputs = [
-    requests
-    pygobject3
-    openconnect
-  ]
-  ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
+  dependencies =
+    with python3Packages;
+    [
+      requests
+      pygobject3
+    ]
+    ++ [
+      openconnect
+    ]
+    ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
 
   preFixup = ''
     gappsWrapperArgs+=(
@@ -44,11 +46,11 @@ buildPythonPackage rec {
     )
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Interactively authenticate to GlobalProtect VPNs that require SAML";
     mainProgram = "gp-saml-gui";
     homepage = "https://github.com/dlenski/gp-saml-gui";
-    license = licenses.gpl3Only;
-    maintainers = [ maintainers.pallix ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ pallix ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15b7b79653f4..3256fd5c8850 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1085,8 +1085,6 @@ with pkgs;
     }
   );
 
-  gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { };
-
   inherit (callPackages ../tools/networking/ivpn/default.nix { })
     ivpn
     ivpn-service

From a723fc2cca00a6e93a9bf3b9c74ca2ef74468381 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 2 Aug 2025 12:58:32 +0200
Subject: [PATCH 216/357] crispy-doom: add missing dependencies

---
 pkgs/by-name/cr/crispy-doom/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/cr/crispy-doom/package.nix b/pkgs/by-name/cr/crispy-doom/package.nix
index 33e25dd195c7..6a8802ea9307 100644
--- a/pkgs/by-name/cr/crispy-doom/package.nix
+++ b/pkgs/by-name/cr/crispy-doom/package.nix
@@ -3,11 +3,14 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
+  libpng,
+  libsamplerate,
   pkg-config,
   python3,
   SDL2,
   SDL2_mixer,
   SDL2_net,
+  zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,9 +35,12 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    libpng
+    libsamplerate
     SDL2
     SDL2_mixer
     SDL2_net
+    zlib
   ];
 
   enableParallelBuilding = true;

From 0361a0e9ce02c212c290b470bffbaa787fa7a5c6 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 2 Aug 2025 13:14:12 +0200
Subject: [PATCH 217/357] crispy-doom: add optional truecolor support

---
 pkgs/by-name/cr/crispy-doom/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/cr/crispy-doom/package.nix b/pkgs/by-name/cr/crispy-doom/package.nix
index 6a8802ea9307..dade280730bd 100644
--- a/pkgs/by-name/cr/crispy-doom/package.nix
+++ b/pkgs/by-name/cr/crispy-doom/package.nix
@@ -11,6 +11,8 @@
   SDL2_mixer,
   SDL2_net,
   zlib,
+
+  enableTruecolor ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -28,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
     for script in $(grep -lr '^#!/usr/bin/env python3$'); do patchShebangs $script; done
   '';
 
+  configureFlags = lib.optional enableTruecolor [ "--enable-truecolor" ];
+
   nativeBuildInputs = [
     autoreconfHook
     pkg-config

From 8cdc932fb9f1511e92276c3f652cc57e75415c45 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 2 Aug 2025 13:14:32 +0200
Subject: [PATCH 218/357] crispy-doom: add myself as maintainer

---
 pkgs/by-name/cr/crispy-doom/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/cr/crispy-doom/package.nix b/pkgs/by-name/cr/crispy-doom/package.nix
index dade280730bd..a4993ef6c200 100644
--- a/pkgs/by-name/cr/crispy-doom/package.nix
+++ b/pkgs/by-name/cr/crispy-doom/package.nix
@@ -62,6 +62,9 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "crispy-doom";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ neonfuz ];
+    maintainers = with lib.maintainers; [
+      Gliczy
+      neonfuz
+    ];
   };
 })

From b4d2664f99b958674560389618f4b5c195373933 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sat, 2 Aug 2025 14:15:35 +0200
Subject: [PATCH 219/357] crispy-doom: add keenanweaver as maintainer

---
 pkgs/by-name/cr/crispy-doom/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/cr/crispy-doom/package.nix b/pkgs/by-name/cr/crispy-doom/package.nix
index a4993ef6c200..e2d5632915c5 100644
--- a/pkgs/by-name/cr/crispy-doom/package.nix
+++ b/pkgs/by-name/cr/crispy-doom/package.nix
@@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       Gliczy
+      keenanweaver
       neonfuz
     ];
   };

From a25c091473c3e9aef23318c1ab1889b9b4d35a7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 13:36:45 +0000
Subject: [PATCH 220/357] labwc: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix
index 3d1cbea4f1c2..671e5516dddc 100644
--- a/pkgs/by-name/la/labwc/package.nix
+++ b/pkgs/by-name/la/labwc/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "labwc";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "labwc";
     repo = "labwc";
     tag = finalAttrs.version;
-    hash = "sha256-7PgRbOSxU7v49dcTuke7V/Xa42baw79iMvfnCOYx4qU=";
+    hash = "sha256-8SKSITFwbagJhuTXVHpPmQoaooktIXc1CeO9ZOUuh1w=";
   };
 
   outputs = [

From b3959a6344083c562d075500124f2bbb92f97dac Mon Sep 17 00:00:00 2001
From: Bryan Honof <bryanhonof@gmail.com>
Date: Sun, 27 Jul 2025 01:44:06 +0200
Subject: [PATCH 221/357] python3Packages.mcp: 1.9.4 -> 1.12.2

I also had to disable some failing tests that I didn't mananage to catch in a
reproducible manner. They tend to happen when the system I'm running
nixpkgs-review on is under some load, but they don't happen all that often when
building the package in isolation.

Co-authored-by: Joshua Peek <josh@users.noreply.github.com>
---
 .../python-modules/mcp/default.nix            | 67 ++++++++++++++-----
 1 file changed, 49 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix
index 5ad4d0b7b956..a88d5286a4d4 100644
--- a/pkgs/development/python-modules/mcp/default.nix
+++ b/pkgs/development/python-modules/mcp/default.nix
@@ -11,6 +11,7 @@
   anyio,
   httpx,
   httpx-sse,
+  jsonschema,
   pydantic,
   pydantic-settings,
   python-multipart,
@@ -28,6 +29,7 @@
   websockets,
 
   # tests
+  dirty-equals,
   inline-snapshot,
   pytest-asyncio,
   pytest-examples,
@@ -38,20 +40,31 @@
 
 buildPythonPackage rec {
   pname = "mcp";
-  version = "1.9.4";
+  version = "1.12.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "modelcontextprotocol";
     repo = "python-sdk";
     tag = "v${version}";
-    hash = "sha256-VXbu/wHbXGS+cISJVUgCVEpTmZc0VfckNRoMj3GDi/A=";
+    hash = "sha256-K3S+2Z4yuo8eAOo8gDhrI8OOfV6ADH4dAb1h8PqYntc=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail ', "uv-dynamic-versioning"' "" \
       --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
+  ''
+  + lib.optionalString stdenv.buildPlatform.isDarwin ''
+    # time.sleep(0.1) feels a bit optimistic and it has been flaky whilst
+    # testing this on macOS under load.
+    substituteInPlace \
+      "tests/client/test_stdio.py" \
+      "tests/server/fastmcp/test_integration.py" \
+      "tests/shared/test_ws.py" \
+      "tests/shared/test_sse.py" \
+      "tests/shared/test_streamable_http.py" \
+      --replace-fail "time.sleep(0.1)" "time.sleep(1)"
   '';
 
   build-system = [ hatchling ];
@@ -64,6 +77,7 @@ buildPythonPackage rec {
     anyio
     httpx
     httpx-sse
+    jsonschema
     pydantic
     pydantic-settings
     python-multipart
@@ -88,6 +102,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "mcp" ];
 
   nativeCheckInputs = [
+    dirty-equals
     inline-snapshot
     pytest-asyncio
     pytest-examples
@@ -97,29 +112,45 @@ buildPythonPackage rec {
   ]
   ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  pytestFlags = [
-    "-Wignore::pydantic.warnings.PydanticDeprecatedSince211"
-  ];
-
   disabledTests = [
     # attempts to run the package manager uv
     "test_command_execution"
 
-    # performance-dependent test
+    # ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception)
+    "test_lifespan_cleanup_executed"
+
+    # AssertionError: Child process should be writing
+    "test_basic_child_process_cleanup"
+
+    # AssertionError: parent process should be writing
+    "test_nested_process_tree"
+
+    # AssertionError: Child should be writing
+    "test_early_parent_exit"
+
+    # pytest.PytestUnraisableExceptionWarning: Exception ignored in: <_io.FileIO ...
+    "test_list_tools_returns_all_tools"
+
+    # AssertionError: Server startup marker not created
+    "test_stdin_close_triggers_cleanup"
+
+    # pytest.PytestUnraisableExceptionWarning: Exception ignored in: <function St..
+    "test_resource_template_client_interaction"
+
+    # 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_"
+
+    # This just feels a bit optimistic...
+    #     	assert duration < 3 * _sleep_time_seconds
+    # AssertionError: assert 0.0733884589999434 < (3 * 0.01)
     "test_messages_are_executed_concurrently"
 
     # ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception)
-    "test_client_session_version_negotiation_failure"
-
-    # AttributeError: 'coroutine' object has no attribute 'client_metadata'
-    "TestOAuthClientProvider"
-
-    # inline_snapshot._exceptions.UsageError: snapshot value should not change. Use Is(...) for dynamic snapshot parts
-    "test_build_metadata"
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # Flaky: ExceptionGroup: unhandled errors in a TaskGroup (1 sub-exception)
-    "test_notification_validation_error"
+    "test_tool_progress"
   ];
 
   __darwinAllowLocalNetworking = true;

From 084630f0e9a9b55f849ffe2d1878f96ad5d0abf7 Mon Sep 17 00:00:00 2001
From: Bryan Honof <bryanhonof@gmail.com>
Date: Sun, 27 Jul 2025 19:44:02 +0200
Subject: [PATCH 222/357] python3Packages.mcp: add bryanhonof as maintainer

---
 pkgs/development/python-modules/mcp/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix
index a88d5286a4d4..82e3584482c8 100644
--- a/pkgs/development/python-modules/mcp/default.nix
+++ b/pkgs/development/python-modules/mcp/default.nix
@@ -160,6 +160,9 @@ buildPythonPackage rec {
     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; [ josh ];
+    maintainers = with lib.maintainers; [
+      bryanhonof
+      josh
+    ];
   };
 }

From 4a32f944c9a37d144d741d6b164283143ac08d0e Mon Sep 17 00:00:00 2001
From: Bryan Honof <bryanhonof@gmail.com>
Date: Sun, 27 Jul 2025 20:08:08 +0200
Subject: [PATCH 223/357] python3Packages.fastmcp: 2.8.0 -> 2.10.6

---
 .../python-modules/fastmcp/default.nix        | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/fastmcp/default.nix b/pkgs/development/python-modules/fastmcp/default.nix
index 8f3da4a17d58..c87ef6e3e938 100644
--- a/pkgs/development/python-modules/fastmcp/default.nix
+++ b/pkgs/development/python-modules/fastmcp/default.nix
@@ -10,31 +10,35 @@
 
   # dependencies
   authlib,
+  cyclopts,
   exceptiongroup,
   httpx,
   mcp,
   openapi-pydantic,
+  pydantic,
+  pyperclip,
   python-dotenv,
   rich,
-  typer,
 
   # tests
   dirty-equals,
+  email-validator,
   fastapi,
+  pytest-asyncio,
   pytest-httpx,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "fastmcp";
-  version = "2.8.0";
+  version = "2.10.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jlowin";
     repo = "fastmcp";
     tag = "v${version}";
-    hash = "sha256-FleJkqdUIhGsV+DVYv/Nf5IORntH/aFq9abKn2r/6Is=";
+    hash = "sha256-Wxugk2ocuur710WZLG7xph2R/n02Y9BvH7Lf4BuEMYs=";
   };
 
   postPatch = ''
@@ -49,28 +53,51 @@ buildPythonPackage rec {
 
   dependencies = [
     authlib
+    cyclopts
     exceptiongroup
     httpx
     mcp
     openapi-pydantic
+    pyperclip
     python-dotenv
     rich
-    typer
   ];
 
   pythonImportsCheck = [ "fastmcp" ];
 
   nativeCheckInputs = [
     dirty-equals
+    email-validator
     fastapi
+    pydantic
+    pytest-asyncio
     pytest-httpx
     pytestCheckHook
     writableTmpDirAsHomeHook
-  ];
+  ]
+  ++ pydantic.optional-dependencies.email;
 
   disabledTests = [
     # AssertionError: assert 'INFO' == 'DEBUG'
     "test_temporary_settings"
+
+    # RuntimeError: Client failed to connect: Connection close
+    "test_keep_alive_maintains_session_across_multiple_calls"
+    "test_keep_alive_false_starts_new_session_across_multiple_calls"
+    "test_keep_alive_starts_new_session_if_manually_closed"
+    "test_keep_alive_maintains_session_if_reentered"
+    "test_close_session_and_try_to_use_client_raises_error"
+
+    # RuntimeError: Client failed to connect: Timed out while waiting for response
+    "test_timeout"
+    "test_timeout_tool_call_overrides_client_timeout_even_if_lower"
+
+    # assert 0 == 2
+    "test_multi_client"
+
+    # fastmcp.exceptions.ToolError: Unknown tool
+    "test_multi_client_with_logging"
+    "test_multi_client_with_elicitation"
   ];
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [

From 54999b7afdcc0c73d332328161939fc3a75f2e24 Mon Sep 17 00:00:00 2001
From: Bryan Honof <bryanhonof@gmail.com>
Date: Sun, 27 Jul 2025 20:17:59 +0200
Subject: [PATCH 224/357] python3Packages.fastapi-mcp: 0.3.4 -> 0.3.7

---
 pkgs/development/python-modules/fastapi-mcp/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fastapi-mcp/default.nix b/pkgs/development/python-modules/fastapi-mcp/default.nix
index 2d6e76197162..0767727a927b 100644
--- a/pkgs/development/python-modules/fastapi-mcp/default.nix
+++ b/pkgs/development/python-modules/fastapi-mcp/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "fastapi-mcp";
-  version = "0.3.4";
+  version = "0.3.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tadata-org";
     repo = "fastapi_mcp";
     tag = "v${version}";
-    hash = "sha256-t6p/jXQjbhUmIlwoqszRj3GGSrLS0Gcoh1BtizNaw8o=";
+    hash = "sha256-WQ+Y/TM5fz0lHjCKvEuYGY6hzxo2ePcgRnq7piNC+KQ=";
   };
 
   build-system = [
@@ -64,6 +64,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTestPaths = [
+    # Flaky, would try to allocate a port on Darwin
+    "tests/test_sse_real_transport.py"
+  ];
+
   __darwinAllowLocalNetworking = true;
 
   meta = {

From 03597ee0cfff9e883d06b175bf273276ce2713f2 Mon Sep 17 00:00:00 2001
From: Bryan Honof <bryanhonof@gmail.com>
Date: Sun, 27 Jul 2025 02:30:19 +0200
Subject: [PATCH 225/357] python3Packages.openai-agents: 0.0.13 -> 0.2.3

Got rid of nix-update-script, since it didn't seem to be doing anything?
---
 .../python-modules/openai-agents/default.nix         | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/openai-agents/default.nix b/pkgs/development/python-modules/openai-agents/default.nix
index 2babf44d6a9d..a4de7640d1bb 100644
--- a/pkgs/development/python-modules/openai-agents/default.nix
+++ b/pkgs/development/python-modules/openai-agents/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  nix-update-script,
   buildPythonPackage,
   fetchPypi,
   hatchling,
@@ -15,20 +14,15 @@
 
 buildPythonPackage rec {
   pname = "openai-agents";
-  version = "0.0.13";
+  version = "0.2.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "openai_agents";
-    hash = "sha256-a4AxXnXAa1MCxfKtui+eo4RflGFdrtRwa/uHF0D1YaU=";
+    hash = "sha256-ldStGUxcDPGkADjLcB7ujs2q92mNh7sT48LFz/gMS00=";
   };
 
-  # OpenAI 1.76.0 seems to not build currently
-  postPatch = ''
-    substituteInPlace pyproject.toml --replace-fail "openai>=1.76.0" "openai"
-  '';
-
   build-system = [
     hatchling
   ];
@@ -47,8 +41,6 @@ buildPythonPackage rec {
     "agents"
   ];
 
-  passthru.updateScript = nix-update-script { };
-
   meta = {
     changelog = "https://github.com/openai/openai-agents-python/releases/tag/${version}";
     homepage = "https://github.com/openai/openai-agents-python";

From ba7193239912b4dd091586f0df2de4542790fb88 Mon Sep 17 00:00:00 2001
From: Bryan Honof <bryanhonof@gmail.com>
Date: Mon, 28 Jul 2025 16:56:12 +0200
Subject: [PATCH 226/357] python3Packages.gradio: 5.38.0 -> 5.38.2

---
 pkgs/development/python-modules/gradio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix
index faafbae3e653..02fcfec7ce3e 100644
--- a/pkgs/development/python-modules/gradio/default.nix
+++ b/pkgs/development/python-modules/gradio/default.nix
@@ -75,20 +75,20 @@
 
 buildPythonPackage rec {
   pname = "gradio";
-  version = "5.38.0";
+  version = "5.38.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gradio-app";
     repo = "gradio";
     tag = "gradio@${version}";
-    hash = "sha256-NbVRbwqHUSwyG+v+cDKCrVtzjj6ThxGRfO+xjqXOy5I=";
+    hash = "sha256-zKAH/tbF1S+LIi1i+BuKBUWDSI0+Ii5FhsZ3sQaFtto=";
   };
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit pname version src;
     fetcherVersion = 1;
-    hash = "sha256-E6dBajJoKzaJF67KRrSB/LNAyLDmT78mCmTar5G6P6g=";
+    hash = "sha256-sIEsolHffX3cpAJU79w+ndRY4vvmWLxp2efTryv+j38=";
   };
 
   pythonRelaxDeps = [

From 3a5dafdc823c222e3fdad5754024fd7b826ec97f Mon Sep 17 00:00:00 2001
From: Bryan Honof <bryanhonof@gmail.com>
Date: Mon, 28 Jul 2025 17:42:52 +0200
Subject: [PATCH 227/357] oterm: allow newer versions of fastmcp dependency

We package a newer version of fastmcp already, but upstream seems to be limiting
it to 2.9.
---
 pkgs/by-name/ot/oterm/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix
index 60575cd030e0..ff09474e8a53 100644
--- a/pkgs/by-name/ot/oterm/package.nix
+++ b/pkgs/by-name/ot/oterm/package.nix
@@ -29,6 +29,7 @@ python3Packages.buildPythonApplication rec {
     "pydantic"
     "textual"
     "typer"
+    "fastmcp"
   ];
 
   build-system = with python3Packages; [ hatchling ];

From 4b94c42cad95c977d14f930fd03a3c14a6569fec Mon Sep 17 00:00:00 2001
From: Bryan Honof <bryanhonof@gmail.com>
Date: Tue, 29 Jul 2025 01:06:23 +0200
Subject: [PATCH 228/357] mcp-proxy: disable tests that are failing

These started popping up when bumping the python3Packages.mcp version.
---
 pkgs/by-name/mc/mcp-proxy/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/mc/mcp-proxy/package.nix b/pkgs/by-name/mc/mcp-proxy/package.nix
index 7b66f756bfac..cea0fd0bd6fe 100644
--- a/pkgs/by-name/mc/mcp-proxy/package.nix
+++ b/pkgs/by-name/mc/mcp-proxy/package.nix
@@ -28,6 +28,18 @@ python3Packages.buildPythonApplication rec {
     pytest-asyncio
   ];
 
+  disabledTests = [
+    # AssertionError: expected call not found.
+    # Expected: mock(PromptReference(type='ref/prompt', name='name'), CompletionArgument(name='name', value='value'))
+    #   Actual: mock(PromptReference(type='ref/prompt', name='name'), CompletionArgument(name='name', value='value'), None)
+    "test_call_tool[server-AsyncMock]"
+    "test_call_tool[proxy-AsyncMock]"
+    "test_complete[server-AsyncMock]"
+    "test_complete[proxy-AsyncMock]"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "MCP server which proxies other MCP servers from stdio to SSE or from SSE to stdio";
     homepage = "https://github.com/sparfenyuk/mcp-proxy";

From 231f9dfbe0d55311a13b9adc0c7c7120cdd5cd53 Mon Sep 17 00:00:00 2001
From: Bryan Honof <bryanhonof@gmail.com>
Date: Tue, 29 Jul 2025 01:52:38 +0200
Subject: [PATCH 229/357] python3Packages.smolagents: disable failing tests

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

diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix
index 1a1d4f3e90e2..ad177f998e12 100644
--- a/pkgs/development/python-modules/smolagents/default.nix
+++ b/pkgs/development/python-modules/smolagents/default.nix
@@ -141,6 +141,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "smolagents" ];
 
+  disabledTestPaths = [
+    # ImportError: cannot import name 'require_soundfile' from 'transformers.testing_utils'
+    "tests/test_types.py"
+  ];
+
   disabledTests = [
     # Missing dependencies
     "test_cleanup"

From 7f41f985d980dbd9bed0b57de67eb3885bcc77a4 Mon Sep 17 00:00:00 2001
From: Bryan Honof <bryanhonof@gmail.com>
Date: Thu, 31 Jul 2025 23:47:52 +0200
Subject: [PATCH 230/357] home-assistant: ignore Pydantic deprecation warnigns
 for mcp package

We bumped the python3Packages.mcp package, and were able to remove this set of
flags due to the Pydantic library also being updated. However, since
home-assistant still seems to be using 1.5.0, and overriding it here, these
flags are still needed in this particular case.
---
 pkgs/servers/home-assistant/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 07f5c52d45f7..6d91fdd0b4ae 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -147,6 +147,10 @@ let
           tag = "v${version}";
           hash = "sha256-Z2NN6k4mD6NixDON1MUOELpBZW9JvMvFErcCbFPdg2o=";
         };
+        pytestFlagsArray = [
+          "-W"
+          "ignore::pydantic.warnings.PydanticDeprecatedSince211"
+        ];
       });
 
       notifications-android-tv = super.notifications-android-tv.overridePythonAttrs (oldAttrs: rec {

From 41eeee21d988396502c6ef2a1a08e3466fd6f4b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 13:54:07 +0000
Subject: [PATCH 231/357] gh-poi: 0.14.0 -> 0.14.1

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

diff --git a/pkgs/by-name/gh/gh-poi/package.nix b/pkgs/by-name/gh/gh-poi/package.nix
index fc6a58b1ed8e..66484945f01d 100644
--- a/pkgs/by-name/gh/gh-poi/package.nix
+++ b/pkgs/by-name/gh/gh-poi/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "gh-poi";
-  version = "0.14.0";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "seachicken";
     repo = "gh-poi";
     rev = "v${version}";
-    hash = "sha256-bbmNzxGRg7nKfB8xu90ZkKrhWwY24G6h8TW07f9IpTY=";
+    hash = "sha256-HwFmSeDPpX1zbJh+0laekphmpnAsEdFBhgoLfT7CCYY=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
   vendorHash = "sha256-ciOJpVqSPJJLX/sqrztqB3YSoMUrEnn52gGddE80rV0=";
 
   # Skip checks because some of test suites require fixture.
-  # See: https://github.com/seachicken/gh-poi/blob/v0.14.0/.github/workflows/contract-test.yml#L28-L29
+  # See: https://github.com/seachicken/gh-poi/blob/v0.14.1/.github/workflows/contract-test.yml#L28-L29
   doCheck = false;
 
   meta = with lib; {

From 499d8b20839fb3fccb8cefd3c982ddf948bc0d7b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 13:54:19 +0000
Subject: [PATCH 232/357] benthos: 4.53.0 -> 4.54.0

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

diff --git a/pkgs/by-name/be/benthos/package.nix b/pkgs/by-name/be/benthos/package.nix
index a6d44799fd9c..17de945b0754 100644
--- a/pkgs/by-name/be/benthos/package.nix
+++ b/pkgs/by-name/be/benthos/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "benthos";
-  version = "4.53.0";
+  version = "4.54.0";
 
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "benthos";
     tag = "v${version}";
-    hash = "sha256-IcyU7YjAEqQnCDrUNnyBAQmnum8C17zQTbN0YWVyodA=";
+    hash = "sha256-+49Gb+5mPCbeNcnFHckNCyWRvdpOP+xy34bn0I97tWc=";
   };
 
   proxyVendor = true;
@@ -22,7 +22,7 @@ buildGoModule rec {
     "cmd/benthos"
   ];
 
-  vendorHash = "sha256-4Za0meD/cI20rLU79oUdwaKCGBLgQQhkisKUNX/Koow=";
+  vendorHash = "sha256-g1jqVJfpH2EsTYoXMGp0HiUEqKlprgMYqmzecGWKmoo=";
 
   #  doCheck = false;
 

From 03e45e5e453dda459e3e9250b32d61497b0b14ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 14:26:55 +0000
Subject: [PATCH 233/357] croc: 10.2.2 -> 10.2.3

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

diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix
index 442a210c1e9b..6e09e22f33db 100644
--- a/pkgs/by-name/cr/croc/package.nix
+++ b/pkgs/by-name/cr/croc/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "croc";
-  version = "10.2.2";
+  version = "10.2.3";
 
   src = fetchFromGitHub {
     owner = "schollz";
     repo = "croc";
     rev = "v${version}";
-    hash = "sha256-tRWkokgs2SZglkgzK+UxwzbTk99GcPgDBcgJkMURNJ8=";
+    hash = "sha256-PuU60Ybiz/6ajJ67lntyq3e3ZPuxNKmM5iCPTRkldrs=";
   };
 
-  vendorHash = "sha256-oyLjCORfx3Pf8T1EQqM9XBrmQyMSDHy2X2axh1L79PQ=";
+  vendorHash = "sha256-bFn2C5py2STLz8YBlnyK2XDBlgoBnXujeBizN9cDTI0=";
 
   subPackages = [ "." ];
 

From 24e7bdb2cb046027c13ceecd909891bdd9de997d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 14:44:01 +0000
Subject: [PATCH 234/357] libretro.beetle-pce-fast: 0-unstable-2025-07-18 ->
 0-unstable-2025-08-01

---
 .../emulators/libretro/cores/beetle-pce-fast.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
index 25e53ba1f3de..d39d929f85df 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-pce-fast";
-  version = "0-unstable-2025-07-18";
+  version = "0-unstable-2025-08-01";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-pce-fast-libretro";
-    rev = "71675959c7df0f4235a90e6eeb271bf7c1bde019";
-    hash = "sha256-4pHPNRc34IEj+4YkKsXuUWK5yZri3+AJasn0aSOpfYY=";
+    rev = "c95e401e1dd37522b6d84d0017702cfece2be840";
+    hash = "sha256-xCjavWWWyNTnJyzCr+N2l3On2iflg+HzXCxOxLZvSew=";
   };
 
   makefile = "Makefile";

From acad8eaa083f51dd7620ce0422bc90c760c85db7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 14:54:02 +0000
Subject: [PATCH 235/357] gost: 3.1.0 -> 3.2.0

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

diff --git a/pkgs/by-name/go/gost/package.nix b/pkgs/by-name/go/gost/package.nix
index 8fba34d55f27..d3d5cd33fed8 100644
--- a/pkgs/by-name/go/gost/package.nix
+++ b/pkgs/by-name/go/gost/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gost";
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "go-gost";
     repo = "gost";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4ZfGxhXespaZNspvbwZ/Yz2ncqtY3wxJPQsqVILayao=";
+    hash = "sha256-pdDCBknAXHIFD7vNkinsoq7Uec6g3VJsNNoE1lvKkW4=";
   };
 
-  vendorHash = "sha256-lWuLvYF9Sl+k8VnsujvRmj7xb9zst+g//Gkg7VwtWkg=";
+  vendorHash = "sha256-6oRw2tCiQFExWhF1l+vvbL1uoJNx+rzPz+LX2J5r4no=";
 
   # Based on ldflags in upstream's .goreleaser.yaml
   ldflags = [

From 9dd8c36e7676a57d6d8082979cb76169835d8f3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 15:45:19 +0000
Subject: [PATCH 236/357] python3Packages.netbox-dns: 1.3.4 -> 1.3.5

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

diff --git a/pkgs/development/python-modules/netbox-dns/default.nix b/pkgs/development/python-modules/netbox-dns/default.nix
index b1bc4e20da25..802c03563237 100644
--- a/pkgs/development/python-modules/netbox-dns/default.nix
+++ b/pkgs/development/python-modules/netbox-dns/default.nix
@@ -7,14 +7,14 @@
 }:
 buildPythonPackage rec {
   pname = "netbox-plugin-dns";
-  version = "1.3.4";
+  version = "1.3.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "peteeckel";
     repo = "netbox-plugin-dns";
     tag = version;
-    hash = "sha256-Tk+Kzcve7jtJ8UyKdNUoNzct8AxOkZ84g/eg/vX1FEc=";
+    hash = "sha256-7Ej+YDpV/irXUujDsgNnhpFdKduT/ALXvjQjyb9PLOA=";
   };
 
   build-system = [ setuptools ];

From fd9c7557a9016d6efe021761b0362503c3a942df Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 2 Aug 2025 11:42:13 -0400
Subject: [PATCH 237/357] open-policy-agent: disable flaky test

This was first observed in https://github.com/NixOS/nixpkgs/pull/415552#issuecomment-2980863449.

Since this test failed for me 3 of 4 times on Linux (2/2 on GitHub Actions, 1/2 on OfBorg),
probably better to disable it.
---
 pkgs/by-name/op/open-policy-agent/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index 51aee9311bcf..6138c0e579f3 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -53,6 +53,9 @@ buildGoModule (finalAttrs: {
         # This test depends on the metrics available in go not changing. This is a bit
         # too unstable for us updating go independently.
         "TestJSONSerialization"
+
+        # Flaky
+        "TestGraphQLParseSchemaAlloc"
       ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         # Skip tests that require network, not available in the darwin sandbox

From 3971b95deaefe595d76149ae0c301d51ee760126 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 16:02:13 +0000
Subject: [PATCH 238/357] sqldef: 2.0.6 -> 2.0.7

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

diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix
index ea8a1029497a..55a8c3a538e4 100644
--- a/pkgs/by-name/sq/sqldef/package.nix
+++ b/pkgs/by-name/sq/sqldef/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "sqldef";
-  version = "2.0.6";
+  version = "2.0.7";
 
   src = fetchFromGitHub {
     owner = "sqldef";
     repo = "sqldef";
     rev = "v${version}";
-    hash = "sha256-vlUrg/mCviFwlNT47o/5wUfl1oFFd6s8Q/Xdpn048Sk=";
+    hash = "sha256-E/C2BBys5I5mC+tWgHhMNVH2ftvkzUqlrG3vJ3D7Lzg=";
   };
 
   proxyVendor = true;

From c13aeeb498c0fc50112e37bbd4ede81a24452ac2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 16:06:30 +0000
Subject: [PATCH 239/357] ipxe: 1.21.1-unstable-2025-07-24 ->
 1.21.1-unstable-2025-07-30

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

diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix
index a4a8347d6bd7..0e17b4112041 100644
--- a/pkgs/by-name/ip/ipxe/package.nix
+++ b/pkgs/by-name/ip/ipxe/package.nix
@@ -48,7 +48,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ipxe";
-  version = "1.21.1-unstable-2025-07-24";
+  version = "1.21.1-unstable-2025-07-30";
 
   nativeBuildInputs = [
     mtools
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ipxe";
     repo = "ipxe";
-    rev = "e3a6e9230c4e513e6a529427d71a714849b6f788";
-    hash = "sha256-/09YxHQGbSdiLwhxOIWh2lPPabTL9QQsOUYpo8zp2f0=";
+    rev = "f7a1e9ef8e1dc22ebded786507b872a45e3fb05d";
+    hash = "sha256-dNnZH6ENxx3K2lAIE0B8mLjOo05D/TBguarrGrxXozc=";
   };
 
   # Calling syslinux on a FAT image isn't going to work on Aarch64.

From 4f9cca05bffec743e2b4237bc90fd03eda495ca0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 16:20:19 +0000
Subject: [PATCH 240/357] terraform-providers.linode: 3.1.0 -> 3.1.1

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index fd5a20139ff9..0d0909e0e485 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -768,13 +768,13 @@
     "vendorHash": "sha256-fP6brpY/wRI1Yjgapzi+FfOci65gxWeOZulXbGdilrE="
   },
   "linode": {
-    "hash": "sha256-rpF/R2wYYwMp+p57NUXFuEw9UpjJUoGFqTbnuGi3j7E=",
+    "hash": "sha256-zqMknrd8W49RijEVn1TlsV3PT1KGmtdAZUE+Gj8AI5g=",
     "homepage": "https://registry.terraform.io/providers/linode/linode",
     "owner": "linode",
     "repo": "terraform-provider-linode",
-    "rev": "v3.1.0",
+    "rev": "v3.1.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-n+CNvbY02Z9mYSrnm3qfP6hLXqD+If00mM7m0Aq8608="
+    "vendorHash": "sha256-ormU5oDUFb0FQK2L6NDGD/GRy4XXuoFTnq6VKSDVtSw="
   },
   "linuxbox": {
     "hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=",

From 78f835d4092d2a20f556c44387029120203d3415 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 16:57:32 +0000
Subject: [PATCH 241/357] cnquery: 11.64.0 -> 11.65.0

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

diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix
index d3bfd3942ef2..4df078c1b353 100644
--- a/pkgs/by-name/cn/cnquery/package.nix
+++ b/pkgs/by-name/cn/cnquery/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "cnquery";
-  version = "11.64.0";
+  version = "11.65.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnquery";
     tag = "v${version}";
-    hash = "sha256-olfkzuAgXjlxDQCaLqnu6V9tenFjBBYvIzxuo2phtns=";
+    hash = "sha256-M2bx4wgVM79iXhtZDFvcOfifwbLCTQ0knTI3FAOzj3M=";
   };
 
   subPackages = [ "apps/cnquery" ];

From 4553f7d9cbdb52624c28f1dbcc067bcf57734421 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 17:30:05 +0000
Subject: [PATCH 242/357] python3Packages.pynetdicom: 3.0.3 -> 3.0.4

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

diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix
index 93666e9c17da..5d5042a8ee32 100644
--- a/pkgs/development/python-modules/pynetdicom/default.nix
+++ b/pkgs/development/python-modules/pynetdicom/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pynetdicom";
-  version = "3.0.3";
+  version = "3.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydicom";
     repo = "pynetdicom";
     tag = "v${version}";
-    hash = "sha256-CiCP5H0RVbbeNQKO/GpP/hZ6nBE5Q9Wp+/b/wHehIpA=";
+    hash = "sha256-4LISckHH+fVBmPcBr8rM62E6r3IkKAgdUneVHyc5Vm8=";
   };
 
   build-system = [ flit-core ];

From 013f5cd9a74efdfe7404acaacff1bc3e6dc51202 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 17:57:15 +0000
Subject: [PATCH 243/357] openfga: 1.9.0 -> 1.9.2

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

diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix
index 3786a8441db9..1c19901db8f1 100644
--- a/pkgs/by-name/op/openfga/package.nix
+++ b/pkgs/by-name/op/openfga/package.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "openfga";
-  version = "1.9.0";
+  version = "1.9.2";
 in
 
 buildGoModule {
@@ -17,10 +17,10 @@ buildGoModule {
     owner = "openfga";
     repo = "openfga";
     rev = "v${version}";
-    hash = "sha256-tP9AENm23WSTLovcznhtFHMbtDY90YnvsyH1WPTefbY=";
+    hash = "sha256-jddtLyAvvY+I/vpXA7e40efxUfL4AjcEGwUiq1jccDg=";
   };
 
-  vendorHash = "sha256-WWF+LzWn4sDMq0ATHPHr+qR1UVtoFE9Nu/2JUOQoi1o=";
+  vendorHash = "sha256-pDMf792e4U9s/ugQ2jto4HbtFEh3nXHTK71Hb5XnHB4=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From bcecce6372ea64d5b5a1653225ebde12b582f5ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theo1.bori@epitech.eu>
Date: Fri, 1 Aug 2025 16:18:43 +0200
Subject: [PATCH 244/357] python3Packages.certbot-nginx: init at 4.0.0

---
 .../python-modules/certbot-nginx/default.nix  | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/certbot-nginx/default.nix

diff --git a/pkgs/development/python-modules/certbot-nginx/default.nix b/pkgs/development/python-modules/certbot-nginx/default.nix
new file mode 100644
index 000000000000..9d9a5735657d
--- /dev/null
+++ b/pkgs/development/python-modules/certbot-nginx/default.nix
@@ -0,0 +1,37 @@
+{
+  buildPythonPackage,
+  acme,
+  certbot,
+  pyparsing,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "certbot-nginx";
+  pyproject = true;
+
+  inherit (certbot) src version;
+  disabled = pythonOlder "3.9";
+
+  sourceRoot = "${src.name}/certbot-nginx";
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    acme
+    certbot
+    pyparsing
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pytestFlags = [
+    "-pno:cacheprovider"
+  ];
+
+  meta = certbot.meta // {
+    description = "Nginx plugin for Certbot";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f4de0910ec4..92064b5a648e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7799,6 +7799,7 @@ with pkgs;
       certbot-dns-ovh
       certbot-dns-rfc2136
       certbot-dns-route53
+      certbot-nginx
     ]
   );
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e159aab5557c..214a50095d0f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2396,6 +2396,8 @@ self: super: with self; {
 
   certbot-dns-route53 = callPackage ../development/python-modules/certbot-dns-route53 { };
 
+  certbot-nginx = callPackage ../development/python-modules/certbot-nginx { };
+
   certifi = callPackage ../development/python-modules/certifi { };
 
   certipy = callPackage ../development/python-modules/certipy { };

From 41698ced6cef1907110a641a8d14bda6b446f9f0 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Fri, 1 Aug 2025 20:41:14 +0100
Subject: [PATCH 245/357] moonlight: 1.3.24 -> 1.3.25

Diff: https://github.com/moonlight-mod/moonlight/compare/refs/tags/v1.3.24...refs/tags/v1.3.25

Changelog: https://raw.githubusercontent.com/moonlight-mod/moonlight/refs/tags/v1.3.25/CHANGELOG.md
---
 pkgs/by-name/mo/moonlight/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index a33f4c6d1a84..b22688a1d1de 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "1.3.24";
+  version = "1.3.25";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qyKn4qHEpGqis82ALjsog0iH6nM8HKMl4y1KLazXT7I=";
+    hash = "sha256-raqn8TVqD/VFgPw6kiv69JoBmUUVp9Ltj9n2EeEg85U=";
   };
 
   nativeBuildInputs = [
@@ -27,8 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
 
     buildInputs = [ nodejs_22 ];
 
-    fetcherVersion = 1;
-    hash = "sha256-Ij2jc5K0WpIIeI/iKXAdU+fxyqkWpkCuQSNqHvhkQS8=";
+    fetcherVersion = 2;
+    hash = "sha256-KZOAbU6IBytkZzwB8jbSwmlkM69uhjNUEKmIu5/DySI=";
   };
 
   env = {

From 26dfe40e9378dd1939a037c9c19f53992fb4393f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 18:08:00 +0000
Subject: [PATCH 246/357] goverter: 1.9.0 -> 1.9.1

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

diff --git a/pkgs/by-name/go/goverter/package.nix b/pkgs/by-name/go/goverter/package.nix
index 9c0923b215b1..bcebefe6f02d 100644
--- a/pkgs/by-name/go/goverter/package.nix
+++ b/pkgs/by-name/go/goverter/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
   pname = "goverter";
-  version = "1.9.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "jmattheis";
     repo = "goverter";
     tag = "v${version}";
-    hash = "sha256-8USfEIwGXJN62iN9+1WSRKiKoki22a1r50ZBKs6wHfg=";
+    hash = "sha256-7uzkSI6ZqkCu+rhC2KMHU2i0geedy6gOKiLZwsFDExM=";
   };
 
-  vendorHash = "sha256-YOtcidMhtQqw/KxY1R3L3XnrhayGQBvHkRdbvYyCQFM=";
+  vendorHash = "sha256-wStuQhxrzd+LyHQi+k6ez6JT1xzZcPjJa09WqX70bys=";
 
   subPackages = [ "cmd/goverter" ];
 

From aaef3fe5a81e484da6d7cc22a222626c7e8a1cae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 18:17:57 +0000
Subject: [PATCH 247/357] python3Packages.inform: 1.34 -> 1.35

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

diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix
index 466efab6c4ea..cebf54bbf486 100644
--- a/pkgs/development/python-modules/inform/default.nix
+++ b/pkgs/development/python-modules/inform/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "inform";
-  version = "1.34";
+  version = "1.35";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "KenKundert";
     repo = "inform";
     tag = "v${version}";
-    hash = "sha256-s4aaCCRwAUL/rISLNEEYfbXnNTS7MeQ1DfjRK1EPk6U=";
+    hash = "sha256-FQc8R4MJ5RKJi70ADboy2Lw6IwLaI3hup60GcnPxV60=";
   };
 
   nativeBuildInputs = [ flit-core ];

From 97ec891580b7e038b8982f36bf1c201a84b9565e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 19:14:28 +0000
Subject: [PATCH 248/357] cura-appimage: 5.10.1 -> 5.10.2

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

diff --git a/pkgs/by-name/cu/cura-appimage/package.nix b/pkgs/by-name/cu/cura-appimage/package.nix
index 43ffd4aa2403..8034c1065e79 100644
--- a/pkgs/by-name/cu/cura-appimage/package.nix
+++ b/pkgs/by-name/cu/cura-appimage/package.nix
@@ -13,7 +13,7 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cura-appimage";
-  version = "5.10.1";
+  version = "5.10.2";
 
   # Give some good names so the intermediate packages are easy
   # to recognise by name in the Nix store.
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-X64.AppImage";
-    hash = "sha256-c89GkgfOSY4hriY66GUCgBYiiJJspM9Fg07lne+KXgw=";
+    hash = "sha256-930jrjNdUE0vxuMslQNbkdm2eLAFBSsVFxlTi56a8Xg=";
   };
 
   appimageContents = appimageTools.extract {

From f33e9f43fdb2a85c25baf1f770380fdeb372992f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 19:15:21 +0000
Subject: [PATCH 249/357] terraform-providers.btp: 1.15.0 -> 1.15.1

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index fd5a20139ff9..5838d33d6c05 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -216,11 +216,11 @@
     "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
   },
   "btp": {
-    "hash": "sha256-vXe8nD8x0p3krddfPzEso7KSkO+nPVC1eUP1CYN8WOk=",
+    "hash": "sha256-6Bmu7yJPMPk/3oMjS35GnLi309XcH2pw0D6ppLbk6zo=",
     "homepage": "https://registry.terraform.io/providers/SAP/btp",
     "owner": "SAP",
     "repo": "terraform-provider-btp",
-    "rev": "v1.15.0",
+    "rev": "v1.15.1",
     "spdx": "Apache-2.0",
     "vendorHash": "sha256-r4Q7b7ZzK+ZDXhIabTSgP7HY5Q51Hz5ErnW+nV+ZIqA="
   },

From f337908243faa11f605f95da7c2e1655ae52c6aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 19:53:21 +0000
Subject: [PATCH 250/357] goreleaser: 2.11.1 -> 2.11.2

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

diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix
index 835559b44dbd..ed834abe1a14 100644
--- a/pkgs/by-name/go/goreleaser/package.nix
+++ b/pkgs/by-name/go/goreleaser/package.nix
@@ -10,16 +10,16 @@
 }:
 buildGoModule rec {
   pname = "goreleaser";
-  version = "2.11.1";
+  version = "2.11.2";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = "goreleaser";
     rev = "v${version}";
-    hash = "sha256-WyfGzCYQRrNA8pGifTFVpg1KPcybvLrVrUYiJl1J9SA=";
+    hash = "sha256-rGlkzTIOG7CXivV3gq9TsYo9bVgznF/0Cln2+89175I=";
   };
 
-  vendorHash = "sha256-qr/sqGbUs6az6JCyNSE06EHUUfk4Yk9tz+mbgj7tGdg=";
+  vendorHash = "sha256-A9C0CXfICVU0lXDPA1XP/Tu9Fgq2qStybZR4nMrnIDs=";
 
   ldflags = [
     "-s"

From 3f4350d4afa0eef5d5b4cb3cfbc8e463fee2752a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 20:11:24 +0000
Subject: [PATCH 251/357] python3Packages.fastcore: 1.8.6 -> 1.8.7

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

diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix
index 9d4b9b346e31..920c03bea751 100644
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.8.6";
+  version = "1.8.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "fastai";
     repo = "fastcore";
     tag = version;
-    hash = "sha256-m/22tTIysVFgNWUUWKC/1TV/dkEki8dDACb0XvKayAw=";
+    hash = "sha256-CF6bODkD1ooIWK4AnOXXKOKyu09cQP876BXgoGtGoXk=";
   };
 
   build-system = [ setuptools ];

From b4ef9fea45e55079d4cf351cd3b45c4e7567c81a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 20:26:50 +0000
Subject: [PATCH 252/357] etherpad-lite: 2.3.2 -> 2.4.1

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

diff --git a/pkgs/by-name/et/etherpad-lite/package.nix b/pkgs/by-name/et/etherpad-lite/package.nix
index 0d6e7dbb3e7e..ef45c1dfa441 100644
--- a/pkgs/by-name/et/etherpad-lite/package.nix
+++ b/pkgs/by-name/et/etherpad-lite/package.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "etherpad-lite";
-  version = "2.3.2";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "ether";
     repo = "etherpad-lite";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7PnqMLd6Mh/l3W1kjkb3aVeHrJXyIzU9/Xzm/VHBh38=";
+    hash = "sha256-D5YukbPnf2qN9NimALHfhCJAgNPsTZxoVV4KuPmnSdc=";
   };
 
   patches = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-n7LolizpKng7zzccytYoCwJ7uGQbMagsgYPDuq0mdxU=";
+    hash = "sha256-/o2WaB63lcWbbe8nCwMSYhGr9zra7QPL1Er78vW8Kjw=";
   };
 
   nativeBuildInputs = [

From d4516bd5f5b6f2d6bce198821c11c359867741d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 20:33:25 +0000
Subject: [PATCH 253/357] cloud-nuke: 0.41.0 -> 0.42.0

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

diff --git a/pkgs/by-name/cl/cloud-nuke/package.nix b/pkgs/by-name/cl/cloud-nuke/package.nix
index 1a91586a0d2b..769593eac8b9 100644
--- a/pkgs/by-name/cl/cloud-nuke/package.nix
+++ b/pkgs/by-name/cl/cloud-nuke/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "cloud-nuke";
-  version = "0.41.0";
+  version = "0.42.0";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "cloud-nuke";
     tag = "v${version}";
-    hash = "sha256-OYk43yR4QFIiCOBCro1uy91SI+9fuMZ2m9h1lbz4R8Y=";
+    hash = "sha256-ALeUZs3LHhkWU1ecnzp/rpNhobCw4QLX2Pm6yN0dB40=";
   };
 
-  vendorHash = "sha256-4rMcbCBRZYbSJosS1VMPZ96caxwaKs5CwFGUfv7O40g=";
+  vendorHash = "sha256-TczKygsgAqDzNBJ8MOwCcMShD2Y8/F2awaeqg/OMCxg=";
 
   nativeBuildInputs = [
     makeBinaryWrapper

From 0d4ab9b08cc4697aa0cf06af245ab6d17f9231a9 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 20 Jul 2025 08:19:28 +0200
Subject: [PATCH 254/357] screen: disable tests on loongarch64

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

diff --git a/pkgs/by-name/sc/screen/package.nix b/pkgs/by-name/sc/screen/package.nix
index 930b70a81d96..308c4ef1921f 100644
--- a/pkgs/by-name/sc/screen/package.nix
+++ b/pkgs/by-name/sc/screen/package.nix
@@ -35,8 +35,10 @@ stdenv.mkDerivation rec {
   ];
 
   # The test suite seems to have some glibc malloc hooks that don't exist/link on macOS
-  # With pkgsLLVM: tests/test-winmsgcond.c:53: assertion 'wmc_end(&wmc, pos + 1, &chg) == pos' failed
-  doCheck = !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.useLLVM;
+  # With pkgsLLVM / on loongarch64-linux:
+  #   tests/test-winmsgcond.c:53: assertion 'wmc_end(&wmc, pos + 1, &chg) == pos' failed
+  doCheck =
+    !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.useLLVM && !stdenv.hostPlatform.isLoongArch64;
 
   meta = with lib; {
     homepage = "https://www.gnu.org/software/screen/";

From 3c25cbb0aa935917d0a07f9a73025e9cbe5f7d77 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 20:39:30 +0000
Subject: [PATCH 255/357] cargo-public-api: 0.49.0 -> 0.50.1

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

diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix
index 47ce0d270a10..499ac2a562ec 100644
--- a/pkgs/by-name/ca/cargo-public-api/package.nix
+++ b/pkgs/by-name/ca/cargo-public-api/package.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-public-api";
-  version = "0.49.0";
+  version = "0.50.1";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-OUWTRnV1cH+a0LtYau5v4kt+1Br8Yn8RPMIPlGNcvHc=";
+    hash = "sha256-npSZT8ivdG1e+8mcRKlFHgjjwgLPOOGRqLHsPcu4vu0=";
   };
 
-  cargoHash = "sha256-UPtD5udR/avho3Sw3dyRjNGS5UmdwWWJJHkdSY92g8s=";
+  cargoHash = "sha256-VHZsUWyUEGMVOJkAuIRGVmej4KdAtAiTjagAvv+k/Os=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 1c1083100bd2c8d58237f100575aa6ddef8834d3 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Wed, 30 Jul 2025 17:29:44 -0700
Subject: [PATCH 256/357] ryujinx: remove

---
 pkgs/by-name/ry/ryujinx/deps.json   | 1007 ---------------------------
 pkgs/by-name/ry/ryujinx/package.nix |  129 ----
 pkgs/top-level/aliases.nix          |    1 +
 3 files changed, 1 insertion(+), 1136 deletions(-)
 delete mode 100644 pkgs/by-name/ry/ryujinx/deps.json
 delete mode 100644 pkgs/by-name/ry/ryujinx/package.nix

diff --git a/pkgs/by-name/ry/ryujinx/deps.json b/pkgs/by-name/ry/ryujinx/deps.json
deleted file mode 100644
index 9f4427172843..000000000000
--- a/pkgs/by-name/ry/ryujinx/deps.json
+++ /dev/null
@@ -1,1007 +0,0 @@
-[
-  {
-    "pname": "Avalonia",
-    "version": "11.0.10",
-    "hash": "sha256-FuGl5admJ9AeRNrg/faGfqx8pwxGxdkmbnth9Jxhelc="
-  },
-  {
-    "pname": "Avalonia.Angle.Windows.Natives",
-    "version": "2.1.0.2023020321",
-    "hash": "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="
-  },
-  {
-    "pname": "Avalonia.BuildServices",
-    "version": "0.0.29",
-    "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="
-  },
-  {
-    "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.0.10",
-    "hash": "sha256-G0ooIjNRW5YHKvQ6qPxe5gaE3HPwGfiCQUo34PSxXGg="
-  },
-  {
-    "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.0.4",
-    "hash": "sha256-Jp0j/58RF9Qooc7ATtq80FtX3TVLhi54JfgrbKdiDes="
-  },
-  {
-    "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.0.10",
-    "hash": "sha256-0v4evkV0jbLffwfQG/QO/RQbHXlCBmFv8A2pBZjS5Y0="
-  },
-  {
-    "pname": "Avalonia.Controls.ItemsRepeater",
-    "version": "11.0.4",
-    "hash": "sha256-P8MfWKkDQrsk6x/vraNxxdYSMHytS8U3fMY2o8b49dw="
-  },
-  {
-    "pname": "Avalonia.Desktop",
-    "version": "11.0.10",
-    "hash": "sha256-fIty7TfiTC+OX9gCH4tA8Fs9dF4+G7Mhs9XnZadUR2g="
-  },
-  {
-    "pname": "Avalonia.Diagnostics",
-    "version": "11.0.10",
-    "hash": "sha256-itnN+LIZ2S+1CjD0ZS/woKtpgWbC/srMYzbYfX3a8LA="
-  },
-  {
-    "pname": "Avalonia.FreeDesktop",
-    "version": "11.0.10",
-    "hash": "sha256-uVNOOVTQIqQ2pDgSsz5saI7+fMvps40vJlMp1/XdyaE="
-  },
-  {
-    "pname": "Avalonia.Markup.Xaml.Loader",
-    "version": "11.0.10",
-    "hash": "sha256-Xv6L8U34QEiH6r3SQWLwuVFk9N9REmCUHa9hEbv2m24="
-  },
-  {
-    "pname": "Avalonia.Native",
-    "version": "11.0.10",
-    "hash": "sha256-P9j01FDXDpixo8wBVH3XK0Am6UBhG52HDrzt1ZqD8Ro="
-  },
-  {
-    "pname": "Avalonia.Remote.Protocol",
-    "version": "11.0.10",
-    "hash": "sha256-qtvlczTg2yUZWyyqXkkboB8lK9aYv+STbfDvSKb55Vw="
-  },
-  {
-    "pname": "Avalonia.Remote.Protocol",
-    "version": "11.0.4",
-    "hash": "sha256-13qXDjlWElmwQ0sb00+ny9gOgKuDOHKvALuQB6EZxCQ="
-  },
-  {
-    "pname": "Avalonia.Skia",
-    "version": "11.0.0",
-    "hash": "sha256-A01nrs3Ij1eTo6tPmu7++T1K+Wo/H/9LvpeuOUGbQeU="
-  },
-  {
-    "pname": "Avalonia.Skia",
-    "version": "11.0.10",
-    "hash": "sha256-1SU17j43Fiw4LbEEgqx10zE/iIVPfb8G1JVbfD2RhXA="
-  },
-  {
-    "pname": "Avalonia.Skia",
-    "version": "11.0.4",
-    "hash": "sha256-1XfPTcAaNj1926uYkvo7P62++ds5M2gHvkv1hRzBVfs="
-  },
-  {
-    "pname": "Avalonia.Svg",
-    "version": "11.0.0.18",
-    "hash": "sha256-U4bafxxxFE0tKmKVxguxH+doFrTHlM6DjFP8wz6Xm9U="
-  },
-  {
-    "pname": "Avalonia.Svg.Skia",
-    "version": "11.0.0.18",
-    "hash": "sha256-M4AQkL42efqOSck4Lf7C1naIRjEPMlnxi3OVC8zLJaQ="
-  },
-  {
-    "pname": "Avalonia.Themes.Simple",
-    "version": "11.0.10",
-    "hash": "sha256-54fc2g1yvM7pPRaF062lSjXaQDe2i61xQRM8m81vWm8="
-  },
-  {
-    "pname": "Avalonia.Win32",
-    "version": "11.0.10",
-    "hash": "sha256-+o228ElrBJBxBkZKGbo3x8/52wKpnAk/x6Yon5pyA74="
-  },
-  {
-    "pname": "Avalonia.X11",
-    "version": "11.0.10",
-    "hash": "sha256-/CRivMxpcbW1FnIuwZbF2ucdcbn4TCyjKzLXgdGtCfQ="
-  },
-  {
-    "pname": "CommandLineParser",
-    "version": "2.9.1",
-    "hash": "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="
-  },
-  {
-    "pname": "Concentus",
-    "version": "2.2.0",
-    "hash": "sha256-7wbB76WoTd2CISIODGhmEiPIrydI0dqDMZGf4gdkogM="
-  },
-  {
-    "pname": "DiscordRichPresence",
-    "version": "1.2.1.24",
-    "hash": "sha256-oRNrlF1/yK0QvrW2+48RsmSg9h9/pDIfA56/bpoHXFU="
-  },
-  {
-    "pname": "DynamicData",
-    "version": "9.0.4",
-    "hash": "sha256-3pyiJeWRwfaT7p1ArsoR13aI78Jo13aHOEw3BelTS9g="
-  },
-  {
-    "pname": "ExCSS",
-    "version": "4.2.3",
-    "hash": "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I="
-  },
-  {
-    "pname": "FluentAvaloniaUI",
-    "version": "2.0.5",
-    "hash": "sha256-EaJ6qR2yn+7p8lf62yx2vL3sGhnPOfbP5jBjR+pGY7o="
-  },
-  {
-    "pname": "FSharp.Core",
-    "version": "7.0.200",
-    "hash": "sha256-680VgvYbZbztPQosO17r5y8vxg/Y/4Vmr5K3iLIJKMo="
-  },
-  {
-    "pname": "GtkSharp.Dependencies",
-    "version": "1.1.1",
-    "hash": "sha256-/IpSj5JnUTREfQsdA3XW+eqNhqApTds65DQoNpjl3jk="
-  },
-  {
-    "pname": "HarfBuzzSharp",
-    "version": "2.8.2.3",
-    "hash": "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="
-  },
-  {
-    "pname": "HarfBuzzSharp",
-    "version": "7.3.0",
-    "hash": "sha256-LlPQO/NYgIMWicvLOtWsQzCp512QpIImYDP9/n2rDOc="
-  },
-  {
-    "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "2.8.2.3",
-    "hash": "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="
-  },
-  {
-    "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "7.3.0",
-    "hash": "sha256-AEHjgqX0o+Fob0SeZ6EikGKoEe6rRxess5fVJ31UL0U="
-  },
-  {
-    "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "2.8.2.3",
-    "hash": "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="
-  },
-  {
-    "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "7.3.0",
-    "hash": "sha256-6oFcdKb17UX5wyAUeCCKXGvzkf0w3MNdZOVMvs54tqw="
-  },
-  {
-    "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
-    "version": "2.8.2.3",
-    "hash": "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="
-  },
-  {
-    "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
-    "version": "7.3.0",
-    "hash": "sha256-9VI0xCavuuIIStuQ7ipBfWu5HrAt+Kk/F2j57C1llTU="
-  },
-  {
-    "pname": "HarfBuzzSharp.NativeAssets.Win32",
-    "version": "2.8.2.3",
-    "hash": "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="
-  },
-  {
-    "pname": "HarfBuzzSharp.NativeAssets.Win32",
-    "version": "7.3.0",
-    "hash": "sha256-WnB7l73hneU9Kpbm8S9zEYbZHjFre24vWz0vl8+v28M="
-  },
-  {
-    "pname": "LibHac",
-    "version": "0.19.0",
-    "hash": "sha256-FDEmeGHbX/aCFjFbFk8QwO2rTfFizt9UKb+KFDt23hk="
-  },
-  {
-    "pname": "MicroCom.CodeGenerator.MSBuild",
-    "version": "0.11.0",
-    "hash": "sha256-TsxziX9V8T3qRrEA3o9wY84ocDcUUUBzvARi5QZW23o="
-  },
-  {
-    "pname": "MicroCom.Runtime",
-    "version": "0.11.0",
-    "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
-  },
-  {
-    "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "3.0.0",
-    "hash": "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="
-  },
-  {
-    "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "3.3.4",
-    "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="
-  },
-  {
-    "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "3.8.0",
-    "hash": "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="
-  },
-  {
-    "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "4.9.2",
-    "hash": "sha256-QU/nyiJWpdPQGHBdaOEVc+AghnGHcKBFBX0oyhRZ9CQ="
-  },
-  {
-    "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "3.8.0",
-    "hash": "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="
-  },
-  {
-    "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "4.9.2",
-    "hash": "sha256-j06Q4A9E65075SBXdXVCMRgeLxA63Rv1vxarydmmVAA="
-  },
-  {
-    "pname": "Microsoft.CodeAnalysis.CSharp.Scripting",
-    "version": "3.8.0",
-    "hash": "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="
-  },
-  {
-    "pname": "Microsoft.CodeAnalysis.Scripting.Common",
-    "version": "3.8.0",
-    "hash": "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="
-  },
-  {
-    "pname": "Microsoft.CodeCoverage",
-    "version": "17.9.0",
-    "hash": "sha256-OaGa4+jRPHs+T+p/oekm2Miluqfd2IX8Rt+BmUx8kr4="
-  },
-  {
-    "pname": "Microsoft.CSharp",
-    "version": "4.3.0",
-    "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="
-  },
-  {
-    "pname": "Microsoft.CSharp",
-    "version": "4.7.0",
-    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
-  },
-  {
-    "pname": "Microsoft.DotNet.PlatformAbstractions",
-    "version": "3.1.6",
-    "hash": "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0="
-  },
-  {
-    "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "8.0.0",
-    "hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="
-  },
-  {
-    "pname": "Microsoft.IdentityModel.Abstractions",
-    "version": "8.0.1",
-    "hash": "sha256-zPWUKTCfGm4MWcYPU037NzezsFE1g8tEijjQkw5iooI="
-  },
-  {
-    "pname": "Microsoft.IdentityModel.JsonWebTokens",
-    "version": "8.0.1",
-    "hash": "sha256-Xv9MUnjb66U3xeR9drOcSX5n2DjOCIJZPMNSKjWHo9Y="
-  },
-  {
-    "pname": "Microsoft.IdentityModel.Logging",
-    "version": "8.0.1",
-    "hash": "sha256-FfwrH/2eLT521Kqw+RBIoVfzlTNyYMqlWP3z+T6Wy2Y="
-  },
-  {
-    "pname": "Microsoft.IdentityModel.Tokens",
-    "version": "8.0.1",
-    "hash": "sha256-beVbbVQy874HlXkTKarPTT5/r7XR1NGHA/50ywWp7YA="
-  },
-  {
-    "pname": "Microsoft.IO.RecyclableMemoryStream",
-    "version": "3.0.1",
-    "hash": "sha256-unFg/5EcU/XKJbob4GtQC43Ydgi5VjeBGs7hfhj4EYo="
-  },
-  {
-    "pname": "Microsoft.NET.Test.Sdk",
-    "version": "17.9.0",
-    "hash": "sha256-q/1AJ7eNlk02wvN76qvjl2xBx5iJ+h5ssiE/4akLmtI="
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.1.0",
-    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "2.0.0",
-    "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="
-  },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "2.1.2",
-    "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="
-  },
-  {
-    "pname": "Microsoft.NETCore.Targets",
-    "version": "1.1.0",
-    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
-  },
-  {
-    "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "17.9.0",
-    "hash": "sha256-iiXUFzpvT8OWdzMj9FGJDqanwHx40s1TXVY9l3ii+s0="
-  },
-  {
-    "pname": "Microsoft.TestPlatform.TestHost",
-    "version": "17.9.0",
-    "hash": "sha256-1BZIY1z+C9TROgdTV/tq4zsPy7Q71GQksr/LoMKAzqU="
-  },
-  {
-    "pname": "Microsoft.Win32.Registry",
-    "version": "4.5.0",
-    "hash": "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0="
-  },
-  {
-    "pname": "MsgPack.Cli",
-    "version": "1.0.1",
-    "hash": "sha256-Gf0Ed9XHH4oFpJIkzhg/xhDVpenunSol65qa8IZeYrY="
-  },
-  {
-    "pname": "NetCoreServer",
-    "version": "8.0.7",
-    "hash": "sha256-RUYic8uAgJGdhUCrMJQULKlHB6xvw9H1lnNGU1axNZw="
-  },
-  {
-    "pname": "NETStandard.Library",
-    "version": "2.0.0",
-    "hash": "sha256-Pp7fRylai8JrE1O+9TGfIEJrAOmnWTJRLWE+qJBahK0="
-  },
-  {
-    "pname": "NETStandard.Library",
-    "version": "2.0.3",
-    "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
-  },
-  {
-    "pname": "Newtonsoft.Json",
-    "version": "13.0.1",
-    "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
-  },
-  {
-    "pname": "NUnit",
-    "version": "3.13.3",
-    "hash": "sha256-Zn+sJIF7ieNqu/t2RwJx6WPFb1jl9UuNHidb/Px0v3E="
-  },
-  {
-    "pname": "NUnit3TestAdapter",
-    "version": "4.1.0",
-    "hash": "sha256-nDPiYdTFulqozEJrujr8/cqjG7m15Vkd/Frqem0Jr/w="
-  },
-  {
-    "pname": "OpenTK.Audio.OpenAL",
-    "version": "4.8.2",
-    "hash": "sha256-i5KRiTYTNMB4Y5Qd5xewaYrb9sBbnXMDu2QXbM3RCeU="
-  },
-  {
-    "pname": "OpenTK.Core",
-    "version": "4.8.2",
-    "hash": "sha256-59S4Vj13y8HtZT6RZTwO6ZZbk1GUNDcYx1rMdv5jr4I="
-  },
-  {
-    "pname": "OpenTK.Graphics",
-    "version": "4.8.2",
-    "hash": "sha256-DNpXqtM9Oj6wDGYSF2FD4A4ueWG892Wk6uGWffNspo0="
-  },
-  {
-    "pname": "OpenTK.Mathematics",
-    "version": "4.8.2",
-    "hash": "sha256-TPsts443n6iEajfH2EuYTKtubrWuTLiCrTB1F4FndIo="
-  },
-  {
-    "pname": "OpenTK.redist.glfw",
-    "version": "3.3.8.39",
-    "hash": "sha256-bg8bGfoDDqmZ/efLFVm8l5etQajIVvOcQ/Nv+yKD4Bc="
-  },
-  {
-    "pname": "OpenTK.Windowing.GraphicsLibraryFramework",
-    "version": "4.8.2",
-    "hash": "sha256-a1MGtU+27pBNns55g8mOsxXpZxfEr6M62zLkIkkJTIY="
-  },
-  {
-    "pname": "runtime.any.System.Collections",
-    "version": "4.3.0",
-    "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="
-  },
-  {
-    "pname": "runtime.any.System.Globalization",
-    "version": "4.3.0",
-    "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="
-  },
-  {
-    "pname": "runtime.any.System.IO",
-    "version": "4.3.0",
-    "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="
-  },
-  {
-    "pname": "runtime.any.System.Reflection",
-    "version": "4.3.0",
-    "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="
-  },
-  {
-    "pname": "runtime.any.System.Reflection.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="
-  },
-  {
-    "pname": "runtime.any.System.Reflection.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="
-  },
-  {
-    "pname": "runtime.any.System.Resources.ResourceManager",
-    "version": "4.3.0",
-    "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="
-  },
-  {
-    "pname": "runtime.any.System.Runtime",
-    "version": "4.3.0",
-    "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
-  },
-  {
-    "pname": "runtime.any.System.Runtime.Handles",
-    "version": "4.3.0",
-    "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="
-  },
-  {
-    "pname": "runtime.any.System.Runtime.InteropServices",
-    "version": "4.3.0",
-    "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="
-  },
-  {
-    "pname": "runtime.any.System.Text.Encoding",
-    "version": "4.3.0",
-    "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
-  },
-  {
-    "pname": "runtime.any.System.Threading.Tasks",
-    "version": "4.3.0",
-    "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="
-  },
-  {
-    "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
-  },
-  {
-    "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
-  },
-  {
-    "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
-  },
-  {
-    "pname": "runtime.native.System",
-    "version": "4.3.0",
-    "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
-  },
-  {
-    "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
-  },
-  {
-    "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
-  },
-  {
-    "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
-  },
-  {
-    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
-  },
-  {
-    "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
-  },
-  {
-    "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
-  },
-  {
-    "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
-  },
-  {
-    "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
-    "version": "4.3.0",
-    "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
-  },
-  {
-    "pname": "runtime.unix.System.Diagnostics.Debug",
-    "version": "4.3.0",
-    "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="
-  },
-  {
-    "pname": "runtime.unix.System.Private.Uri",
-    "version": "4.3.0",
-    "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
-  },
-  {
-    "pname": "runtime.unix.System.Runtime.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="
-  },
-  {
-    "pname": "Ryujinx.AtkSharp",
-    "version": "3.24.24.59-ryujinx",
-    "hash": "sha256-mK1zXkd6bdo7YqOm/rcI8MTniugvs5Kjw+esGmHYJxE="
-  },
-  {
-    "pname": "Ryujinx.Audio.OpenAL.Dependencies",
-    "version": "1.21.0.1",
-    "hash": "sha256-NHGzMcYduuYJjduIlf8M8zSQQuJcXAEaMNmKIqAgs3w="
-  },
-  {
-    "pname": "Ryujinx.CairoSharp",
-    "version": "3.24.24.59-ryujinx",
-    "hash": "sha256-+gV4Vlkd0jMZ6yGCz1/KoiE32/O26gHOZiHXmZ292rE="
-  },
-  {
-    "pname": "Ryujinx.GdkSharp",
-    "version": "3.24.24.59-ryujinx",
-    "hash": "sha256-r1UK7YzhMOJ3Z8eWuUyTf0nGQ0Bdlic8Qri170ilEbs="
-  },
-  {
-    "pname": "Ryujinx.GioSharp",
-    "version": "3.24.24.59-ryujinx",
-    "hash": "sha256-sbfdn16UoQtcU9gAgvP2kjBUbYi9nKy09bmhvn9IGtU="
-  },
-  {
-    "pname": "Ryujinx.GLibSharp",
-    "version": "3.24.24.59-ryujinx",
-    "hash": "sha256-zZv0B4BvKuRdse8oqSbb4P6FFq79w4M+MCk8EqqLVWk="
-  },
-  {
-    "pname": "Ryujinx.Graphics.Nvdec.Dependencies",
-    "version": "5.0.3-build14",
-    "hash": "sha256-+ff+tlWggY+qZTBJroOOphRpOjBDg5cQgwGtVOTiqRQ="
-  },
-  {
-    "pname": "Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK",
-    "version": "1.2.0",
-    "hash": "sha256-vdDw6YGoyQzv6ustyXP6v7YWUIKEXaZOyUKAaVbRauI="
-  },
-  {
-    "pname": "Ryujinx.GtkSharp",
-    "version": "3.24.24.59-ryujinx",
-    "hash": "sha256-2duc6+KLuctobfwqeuewxRLZnXn83QomF4rN0hEoMTc="
-  },
-  {
-    "pname": "Ryujinx.PangoSharp",
-    "version": "3.24.24.59-ryujinx",
-    "hash": "sha256-gGAK/aEfTUAxEihjlBOtHlhPZZFAwCasgUB/Umapva0="
-  },
-  {
-    "pname": "Ryujinx.SDL2-CS",
-    "version": "2.30.0-build32",
-    "hash": "sha256-KrrlDq0pXcunnOhJL12dt1CAdNbaupbDlnza5gXuVKE="
-  },
-  {
-    "pname": "securifybv.PropertyStore",
-    "version": "0.1.0",
-    "hash": "sha256-jTPT9E2LyElgJq4HMavkdwT8tA9uklnJv00mlIx66+g="
-  },
-  {
-    "pname": "securifybv.ShellLink",
-    "version": "0.1.0",
-    "hash": "sha256-Am+ZednCVJUDgB7TePyY3CTxKDQ6Lr8M8KiCVAJoouw="
-  },
-  {
-    "pname": "shaderc.net",
-    "version": "0.1.0",
-    "hash": "sha256-+K7ObC9ucilwWY+Tlf9KcrAVoTFS65V6Di7JDWDSZTg="
-  },
-  {
-    "pname": "SharpZipLib",
-    "version": "1.4.2",
-    "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="
-  },
-  {
-    "pname": "ShimSkiaSharp",
-    "version": "1.0.0.18",
-    "hash": "sha256-72NV+OuW8bCfI/EOXwgS6dleLZnomLJTYeQPPmfhuu8="
-  },
-  {
-    "pname": "Silk.NET.Core",
-    "version": "2.21.0",
-    "hash": "sha256-D4ZUCm1Gf/EiRWrSwSLrdXT6U54icY2E/vrvCD/bRHw="
-  },
-  {
-    "pname": "Silk.NET.Vulkan",
-    "version": "2.21.0",
-    "hash": "sha256-Xnxl13+ziJ1+jNxMFSrEuh6NvL1FBrYmJ/d3HQXpgzY="
-  },
-  {
-    "pname": "Silk.NET.Vulkan.Extensions.EXT",
-    "version": "2.21.0",
-    "hash": "sha256-udELG0ppCOP9eT2yl/sI9MgKOVOuK0py9znmoaBGDpk="
-  },
-  {
-    "pname": "Silk.NET.Vulkan.Extensions.KHR",
-    "version": "2.21.0",
-    "hash": "sha256-KyiGHW6CNkXE3EdHk3ufwTVG7oLvSyHwx+MmIJhsiBk="
-  },
-  {
-    "pname": "SkiaSharp",
-    "version": "2.88.3",
-    "hash": "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="
-  },
-  {
-    "pname": "SkiaSharp",
-    "version": "2.88.6",
-    "hash": "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc="
-  },
-  {
-    "pname": "SkiaSharp",
-    "version": "2.88.7",
-    "hash": "sha256-Ip3afwTr4QOqtwOUKqK6g/9Ug4dMSebTci5K29Jc3Dg="
-  },
-  {
-    "pname": "SkiaSharp.HarfBuzz",
-    "version": "2.88.6",
-    "hash": "sha256-gpHiTuHfiXgbkBkzipXb8EXIatefsod75nyrFdPcwcA="
-  },
-  {
-    "pname": "SkiaSharp.NativeAssets.Linux",
-    "version": "2.88.3",
-    "hash": "sha256-eExWAAURgnwwm2fRwsK/rf+TeOAPs2n02XZzC0zeUjU="
-  },
-  {
-    "pname": "SkiaSharp.NativeAssets.Linux",
-    "version": "2.88.7",
-    "hash": "sha256-QdQRN1IBjqohmI8U+6WJRPgOsh8a9soN2UvVObs1H1w="
-  },
-  {
-    "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "2.88.3",
-    "hash": "sha256-8G4swiLMr6XS3kjfO/YC1PyoVdfSq7nxZthZZ+KTKqQ="
-  },
-  {
-    "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "2.88.6",
-    "hash": "sha256-7hOMjlYTOiNPLNwfLFUjTcdgiGEtmYUI1EubiRiC6bo="
-  },
-  {
-    "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "2.88.7",
-    "hash": "sha256-WgPldXSqPMm0TrdUWAyjge5rcRhd9G3/Ix/v/2NQvBc="
-  },
-  {
-    "pname": "SkiaSharp.NativeAssets.WebAssembly",
-    "version": "2.88.3",
-    "hash": "sha256-/SkV2pIZnt0ziSKB7gt7U2Rltk2Id+zOzbmqgfWUtvA="
-  },
-  {
-    "pname": "SkiaSharp.NativeAssets.WebAssembly",
-    "version": "2.88.7",
-    "hash": "sha256-oIjFF+Rv+g8AKyNaaVAgnHX3eeP/l8K2sgHs9bRyUMw="
-  },
-  {
-    "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.3",
-    "hash": "sha256-2PhMTwRHitT13KCKiZltKIFieAvNY4jBmVZ2ndVynA8="
-  },
-  {
-    "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.6",
-    "hash": "sha256-ljD4QmAO2/vwA6I8GIUNkONpOzmGsOVJJy9vPDnjVfA="
-  },
-  {
-    "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.7",
-    "hash": "sha256-+7RxCAr+ne9MZWdXKKpV4ZbHW0k6hLD20ZFWWOCiNYU="
-  },
-  {
-    "pname": "SPB",
-    "version": "0.0.4-build32",
-    "hash": "sha256-GUzbV5rLWtXTpiddYrKnWWLujG38vBDCO4xRStwAaDo="
-  },
-  {
-    "pname": "Svg.Custom",
-    "version": "1.0.0.18",
-    "hash": "sha256-RguRPwBM/KCogaiOgjELlvuqN1Tr+b3HA4Odz1rXBgU="
-  },
-  {
-    "pname": "Svg.Model",
-    "version": "1.0.0.18",
-    "hash": "sha256-CXZC45txfcd8MuRmDENw2ujlGk74YaUPNs7dXq+Zcg8="
-  },
-  {
-    "pname": "Svg.Skia",
-    "version": "1.0.0.18",
-    "hash": "sha256-o5VnCaAGX4LuwNyl7QM0KOg2gNfkD5uNMNthxB7w0m4="
-  },
-  {
-    "pname": "System.Buffers",
-    "version": "4.5.1",
-    "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
-  },
-  {
-    "pname": "System.CodeDom",
-    "version": "4.4.0",
-    "hash": "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0="
-  },
-  {
-    "pname": "System.CodeDom",
-    "version": "8.0.0",
-    "hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338="
-  },
-  {
-    "pname": "System.Collections",
-    "version": "4.3.0",
-    "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
-  },
-  {
-    "pname": "System.Collections.Immutable",
-    "version": "5.0.0",
-    "hash": "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="
-  },
-  {
-    "pname": "System.Collections.Immutable",
-    "version": "8.0.0",
-    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
-  },
-  {
-    "pname": "System.ComponentModel.Annotations",
-    "version": "4.5.0",
-    "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
-  },
-  {
-    "pname": "System.Diagnostics.Debug",
-    "version": "4.3.0",
-    "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
-  },
-  {
-    "pname": "System.Dynamic.Runtime",
-    "version": "4.3.0",
-    "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="
-  },
-  {
-    "pname": "System.Globalization",
-    "version": "4.3.0",
-    "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
-  },
-  {
-    "pname": "System.IO",
-    "version": "4.3.0",
-    "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
-  },
-  {
-    "pname": "System.IO.Hashing",
-    "version": "8.0.0",
-    "hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="
-  },
-  {
-    "pname": "System.IO.Pipelines",
-    "version": "6.0.0",
-    "hash": "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="
-  },
-  {
-    "pname": "System.Linq",
-    "version": "4.3.0",
-    "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
-  },
-  {
-    "pname": "System.Linq.Expressions",
-    "version": "4.3.0",
-    "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
-  },
-  {
-    "pname": "System.Management",
-    "version": "8.0.0",
-    "hash": "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0="
-  },
-  {
-    "pname": "System.Memory",
-    "version": "4.5.4",
-    "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
-  },
-  {
-    "pname": "System.Memory",
-    "version": "4.5.5",
-    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
-  },
-  {
-    "pname": "System.Numerics.Vectors",
-    "version": "4.3.0",
-    "hash": "sha256-eog2Sp8CAntRlyp2Aar1tpAwDrojGFZ5LIdqsmuIchY="
-  },
-  {
-    "pname": "System.Numerics.Vectors",
-    "version": "4.4.0",
-    "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
-  },
-  {
-    "pname": "System.Numerics.Vectors",
-    "version": "4.5.0",
-    "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
-  },
-  {
-    "pname": "System.ObjectModel",
-    "version": "4.3.0",
-    "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
-  },
-  {
-    "pname": "System.Private.Uri",
-    "version": "4.3.0",
-    "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
-  },
-  {
-    "pname": "System.Reactive",
-    "version": "6.0.1",
-    "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
-  },
-  {
-    "pname": "System.Reflection",
-    "version": "4.3.0",
-    "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
-  },
-  {
-    "pname": "System.Reflection.Emit",
-    "version": "4.3.0",
-    "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
-  },
-  {
-    "pname": "System.Reflection.Emit.ILGeneration",
-    "version": "4.3.0",
-    "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
-  },
-  {
-    "pname": "System.Reflection.Emit.Lightweight",
-    "version": "4.3.0",
-    "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
-  },
-  {
-    "pname": "System.Reflection.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
-  },
-  {
-    "pname": "System.Reflection.Metadata",
-    "version": "1.6.0",
-    "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
-  },
-  {
-    "pname": "System.Reflection.Metadata",
-    "version": "5.0.0",
-    "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="
-  },
-  {
-    "pname": "System.Reflection.Metadata",
-    "version": "8.0.0",
-    "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
-  },
-  {
-    "pname": "System.Reflection.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
-  },
-  {
-    "pname": "System.Reflection.TypeExtensions",
-    "version": "4.3.0",
-    "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
-  },
-  {
-    "pname": "System.Resources.ResourceManager",
-    "version": "4.3.0",
-    "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
-  },
-  {
-    "pname": "System.Runtime",
-    "version": "4.3.0",
-    "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.7.1",
-    "hash": "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "5.0.0",
-    "hash": "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="
-  },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "6.0.0",
-    "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
-  },
-  {
-    "pname": "System.Runtime.Extensions",
-    "version": "4.3.0",
-    "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
-  },
-  {
-    "pname": "System.Runtime.Handles",
-    "version": "4.3.0",
-    "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
-  },
-  {
-    "pname": "System.Runtime.InteropServices",
-    "version": "4.3.0",
-    "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
-  },
-  {
-    "pname": "System.Security.AccessControl",
-    "version": "4.5.0",
-    "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="
-  },
-  {
-    "pname": "System.Security.Principal.Windows",
-    "version": "4.5.0",
-    "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="
-  },
-  {
-    "pname": "System.Text.Encoding",
-    "version": "4.3.0",
-    "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
-  },
-  {
-    "pname": "System.Text.Encoding.CodePages",
-    "version": "4.5.1",
-    "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="
-  },
-  {
-    "pname": "System.Text.Encoding.CodePages",
-    "version": "8.0.0",
-    "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="
-  },
-  {
-    "pname": "System.Text.Encodings.Web",
-    "version": "8.0.0",
-    "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="
-  },
-  {
-    "pname": "System.Text.Json",
-    "version": "8.0.0",
-    "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="
-  },
-  {
-    "pname": "System.Threading",
-    "version": "4.3.0",
-    "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
-  },
-  {
-    "pname": "System.Threading.Tasks",
-    "version": "4.3.0",
-    "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
-  },
-  {
-    "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.5.4",
-    "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
-  },
-  {
-    "pname": "Tmds.DBus.Protocol",
-    "version": "0.15.0",
-    "hash": "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="
-  },
-  {
-    "pname": "UnicornEngine.Unicorn",
-    "version": "2.0.2-rc1-fb78016",
-    "hash": "sha256-NrJ4/o4FmCt2zoB1fWAzqdonvpYhTFsWwh3h0lxZg+Q="
-  }
-]
diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix
deleted file mode 100644
index 7c77f2631f8d..000000000000
--- a/pkgs/by-name/ry/ryujinx/package.nix
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-  lib,
-  buildDotnetModule,
-  dotnetCorePackages,
-  fetchzip,
-  libX11,
-  libgdiplus,
-  ffmpeg,
-  openal,
-  libsoundio,
-  sndio,
-  pulseaudio,
-  vulkan-loader,
-  glew,
-  libGL,
-  libICE,
-  libSM,
-  libXcursor,
-  libXext,
-  libXi,
-  libXrandr,
-  udev,
-  SDL2,
-  SDL2_mixer,
-}:
-
-buildDotnetModule rec {
-  pname = "ryujinx";
-  version = "1.1.1401"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
-
-  src = fetchzip {
-    url = "https://archive.org/download/ryujinx-5dbba-07e-33e-83c-9047dcbb-701c-9655edbbe-89086.tar/Ryujinx-5dbba07e33e83c9047dcbb701c9655edbbe89086.tar.gz";
-    hash = "sha256-UeJ3KE5e5H9crqroAxjmxYTf/Z4cbj41a6/1HW2nLcA=";
-  };
-
-  enableParallelBuilding = false;
-
-  dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin;
-  dotnet-runtime = dotnetCorePackages.runtime_8_0;
-
-  nugetDeps = ./deps.json;
-
-  runtimeDeps = [
-    libX11
-    libgdiplus
-    SDL2_mixer
-    openal
-    libsoundio
-    sndio
-    pulseaudio
-    vulkan-loader
-    ffmpeg
-    udev
-
-    # Avalonia UI
-    glew
-    libICE
-    libSM
-    libXcursor
-    libXext
-    libXi
-    libXrandr
-
-    # Headless executable
-    libGL
-    SDL2
-  ];
-
-  projectFile = "Ryujinx.sln";
-  testProjectFile = "src/Ryujinx.Tests/Ryujinx.Tests.csproj";
-  doCheck = true;
-
-  dotnetFlags = [
-    "/p:ExtraDefineConstants=DISABLE_UPDATER%2CFORCE_EXTERNAL_BASE_DIR"
-  ];
-
-  executables = [
-    "Ryujinx.Headless.SDL2"
-    "Ryujinx"
-  ];
-
-  makeWrapperArgs = [
-    # Without this Ryujinx fails to start on wayland. See https://github.com/Ryujinx/Ryujinx/issues/2714
-    "--set SDL_VIDEODRIVER x11"
-  ];
-
-  preInstall = ''
-    # workaround for https://github.com/Ryujinx/Ryujinx/issues/2349
-    mkdir -p $out/lib/sndio-6
-    ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6
-  '';
-
-  preFixup = ''
-    mkdir -p $out/share/{applications,icons/hicolor/scalable/apps,mime/packages}
-    pushd ${src}/distribution/linux
-
-    install -D ./Ryujinx.desktop $out/share/applications/Ryujinx.desktop
-    install -D ./Ryujinx.sh $out/bin/Ryujinx.sh
-    install -D ./mime/Ryujinx.xml $out/share/mime/packages/Ryujinx.xml
-    install -D ../misc/Logo.svg $out/share/icons/hicolor/scalable/apps/Ryujinx.svg
-
-    ln -s $out/bin/Ryujinx $out/bin/ryujinx
-
-    popd
-  '';
-
-  meta = with lib; {
-    homepage = "https://ryujinx.org/";
-    changelog = "https://github.com/Ryujinx/Ryujinx/wiki/Changelog";
-    description = "Experimental Nintendo Switch Emulator written in C#";
-    longDescription = ''
-      Ryujinx is an open-source Nintendo Switch emulator, created by gdkchan,
-      written in C#. This emulator aims at providing excellent accuracy and
-      performance, a user-friendly interface and consistent builds. It was
-      written from scratch and development on the project began in September
-      2017.
-    '';
-    license = licenses.mit;
-    maintainers = with maintainers; [
-      jk
-      artemist
-    ];
-    platforms = [
-      "x86_64-linux"
-      "aarch64-linux"
-    ];
-    mainProgram = "Ryujinx";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eb16c933f6e8..81a3a25adaf6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1788,6 +1788,7 @@ mapAliases {
   rustic-rs = rustic; # Added 2024-08-02
   rxvt_unicode = throw "'rxvt_unicode' has been renamed to/replaced by 'rxvt-unicode-unwrapped'"; # Converted to throw 2024-10-17
   rxvt_unicode-with-plugins = throw "'rxvt_unicode-with-plugins' has been renamed to/replaced by 'rxvt-unicode'"; # Converted to throw 2024-10-17
+  ryujinx = throw "'ryujinx' has been replaced by 'ryubing' as the new upstream"; # Added 2025-07-30
   ryujinx-greemdev = ryubing; # Added 2025-01-20
 
   # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix,

From e693a305fbeeadda005ccb8e18ca50bbd58d4c46 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 2 Aug 2025 15:14:12 -0600
Subject: [PATCH 257/357] mongoose: 3.3.4 -> 3.3.5

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

diff --git a/pkgs/by-name/mo/mongoose/package.nix b/pkgs/by-name/mo/mongoose/package.nix
index d522cda6186d..500a2a135357 100644
--- a/pkgs/by-name/mo/mongoose/package.nix
+++ b/pkgs/by-name/mo/mongoose/package.nix
@@ -8,11 +8,11 @@
 }:
 
 let
-  suitesparseVersion = "7.8.3";
+  suitesparseVersion = "7.11.0";
 in
 stdenv.mkDerivation {
   pname = "mongoose";
-  version = "3.3.4";
+  version = "3.3.5";
 
   outputs = [
     "bin"
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "DrTimothyAldenDavis";
     repo = "SuiteSparse";
-    rev = "v${suitesparseVersion}";
-    hash = "sha256-ai3Xne1ByP2hcM9L236pUyVsVohW6k0BX0DRXPq/jhw=";
+    tag = "v${suitesparseVersion}";
+    hash = "sha256-8CnN2P/W15GpK0nCNoRQongOrzcz5E8l9SgKksqLxd0=";
   };
 
   nativeBuildInputs = [

From 31ad4265427c14d4c1bfb5960338d57435d28ce8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 21:25:13 +0000
Subject: [PATCH 258/357] tpnote: 1.25.12 -> 1.25.14

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

diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index 2a494b093a03..d770c2e190d1 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tpnote";
-  version = "1.25.12";
+  version = "1.25.14";
 
   src = fetchFromGitHub {
     owner = "getreu";
     repo = "tp-note";
     tag = "v${version}";
-    hash = "sha256-rjRZVD0EDRtSiF8kU3VyQJhBJEGDqDsjJgEZkVeC+L0=";
+    hash = "sha256-CgC4aLg1GdqDXzuWfV4i5C4//I3GJ2RJa0y3oFOM0II=";
   };
 
-  cargoHash = "sha256-lUwusYFt7shEt2fTV4N5bn6bYTWDjUU7hY9VsC2bDHo=";
+  cargoHash = "sha256-LF17FrWiqfFaVFbOjm9GiW9AsZmleZL++i8YDyrVZVM=";
 
   nativeBuildInputs = [
     cmake

From 8995cc82e7990a8ca74ced7e9557ec0f75ca71c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Aug 2025 22:40:08 +0000
Subject: [PATCH 259/357] odpic: 5.6.0 -> 5.6.2

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

diff --git a/pkgs/by-name/od/odpic/package.nix b/pkgs/by-name/od/odpic/package.nix
index 1e686036d0f7..921a4e84481c 100644
--- a/pkgs/by-name/od/odpic/package.nix
+++ b/pkgs/by-name/od/odpic/package.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "5.6.0";
+  version = "5.6.2";
   libPath = lib.makeLibraryPath [ oracle-instantclient.lib ];
 
 in
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     owner = "oracle";
     repo = "odpi";
     rev = "v${version}";
-    sha256 = "sha256-kdhL+yvolf7paNBbUN0V/Zp0mwHS2BEhP8bRUwa3dhQ=";
+    sha256 = "sha256-UBLv7iTqwjxDuLc09zxACYQxoU3/AKNPfNOwgMJ2qjw=";
   };
 
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

From e9aa1c19b02838571a37040f000ffb5fb287ffe3 Mon Sep 17 00:00:00 2001
From: Felix Albrigtsen <felix@albrigtsen.it>
Date: Sun, 3 Aug 2025 01:22:15 +0200
Subject: [PATCH 260/357] hashcat: fix build on aarch64

---
 pkgs/by-name/ha/hashcat/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ha/hashcat/package.nix b/pkgs/by-name/ha/hashcat/package.nix
index 06869a15ac5d..ddc90d75be08 100644
--- a/pkgs/by-name/ha/hashcat/package.nix
+++ b/pkgs/by-name/ha/hashcat/package.nix
@@ -61,6 +61,9 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) [
     "IS_APPLE_SILICON='${if stdenv.hostPlatform.isAarch64 then "1" else "0"}'"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    "IS_AARCH64=1"
   ];
 
   enableParallelBuilding = true;

From f3245b67d085b83a796c5c107dfa500b48906ac1 Mon Sep 17 00:00:00 2001
From: Devan Carpenter <git@dvn.me>
Date: Tue, 29 Jul 2025 22:30:07 -0500
Subject: [PATCH 261/357] wahay: init at 0.2

Co-authored-by: Mikael Voss <mvs@nyantec.com>
---
 pkgs/by-name/wa/wahay/package.nix | 98 +++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 pkgs/by-name/wa/wahay/package.nix

diff --git a/pkgs/by-name/wa/wahay/package.nix b/pkgs/by-name/wa/wahay/package.nix
new file mode 100644
index 000000000000..5edf516cf744
--- /dev/null
+++ b/pkgs/by-name/wa/wahay/package.nix
@@ -0,0 +1,98 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  gnumake,
+  pkg-config,
+  gtk3,
+  rubyPackages,
+  tor,
+  mumble,
+  installShellFiles,
+  wrapGAppsHook3,
+  writableTmpDirAsHomeHook,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "wahay";
+  version = "0.2";
+
+  src = fetchFromGitHub {
+    owner = "digitalautonomy";
+    repo = "wahay";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-59gVGDElIs+OQ/ELwOFjz6YqG18iHqoa2yYF2Ddi0/o=";
+  };
+
+  vendorHash = "sha256-w8lUnvy5dPMHWbzyyTq9Q/kE/4vSuOHffaY9CeasvQ0=";
+
+  buildInputs = [
+    gtk3
+  ];
+
+  nativeBuildInputs = [
+    gnumake
+    pkg-config
+    rubyPackages.sass
+    installShellFiles
+    wrapGAppsHook3
+  ];
+
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+  ];
+
+  postPatch = ''
+    # Avoid Git invocation: Remove assignments starting with ‘$(shell git’
+    sed -E -i \
+      -e '/^\w+\s*[+:]?=\s*\$\(shell\s+git\>/d' \
+      Makefile
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    make TAG_VERSION=v${finalAttrs.version} \
+         BUILD_TIMESTAMP="$(date -u -d "@$SOURCE_DATE_EPOCH" '+%Y-%m-%d %H:%M:%S')" \
+         build
+    runHook postBuild
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    make test
+    runHook postCheck
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    installBin bin/wahay
+    installManPage packaging/ubuntu/ubuntu/usr/share/man/man1/wahay.1.gz
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PATH : ${
+        lib.escapeShellArg (
+          lib.makeBinPath [
+            tor
+            mumble
+          ]
+        )
+      }
+    )
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    broken = stdenv.hostPlatform.isDarwin;
+    description = "Decentralized encrypted conference call application";
+    homepage = "https://wahay.org/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dvn0 ];
+    mainProgram = "wahay";
+  };
+})

From bbc8067bcf93029fe1a9bb4cee7c66c8749a9957 Mon Sep 17 00:00:00 2001
From: Joyuv <givanilsonmariz7@outlook.com>
Date: Sat, 2 Aug 2025 21:13:21 -0300
Subject: [PATCH 262/357] fallout2-ce: fix patch hash

---
 pkgs/games/fallout-ce/fallout2-ce.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/fallout-ce/fallout2-ce.nix b/pkgs/games/fallout-ce/fallout2-ce.nix
index a1b4f28b1971..396ffb1394dc 100644
--- a/pkgs/games/fallout-ce/fallout2-ce.nix
+++ b/pkgs/games/fallout-ce/fallout2-ce.nix
@@ -20,7 +20,7 @@ callPackage ./build.nix rec {
     # Fix case-sensitive filesystems issue when save/load games
     (fetchpatch2 {
       url = "https://github.com/alexbatalov/fallout2-ce/commit/d843a662b3ceaf01ac363e9abb4bfceb8b805c36.patch";
-      sha256 = "sha256-u4E9+DE6sGYikIGwKDmSBj3ErCfIo6YzIw2eMiqXw/E=";
+      sha256 = "sha256-r4sfl1JolWRNd2xcf4BMCxZw3tbN21UJW4TdyIbQzgs=";
     })
   ];
 

From c050df7e05db8914be3a2a235d1a1b30f6c262cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 00:31:38 +0000
Subject: [PATCH 263/357] spiffe-helper: 0.10.0 -> 0.10.1

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

diff --git a/pkgs/by-name/sp/spiffe-helper/package.nix b/pkgs/by-name/sp/spiffe-helper/package.nix
index 396566145f57..df54bd74a6ab 100644
--- a/pkgs/by-name/sp/spiffe-helper/package.nix
+++ b/pkgs/by-name/sp/spiffe-helper/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "spiffe-helper";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "spiffe";
     repo = "spiffe-helper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nakwTJBE8ICuRCmG+pjh1gZVFIXSOgsxTDjEeBrwufE=";
+    hash = "sha256-rP0qXSut+9m8wCzByO0CO6IobC1lphK/3Y1OhPgiAOw=";
   };
 
   vendorHash = "sha256-sAcmJNry3nuWyzt0Ee05JjROR/pDXxu2NVmltotSD0U=";

From efa5e82dbb1fa4e56080c6a849f8981170ffdd34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 00:34:54 +0000
Subject: [PATCH 264/357] unimap: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/by-name/un/unimap/package.nix b/pkgs/by-name/un/unimap/package.nix
index dee904396f8c..8776c65270ee 100644
--- a/pkgs/by-name/un/unimap/package.nix
+++ b/pkgs/by-name/un/unimap/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "unimap";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "Edu4rdSHL";
     repo = "unimap";
     rev = version;
-    hash = "sha256-7UbzE5VXycjo7KNpPe2oqwyZDT4Vk8rQZ6HXT1q9Cw4=";
+    hash = "sha256-QQZNeZUB6aHnYz7B7uqL8I9gkk4JvQJ4TD9NxECd6JA=";
   };
 
-  cargoHash = "sha256-ShwFHLfDPc3P8J5gV5CFz/2vrQ5xR01C3sYIejyt860=";
+  cargoHash = "sha256-1haSdmhK14XvKunSbj9jPTuHJK5tWdzdFAqxhg2TI0s=";
 
   nativeBuildInputs = [
     installShellFiles

From 8dfd1d60bdf8ac4a9a59fd95edf76a2e15542853 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 00:51:22 +0000
Subject: [PATCH 265/357] cdncheck: 1.1.29 -> 1.1.30

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

diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index 3440b4d40554..55989c4848a0 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "cdncheck";
-  version = "1.1.29";
+  version = "1.1.30";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${version}";
-    hash = "sha256-+R6IRMdkLVJ6rtkCQUMDc5scNWlv0rMa0urHhfiEwro=";
+    hash = "sha256-DA68sGa1CbWfNjmRjzh+/NpMPUIxe8HCj2QjzFjDXz4=";
   };
 
   vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";

From 0f56042556eef90c0ffcde1a36974d2a7085bd98 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 14 Jul 2025 14:51:39 +0200
Subject: [PATCH 266/357] inspircd: 3.18.0 -> 4.7.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://docs.inspircd.org/4/breaking-changes/
https://docs.inspircd.org/4/overview/

https://docs.inspircd.org/4/change-log/#inspircd-401
https://docs.inspircd.org/4/change-log/#inspircd-410
https://docs.inspircd.org/4/change-log/#inspircd-420
https://docs.inspircd.org/4/change-log/#inspircd-430
https://docs.inspircd.org/4/change-log/#inspircd-440
https://docs.inspircd.org/4/change-log/#inspircd-450
https://docs.inspircd.org/4/change-log/#inspircd-460
https://docs.inspircd.org/4/change-log/#inspircd-470

Packaging-relevant changes:

- inspircd no longer has the start subcommand, but needs to be invoked
  directly.
- New extra modules: log_syslog and log_json
- Removed extra modules: regex_tre, regex_pcre, ssl_mbedtls
  You probably should not use them anymore, but they can be
  obtained via the module manager in theory — though I doubt it works
  with Nix (another item for the todo list, I guess):
  https://docs.inspircd.org/4/module-manager/
---
 doc/release-notes/rl-2511.section.md           |  2 ++
 nixos/modules/services/networking/inspircd.nix |  2 +-
 pkgs/by-name/in/inspircd/package.nix           | 17 +++++++----------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index bb8943416017..332ae0b71aa1 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -47,6 +47,8 @@
   The binary name remains `webfontkitgenerator`.
   The `webfontkitgenerator` package is an alias to `webfont-bundler`.
 
+- `inspircd` has been updated to the v4 release series. Please refer to the upstream documentation for [general information](https://docs.inspircd.org/4/overview/#v4-overview) and a list of [breaking changes](https://docs.inspircd.org/4/breaking-changes/).
+
 - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input.
 
 - `vmware-horizon-client` was renamed to `omnissa-horizon-client`, following [VMware's sale of their end-user business to Omnissa](https://www.omnissa.com/insights/introducing-omnissa-the-former-vmware-end-user-computing-business/). The binary has been renamed from `vmware-view` to `horizon-client`.
diff --git a/nixos/modules/services/networking/inspircd.nix b/nixos/modules/services/networking/inspircd.nix
index 5ae169dd4155..315a327bc36e 100644
--- a/nixos/modules/services/networking/inspircd.nix
+++ b/nixos/modules/services/networking/inspircd.nix
@@ -59,7 +59,7 @@ in
       serviceConfig = {
         Type = "simple";
         ExecStart = ''
-          ${lib.getBin cfg.package}/bin/inspircd start --config ${configFile} --nofork --nopid
+          ${lib.getBin cfg.package}/bin/inspircd --config ${configFile} --nofork --nopid
         '';
         DynamicUser = true;
       };
diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix
index caf666705e90..add41960449f 100644
--- a/pkgs/by-name/in/inspircd/package.nix
+++ b/pkgs/by-name/in/inspircd/package.nix
@@ -31,6 +31,7 @@ let
 
   # compatible if libc is compatible
   libcModules = [
+    "log_syslog"
     "regex_posix"
     "sslrehashsignal"
   ];
@@ -50,12 +51,11 @@ let
       # GPLv2 compatible dependencies
       "argon2"
       "ldap"
+      "log_json"
       "mysql"
       "pgsql"
-      "regex_pcre"
       "regex_pcre2"
       "regex_re2"
-      "regex_tre"
       "sqlite3"
       "ssl_gnutls"
     ]
@@ -74,15 +74,13 @@ in
   openldap,
   libpq,
   libmysqlclient,
-  pcre,
   pcre2,
-  tre,
   re2,
   sqlite,
   gnutls,
   libmaxminddb,
   openssl,
-  mbedtls,
+  yyjson,
   # For a full list of module names, see https://docs.inspircd.org/packaging/
   extraModules ? compatibleModules lib stdenv,
 }:
@@ -104,12 +102,12 @@ let
       )
     ];
     ldap = [ openldap ];
+    log_json = [ yyjson ];
+    log_syslog = [ ];
     mysql = [ libmysqlclient ];
     pgsql = [ libpq ];
-    regex_pcre = [ pcre ];
     regex_pcre2 = [ pcre2 ];
     regex_re2 = [ re2 ];
-    regex_tre = [ tre ];
     sqlite3 = [ sqlite ];
     ssl_gnutls = [ gnutls ];
     # depends on stdenv.cc.libc
@@ -119,7 +117,6 @@ let
     regex_stdlib = [ ];
     # GPLv2 incompatible
     geo_maxmind = [ libmaxminddb ];
-    ssl_mbedtls = [ mbedtls ];
     ssl_openssl = [ openssl ];
   };
 
@@ -151,13 +148,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "inspircd";
-  version = "3.18.0";
+  version = "4.7.0";
 
   src = fetchFromGitHub {
     owner = "inspircd";
     repo = "inspircd";
     rev = "v${version}";
-    sha256 = "sha256-Aulhg2CbtcpsxkH5kXkp4EoZF5/F9pOXJc1S08S5P08=";
+    sha256 = "sha256-/LiniV5moKGX7K6Hfzq1mxEBZ+sqnScQxT0AApiBPaA=";
   };
 
   outputs = [

From 0515216cefe35b8ed9b68cd65afad66d66b5faea Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 14 Jul 2025 15:41:05 +0200
Subject: [PATCH 267/357] nixos/inspircd: sync with upstream systemd.service
 file

We could in theory just re-use the upstream one, but it sets User=root
which I'm not entirely comfortable with. Instead, add the settings we
were missing from that file here. Sadly, upstream doesn't configure a
syscall filter or similar.
---
 nixos/modules/services/networking/inspircd.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/inspircd.nix b/nixos/modules/services/networking/inspircd.nix
index 315a327bc36e..dbc587e0a4f1 100644
--- a/nixos/modules/services/networking/inspircd.nix
+++ b/nixos/modules/services/networking/inspircd.nix
@@ -53,14 +53,22 @@ in
   config = lib.mkIf cfg.enable {
     systemd.services.inspircd = {
       description = "InspIRCd - the stable, high-performance and modular Internet Relay Chat Daemon";
+      unitConfig.Documentation = "https://docs.inspircd.org";
       wantedBy = [ "multi-user.target" ];
-      requires = [ "network.target" ];
+
+      after = [
+        "network.target"
+        "network-online.target"
+      ];
+      wants = [ "network-online.target" ];
 
       serviceConfig = {
         Type = "simple";
         ExecStart = ''
           ${lib.getBin cfg.package}/bin/inspircd --config ${configFile} --nofork --nopid
         '';
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        Restart = "on-failure";
         DynamicUser = true;
       };
     };

From e960e6e1dc689e2b5fe9e3ee824fc12860d9f27c Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 2 Aug 2025 20:39:44 +0200
Subject: [PATCH 268/357] inspircd: 4.7.0 -> 4.8.0

https://docs.inspircd.org/4/change-log/#inspircd-480

- The build system now allows using the system provided versions of
  utf8cpp and http-parser which is great for us.

- Pass --disable-ownership which means we will no longer have to know
  the user to which will run inspircd at build time (we didn't know that
  before, so we had to pass --uid 0 and --gid 0 (which always exist),
  but having .service files which hardcode User=root isn't great even
  though the user could configure inspircd to use setuid(2)).
---
 pkgs/by-name/in/inspircd/package.nix | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix
index add41960449f..38c995ee32a4 100644
--- a/pkgs/by-name/in/inspircd/package.nix
+++ b/pkgs/by-name/in/inspircd/package.nix
@@ -70,6 +70,8 @@ in
   nixosTests,
   perl,
   pkg-config,
+  http-parser,
+  utf8cpp,
   libargon2,
   openldap,
   libpq,
@@ -148,13 +150,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "inspircd";
-  version = "4.7.0";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "inspircd";
     repo = "inspircd";
     rev = "v${version}";
-    sha256 = "sha256-/LiniV5moKGX7K6Hfzq1mxEBZ+sqnScQxT0AApiBPaA=";
+    sha256 = "sha256-fMfsNbkp9M8KiuhwOEFmPjowZ4JLP4IpX6LRO9aLHzY=";
   };
 
   outputs = [
@@ -172,7 +174,18 @@ stdenv.mkDerivation rec {
   ++ lib.optionals (lib.elem "pgsql" extraModules) [
     libpq.pg_config
   ];
-  buildInputs = extraInputs;
+
+  # Disable use of the vendored versions of these libraries
+  env = {
+    SYSTEM_HTTP_PARSER = "1";
+    SYSTEM_UTFCPP = "1";
+  };
+
+  buildInputs = [
+    http-parser
+    utf8cpp
+  ]
+  ++ extraInputs;
 
   configurePhase = ''
     runHook preConfigure
@@ -189,8 +202,7 @@ stdenv.mkDerivation rec {
     ./configure \
       --disable-auto-extras \
       --distribution-label nixpkgs${version} \
-      --uid 0 \
-      --gid 0 \
+      --disable-ownership \
       --binary-dir  ${placeholder "bin"}/bin \
       --config-dir  /etc/inspircd \
       --data-dir    ${placeholder "lib"}/lib/inspircd \

From feff4890ba70556f81384c96b475f9655e989047 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 01:13:17 +0000
Subject: [PATCH 269/357] gotty: 1.5.0 -> 1.5.1

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

diff --git a/pkgs/by-name/go/gotty/package.nix b/pkgs/by-name/go/gotty/package.nix
index 38f040f0bb52..80e9238a4f52 100644
--- a/pkgs/by-name/go/gotty/package.nix
+++ b/pkgs/by-name/go/gotty/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "gotty";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "sorenisanerd";
     repo = "gotty";
     rev = "v${version}";
-    sha256 = "sha256-VSu0ASnLmRzOGOEKqb/zB43+HxEwMpKLpbdbWY5QrEk=";
+    sha256 = "sha256-6TFfBS/uZ5I/h1S22O5x8VaCBfjDtXDfk0stMZad7B4=";
   };
 
-  vendorHash = "sha256-XtqIiREtKg0LRnwOg8UyYrWUWJNQbCJUw+nVvaiN3GQ=";
+  vendorHash = "sha256-OcBwkA28k54rSZP66L+wdkiWPvUv7Z9pTlEK7/LXjBM=";
 
   # upstream did not update the tests, so they are broken now
   # https://github.com/sorenisanerd/gotty/issues/13

From d7ba59ac61af362805b6f983ad86a6d94d76611a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 01:18:07 +0000
Subject: [PATCH 270/357] werf: 2.42.0 -> 2.45.0

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

diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index 4d66aaadb0b6..d9c2163c0c0c 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -10,17 +10,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "werf";
-  version = "2.42.0";
+  version = "2.45.0";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HZT8MYPnSe6BQtGNiCCB/MfAsj1HQz9oXyZlKgBzbBg=";
+    hash = "sha256-tTWhGaKEYrZAQnIkuRcTMLlYooexhRIc0rJ4wzqJCWM=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-IlXE1mNSc/CFN5lSXvXonGQanyDS+XH8Wa3FCLM/gXc=";
+  vendorHash = "sha256-5OSt0oMFb0MjJDXTFJKtaintOhnCShBOHfjllWbwb6Y=";
 
   subPackages = [ "cmd/werf" ];
 

From 53479e04c4adffeb4fb09870f2515ff488c9df2d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 24 Jul 2025 08:58:23 -0500
Subject: [PATCH 271/357] plater: migrate to by-name

plater: refactor package definitions and meta

plater: unstable-2020-07-30 -> unstable-2025-03-24

plater: 2020-07-30 -> 1.0.0-unstable-2025-03-24

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
---
 .../pl/plater/package.nix}                    | 31 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 15 insertions(+), 18 deletions(-)
 rename pkgs/{applications/misc/plater/default.nix => by-name/pl/plater/package.nix} (61%)

diff --git a/pkgs/applications/misc/plater/default.nix b/pkgs/by-name/pl/plater/package.nix
similarity index 61%
rename from pkgs/applications/misc/plater/default.nix
rename to pkgs/by-name/pl/plater/package.nix
index 80cd745f8b9a..800c9299d8ca 100644
--- a/pkgs/applications/misc/plater/default.nix
+++ b/pkgs/by-name/pl/plater/package.nix
@@ -1,38 +1,37 @@
 {
-  mkDerivation,
+  stdenv,
   cmake,
   fetchFromGitHub,
   lib,
   libGLU,
   makeDesktopItem,
-  qtbase,
-  wrapQtAppsHook,
+  qt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "plater";
-  version = "2020-07-30";
+  version = "1.0.0-unstable-2025-03-24";
 
   src = fetchFromGitHub {
     owner = "Rhoban";
     repo = "Plater";
-    rev = "f8de6d038f95a9edebfcfe142c8e9783697d5b47";
-    sha256 = "0r20mbzd16zv1aiadjqdy7z6sp09rr6lgfxhvir4ll3cpakkynr4";
+    rev = "6c4f924504979095b1b45cf8fd81b1e38f0f8642";
+    hash = "sha256-+iL5Gl7k4lPikRwkyhaXSEcFYmhXV4ubAvP3iTBXDO8=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
     libGLU
-    qtbase
+    qt5.qtbase
   ];
 
   desktopItem = makeDesktopItem {
-    name = pname;
-    exec = pname;
-    icon = pname;
+    name = "plater";
+    exec = "plater";
+    icon = "plater";
     desktopName = "Ideamaker";
     genericName = meta.description;
     categories = [
@@ -47,11 +46,11 @@ mkDerivation rec {
     cp $src/gui/img/plater.png $out/share/pixmaps/${pname}.png
   '';
 
-  meta = with lib; {
+  meta = {
     description = "3D-printer parts placer and plate generator";
     homepage = "https://github.com/Rhoban/Plater";
-    maintainers = with maintainers; [ lovesegfault ];
-    platforms = platforms.linux;
-    license = licenses.cc-by-nc-30;
+    maintainers = with lib.maintainers; [ lovesegfault ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.cc-by-nc-30;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15b7b79653f4..b97c9e135b21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13340,8 +13340,6 @@ with pkgs;
 
   pineapple-pictures = qt6Packages.callPackage ../applications/graphics/pineapple-pictures { };
 
-  plater = libsForQt5.callPackage ../applications/misc/plater { };
-
   plexamp = callPackage ../applications/audio/plexamp { };
 
   plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };

From 09325145c0e1cbd93b778b904cf0bf419821cb05 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 25 Jul 2025 09:20:33 -0500
Subject: [PATCH 272/357] olive-editor: migrate to by-name

olive-editor: refactor package definitions and meta
---
 .../ol/olive-editor/package.nix}              | 21 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 9 insertions(+), 14 deletions(-)
 rename pkgs/{applications/video/olive-editor/default.nix => by-name/ol/olive-editor/package.nix} (89%)

diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/by-name/ol/olive-editor/package.nix
similarity index 89%
rename from pkgs/applications/video/olive-editor/default.nix
rename to pkgs/by-name/ol/olive-editor/package.nix
index 787062bd3178..1be1af06b3b9 100644
--- a/pkgs/applications/video/olive-editor/default.nix
+++ b/pkgs/by-name/ol/olive-editor/package.nix
@@ -9,14 +9,11 @@
   opencolorio,
   ffmpeg_6,
   cmake,
-  wrapQtAppsHook,
   openimageio,
   openexr,
   portaudio,
   imath,
-  qtwayland,
-  qtmultimedia,
-  qttools,
+  qt6,
 }:
 
 let
@@ -71,7 +68,7 @@ stdenv.mkDerivation {
     pkg-config
     which
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -82,18 +79,18 @@ stdenv.mkDerivation {
     imath
     openexr
     portaudio
-    qtwayland
-    qtmultimedia
-    qttools
+    qt6.qtwayland
+    qt6.qtmultimedia
+    qt6.qttools
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Professional open-source NLE video editor";
     homepage = "https://www.olivevideoeditor.org/";
     downloadPage = "https://www.olivevideoeditor.org/download.php";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.balsoft ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ balsoft ];
+    platforms = lib.platforms.unix;
     # never built on aarch64-darwin since first introduction in nixpkgs
     broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
     mainProgram = "olive-editor";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15b7b79653f4..76a0bccf355a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3888,8 +3888,6 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  olive-editor = qt6Packages.callPackage ../applications/video/olive-editor { };
-
   ome_zarr = with python3Packages; toPythonApplication ome-zarr;
 
   onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; };

From b56e34b54022a864ede429d7f78c6662d7f29b36 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 26 Jul 2025 08:34:59 -0500
Subject: [PATCH 273/357] awsume: migrate to by-name

awsume: refactor package definitions

awsume: fix python path

Use python3 from build instead of host

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
---
 .../aw/awsume/package.nix}                    | 29 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 20 deletions(-)
 rename pkgs/{tools/admin/awsume/default.nix => by-name/aw/awsume/package.nix} (55%)

diff --git a/pkgs/tools/admin/awsume/default.nix b/pkgs/by-name/aw/awsume/package.nix
similarity index 55%
rename from pkgs/tools/admin/awsume/default.nix
rename to pkgs/by-name/aw/awsume/package.nix
index 85cecfa4659b..2a31bff4f1c4 100644
--- a/pkgs/tools/admin/awsume/default.nix
+++ b/pkgs/by-name/aw/awsume/package.nix
@@ -1,18 +1,11 @@
 {
   lib,
-  python,
   installShellFiles,
-  buildPythonApplication,
   fetchFromGitHub,
-  boto3,
-  colorama,
-  psutil,
-  pluggy,
-  pyyaml,
-  setuptools,
+  python3Packages,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "awsume";
   version = "4.5.5";
   format = "setuptools";
@@ -20,15 +13,15 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "trek10inc";
     repo = "awsume";
-    rev = version;
-    sha256 = "sha256-lm9YANYckyHDoNbB1wytBm55iyBmUuxFPmZupfpReqc=";
+    tag = version;
+    hash = "sha256-lm9YANYckyHDoNbB1wytBm55iyBmUuxFPmZupfpReqc=";
   };
 
   AWSUME_SKIP_ALIAS_SETUP = 1;
 
   nativeBuildInputs = [ installShellFiles ];
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     colorama
     boto3
     psutil
@@ -45,20 +38,20 @@ buildPythonApplication rec {
 
   postInstall = ''
     installShellCompletion --cmd awsume \
-      --bash <(PYTHONPATH=./awsume/configure ${python}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['bash'])") \
-      --zsh <(PYTHONPATH=./awsume/configure ${python}/bin/python3 -c"import autocomplete; print(autocomplete.ZSH_AUTOCOMPLETE_FUNCTION)") \
-      --fish <(PYTHONPATH=./awsume/configure ${python}/bin/python3 -c"import autocomplete; print(autocomplete.SCRIPTS['fish'])") \
+      --bash <(PYTHONPATH=./awsume/configure python3 -c"import autocomplete; print(autocomplete.SCRIPTS['bash'])") \
+      --zsh <(PYTHONPATH=./awsume/configure python3 -c"import autocomplete; print(autocomplete.ZSH_AUTOCOMPLETE_FUNCTION)") \
+      --fish <(PYTHONPATH=./awsume/configure python3 -c"import autocomplete; print(autocomplete.SCRIPTS['fish'])") \
 
     rm -f $out/bin/awsume.bat
   '';
 
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Utility for easily assuming AWS IAM roles from the command line";
     homepage = "https://github.com/trek10inc/awsume";
-    license = [ licenses.mit ];
+    license = lib.licenses.mit;
     mainProgram = "awsume";
-    maintainers = [ maintainers.nilp0inter ];
+    maintainers = with lib.maintainers; [ nilp0inter ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15b7b79653f4..985d33c2f7b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1614,8 +1614,6 @@ with pkgs;
 
   autoflake = with python3.pkgs; toPythonApplication autoflake;
 
-  awsume = python3Packages.callPackage ../tools/admin/awsume { };
-
   aws-mfa = python3Packages.callPackage ../tools/admin/aws-mfa { };
 
   azure-cli-extensions = recurseIntoAttrs azure-cli.extensions;

From a26223668fd0830249592ed6cacad4c89cbf4f19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 02:54:07 +0000
Subject: [PATCH 274/357] qownnotes: 25.7.8 -> 25.7.9

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

diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index 264c54b95217..f3cf89c0ef7c 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -18,11 +18,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "25.7.8";
+  version = "25.7.9";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-NPejWX8/Wekbp6ht1i0MayC6R/9TBykQ2cqXAsqR1CY=";
+    hash = "sha256-rcBuGkoRel998i34e1kO8h/lqMZtgKnAipKGEF6xrhs=";
   };
 
   nativeBuildInputs = [

From 871f9af4cdbffc7c3ccbade33d4df6255dbcebc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 03:31:29 +0000
Subject: [PATCH 275/357] cpptrace: 1.0.3 -> 1.0.4

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

diff --git a/pkgs/by-name/cp/cpptrace/package.nix b/pkgs/by-name/cp/cpptrace/package.nix
index 942881d1a037..2fc49cba0f0f 100644
--- a/pkgs/by-name/cp/cpptrace/package.nix
+++ b/pkgs/by-name/cp/cpptrace/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpptrace";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "jeremy-rifkin";
     repo = "cpptrace";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8H1eJQYQn1DsVsJ0OpJAOJSWD/0iSn1SQLzg1elyEmM=";
+    hash = "sha256-KmAJEEU1aTKwleGBllSxlrsO4jVSTKnSTQQZyJ50loY=";
   };
 
   patches = [

From 9d133a0616ddea6442007a7fe72d0cdfe1516706 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 04:04:33 +0000
Subject: [PATCH 276/357] go-swag: 1.16.4 -> 1.16.6

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

diff --git a/pkgs/by-name/go/go-swag/package.nix b/pkgs/by-name/go/go-swag/package.nix
index 7193d56ba312..efabe7428ee8 100644
--- a/pkgs/by-name/go/go-swag/package.nix
+++ b/pkgs/by-name/go/go-swag/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-swag";
-  version = "1.16.4";
+  version = "1.16.6";
 
   src = fetchFromGitHub {
     owner = "swaggo";
     repo = "swag";
     rev = "v${version}";
-    sha256 = "sha256-wqBT7uan5XL51HHDGINRH9NTb1tybF44d/rWRxl6Lak=";
+    sha256 = "sha256-ixeHj+bqskQJOCxnJaU0IG9Qoe4SQk+McNY0Sy1tUwI=";
   };
 
-  vendorHash = "sha256-6L5LzXtYjrA/YKmNEC/9dyiHpY/8gkH/CvW0JTo+Bwc=";
+  vendorHash = "sha256-P3WH4SrGL4Ejn4U34EEJA21Fne/UlOWg8jiI94Bp7Ms=";
 
   subPackages = [ "cmd/swag" ];
 

From 76044528d97e2d24812b58ad3bbc43db051392ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 04:22:12 +0000
Subject: [PATCH 277/357] golangci-lint: 2.3.0 -> 2.3.1

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

diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix
index 0a87d4a4ef2b..483355957029 100644
--- a/pkgs/by-name/go/golangci-lint/package.nix
+++ b/pkgs/by-name/go/golangci-lint/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "golangci-lint";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Kr4nkoqlCGyuaa4X1BLqe/WZA+ofYkWPizPMzcZQDQg=";
+    hash = "sha256-TuMIDKs8g1oYT4nQoUjwW0wEMaGxN+3YyWsbWTGy+tE=";
   };
 
-  vendorHash = "sha256-SsKypfsr1woHah9rIyFnUNdp0mTde7k++E2CfE22LK4=";
+  vendorHash = "sha256-1jnunHTVtqeDoljOC6JVq1pOxtZ/njqIRyQHRzctxgI=";
 
   subPackages = [ "cmd/golangci-lint" ];
 

From d632bfb8fdca1cde30efc02ef0219fe330a1878c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 04:45:24 +0000
Subject: [PATCH 278/357] roxctl: 4.8.0 -> 4.8.1

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

diff --git a/pkgs/by-name/ro/roxctl/package.nix b/pkgs/by-name/ro/roxctl/package.nix
index 4fe04d499737..1ceeecd72d6e 100644
--- a/pkgs/by-name/ro/roxctl/package.nix
+++ b/pkgs/by-name/ro/roxctl/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "roxctl";
-  version = "4.8.0";
+  version = "4.8.1";
 
   src = fetchFromGitHub {
     owner = "stackrox";
     repo = "stackrox";
     rev = version;
-    sha256 = "sha256-IIvHQFhdQiOtdceW6GhgeJ2yqXdL+FDeE7Y9VkTShJA=";
+    sha256 = "sha256-HtxRMcPFs80OpVAM3CnUBnQjBFm+5Sl/kL3SrzKmjf0=";
   };
 
-  vendorHash = "sha256-nobE6QJfzFLFgWzzy04uynOtFoYHx8iv8RMcX8F2JOY=";
+  vendorHash = "sha256-Mra4hfg5nW/8CSQK/h6nnsZhN2GLdMg14kBvkFW3Y0w=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From b16813baa89e3bf87c62d459e6c8b2c3da57a369 Mon Sep 17 00:00:00 2001
From: Jonas Rembser <jonas.rembser@cern.ch>
Date: Sun, 3 Aug 2025 06:52:10 +0200
Subject: [PATCH 279/357] root: 6.36.00 -> 6.36.02 (#424032)

* Update to the newest ROOT patch release.

  * Disable `tmva-pymva`, since it doesn't work with recent TensorFlow
    versions anyway

  * Don't set `gnuinstall=ON` for the ROOT build, because we were
    overriding the install paths anyway to what they were with
    `gnuinstall=OFF`
---
 pkgs/by-name/ro/root/package.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix
index b380e4be2258..73dfb559ac31 100644
--- a/pkgs/by-name/ro/root/package.nix
+++ b/pkgs/by-name/ro/root/package.nix
@@ -52,7 +52,7 @@
 
 stdenv.mkDerivation rec {
   pname = "root";
-  version = "6.36.00";
+  version = "6.36.02";
 
   passthru = {
     tests = import ./tests { inherit callPackage; };
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
-    hash = "sha256-lK/I3vkoQmeaEwonUhvmbiq9qjdiCIjmHYKKQ/xLAaI=";
+    hash = "sha256-UQ1nezOsfKSKoNcSvbiNg1of9qN074bxoeFo+ieetHA=";
   };
 
   clad_src = fetchFromGitHub {
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
     patchRcPathFish
     patchRcPathPosix
     pcre2
-    python3.pkgs.numpy
+    python3
     tbb
     xrootd
     xxHash
@@ -162,18 +162,15 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DCLAD_SOURCE_DIR=${clad_src}"
-    "-DCMAKE_INSTALL_BINDIR=bin"
-    "-DCMAKE_INSTALL_INCLUDEDIR=include"
-    "-DCMAKE_INSTALL_LIBDIR=lib"
     "-DClang_DIR=${clang}/lib/cmake/clang"
     "-Dbuiltin_clang=OFF"
     "-Dbuiltin_llvm=OFF"
     "-Dfail-on-missing=ON"
     "-Dfftw3=ON"
     "-Dfitsio=OFF"
-    "-Dgnuinstall=ON"
     "-Dmathmore=ON"
     "-Dsqlite=OFF"
+    "-Dtmva-pymva=OFF"
     "-Dvdt=OFF"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [

From 4cb79cc79705d6fa8e380510850d8c89ac93fb86 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 04:56:06 +0000
Subject: [PATCH 280/357] strictdoc: 0.9.3 -> 0.10.1

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

diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix
index 60dee552dbf3..9e234753ccc9 100644
--- a/pkgs/by-name/st/strictdoc/package.nix
+++ b/pkgs/by-name/st/strictdoc/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "strictdoc";
-  version = "0.9.3";
+  version = "0.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "strictdoc-project";
     repo = "strictdoc";
     tag = version;
-    hash = "sha256-3bZfyjylNrCK2UFXgCoNI/LckSa8FkVWD/kBopFIbec=";
+    hash = "sha256-TXrSv6V5fMhcx4YolTfsFwgGL5qxNp67iv62KDC5H00=";
   };
 
   build-system = [
@@ -74,7 +74,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = {
     description = "Software for technical documentation and requirements management";
     homepage = "https://github.com/strictdoc-project/strictdoc";
-    changelog = "https://github.com/strictdoc-project/strictdoc/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/strictdoc-project/strictdoc/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ yuu ];
     mainProgram = "strictdoc";

From 6e443db4d74c6e40017b6ba13260b53d6b1bb5b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 05:11:22 +0000
Subject: [PATCH 281/357] terraform-providers.ovh: 2.5.0 -> 2.6.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index fd5a20139ff9..c54b7990e125 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1012,11 +1012,11 @@
     "vendorHash": null
   },
   "ovh": {
-    "hash": "sha256-WOfmY6H/MoeOtph8xVnr/CyovcyIPDYeiw9piCgxfz8=",
+    "hash": "sha256-Z9V+66Ycaa/XWs37ATAbQiwbMooBaHJYaEeduUXghV0=",
     "homepage": "https://registry.terraform.io/providers/ovh/ovh",
     "owner": "ovh",
     "repo": "terraform-provider-ovh",
-    "rev": "v2.5.0",
+    "rev": "v2.6.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 98eaee6dac731736d14bf4882faeb3130254e62e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 05:40:36 +0000
Subject: [PATCH 282/357] terraform-providers.auth0: 1.24.1 -> 1.25.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index fd5a20139ff9..9fb0e3870636 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -99,11 +99,11 @@
     "vendorHash": "sha256-YIn8akPW+DCVF0eYZxsmJxmrJuYhK4QLG/uhmmrXd4c="
   },
   "auth0": {
-    "hash": "sha256-kFlRAwvKpqcD0n5VKJC+Whr8ZeO4DUzkLT2umvLXgEA=",
+    "hash": "sha256-qTSoE9BRVTJEj5Lbhci3b3kyrIhvG0Mqk+ulDqfQrFg=",
     "homepage": "https://registry.terraform.io/providers/auth0/auth0",
     "owner": "auth0",
     "repo": "terraform-provider-auth0",
-    "rev": "v1.24.1",
+    "rev": "v1.25.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-uKzgEBNrLqcOkrrxKO9c5wKRwUjQInzeseN/euEI2G8="
   },

From d0aa9c4a8ff4fd944c04c0d136c6cc295dd831ef Mon Sep 17 00:00:00 2001
From: Alex Dehnert <adehnert@mit.edu>
Date: Sun, 3 Aug 2025 01:50:37 -0400
Subject: [PATCH 283/357] salt: Build with the cryptography module

Without this, both the master and minion give errors like "NameError:
name 'rsa' is not defined", while with it they both run fine. This is
presumably because Salt just ignores import errors of the cryptography
library[1], so rather than erroring immediately on startup it takes a while
(at least for the minion).

[1] https://github.com/saltstack/salt/blob/master/salt/crypt.py#L50
---
 pkgs/by-name/sa/salt/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/sa/salt/package.nix b/pkgs/by-name/sa/salt/package.nix
index 1608a9078ff6..ff4c95345d9a 100644
--- a/pkgs/by-name/sa/salt/package.nix
+++ b/pkgs/by-name/sa/salt/package.nix
@@ -47,6 +47,7 @@ python3.pkgs.buildPythonApplication rec {
   propagatedBuildInputs =
     with python3.pkgs;
     [
+      cryptography
       distro
       jinja2
       jmespath

From b523a0237a26aa11725c70feb9077ede31e887aa Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 08:15:38 +0200
Subject: [PATCH 284/357] python313Packages.publicsuffixlist: 1.0.2.20250724 ->
 1.0.2.20250802

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250802-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index caaace3cc788..26fcb0f7ec22 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250724";
+  version = "1.0.2.20250802";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-eZKPikda5WtjxSS+nZGftcMVFjFrZMeHVt9XAl5QQWs=";
+    hash = "sha256-/Liz65F7Rk/TJr5xICfRsK10Flzgojw2m4otnh4+y5A=";
   };
 
   build-system = [ setuptools ];

From b2b36dc0d5df4ac1edeff9db771ee04fae121cbc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 08:17:03 +0200
Subject: [PATCH 285/357] python313Packages.pylitterbot: 2024.2.2 -> 2024.2.3

Diff: https://github.com/natekspencer/pylitterbot/compare/refs/tags/v2024.2.2...refs/tags/v2024.2.3

Changelog: https://github.com/natekspencer/pylitterbot/releases/tag/v2024.2.3
---
 pkgs/development/python-modules/pylitterbot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix
index 26f7b8934954..696b3e20142a 100644
--- a/pkgs/development/python-modules/pylitterbot/default.nix
+++ b/pkgs/development/python-modules/pylitterbot/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pylitterbot";
-  version = "2024.2.2";
+  version = "2024.2.3";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "natekspencer";
     repo = "pylitterbot";
     tag = "v${version}";
-    hash = "sha256-FKBgvP3qXT3nKHn5R9pp4nYNX+mO4vfDi5fzQ5+y1Nc=";
+    hash = "sha256-r0Nd9xDj6l913ofu7jeBbCud01yw/lgiHO1L6XN9B+Y=";
   };
 
   pythonRelaxDeps = [ "deepdiff" ];

From 908d46ba814dc39430c507fe50e58d235bfc3d56 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 08:17:59 +0200
Subject: [PATCH 286/357] python313Packages.denonavr: 1.1.1 -> 1.1.2

Diff: https://github.com/ol-iver/denonavr/compare/refs/tags/1.1.1...refs/tags/1.1.2

Changelog: https://github.com/ol-iver/denonavr/releases/tag/1.1.2
---
 pkgs/development/python-modules/denonavr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix
index 55ea60f0fd90..ca279da97c39 100644
--- a/pkgs/development/python-modules/denonavr/default.nix
+++ b/pkgs/development/python-modules/denonavr/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "denonavr";
-  version = "1.1.1";
+  version = "1.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ol-iver";
     repo = "denonavr";
     tag = version;
-    hash = "sha256-7fUHSnhqY5nAAAniAHs6qjuc8iYuxcg1CzPD+WyUCZQ=";
+    hash = "sha256-r8Gg7mZwEiSq1iFQJXLb9xCb/iYxTbaCKGBH2EDZQqs=";
   };
 
   pythonRelaxDeps = [ "defusedxml" ];

From 44b8e71f4077269c477e6fb77aa99fde467d0de3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 08:20:03 +0200
Subject: [PATCH 287/357] python313Packages.environs: 14.2.0 -> 14.3.0

Diff: https://github.com/sloria/environs/compare/refs/tags/14.2.0...refs/tags/14.3.0

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

diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix
index 144d2f68be5d..f9d1671f9e26 100644
--- a/pkgs/development/python-modules/environs/default.nix
+++ b/pkgs/development/python-modules/environs/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "environs";
-  version = "14.2.0";
+  version = "14.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "sloria";
     repo = "environs";
     tag = version;
-    hash = "sha256-2JmoLhKqvX927e64qMIv+YAK7WJR+O/8nKvgaT9AQm8=";
+    hash = "sha256-DGcYIir2ckzCJ9423OiFwSi0xMXyox6RNYnhOGQhOuc=";
   };
 
   nativeBuildInputs = [ flit-core ];

From 777f9bfb6e593935cd631b6dd53b0c07212cfab3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 08:26:48 +0200
Subject: [PATCH 288/357] python313Packages.meshtastic: 2.6.4 -> 2.7.0

Diff: https://github.com/meshtastic/python/compare/refs/tags/2.6.4...refs/tags/2.7.0

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

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index e280c925b23d..8d2fc1c11558 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -34,7 +34,7 @@
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.6.4";
+  version = "2.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     owner = "meshtastic";
     repo = "python";
     tag = version;
-    hash = "sha256-pbDWxnYrUFEJ3XHwoQZnGc/USbOKAzJtJ6nHkTv/e6Y=";
+    hash = "sha256-7VBT4W0TWAEyjAEOA0FPOECS1JxFEpNLkWNHVFiWL1E=";
   };
 
   pythonRelaxDeps = [

From ca5f051bb14f7145af5aef368b33794e7c58bf68 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 08:32:35 +0200
Subject: [PATCH 289/357] python313Packages.nicegui: 2.22.0 -> 2.22.1

Diff: https://github.com/zauberzeug/nicegui/compare/refs/tags/v2.22.0...refs/tags/v2.22.1

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

diff --git a/pkgs/development/python-modules/nicegui/default.nix b/pkgs/development/python-modules/nicegui/default.nix
index 0bfd8dbc4aba..618815b655b8 100644
--- a/pkgs/development/python-modules/nicegui/default.nix
+++ b/pkgs/development/python-modules/nicegui/default.nix
@@ -42,14 +42,14 @@
 
 buildPythonPackage rec {
   pname = "nicegui";
-  version = "2.22.0";
+  version = "2.22.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zauberzeug";
     repo = "nicegui";
     tag = "v${version}";
-    hash = "sha256-NzczF8Tth1qTc36xu+wsSYxJyHde6kEtVvI/5rKbHqQ=";
+    hash = "sha256-v9ELS0EzmqbaUhyqKidvN7UvvCHwBne2QkJJmTkheBg=";
   };
 
   pythonRelaxDeps = [ "requests" ];

From bffc1e8dbd453555e429ab24e644753579fed9dd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 08:35:51 +0200
Subject: [PATCH 290/357] python313Packages.typer-shell: 0.1.12 -> 0.2.1

Diff: https://github.com/FergusFettes/typer-shell/compare/refs/tags/v0.1.12...refs/tags/v0.2.1
---
 pkgs/development/python-modules/typer-shell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/typer-shell/default.nix b/pkgs/development/python-modules/typer-shell/default.nix
index 07f3ea5528ec..cdc436273118 100644
--- a/pkgs/development/python-modules/typer-shell/default.nix
+++ b/pkgs/development/python-modules/typer-shell/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "typer-shell";
-  version = "0.1.12";
+  version = "0.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "FergusFettes";
     repo = "typer-shell";
     tag = "v${version}";
-    hash = "sha256-fnqI+nKMaQocBWd9i/lqq8OzKwFdxJ8+7aYG5sNQ55E=";
+    hash = "sha256-ch5xElSIIIYNtE1Wb6aWUvbV0gT5MU1sLIY+suYzjHE=";
   };
 
   pythonRelaxDeps = [

From 92afbbb95823b268d5aa9e9aad3e9242ce98f303 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 08:37:03 +0200
Subject: [PATCH 291/357] zdns: 2.0.4 -> 2.0.5

Diff: https://github.com/zmap/zdns/compare/refs/tags/v2.0.4...refs/tags/v2.0.5
---
 pkgs/by-name/zd/zdns/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zd/zdns/package.nix b/pkgs/by-name/zd/zdns/package.nix
index 39e72d1fe71f..a45d9d372893 100644
--- a/pkgs/by-name/zd/zdns/package.nix
+++ b/pkgs/by-name/zd/zdns/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "zdns";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchFromGitHub {
     owner = "zmap";
     repo = "zdns";
     tag = "v${version}";
-    hash = "sha256-jnrewp0wXaRFVBY6Wo9JHGDnDxzQFOhh3JoLqxRicew=";
+    hash = "sha256-e01+TjJETpWNrdtG+lHHGmS9ZS9RijOo5wRnEv6w5jk=";
   };
 
-  vendorHash = "sha256-Uosa4Am5IQ9653TDZCOA9AS97pyQ1H2wRhXyJBQ1Eys=";
+  vendorHash = "sha256-YlSm4uMDw5I/R4VRpoo5+t/zTwY7J62faodwKlrfbTs=";
 
   preCheck = ''
     # Tests require network access

From 12e68006499b664cbc07140b3842fa7dc6c8bdc2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 08:46:47 +0200
Subject: [PATCH 292/357] trivy: 0.64.1 -> 0.65.0

Diff: https://github.com/aquasecurity/trivy/compare/refs/tags/v0.64.1...refs/tags/v0.65.0

Changelog: https://github.com/aquasecurity/trivy/releases/tag/v0.65.0
---
 pkgs/by-name/tr/trivy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix
index 81b87cdd2685..eb2c950cddd3 100644
--- a/pkgs/by-name/tr/trivy/package.nix
+++ b/pkgs/by-name/tr/trivy/package.nix
@@ -11,19 +11,19 @@
 
 buildGo124Module rec {
   pname = "trivy";
-  version = "0.64.1";
+  version = "0.65.0";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = "trivy";
     tag = "v${version}";
-    hash = "sha256-RNqbBh0PgpJruWIENAdjUDKsuConXxtSzKv4261rKmk=";
+    hash = "sha256-xOYLIBLy+0avsTp+Sind6IJc9O17aF4inRNnhuHwz1M=";
   };
 
   # Hash mismatch on across Linux and Darwin
   proxyVendor = true;
 
-  vendorHash = "sha256-e8742QO20n8hVtCXG5r+HOED8ccj/Pr3qbcndP94Nps=";
+  vendorHash = "sha256-2O0zmPgXL0FZbnzEME8pBPizhWcCgKOukoNJhDhjCrQ=";
 
   subPackages = [ "cmd/trivy" ];
 

From cd8d590a750dd4e0afabb291dd03b3625dd22128 Mon Sep 17 00:00:00 2001
From: mivorasu <mivorasu@users.noreply.github.com>
Date: Sun, 3 Aug 2025 14:55:10 +0800
Subject: [PATCH 293/357] ablog: disable failed test

---
 pkgs/by-name/ab/ablog/package.nix | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ab/ablog/package.nix b/pkgs/by-name/ab/ablog/package.nix
index 0de007d45673..6fc85d7e62a2 100644
--- a/pkgs/by-name/ab/ablog/package.nix
+++ b/pkgs/by-name/ab/ablog/package.nix
@@ -5,10 +5,13 @@
   gitUpdater,
 }:
 
-python3Packages.buildPythonApplication rec {
-  pname = "ablog";
+let
   version = "0.11.12";
-  format = "pyproject";
+in
+python3Packages.buildPythonApplication {
+  pname = "ablog";
+  inherit version;
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sunpy";
@@ -20,10 +23,9 @@ python3Packages.buildPythonApplication rec {
   build-system = with python3Packages; [
     setuptools
     setuptools-scm
+    wheel
   ];
 
-  nativeBuildInputs = with python3Packages; [ wheel ];
-
   dependencies = with python3Packages; [
     docutils
     feedgen
@@ -40,14 +42,17 @@ python3Packages.buildPythonApplication rec {
   ];
 
   pytestFlags = [
-    "-Wignore::sphinx.deprecation.RemovedInSphinx90Warning"
     "--rootdir=src/ablog"
     "-Wignore::sphinx.deprecation.RemovedInSphinx90Warning" # Ignore ImportError
   ];
 
-  # assert "post 1" not in html
-  # AssertionError
-  disabledTests = [ "test_not_safe_for_parallel_read" ];
+  disabledTests = [
+    # upstream investigation is still ongoing
+    # https://github.com/sunpy/ablog/issues/302
+    "test_not_safe_for_parallel_read"
+    # need sphinx old version
+    "test_feed"
+  ];
 
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 

From 26bde9126b414cfc30db9fe666e6336d648f4b7e Mon Sep 17 00:00:00 2001
From: x123 <x123@users.noreply.github.com>
Date: Sat, 2 Aug 2025 17:38:12 +0200
Subject: [PATCH 294/357] mdwatch: init at 0.1.11

---
 pkgs/by-name/md/mdwatch/package.nix | 33 +++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 pkgs/by-name/md/mdwatch/package.nix

diff --git a/pkgs/by-name/md/mdwatch/package.nix b/pkgs/by-name/md/mdwatch/package.nix
new file mode 100644
index 000000000000..ed516d62eafe
--- /dev/null
+++ b/pkgs/by-name/md/mdwatch/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "mdwatch";
+  version = "0.1.11";
+
+  src = fetchFromGitHub {
+    owner = "santoshxshrestha";
+    repo = "mdwatch";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-v+QsSPknUAFk+GC8D0wtA8VTcCWeb8DX6inL6WNl8gQ=";
+  };
+
+  cargoHash = "sha256-4Xvi5DxlqxfwnIa00Dr7tRzYa8/52BH/SODiNenlFDg=";
+
+  updateScript = nix-update-script { };
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  meta = {
+    description = "Simple CLI tool to live-preview Markdown files in your browser";
+    homepage = "https://github.com/santoshxshrestha/mdwatch";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ x123 ];
+    mainProgram = "mdwatch";
+  };
+})

From 98a17f91a655c0f1e0142af560614677ce0dc6bc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 09:00:11 +0200
Subject: [PATCH 295/357] vunnel: 0.35.1 -> 0.36.0

Diff: https://github.com/anchore/vunnel/compare/refs/tags/v0.35.1...refs/tags/v0.36.0

Changelog: https://github.com/anchore/vunnel/releases/tag/v0.36.0
---
 pkgs/by-name/vu/vunnel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix
index 5c207297b785..df133b516303 100644
--- a/pkgs/by-name/vu/vunnel/package.nix
+++ b/pkgs/by-name/vu/vunnel/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "vunnel";
-  version = "0.35.1";
+  version = "0.36.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "vunnel";
     tag = "v${version}";
-    hash = "sha256-Qxf9nUAk2NIdLhy1n//pY6RHq1Rg+PIGqN0NDuS4xj4=";
+    hash = "sha256-dT6tBIaY2Vv/YjOkgeAIA4cYP8+BebKmMaZT1ImO7AY=";
     leaveDotGit = true;
   };
 

From b0e30374050b0915eb8ab022c83f3df43a57ce70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 07:01:28 +0000
Subject: [PATCH 296/357] terramate: 0.14.1 -> 0.14.2

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

diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix
index 4077d6778797..0fa7b798ed77 100644
--- a/pkgs/by-name/te/terramate/package.nix
+++ b/pkgs/by-name/te/terramate/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "terramate";
-  version = "0.14.1";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "terramate-io";
     repo = "terramate";
     rev = "v${version}";
-    hash = "sha256-75tx0LQwAUdox7qIkedPH956DAx0l6f+9M+6VgYDosQ=";
+    hash = "sha256-o4J9HyZfxkqi4CHp+IKUVSmQZWnzfZjEjg6Izdr7xyM=";
   };
 
   vendorHash = "sha256-u9eXi7FjMsXm0H0y7Gs/Wu2I8tp4rRLxtjUxrrHJkEU=";

From 195282b4d06fa5fcd486a08bbe317e01354d8c81 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 09:15:26 +0200
Subject: [PATCH 297/357] dnsmonster: update changelog URL

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

diff --git a/pkgs/by-name/dn/dnsmonster/package.nix b/pkgs/by-name/dn/dnsmonster/package.nix
index 6ed3b9484a4c..0b6795440893 100644
--- a/pkgs/by-name/dn/dnsmonster/package.nix
+++ b/pkgs/by-name/dn/dnsmonster/package.nix
@@ -30,7 +30,7 @@ buildGoModule rec {
   meta = {
     description = "Passive DNS Capture and Monitoring Toolkit";
     homepage = "https://github.com/mosajjal/dnsmonster";
-    changelog = "https://github.com/mosajjal/dnsmonster/releases/tag/v${version}";
+    changelog = "https://github.com/mosajjal/dnsmonster/releases/tag/${src.tag}";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ fab ];
     broken = stdenv.hostPlatform.isDarwin;

From 8fe51d7dabb428b7dde1a2162d99343f0ff4e3f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 07:43:07 +0000
Subject: [PATCH 298/357] vulkan-hdr-layer-kwin6: 0-unstable-2025-05-22 ->
 0-unstable-2025-07-31

---
 pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix
index 30cbf761822b..a2353225f015 100644
--- a/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix
+++ b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation {
   pname = "vulkan-hdr-layer-kwin6";
-  version = "0-unstable-2025-05-22";
+  version = "0-unstable-2025-07-31";
 
   depsBuildBuild = [ pkg-config ];
 
@@ -40,8 +40,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "Zamundaaa";
     repo = "VK_hdr_layer";
-    rev = "1384036ea24a9bc38a5c684dac5122d5e3431ae6";
-    hash = "sha256-xm0S1vLE8MAov8gf6rN5ZKZAe6NMKfHDlUlmNd332qw=";
+    rev = "303e0c69e1d33acd95158d92b1fc652fb5b85399";
+    hash = "sha256-NsC44Ifl/fAHvFqP7NLrVZ71Y+x5mBEkv+r43HN5yn4=";
     fetchSubmodules = true;
   };
 

From c7cbc7ea806675c2401e4339834fb8d327fbe969 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 08:35:19 +0000
Subject: [PATCH 299/357] kubectl-ai: 0.0.18 -> 0.0.20

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

diff --git a/pkgs/by-name/ku/kubectl-ai/package.nix b/pkgs/by-name/ku/kubectl-ai/package.nix
index 7deb09e6a026..ac29224c97a7 100644
--- a/pkgs/by-name/ku/kubectl-ai/package.nix
+++ b/pkgs/by-name/ku/kubectl-ai/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubectl-ai";
-  version = "0.0.18";
+  version = "0.0.20";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "kubectl-ai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xxqR6jBK5RACyYGyOmIt2CY99ggWz0ygO9lmT2c0REc=";
+    hash = "sha256-iyyaQBulncPNJXm7ir/aOjJxJvd0Q178weneiwQbGcU=";
   };
 
-  vendorHash = "sha256-AuvBO7ucP/tWcag5NonDreXynxLm001Mu+Z1oIG8axw=";
+  vendorHash = "sha256-a84HesnInU7JZZTx0Rm1Qgsmo7SJC0kMnckgmUk0Vow=";
 
   # Build the main command
   subPackages = [ "cmd" ];

From 387b89e19235e447e469d7beb8f4bc3b38bb64da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 08:35:49 +0000
Subject: [PATCH 300/357] python3Packages.llama-index-instrumentation: 0.3.0 ->
 0.4.0

---
 .../python-modules/llama-index-instrumentation/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-instrumentation/default.nix b/pkgs/development/python-modules/llama-index-instrumentation/default.nix
index 8f430b775c9e..40774b99d19f 100644
--- a/pkgs/development/python-modules/llama-index-instrumentation/default.nix
+++ b/pkgs/development/python-modules/llama-index-instrumentation/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "llama-index-instrumentation";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_instrumentation";
     inherit version;
-    hash = "sha256-d3QcHZhh6tCA5vmDUGJZcUiNHgRr7ekc7J4M4vY+o0o=";
+    hash = "sha256-847MHwK2wferhCY7qmRn+sn4ZTjA7iVUKFPeRieKvqc=";
   };
 
   pythonRelaxDeps = [ "pydantic" ];

From dc8091dcec5773a935a1c2e84f572a16eb342789 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 08:43:22 +0000
Subject: [PATCH 301/357] vscode-extensions.ethersync.ethersync: 0.2.1 -> 0.4.0

---
 .../editors/vscode/extensions/ethersync.ethersync/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix b/pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix
index 1eae53b8a780..9af7cc59f2bc 100644
--- a/pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ethersync";
     name = "ethersync";
-    version = "0.2.1";
-    hash = "sha256-/oRpoYMWSpkAEM89KlJnSJ7TWwcGloYHXh80Ml+vz+M=";
+    version = "0.4.0";
+    hash = "sha256-/09be/1KZVIDUr+YieeD7xc8PXdchRo3Kt1GqD3Pt6M=";
   };
 
   meta = {

From 1119c1bf612f202edb1da12c6bba407eb1f7274c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 09:09:40 +0000
Subject: [PATCH 302/357] realm: 2.7.0 -> 2.8.0

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

diff --git a/pkgs/by-name/re/realm/package.nix b/pkgs/by-name/re/realm/package.nix
index a017a1f60859..b4acd0893253 100644
--- a/pkgs/by-name/re/realm/package.nix
+++ b/pkgs/by-name/re/realm/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "realm";
-  version = "2.7.0";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "zhboner";
     repo = "realm";
     rev = "v${version}";
-    hash = "sha256-vkLGfSDRYqvoqyVM/CWGJjpvXXPisEZxUSjLZGjNzno=";
+    hash = "sha256-7hOy+bqWoVyI2xGJ0eY7GvyIYykr6VP8d3ZYtY/jGPI=";
   };
 
-  cargoHash = "sha256-Oe64l16uYdU6NvTl7XrEm6dAtRFngI9yHC4fe4hpTNA=";
+  cargoHash = "sha256-yR+ayseoUYpK9lUFRP0OLrp1+LUrtPnxiPRvjDFSNgo=";
 
   env.RUSTC_BOOTSTRAP = 1;
 

From bdb6f413b8501782feb2ede572c1c58bc1e31155 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 08:09:44 +0000
Subject: [PATCH 303/357] androidStudioPackages.canary: 2025.1.3.2 ->
 2025.1.3.3

---
 pkgs/applications/editors/android-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index e287dff0031a..423426bc2f57 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -24,8 +24,8 @@ let
     sha256Hash = "sha256-qA7iu4nK+29aHKsUmyQWuwV0SFnv5cYQvFq5CAMKyKw=";
   };
   latestVersion = {
-    version = "2025.1.3.2"; # "Android Studio Narwhal Feature Drop | 2025.1.3 Canary 2"
-    sha256Hash = "sha256-6ZjjIzZ5y6VzbbKSIeDlXE+77fAksy532D+LlqMCmo4=";
+    version = "2025.1.3.3"; # "Android Studio Narwhal Feature Drop | 2025.1.3 Canary 3"
+    sha256Hash = "sha256-0BdbAJMQi9qgss1IJTMxjQpOjynLFuiY0Vlw5VYCY+c=";
   };
 in
 {

From f1b31e3e79af44632fc1a39bad63e16a9765925b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 09:32:12 +0000
Subject: [PATCH 304/357] python3Packages.pyathena: 3.15.0 -> 3.16.0

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

diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix
index d815df7d70a9..9e3773387680 100644
--- a/pkgs/development/python-modules/pyathena/default.nix
+++ b/pkgs/development/python-modules/pyathena/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "pyathena";
-  version = "3.15.0";
+  version = "3.16.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-F3XquRYvwWFLqGHokxaRxsNM4pANemCweU3tVmhn0M4=";
+    hash = "sha256-4lTxUgINLZRzDEuy/YZDlw0O02yrz38UxVBW97zTfok=";
   };
 
   build-system = [ hatchling ];

From 5a6deea7719a43ce3f759b64e1500de381650fd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 09:50:08 +0000
Subject: [PATCH 305/357] cargo-3ds: 0.1.4 -> 0.1.5

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

diff --git a/pkgs/by-name/ca/cargo-3ds/package.nix b/pkgs/by-name/ca/cargo-3ds/package.nix
index 9aa6fc65432c..801e5171d018 100644
--- a/pkgs/by-name/ca/cargo-3ds/package.nix
+++ b/pkgs/by-name/ca/cargo-3ds/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "cargo-3ds";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "rust3ds";
     repo = "cargo-3ds";
     tag = "v${version}";
-    hash = "sha256-APi1K5LtdHFI5kjPfZUOFcsZ/xoQixjKq5xZxwlW9CE=";
+    hash = "sha256-UMeIxYxQ+0VGyDJTu78n9O5iXw3ZBg8mHqmnUtbnXo4=";
   };
 
-  cargoHash = "sha256-2JpBm0ahgiL4KSM4J/nQRbdo3MDZgZj6EDg7Jr5ZanA=";
+  cargoHash = "sha256-ZH4JGBoXf6eTD35QPQBTIUYIlSyMOtWW2tWF5MkjqFk=";
 
   # Integration tests do not run in Nix build environment due to needing to
   # create and build Cargo workspaces.

From 9fc2ea4357c14fb7955cab9936b9e6426af2560e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 10:21:22 +0000
Subject: [PATCH 306/357] kodiPackages.formula1: 2.0.5 -> 2.0.6

---
 pkgs/applications/video/kodi/addons/formula1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/formula1/default.nix b/pkgs/applications/video/kodi/addons/formula1/default.nix
index 7ca5ddb67627..c05e72e93f5d 100644
--- a/pkgs/applications/video/kodi/addons/formula1/default.nix
+++ b/pkgs/applications/video/kodi/addons/formula1/default.nix
@@ -10,11 +10,11 @@
 buildKodiAddon rec {
   pname = "formula1";
   namespace = "plugin.video.formula1";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchzip {
     url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip";
-    sha256 = "sha256-zOEf1CXywEqUpBhan03xjVQ3Rjp3h08X2OgQ4GAjwJQ=";
+    sha256 = "sha256-oo5mS99fwMjMi8lUdiGNMOghVLd4dLr4SkoDzObufV4=";
   };
 
   propagatedBuildInputs = [

From 4d3754109502c38e07eb08175bf3f7b2a89f4f05 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 12:33:51 +0200
Subject: [PATCH 307/357] python313Packages.reolink-aio: 0.14.3 -> 0.14.5

Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.14.3...refs/tags/0.14.5

Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.14.5
---
 pkgs/development/python-modules/reolink-aio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index c63bcc948e10..1e1adb006e79 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.14.3";
+  version = "0.14.5";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "starkillerOG";
     repo = "reolink_aio";
     tag = version;
-    hash = "sha256-RH6elFdv51OqFvJjTGG+ZEuQNI3tpWj6gYU7XsfOUiU=";
+    hash = "sha256-i1/1Z8JngoGQ/VwjMAHJ7RJhS3dfpXApE1DdfTfIz8E=";
   };
 
   build-system = [ setuptools ];

From 140a9dee05f0fec11b514f702f730df59454a49c Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Sun, 3 Aug 2025 12:46:10 +0200
Subject: [PATCH 308/357] amarok: remove unused pcre dependency

---
 pkgs/applications/audio/amarok/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index b398bf1f4480..75f2d9e807de 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -36,7 +36,6 @@
   lzo,
   lz4,
   mariadb-embedded,
-  pcre,
   snappy,
   taglib,
   taglib_extras,
@@ -93,7 +92,6 @@ stdenv.mkDerivation (finalAttrs: {
     lz4
     lzo
     mariadb-embedded
-    pcre
     snappy
     taglib
     taglib_extras

From 699af90c198ac3ce22dd46f5c726ca18ea28a510 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sun, 3 Aug 2025 15:13:40 +0900
Subject: [PATCH 309/357] yamlfmt: correct commit reference in version flag

---
 pkgs/by-name/ya/yamlfmt/package.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix
index 1dd51cfd7202..5e7219f4cf28 100644
--- a/pkgs/by-name/ya/yamlfmt/package.nix
+++ b/pkgs/by-name/ya/yamlfmt/package.nix
@@ -14,7 +14,12 @@ buildGoModule (finalAttrs: {
     owner = "google";
     repo = "yamlfmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EYOtxb2Xq4bQpWbITmPieVMqJz3/2chgNirZEjiyjAY=";
+    hash = "sha256-WSw4WhWNyvkCwRCQYFAKhtkvOSSCrSlX3+i6cMHRtOQ=";
+    leaveDotGit = true;
+    postFetch = ''
+      git -C "$out" rev-parse --short HEAD > "$out/.git_head"
+      rm -rf "$out/.git"
+    '';
   };
 
   vendorHash = "sha256-Cy1eBvKkQ90twxjRL2bHTk1qNFLQ22uFrOgHKmnoUIQ=";
@@ -23,9 +28,12 @@ buildGoModule (finalAttrs: {
     "-s"
     "-w"
     "-X=main.version=${finalAttrs.version}"
-    "-X=main.commit=${finalAttrs.src.rev}"
   ];
 
+  preBuild = ''
+    ldflags+=" -X=main.commit=$(<.git_head)"
+  '';
+
   # Test failure in vendored yaml package, see:
   # https://github.com/google/yamlfmt/issues/256
   checkFlags = [ "-run=!S/TestNodeRoundtrip" ];

From 06ad68fa17a6522fa3d89d71b465372a7962f04b Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Sun, 3 Aug 2025 19:56:31 +0900
Subject: [PATCH 310/357] yamlfmt: prefer versionCheckHook over
 testers.testVersion

---
 pkgs/by-name/ya/yamlfmt/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix
index 5e7219f4cf28..4e5cea9eae03 100644
--- a/pkgs/by-name/ya/yamlfmt/package.nix
+++ b/pkgs/by-name/ya/yamlfmt/package.nix
@@ -2,8 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  testers,
-  yamlfmt,
+  versionCheckHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -38,9 +37,11 @@ buildGoModule (finalAttrs: {
   # https://github.com/google/yamlfmt/issues/256
   checkFlags = [ "-run=!S/TestNodeRoundtrip" ];
 
-  passthru.tests.version = testers.testVersion {
-    package = yamlfmt;
-  };
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Extensible command line tool or library to format yaml files";

From 9c81a9073fda5cdb2c10fe20ec8378561b69e3ab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 13:05:00 +0200
Subject: [PATCH 311/357] python313Packages.automower-ble: 0.2.1 -> 0.2.7

Diff: https://github.com/alistair23/AutoMower-BLE/compare/refs/tags/0.2.1...refs/tags/0.2.7
---
 pkgs/development/python-modules/automower-ble/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/automower-ble/default.nix b/pkgs/development/python-modules/automower-ble/default.nix
index 1c33759ccefe..4c335e0f52dd 100644
--- a/pkgs/development/python-modules/automower-ble/default.nix
+++ b/pkgs/development/python-modules/automower-ble/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "automower-ble";
-  version = "0.2.1";
+  version = "0.2.7";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "alistair23";
     repo = "AutoMower-BLE";
     tag = version;
-    hash = "sha256-k0cVjpuhPFpPoPVFj0uoKVoFEQn4TNIuFLedJfawlaA=";
+    hash = "sha256-oOwSbGzTGXWm3Vmsui4k1lPRnT8+aIs6sk1DK/aRxzs=";
   };
 
   build-system = [ setuptools ];

From 7b19dbeb1c159096c1aa9ce2e864103a4ea3d5b4 Mon Sep 17 00:00:00 2001
From: x123 <x123@users.noreply.github.com>
Date: Sun, 3 Aug 2025 10:50:52 +0200
Subject: [PATCH 312/357] crush: init at 0.2.1

---
 pkgs/by-name/cr/crush/package.nix | 58 +++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 pkgs/by-name/cr/crush/package.nix

diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix
new file mode 100644
index 000000000000..816a2b4b183f
--- /dev/null
+++ b/pkgs/by-name/cr/crush/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  writableTmpDirAsHomeHook,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "crush";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "charmbracelet";
+    repo = "crush";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-SjrkQFSjJrPNynARE92uKA53hkstIUBSvQbqcYSsnaM=";
+  };
+
+  vendorHash = "sha256-aI3MSaQYUOLJxBxwCoVg13HpxK46q6ZITrw1osx5tiE=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=github.com/charmbracelet/crush/internal/version.Version=${finalAttrs.version}"
+  ];
+
+  # rename TestMain to prevent it from running, as it panics in the sandbox.
+  postPatch = ''
+    sed -i 's/func TestMain/func DisabledTestMain/' internal/llm/provider/openai_test.go
+  '';
+
+  checkFlags =
+    let
+      # these tests fail in the sandbox
+      skippedTests = [
+        "TestOpenAIClientStreamChoices"
+        "TestGrepWithIgnoreFiles"
+        "TestSearchImplementations"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+  doInstallCheck = true;
+  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  updateScript = nix-update-script { };
+
+  meta = {
+    description = "Glamourous AI coding agent for your favourite terminal";
+    homepage = "https://github.com/charmbracelet/crush";
+    license = lib.licenses.fsl11Mit;
+    maintainers = with lib.maintainers; [ x123 ];
+    mainProgram = "crush";
+  };
+})

From 2c94210d066a2b769e9ce6762c6f92bb5362cdf8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 11:45:35 +0000
Subject: [PATCH 313/357] python3Packages.disposable-email-domains: 0.0.128 ->
 0.0.129

---
 .../python-modules/disposable-email-domains/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix
index dfe1af3af2c7..ece17e48f9ef 100644
--- a/pkgs/development/python-modules/disposable-email-domains/default.nix
+++ b/pkgs/development/python-modules/disposable-email-domains/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "disposable-email-domains";
-  version = "0.0.128";
+  version = "0.0.129";
   pyproject = true;
 
   # No tags on GitHub
   src = fetchPypi {
     pname = "disposable_email_domains";
     inherit version;
-    hash = "sha256-M7dy5oNkZv5a7S+Cc03dn2Ewyv6i6kvCIFGcWV8HDeU=";
+    hash = "sha256-zHyTuJtE78xTj9NHvNmD8b8RmmdMxROsZO9r5UG1D6k=";
   };
 
   build-system = [

From 0eb9bfe1ca58b182311de174ab1d5512405ea8c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 06:45:21 +0000
Subject: [PATCH 314/357] bash-preexec: 0.5.0 -> 0.6.0

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

diff --git a/pkgs/by-name/ba/bash-preexec/package.nix b/pkgs/by-name/ba/bash-preexec/package.nix
index 14fb7e109cfe..3eb7a82f4dfb 100644
--- a/pkgs/by-name/ba/bash-preexec/package.nix
+++ b/pkgs/by-name/ba/bash-preexec/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.5.0";
+  version = "0.6.0";
 in
 stdenvNoCC.mkDerivation {
   pname = "bash-preexec";
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
     owner = "rcaloras";
     repo = "bash-preexec";
     rev = version;
-    sha256 = "sha256-+FU5n7EkY78X5nUiW3WN9+6Bf6oiPjsG2MSRCleooFs=";
+    sha256 = "sha256-4DzbeIiUX7iXy2CeSvRC2X+XnjVk+/UiMbM/dLHx7zU=";
   };
 
   nativeCheckInputs = [ bats ];

From 8188559e944a3217d19547e1b2b0ae7bc25dc595 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 12:49:59 +0000
Subject: [PATCH 315/357] swaylock: 1.8.2 -> 1.8.3

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

diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix
index be4d8de92b1c..de20c0274a0f 100644
--- a/pkgs/by-name/sw/swaylock/package.nix
+++ b/pkgs/by-name/sw/swaylock/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "swaylock";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "swaylock";
     tag = "v${version}";
-    hash = "sha256-VZxUyASWyg+UMTTYeuyRIO+++ZKL0nAqjNS6nJ756yk=";
+    hash = "sha256-5JAA8mCY3vOsauvRK2zquBrzA2ROakEfahzp4a6j/Ac=";
   };
 
   strictDeps = true;

From 2936efa07065df5c6437b1ab29931321d7414c03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 13:07:52 +0000
Subject: [PATCH 316/357] libiec61850: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/by-name/li/libiec61850/package.nix b/pkgs/by-name/li/libiec61850/package.nix
index 94261d06dfdb..eca61dc38b33 100644
--- a/pkgs/by-name/li/libiec61850/package.nix
+++ b/pkgs/by-name/li/libiec61850/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libiec61850";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "mz-automation";
     repo = "libiec61850";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-KFUqeDe90wrqMueD8AYgB1scl6OZkKW2z+oV9wREF3k=";
+    hash = "sha256-9UPXuZkAxr3SSjPN3VZRr6Hsz0GyDVJLUZEM+zZruik=";
   };
 
   separateDebugInfo = true;

From 1c9bc048c94012dcb222cfe3f472c9f3193f6a7d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 3 Aug 2025 15:18:38 +0200
Subject: [PATCH 317/357] corestore: 7.1.0 -> 7.4.5

---
 pkgs/by-name/co/corestore/package-lock.json | 901 ++++++++++++++------
 pkgs/by-name/co/corestore/package.nix       |   7 +-
 2 files changed, 633 insertions(+), 275 deletions(-)

diff --git a/pkgs/by-name/co/corestore/package-lock.json b/pkgs/by-name/co/corestore/package-lock.json
index 3dcfbff427de..0e2f2d6548c2 100644
--- a/pkgs/by-name/co/corestore/package-lock.json
+++ b/pkgs/by-name/co/corestore/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "corestore",
-  "version": "7.1.0",
+  "version": "7.4.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "corestore",
-      "version": "7.1.0",
+      "version": "7.4.5",
       "license": "MIT",
       "dependencies": {
         "b4a": "^1.6.7",
@@ -15,7 +15,8 @@
         "hypercore-errors": "^1.4.0",
         "hypercore-id-encoding": "^1.3.0",
         "ready-resource": "^1.1.1",
-        "sodium-universal": "^4.0.1"
+        "sodium-universal": "^5.0.1",
+        "which-runtime": "^1.2.1"
       },
       "devDependencies": {
         "brittle": "^3.7.0",
@@ -25,9 +26,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.5.1.tgz",
-      "integrity": "sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
+      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -126,32 +127,22 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@hyperswarm/secret-stream": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/@hyperswarm/secret-stream/-/secret-stream-6.7.1.tgz",
-      "integrity": "sha512-isb18Pt6lXBpOQMRmpqItw+kYynXilOFyOhto/RMP15WQtTWC0rR5jfZPYXU7ZYV6Kxd2lyQ4ZBevoIcvEJHEQ==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/@hyperswarm/secret-stream/-/secret-stream-6.8.1.tgz",
+      "integrity": "sha512-F3fr8CKB6za9Ac7ifjgAe07qnnesl5kS0MtLsyKxA1Og8E+FZykdwLpgoLjnEa7G6E1L56lASLr42E4kd20sog==",
       "license": "Apache-2.0",
       "dependencies": {
         "b4a": "^1.1.0",
         "hypercore-crypto": "^3.3.1",
         "noise-curve-ed": "^2.0.1",
-        "noise-handshake": "^3.0.2",
+        "noise-handshake": "^4.0.0",
         "sodium-secretstream": "^1.1.0",
-        "sodium-universal": "^4.0.0",
+        "sodium-universal": "^5.0.0",
         "streamx": "^2.14.0",
         "timeout-refresh": "^2.0.0",
         "unslab": "^1.3.0"
       }
     },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
@@ -163,16 +154,16 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
+      "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "version": "0.3.29",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
+      "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -247,9 +238,9 @@
       "license": "ISC"
     },
     "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -337,18 +328,20 @@
       }
     },
     "node_modules/array-includes": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
-      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
+      "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "is-string": "^1.0.7"
+        "es-abstract": "^1.24.0",
+        "es-object-atoms": "^1.1.1",
+        "get-intrinsic": "^1.3.0",
+        "is-string": "^1.1.1",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -477,6 +470,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/assert": {
+      "name": "bare-assert",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bare-assert/-/bare-assert-1.0.2.tgz",
+      "integrity": "sha512-7AGTrUCz7OOWnMOp4hWnksAkFeZlvW7WMwvKQBANVJIOtjWa6RLSPyUN+zs3QBufRZwIYhYB3UpkAlDbBPp2/Q==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
     "node_modules/async-function": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
@@ -534,19 +535,99 @@
         }
       }
     },
-    "node_modules/bare-cov": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bare-cov/-/bare-cov-1.0.1.tgz",
-      "integrity": "sha512-r/qCY1ZWUvD0QY04ZHgRy8qXW/x+vD+Iofg1l/OiYmTz4h46oMF7DHWl/NkgUZBKK2X6QoE4Q/w/JvJDmh5+HQ==",
+    "node_modules/bare-ansi-escapes": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/bare-ansi-escapes/-/bare-ansi-escapes-2.2.3.tgz",
+      "integrity": "sha512-02ES4/E2RbrtZSnHJ9LntBhYkLA6lPpSEeP8iqS3MccBIVhVBlEmruF1I7HZqx5Q8aiTeYfQVeqmrU9YO2yYoQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@istanbuljs/schema": "^0.1.3",
-        "istanbul-lib-coverage": "^3.2.2",
-        "istanbul-lib-report": "^3.0.1",
-        "istanbul-reports": "^3.1.7",
+        "bare-stream": "^2.6.5"
+      },
+      "peerDependencies": {
+        "bare-buffer": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-buffer": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/bare-assert": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bare-assert/-/bare-assert-1.0.2.tgz",
+      "integrity": "sha512-7AGTrUCz7OOWnMOp4hWnksAkFeZlvW7WMwvKQBANVJIOtjWa6RLSPyUN+zs3QBufRZwIYhYB3UpkAlDbBPp2/Q==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/bare-cov": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/bare-cov/-/bare-cov-1.1.1.tgz",
+      "integrity": "sha512-YP0QjpKznC55rn3fc3hOPjcegm1eu/ZHVwS+t1c48O48bWMspWzBY+9a6fI5sb/PGwqv47W4clpnmcy7vKhYrQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-fs": "^4.1.2",
+        "bare-inspector": "^4.0.1",
+        "bare-path": "^3.0.0",
+        "bare-process": "^4.2.1",
+        "bare-url": "^2.1.5",
+        "bare-v8-to-istanbul": "v1.0.0",
         "picomatch": "^4.0.2",
-        "v8-to-istanbul": "^9.3.0"
+        "which-runtime": "^1.2.1"
+      }
+    },
+    "node_modules/bare-crypto": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/bare-crypto/-/bare-crypto-1.7.0.tgz",
+      "integrity": "sha512-HPoNUQitmlihHzBotCG5huj0zRpVabrsRfoq6yCB+Y1HRftXmMJPMfVKxELijaMCMSJtlvw6ytotE88lwf6qdg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-stream": "^2.6.3"
+      },
+      "peerDependencies": {
+        "bare-buffer": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-buffer": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/bare-debug-log": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/bare-debug-log/-/bare-debug-log-2.0.0.tgz",
+      "integrity": "sha512-Vi42PkMQsNV9PUpx2Gl1hikshx5O9FzMJ6o9Nnopseg7qLBBK7Nl31d0RHcfwLEAfmcPApytpc0ZFfq68u22FQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-os": "^3.0.1"
+      }
+    },
+    "node_modules/bare-dns": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/bare-dns/-/bare-dns-2.1.2.tgz",
+      "integrity": "sha512-0GCTZBzL3vJ/xfupMnmKGHYNMrFBpX3sK4I2nTXgH2BAwifvyXVCEKFVypAwyqQJ85tYuTel52nD6us7CqfHXQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "bare": ">=1.7.0"
+      }
+    },
+    "node_modules/bare-encoding": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/bare-encoding/-/bare-encoding-1.0.0.tgz",
+      "integrity": "sha512-9T5CSCaytaIWZpFWx9LQLJ6/z/m2Slnan9tQBKmOvoq/UtPBbOKT/B2fo29Xhi4X1FFtNx8DFdtrFgqm2yse/Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "bare-buffer": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-buffer": {
+          "optional": true
+        }
       }
     },
     "node_modules/bare-env": {
@@ -560,15 +641,25 @@
       }
     },
     "node_modules/bare-events": {
-      "version": "2.5.4",
-      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.4.tgz",
-      "integrity": "sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.6.0.tgz",
+      "integrity": "sha512-EKZ5BTXYExaNqi3I3f9RtEsaI/xBSGjE0XZCZilPzFAV/goswFHuPd9jEZlPIZ/iNZJwDSao9qRiScySz7MbQg==",
       "license": "Apache-2.0"
     },
+    "node_modules/bare-format": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bare-format/-/bare-format-1.0.1.tgz",
+      "integrity": "sha512-1oS+LZrWK6tnYnvNSHDGljc2MPunRxwhpFriuCgzNF+oklrnwmBKD91tS0yt+jpl2j3UgcSDzBIMiVTvLs9A8w==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-inspect": "^3.0.0"
+      }
+    },
     "node_modules/bare-fs": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.2.tgz",
-      "integrity": "sha512-8wSeOia5B7LwD4+h465y73KOdj5QHsbbuoUfPBi+pXgFJIPuG7SsiOdJuijWMyfid49eD+WivpfY7KT8gbAzBA==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.6.tgz",
+      "integrity": "sha512-25RsLF33BqooOEFNdMcEhMpJy8EoR88zSMrnOQOaM3USnOK2VmaJ1uaQEwPA6AQjrv1lXChScosN6CzbwbO9OQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "bare-events": "^2.5.4",
@@ -587,10 +678,72 @@
         }
       }
     },
+    "node_modules/bare-hrtime": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/bare-hrtime/-/bare-hrtime-2.0.11.tgz",
+      "integrity": "sha512-Mnb2rnGRSHzNHQwFrK8VVqD8Oob/CiSsBlgZGKQ1xTj25GPI19sXHjUPzrkHOU1DaoVj1ig1VO7rZGaYOfXPaw==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/bare-http1": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/bare-http1/-/bare-http1-4.0.2.tgz",
+      "integrity": "sha512-6Jns5oBG9LFz/U2PuFk2LHQbQ1ZuUgPyuahfbNikPL/HcjpSGdSl0xMiN3Qt852Xm1sLBsTGxl0OoM2cVCYzNQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-events": "^2.0.0",
+        "bare-stream": "^2.3.0",
+        "bare-tcp": "^2.0.0"
+      }
+    },
+    "node_modules/bare-https": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/bare-https/-/bare-https-2.0.0.tgz",
+      "integrity": "sha512-qmjNZmYQ4nn+k3CLlxVyOqWYamdBPqE7psR5/lFWG39fskAR4C2h29d1Ka5BeWOGDAWhXImFIwZUxwCE/7xeLA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-http1": "^4.0.0",
+        "bare-tcp": "^2.0.0",
+        "bare-tls": "^2.0.0"
+      }
+    },
+    "node_modules/bare-inspect": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/bare-inspect/-/bare-inspect-3.1.1.tgz",
+      "integrity": "sha512-DOqRxa/qYZS+P3+3yVdroeixaqc6+gwiSUHntS5294Iykhe9ySzlfoRvSDM//xUHad8sQ59IOhyCoedFluvC6g==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-ansi-escapes": "^2.1.0",
+        "bare-type": "^1.0.0"
+      },
+      "engines": {
+        "bare": ">=1.18.0"
+      }
+    },
+    "node_modules/bare-inspector": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/bare-inspector/-/bare-inspector-4.0.1.tgz",
+      "integrity": "sha512-MZGIci2OFzwDNWlY/JUmEVtK/0xa+mbdggOB0jSI0WYkQpyxaiD4q/8xZ42k4kOoZNLKpYMI31wmllm6jS5w9g==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-events": "^2.1.0",
+        "bare-http1": "^4.0.0",
+        "bare-stream": "^2.0.0",
+        "bare-url": "^2.0.0",
+        "bare-ws": "^2.0.0"
+      },
+      "engines": {
+        "bare": ">=1.2.0"
+      }
+    },
     "node_modules/bare-module-resolve": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/bare-module-resolve/-/bare-module-resolve-1.10.2.tgz",
-      "integrity": "sha512-C9COe/GhWfVXKytW3DElTkiBU+Gb2OXeaVkdGdRB/lp26TVLESHkTGS876iceAGdvtPgohfp9nX8vXHGvN3++Q==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/bare-module-resolve/-/bare-module-resolve-1.11.1.tgz",
+      "integrity": "sha512-DCxeT9i8sTs3vUMA3w321OX/oXtNEu5EjObQOnTmCdNp5RXHBAvAaBDHvAi9ta0q/948QPz+co6SsGi6aQMYRg==",
       "license": "Apache-2.0",
       "dependencies": {
         "bare-semver": "^1.0.0"
@@ -604,6 +757,19 @@
         }
       }
     },
+    "node_modules/bare-net": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/bare-net/-/bare-net-2.0.1.tgz",
+      "integrity": "sha512-klzDKbZFzfguS6054Yv+8/e9rhggYVAg8I8svCWCtYkMwdlh3hz1SGCut6Q7d7iqV60YtuG3Y8957DqLcKuEJQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-events": "^2.2.2",
+        "bare-pipe": "^4.0.0",
+        "bare-stream": "^2.0.0",
+        "bare-tcp": "^2.0.0"
+      }
+    },
     "node_modules/bare-os": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.1.tgz",
@@ -623,9 +789,9 @@
       }
     },
     "node_modules/bare-pipe": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/bare-pipe/-/bare-pipe-4.0.5.tgz",
-      "integrity": "sha512-pGI5lPp0QMecENYm1KxAeM0pomByCB4ubUt2C78xaagH4et6Bc2OTzM0y3Bc91AT8ERIG4iNPmAKVjgaxYcwIQ==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/bare-pipe/-/bare-pipe-4.0.6.tgz",
+      "integrity": "sha512-S9kpDJq74gkceynfRqXCaED119k2jF2us4U9xZnTLX0GEduWQY29MNTpAMAf/ucEailW9SPLjGLzbfPCONz3Lw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -636,12 +802,42 @@
         "bare": ">=1.16.0"
       }
     },
+    "node_modules/bare-process": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/bare-process/-/bare-process-4.2.1.tgz",
+      "integrity": "sha512-wcmyQWTHxd2xRgeKUSY46ofmuEAJ9CLo/6swJTHOZFPYpBShMWNPVI2Ba8o0n/X/YE4as99M28x37saWZ1L1vQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-env": "^3.0.0",
+        "bare-events": "^2.3.1",
+        "bare-hrtime": "^2.0.0",
+        "bare-os": "^3.5.0",
+        "bare-pipe": "^4.0.0",
+        "bare-signals": "^4.0.0",
+        "bare-tty": "^5.0.0"
+      }
+    },
     "node_modules/bare-semver": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/bare-semver/-/bare-semver-1.0.1.tgz",
       "integrity": "sha512-UtggzHLiTrmFOC/ogQ+Hy7VfoKoIwrP1UFcYtTxoCUdLtsIErT8+SWtOC2DH/snT9h+xDrcBEPcwKei1mzemgg==",
       "license": "Apache-2.0"
     },
+    "node_modules/bare-signals": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/bare-signals/-/bare-signals-4.0.3.tgz",
+      "integrity": "sha512-xIy8ILawd3xepmpsYYMzPgMWsZm471Onw6jcqoitczuH6kNqN0NVkFKcEztpdq82MMfcsyo7xqLQIgmeoB05rg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-events": "^2.5.3",
+        "bare-os": "^3.3.1"
+      },
+      "engines": {
+        "bare": ">=1.7.0"
+      }
+    },
     "node_modules/bare-stream": {
       "version": "2.6.5",
       "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.6.5.tgz",
@@ -664,9 +860,9 @@
       }
     },
     "node_modules/bare-subprocess": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/bare-subprocess/-/bare-subprocess-5.0.3.tgz",
-      "integrity": "sha512-iCx8kfvqClPAQGsbL2RfMubB6EYoZ67ZhaEIpn6wIqIa60p4zLAlGJyEQQtXPo/5dclbpgzWre5hvJ7HzXC/aA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/bare-subprocess/-/bare-subprocess-5.1.0.tgz",
+      "integrity": "sha512-uUQdB2Ks+eUXPwYDGKQ2ZX1hV8AoS1fs5ep33GkMIAv21f4zy/soV9IejjlbSqJbnmDLC44RyitRzSAbIed1ng==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -687,15 +883,131 @@
         }
       }
     },
+    "node_modules/bare-tcp": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/bare-tcp/-/bare-tcp-2.0.7.tgz",
+      "integrity": "sha512-3I91sieZw1WYZDK5nNf/XVBBne0hhsIJsLqy29o/IRITBidK0rJP9ZsKOLlYSiop1PFj7VNWd1ZQtgbQh9wnCg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-dns": "^2.0.4",
+        "bare-events": "^2.5.4",
+        "bare-stream": "^2.6.4"
+      },
+      "engines": {
+        "bare": ">=1.16.0"
+      }
+    },
+    "node_modules/bare-tls": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bare-tls/-/bare-tls-2.1.1.tgz",
+      "integrity": "sha512-56xUcgn8iEAP0Sje7OgZSwari176L0nNQaEBbpsdCVytxz10dmRY0thSFNOXpCPWIhtuH1AMK0ZzK0l0IxcxPQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-net": "^2.0.1",
+        "bare-stream": "^2.6.4"
+      },
+      "engines": {
+        "bare": ">=1.7.0"
+      }
+    },
+    "node_modules/bare-tty": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/bare-tty/-/bare-tty-5.0.2.tgz",
+      "integrity": "sha512-xOHwI7zZl2Opm7Rul5O+okE32j7O14feJhgovJX2EghtQ2IWVfiC1oH0DmFruMvKthvhZY/Lpg8n5SVBaZhV1A==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-events": "^2.2.0",
+        "bare-signals": "^4.0.0",
+        "bare-stream": "^2.0.0"
+      },
+      "engines": {
+        "bare": ">=1.16.0"
+      }
+    },
+    "node_modules/bare-type": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/bare-type/-/bare-type-1.0.6.tgz",
+      "integrity": "sha512-6QFeIIp1d06xU9BjDPkl8+QeHil3TKSDpIKUid6bQzwYvxFOnMVhAifRS3J0fvWirEMlWmqxDDKjHW8RPe6C3Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "bare": ">=1.2.0"
+      }
+    },
     "node_modules/bare-url": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.1.5.tgz",
-      "integrity": "sha512-lNImB5KLN+ggw+SYDYvqf/yCizXIyq8U/nWBlx7m4pc4TKS24SB/1WWskzGacon5cVVAC6qUzCYzI/aMYCf4Ng==",
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.1.6.tgz",
+      "integrity": "sha512-FgjDeR+/yDH34By4I0qB5NxAoWv7dOTYcOXwn73kr+c93HyC2lU6tnjifqUe33LKMJcDyCYPQjEAqgOQiXkE2Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "bare-path": "^3.0.0"
       }
     },
+    "node_modules/bare-utils": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/bare-utils/-/bare-utils-1.3.0.tgz",
+      "integrity": "sha512-s0wQMUw4tjaW5x+mknXPcmmX25v4D27+gqo5IavCpsjjgloA7ta7aXtt/tqlR4ADEUZe4ANzQiLRXrzuMxHdcA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-debug-log": "^2.0.0",
+        "bare-encoding": "^1.0.0",
+        "bare-format": "^1.0.0",
+        "bare-inspect": "^3.0.0"
+      }
+    },
+    "node_modules/bare-v8-to-istanbul": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/bare-v8-to-istanbul/-/bare-v8-to-istanbul-1.0.0.tgz",
+      "integrity": "sha512-5xm9ykzWrk7ntC0Ps2tnNwlFlEAMb3Rk0w/WlwJ/A1xboTQKa9f+NO/31PXB5LspMaz9Qv2pnIwiiHWEnk+kXQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "assert": "npm:bare-assert",
+        "bare-assert": "^1.0.2",
+        "bare-fs": "^4.1.2",
+        "bare-path": "^3.0.0",
+        "bare-process": "^4.2.0",
+        "bare-url": "^2.1.5",
+        "bare-utils": "^1.2.0",
+        "fs": "npm:bare-fs",
+        "path": "npm:bare-path",
+        "process": "npm:bare-process",
+        "url": "npm:bare-url",
+        "util": "npm:bare-utils",
+        "v8-to-istanbul": "^9.3.0",
+        "which-runtime": "^1.2.1"
+      }
+    },
+    "node_modules/bare-ws": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/bare-ws/-/bare-ws-2.0.3.tgz",
+      "integrity": "sha512-be3cX68FQKln0jnsuyh1eK60EIM8/hYPFNHYZykN1fS3shWhzdKFo+I4gtZloSzS4aIKtVpi7+M0by8Q9y/NSA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-crypto": "^1.2.0",
+        "bare-events": "^2.3.1",
+        "bare-http1": "^4.0.0",
+        "bare-https": "^2.0.0",
+        "bare-stream": "^2.1.2"
+      },
+      "peerDependencies": {
+        "bare-buffer": "*",
+        "bare-url": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-buffer": {
+          "optional": true
+        },
+        "bare-url": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/big-sparse-array": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/big-sparse-array/-/big-sparse-array-1.0.3.tgz",
@@ -703,9 +1015,9 @@
       "license": "MIT"
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -714,24 +1026,29 @@
       }
     },
     "node_modules/brittle": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/brittle/-/brittle-3.13.1.tgz",
-      "integrity": "sha512-/j8hTAhc/u4MDkrexC5MjYErgNMWCpYHZONmhI7wmMJPRY+lef/KW1PzDRzK3i5Gopig1Bos/zlwqeysdjqw/g==",
+      "version": "3.17.0",
+      "resolved": "https://registry.npmjs.org/brittle/-/brittle-3.17.0.tgz",
+      "integrity": "sha512-9IJXmSkJozjsDH/WepQ7f1pY4PgZt34QjMcKhUxYwF+q8E7x6197NU+4/NTNmF5Jw5J1ruF73IIj3gEu5ck8+w==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "b4a": "^1.6.0",
-        "bare-cov": "^1.0.1",
+        "bare-cov": "^1.1.0",
+        "bare-path": "^3.0.0",
+        "bare-process": "^4.2.1",
         "bare-subprocess": "^5.0.0",
         "error-stack-parser": "^2.1.4",
-        "globbie": "^1.0.0",
+        "globbie": "^1.0.2",
         "paparam": "^1.6.2",
         "same-object": "^1.0.2",
         "test-tmp": "^1.4.0",
         "tmatch": "^5.0.0"
       },
       "bin": {
-        "brittle": "cmd.js"
+        "brittle": "bin/node.js",
+        "brittle-bare": "bin/bare.js",
+        "brittle-node": "bin/node.js",
+        "brittle-pear": "bin/pear.js"
       }
     },
     "node_modules/builtins": {
@@ -744,6 +1061,19 @@
         "semver": "^7.0.0"
       }
     },
+    "node_modules/builtins/node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/call-bind": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
@@ -842,9 +1172,9 @@
       "license": "MIT"
     },
     "node_modules/compact-encoding": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/compact-encoding/-/compact-encoding-2.16.0.tgz",
-      "integrity": "sha512-zG2ul4Egc8ktfmj2vYiC6s/U3u1OkNyUGj32jrJq6qcJ4atGcEpVr+AI+VDJ3oteNfGIw/uol4oBQyB74OeGvw==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/compact-encoding/-/compact-encoding-2.16.1.tgz",
+      "integrity": "sha512-vP39X4nwtesmZucaAxDg4wnudOoaJTSR+fikzi8VLVxbwLmcWXf3t0LxY0n2H1AMpdoQZ08lmUf4GY3XiDPnMQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "b4a": "^1.3.0"
@@ -934,9 +1264,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -995,9 +1325,9 @@
       }
     },
     "node_modules/device-file": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/device-file/-/device-file-1.2.5.tgz",
-      "integrity": "sha512-/WKlIqNmGh1OlDyLQquH+wKqFrgm1G1S3rbZhur2AgR0e3KEO4nYncqSDe7MVK/kVuqRzNCSLPFapLwtxcV43Q==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/device-file/-/device-file-1.2.6.tgz",
+      "integrity": "sha512-gHH0lYHWvxjDOstkLji6ExtmYUPtpgICdkEeOuKkodiz111e7rPZP1WWwHlEmvA/gDNQl3KJkbWJ8YDidu3C4A==",
       "license": "Apache-2.0",
       "dependencies": {
         "b4a": "^1.6.7",
@@ -1054,9 +1384,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.23.9",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
-      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
+      "version": "1.24.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
+      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1064,18 +1394,18 @@
         "arraybuffer.prototype.slice": "^1.0.4",
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
+        "call-bound": "^1.0.4",
         "data-view-buffer": "^1.0.2",
         "data-view-byte-length": "^1.0.2",
         "data-view-byte-offset": "^1.0.1",
         "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
+        "es-object-atoms": "^1.1.1",
         "es-set-tostringtag": "^2.1.0",
         "es-to-primitive": "^1.3.0",
         "function.prototype.name": "^1.1.8",
-        "get-intrinsic": "^1.2.7",
-        "get-proto": "^1.0.0",
+        "get-intrinsic": "^1.3.0",
+        "get-proto": "^1.0.1",
         "get-symbol-description": "^1.1.0",
         "globalthis": "^1.0.4",
         "gopd": "^1.2.0",
@@ -1087,21 +1417,24 @@
         "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
         "is-data-view": "^1.0.2",
+        "is-negative-zero": "^2.0.3",
         "is-regex": "^1.2.1",
+        "is-set": "^2.0.3",
         "is-shared-array-buffer": "^1.0.4",
         "is-string": "^1.1.1",
         "is-typed-array": "^1.1.15",
-        "is-weakref": "^1.1.0",
+        "is-weakref": "^1.1.1",
         "math-intrinsics": "^1.1.0",
-        "object-inspect": "^1.13.3",
+        "object-inspect": "^1.13.4",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.7",
         "own-keys": "^1.0.1",
-        "regexp.prototype.flags": "^1.5.3",
+        "regexp.prototype.flags": "^1.5.4",
         "safe-array-concat": "^1.1.3",
         "safe-push-apply": "^1.0.0",
         "safe-regex-test": "^1.1.0",
         "set-proto": "^1.0.0",
+        "stop-iteration-iterator": "^1.1.0",
         "string.prototype.trim": "^1.2.10",
         "string.prototype.trimend": "^1.0.9",
         "string.prototype.trimstart": "^1.0.8",
@@ -1110,7 +1443,7 @@
         "typed-array-byte-offset": "^1.0.4",
         "typed-array-length": "^1.0.7",
         "unbox-primitive": "^1.1.0",
-        "which-typed-array": "^1.1.18"
+        "which-typed-array": "^1.1.19"
       },
       "engines": {
         "node": ">= 0.4"
@@ -1375,9 +1708,9 @@
       }
     },
     "node_modules/eslint-module-utils": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
-      "integrity": "sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz",
+      "integrity": "sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1449,30 +1782,30 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.31.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.31.0.tgz",
-      "integrity": "sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==",
+      "version": "2.32.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
+      "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
-        "array-includes": "^3.1.8",
-        "array.prototype.findlastindex": "^1.2.5",
-        "array.prototype.flat": "^1.3.2",
-        "array.prototype.flatmap": "^1.3.2",
+        "array-includes": "^3.1.9",
+        "array.prototype.findlastindex": "^1.2.6",
+        "array.prototype.flat": "^1.3.3",
+        "array.prototype.flatmap": "^1.3.3",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
         "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.12.0",
+        "eslint-module-utils": "^2.12.1",
         "hasown": "^2.0.2",
-        "is-core-module": "^2.15.1",
+        "is-core-module": "^2.16.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
         "object.fromentries": "^2.0.8",
         "object.groupby": "^1.0.3",
-        "object.values": "^1.2.0",
+        "object.values": "^1.2.1",
         "semver": "^6.3.1",
-        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimend": "^1.0.9",
         "tsconfig-paths": "^3.15.0"
       },
       "engines": {
@@ -1505,16 +1838,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/eslint-plugin-n": {
       "version": "15.7.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz",
@@ -1541,6 +1864,19 @@
         "eslint": ">=7.0.0"
       }
     },
+    "node_modules/eslint-plugin-n/node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/eslint-plugin-promise": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz",
@@ -1621,16 +1957,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint-plugin-react/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/eslint-scope": {
       "version": "7.2.2",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
@@ -1865,6 +2191,30 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/fs": {
+      "name": "bare-fs",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.1.6.tgz",
+      "integrity": "sha512-25RsLF33BqooOEFNdMcEhMpJy8EoR88zSMrnOQOaM3USnOK2VmaJ1uaQEwPA6AQjrv1lXChScosN6CzbwbO9OQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-events": "^2.5.4",
+        "bare-path": "^3.0.0",
+        "bare-stream": "^2.6.4"
+      },
+      "engines": {
+        "bare": ">=1.16.0"
+      },
+      "peerDependencies": {
+        "bare-buffer": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-buffer": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/fs-native-extensions": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/fs-native-extensions/-/fs-native-extensions-1.4.2.tgz",
@@ -2077,13 +2427,15 @@
       }
     },
     "node_modules/globbie": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/globbie/-/globbie-1.0.1.tgz",
-      "integrity": "sha512-gcokK9aku5LU7KgbQAmtjtxmBbp0viw7qNZr6aA3p/YqSg7G1rZXA9wx2xsUSi3F3pashx0wmUs68lMXXNbSgw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globbie/-/globbie-1.0.3.tgz",
+      "integrity": "sha512-hcryJmKcftf82xfBWTWxuUITWIIoYO3ec104V17SMHGFl6VLbm1d1Ju9LX9L+jyJTwICpemX/dmPI/HGYoKr1A==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "brittle": "^3.6.0",
+        "bare-fs": "^4.1.2",
+        "bare-path": "^3.0.0",
+        "bare-process": "^4.2.1",
         "picomatch": "^4.0.2"
       }
     },
@@ -2208,17 +2560,10 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/hypercore": {
-      "version": "11.1.2",
-      "resolved": "https://registry.npmjs.org/hypercore/-/hypercore-11.1.2.tgz",
-      "integrity": "sha512-wiCLejTqCX74Z9UXs/N80h6tktiG6iqHf5wLkAeDWztEsXfRy4AQ7U9PqUIYBnaYuIRaReMPYiMeYPKs0eLUUg==",
+      "version": "11.11.2",
+      "resolved": "https://registry.npmjs.org/hypercore/-/hypercore-11.11.2.tgz",
+      "integrity": "sha512-KbbMcdxPkuCukDD9zUmKLoAX2wReyCGBHA+wjJ7lcs/UJQl1XzYnkOFlDdp+xV9wHc7WncxIgwsjgbwhxKiuBw==",
       "license": "MIT",
       "dependencies": {
         "@hyperswarm/secret-stream": "^6.0.0",
@@ -2229,43 +2574,30 @@
         "fast-fifo": "^1.3.0",
         "flat-tree": "^1.9.0",
         "hypercore-crypto": "^3.2.1",
-        "hypercore-encryption": "^1.0.0",
         "hypercore-errors": "^1.2.0",
         "hypercore-id-encoding": "^1.2.0",
         "hypercore-storage": "^1.0.0",
         "is-options": "^1.0.1",
+        "nanoassert": "^2.0.0",
         "protomux": "^3.5.0",
         "quickbit-universal": "^2.2.0",
         "random-array-iterator": "^1.0.0",
         "safety-catch": "^1.0.1",
-        "sodium-universal": "^4.0.0",
+        "sodium-universal": "^5.0.1",
         "streamx": "^2.12.4",
         "unslab": "^1.3.0",
         "z32": "^1.0.0"
       }
     },
     "node_modules/hypercore-crypto": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/hypercore-crypto/-/hypercore-crypto-3.5.0.tgz",
-      "integrity": "sha512-jIhMtPsBfomxruq5TsCl+jhMYsjWBOsSllQy006OFInoRhfIpXpcE28o1wU6qdMRdvzoEIiWmFxJC3SRUmt3WA==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/hypercore-crypto/-/hypercore-crypto-3.6.1.tgz",
+      "integrity": "sha512-ltIz2uDwy9pO/ZGTvqcjzyBkvt6O4cVm4r/nNxh0GFs/RbQtqP/i4wCvLEdmU7ptgtnw7fI67WYD1aHPuv4OVA==",
       "license": "MIT",
       "dependencies": {
         "b4a": "^1.6.6",
         "compact-encoding": "^2.15.0",
-        "sodium-universal": "^4.0.1"
-      }
-    },
-    "node_modules/hypercore-encryption": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/hypercore-encryption/-/hypercore-encryption-1.1.2.tgz",
-      "integrity": "sha512-n/tzQytyzCx3DHKKXsELE4uYlcHD9Y0U3Tfgf5NT0MM03pYmDFVsC2nYHYcdEBLSWNca0ZWwqBRFAb0DuQPN6w==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "b4a": "^1.6.7",
-        "compact-encoding": "^2.16.0",
-        "hypercore-crypto": "^3.5.0",
-        "ready-resource": "^1.1.2",
-        "sodium-native": "^4.3.3"
+        "sodium-universal": "^5.0.0"
       }
     },
     "node_modules/hypercore-errors": {
@@ -2285,9 +2617,9 @@
       }
     },
     "node_modules/hypercore-storage": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/hypercore-storage/-/hypercore-storage-1.11.0.tgz",
-      "integrity": "sha512-lJLL76UepyjdnhIq7OBAvrzrbt6fq/ZFX3ue+HcduzC/nzwo/LVK9Kna/aAVMAJOvYanSyy2N3hEeFbXda+c9g==",
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/hypercore-storage/-/hypercore-storage-1.14.0.tgz",
+      "integrity": "sha512-IkCRvDaBbZqR0nORvhtVN2h5NtJ/Of+dmxCy7tGzjW51cLrouBCJVBNJ005D6yIiEEvTMFogxPZIA+ZTFEP80Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "b4a": "^1.6.7",
@@ -2306,9 +2638,9 @@
       }
     },
     "node_modules/hyperschema": {
-      "version": "1.10.4",
-      "resolved": "https://registry.npmjs.org/hyperschema/-/hyperschema-1.10.4.tgz",
-      "integrity": "sha512-7qLp1jzB6XNSj5ru/3PagB39C6NzKpA36RUCrO0HCSLMpcKoMge2wUA+U32wY781oD5YIWAKZcNjvbdnXpS8ZQ==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/hyperschema/-/hyperschema-1.13.0.tgz",
+      "integrity": "sha512-cNbe7Ay2hSbQ1X/Yf1ch9kPPnKU78dq9LT7ppBE8l8LGZ0IKzIbVOWNIJYOXPr97hWHaoTvxIqhr5wb/R80Gmw==",
       "license": "Apache-2.0",
       "dependencies": {
         "bare-fs": "^4.0.1",
@@ -2355,9 +2687,9 @@
       }
     },
     "node_modules/index-encoder": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/index-encoder/-/index-encoder-3.3.2.tgz",
-      "integrity": "sha512-47q0gkBcF+aGM997RePrALMCfj6/5dVNqdLckHKBP7NhOnDPENVgDwWnsUbv1XCveWVQ+SXoZ8gXk+aOZspTTg==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/index-encoder/-/index-encoder-3.4.0.tgz",
+      "integrity": "sha512-k3+ENtseFYI9ZPOIZzVH8LlONUvXAcd4jvCPo+Nob/T/2t5R5Rfh8XiFXBG++gHHuVby7HBDp/3YbyEmE481cg==",
       "license": "Apache-2.0",
       "dependencies": {
         "b4a": "^1.6.4"
@@ -2610,6 +2942,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-number-object": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
@@ -2811,45 +3156,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/istanbul-lib-coverage": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
-      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^4.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-reports": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/iterator.prototype": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
@@ -3032,22 +3338,6 @@
         "loose-envify": "cli.js"
       }
     },
-    "node_modules/make-dir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "semver": "^7.5.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -3102,25 +3392,25 @@
       "license": "MIT"
     },
     "node_modules/noise-curve-ed": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/noise-curve-ed/-/noise-curve-ed-2.0.1.tgz",
-      "integrity": "sha512-8HMZ40Wmarg8RQjVemLrjB49JSL6eGeOD+tlzaQW5/p+hNPfHFEMC3UZZ57zUqUprMuz6GN+gsPExpz2DWL+iA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/noise-curve-ed/-/noise-curve-ed-2.1.0.tgz",
+      "integrity": "sha512-zAzJx+VwZM3w6EA1hTmDhJfvAnCeBQn/1FAeZ0LtGxCcCtlAK/uJXQVF/eDVUOaAZ286lHlx77WJ+qj9SmsRRg==",
       "license": "ISC",
       "dependencies": {
         "b4a": "^1.1.0",
         "nanoassert": "^2.0.0",
-        "sodium-universal": "^4.0.0"
+        "sodium-universal": "^5.0.0"
       }
     },
     "node_modules/noise-handshake": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/noise-handshake/-/noise-handshake-3.1.0.tgz",
-      "integrity": "sha512-0S1qkUvMbTvZCfgr/vSkVT84YyvI4Q0OLwSc5BFxVmjaePrxAwVeXeJDY3A7N/7+qj95gZ15LaNoP9ZnBXH5Lw==",
-      "license": "ISC",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/noise-handshake/-/noise-handshake-4.1.0.tgz",
+      "integrity": "sha512-ZHt2+mOXTvjtaWS2h/JPvQjmknfKrEld2xdSsRYWXnYiJmK/N+dtxrDVSt1cr9wGAlhH7Ek43lIZNsL5bVeX9A==",
+      "license": "Apache-2.0",
       "dependencies": {
         "b4a": "^1.1.0",
         "nanoassert": "^2.0.0",
-        "sodium-universal": "^4.0.0"
+        "sodium-universal": "^5.0.0"
       }
     },
     "node_modules/object-assign": {
@@ -3335,9 +3625,9 @@
       }
     },
     "node_modules/paparam": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/paparam/-/paparam-1.8.1.tgz",
-      "integrity": "sha512-yL1KdlFDYisSfp8Ewlv+FeAhKOFZCgMdJoKFcHolY/h2BPdyOlFTVe6/xrbZKHGAaUWS24xqpPUm2Iq9M0+LGg==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/paparam/-/paparam-1.8.5.tgz",
+      "integrity": "sha512-LLsGJwf3bJuf32jAfQYIMbt7oXuY2TXG3aWVHGXrE8o9cwGYIj+r/4J/VBn5Sgo+mA5lXzNnfqPqfBGPBIvjvQ==",
       "dev": true,
       "license": "Apache-2.0"
     },
@@ -3368,6 +3658,17 @@
         "node": ">=4"
       }
     },
+    "node_modules/path": {
+      "name": "bare-path",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",
+      "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-os": "^3.0.1"
+      }
+    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -3406,9 +3707,9 @@
       "license": "MIT"
     },
     "node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3528,6 +3829,23 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/process": {
+      "name": "bare-process",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/bare-process/-/bare-process-4.2.1.tgz",
+      "integrity": "sha512-wcmyQWTHxd2xRgeKUSY46ofmuEAJ9CLo/6swJTHOZFPYpBShMWNPVI2Ba8o0n/X/YE4as99M28x37saWZ1L1vQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-env": "^3.0.0",
+        "bare-events": "^2.3.1",
+        "bare-hrtime": "^2.0.0",
+        "bare-os": "^3.5.0",
+        "bare-pipe": "^4.0.0",
+        "bare-signals": "^4.0.0",
+        "bare-tty": "^5.0.0"
+      }
+    },
     "node_modules/prop-types": {
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
@@ -3591,13 +3909,12 @@
       "license": "MIT"
     },
     "node_modules/quickbit-native": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/quickbit-native/-/quickbit-native-2.3.6.tgz",
-      "integrity": "sha512-Fg4fRVW9lGMbT+QXhWcDvGSkkGCenbjx2EBg4rD3tDg7b2jW2Os+ypILpbXwXFoMKIlACIPvwerRxrPPFOTdVA==",
+      "version": "2.4.6",
+      "resolved": "https://registry.npmjs.org/quickbit-native/-/quickbit-native-2.4.6.tgz",
+      "integrity": "sha512-GXYG0vTLTknHs57qYpNzJO0e2dJpNFyIYZTnKTnOFG5mTUacJIRe7GssnyGJ273zG0iids0D0IOgmZUr0pLENg==",
       "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
-        "b4a": "^1.6.0",
         "require-addon": "^1.1.0"
       }
     },
@@ -3785,9 +4102,9 @@
       }
     },
     "node_modules/rocksdb-native": {
-      "version": "3.5.7",
-      "resolved": "https://registry.npmjs.org/rocksdb-native/-/rocksdb-native-3.5.7.tgz",
-      "integrity": "sha512-JlmoQo9kz9M8/d45cpVYlGt61/h6Ma1JHEnZDkZSGjVRaUpnaWrtKTEeTi57TEL04TsEWPEebKE37T8r1ioDwQ==",
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/rocksdb-native/-/rocksdb-native-3.6.4.tgz",
+      "integrity": "sha512-aeFHk3AjSwhWaUW3lQepyKus1NH0NXHXX4IAZDSYAcX+CacXyESFbxQlrMz9qsoRuX4QDYoBbawOU5jcXVbRZw==",
       "license": "Apache-2.0",
       "dependencies": {
         "compact-encoding": "^2.15.0",
@@ -3900,16 +4217,13 @@
       "license": "Apache-2.0"
     },
     "node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
       }
     },
     "node_modules/set-function-length": {
@@ -4084,31 +4398,35 @@
       }
     },
     "node_modules/sodium-native": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-4.3.3.tgz",
-      "integrity": "sha512-OnxSlN3uyY8D0EsLHpmm2HOFmKddQVvEMmsakCrXUzSd8kjjbzL413t4ZNF3n0UxSwNgwTyUvkmZHTfuCeiYSw==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/sodium-native/-/sodium-native-5.0.6.tgz",
+      "integrity": "sha512-lKSVfjJ867gb3LrnOZ0nuVxZ19//k/YhhYKVWQg4fklZ85YKtDHTxmEuWuk/s62IoiDbKC/DV50pcSd9tgaVew==",
       "license": "MIT",
       "dependencies": {
-        "require-addon": "^1.1.0"
+        "require-addon": "^1.1.0",
+        "which-runtime": "^1.2.1"
+      },
+      "engines": {
+        "bare": ">=1.16.0"
       }
     },
     "node_modules/sodium-secretstream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/sodium-secretstream/-/sodium-secretstream-1.1.1.tgz",
-      "integrity": "sha512-9lRQtNdQYmANo+sgNjEQafKrd/N4ojqv17E8wOzx3yOCaOJ5Gb4MuXoYq2Nv4Xo9Kt2fOROYcmV24bamu86c8A==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/sodium-secretstream/-/sodium-secretstream-1.2.0.tgz",
+      "integrity": "sha512-q/DbraNFXm1KfCiiZvapmz5UC3OlpirYFIvBK2MhGaOFSb3gRyk8OXTi17UI9SGfshQNCpsVvlopogbzZNyW6Q==",
       "license": "MIT",
       "dependencies": {
         "b4a": "^1.1.1",
-        "sodium-universal": "^4.0.0"
+        "sodium-universal": "^5.0.0"
       }
     },
     "node_modules/sodium-universal": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/sodium-universal/-/sodium-universal-4.0.1.tgz",
-      "integrity": "sha512-sNp13PrxYLaUFHTGoDKkSDFvoEu51bfzE12RwGlqU1fcrkpAOK0NvizaJzOWV0Omtk9me2+Pnbjcf/l0efxuGQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/sodium-universal/-/sodium-universal-5.0.1.tgz",
+      "integrity": "sha512-rv+aH+tnKB5H0MAc2UadHShLMslpJsc4wjdnHRtiSIEYpOetCgu8MS4ExQRia+GL/MK3uuCyZPeEsi+J3h+Q+Q==",
       "license": "MIT",
       "dependencies": {
-        "sodium-native": "^4.0.0"
+        "sodium-native": "^5.0.1"
       },
       "peerDependencies": {
         "sodium-javascript": "~0.8.0"
@@ -4194,10 +4512,24 @@
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
+    "node_modules/stop-iteration-iterator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "internal-slot": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/streamx": {
-      "version": "2.22.0",
-      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.0.tgz",
-      "integrity": "sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==",
+      "version": "2.22.1",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.22.1.tgz",
+      "integrity": "sha512-znKXEBxfatz2GBNK02kRnCXjV+AA4kjZIUxeWSr3UGirZMJfTE9uiwKHobnbgxWyL/JWro8tTq+vOqAK1/qbSA==",
       "license": "MIT",
       "dependencies": {
         "fast-fifo": "^1.3.2",
@@ -4566,6 +4898,31 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/url": {
+      "name": "bare-url",
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.1.6.tgz",
+      "integrity": "sha512-FgjDeR+/yDH34By4I0qB5NxAoWv7dOTYcOXwn73kr+c93HyC2lU6tnjifqUe33LKMJcDyCYPQjEAqgOQiXkE2Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-path": "^3.0.0"
+      }
+    },
+    "node_modules/util": {
+      "name": "bare-utils",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/bare-utils/-/bare-utils-1.3.0.tgz",
+      "integrity": "sha512-s0wQMUw4tjaW5x+mknXPcmmX25v4D27+gqo5IavCpsjjgloA7ta7aXtt/tqlR4ADEUZe4ANzQiLRXrzuMxHdcA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-debug-log": "^2.0.0",
+        "bare-encoding": "^1.0.0",
+        "bare-format": "^1.0.0",
+        "bare-inspect": "^3.0.0"
+      }
+    },
     "node_modules/v8-to-istanbul": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
@@ -4675,9 +5032,9 @@
       }
     },
     "node_modules/which-runtime": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/which-runtime/-/which-runtime-1.2.1.tgz",
-      "integrity": "sha512-8feIHccQFH/whiA1fD1b4c5+Q7T4ry1g1oHYc2mHnFh81tTQFsCvy3zhS2geUapkFAVBddUT/AM1a3rbqJweFg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/which-runtime/-/which-runtime-1.3.0.tgz",
+      "integrity": "sha512-mQrEBUe15PdEuJvrBlvy3tika6sxQrkblI7JQ9kXeg8Lcby9FwmKvAYrCT3wLh91k6ltost7AVM7qYhjC8N0Zg==",
       "license": "Apache-2.0"
     },
     "node_modules/which-typed-array": {
@@ -4752,4 +5109,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/pkgs/by-name/co/corestore/package.nix b/pkgs/by-name/co/corestore/package.nix
index c1131e95ae10..f2931d80ba27 100644
--- a/pkgs/by-name/co/corestore/package.nix
+++ b/pkgs/by-name/co/corestore/package.nix
@@ -7,20 +7,21 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "corestore";
-  version = "7.1.0";
+  version = "7.4.5";
 
   src = fetchFromGitHub {
     owner = "holepunchto";
     repo = "corestore";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lbbjYWJah1A2/ySBTI2Mg78dRjLyt/TJ5rhqBPxWOps=";
+    hash = "sha256-wuf7bPxHuzic2B4HCH7emM1+jc7gw+l5Sm/LCYnpvs4=";
   };
 
-  npmDepsHash = "sha256-3WfcomAOE+u/ZIn5M+sP/GkxArXx5IRFzf0IG4ykaiU=";
+  npmDepsHash = "sha256-hQYvQeTwlIWImdNhgpnJjDC24Fx4G0eST7tptWV1Xgw=";
 
   dontNpmBuild = true;
 
   # ERROR: Missing package-lock.json from src
+  # Upstream doesn't want to maintain a lockfile in their repo: https://github.com/holepunchto/corestore/issues/119
   # Copy vendored package-lock.json to src via postPatch
   postPatch = ''
     cp ${./package-lock.json} ./package-lock.json

From ef25209f9c7b17b6871a4caab0e1b76e3f307df9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 13:32:54 +0000
Subject: [PATCH 318/357] upbound-main: 0.39.0-384.g0a0c8634 ->
 0.41.0-0.rc.0.26.ge82e8330

---
 pkgs/by-name/up/upbound/sources-main.json | 34 +++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/up/upbound/sources-main.json b/pkgs/by-name/up/upbound/sources-main.json
index d2a1dccb4b91..8cbf2f83236e 100644
--- a/pkgs/by-name/up/upbound/sources-main.json
+++ b/pkgs/by-name/up/upbound/sources-main.json
@@ -8,38 +8,38 @@
   "fetchurlAttrSet": {
     "docker-credential-up": {
       "aarch64-darwin": {
-        "hash": "sha256-KHM5j1yzwBTCgP8L98Tg4bdcH3Bi47ZqMew8TdOmHfs=",
-        "url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/docker-credential-up/darwin_arm64.tar.gz"
+        "hash": "sha256-IF0/05xL5X4FFsaFTNvl8Q3Z2JaoBd4CV1HagtE3RG0=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/docker-credential-up/darwin_arm64.tar.gz"
       },
       "aarch64-linux": {
-        "hash": "sha256-QcGPdlXnLR8X//6+ViYLnB64H4V8DD5JRbFvFTdRiSA=",
-        "url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/docker-credential-up/linux_arm64.tar.gz"
+        "hash": "sha256-jioxVXVh39LUsMm2txqYk56azoJIxsvLK5NkZcD+SvY=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/docker-credential-up/linux_arm64.tar.gz"
       },
       "x86_64-darwin": {
-        "hash": "sha256-XTJmt1jMXTCfY6DAda0prKsGgj8FbQ1WdF7bzxIpvrE=",
-        "url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/docker-credential-up/darwin_amd64.tar.gz"
+        "hash": "sha256-C0jZRZCHdciNXsC7vrjPeeZaq8RIA4+noaF+JpMISiw=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/docker-credential-up/darwin_amd64.tar.gz"
       },
       "x86_64-linux": {
-        "hash": "sha256-6rBbIsOuxx29cEaRC4IKjAnkAPyy5s/r2UOYQ5lf6YA=",
-        "url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/docker-credential-up/linux_amd64.tar.gz"
+        "hash": "sha256-CVM9eo8KuyXskPIduO/Wvk+Uq5wyKKqQcYthUqsgCBA=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/docker-credential-up/linux_amd64.tar.gz"
       }
     },
     "up": {
       "aarch64-darwin": {
-        "hash": "sha256-AWOEJIVpU0NEWHStuOj39VpnYwKiSfgbGLeKjKYBEVY=",
-        "url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/up/darwin_arm64.tar.gz"
+        "hash": "sha256-Wx7cFeKVZAj5pfzvyR1NM9rMLeqHeyKegcrzTn3zVp4=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/up/darwin_arm64.tar.gz"
       },
       "aarch64-linux": {
-        "hash": "sha256-1ybfK901CbwHK0MiZYEIYJSY6hPnxqgNOVI47BaOMLM=",
-        "url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/up/linux_arm64.tar.gz"
+        "hash": "sha256-pbpcsVz9BROF2ajJsLOBFB4xQXAGwcs3hsOqvnf2yw0=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/up/linux_arm64.tar.gz"
       },
       "x86_64-darwin": {
-        "hash": "sha256-aw75IToOlqq7xTia6o8Zs2GXBzKdnatwyeETvvT8iCI=",
-        "url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/up/darwin_amd64.tar.gz"
+        "hash": "sha256-eQ1z23yfrLREvN+tylz2LwU+YbJgf0bRQioT4zR7dRw=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/up/darwin_amd64.tar.gz"
       },
       "x86_64-linux": {
-        "hash": "sha256-6jc3jxy2qRabew6P/Xf5bElcuMXHsPg0zED80ubFUAk=",
-        "url": "https://cli.upbound.io/main/v0.39.0-384.g0a0c8634/bundle/up/linux_amd64.tar.gz"
+        "hash": "sha256-lrgR3XifNXIMtcefFTLkDUq8Lu6jSeyta53tFByP2mM=",
+        "url": "https://cli.upbound.io/main/v0.41.0-0.rc.0.26.ge82e8330/bundle/up/linux_amd64.tar.gz"
       }
     }
   },
@@ -49,5 +49,5 @@
     "x86_64-darwin",
     "x86_64-linux"
   ],
-  "version": "0.39.0-384.g0a0c8634"
+  "version": "0.41.0-0.rc.0.26.ge82e8330"
 }

From 814d2b7ddd4b36f85881a6fcfe532ff8c92a28f4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 3 Aug 2025 15:40:18 +0200
Subject: [PATCH 319/357] esphome: 2025.7.3 -> 2025.7.4

https://github.com/esphome/esphome/releases/tag/2025.7.4
---
 pkgs/by-name/es/esphome/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index f99e4179f6a9..89491d31fe7d 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -34,14 +34,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2025.7.3";
+  version = "2025.7.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "esphome";
     tag = version;
-    hash = "sha256-njhcH/C55i1Xkclt2bp+z9OXhR7gsewWUgW3bn/1yig=";
+    hash = "sha256-zN3QkyGqz6/v8k76857nYEpErR0SijH0RetNxQttifI=";
   };
 
   build-system = with python.pkgs; [

From edf469d8fd8794e676de9a9b5c149a567d2440f1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 3 Aug 2025 14:54:17 +0100
Subject: [PATCH 320/357] whois: 5.6.3 -> 5.6.4

Changes: https://github.com/rfc1036/whois/compare/v5.6.3...v5.6.4
---
 pkgs/by-name/wh/whois/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wh/whois/package.nix b/pkgs/by-name/wh/whois/package.nix
index d40fd71bc8fc..44d87d25a7b6 100644
--- a/pkgs/by-name/wh/whois/package.nix
+++ b/pkgs/by-name/wh/whois/package.nix
@@ -11,14 +11,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.6.3";
+  version = "5.6.4";
   pname = "whois";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    hash = "sha256-YJAd6s1kq2IJcR7qf7ljntLb5HgsaTH0wsoPKIMxHdg=";
+    hash = "sha256-9c67LrpJu3cW/j1hfNhatB4nkCxMTCfHpszawGtU7ko=";
   };
 
   patches = [

From 8574495e9332e374a143caf25c4e4e2361681248 Mon Sep 17 00:00:00 2001
From: Dustin Frisch <fooker@lab.sh>
Date: Sun, 3 Aug 2025 16:12:09 +0200
Subject: [PATCH 321/357] perses: do not update to beta releases

---
 pkgs/by-name/pe/perses/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/pe/perses/update.sh b/pkgs/by-name/pe/perses/update.sh
index 092727655033..68e4ec1fc08b 100755
--- a/pkgs/by-name/pe/perses/update.sh
+++ b/pkgs/by-name/pe/perses/update.sh
@@ -3,7 +3,7 @@
 
 set -euo pipefail
 
-nix-update "${UPDATE_NIX_ATTR_PATH}" --version=unstable
+nix-update "${UPDATE_NIX_ATTR_PATH}"
 
 src="$(nix-build -A "${UPDATE_NIX_ATTR_PATH}".src --no-out-link)"
 

From cf01dea7aa2c1854398d79b94531afaae22c1b5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 14:16:08 +0000
Subject: [PATCH 322/357] cargo-deb: 3.3.0 -> 3.4.0

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

diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix
index 7d621a4dc2e4..cd415d8611de 100644
--- a/pkgs/by-name/ca/cargo-deb/package.nix
+++ b/pkgs/by-name/ca/cargo-deb/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-deb";
-  version = "3.3.0";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "kornelski";
     repo = "cargo-deb";
     rev = "v${version}";
-    hash = "sha256-8jYcE6rqh/YwY8CVypxCeQfFhI7jBxrRngWhC3KbXag=";
+    hash = "sha256-0phdZMeiZU916t9osgv1I0+tZpQbq5m1MR+wwWgsbIo=";
   };
 
-  cargoHash = "sha256-R/LyTkxWqHjDE7MOPBao8GeSS3n7KrVWrCqGUz0SM9s=";
+  cargoHash = "sha256-fi4GY+TE+fRdnTl61SxASk7esSa5BlT1bGRt5g0oGlk=";
 
   nativeBuildInputs = [
     makeWrapper

From 637fc3652907625f645a297dcbcb004d7e8f551b Mon Sep 17 00:00:00 2001
From: Matt Christ <matt@christ.systems>
Date: Sun, 3 Aug 2025 08:29:22 -0500
Subject: [PATCH 323/357] nixos/freshrss: fix loading extensions' static
 content

Before this change, the THIRDPARTY_EXTENSIONS_PATH would end up with a
double-slash in the path, which was breaking FreshRSS's is_valid_path
detection.
---
 nixos/modules/services/web-apps/freshrss.nix |  2 +-
 nixos/tests/freshrss/extensions.nix          | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix
index 1cacfdcbac95..786961827312 100644
--- a/nixos/modules/services/web-apps/freshrss.nix
+++ b/nixos/modules/services/web-apps/freshrss.nix
@@ -18,7 +18,7 @@ let
     DATA_PATH = cfg.dataDir;
   }
   // lib.optionalAttrs (cfg.extensions != [ ]) {
-    THIRDPARTY_EXTENSIONS_PATH = "${extension-env}/share/freshrss/";
+    THIRDPARTY_EXTENSIONS_PATH = "${extension-env}/share/freshrss";
   };
 in
 {
diff --git a/nixos/tests/freshrss/extensions.nix b/nixos/tests/freshrss/extensions.nix
index 8b0d306e6b01..d956d4fe32fb 100644
--- a/nixos/tests/freshrss/extensions.nix
+++ b/nixos/tests/freshrss/extensions.nix
@@ -8,14 +8,30 @@
         enable = true;
         baseUrl = "http://localhost";
         authType = "none";
-        extensions = [ pkgs.freshrss-extensions.youtube ];
+        extensions = [
+          pkgs.freshrss-extensions.youtube
+          pkgs.freshrss-extensions.title-wrap
+        ];
       };
     };
+  extraPythonPackages = p: [
+    p.lxml
+    p.lxml-stubs
+  ];
+  skipTypeCheck = true;
 
   testScript = ''
     machine.wait_for_unit("multi-user.target")
     machine.wait_for_open_port(80)
-    response = machine.succeed("curl -vvv -s http://localhost:80/i/?c=extension")
+    response = machine.succeed("curl -s http://localhost:80/i/?c=extension")
     assert '<span class="ext_name disabled">YouTube Video Feed</span>' in response, "Extension not present in extensions page."
+
+    # enable Title-Wrap extension
+    from lxml import etree
+    tree = etree.HTML(response)
+    csrf = tree.xpath("/html/body/header/nav/form/input/@value")[0]
+    response = machine.succeed(f"curl --fail-with-body -s 'http://localhost:80/i/?c=extension&a=enable&e=Title-Wrap' -d '_csrf={csrf}'")
+    # verify that the Title-Wrap css is accessible.
+    machine.succeed("curl --fail-with-body -s 'http://localhost:80/ext.php?1=&f=xExtension-TitleWrap/static/title_wrap.css'")
   '';
 }

From 1db3660e6e69586b75da25920d08d08eab5d8264 Mon Sep 17 00:00:00 2001
From: "@norpol" <2230917+norpol@users.noreply.github.com>
Date: Sat, 19 Jul 2025 22:45:37 +0100
Subject: [PATCH 324/357] liquibase: disable analytics by default

---
 pkgs/by-name/li/liquibase/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/li/liquibase/package.nix b/pkgs/by-name/li/liquibase/package.nix
index 548e85df8d72..aa01bb695842 100644
--- a/pkgs/by-name/li/liquibase/package.nix
+++ b/pkgs/by-name/li/liquibase/package.nix
@@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
       # there’s a lot of escaping, but I’m not sure how to improve that
       cat > $out/bin/liquibase <<EOF
       #!/usr/bin/env bash
+      export LIQUIBASE_ANALYTICS_ENABLED="\''${LIQUIBASE_ANALYTICS_ENABLED:-false}"
       # taken from the executable script in the source
       CP=""
       ${addJars "$out/internal/lib"}

From 1f33658aa9a0c848d06c042c193984eb0456e920 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 3 Aug 2025 16:27:47 +0200
Subject: [PATCH 325/357] firefox-esr: migrate to 140 ESR

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb2b8144aadd..6f9dad965964 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12154,7 +12154,7 @@ with pkgs;
           buildMozillaMach
           ;
       };
-  firefox-esr-unwrapped = firefox-esr-128-unwrapped;
+  firefox-esr-unwrapped = firefox-esr-140-unwrapped;
 
   firefox = wrapFirefox firefox-unwrapped { };
   firefox-beta = wrapFirefox firefox-beta-unwrapped { };
@@ -12172,7 +12172,7 @@ with pkgs;
     wmClass = "firefox-esr";
     icon = "firefox-esr";
   };
-  firefox-esr = firefox-esr-128;
+  firefox-esr = firefox-esr-140;
 
   firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
     inherit (firefox-unwrapped.passthru) applicationName;

From d755301541b6fa8c3a320cbffb6027903aeadb9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 14:42:58 +0000
Subject: [PATCH 326/357] php83: 8.3.23 -> 8.3.24

---
 pkgs/development/interpreters/php/8.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index 6f707647e2fe..c041925e7f07 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.3.23";
-      hash = "sha256-BUiPe5Z9kKUJMvBnTcNW4beV9SLwKYtc4ktoDeIzwtQ=";
+      version = "8.3.24";
+      hash = "sha256-5OEtpJB0aSRiTJFAa2CzGWfk173qu6uejLU1SITumWQ=";
     }
   );
 in

From 87bb70d0ee9e66901f8c0b0e054f6e42153d064e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 14:45:54 +0000
Subject: [PATCH 327/357] jsonschema-cli: 0.30.0 -> 0.32.0

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

diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix
index 0a1440712687..fbaea316afdb 100644
--- a/pkgs/by-name/js/jsonschema-cli/package.nix
+++ b/pkgs/by-name/js/jsonschema-cli/package.nix
@@ -8,14 +8,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jsonschema-cli";
-  version = "0.30.0";
+  version = "0.32.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-AjBVvEixkP7khm3/0U81E/G7tCKoqnfNG05gpgYlqNE=";
+    hash = "sha256-ZcavZSHf2eT65f7HbtZmD2mYUtrXEL/l1opXCvdn1O0=";
   };
 
-  cargoHash = "sha256-3hZAEjJrJ5vw6kXwY+xTv/mO0lx/KNmXA2lULJkX9aE=";
+  cargoHash = "sha256-ivD1dvz2xxNei77Dq6myE4zivWD8LZoEqq8E7QhgP9s=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 7767daf139f973aea08976540d861d1fcbc1e8af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 14:55:53 +0000
Subject: [PATCH 328/357] vscode-extensions.ionide.ionide-fsharp: 7.26.5 ->
 7.26.6

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index aeabf8f13601..1773c4273489 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2430,8 +2430,8 @@ let
         mktplcRef = {
           name = "Ionide-fsharp";
           publisher = "Ionide";
-          version = "7.26.5";
-          hash = "sha256-h652UK81MxEhwyJKlWLnueQmhpl2pHByvhPrfH+4WXk=";
+          version = "7.26.6";
+          hash = "sha256-oLzOkb0C93HlUcBKOKMa3u/jsRY6n8fnapRg5Jiyass=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog";

From f2af4a5483f3709956bd12909de86753b981469d Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin.p.restivo@gmail.com>
Date: Sun, 3 Aug 2025 11:18:07 -0400
Subject: [PATCH 329/357] tattoy: init at 0.1.8 (#428828)

---
 pkgs/by-name/ta/tattoy/package.nix | 63 ++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/ta/tattoy/package.nix

diff --git a/pkgs/by-name/ta/tattoy/package.nix b/pkgs/by-name/ta/tattoy/package.nix
new file mode 100644
index 000000000000..1738d66ced11
--- /dev/null
+++ b/pkgs/by-name/ta/tattoy/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  pkg-config,
+  libxcb,
+  dbus,
+  bash,
+  procps,
+  nano,
+  watch,
+}:
+
+rustPlatform.buildRustPackage (attrs: {
+  pname = "tattoy";
+  version = "0.1.8";
+
+  src = fetchFromGitHub {
+    owner = "tattoy-org";
+    repo = "tattoy";
+    tag = "tattoy-v${attrs.version}";
+    hash = "sha256-44rXygZVbwwC/jOB69iHydsjYr/WeVU4Eky3BPqJzyc=";
+  };
+
+  cargoHash = "sha256-DJyml8J9XXKD2t1dQz+OrVDFcq6PLMoDlhiLo86D3CM=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    dbus
+    libxcb
+  ];
+
+  nativeCheckInputs = [
+    bash
+    nano
+    procps
+    watch
+  ];
+
+  checkFlags = [
+    # e2e tests currently fail
+    # see https://github.com/tattoy-org/tattoy/pull/104/files for discussion
+    # re-enable after PR merged
+    "--skip e2e"
+    "--skip gpu"
+  ];
+
+  useNextest = true;
+
+  meta = {
+    description = "Text-based compositor for modern terminals";
+    homepage = "https://github.com/tattoy-org/tattoy";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      DieracDelta
+    ];
+    mainProgram = "tattoy";
+    platforms = lib.platforms.unix;
+  };
+})

From 2d600db3aff6e40da585a14bdc7043ad2d73223e Mon Sep 17 00:00:00 2001
From: jack <github@jackr.eu>
Date: Wed, 30 Jul 2025 10:56:09 +0200
Subject: [PATCH 330/357] fosrl-olm: init at 1.0.0

---
 pkgs/by-name/fo/fosrl-olm/package.nix | 38 +++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/fo/fosrl-olm/package.nix

diff --git a/pkgs/by-name/fo/fosrl-olm/package.nix b/pkgs/by-name/fo/fosrl-olm/package.nix
new file mode 100644
index 000000000000..97098e52826c
--- /dev/null
+++ b/pkgs/by-name/fo/fosrl-olm/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "olm";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "fosrl";
+    repo = "olm";
+    tag = version;
+    hash = "sha256-a0gkEo5EuJpHpZ5fKAPBXSTRvZaQo6KOJu4Abi1EztU=";
+  };
+
+  vendorHash = "sha256-Ms8tLFKIa8GqmyFI7o+sQEpsZghNPIpq8BRCoY89Org=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  doInstallCheck = true;
+
+  meta = {
+    description = "Tunneling client for Pangolin";
+    homepage = "https://github.com/fosrl/olm";
+    changelog = "https://github.com/fosrl/olm/releases/tag/${src.tag}";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
+      jackr
+      sigmasquadron
+    ];
+    mainProgram = "olm";
+  };
+}

From 3df85aa44b172985afe0c74c46dece4110ed9784 Mon Sep 17 00:00:00 2001
From: thattemperature <2719023332@qq.com>
Date: Sun, 3 Aug 2025 21:48:54 +0800
Subject: [PATCH 331/357] emacsPackages.eaf-pyqterminal: init at
 0-unstable-2025-05-05

---
 .../eaf-pyqterminal/package.nix               | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pyqterminal/package.nix

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pyqterminal/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pyqterminal/package.nix
new file mode 100644
index 000000000000..0a2c88784518
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-pyqterminal/package.nix
@@ -0,0 +1,46 @@
+{
+  # Basic
+  lib,
+  melpaBuild,
+  fetchFromGitHub,
+  # Updater
+  unstableGitUpdater,
+}:
+
+melpaBuild {
+
+  pname = "eaf-pyqterminal";
+  version = "0-unstable-2025-05-05";
+
+  src = fetchFromGitHub {
+    owner = "mumu-lhl";
+    repo = "eaf-pyqterminal";
+    rev = "db947f136660adc4c3883b332f4465af82e4c9da";
+    hash = "sha256-0BH29XvBzJPgJBFSKHiKSLo/dpj5rixg7+u+LDpB5+U=";
+  };
+
+  files = ''
+    ("*.el"
+     "*.py")
+  '';
+
+  passthru = {
+    updateScript = unstableGitUpdater { };
+    eafPythonDeps =
+      ps: with ps; [
+        pyte
+        psutil
+      ];
+    eafOtherDeps = [ ];
+  };
+
+  meta = {
+    description = "Terminal written in PyQt6 for the EAF";
+    homepage = "https://github.com/mumu-lhl/eaf-pyqterminal";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      thattemperature
+    ];
+  };
+
+}

From e26b4861479b22d4a276a46ba0871312ca206c6d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 3 Aug 2025 16:42:55 +0100
Subject: [PATCH 332/357] stalwart-mail: fix formatting

---
 pkgs/by-name/st/stalwart-mail/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index fb8852c01c9d..b147be39f8d8 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -59,14 +59,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ++ lib.optionals withFoundationdb [ "foundationdb" ]
   ++ lib.optionals stalwartEnterprise [ "enterprise" ];
 
-  env =
-    {
-      OPENSSL_NO_VENDOR = true;
-      ZSTD_SYS_USE_PKG_CONFIG = true;
-      ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
-      ROCKSDB_LIB_DIR = "${rocksdb}/lib";
-    }
-    // lib.optionalAttrs
+  env = {
+    OPENSSL_NO_VENDOR = true;
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+    ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
+    ROCKSDB_LIB_DIR = "${rocksdb}/lib";
+  }
+  //
+    lib.optionalAttrs
       (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isArmv7))
       {
         JEMALLOC_SYS_WITH_LG_PAGE = 16;

From de3755ea6a1a9bc422ceb18976a7b585a6d5fe54 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 3 Aug 2025 18:08:32 +0200
Subject: [PATCH 333/357] php84: 8.4.10 -> 8.4.11

ChangeLog: https://www.php.net/ChangeLog-8.php#8.4.11
---
 pkgs/development/interpreters/php/8.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
index 3c0e0cc9640d..1591c2c5aad9 100644
--- a/pkgs/development/interpreters/php/8.4.nix
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.4.10";
-      hash = "sha256-iBXRBlnN5fA75NFpIF1it7Ke0O3HzdhLY4TNoDEMMQg=";
+      version = "8.4.11";
+      hash = "sha256-LDnHW1TfibARlbcq0O4fzUkMcdsYvFK81h+y/7V7Jvo=";
     }
   );
 in

From dce17d8f828cddf2aa86d22778687ff330ce604c Mon Sep 17 00:00:00 2001
From: thtrf <r3769.tv@gmail.com>
Date: Mon, 21 Jul 2025 11:11:57 +0200
Subject: [PATCH 334/357] wails: move to by-name

---
 .../tools/wails/default.nix => by-name/wa/wails/package.nix}  | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 4 deletions(-)
 rename pkgs/{development/tools/wails/default.nix => by-name/wa/wails/package.nix} (100%)

diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/by-name/wa/wails/package.nix
similarity index 100%
rename from pkgs/development/tools/wails/default.nix
rename to pkgs/by-name/wa/wails/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f9dad965964..640ff6c7667a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7587,10 +7587,6 @@ with pkgs;
 
   vcpkg-tool-unwrapped = vcpkg-tool.override { doWrap = false; };
 
-  wails = callPackage ../development/tools/wails {
-    stdenv = gccStdenv;
-  };
-
   whatstyle = callPackage ../development/tools/misc/whatstyle {
     inherit (llvmPackages) clang-unwrapped;
   };

From 49f8945bb9a1538a782a59f6e17f3d6bee8fd8cc Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Mon, 4 Aug 2025 00:00:25 +0800
Subject: [PATCH 335/357] gnome-commander: fix build by temporarily disable
 gtest

---
 pkgs/by-name/gn/gnome-commander/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gn/gnome-commander/package.nix b/pkgs/by-name/gn/gnome-commander/package.nix
index faab9a0cfadf..d714f1ea93c4 100644
--- a/pkgs/by-name/gn/gnome-commander/package.nix
+++ b/pkgs/by-name/gn/gnome-commander/package.nix
@@ -53,9 +53,14 @@ stdenv.mkDerivation (finalAttrs: {
     taglib
     poppler
     samba
-    gtest
   ];
 
+  mesonFlags = [ (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) ];
+
+  checkInputs = [ gtest ];
+
+  doCheck = false; # gtest requires C/C++17 but the project is written in C/C++11
+
   meta = {
     description = "Fast and powerful twin-panel file manager for the Linux desktop";
     homepage = "https://gcmd.github.io";

From c24457190160f157d5ebf9155ae7f26316146cb6 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <thierry@delafontaine.xyz>
Date: Sat, 5 Apr 2025 13:18:23 +0200
Subject: [PATCH 336/357] lgogdownloader: enable build on `aarch64-darwin` when
 enableGui is disabled

---
 pkgs/by-name/lg/lgogdownloader/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix
index da559b62daaa..3a21661f4ee7 100644
--- a/pkgs/by-name/lg/lgogdownloader/package.nix
+++ b/pkgs/by-name/lg/lgogdownloader/package.nix
@@ -63,7 +63,9 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "lgogdownloader";
     homepage = "https://github.com/Sude-/lgogdownloader";
     license = lib.licenses.wtfpl;
+    # qtbase requires a sandbox profile with read access to /usr/share/icu.
+    # To prevent build failures in CI, we disable Darwin support when the GUI is enabled.
+    platforms = lib.platforms.linux ++ lib.optionals (!enableGui) lib.platforms.darwin;
     maintainers = with lib.maintainers; [ _0x4A6F ];
-    platforms = lib.platforms.linux;
   };
 })

From e8f1900e2a62079abbb86145716a9828b9cdafed Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 27 Jul 2025 14:10:40 -0400
Subject: [PATCH 337/357] python3Packages.otr: init at 2.1.0

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../python-modules/otr/default.nix            | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/otr/default.nix

diff --git a/pkgs/development/python-modules/otr/default.nix b/pkgs/development/python-modules/otr/default.nix
new file mode 100644
index 000000000000..38e1927c129b
--- /dev/null
+++ b/pkgs/development/python-modules/otr/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  cryptography,
+  gmpy2,
+  python3-application,
+}:
+
+buildPythonPackage rec {
+  pname = "otr";
+  version = "2.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "AGProjects";
+    repo = "python3-otr";
+    tag = version;
+    hash = "sha256-jCyPEdWDEW1x0Id//yM67SvKvYpdyIfPmcCWiRgwvb0=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    cryptography
+    gmpy2
+    python3-application
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    python3 test.py
+
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [ "otr" ];
+
+  meta = {
+    description = "Off-The-Record Messaging protocol implementation for Python";
+    homepage = "https://github.com/AGProjects/python3-otr";
+    license = lib.licenses.lgpl21Plus;
+    teams = [
+      lib.teams.ngi
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c85cb1d2f56b..bcb63858c9a7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11081,6 +11081,8 @@ self: super: with self; {
 
   otpauth = callPackage ../development/python-modules/otpauth { };
 
+  otr = callPackage ../development/python-modules/otr { };
+
   ots-python = callPackage ../development/python-modules/ots-python { };
 
   ourgroceries = callPackage ../development/python-modules/ourgroceries { };

From 32bbac980c125e4c6ce32f52c055c7c56abd5987 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Tue, 29 Jul 2025 21:40:55 +0200
Subject: [PATCH 338/357] lgogdownloader: disable GUI by default

- Set the `enableGui` option to `false` by default to disable the GUI.
- Provide a `lgogdownloader-gui` package with GUI enabled

BREAKING CHANGE: Users who previously relied on the GUI will now need to explicitly enable it.
---
 pkgs/by-name/lg/lgogdownloader/package.nix | 2 +-
 pkgs/top-level/all-packages.nix            | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix
index 3a21661f4ee7..fadb4f0bff61 100644
--- a/pkgs/by-name/lg/lgogdownloader/package.nix
+++ b/pkgs/by-name/lg/lgogdownloader/package.nix
@@ -16,7 +16,7 @@
   libsForQt5,
   testers,
 
-  enableGui ? true,
+  enableGui ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f9dad965964..4240be550073 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2259,6 +2259,8 @@ with pkgs;
 
   lexicon = with python3Packages; toPythonApplication dns-lexicon;
 
+  lgogdownloader-gui = callPackage ../by-name/lg/lgogdownloader/package.nix { enableGui = true; };
+
   # Less secure variant of lowdown for use inside Nix builds.
   lowdown-unsandboxed = lowdown.override {
     enableDarwinSandbox = false;

From d3911402c97b9004f548ba9dcf0eb8779fdec7cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Aug 2025 17:14:18 +0000
Subject: [PATCH 339/357] python3Packages.snakemake-interface-storage-plugins:
 4.2.1 -> 4.2.2

---
 .../snakemake-interface-storage-plugins/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
index 0e6ccd4db39c..e3ae6bd355d5 100644
--- a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "snakemake-interface-storage-plugins";
-  version = "4.2.1";
+  version = "4.2.2";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-storage-plugins";
     tag = "v${version}";
-    hash = "sha256-mGpKmKWWL4ue9Dddjs4fXCaITrC97yHC58Jh2vclXAY=";
+    hash = "sha256-Fhofj4xFdIPlrJgd0iOcEkGOnEXaDptrrv47luYE8wU=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From 1d895ba4e452c71ed4f274d45e3d36c4407699d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?=
 <33058747+GaetanLepage@users.noreply.github.com>
Date: Sun, 3 Aug 2025 18:47:25 +0200
Subject: [PATCH 340/357] python3Packages.keras: 3.10.0 -> 3.11.1 (#429693)

Diff:
https://github.com/keras-team/keras/compare/refs/tags/v3.10.0...refs/tags/v3.11.1

Changelog: https://github.com/keras-team/keras/releases/tag/v3.11.1
---
 pkgs/development/python-modules/keras/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index 568aaa06ce9c..67597c1d5ca8 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -36,14 +36,14 @@
 
 buildPythonPackage rec {
   pname = "keras";
-  version = "3.10.0";
+  version = "3.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "keras-team";
     repo = "keras";
     tag = "v${version}";
-    hash = "sha256-N0RlXnmSYJvD4/a47U4EjMczw1VIyereZoPicjgEkAI=";
+    hash = "sha256-jyNOL5u+XVVqChD7Fs3yJCcW14bTvitiQa4H4DTeja0=";
   };
 
   build-system = [
@@ -83,9 +83,10 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
-    # NameError: name 'MockRemat' is not defined
-    # https://github.com/keras-team/keras/issues/21126
-    "test_functional_model_with_remat"
+    # Require unpackaged `grain`
+    "test_fit_with_data_adapter_grain_dataloader"
+    "test_fit_with_data_adapter_grain_datast"
+    "test_fit_with_data_adapter_grain_datast_with_len"
 
     # Tries to install the package in the sandbox
     "test_keras_imports"
@@ -99,6 +100,9 @@ buildPythonPackage rec {
   ];
 
   disabledTestPaths = [
+    # Require unpackaged `grain`
+    "keras/src/trainers/data_adapters/grain_dataset_adapter_test.py"
+
     # These tests succeed when run individually, but crash within the full test suite:
     # ImportError: /nix/store/4bw0x7j3wfbh6i8x3plmzknrdwdzwfla-abseil-cpp-20240722.1/lib/libabsl_cord_internal.so.2407.0.0:
     # undefined symbol: _ZN4absl12lts_2024072216strings_internal13StringifySink6AppendESt17basic_string_viewIcSt11char_traitsIcEE

From 9098504c3713ac266caaa5db4c5e7c224db279bc Mon Sep 17 00:00:00 2001
From: guylamar2006 <guychronister@outlook.com>
Date: Sun, 3 Aug 2025 12:23:26 -0500
Subject: [PATCH 341/357] acd-cli: migrate to by-name (#428863)

acd_cli: migrate to by-name

acd_cli: refactor package definitions

acd_cli: fix accidental rename of acd-cli
---
 .../ac/acd-cli/package.nix}                   | 28 +++++++------------
 pkgs/top-level/all-packages.nix               | 14 ----------
 2 files changed, 10 insertions(+), 32 deletions(-)
 rename pkgs/{applications/networking/sync/acd_cli/default.nix => by-name/ac/acd-cli/package.nix} (64%)

diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/by-name/ac/acd-cli/package.nix
similarity index 64%
rename from pkgs/applications/networking/sync/acd_cli/default.nix
rename to pkgs/by-name/ac/acd-cli/package.nix
index 4124fe379d1c..54f2e51368ad 100644
--- a/pkgs/applications/networking/sync/acd_cli/default.nix
+++ b/pkgs/by-name/ac/acd-cli/package.nix
@@ -1,20 +1,12 @@
 {
   lib,
   fetchFromGitHub,
-  buildPythonApplication,
   fuse,
-  appdirs,
-  colorama,
-  python-dateutil,
-  requests,
-  requests-toolbelt,
-  fusepy,
-  sqlalchemy,
-  setuptools,
+  python3Packages,
 }:
 
-buildPythonApplication rec {
-  pname = "acd_cli";
+python3Packages.buildPythonApplication rec {
+  pname = "acd-cli";
   version = "0.3.2";
   format = "setuptools";
 
@@ -22,12 +14,12 @@ buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "yadayada";
-    repo = pname;
-    rev = version;
-    sha256 = "0a0fr632l24a3jmgla3b1vcm50ayfa9hdbp677ch1chwj5dq4zfp";
+    repo = "acd_cli";
+    tag = version;
+    hash = "sha256-132CW5EcsgDZOeauBpNyXoFS2Q5rKPqqHIoIKobJDig=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = with python3Packages; [
     appdirs
     colorama
     python-dateutil
@@ -50,10 +42,10 @@ buildPythonApplication rec {
     lnOverBin acd_cli.py acdcli
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command line interface and FUSE filesystem for Amazon Cloud Drive";
     homepage = "https://github.com/yadayada/acd_cli";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ edwtjo ];
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ edwtjo ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4240be550073..5b50182f0430 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11626,20 +11626,6 @@ with pkgs;
     patches = config."2bwm".patches or [ ];
   };
 
-  acd-cli = callPackage ../applications/networking/sync/acd_cli {
-    inherit (python3Packages)
-      buildPythonApplication
-      appdirs
-      colorama
-      python-dateutil
-      requests
-      requests-toolbelt
-      setuptools
-      sqlalchemy
-      fusepy
-      ;
-  };
-
   inherit (qt6Packages.callPackage ../applications/office/activitywatch { })
     aw-qt
     aw-notify

From 716cca4ed6280ffd88a47ab28e2974df734a0fe0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 17:56:07 +0000
Subject: [PATCH 342/357] pinact: 3.3.0 -> 3.3.2

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

diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix
index 0134285556d3..b65beae0d745 100644
--- a/pkgs/by-name/pi/pinact/package.nix
+++ b/pkgs/by-name/pi/pinact/package.nix
@@ -13,16 +13,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "pinact";
-  version = "3.3.0";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "suzuki-shunsuke";
     repo = "pinact";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aNRDz0mAc5fsS01W0PZxCGw0NgEcExtciTcv/Omdv3g=";
+    hash = "sha256-epDtKwebVFCDZFwpOd2GWuY27EkD/xtkNE79XqTI9S0=";
   };
 
-  vendorHash = "sha256-eqT92vK8Ah7glS/O5rWp+wK/apGwC61/GIZRUtpmNFo=";
+  vendorHash = "sha256-31XM13BwaIHfxS3mM3zRroAIku9wEM+ogR9qhG/OanY=";
 
   env.CGO_ENABLED = 0;
 

From f7ac44456d642f18160b3b106b697e5b8eee2b03 Mon Sep 17 00:00:00 2001
From: x123 <x123@users.noreply.github.com>
Date: Sun, 3 Aug 2025 14:06:38 +0200
Subject: [PATCH 343/357] opencode: 0.3.112 -> 0.3.122

---
 pkgs/by-name/op/opencode/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 465a4287c8fe..0f8d2d9733d6 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -13,10 +13,10 @@
 
 let
   opencode-node-modules-hash = {
-    "aarch64-darwin" = "sha256-QfsPK6iPuXXKpT3z1SUDdvCx3uT+U2IZy4msH8UiFg8=";
-    "aarch64-linux" = "sha256-/BpbECRBxLOz+YEQrEHNrtHSr/BaLOrAkJXH0TBHjFE=";
-    "x86_64-darwin" = "sha256-KA3jaU7BD7lueKBuM9cTJuEby6AC0E03JYZMKRxceqY=";
-    "x86_64-linux" = "sha256-us6m4Iwaf+zS3NBSoOEAVBpHoyXPDnt+P9/D/Qbui+Y=";
+    "aarch64-darwin" = "sha256-AM+4jX1lroqBxslGK1by2q8MRsox4xrtlN95qPj0x2Y=";
+    "aarch64-linux" = "sha256-iQIqv6r6uo9zj8kiQDJuPyFdySNHIj+F4C286K6icv0=";
+    "x86_64-darwin" = "sha256-L6ae0C8AVzwMVfob38wdwNZoK02FMokzPGC2209r7NU=";
+    "x86_64-linux" = "sha256-oZa8O0iK5uSJjl6fOdnjqjIuG//ihrj4six3FUdfob8=";
   };
   bun-target = {
     "aarch64-darwin" = "bun-darwin-arm64";
@@ -27,12 +27,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.3.112";
+  version = "0.3.122";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BeUgZUzuphQ1gqPnDnKP2HMy5nyoD5au4AekGT2deIc=";
+    hash = "sha256-JsyUXRfMQ40qQwtaW0Ebh/HlHqzb2D8AvsyJm5Yjm8E=";
   };
 
   tui = buildGoModule {

From fcc79bd144c1060f27b4cb3bb65fb7d4ec1701f9 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 4 Aug 2025 02:37:34 +0900
Subject: [PATCH 344/357] mubeng: update GitHub repository owner

The upstream repository owner changed.

Upstream(0.21.0): https://github.com/mubeng/mubeng/commit/f70c064d7cb5b4890cabc1958cb11dba20c8af01

Also update the module path in ldflags, it causes wrong version number to display in nixpkgs

Upstream(0.15.0): https://github.com/mubeng/mubeng/commit/6681713175923b5e02080e10416429f26c79171d
nixpkgs(0.14.2 -> 0.15.3): 22021be9a5bd9eb47b2c1b3da41dc8321615555a
---
 pkgs/by-name/mu/mubeng/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mu/mubeng/package.nix b/pkgs/by-name/mu/mubeng/package.nix
index 35fb5632b894..8b917aca96b9 100644
--- a/pkgs/by-name/mu/mubeng/package.nix
+++ b/pkgs/by-name/mu/mubeng/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.22.0";
 
   src = fetchFromGitHub {
-    owner = "kitabisa";
+    owner = "mubeng";
     repo = "mubeng";
     tag = "v${version}";
     hash = "sha256-YK3a975l/gMCaWxTB4gEQWAzzX+GRnYSvKksPmp3ZRA=";
@@ -20,13 +20,13 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X=ktbs.dev/mubeng/common.Version=${version}"
+    "-X=github.com/mubeng/mubeng/common.Version=${version}"
   ];
 
   meta = {
     description = "Proxy checker and IP rotator";
-    homepage = "https://github.com/kitabisa/mubeng";
-    changelog = "https://github.com/kitabisa/mubeng/releases/tag/v${version}";
+    homepage = "https://github.com/mubeng/mubeng";
+    changelog = "https://github.com/mubeng/mubeng/releases/tag/v${version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "mubeng";

From 5f6508e8e2b2419f545770828438208d356ddd5a Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 4 Aug 2025 02:40:01 +0900
Subject: [PATCH 345/357] mubeng: add versionCheckHook

---
 pkgs/by-name/mu/mubeng/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/mu/mubeng/package.nix b/pkgs/by-name/mu/mubeng/package.nix
index 8b917aca96b9..c0f0d801d1be 100644
--- a/pkgs/by-name/mu/mubeng/package.nix
+++ b/pkgs/by-name/mu/mubeng/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
 buildGoModule rec {
@@ -23,6 +24,12 @@ buildGoModule rec {
     "-X=github.com/mubeng/mubeng/common.Version=${version}"
   ];
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
   meta = {
     description = "Proxy checker and IP rotator";
     homepage = "https://github.com/mubeng/mubeng";

From 102d152ac42478d176f49c262e7bf2663d8ad0f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 19:10:06 +0000
Subject: [PATCH 346/357] picocrypt-cli: 1.48 -> 1.49

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

diff --git a/pkgs/by-name/pi/picocrypt-cli/package.nix b/pkgs/by-name/pi/picocrypt-cli/package.nix
index 37496753a2e2..5c0a61a5e3f0 100644
--- a/pkgs/by-name/pi/picocrypt-cli/package.nix
+++ b/pkgs/by-name/pi/picocrypt-cli/package.nix
@@ -6,17 +6,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "picocrypt-cli";
-  version = "1.48";
+  version = "1.49";
 
   src = fetchFromGitHub {
     owner = "Picocrypt";
     repo = "CLI";
     tag = finalAttrs.version;
-    hash = "sha256-A/04tuDwB2nAGWOWNEPt87lwAR/5Co/IjjV7xIcRxUo=";
+    hash = "sha256-r+ySKCVRPYHY+8s6uCj2ZQyMArccPjpa4d4lvYjrmmU=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/picocrypt";
-  vendorHash = "sha256-iVbfvV3BqK40uU9kQaqgIsHmX8i7w1M1MIxnknDP6AM=";
+  vendorHash = "sha256-HscCZ6z/tGLNlm6AjYmAG156LS3VGeye12eyeqYVGtw=";
 
   ldflags = [
     "-s"

From 3f8caf5e67c94489c77b71f1135c2124f4a33b40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 19:25:31 +0000
Subject: [PATCH 347/357] typescript-go: 0-unstable-2025-07-25 ->
 0-unstable-2025-08-01

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

diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix
index 9ec4e9d3b91f..f1a8a9defa9d 100644
--- a/pkgs/by-name/ty/typescript-go/package.nix
+++ b/pkgs/by-name/ty/typescript-go/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule {
   pname = "typescript-go";
-  version = "0-unstable-2025-07-25";
+  version = "0-unstable-2025-08-01";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "typescript-go";
-    rev = "c05da65ec4298d5930c59b559e9d5e00dfab8af3";
-    hash = "sha256-6zFBooMgdUHsKP5qOd7GOCBj3+NS0ckzWFIeO+0V2Fw=";
+    rev = "644bde28939733580cbef96adaa7253f9faa54ac";
+    hash = "sha256-5oU3tTZ8jvc85jzgh14ICLlz0VgQ7v2ofeMADRMW5O4=";
     fetchSubmodules = false;
   };
 
-  vendorHash = "sha256-ORetO5VTo94KJfC/q7TDSWoQjZUKYjrMcSMecVpu8Pw=";
+  vendorHash = "sha256-nOro2EARm/4LZ0BfX10nuhCAlPi6T91EpXGP0F9Rm04=";
 
   ldflags = [
     "-s"

From 4cb122183f4d0da06ed5956eadd0a546acf14c2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 19:31:40 +0000
Subject: [PATCH 348/357] render50: 9.2.8 -> 9.2.10

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

diff --git a/pkgs/by-name/re/render50/package.nix b/pkgs/by-name/re/render50/package.nix
index 132d1a76af3e..22d62f2db5e1 100644
--- a/pkgs/by-name/re/render50/package.nix
+++ b/pkgs/by-name/re/render50/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "render50";
-  version = "9.2.8";
+  version = "9.2.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cs50";
     repo = "render50";
     tag = "v${version}";
-    hash = "sha256-ZCSd1Y7PPVkMQWkEgcaqh3Ypy8OrWxI9iM2HMVT/VeA=";
+    hash = "sha256-YaLLWrae8vgOYLmfFlPa6WkKGNlUj+n76NRpg0qm6QI=";
   };
 
   build-system = [
@@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec {
     description = "Generate syntax-highlighted PDFs of source code";
     homepage = "https://cs50.readthedocs.io/render50/";
     downloadPage = "https://github.com/cs50/render50";
-    changelog = "https://github.com/cs50/render50/releases/tag/v${version}";
+    changelog = "https://github.com/cs50/render50/releases/tag/${src.tag}";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ ethancedwards8 ];

From c857ac0b751399e2f8db7a93fd4214600e6836a0 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Sun, 3 Aug 2025 20:37:08 +0200
Subject: [PATCH 349/357] tptp: 7.2.0 -> 9.1.0

---
 pkgs/by-name/tp/tptp/package.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/tp/tptp/package.nix b/pkgs/by-name/tp/tptp/package.nix
index 0c6d68d44cdd..ae55bdc6d057 100644
--- a/pkgs/by-name/tp/tptp/package.nix
+++ b/pkgs/by-name/tp/tptp/package.nix
@@ -2,28 +2,32 @@
   lib,
   stdenv,
   fetchurl,
-  yap,
+  swi-prolog,
   tcsh,
   perl,
   patchelf,
+  curl,
 }:
 
 stdenv.mkDerivation rec {
   pname = "TPTP";
-  version = "7.2.0";
+  version = "9.1.0";
 
   src = fetchurl {
     urls = [
-      "http://tptp.cs.miami.edu/TPTP/Distribution/TPTP-v${version}.tgz"
-      "http://tptp.cs.miami.edu/TPTP/Archive/TPTP-v${version}.tgz"
+      "https://tptp.org/TPTP/Distribution/TPTP-v${version}.tgz"
+      "https://tptp.org/TPTP/Archive/TPTP-v${version}.tgz"
     ];
-    sha256 = "0yq8452b6mym4yscy46pshg0z2my8xi74b5bp2qlxd5bjwcrg6rl";
+    hash = "sha256-KylCpKEdjvXTzYU2MOi0FDrr4e6je2YB366+dxy3Xmo=";
   };
 
-  nativeBuildInputs = [ patchelf ];
+  nativeBuildInputs = [
+    patchelf
+    swi-prolog
+  ];
   buildInputs = [
     tcsh
-    yap
+    swi-prolog
     perl
   ];
 
@@ -40,7 +44,7 @@ stdenv.mkDerivation rec {
     substituteInPlace $sharedir/TPTP2X/tptp2X_install --replace /bin/mv mv
     tcsh $sharedir/TPTP2X/tptp2X_install -default
 
-    patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $sharedir/Scripts/tptp4X
+    patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath ${lib.getLib curl}/lib $sharedir/Scripts/tptp4X
 
     mkdir -p $out/bin
     ln -s $sharedir/TPTP2X/tptp2X $out/bin
@@ -60,5 +64,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfreeRedistributable;
+    homepage = "https://tptp.org/TPTP/";
   };
 }

From 8059b99f2c04a00a77979ae4bcb5611a61b638ba Mon Sep 17 00:00:00 2001
From: thtrf <r3769.tv@gmail.com>
Date: Mon, 21 Jul 2025 11:14:15 +0200
Subject: [PATCH 350/357] wails: 2.10.1 -> 2.10.2

---
 pkgs/by-name/wa/wails/package.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/wa/wails/package.nix b/pkgs/by-name/wa/wails/package.nix
index 674281f43885..1a0e02472408 100644
--- a/pkgs/by-name/wa/wails/package.nix
+++ b/pkgs/by-name/wa/wails/package.nix
@@ -8,25 +8,26 @@
   go,
   nodejs,
   zlib,
+  nix-update-script,
   # Linux specific dependencies
   gtk3,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
 }:
 
 buildGoModule rec {
   pname = "wails";
-  version = "2.10.1";
+  version = "2.10.2";
 
   src =
     fetchFromGitHub {
       owner = "wailsapp";
       repo = "wails";
       tag = "v${version}";
-      hash = "sha256-PLlr2iBvYwJBvozQGvM68Xp3ts7Pt75hGhNZmMhNqbI=";
+      hash = "sha256-b0ns2cXlUT5tPbVEOzQGftxoUqGEDuzj+2KDxNnfs4c=";
     }
     + "/v2";
 
-  vendorHash = "sha256-7f7QJv2PM7/CG30bWSDP4+wuhi5Aa9rXT5voHm+QivE=";
+  vendorHash = "sha256-u1NoAHxBSzw44W3l5MzMxMUjgrfM9EDkKwR4GAPQBVE=";
 
   proxyVendor = true;
 
@@ -52,7 +53,7 @@ buildGoModule rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     gtk3
-    webkitgtk_4_0
+    webkitgtk_4_1
   ];
 
   ldflags = [
@@ -75,7 +76,7 @@ buildGoModule rec {
         lib.makeLibraryPath (
           lib.optionals stdenv.hostPlatform.isLinux [
             gtk3
-            webkitgtk_4_0
+            webkitgtk_4_1
           ]
         )
       }" \
@@ -83,11 +84,13 @@ buildGoModule rec {
       --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}"
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
-    description = "Build applications using Go + HTML + CSS + JS";
+    description = "Build desktop applications using Go & Web Technologies";
     homepage = "https://wails.io";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ thtrf ];
     mainProgram = "wails";
     platforms = lib.platforms.unix;
   };

From bd2b8cc4a17b82497ef835405ea94ccb21f153db Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 3 Aug 2025 22:01:48 +0200
Subject: [PATCH 351/357] libdigidoc: add myself as maintainer

I'd like to get notifications for bumps of this, considering it's used
in qdigidoc, a package I maintain.
---
 pkgs/by-name/li/libdigidocpp/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libdigidocpp/package.nix b/pkgs/by-name/li/libdigidocpp/package.nix
index c48e82aff3ad..c0cffc352d11 100644
--- a/pkgs/by-name/li/libdigidocpp/package.nix
+++ b/pkgs/by-name/li/libdigidocpp/package.nix
@@ -72,6 +72,9 @@ stdenv.mkDerivation rec {
     homepage = "https://www.id.ee/";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.jagajaga ];
+    maintainers = [
+      maintainers.flokli
+      maintainers.jagajaga
+    ];
   };
 }

From a2d32704e4d71b5ccb2c527230a65e5b7f55a251 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Aug 2025 20:11:04 +0000
Subject: [PATCH 352/357] gallery-dl: 1.30.0 -> 1.30.2

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

diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix
index 98ba4ecb8d3d..cb9d40d3f03a 100644
--- a/pkgs/by-name/ga/gallery-dl/package.nix
+++ b/pkgs/by-name/ga/gallery-dl/package.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "gallery-dl";
-  version = "1.30.0";
+  version = "1.30.2";
 in
 python3Packages.buildPythonApplication {
   inherit pname version;
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication {
     owner = "mikf";
     repo = "gallery-dl";
     tag = "v${version}";
-    hash = "sha256-puxkxrAkYu8oBmMltr1IfjNIAuoOu7yv6UZo6VqC6L8=";
+    hash = "sha256-/z4ozgukl54/GdZbf3aF+JxPsp5Fh/2/JzsYHdDcT5c=";
   };
 
   build-system = [ python3Packages.setuptools ];

From a72966c367a28bfc111097218658e5391aafb87c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Aug 2025 22:37:31 +0200
Subject: [PATCH 353/357] python313Packages.cxxheaderparser: 1.5.0 -> 1.5.4

Diff: https://github.com/robotpy/cxxheaderparser/compare/1.5.0...1.5.4
---
 pkgs/development/python-modules/cxxheaderparser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cxxheaderparser/default.nix b/pkgs/development/python-modules/cxxheaderparser/default.nix
index e5e27c7c9be5..dac17827d693 100644
--- a/pkgs/development/python-modules/cxxheaderparser/default.nix
+++ b/pkgs/development/python-modules/cxxheaderparser/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "cxxheaderparser";
-  version = "1.5.0";
+  version = "1.5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "robotpy";
     repo = "cxxheaderparser";
     rev = version;
-    hash = "sha256-+Q8EaVhx8/e+37GEHW3In5tMTIMl+5MySuCLgAzTypo=";
+    hash = "sha256-56u7JPlms6ep53LsrDEkwctG2VQzmIVQyjSFLZaK95g=";
   };
 
   postPatch = ''

From 1797584a685a1a42e34496b1d46df51ba6de46c1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 3 Aug 2025 22:42:04 +0200
Subject: [PATCH 354/357] presenterm: 0.15.0 -> 0.15.1

Diff: https://github.com/mfontanini/presenterm/compare/refs/tags/v0.15.0...refs/tags/v0.15.1

Changelog: https://github.com/mfontanini/presenterm/releases/tag/v0.15.1
---
 pkgs/by-name/pr/presenterm/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix
index d10726de1198..f316c383b442 100644
--- a/pkgs/by-name/pr/presenterm/package.nix
+++ b/pkgs/by-name/pr/presenterm/package.nix
@@ -14,13 +14,13 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "presenterm";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "mfontanini";
     repo = "presenterm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6ziPuWbPOsSwlnqVN1cKaOvxVk3axFnPBsnCIZz2iTg=";
+    hash = "sha256-tkIw7qo7lq3rSaBG0m6HzlXt8l3dQVFSBm8P3v7adVk=";
   };
 
   nativeBuildInputs =
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "sixel"
   ];
 
-  cargoHash = "sha256-UOPX5+RnnAStrsvBbL211m5NzYFjqbpIG/sdvoej1Rc=";
+  cargoHash = "sha256-CLoN85A2fggTHs/AHmo43N+9Q4FGKwNmKObw+OMBFao=";
 
   env = lib.optionalAttrs (isDarwin && isx86_64) {
     NIX_CFLAGS_LINK = "-fuse-ld=lld";

From 2376a8c74f68350bb72ac65cf173ba6a8d8369dd Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Sun, 3 Aug 2025 22:35:26 +0200
Subject: [PATCH 355/357] tinymist: 0.13.16 -> 0.13.18

Changelog:
https://github.com/Myriad-Dreamin/tinymist/releases/tag/v0.13.18
Diff:
https://github.com/Myriad-Dreamin/tinymist/compare/v0.13.16...v0.13.18
---
 .../vscode/extensions/myriad-dreamin.tinymist/default.nix   | 2 +-
 pkgs/by-name/ti/tinymist/package.nix                        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
index ba99d9eee2f7..607ef0444273 100644
--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "tinymist";
     publisher = "myriad-dreamin";
     inherit (tinymist) version;
-    hash = "sha256-9F/+IuX/5IMIEa8zXYBZsK3QNZCCuCDvXQ7C7WbwuFo=";
+    hash = "sha256-v/85T/MIEVrbXDDgIa6cBXPjpMmxZFXDglUEZvyRZSc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix
index 90aba4cc78b6..2b048f1b12b0 100644
--- a/pkgs/by-name/ti/tinymist/package.nix
+++ b/pkgs/by-name/ti/tinymist/package.nix
@@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tinymist";
   # Please update the corresponding vscode extension when updating
   # this derivation.
-  version = "0.13.16";
+  version = "0.13.18";
 
   src = fetchFromGitHub {
     owner = "Myriad-Dreamin";
     repo = "tinymist";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4ffFIqF+UYFKTl4dQadr2mCKDYnpIdaKKBQ/tXonfAA=";
+    hash = "sha256-WMbXdNa5MoaWliIlonn4tL6Myyx2nSAjgyOb/wqR7PA=";
   };
 
-  cargoHash = "sha256-cQTfyzvnrxdcYOnmJGAqwLN4Ueqh9PkYZsiGljmcrY8=";
+  cargoHash = "sha256-fU4b99mvLc1SgN2DgHqW27Agocc9NH3wQBPVFkGU0HY=";
 
   nativeBuildInputs = [
     installShellFiles

From 69290c635c61a1881cf21716bc7113903eea89b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 03:01:49 +0000
Subject: [PATCH 356/357] sea-orm-cli: 1.1.12 -> 1.1.14

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

diff --git a/pkgs/by-name/se/sea-orm-cli/package.nix b/pkgs/by-name/se/sea-orm-cli/package.nix
index caffcd25fed1..91511608767c 100644
--- a/pkgs/by-name/se/sea-orm-cli/package.nix
+++ b/pkgs/by-name/se/sea-orm-cli/package.nix
@@ -9,18 +9,18 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sea-orm-cli";
-  version = "1.1.12";
+  version = "1.1.14";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-549ZThGMQ601q0nrzAD20MIrErANcghtB+DxYPUBUt4=";
+    hash = "sha256-7nJyonPU3mdFmV968Ai5M0+Y3fm0OKsNRSKafo64V+s=";
   };
 
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl ];
 
-  cargoHash = "sha256-pwOsuet1qV7175pso5tZm1VY4JznCx63XNcBX0Jh4F4=";
+  cargoHash = "sha256-IX7s5JoaOzfP01ypqg+k018b+qwnqI356Gs+nIrpxYg=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";

From 8a629b8543e65d17b14ab3f4fee63fde47538f2e Mon Sep 17 00:00:00 2001
From: thtrf <r3769.tv@gmail.com>
Date: Mon, 4 Aug 2025 00:44:40 +0200
Subject: [PATCH 357/357] satisfactorymodmanager: use webkitgtk2-4.1

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

diff --git a/pkgs/by-name/sa/satisfactorymodmanager/package.nix b/pkgs/by-name/sa/satisfactorymodmanager/package.nix
index 248a1b3fe428..3f1b73e63d3f 100644
--- a/pkgs/by-name/sa/satisfactorymodmanager/package.nix
+++ b/pkgs/by-name/sa/satisfactorymodmanager/package.nix
@@ -65,7 +65,7 @@ buildGoModule rec {
   # running this caches some additional dependencies for the FOD
   overrideModAttrs = {
     preBuild = ''
-      wails build
+      wails build -tags webkit2_41 # 4.0 EOL
     '';
   };
 
@@ -75,7 +75,7 @@ buildGoModule rec {
 
   buildPhase = ''
     runHook preBuild
-    wails build
+    wails build -tags webkit2_41 # 4.0 EOL
     runHook postBuild
   '';