From 0d4541ac1e59b1dd07c19a140855fa6071467e10 Mon Sep 17 00:00:00 2001
From: XBagon <xbagon@outlook.de>
Date: Sun, 9 Feb 2025 23:43:01 +0100
Subject: [PATCH 01/95] gate: 0.42.0 -> 0.47.0

---
 pkgs/by-name/ga/gate/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix
index 10379d08b15a..362faf2bc0a1 100644
--- a/pkgs/by-name/ga/gate/package.nix
+++ b/pkgs/by-name/ga/gate/package.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "gate";
-  version = "0.42.0";
+  version = "0.47.0";
 in
 buildGoModule {
   inherit pname version;
@@ -15,16 +15,18 @@ buildGoModule {
     owner = "minekube";
     repo = "gate";
     tag = "v${version}";
-    hash = "sha256-a2rt+V6y8lyBMSG49eWLTPeLZKIjq+a5NBL+agIL1dg=";
+    hash = "sha256-bEpEE7W2emKLgN8WZ2Jw/cHI8ipX8mo3NZLgxUyuMK4=";
   };
 
-  vendorHash = "sha256-5s96L9KWeiS//21mQMn8ka82Uk4rMbq/8I+l67HTSA8=";
+  vendorHash = "sha256-ZxrQIcuTVROuRevQty2HN0J9NnOVkk9t8PvUZyxof1Y=";
 
   ldflags = [
     "-s"
     "-w"
   ];
 
+  excludedPackages = [ ".web" ];
+
   meta = {
     description = "High-Performance, Low-Memory, Lightweight, Extensible Minecraft Reverse Proxy";
     longDescription = ''

From 0e379f3fa9558efe90a3c1f4bc9ec864c6b4eed1 Mon Sep 17 00:00:00 2001
From: luftmensch-luftmensch <valentinobocchetti59@gmail.com>
Date: Sat, 22 Feb 2025 10:26:26 +0100
Subject: [PATCH 02/95] electron-mail: 5.2.3 -> 5.3.0

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

diff --git a/pkgs/by-name/el/electron-mail/package.nix b/pkgs/by-name/el/electron-mail/package.nix
index 22e7200277f9..74131ada35df 100644
--- a/pkgs/by-name/el/electron-mail/package.nix
+++ b/pkgs/by-name/el/electron-mail/package.nix
@@ -7,11 +7,11 @@
 
 let
   pname = "electron-mail";
-  version = "5.2.3";
+  version = "5.3.0";
 
   src = fetchurl {
     url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage";
-    sha256 = "sha256-ajekPPRgprYNWE2osAXe46qVjnxXzkXa+MkWiNYJ5Fc=";
+    hash = "sha256-QGYsD8Ec6/G4X2dGZfH7LwT6o6X599kP6V34y6WxP64=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From a126901121dadac7ec7845089d2862d71293c4d2 Mon Sep 17 00:00:00 2001
From: luftmensch-luftmensch <valentinobocchetti59@gmail.com>
Date: Sat, 22 Feb 2025 10:29:12 +0100
Subject: [PATCH 03/95] electron-mail: remove `with lib;`

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

diff --git a/pkgs/by-name/el/electron-mail/package.nix b/pkgs/by-name/el/electron-mail/package.nix
index 74131ada35df..9425bae778e8 100644
--- a/pkgs/by-name/el/electron-mail/package.nix
+++ b/pkgs/by-name/el/electron-mail/package.nix
@@ -33,12 +33,12 @@ appimageTools.wrapType2 {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail";
     mainProgram = "electron-mail";
     homepage = "https://github.com/vladimiry/ElectronMail";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.princemachiavelli ];
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.princemachiavelli ];
     platforms = [ "x86_64-linux" ];
     changelog = "https://github.com/vladimiry/ElectronMail/releases/tag/v${version}";
   };

From fe9da650ef54668bb0b575a4f2709268b9749a60 Mon Sep 17 00:00:00 2001
From: Robert Medeiros <robert@crimeminister.org>
Date: Wed, 26 Mar 2025 19:40:39 -0400
Subject: [PATCH 04/95] overturemaps: 0.12.0 -> 0.14.0

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

diff --git a/pkgs/by-name/ov/overturemaps/package.nix b/pkgs/by-name/ov/overturemaps/package.nix
index 788d75e593c8..f0dbe48c7f3d 100644
--- a/pkgs/by-name/ov/overturemaps/package.nix
+++ b/pkgs/by-name/ov/overturemaps/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "overturemaps";
-  version = "0.12.0";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Nr8ZB5A8ePJI69IL4Mzjmz22FLzsTGdfP+eTSAqCcoc=";
+    hash = "sha256-UtYS5FcNBT9IIiybKUXK+jwGnXQ+oR/HQI3ntfV8NYg=";
   };
 
   build-system = with python3Packages; [ poetry-core ];

From 946c5908742e988f1a1ba12d52681cfe092af012 Mon Sep 17 00:00:00 2001
From: Tobias Berger <toby@tobot.dev>
Date: Mon, 7 Apr 2025 11:40:06 +0200
Subject: [PATCH 05/95] space-station-14-launcher: 0.29.1 -> 0.31.0

Format
---
 .../sp/space-station-14-launcher/deps.json    | 510 ++++--------------
 .../sp/space-station-14-launcher/package.nix  | 200 ++++++-
 .../space-station-14-launcher.nix             | 132 -----
 .../sp/space-station-14-launcher/update.sh    |  16 -
 4 files changed, 281 insertions(+), 577 deletions(-)
 delete mode 100644 pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix
 delete mode 100755 pkgs/by-name/sp/space-station-14-launcher/update.sh

diff --git a/pkgs/by-name/sp/space-station-14-launcher/deps.json b/pkgs/by-name/sp/space-station-14-launcher/deps.json
index 97c320c9e91f..5dee9fb6ad82 100644
--- a/pkgs/by-name/sp/space-station-14-launcher/deps.json
+++ b/pkgs/by-name/sp/space-station-14-launcher/deps.json
@@ -1,78 +1,83 @@
 [
   {
     "pname": "Avalonia",
-    "version": "11.0.5",
-    "hash": "sha256-BqpHqQIObTb7DHTyZAgCD9A5I0pZkHhSoPTN2g6/G9E="
+    "version": "11.2.4",
+    "hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
-    "version": "2.1.0.2023020321",
-    "hash": "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="
+    "version": "2.1.22045.20230930",
+    "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
   },
   {
     "pname": "Avalonia.BuildServices",
-    "version": "0.0.29",
-    "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="
+    "version": "0.0.31",
+    "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.0.5",
-    "hash": "sha256-Iob8OyWhwXhmHKCdnea7dtL9VQvcrf6/gUGHJ30CKXA="
+    "version": "11.2.4",
+    "hash": "sha256-21Wfb4p0dCevw8Iu/Fchngt1teAnBaxEWgiUpFkerTo="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.0.5",
-    "hash": "sha256-2iVuMPRw7sbsYPGSG4XjQFGFky5WB5B05Jh1+I852ZI="
+    "version": "11.2.4",
+    "hash": "sha256-fqQBKzHcL0CwuOQ90Gp+UUZZP9OQ9U6H41bvikxQJpo="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.0.5",
-    "hash": "sha256-UKVibxhJoGNvEGh8J/Z0sq8J81FT8yth/yXVPSFHF/8="
+    "version": "11.2.4",
+    "hash": "sha256-WKTOx7RNSb0fOMg5Za4j+u9DwKXDqVzHwQCEXSm7TFo="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.0.5",
-    "hash": "sha256-0cUxPYJP2W11wnM6j4qNB3IvHlsUp9EZlY8I/NoAmd4="
+    "version": "11.2.4",
+    "hash": "sha256-MUSfRXeJ1bstO2rTqWWCQyVq2EpjM5b5bxe0KxVAEU4="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.0.5",
-    "hash": "sha256-O20fC/9YXO3/MZNlh1EgWLHFSyi/ao083MKwjetgxmo="
+    "version": "11.2.4",
+    "hash": "sha256-lw8YFXR/pn0awFvFW+OhjZ2LbHonL6zwqLIz+pQp+Sk="
+  },
+  {
+    "pname": "Avalonia.Markup.Xaml.Loader",
+    "version": "11.2.4",
+    "hash": "sha256-iSf5UmeWi6D7uVblYj3eMN9pljwKA6O0pAz1UYE38kQ="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.0.5",
-    "hash": "sha256-KVUAXXT+f4VrtJ8widfEIzN25GBbtXWog/tpM354gdg="
+    "version": "11.2.4",
+    "hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM="
   },
   {
     "pname": "Avalonia.ReactiveUI",
-    "version": "11.0.5",
-    "hash": "sha256-8tGLyA0PRKt1REb9YeCtEDz5oB886PRG35aO0uZm/jU="
+    "version": "11.2.4",
+    "hash": "sha256-LqwLUDCIbJowol6BNTTsK7a7KjcLLbCM3y3KKvuHRGw="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.0.5",
-    "hash": "sha256-wTqdxPU3Ql7jC4JFkChbUfaRR0nqUKrYKn8oexdFyig="
+    "version": "11.2.4",
+    "hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.0.5",
-    "hash": "sha256-rKOgkNLCwEVVcyLCimvhDUDKXnrDOguUryaGVOPFFwE="
+    "version": "11.2.4",
+    "hash": "sha256-82UQGuCl5hN5kdA3Uz7hptpNnG1EPlSB6k/a6XPSuXI="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.0.5",
-    "hash": "sha256-27evmgSrIx+EopF6E3N1cT7BvAUc/s99TVEMfmG83cQ="
+    "version": "11.2.4",
+    "hash": "sha256-rnF2/bzN8AuOFlsuekOxlu+uLI7n1kIAmC36FFXMKak="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.0.5",
-    "hash": "sha256-ncZLGKhpfjuuVPz4Fs+P6L3dM0KRnwAC3xJRqyvpKw8="
+    "version": "11.2.4",
+    "hash": "sha256-LJSKiLbdof8qouQhN7pY1RkMOb09IiAu/nrJFR2OybY="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.0.5",
-    "hash": "sha256-rvs3hwRh3F5E1j3JqcodWJTHV3BTWMKkvzq170tuPa4="
+    "version": "11.2.4",
+    "hash": "sha256-qty8D2/HlZz/7MiEhuagjlKlooDoW3fow5yJY5oX4Uk="
   },
   {
     "pname": "CodeHollow.FeedReader",
@@ -86,8 +91,8 @@
   },
   {
     "pname": "DynamicData",
-    "version": "7.13.1",
-    "hash": "sha256-wSMqsqAWKqVaIDVlRtycTiS0R3fQxknfEPfBaYVawkM="
+    "version": "8.4.1",
+    "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4="
   },
   {
     "pname": "Fody",
@@ -96,28 +101,38 @@
   },
   {
     "pname": "HarfBuzzSharp",
-    "version": "2.8.2.3",
-    "hash": "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="
+    "version": "7.3.0.3",
+    "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "2.8.2.3",
-    "hash": "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="
+    "version": "7.3.0.3",
+    "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "2.8.2.3",
-    "hash": "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="
+    "version": "7.3.0.3",
+    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
-    "version": "2.8.2.3",
-    "hash": "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="
+    "version": "7.3.0.3",
+    "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Win32",
-    "version": "2.8.2.3",
-    "hash": "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="
+    "version": "7.3.0.3",
+    "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
+  },
+  {
+    "pname": "HotAvalonia",
+    "version": "2.1.0",
+    "hash": "sha256-dAsVw79exJeQBCCMwJDv7SWARl3dcSIEYcjcmusLqJM="
+  },
+  {
+    "pname": "HotAvalonia.Extensions",
+    "version": "2.1.0",
+    "hash": "sha256-96H37VvKh2E42KNXtUClhvArcJeX6/diooD2HEcNbOY="
   },
   {
     "pname": "JetBrains.Annotations",
@@ -149,36 +164,6 @@
     "version": "0.11.0",
     "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
   },
-  {
-    "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "3.0.0",
-    "hash": "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="
-  },
-  {
-    "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "3.8.0",
-    "hash": "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="
-  },
-  {
-    "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "3.8.0",
-    "hash": "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="
-  },
-  {
-    "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.CSharp",
-    "version": "4.3.0",
-    "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="
-  },
   {
     "pname": "Microsoft.Data.Sqlite.Core",
     "version": "7.0.4",
@@ -189,36 +174,46 @@
     "version": "8.0.0",
     "hash": "sha256-BAbtucZQvBgbiJ51UAL/Ilx+dz96LpWmfjnnNGlcw48="
   },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.1.0",
-    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
-  },
-  {
-    "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.Toolkit.Mvvm",
     "version": "7.1.2",
     "hash": "sha256-JOxZGQGm1WPkIpIDurQnlYk+QgHxJLPguJfCQLJ8NEM="
   },
   {
-    "pname": "Microsoft.Win32.SystemEvents",
-    "version": "6.0.0",
-    "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
+    "pname": "Mono.Cecil",
+    "version": "0.11.5",
+    "hash": "sha256-nPFwbzW08gnCjadBdgi+16MHYhsPAXnFIliveLxGaNA="
   },
   {
     "pname": "Mono.Posix.NETStandard",
     "version": "1.0.0",
     "hash": "sha256-/F61k7MY/fu2FcfW7CkyjuUroKwlYAXPQFVeDs1QknY="
   },
+  {
+    "pname": "MonoMod.Backports",
+    "version": "1.1.2",
+    "hash": "sha256-oXhcnMo0rDZDcpmhGVhQhax0lFeb9DT3GfSooesOo38="
+  },
+  {
+    "pname": "MonoMod.Core",
+    "version": "1.2.1",
+    "hash": "sha256-EQ4CX9OGxBPMDqMCdrudkGY/ywZUi3rtFszDcgp7MBg="
+  },
+  {
+    "pname": "MonoMod.ILHelpers",
+    "version": "1.1.0",
+    "hash": "sha256-seoET5fqsyOY8g7DfNpLQHNTdUVY3U/xCoYFC4UrOKw="
+  },
+  {
+    "pname": "MonoMod.RuntimeDetour",
+    "version": "25.2.1",
+    "hash": "sha256-ZlgzMqquKWwv8+MvOhIEdvoPShFe7nUAZ3evWhGoLsc="
+  },
+  {
+    "pname": "MonoMod.Utils",
+    "version": "25.0.7",
+    "hash": "sha256-GegA6fMRLYVeB75ypkIfTdqgGT38fcKqY/McqZE27qQ="
+  },
   {
     "pname": "NSec.Cryptography",
     "version": "22.4.0",
@@ -226,8 +221,8 @@
   },
   {
     "pname": "ReactiveUI",
-    "version": "18.4.26",
-    "hash": "sha256-SvWTQfgwwIIwwj67J42fb+Gm8u74iawPd7JqYuYmEnY="
+    "version": "20.1.1",
+    "hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE="
   },
   {
     "pname": "ReactiveUI.Fody",
@@ -274,141 +269,6 @@
     "version": "0.1.2",
     "hash": "sha256-ANaf6S0tsocsw37RJvk9d4LcvVQ0+1yO900iG1BLwe4="
   },
-  {
-    "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": "Serilog",
     "version": "2.12.0",
@@ -431,28 +291,28 @@
   },
   {
     "pname": "SkiaSharp",
-    "version": "2.88.6",
-    "hash": "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc="
+    "version": "2.88.9",
+    "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Linux",
-    "version": "2.88.6",
-    "hash": "sha256-VjgGoi73tVvqO/UXmQb1w9ioAbFu2dxH8oHz1l5H4zE="
+    "version": "2.88.9",
+    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
   },
   {
     "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "2.88.6",
-    "hash": "sha256-7hOMjlYTOiNPLNwfLFUjTcdgiGEtmYUI1EubiRiC6bo="
+    "version": "2.88.9",
+    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
   },
   {
     "pname": "SkiaSharp.NativeAssets.WebAssembly",
-    "version": "2.88.6",
-    "hash": "sha256-CIb9fHVgHwIa0R1WafKJ3+GqtDHHRgDohA3ayTHvlws="
+    "version": "2.88.9",
+    "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.6",
-    "hash": "sha256-ljD4QmAO2/vwA6I8GIUNkONpOzmGsOVJJy9vPDnjVfA="
+    "version": "2.88.9",
+    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
   },
   {
     "pname": "SpaceWizards.Sodium",
@@ -466,8 +326,8 @@
   },
   {
     "pname": "Splat",
-    "version": "14.6.8",
-    "hash": "sha256-XHTuUKAisBU0O3keA+Ojzb8yKKJUheWbRHakzLBeQNo="
+    "version": "15.1.1",
+    "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg="
   },
   {
     "pname": "SQLitePCLRaw.bundle_e_sqlite3",
@@ -489,60 +349,15 @@
     "version": "2.1.4",
     "hash": "sha256-Zdj676VT6j6k9ZCL2hYVl4F8bi4TK/ldvQBPmW0oDi0="
   },
-  {
-    "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.ComponentModel.Annotations",
-    "version": "4.5.0",
-    "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
-  },
-  {
-    "pname": "System.Diagnostics.Debug",
-    "version": "4.3.0",
-    "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
-  },
-  {
-    "pname": "System.Drawing.Common",
-    "version": "6.0.0",
-    "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
-  },
-  {
-    "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="
+    "version": "5.0.0",
+    "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
   },
   {
     "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="
+    "version": "8.0.0",
+    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
   },
   {
     "pname": "System.Memory",
@@ -560,119 +375,14 @@
     "hash": "sha256-wSK5KtWvlDp8WLNddCmAM66uGyj9/KfJyCh8ht1PD1M="
   },
   {
-    "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.0",
+    "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
   },
   {
     "pname": "System.Reactive",
-    "version": "5.0.0",
-    "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="
-  },
-  {
-    "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": "5.0.0",
-    "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="
-  },
-  {
-    "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.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.Text.Encoding",
-    "version": "4.3.0",
-    "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
-  },
-  {
-    "pname": "System.Text.Encoding.CodePages",
-    "version": "4.5.1",
-    "hash": "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="
-  },
-  {
-    "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="
+    "version": "6.0.1",
+    "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
   },
   {
     "pname": "TerraFX.Interop.Windows",
@@ -681,8 +391,8 @@
   },
   {
     "pname": "Tmds.DBus.Protocol",
-    "version": "0.15.0",
-    "hash": "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="
+    "version": "0.20.0",
+    "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
   },
   {
     "pname": "YamlDotNet",
diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix
index d39129c092a2..54bff729de14 100644
--- a/pkgs/by-name/sp/space-station-14-launcher/package.nix
+++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix
@@ -1,42 +1,184 @@
 {
+  lib,
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  wrapGAppsHook4,
+  iconConvTools,
+  copyDesktopItems,
+  makeDesktopItem,
+  libX11,
+  libICE,
+  libSM,
+  libXi,
+  libXcursor,
+  libXext,
+  libXrandr,
+  fontconfig,
+  glew,
+  SDL2,
+  glfw,
+  glibc,
+  libGL,
+  freetype,
+  openal,
+  fluidsynth,
+  gtk3,
+  pango,
+  atk,
+  cairo,
+  zlib,
+  glib,
+  gdk-pixbuf,
   soundfont-fluid,
-  buildFHSEnv,
-  runCommand,
-  callPackage,
+
+  # Path to set ROBUST_SOUNDFONT_OVERRIDE to, essentially the default soundfont used.
+  soundfont-path ? "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2",
 }:
-
 let
-  space-station-14-launcher = callPackage ./space-station-14-launcher.nix { };
-
-  # Workaround for hardcoded soundfont paths in downloaded engine assemblies.
-  soundfont-fluid-fixed = runCommand "soundfont-fluid-fixed" { } ''
-    mkdir -p "$out/share/soundfonts"
-    ln -sf ${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2 $out/share/soundfonts/FluidR3_GM.sf2
-  '';
+  version = "0.31.0";
+  pname = "space-station-14-launcher";
 in
-buildFHSEnv rec {
-  pname = "space-station-14-launcher-wrapped";
-  inherit (space-station-14-launcher) version;
+buildDotnetModule rec {
+  inherit pname;
 
-  targetPkgs = pkgs: [
-    space-station-14-launcher
-    soundfont-fluid-fixed
+  # Workaround to prevent buildDotnetModule from overriding assembly versions.
+  name = "${pname}-${version}";
+
+  # A bit redundant but I don't trust this package to be maintained by anyone else.
+  src = fetchFromGitHub {
+    owner = "space-wizards";
+    repo = "SS14.Launcher";
+    rev = "v${version}";
+    hash = "sha256-lEgJ+GdmiSQMl/l+CTBIUevMcJi+yVvFuS3buTNCYW4=";
+    fetchSubmodules = true;
+  };
+
+  buildType = "Release";
+  selfContainedBuild = false;
+
+  projectFile = [
+    "SS14.Loader/SS14.Loader.csproj"
+    "SS14.Launcher/SS14.Launcher.csproj"
   ];
 
-  runScript = "SS14.Launcher";
+  nugetDeps = ./deps.json;
 
-  extraInstallCommands = ''
-    mkdir -p $out/share/applications
-    ln -s ${space-station-14-launcher}/share/icons $out/share
-    cp ${space-station-14-launcher}/share/applications/space-station-14-launcher.desktop "$out/share/applications"
-    substituteInPlace "$out/share/applications/space-station-14-launcher.desktop" \
-        --replace ${space-station-14-launcher.meta.mainProgram} ${meta.mainProgram}
+  passthru = {
+    inherit version;
+  };
+
+  # SDK 8.0 required for Robust.LoaderApi
+  dotnet-sdk =
+    with dotnetCorePackages;
+    combinePackages [
+      sdk_9_0
+      sdk_8_0
+    ];
+  dotnet-runtime = dotnetCorePackages.runtime_9_0;
+
+  dotnetFlags = [
+    "-p:FullRelease=true"
+    "-p:RobustILLink=true"
+    "-nologo"
+  ];
+
+  nativeBuildInputs = [
+    wrapGAppsHook4
+    iconConvTools
+    copyDesktopItems
+  ];
+
+  LD_LIBRARY_PATH = lib.makeLibraryPath [
+    fontconfig
+    libX11
+    libICE
+    libSM
+    libXi
+    libXcursor
+    libXext
+    libXrandr
+
+    glfw
+    SDL2
+    glibc
+    libGL
+    openal
+    freetype
+    fluidsynth
+  ];
+
+  runtimeDeps = [
+    # Required by the game.
+    glfw
+    SDL2
+    glibc
+    libGL
+    openal
+    freetype
+    fluidsynth
+
+    # Needed for file dialogs.
+    gtk3
+    pango
+    cairo
+    atk
+    zlib
+    glib
+    gdk-pixbuf
+
+    # Avalonia UI dependencies.
+    libX11
+    libICE
+    libSM
+    libXi
+    libXcursor
+    libXext
+    libXrandr
+    fontconfig
+    glew
+
+    # TODO: Figure out dependencies for CEF support.
+  ];
+
+  # ${soundfont-path} is escaped here:
+  # https://github.com/NixOS/nixpkgs/blob/d29975d32b1dc7fe91d5cb275d20f8f8aba399ad/pkgs/build-support/setup-hooks/make-wrapper.sh#L126C35-L126C45
+  # via https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html under ${parameter@operator}
+  makeWrapperArgs = [ ''--set ROBUST_SOUNDFONT_OVERRIDE ${soundfont-path}'' ];
+
+  executables = [ "SS14.Launcher" ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = pname;
+      exec = meta.mainProgram;
+      icon = pname;
+      desktopName = "Space Station 14 Launcher";
+      comment = meta.description;
+      categories = [ "Game" ];
+      startupWMClass = meta.mainProgram;
+    })
+  ];
+
+  postInstall = ''
+    mkdir -p $out/lib/space-station-14-launcher/loader
+    cp -r SS14.Loader/bin/${buildType}/*/*/* $out/lib/space-station-14-launcher/loader/
+
+    icoFileToHiColorTheme SS14.Launcher/Assets/icon.ico space-station-14-launcher $out
   '';
 
-  passthru = space-station-14-launcher.passthru // {
-    unwrapped = space-station-14-launcher;
-  };
-  meta = space-station-14-launcher.meta // {
-    mainProgram = pname;
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  meta = with lib; {
+    description = "Launcher for Space Station 14, a multiplayer game about paranoia and disaster";
+    homepage = "https://spacestation14.io";
+    license = licenses.mit;
+    maintainers = [ ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "SS14.Launcher";
   };
 }
diff --git a/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix
deleted file mode 100644
index 12455e9dc40e..000000000000
--- a/pkgs/by-name/sp/space-station-14-launcher/space-station-14-launcher.nix
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  lib,
-  buildDotnetModule,
-  dotnetCorePackages,
-  fetchFromGitHub,
-  wrapGAppsHook3,
-  iconConvTools,
-  copyDesktopItems,
-  makeDesktopItem,
-  glew,
-  SDL2,
-  glfw,
-  glibc,
-  libGL,
-  freetype,
-  openal,
-  fluidsynth,
-  gtk3,
-  pango,
-  atk,
-  cairo,
-  zlib,
-  glib,
-  gdk-pixbuf,
-}:
-let
-  version = "0.29.1";
-  pname = "space-station-14-launcher";
-in
-buildDotnetModule rec {
-  inherit pname version;
-
-  # Workaround to prevent buildDotnetModule from overriding assembly versions.
-  name = "${pname}-${version}";
-
-  src = fetchFromGitHub {
-    owner = "space-wizards";
-    repo = "SS14.Launcher";
-    rev = "v${version}";
-    hash = "sha256-Gajs8zINWBJ3BvAPKYan0bCRbEVscz56pyE9WOLiOqU=";
-    fetchSubmodules = true;
-  };
-
-  buildType = "Release";
-  selfContainedBuild = false;
-
-  projectFile = [
-    "SS14.Loader/SS14.Loader.csproj"
-    "SS14.Launcher/SS14.Launcher.csproj"
-  ];
-
-  nugetDeps = ./deps.json;
-
-  passthru = {
-    inherit version; # Workaround so update script works.
-    updateScript = ./update.sh;
-  };
-
-  dotnet-sdk = dotnetCorePackages.sdk_8_0;
-  dotnet-runtime = dotnetCorePackages.runtime_8_0;
-
-  dotnetFlags = [
-    "-p:FullRelease=true"
-    "-p:RobustILLink=true"
-    "-nologo"
-  ];
-
-  nativeBuildInputs = [
-    wrapGAppsHook3
-    iconConvTools
-    copyDesktopItems
-  ];
-
-  runtimeDeps = [
-    # Required by the game.
-    glfw
-    SDL2
-    glibc
-    libGL
-    openal
-    freetype
-    fluidsynth
-
-    # Needed for file dialogs.
-    gtk3
-    pango
-    cairo
-    atk
-    zlib
-    glib
-    gdk-pixbuf
-
-    # Avalonia UI dependencies.
-    glew
-  ];
-
-  executables = [ "SS14.Launcher" ];
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = pname;
-      exec = meta.mainProgram;
-      icon = pname;
-      desktopName = "Space Station 14 Launcher";
-      comment = meta.description;
-      categories = [ "Game" ];
-      startupWMClass = meta.mainProgram;
-    })
-  ];
-
-  postInstall = ''
-    mkdir -p $out/lib/space-station-14-launcher/loader
-    cp -r SS14.Loader/bin/${buildType}/*/*/* $out/lib/space-station-14-launcher/loader/
-
-    icoFileToHiColorTheme SS14.Launcher/Assets/icon.ico space-station-14-launcher $out
-  '';
-
-  dontWrapGApps = true;
-
-  preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
-  '';
-
-  meta = with lib; {
-    description = "Launcher for Space Station 14, a multiplayer game about paranoia and disaster";
-    homepage = "https://spacestation14.io";
-    license = licenses.mit;
-    maintainers = [ ];
-    platforms = [ "x86_64-linux" ];
-    mainProgram = "SS14.Launcher";
-  };
-}
diff --git a/pkgs/by-name/sp/space-station-14-launcher/update.sh b/pkgs/by-name/sp/space-station-14-launcher/update.sh
deleted file mode 100755
index 6e8b337d3842..000000000000
--- a/pkgs/by-name/sp/space-station-14-launcher/update.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts
-set -eo pipefail
-cd "$(dirname "${BASH_SOURCE[0]}")"
-
-new_version="$(curl -s "https://api.github.com/repos/space-wizards/SS14.Launcher/releases?per_page=1" | jq -r '.[0].tag_name' | sed 's/v//')"
-old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./space-station-14-launcher.nix)"
-
-if [[ "$new_version" == "$old_version" ]]; then
-  echo "Already up to date!"
-  exit 0
-fi
-
-cd ../../..
-update-source-version space-station-14-launcher.unwrapped "$new_version"
-$(nix-build -A space-station-14-launcher.fetch-deps --no-out-link)

From 9280d860776bd4cfaa8826d8ef2a4f85aa0ac4f1 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Wed, 9 Apr 2025 21:58:09 +0800
Subject: [PATCH 06/95] spirit: 0.7.0 -> 0.8.0

---
 pkgs/by-name/sp/spirit/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sp/spirit/package.nix b/pkgs/by-name/sp/spirit/package.nix
index e4e0334c0a53..3e33990b96cd 100644
--- a/pkgs/by-name/sp/spirit/package.nix
+++ b/pkgs/by-name/sp/spirit/package.nix
@@ -4,18 +4,18 @@
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "spirit";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "cashapp";
     repo = "spirit";
-    rev = "v${version}-prerelease";
-    hash = "sha256-qC27kkUWELRFEVhZT7R6ickpAfDbL/AtYx2gRkDTvrI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-bGKqiCd9dggppORouoWlAoAaYdx4vAivsP22KWm1fxU=";
   };
 
-  vendorHash = "sha256-Dq7UeAH7FvY12rEYkpcKpEUzMMrGfubt0WadnZYt8dk=";
+  vendorHash = "sha256-87WUqUjyfprpY63kEKCAx/AU6TN73W7oMdOaKfl8xt4=";
 
   subPackages = [ "cmd/spirit" ];
 
@@ -31,4 +31,4 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "spirit";
   };
-}
+})

From 7ba214a334b3689611eea29b1ea1275c3c7ae4ee Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Fri, 11 Apr 2025 08:49:27 +0800
Subject: [PATCH 07/95] weaver: 0.13.2 -> 0.14.0

---
 pkgs/by-name/we/weaver/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix
index 80e838b23272..38c9fcb2767c 100644
--- a/pkgs/by-name/we/weaver/package.nix
+++ b/pkgs/by-name/we/weaver/package.nix
@@ -6,19 +6,19 @@
   weaver,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "weaver";
-  version = "0.13.2";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "weaver";
-    rev = "v${version}";
-    hash = "sha256-kfBWI+1f39oSSKYflXfXnBTc96OZch7o5HWfOgOfuxs=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zsDHVa3UqJX0dPg69hQmoTc6d+fx5zHe4+ElFByMb9s=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-KK6Cp6viQPp9cSxs1dP1tf/bIMgkKiaKPE6VytyHyZA=";
+  cargoHash = "sha256-30JR9dX+N8KLHeUt8VsGC9LgKUnTtwunWAaXEnzGyWw=";
 
   checkFlags = [
     # Skip tests requiring network
@@ -36,4 +36,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "weaver";
   };
-}
+})

From 3b81fff9fc264131a2b8075a1bea8bb8e9348346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sun, 13 Apr 2025 17:10:29 +0000
Subject: [PATCH 08/95] gamja: 1.0.0-beta.10 -> 1.0.0-beta.11

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

diff --git a/pkgs/by-name/ga/gamja/package.nix b/pkgs/by-name/ga/gamja/package.nix
index 8b8c1b59f0c7..e4eae19f469b 100644
--- a/pkgs/by-name/ga/gamja/package.nix
+++ b/pkgs/by-name/ga/gamja/package.nix
@@ -8,17 +8,17 @@
 }:
 buildNpmPackage rec {
   pname = "gamja";
-  version = "1.0.0-beta.10";
+  version = "1.0.0-beta.11";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "emersion";
     repo = "gamja";
     rev = "v${version}";
-    hash = "sha256-JqnEiPnYRGSeIZm34Guu7MgMfwcySc42aTXweMqL8BQ=";
+    hash = "sha256-amwJ6PWS0In7ERcvZr5XbJyHedSwJGAUUS2vWIqktNE=";
   };
 
-  npmDepsHash = "sha256-dAfbluNNBF1e9oagej+SRxO/YffCdLLAUUgt8krnWvg=";
+  npmDepsHash = "sha256-5YU9H3XHwZADdIvKmS99cAFFg69GPJzD9u0LOuJmKXE=";
 
   installPhase = ''
     runHook preInstall
@@ -33,7 +33,7 @@ buildNpmPackage rec {
 
   meta = with lib; {
     description = "Simple IRC web client";
-    homepage = "https://git.sr.ht/~emersion/gamja";
+    homepage = "https://codeberg.org/emersion/gamja";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [
       motiejus

From 4aac9783f77309c10132f868e1be22309928a940 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 13 Apr 2025 19:21:38 -0500
Subject: [PATCH 09/95] weasis: hardcode jre to jdk23 to fully encapsulate
 package

---
 pkgs/by-name/we/weasis/package.nix | 6 +++---
 pkgs/top-level/all-packages.nix    | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix
index c1c4410e5263..cd2a81853fe9 100644
--- a/pkgs/by-name/we/weasis/package.nix
+++ b/pkgs/by-name/we/weasis/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchzip,
-  jre,
+  jdk23,
   copyDesktopItems,
   makeDesktopItem,
 }:
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     runHook preBuild
 
-    ./build/script/package-weasis.sh --no-installer --jdk ${jre}
+    ./build/script/package-weasis.sh --no-installer --jdk ${jdk23}
 
     runHook postBuild
   '';
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/share/{applications,pixmaps}
 
-    mv weasis-${platform}-jdk${lib.versions.major jre.version}-${version}/Weasis/* $out/
+    mv weasis-${platform}-jdk${lib.versions.major jdk23.version}-${version}/Weasis/* $out/
     mv $out/lib/*.png $out/share/pixmaps/
 
     runHook postInstall
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27b6c4de43e8..2b227fef349e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19473,10 +19473,6 @@ with pkgs;
     inherit (gst_all_1) gstreamer gst-plugins-base;
   };
 
-  weasis = callPackage ../by-name/we/weasis/package.nix {
-    jre = jdk23;
-  };
-
   sieveshell = with python3.pkgs; toPythonApplication managesieve;
 
   jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami {

From 688191807222c8db438077c2b2dcb47e5236ae43 Mon Sep 17 00:00:00 2001
From: mathis <mathis.guilbaud@avisto.com>
Date: Mon, 14 Apr 2025 09:44:06 +0200
Subject: [PATCH 10/95] kubecm: refactor

---
 pkgs/by-name/ku/kubecm/package.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ku/kubecm/package.nix b/pkgs/by-name/ku/kubecm/package.nix
index 476ed8e114f2..457cc2db1ff9 100644
--- a/pkgs/by-name/ku/kubecm/package.nix
+++ b/pkgs/by-name/ku/kubecm/package.nix
@@ -2,6 +2,8 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  installShellFiles,
+  stdenv,
 }:
 
 buildGoModule rec {
@@ -22,13 +24,25 @@ buildGoModule rec {
     "-X github.com/sunny0826/kubecm/version.Version=${version}"
   ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd kubecm \
+      --bash <($out/bin/kubecm completion bash) \
+      --fish <($out/bin/kubecm completion fish) \
+      --zsh <($out/bin/kubecm completion zsh)
+  '';
+
   doCheck = false;
 
   meta = with lib; {
     description = "Manage your kubeconfig more easily";
     homepage = "https://github.com/sunny0826/kubecm/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ qjoly ];
+    maintainers = with maintainers; [
+      qjoly
+      sailord
+    ];
     mainProgram = "kubecm";
   };
 }

From df05ca5c2a59b714d8322b3fb2bf20ff60fc9c4e Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Tue, 15 Apr 2025 02:15:27 -0700
Subject: [PATCH 11/95] ckan: add passthru.updateScript

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

diff --git a/pkgs/by-name/ck/ckan/package.nix b/pkgs/by-name/ck/ckan/package.nix
index 14fce13de723..c0fd0e588c6f 100644
--- a/pkgs/by-name/ck/ckan/package.nix
+++ b/pkgs/by-name/ck/ckan/package.nix
@@ -9,6 +9,7 @@
   imagemagick,
   copyDesktopItems,
   makeDesktopItem,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -75,6 +76,8 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Mod manager for Kerbal Space Program";
     mainProgram = "ckan";

From 642dba1ff9c9f500ddcd91506785ffc038de3532 Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Tue, 15 Apr 2025 02:39:25 -0700
Subject: [PATCH 12/95] ckan: 1.35.2 -> 1.36.0

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

diff --git a/pkgs/by-name/ck/ckan/package.nix b/pkgs/by-name/ck/ckan/package.nix
index c0fd0e588c6f..b0b8dd4faecc 100644
--- a/pkgs/by-name/ck/ckan/package.nix
+++ b/pkgs/by-name/ck/ckan/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ckan";
-  version = "1.35.2";
+  version = "1.36.0";
 
   src = fetchurl {
     url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe";
-    sha256 = "sha256-SK2eKdH/bm+W+qU8XUHRD9uffmfp5bR4dBvBEUKCm8E=";
+    hash = "sha256-Tw8s86FtBz/92uq2imFZm4n88NCCpePTpydoAoYsE3U=";
   };
 
   icon = fetchurl {

From 9a1032fa4ffb3c94391379361154a0916991beeb Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Tue, 15 Apr 2025 10:17:28 -0400
Subject: [PATCH 13/95] kitty: append instead of prepend extra deps to PATH
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This allows those in the PATH already to be preferred. Prepending might
lead to confusing behavior as this may have overridden the user’s choice
for these in the shell that Kitty starts.
---
 pkgs/by-name/ki/kitty/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index cf8920486320..9546a34ab7b0 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -294,7 +294,7 @@ buildPythonApplication rec {
 
     # dereference the `kitty` symlink to make sure the actual executable
     # is wrapped on macOS as well (and not just the symlink)
-    wrapProgram $(realpath "$out/bin/kitty") --prefix PATH : "$out/bin:${
+    wrapProgram $(realpath "$out/bin/kitty") --suffix PATH : "$out/bin:${
       lib.makeBinPath [
         imagemagick
         ncurses.dev

From 0cd0adf313cc7920ac28ffdcc4b6aba54c69bd21 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Sun, 13 Apr 2025 20:44:53 +0000
Subject: [PATCH 14/95] edgetx: migrate to by-name

This is a zero rebuild refactor.
---
 .../default.nix => by-name/ed/edgetx/package.nix} | 15 +++++++--------
 pkgs/top-level/all-packages.nix                   |  2 --
 2 files changed, 7 insertions(+), 10 deletions(-)
 rename pkgs/{applications/misc/edgetx/default.nix => by-name/ed/edgetx/package.nix} (90%)

diff --git a/pkgs/applications/misc/edgetx/default.nix b/pkgs/by-name/ed/edgetx/package.nix
similarity index 90%
rename from pkgs/applications/misc/edgetx/default.nix
rename to pkgs/by-name/ed/edgetx/package.nix
index e4b4e3f3b385..7f72d3833b26 100644
--- a/pkgs/applications/misc/edgetx/default.nix
+++ b/pkgs/by-name/ed/edgetx/package.nix
@@ -1,19 +1,17 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
   gcc-arm-embedded,
   python3Packages,
-  qtbase,
-  qtmultimedia,
-  qttools,
+  libsForQt5,
   SDL,
   gtest,
   dfu-util,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "edgetx";
   version = "2.7.2";
 
@@ -29,12 +27,13 @@ mkDerivation rec {
     cmake
     gcc-arm-embedded
     python3Packages.pillow
-    qttools
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
     SDL
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b811f4842f5d..3a812310e5f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15360,8 +15360,6 @@ with pkgs;
     mopidy-ytmusic
     ;
 
-  edgetx = libsForQt5.callPackage ../applications/misc/edgetx { };
-
   mpg123 = callPackage ../applications/audio/mpg123 {
     inherit (darwin.apple_sdk.frameworks) AudioUnit AudioToolbox;
     jack = libjack2;

From 7ab6179a39aaf019cf37d8f8ef199233f7af0da1 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Sun, 13 Apr 2025 20:47:28 +0000
Subject: [PATCH 15/95] edgetx: refactor src attribute

- Remove repo = pname
- Migrate `rev` -> `tag`
---
 pkgs/by-name/ed/edgetx/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix
index 7f72d3833b26..9bb99677cabe 100644
--- a/pkgs/by-name/ed/edgetx/package.nix
+++ b/pkgs/by-name/ed/edgetx/package.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "EdgeTX";
-    repo = pname;
-    rev = "v${version}";
+    repo = "edgetx";
+    tag = "v${version}";
     fetchSubmodules = true;
     hash = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E=";
   };

From 6b917b1564620ea7358693adc5d66fb97c354aba Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Mon, 14 Apr 2025 22:44:15 +0000
Subject: [PATCH 16/95] edgetx: 2.7.2 -> 2.11.0-rc3, expand build for all
 targets

Previously the companion was built only for a single default target.
This is very unexpected. Upstream build system is a huge pain, so
our build will also look very hacky. For reference [1] is how upstream
builds their repo. I've tried to make the derivation not very cringeworthy,
but there's a lot of complexity piled on.

Some specific problems to keep an eye out for:

- All targets have to be enumerated by hand. I've put it into a separate
  file to improve readability.
- libclang shenanigans. Upstream uses python bindings for `libclang` to
  generate code at compile time. To make it find C/C++ standard library
  headers we have to patch the scripts and read nix-support/{libc,libcxx}-cflags
  to extract the necessary compiler flags that cc-wrapper usually handles for us.

[1]: https://github.com/EdgeTX/edgetx/blob/v2.11.0-rc3/tools/build-companion.sh
---
 .../ed/edgetx/0001-libclang-paths.patch       |  38 +++++
 pkgs/by-name/ed/edgetx/package.nix            | 144 +++++++++++++++---
 pkgs/by-name/ed/edgetx/targets.nix            |  46 ++++++
 3 files changed, 210 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/by-name/ed/edgetx/0001-libclang-paths.patch
 create mode 100644 pkgs/by-name/ed/edgetx/targets.nix

diff --git a/pkgs/by-name/ed/edgetx/0001-libclang-paths.patch b/pkgs/by-name/ed/edgetx/0001-libclang-paths.patch
new file mode 100644
index 000000000000..ca40b2a69628
--- /dev/null
+++ b/pkgs/by-name/ed/edgetx/0001-libclang-paths.patch
@@ -0,0 +1,38 @@
+diff --git a/radio/util/find_clang.py b/radio/util/find_clang.py
+index d9cdbb083..f78f87717 100644
+--- a/radio/util/find_clang.py
++++ b/radio/util/find_clang.py
+@@ -59,6 +59,7 @@ def getBuiltinHeaderPath(library_path):
+     return None
+ 
+ def findLibClang():
++    return "@libclang@"
+     if sys.platform == "darwin":
+         knownPaths = [
+             "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib",
+diff --git a/radio/util/generate_datacopy.py b/radio/util/generate_datacopy.py
+index a92b0c3e2..6385b2ff6 100755
+--- a/radio/util/generate_datacopy.py
++++ b/radio/util/generate_datacopy.py
+@@ -5,7 +5,8 @@ import sys
+ import clang.cindex
+ import time
+ import os
+-
++from pathlib import Path
++import re
+ 
+ structs = []
+ extrastructs = []
+@@ -102,6 +103,11 @@ def main():
+     if find_clang.builtin_hdr_path:
+         args.append("-I" + find_clang.builtin_hdr_path)
+ 
++    args.append("-resource-dir")
++    args.append("@resourceDir@")
++    for path in ["@libc-cflags@", "@libcxx-cflags@"]:
++        args.extend([flag.strip() for flag in re.split(r'\s+', Path(path).read_text()) if flag.strip()])
++
+     translation_unit = index.parse(sys.argv[1], args)
+ 
+     if translation_unit.diagnostics:
diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix
index 9bb99677cabe..be347cdae9fe 100644
--- a/pkgs/by-name/ed/edgetx/package.nix
+++ b/pkgs/by-name/ed/edgetx/package.nix
@@ -2,31 +2,57 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  python3,
   cmake,
-  gcc-arm-embedded,
-  python3Packages,
+  ninja,
   libsForQt5,
-  SDL,
-  gtest,
+  SDL2,
+  fox_1_6,
+  replaceVars,
+  llvmPackages,
   dfu-util,
+  gtest,
+  miniz,
+  yaml-cpp,
+  # List of targets to build simulators for
+  targetsToBuild ? import ./targets.nix,
 }:
 
-stdenv.mkDerivation rec {
+let
+  # Keep in sync with `cmake/FetchMaxLibQt.cmake`.
+  maxlibqt = fetchFromGitHub {
+    owner = "edgetx";
+    repo = "maxLibQt";
+    rev = "ac1988ffd005cd15a8449b92150ce6c08574a4f1";
+    hash = "sha256-u8e4qseU0+BJyZkV0JE4sUiXaFeIYvadkMTGXXiE2Kg=";
+  };
+
+  pythonEnv = python3.withPackages (
+    pyPkgs: with pyPkgs; [
+      pillow
+      lz4
+      jinja2
+      libclang
+    ]
+  );
+in
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "edgetx";
-  version = "2.7.2";
+  version = "2.11.0-rc3";
 
   src = fetchFromGitHub {
     owner = "EdgeTX";
     repo = "edgetx";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E=";
+    hash = "sha256-ipiGkc+R7/itmnRRrlrc4iXn+fLWm4OKc227NfevFhI=";
   };
 
   nativeBuildInputs = [
     cmake
-    gcc-arm-embedded
-    python3Packages.pillow
+    ninja
+    pythonEnv
     libsForQt5.qttools
     libsForQt5.wrapQtAppsHook
   ];
@@ -34,21 +60,104 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libsForQt5.qtbase
     libsForQt5.qtmultimedia
-    SDL
+    libsForQt5.qtserialport
+    SDL2
+    fox_1_6
+  ];
+
+  patches = [
+    (replaceVars ./0001-libclang-paths.patch (
+      let
+        llvmMajor = lib.versions.major llvmPackages.llvm.version;
+      in
+      {
+        resourceDir = "${llvmPackages.clang.cc.lib}/lib/clang/${llvmMajor}";
+        libclang = "${lib.getLib llvmPackages.libclang}/lib/libclang.so";
+        libc-cflags = "${llvmPackages.clang}/nix-support/libc-cflags";
+        libcxx-cflags = "${llvmPackages.clang}/nix-support/libcxx-cxxflags";
+      }
+    ))
   ];
 
   postPatch = ''
     sed -i companion/src/burnconfigdialog.cpp \
       -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|'
+    patchShebangs companion/util radio/util
   '';
 
   cmakeFlags = [
-    "-DGTEST_ROOT=${gtest.src}/googletest"
-    "-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
-    # file RPATH_CHANGE could not write new RPATH
-    "-DCMAKE_SKIP_BUILD_RPATH=ON"
+    # Unvendoring these libraries is infeasible. At least lets reuse the same sources.
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${gtest.src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MINIZ" "${miniz.src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-cpp.src}")
+    # Custom library https://github.com/edgetx/maxLibQt.
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MAXLIBQT" "${maxlibqt}")
+    (lib.cmakeFeature "DFU_UTIL_ROOT_DIR" "${lib.getBin dfu-util}/bin")
+    # Superbuild machinery is only getting in the way.
+    (lib.cmakeBool "EdgeTX_SUPERBUILD" false)
+    # COMMON_OPTIONS from tools/build-companion.sh.
+    (lib.cmakeBool "GVARS" true)
+    (lib.cmakeBool "HELI" true)
+    (lib.cmakeBool "LUA" true)
+    # Build companion and not the firmware.
+    (lib.cmakeBool "NATIVE_BUILD" true)
+    # file RPATH_CHANGE could not write new RPATH.
+    (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
   ];
 
+  env = {
+    EDGETX_VERSION_SUFFIX = "nixpkgs";
+  };
+
+  dontUseCmakeConfigure = true;
+  # We invoke cmakeConfigurePhase multiple times, but only need this once.
+  dontFixCmake = true;
+  inherit targetsToBuild;
+  __structuredAttrs = true; # To pass targetsToBuild as an array.
+
+  configurePhase = ''
+    runHook preConfigure
+    prependToVar cmakeFlags "-GNinja"
+    fixCmakeFiles .
+    runHook postConfigure
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    cmakeCommonFlags="$''\{cmakeFlags[@]}"
+    # This is the most sensible way to convert target name -> cmake options
+    # aside from manually extracting bash variables from upstream's CI scripts
+    # and converting that to nix expressions. Let's hope upstream doesn't break
+    # this file too often.
+    source $src/tools/build-common.sh
+
+    # Yes, this is really how upstream expects packaging to look like ¯\_(ツ)_/¯.
+    # https://github.com/EdgeTX/edgetx/wiki/Build-Instructions-under-Ubuntu-20.04#building-companion-simulator-and-radio-simulator-libraries
+    for plugin in "$''\{targetsToBuild[@]''\}"
+    do
+      # Variable modified by `get_target_build_options` from build-common.sh.
+      local BUILD_OPTIONS=""
+      get_target_build_options "$plugin"
+      # With each invocation of `cmakeConfigurePhase` `cmakeFlags` gets
+      # prepended to, so it has to be reset.
+      cmakeFlags=()
+      appendToVar cmakeFlags $cmakeCommonFlags $BUILD_OPTIONS
+      pushd .
+      cmakeConfigurePhase
+      ninjaFlags=("libsimulator")
+      ninjaBuildPhase
+      rm CMakeCache.txt
+      popd
+    done
+
+    cmakeConfigurePhase
+    ninjaFlags=()
+    ninjaBuildPhase
+
+    runHook postBuild
+  '';
+
   meta = with lib; {
     description = "EdgeTX Companion transmitter support software";
     longDescription = ''
@@ -56,7 +165,7 @@ stdenv.mkDerivation rec {
       firmware to the radio, backing up model settings, editing settings and
       running radio simulators.
     '';
-    mainProgram = "companion" + lib.concatStrings (lib.take 2 (lib.splitVersion version));
+    mainProgram = "companion" + lib.concatStrings (lib.take 2 (lib.splitVersion finalAttrs.version));
     homepage = "https://edgetx.org/";
     license = licenses.gpl2Only;
     platforms = [
@@ -70,5 +179,4 @@ stdenv.mkDerivation rec {
       wucke13
     ];
   };
-
-}
+})
diff --git a/pkgs/by-name/ed/edgetx/targets.nix b/pkgs/by-name/ed/edgetx/targets.nix
new file mode 100644
index 000000000000..d835799ff0b7
--- /dev/null
+++ b/pkgs/by-name/ed/edgetx/targets.nix
@@ -0,0 +1,46 @@
+# Keep in sync with tools/build-companion.sh
+[
+  "x9lite"
+  "x9lites"
+  "x7"
+  "x7access"
+  "t8"
+  "t12"
+  "t12max"
+  "tx12"
+  "tx12mk2"
+  "zorro"
+  "commando8"
+  "boxer"
+  "pocket"
+  "mt12"
+  "gx12"
+  "tlite"
+  "tpro"
+  "tprov2"
+  "tpros"
+  "bumblebee"
+  "lr3pro"
+  "t14"
+  "x9d"
+  "x9dp"
+  "x9dp2019"
+  "x9e"
+  "xlite"
+  "xlites"
+  "nv14"
+  "el18"
+  "pl18"
+  "pl18ev"
+  "x10"
+  "x10express"
+  "x12s"
+  "t15"
+  "t16"
+  "t18"
+  "t20"
+  "t20v2"
+  "tx16s"
+  "f16"
+  "v16"
+]

From f273becb99669f43b2f841acf037efc93853bf1b Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Mon, 14 Apr 2025 22:44:39 +0000
Subject: [PATCH 17/95] edgetx: remove with lib

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

diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix
index be347cdae9fe..8083589d3f06 100644
--- a/pkgs/by-name/ed/edgetx/package.nix
+++ b/pkgs/by-name/ed/edgetx/package.nix
@@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postBuild
   '';
 
-  meta = with lib; {
+  meta = {
     description = "EdgeTX Companion transmitter support software";
     longDescription = ''
       EdgeTX Companion is used for many different tasks like loading EdgeTX
@@ -167,13 +167,13 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     mainProgram = "companion" + lib.concatStrings (lib.take 2 (lib.splitVersion finalAttrs.version));
     homepage = "https://edgetx.org/";
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
     platforms = [
       "i686-linux"
       "x86_64-linux"
       "aarch64-linux"
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       elitak
       lopsided98
       wucke13

From a5b9b780605aeb81d6feb1b7b718ae5f2e2f1c92 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Mon, 14 Apr 2025 22:45:16 +0000
Subject: [PATCH 18/95] edgetx: add myself as maintainer

---
 pkgs/by-name/ed/edgetx/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix
index 8083589d3f06..12f6516b0186 100644
--- a/pkgs/by-name/ed/edgetx/package.nix
+++ b/pkgs/by-name/ed/edgetx/package.nix
@@ -177,6 +177,7 @@ stdenv.mkDerivation (finalAttrs: {
       elitak
       lopsided98
       wucke13
+      xokdvium
     ];
   };
 })

From 60575082f050fabe1b7fb476c22460e42b05a345 Mon Sep 17 00:00:00 2001
From: amesgen <amesgen@amesgen.de>
Date: Sat, 28 Dec 2024 20:28:02 +0100
Subject: [PATCH 19/95] cbor-diag: 0.8.8 -> 0.9.6

---
 pkgs/by-name/cb/cbor-diag/Gemfile.lock | 10 +++++-----
 pkgs/by-name/cb/cbor-diag/gemset.nix   | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/cb/cbor-diag/Gemfile.lock b/pkgs/by-name/cb/cbor-diag/Gemfile.lock
index 4a4fc73d4b32..3fb8993319ef 100644
--- a/pkgs/by-name/cb/cbor-diag/Gemfile.lock
+++ b/pkgs/by-name/cb/cbor-diag/Gemfile.lock
@@ -3,18 +3,18 @@ GEM
   specs:
     cbor-canonical (0.1.2)
     cbor-deterministic (0.1.3)
-    cbor-diag (0.8.8)
+    cbor-diag (0.9.6)
       cbor-canonical
       cbor-deterministic
       cbor-packed
       json_pure
       neatjson
       treetop (~> 1)
-    cbor-packed (0.1.5)
-    json_pure (2.7.2)
+    cbor-packed (0.2.2)
+    json_pure (2.8.1)
     neatjson (0.10.5)
     polyglot (0.3.5)
-    treetop (1.6.12)
+    treetop (1.6.14)
       polyglot (~> 0.3)
 
 PLATFORMS
@@ -24,4 +24,4 @@ DEPENDENCIES
   cbor-diag
 
 BUNDLED WITH
-   2.5.16
+   2.6.6
diff --git a/pkgs/by-name/cb/cbor-diag/gemset.nix b/pkgs/by-name/cb/cbor-diag/gemset.nix
index 65789a0348e0..c01ae16a4451 100644
--- a/pkgs/by-name/cb/cbor-diag/gemset.nix
+++ b/pkgs/by-name/cb/cbor-diag/gemset.nix
@@ -32,30 +32,30 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "12gicnz857iin9lhbrigyqz4v8fan9lq4sd56rfcb2c7a8azvmz9";
+      sha256 = "0c0a4pfvnhkh8dmih1igm7qm2ligzvccppjskpz85v69xizfsj71";
       type = "gem";
     };
-    version = "0.8.8";
+    version = "0.9.6";
   };
   cbor-packed = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1dijyj7rivi39h34f32fx7k4xvngldf569i0372n1z6w01nv761l";
+      sha256 = "0sbbz0p17m77xqmh4fv4rwly1cj799hapdsg4h43kwsw8h0rnk8n";
       type = "gem";
     };
-    version = "0.1.5";
+    version = "0.2.2";
   };
   json_pure = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "13b4dminf6znfwvj8d61w6dar9zrxnndrmiig19adbliv0haxmlr";
+      sha256 = "1kks889ymaq5xqvj18qamar3il8m3dnnaf6cij0a0kwxp8lpk1va";
       type = "gem";
     };
-    version = "2.7.2";
+    version = "2.8.1";
   };
   neatjson = {
     groups = [ "default" ];
@@ -83,9 +83,9 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0adc8qblz8ii668r3rksjx83p675iryh52rvdvysimx2hkbasj7d";
+      sha256 = "1m5fqy7vq6y7bgxmw7jmk7y6pla83m16p7lb41lbqgg53j8x2cds";
       type = "gem";
     };
-    version = "1.6.12";
+    version = "1.6.14";
   };
 }

From 914deb3f993001aca67a705b2bb2963e8c1421fa Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sun, 20 Apr 2025 01:38:49 -0700
Subject: [PATCH 20/95] =?UTF-8?q?mozillavpn:=202.26.0=20=E2=86=92=202.27.0?=
 =?UTF-8?q?,=20patch=20for=20Qt=206.9=20compatibility?=
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 | 30 ++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix
index e9890e4fcbdd..22487b17c307 100644
--- a/pkgs/by-name/mo/mozillavpn/package.nix
+++ b/pkgs/by-name/mo/mozillavpn/package.nix
@@ -4,6 +4,7 @@
   cargo,
   cmake,
   fetchFromGitHub,
+  fetchpatch,
   go,
   lib,
   libcap,
@@ -22,15 +23,36 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mozillavpn";
-  version = "2.26.0";
+  version = "2.27.0";
   src = fetchFromGitHub {
     owner = "mozilla-mobile";
     repo = "mozilla-vpn-client";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-BKD8X4nPLyTtY0x06nCSRRK36XKucpnhvjJN8aZssUs=";
+    hash = "sha256-TfiEc5Lptr0ntp4buEEWbQTvNkVjZbdMWDv8CEZa6IM=";
   };
-  patches = [ ];
+  patches = [
+    # Provide default args for LottieStatus::changed so moc can call it (#10420)
+    (fetchpatch {
+      url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/e5abe5714a5b506e398c088d21672f00d6f93240.patch";
+      hash = "sha256-DU5wQ1DDF8DbmMIlohoEIDJ7/9+9GVwrvsr51T9bGx8=";
+    })
+    # Remove Qt.labls.qmlmodels usage (#10422)
+    (fetchpatch {
+      url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/4497972b1bf7b7f215dc6c1227d76d6825f5b958.patch";
+      hash = "sha256-RPRdARM/jXSHmTGGjiOrfJ7KVejp3JmUfsN5pmKYPuY=";
+    })
+    # Qt compat: Make sure to include what we use
+    (fetchpatch {
+      url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/0909d43447a7ddbc6ec20d108637524552848bd6.patch";
+      hash = "sha256-Hpn69hQxa269XH+Ku/MYD2GwdFhfCX4yoVRCEDfIOKc=";
+    })
+    # Use QDesktopUnixServices after qt 6.9.0
+    (fetchpatch {
+      url = "https://github.com/mozilla-mobile/mozilla-vpn-client/pull/10424/commits/81e66044388459ffe2b08804ab5a326586ac7113.patch";
+      hash = "sha256-+v3NoTAdkjKEyBPbbJZQ2d11hJMyE3E4B9uYUerVa7c=";
+    })
+  ];
 
   netfilter = buildGoModule {
     pname = "${finalAttrs.pname}-netfilter";
@@ -45,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src patches;
-    hash = "sha256-tVTXlGO969qPR9/TbOJbDdOiwOI1PT11MvNYdLqgDlo=";
+    hash = "sha256-SGC+YT5ATV/ZaP/wrm3c31OQBw6Pk8ZSXjxEPFdP2f8=";
   };
 
   buildInputs = [

From 0cb456ff80540f7317e8fe37b82950867a86f7d8 Mon Sep 17 00:00:00 2001
From: amesgen <amesgen@amesgen.de>
Date: Sat, 29 Mar 2025 14:22:37 +0100
Subject: [PATCH 21/95] scriv: 1.5.1 -> 1.7.0

---
 pkgs/by-name/sc/scriv/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sc/scriv/package.nix b/pkgs/by-name/sc/scriv/package.nix
index f3c7c8da3fdc..e3e3f84f3e3e 100644
--- a/pkgs/by-name/sc/scriv/package.nix
+++ b/pkgs/by-name/sc/scriv/package.nix
@@ -10,14 +10,17 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "scriv";
-  version = "1.5.1";
+  version = "1.7.0";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MK6f+NFE+ODPOUxOHTeVQvGzgjdnZClVtU7EDcALMrY=";
+    hash = "sha256-fBqL5jUdA2kuXnV4Te6g2PEbLJD5G+GLD7OjdVVbUl4=";
   };
 
-  propagatedBuildInputs =
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies =
     with python3.pkgs;
     [
       attrs
@@ -46,6 +49,9 @@ python3.pkgs.buildPythonApplication rec {
   disabledTests = [
     # assumes we have checked out the full repo (including remotes)
     "test_real_get_github_repos"
+    # requires a newer pandoc version (as it tests for a specific format of the
+    # error message)
+    "test_bad_convert_to_markdown"
   ];
 
   passthru.tests = {

From 4d0c402584166e29512a36c0945f7806070370da Mon Sep 17 00:00:00 2001
From: PhiliPdB <phlpdbrn@gmail.com>
Date: Fri, 18 Apr 2025 08:48:07 +0200
Subject: [PATCH 22/95] python313Packages.pymediainfo: fix build

pymediainfo had some breaking changes regarding their build proces,
hence the update in #395156 broke it.
---
 .../development/python-modules/pymediainfo/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix
index 248e84394bcf..d19432cc46b5 100644
--- a/pkgs/development/python-modules/pymediainfo/default.nix
+++ b/pkgs/development/python-modules/pymediainfo/default.nix
@@ -4,7 +4,7 @@
   fetchPypi,
   buildPythonPackage,
   libmediainfo,
-  setuptools-scm,
+  pdm-backend,
   pytest,
   pythonOlder,
 }:
@@ -12,9 +12,9 @@
 buildPythonPackage rec {
   pname = "pymediainfo";
   version = "7.0.1";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
-    substituteInPlace pymediainfo/__init__.py \
+    substituteInPlace src/pymediainfo/__init__.py \
       --replace "libmediainfo.0.dylib" \
                 "${libmediainfo}/lib/libmediainfo.0${stdenv.hostPlatform.extensions.sharedLibrary}" \
       --replace "libmediainfo.dylib" \
@@ -31,7 +31,7 @@ buildPythonPackage rec {
                 "${libmediainfo}/lib/libmediainfo${stdenv.hostPlatform.extensions.sharedLibrary}.0"
   '';
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ pdm-backend ];
 
   nativeCheckInputs = [
     pytest

From a11f1567b41bd0cb1539b9eb7b2cd349be428aae Mon Sep 17 00:00:00 2001
From: PhiliPdB <phlpdbrn@gmail.com>
Date: Fri, 18 Apr 2025 09:11:51 +0200
Subject: [PATCH 23/95] rapid-photo-downloader: Add update script

---
 .../graphics/rapid-photo-downloader/default.nix             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index f7a2685169ca..a072e90d5d5e 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -17,6 +17,7 @@
   gdk-pixbuf,
   libmediainfo,
   vmtouch,
+  gitUpdater,
 }:
 
 mkDerivationWith python3Packages.buildPythonApplication rec {
@@ -118,6 +119,11 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
     )
   '';
 
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
+    ignoredVersions = "a.*";
+  };
+
   meta = with lib; {
     description = "Photo and video importer for cameras, phones, and memory cards";
     mainProgram = "rapid-photo-downloader";

From e59b8ef3397b433efa81c8f5fd2484dfa95d92fb Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 22 Apr 2025 07:16:36 +0800
Subject: [PATCH 24/95] featherpad: 1.4.1 -> 1.6.1

Diff: https://github.com/tsujan/FeatherPad/compare/V1.4.1...V1.6.1
---
 .../editors/featherpad/default.nix            | 42 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix
index 72fd7d1dac87..76bb4b510fc1 100644
--- a/pkgs/applications/editors/featherpad/default.nix
+++ b/pkgs/applications/editors/featherpad/default.nix
@@ -1,44 +1,42 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
+  fetchFromGitHub,
   cmake,
+  qt6,
   hunspell,
   pkg-config,
-  qttools,
-  qtbase,
-  qtsvg,
-  qtx11extras,
-  fetchFromGitHub,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "featherpad";
-  version = "1.4.1";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "tsujan";
     repo = "FeatherPad";
-    rev = "V${version}";
-    sha256 = "sha256-8IT/PxLz6BsLHzY5pM0bTlAO0xvfC7/aI7+Gbw2LyME=";
+    tag = "V${finalAttrs.version}";
+    hash = "sha256-uI/XKBBoKsbABQWvTQbqFLStXFeiJI2u0DA+Injxon0=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-  ];
-  buildInputs = [
-    hunspell
-    qtbase
-    qtsvg
-    qtx11extras
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
-  meta = with lib; {
+  buildInputs = [
+    hunspell
+    qt6.qtbase
+    qt6.qtsvg
+  ];
+
+  meta = {
     description = "Lightweight Qt5 Plain-Text Editor for Linux";
     homepage = "https://github.com/tsujan/FeatherPad";
-    platforms = platforms.linux;
-    maintainers = [ maintainers.flosse ];
-    license = licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.flosse ];
+    license = lib.licenses.gpl3Plus;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff5ca45f8a92..e8433d1111c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3371,7 +3371,7 @@ with pkgs;
 
   fcitx5-table-other = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-other.nix { };
 
-  featherpad = qt5.callPackage ../applications/editors/featherpad { };
+  featherpad = callPackage ../applications/editors/featherpad { };
 
   ffsend = callPackage ../tools/misc/ffsend {
     inherit (darwin.apple_sdk.frameworks) Security AppKit;

From 9b7f2e6cd0c31f753c216f7219285a597c3e3a2f Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Tue, 22 Apr 2025 08:09:44 +0800
Subject: [PATCH 25/95] free42: 3.1.10 -> 3.2.8

Diff: https://github.com/thomasokken/free42/compare/v3.1.10...v3.2.8
---
 pkgs/by-name/fr/free42/package.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix
index 6814a45f2d37..f551bd24c91f 100644
--- a/pkgs/by-name/fr/free42/package.nix
+++ b/pkgs/by-name/fr/free42/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "free42";
-  version = "3.1.10";
+  version = "3.2.8";
 
   src = fetchFromGitHub {
     owner = "thomasokken";
     repo = "free42";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-X1fNr+0xc15KmR+qbDOkQraYPUj50b1eWmSheIKl4e8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Hvq5YoiBVgKjz/+SVeF5WTj7CUZ7MrrFIAeesH3we68=";
   };
 
   nativeBuildInputs = [
@@ -26,9 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     wrapGAppsHook3
   ];
 
-  buildInputs = [
-    alsa-lib
-  ];
+  buildInputs = [ alsa-lib ];
 
   postPatch = ''
     sed -i -e "s|/bin/ls|ls|" gtk/Makefile
@@ -86,7 +84,6 @@ stdenv.mkDerivation (finalAttrs: {
                         $out/share/icons/hicolor/128x128/apps
 
     install -m755 gtk/free42dec gtk/free42bin $out/bin
-    install -m644 gtk/README $out/share/doc/free42/README-GTK
     install -m644 README $out/share/doc/free42/README
 
     install -m644 gtk/icon-48x48.xpm $out/share/icons/hicolor/48x48/apps/free42.xpm

From 77dc1fefc5b2c309614a80e1e155a00bcb6bfaed Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 22 Apr 2025 06:35:32 +0100
Subject: [PATCH 26/95] darwin.moltenvk: fix the eval on `linux`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change the eval fails as:

    $ nix eval --impure --expr 'with import ./. { system = "x86_64-linux"; }; darwin.moltenvk.NIX_CFLAGS_COMPILE'
    error:
       … in the condition of the assert statement
         at pkgs/stdenv/generic/make-derivation.nix:716:11:
          715|           n: v:
          716|           assert assertMsg (isString v || isBool v || isInt v || isDerivation v)
             |           ^
          717|             "The `env` attribute set can only contain derivation, string, boolean or integer attributes. The `${n}` attribute is of type ${builtins.typeOf v}.";

       … in the left operand of the OR (||) operator
         at lib/asserts.nix:39:31:
           38|   # TODO(Profpatsch): add tests that check stderr
           39|   assertMsg = pred: msg: pred || builtins.throw msg;
             |                               ^
           40|

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: expected a set but found null: null
---
 pkgs/by-name/mo/moltenvk/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/moltenvk/package.nix b/pkgs/by-name/mo/moltenvk/package.nix
index 6651f2298a2d..4fd4aa6e6b3b 100644
--- a/pkgs/by-name/mo/moltenvk/package.nix
+++ b/pkgs/by-name/mo/moltenvk/package.nix
@@ -101,8 +101,8 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   env.NIX_CFLAGS_COMPILE = toString (
-    [
-      "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
+    lib.optional (stdenv.cc.libcxx != null) "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
+    ++ [
       "-I${lib.getDev spirv-cross}/include/spirv_cross"
       "-I${lib.getDev spirv-headers}/include/spirv/unified1"
 

From 02246c9c24fc1f130ec77ae45ded63622ef977be Mon Sep 17 00:00:00 2001
From: beeb <703631+beeb@users.noreply.github.com>
Date: Tue, 22 Apr 2025 09:42:04 +0200
Subject: [PATCH 27/95] lintspec: 0.4.1 -> 0.5.0

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

diff --git a/pkgs/by-name/li/lintspec/package.nix b/pkgs/by-name/li/lintspec/package.nix
index 778c4bb874b9..d403c207cbf7 100644
--- a/pkgs/by-name/li/lintspec/package.nix
+++ b/pkgs/by-name/li/lintspec/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lintspec";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "beeb";
     repo = "lintspec";
     tag = "v${version}";
-    hash = "sha256-3+E0y3WxyjvIeIaAVhjXoBnS4+THv6L4Dj4LvpRYkog=";
+    hash = "sha256-I9u4fS3K3tPgr15lAEkBQO1KXSNPAu3aiM9Qo9IRuHE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-TIGNToVqzRUV3/5RpbYpuMrefntft9qasCjOxmpE3lc=";
+  cargoHash = "sha256-wTR4E+Pbx0ReeVav/ECklS8on0v5aYvFqE+FZhieRHk=";
 
   meta = {
     description = "Blazingly fast linter for NatSpec comments in Solidity code";

From 396c533de2ad7c09fdbeb616897a2bb2cf8061df Mon Sep 17 00:00:00 2001
From: Matt Bryant <tehmatt@users.noreply.github.com>
Date: Tue, 22 Apr 2025 01:14:54 -0700
Subject: [PATCH 28/95] functiontrace-server: configure nix-updater

---
 pkgs/by-name/fu/functiontrace-server/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/fu/functiontrace-server/package.nix b/pkgs/by-name/fu/functiontrace-server/package.nix
index b406745ceb3c..3d56421e0c40 100644
--- a/pkgs/by-name/fu/functiontrace-server/package.nix
+++ b/pkgs/by-name/fu/functiontrace-server/package.nix
@@ -4,6 +4,7 @@
   fetchCrate,
   stdenv,
   darwin,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -22,6 +23,8 @@ rustPlatform.buildRustPackage rec {
     darwin.apple_sdk.frameworks.CoreFoundation
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Server for FunctionTrace, a graphical Python profiler";
     homepage = "https://functiontrace.com";

From 2f8471d856a0474ac751579873979a603a119d81 Mon Sep 17 00:00:00 2001
From: Matt Bryant <tehmatt@users.noreply.github.com>
Date: Tue, 22 Apr 2025 01:20:43 -0700
Subject: [PATCH 29/95] functiontrace-server: 0.5.2 -> 0.8.3

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

diff --git a/pkgs/by-name/fu/functiontrace-server/package.nix b/pkgs/by-name/fu/functiontrace-server/package.nix
index 3d56421e0c40..e82b26757d45 100644
--- a/pkgs/by-name/fu/functiontrace-server/package.nix
+++ b/pkgs/by-name/fu/functiontrace-server/package.nix
@@ -9,15 +9,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "functiontrace-server";
-  version = "0.5.2";
+  version = "0.8.3";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-p6ypMfg99ohQCyPB2O0wXbGmPvD2K9V3EnFDd5dC6js=";
+    hash = "sha256-xTNNAYhxyL5/Sip+nZJleWOjTYs2MH3QM7pzLYk/6Gs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-sPleuZV7eXlQjKqeHCIlRwu1FzneBh460yAElnxi6Do=";
+  cargoHash = "sha256-zwarLDKaI4TMCId8+3wVtioOMw2F8Z7Rnl0bKbQVndQ=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.CoreFoundation

From 736bea03b47d0c72b132bb401df8027b6349d1c8 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 23 Apr 2025 00:02:55 +0900
Subject: [PATCH 30/95] pdfsam-basic: add updateScript

---
 pkgs/applications/misc/pdfsam-basic/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix
index a67a1821d554..f142b150580e 100644
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -6,6 +6,7 @@
   jdk21,
   wrapGAppsHook3,
   glib,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -47,6 +48,8 @@ stdenv.mkDerivation rec {
     categories = [ "Office" ];
   };
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     homepage = "https://github.com/torakiki/pdfsam";
     description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files";

From d10c7d7ce59a2f2497d5011e0f1a98eb96f09602 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 23 Apr 2025 00:07:48 +0900
Subject: [PATCH 31/95] pdfsam-basic: 5.2.9 -> 5.3.1

Diff: https://github.com/torakiki/pdfsam/compare/v5.2.9...v5.3.1

They changed release asset names since v5.3.0
https://github.com/torakiki/pdfsam/commit/4318e6ebee13edc83d04d24e9b9b9763b526f180
---
 pkgs/applications/misc/pdfsam-basic/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix
index f142b150580e..87bd98079c89 100644
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pdfsam-basic";
-  version = "5.2.9";
+  version = "5.3.1";
 
   src = fetchurl {
-    url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
-    hash = "sha256-ZLVO2VD0XUVUG/GSot21c6nJ2N8h39vDzyzAzk1pQ6c=";
+    url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam-basic_${version}-1_amd64.deb";
+    hash = "sha256-Fhj/MJnnm8nsuJmSb6PigJT6Qm+CkGg8lV0NaUMfur0=";
   };
 
   unpackPhase = ''

From ed5b4d1bec3105ec2dc17dd60984a6af2a1027d4 Mon Sep 17 00:00:00 2001
From: PhiliPdB <phlpdbrn@gmail.com>
Date: Fri, 18 Apr 2025 09:40:10 +0200
Subject: [PATCH 32/95] rapid-photo-downloader: 0.9.34 -> 0.9.36

---
 .../rapid-photo-downloader/default.nix        | 69 ++++++++++---------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index a072e90d5d5e..500936379f19 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -22,15 +22,50 @@
 
 mkDerivationWith python3Packages.buildPythonApplication rec {
   pname = "rapid-photo-downloader";
-  version = "0.9.34";
+  version = "0.9.36";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "damonlynch";
     repo = "rapid-photo-downloader";
     rev = "v${version}";
-    hash = "sha256-4VC1fwQh9L3c5tgLUaC36p9QHL4dR2vkWc2XlNl0Xzw=";
+    hash = "sha256-fFmIbqymYkg2Z1/x0mNsCNlDCOyqVg65CM4a67t+kPQ=";
   };
 
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies =
+    with python3Packages;
+    [
+      ifuse
+      libimobiledevice
+      # Python dependencies
+      pyqt5
+      pygobject3
+      gphoto2
+      pyzmq
+      tornado
+      psutil
+      pyxdg
+      arrow
+      python-dateutil
+      easygui
+      babel
+      colour
+      pillow
+      pymediainfo
+      sortedcontainers
+      requests
+      colorlog
+      pyprind
+      setuptools
+      show-in-file-manager
+      tenacity
+    ]
+    ++ lib.optional (pythonOlder "3.8") importlib-metadata;
+
   postPatch = ''
     # Drop broken version specifier
     sed -i '/python_requires/d' setup.py
@@ -73,36 +108,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
   #       "Namespace [Notify / GExiv2 / GUdev] not available"
   strictDeps = false;
 
-  propagatedBuildInputs =
-    with python3Packages;
-    [
-      ifuse
-      libimobiledevice
-      pyqt5
-      pygobject3
-      gphoto2
-      pyzmq
-      tornado
-      psutil
-      pyxdg
-      arrow
-      python-dateutil
-      easygui
-      babel
-      colour
-      pillow
-      pyheif
-      pymediainfo
-      sortedcontainers
-      requests
-      colorlog
-      pyprind
-      setuptools
-      show-in-file-manager
-      tenacity
-    ]
-    ++ lib.optional (pythonOlder "3.8") importlib-metadata;
-
   preFixup = ''
     makeWrapperArgs+=(
       --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH"

From 63d4e1300bf89db2917004a0db2261a5bbec9112 Mon Sep 17 00:00:00 2001
From: PhiliPdB <phlpdbrn@gmail.com>
Date: Fri, 18 Apr 2025 17:47:37 +0200
Subject: [PATCH 33/95] maintainers: add philipdb

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 08d80e631b64..b2fc53d893d9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18858,6 +18858,13 @@
     githubId = 1640697;
     name = "Philipp Hausmann";
   };
+  philipdb = {
+    email = "philipdb.art110@passmail.com";
+    name = "Philip de Bruin";
+    github = "PhiliPdB";
+    githubId = 7051056;
+    keys = [ { fingerprint = "01AE 5EC2 39D9 CE4B DDB0  166A 4EC5 5FB7 07DC 24C4"; } ];
+  };
   Philipp-M = {
     email = "philipp@mildenberger.me";
     github = "Philipp-M";

From cadf02efa23215f613366c67ba51461242f2eceb Mon Sep 17 00:00:00 2001
From: PhiliPdB <phlpdbrn@gmail.com>
Date: Fri, 18 Apr 2025 17:52:35 +0200
Subject: [PATCH 34/95] python313Packages.pymediainfo: add philipdb to
 maintainers

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

diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix
index d19432cc46b5..7b97714a454e 100644
--- a/pkgs/development/python-modules/pymediainfo/default.nix
+++ b/pkgs/development/python-modules/pymediainfo/default.nix
@@ -43,11 +43,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pymediainfo" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python wrapper for the mediainfo library";
     homepage = "https://github.com/sbraz/pymediainfo";
     changelog = "https://github.com/sbraz/pymediainfo/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ philipdb ];
   };
 }

From f3c2c61fb3807a5ca4c30042d3713bbd45d181de Mon Sep 17 00:00:00 2001
From: PhiliPdB <phlpdbrn@gmail.com>
Date: Fri, 18 Apr 2025 17:53:07 +0200
Subject: [PATCH 35/95] rapid-photo-downloader: add philipdb to maintainers

---
 .../graphics/rapid-photo-downloader/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index 500936379f19..da1e3487a5c1 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -129,12 +129,12 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
     ignoredVersions = "a.*";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Photo and video importer for cameras, phones, and memory cards";
     mainProgram = "rapid-photo-downloader";
     homepage = "https://www.damonlynch.net/rapid/";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = [ ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ philipdb ];
   };
 }

From cafc96cc1ba136b4727cd8ace847ffa1dfa2458c Mon Sep 17 00:00:00 2001
From: musjj <72612857+musjj@users.noreply.github.com>
Date: Wed, 23 Apr 2025 02:48:15 +0700
Subject: [PATCH 36/95] pureref: add desktop shortcut

---
 pkgs/by-name/pu/pureref/package.nix | 30 +++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/pu/pureref/package.nix b/pkgs/by-name/pu/pureref/package.nix
index d9ff3269f162..069ff4f7e3a3 100644
--- a/pkgs/by-name/pu/pureref/package.nix
+++ b/pkgs/by-name/pu/pureref/package.nix
@@ -5,26 +5,39 @@
   curl,
   gnugrep,
   cacert,
+  dpkg,
 }:
-
-appimageTools.wrapType1 rec {
-  pname = "pureref";
+let
   version = "2.0.3";
-
-  src =
-    runCommand "PureRef-${version}_x64.Appimage"
+  deb =
+    runCommand "PureRef-${version}_x64"
       {
         nativeBuildInputs = [
           curl
           gnugrep
           cacert
+          dpkg
         ];
-        outputHash = "sha256-0iR1cP2sZvWWqKwRAwq6L/bmIBSYHKrlI8u8V2hANfM=";
+        outputHash = "sha256-VdKu1YQa+//FbNWqgTPoUhY4pSekgVohI53D4i5hVkQ=";
+        outputHashMode = "recursive";
       }
       ''
         key="$(curl -A 'nixpkgs/Please contact maintainer if there is an issue' "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)"
-        curl -L "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out
+        curl -L "https://www.pureref.com/files/build.php?build=LINUX64.deb&version=${version}&downloadKey=$key" --output $name.deb
+        dpkg-deb -x $name.deb $out
+        chmod 755 $out
       '';
+in
+appimageTools.wrapType1 {
+  pname = "pureref";
+  inherit version;
+
+  src = "${deb}/usr/bin/PureRef";
+
+  extraInstallCommands = ''
+    mv $out/bin/pureref $out/bin/PureRef
+    cp -r ${deb}/usr/share $out
+  '';
 
   meta = with lib; {
     description = "Reference Image Viewer";
@@ -35,6 +48,7 @@ appimageTools.wrapType1 rec {
       husjon
     ];
     platforms = [ "x86_64-linux" ];
+    mainProgram = "PureRef";
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
 }

From ded2c428bf02a934e2d1efa4c2b92ce40dfbebe0 Mon Sep 17 00:00:00 2001
From: DSeeLP <46624152+DSeeLP@users.noreply.github.com>
Date: Wed, 23 Apr 2025 12:38:41 +0200
Subject: [PATCH 37/95] finamp: 0.9.15-beta -> 0.9.16-beta
 https://github.com/jmshrv/finamp/releases/tag/0.9.16-beta

---
 pkgs/by-name/fi/finamp/package.nix       |  11 +-
 pkgs/by-name/fi/finamp/pubspec.lock.json | 181 +++++++++++++----------
 2 files changed, 109 insertions(+), 83 deletions(-)

diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix
index d083de8340f4..c0c2c69ddd9a 100644
--- a/pkgs/by-name/fi/finamp/package.nix
+++ b/pkgs/by-name/fi/finamp/package.nix
@@ -9,7 +9,7 @@
   makeDesktopItem,
 }:
 let
-  version = "0.9.15-beta";
+  version = "0.9.16-beta";
 in
 flutter.buildFlutterApplication {
   inherit version;
@@ -18,7 +18,7 @@ flutter.buildFlutterApplication {
     owner = "jmshrv";
     repo = "finamp";
     rev = version;
-    hash = "sha256-ekCdHU9z8nxcIFz3oN0txlIKWAwhMV8Q5/t5QYvbzCc=";
+    hash = "sha256-AmxQyDV0AiS2qzAsrgBm0SqH0CaLi3W1A3gcsk65dj0=";
   };
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
@@ -30,7 +30,7 @@ flutter.buildFlutterApplication {
 
   gitHashes = {
     balanced_text = "sha256-lSDR5dDjZ4garRbBPI+wSxC5iScg8wVSD5kymmLbYbk=";
-    isar_generator = "sha256-lWnHmZmYx7qDG6mzyDqYt+Xude2xVOH1VW+BoDCas60=";
+    isar_generator = "sha256-EthUFM+YI3bnM0U0sECoNOCRXpo4qjP71VXYBuO/u+I=";
     media_kit_libs_windows_audio = "sha256-p3hRq79whLFJLNUgL9atXyTGvOIqCbTRKVk1ie0Euqs=";
     palette_generator = "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0=";
     split_view = "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k=";
@@ -43,12 +43,13 @@ flutter.buildFlutterApplication {
   '';
 
   postInstall = ''
-    install -Dm644 $src/assets/icon/icon_foreground.svg $out/share/icons/hicolor/scalable/apps/finamp.svg
+    install -Dm444 assets/icon/icon_foreground.svg $out/share/icons/hicolor/scalable/apps/finamp.svg
+    install -Dm444 assets/com.unicornsonlsd.finamp.metainfo.xml -t $out/share/metainfo
   '';
 
   desktopItems = [
     (makeDesktopItem {
-      name = "Finamp";
+      name = "com.unicornsonlsd.finamp";
       desktopName = "Finamp";
       genericName = "Music Player";
       exec = "finamp";
diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json
index 89636bc09f2d..c27f4bd1ca58 100644
--- a/pkgs/by-name/fi/finamp/pubspec.lock.json
+++ b/pkgs/by-name/fi/finamp/pubspec.lock.json
@@ -4,37 +4,31 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
+        "sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "76.0.0"
-    },
-    "_macros": {
-      "dependency": "transitive",
-      "description": "dart",
-      "source": "sdk",
-      "version": "0.3.3"
+      "version": "80.0.0"
     },
     "analyzer": {
       "dependency": "direct main",
       "description": {
         "name": "analyzer",
-        "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
+        "sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.11.0"
+      "version": "7.3.0"
     },
     "analyzer_plugin": {
-      "dependency": "direct overridden",
+      "dependency": "transitive",
       "description": {
         "name": "analyzer_plugin",
-        "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161",
+        "sha256": "b3075265c5ab222f8b3188342dcb50b476286394a40323e85d1fa725035d40a4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.11.3"
+      "version": "0.13.0"
     },
     "app_set_id": {
       "dependency": "direct main",
@@ -50,11 +44,11 @@
       "dependency": "transitive",
       "description": {
         "name": "archive",
-        "sha256": "0c64e928dcbefddecd234205422bcfc2b5e6d31be0b86fef0d0dd48d7b4c9742",
+        "sha256": "7dcbd0f87fe5f61cb28da39a1a8b70dbc106e2fe0516f7836eb7bb2948481a12",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.4"
+      "version": "4.0.5"
     },
     "args": {
       "dependency": "transitive",
@@ -387,6 +381,26 @@
       "source": "hosted",
       "version": "3.0.0"
     },
+    "connectivity_plus": {
+      "dependency": "direct main",
+      "description": {
+        "name": "connectivity_plus",
+        "sha256": "04bf81bb0b77de31557b58d052b24b3eee33f09a6e7a8c68a3e247c7df19ec27",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.1.3"
+    },
+    "connectivity_plus_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "connectivity_plus_platform_interface",
+        "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.1"
+    },
     "console": {
       "dependency": "transitive",
       "description": {
@@ -471,11 +485,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820",
+        "sha256": "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.8"
+      "version": "3.0.1"
     },
     "dartx": {
       "dependency": "transitive",
@@ -571,11 +585,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b",
+        "sha256": "09b474c0c8117484b80cbebc043801ff91e05cfbd2874d512825c899e1754694",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.2.1"
+      "version": "9.2.3"
     },
     "file_sizes": {
       "dependency": "direct main",
@@ -755,16 +769,6 @@
       "source": "hosted",
       "version": "2.0.5"
     },
-    "flutter_vibrate": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_vibrate",
-        "sha256": "9cc9b32cf52c90dd34c1cf396ed40010b2c74e69adbb0ff16005afa900971ad8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.0"
-    },
     "flutter_web_plugins": {
       "dependency": "transitive",
       "description": "flutter",
@@ -801,6 +805,16 @@
       "source": "hosted",
       "version": "4.0.0"
     },
+    "gaimon": {
+      "dependency": "direct main",
+      "description": {
+        "name": "gaimon",
+        "sha256": "4194b979dc84b2c5135dba261a0a1f810e4dff25a87bcb53cca53fb585438307",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.0"
+    },
     "get_it": {
       "dependency": "direct main",
       "description": {
@@ -915,11 +929,11 @@
       "dependency": "transitive",
       "description": {
         "name": "image",
-        "sha256": "13d3349ace88f12f4a0d175eb5c12dcdd39d35c4c109a8a13dfeb6d0bd9e31c3",
+        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.3"
+      "version": "4.5.4"
     },
     "image_size_getter": {
       "dependency": "transitive",
@@ -984,12 +998,13 @@
     "isar_generator": {
       "dependency": "direct dev",
       "description": {
-        "name": "isar_generator",
-        "sha256": "76c121e1295a30423604f2f819bc255bc79f852f3bc8743a24017df6068ad133",
-        "url": "https://pub.dev"
+        "path": "packages/isar_generator",
+        "ref": "ad574f60ed6f39d2995cd16fc7dc3de9a646ef30",
+        "resolved-ref": "ad574f60ed6f39d2995cd16fc7dc3de9a646ef30",
+        "url": "https://github.com/callumw-k/isar.git"
       },
-      "source": "hosted",
-      "version": "3.1.0+1"
+      "source": "git",
+      "version": "3.1.8"
     },
     "js": {
       "dependency": "transitive",
@@ -1045,21 +1060,21 @@
       "dependency": "transitive",
       "description": {
         "name": "just_audio_platform_interface",
-        "sha256": "271b93b484c6f494ecd72a107fffbdb26b425f170c665b9777a0a24a726f2f24",
+        "sha256": "4cd94536af0219fa306205a58e78d67e02b0555283c1c094ee41e402a14a5c4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.4.0"
+      "version": "4.5.0"
     },
     "just_audio_web": {
       "dependency": "transitive",
       "description": {
         "name": "just_audio_web",
-        "sha256": "58915be64509a7683c44bf11cd1a23c15a48de104927bee116e3c63c8eeea0d4",
+        "sha256": "8c7e779892e180cbc9ffb5a3c52f6e90e1cbbf4a63694cc450972a7edbd2bb6d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.14"
+      "version": "0.4.15"
     },
     "leak_tracker": {
       "dependency": "transitive",
@@ -1121,16 +1136,6 @@
       "source": "hosted",
       "version": "1.3.0"
     },
-    "macros": {
-      "dependency": "transitive",
-      "description": {
-        "name": "macros",
-        "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3-main.0"
-    },
     "marquee": {
       "dependency": "direct main",
       "description": {
@@ -1165,21 +1170,21 @@
       "dependency": "transitive",
       "description": {
         "name": "media_kit",
-        "sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62",
+        "sha256": "48c10c3785df5d88f0eef970743f8c99b2e5da2b34b9d8f9876e598f62d9e776",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.11"
+      "version": "1.2.0"
     },
     "media_kit_libs_linux": {
       "dependency": "direct main",
       "description": {
         "name": "media_kit_libs_linux",
-        "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310",
+        "sha256": "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.3"
+      "version": "1.2.1"
     },
     "media_kit_libs_windows_audio": {
       "dependency": "direct main",
@@ -1232,6 +1237,16 @@
       "source": "hosted",
       "version": "1.0.0"
     },
+    "nm": {
+      "dependency": "transitive",
+      "description": {
+        "name": "nm",
+        "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.0"
+    },
     "octo_image": {
       "dependency": "direct main",
       "description": {
@@ -1427,11 +1442,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.1.0"
     },
     "platform": {
       "dependency": "transitive",
@@ -1473,15 +1488,25 @@
       "source": "hosted",
       "version": "6.0.1"
     },
+    "progress_border": {
+      "dependency": "direct main",
+      "description": {
+        "name": "progress_border",
+        "sha256": "f47c2b951c29f04d7a2232d9f72210874df893ea45c7bd313076291d8c4d8a57",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.5"
+    },
     "provider": {
       "dependency": "direct main",
       "description": {
         "name": "provider",
-        "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c",
+        "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.2"
+      "version": "6.1.4"
     },
     "pub_semver": {
       "dependency": "transitive",
@@ -1587,11 +1612,11 @@
       "dependency": "transitive",
       "description": {
         "name": "safe_local_storage",
-        "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440",
+        "sha256": "e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.2"
+      "version": "2.0.1"
     },
     "screen_retriever": {
       "dependency": "transitive",
@@ -1784,41 +1809,41 @@
       "dependency": "transitive",
       "description": {
         "name": "sqflite",
-        "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb",
+        "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "sqflite_android": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_android",
-        "sha256": "78f489aab276260cdd26676d2169446c7ecd3484bbd5fead4ca14f3ed4dd9ee3",
+        "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.1"
     },
     "sqflite_common": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709",
+        "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4+6"
+      "version": "2.5.5"
     },
     "sqflite_darwin": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_darwin",
-        "sha256": "22adfd9a2c7d634041e96d6241e6e1c8138ca6817018afc5d443fef91dcefa9c",
+        "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1+1"
+      "version": "2.4.2"
     },
     "sqflite_platform_interface": {
       "dependency": "transitive",
@@ -1884,11 +1909,11 @@
       "dependency": "transitive",
       "description": {
         "name": "synchronized",
-        "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225",
+        "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.0+3"
+      "version": "3.3.1"
     },
     "term_glyph": {
       "dependency": "transitive",
@@ -1974,11 +1999,11 @@
       "dependency": "transitive",
       "description": {
         "name": "uri_parser",
-        "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835",
+        "sha256": "ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.2"
+      "version": "3.0.0"
     },
     "url_launcher": {
       "dependency": "direct main",
@@ -2004,11 +2029,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
+        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.2"
+      "version": "6.3.3"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -2121,7 +2146,7 @@
       "version": "2.1.4"
     },
     "visibility_detector": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "visibility_detector",
         "sha256": "dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420",
@@ -2144,11 +2169,11 @@
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e",
+        "sha256": "b90fbcc8d7bdf3b883ea9706d9d76b9978cb1dfa4351fcc8014d6ec31a493354",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.10"
+      "version": "1.2.11"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
@@ -2201,7 +2226,7 @@
       "version": "0.1.6"
     },
     "web_socket_channel": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "web_socket_channel",
         "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5",

From f5c66e7dfcec9b4cf9d9abd4d72d21092371fd22 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Wed, 23 Apr 2025 15:57:09 +0200
Subject: [PATCH 38/95] prowlarr: 1.33.3.5008 -> 1.34.1.5021

---
 pkgs/by-name/pr/prowlarr/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pr/prowlarr/package.nix b/pkgs/by-name/pr/prowlarr/package.nix
index dbb681dabf42..8f87eb79c254 100644
--- a/pkgs/by-name/pr/prowlarr/package.nix
+++ b/pkgs/by-name/pr/prowlarr/package.nix
@@ -37,16 +37,16 @@ let
 
   hash =
     {
-      aarch64-darwin = "sha256-glN+QlawtpG9aZ2ROCRkDjNCLTLh8IUWs695XShDhzI=";
-      aarch64-linux = "sha256-oyeZrUC2l5O62fknNBdfwEH3p2tFXX8fFrEaA7vWoRg=";
-      x86_64-darwin = "sha256-58io1d+mKcXvcoMQzGBIOQg2b6ehLQS2G6r0RnR+blw=";
-      x86_64-linux = "sha256-8owcCOPSKfZrAxeuGT8dZnmnbAtQiyv12K9Yr0KJhQE=";
+      aarch64-darwin = "sha256-V9i3n/q8GrPQ9qt0AzKJPedAZeeiUm9A5IQ/8FD62b4=";
+      aarch64-linux = "sha256-Qhx/zh9E+5oBjf7vMvvAVQF05rJI0aB0KcBMXZaYlDA=";
+      x86_64-darwin = "sha256-eVu3RCFTHz/uVyt3aBnXBlpCtH5Jdnil0PTEREnxZvs=";
+      x86_64-linux = "sha256-1tZq12F676RhbMvl4ubDirpNjU1a9yOLxd0DAK2xNqY=";
     }
     .${stdenv.hostPlatform.system} or unsupported;
 in
 stdenv.mkDerivation rec {
   inherit pname;
-  version = "1.33.3.5008";
+  version = "1.34.1.5021";
 
   src = fetchurl {
     url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz";

From 15c84c36cecccdf52f9f6293e2b319f1225dfb08 Mon Sep 17 00:00:00 2001
From: Ivan Petkov <ivanppetkov@gmail.com>
Date: Fri, 11 Apr 2025 18:27:45 -0700
Subject: [PATCH 39/95] lixPackageSets.stable.nix-direnv: init

This adds nix-direnv to the lixPackageSets scope whose
fallback logic for finding a Nix implementation will use Lix
---
 pkgs/tools/package-management/lix/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 1ec7f9e39553..c898d099fdbc 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -12,6 +12,7 @@
   ncurses,
   stdenv,
   clangStdenv,
+  nix-direnv,
   nix-fast-build,
 
   storeDir ? "/nix/store",
@@ -83,6 +84,10 @@ let
           stdenv = lixStdenv;
         };
 
+        nix-direnv = nix-direnv.override {
+          nix = self.lix;
+        };
+
         nix-eval-jobs = self.callPackage (callPackage ./common-nix-eval-jobs.nix nix-eval-jobs-args) {
           stdenv = lixStdenv;
         };

From 1b98d9de85ecee4f1b143e6c758379046ee20561 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 24 Apr 2025 09:39:44 +0800
Subject: [PATCH 40/95] func: 1.10.0 -> 1.16.2

Diff: https://github.com/knative/func/compare/knative-v1.10.0...knative-v1.16.2

Changelog: https://github.com/knative/func/releases/tag/knative-v1.16.2
---
 pkgs/by-name/fu/func/package.nix | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/fu/func/package.nix b/pkgs/by-name/fu/func/package.nix
index 0d6f02a69548..4388fe81487a 100644
--- a/pkgs/by-name/fu/func/package.nix
+++ b/pkgs/by-name/fu/func/package.nix
@@ -7,25 +7,26 @@
   func,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "func";
-  version = "1.10.0";
+  version = "1.16.2";
 
   src = fetchFromGitHub {
     owner = "knative";
     repo = "func";
-    rev = "knative-v${version}";
-    hash = "sha256-x/SrRkgeLvjcd9LNgMGOf5TLU1GXpjY2Z2MyxrBZckc=";
+    tag = "knative-v${finalAttrs.version}";
+    hash = "sha256-nbS7X5WPu+WBtPUKShE5aWve5m2gw2naQQzNeG7pbGM=";
   };
 
-  vendorHash = null;
+  vendorHash = "sha256-Gn+nyck/VOwf8iKPeyLvsPWOpfdN/maUcQOLFAU0oic=";
 
   subPackages = [ "cmd/func" ];
 
   ldflags = [
-    "-X main.vers=v${version}"
+    "-X knative.dev/func/pkg/app.vers=v${finalAttrs.version}"
     "-X main.date=19700101T000000Z"
-    "-X main.hash=${version}"
+    "-X knative.dev/func/pkg/app.hash=${finalAttrs.version}"
+    "-X knative.dev/func/pkg/app.kver=${finalAttrs.src.tag}"
   ];
 
   nativeBuildInputs = [ installShellFiles ];
@@ -39,15 +40,15 @@ buildGoModule rec {
   passthru.tests.version = testers.testVersion {
     package = func;
     command = "func version";
-    version = "v${version}";
+    version = "v${finalAttrs.version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Knative client library and CLI for creating, building, and deploying Knative Functions";
     mainProgram = "func";
     homepage = "https://github.com/knative/func";
-    changelog = "https://github.com/knative/func/releases/tag/knative-v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ maxwell-lt ];
+    changelog = "https://github.com/knative/func/releases/tag/knative-v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ maxwell-lt ];
   };
-}
+})

From e6f0e546714bd35223b246cf4ba6fd4096f1fb47 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Apr 2025 05:56:24 +0000
Subject: [PATCH 41/95] dart-sass: 1.86.3 -> 1.87.0

---
 pkgs/by-name/da/dart-sass/package.nix       |  4 +--
 pkgs/by-name/da/dart-sass/pubspec.lock.json | 34 +++++++++++++--------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix
index d8247bf18f97..485a3f1fd87b 100644
--- a/pkgs/by-name/da/dart-sass/package.nix
+++ b/pkgs/by-name/da/dart-sass/package.nix
@@ -22,13 +22,13 @@ let
 in
 buildDartApplication rec {
   pname = "dart-sass";
-  version = "1.86.3";
+  version = "1.87.0";
 
   src = fetchFromGitHub {
     owner = "sass";
     repo = "dart-sass";
     rev = version;
-    hash = "sha256-HYuKSZLLL3Eg1FPrHK25H1GLuyC/xL9i0DM9eQ6Ry9U=";
+    hash = "sha256-orFmX5I5j8Ds0zTQ0HLEd0LOw433Age2LOl9of/ggKI=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json
index 46debc0d3d30..ba581e1dc174 100644
--- a/pkgs/by-name/da/dart-sass/pubspec.lock.json
+++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json
@@ -4,21 +4,21 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57",
+        "sha256": "e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "80.0.0"
+      "version": "82.0.0"
     },
     "analyzer": {
       "dependency": "direct dev",
       "description": {
         "name": "analyzer",
-        "sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e",
+        "sha256": "13c1e6c6fd460522ea840abec3f677cc226f5fec7872c04ad7b425517ccf54f7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.3.0"
+      "version": "7.4.4"
     },
     "archive": {
       "dependency": "direct dev",
@@ -80,6 +80,16 @@
       "source": "hosted",
       "version": "2.0.3"
     },
+    "cli_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_config",
+        "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
     "cli_pkg": {
       "dependency": "direct main",
       "description": {
@@ -134,11 +144,11 @@
       "dependency": "transitive",
       "description": {
         "name": "coverage",
-        "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43",
+        "sha256": "9086475ef2da7102a0c0a4e37e1e30707e7fb7b6d28c209f559a9c5f8ce42016",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.11.1"
+      "version": "1.12.0"
     },
     "crypto": {
       "dependency": "direct dev",
@@ -244,11 +254,11 @@
       "dependency": "transitive",
       "description": {
         "name": "html",
-        "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec",
+        "sha256": "9475be233c437f0e3637af55e7702cbbe5c23a68bd56e8a5fa2d426297b7c6c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.15.5"
+      "version": "0.15.5+1"
     },
     "http": {
       "dependency": "direct main",
@@ -744,21 +754,21 @@
       "dependency": "transitive",
       "description": {
         "name": "web_socket",
-        "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+        "sha256": "bfe6f435f6ec49cb6c01da1e275ae4228719e59a6b067048c51e72d9d63bcc4b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.6"
+      "version": "1.0.0"
     },
     "web_socket_channel": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.2"
+      "version": "3.0.3"
     },
     "webkit_inspection_protocol": {
       "dependency": "transitive",

From afd44f4b27166dcd6b47a689e1335228363f72ce Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 24 Apr 2025 13:22:14 +0200
Subject: [PATCH 42/95] =?UTF-8?q?openttd-jgrpp:=200.65.1=20=E2=86=92=200.6?=
 =?UTF-8?q?5.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix
index 18485da14464..54e4e64312ac 100644
--- a/pkgs/games/openttd/jgrpp.nix
+++ b/pkgs/games/openttd/jgrpp.nix
@@ -7,13 +7,13 @@
 
 openttd.overrideAttrs (oldAttrs: rec {
   pname = "openttd-jgrpp";
-  version = "0.65.1";
+  version = "0.65.2";
 
   src = fetchFromGitHub {
     owner = "JGRennison";
     repo = "OpenTTD-patches";
     rev = "jgrpp-${version}";
-    hash = "sha256-nS9yUcCwRkzmC9vIjQvPaRDcdPvHt4Nzt0cyfUX+XTY=";
+    hash = "sha256-CoWtFhR8U1PjvV4ID7R5cuFAD6jV8Ps6DtLOu6V55TM=";
   };
   patches = [ ];
 

From 7877f0667168e3bfd92b82260630fb97bbd1cce6 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 24 Apr 2025 12:34:50 +0300
Subject: [PATCH 43/95] readerwriterqueue: init at 1.0.6-2024-07-09

---
 pkgs/by-name/re/readerwriterqueue/package.nix | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/re/readerwriterqueue/package.nix

diff --git a/pkgs/by-name/re/readerwriterqueue/package.nix b/pkgs/by-name/re/readerwriterqueue/package.nix
new file mode 100644
index 000000000000..968702eb3ff8
--- /dev/null
+++ b/pkgs/by-name/re/readerwriterqueue/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "readerwriterqueue";
+  # Not using a stable version since this one produces
+  # readerwriterqueueConfig.cmake needed by dependent packages.
+  version = "1.0.6-2024-07-09";
+
+  src = fetchFromGitHub {
+    owner = "cameron314";
+    repo = "readerwriterqueue";
+    rev = "16b48ae1148284e7b40abf72167206a4390a4592";
+    hash = "sha256-m4cUIXiDFxTguDZ7d0svjlOSkUNYY0bbUp3t7adBwOo=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  meta = {
+    description = "Fast single-producer, single-consumer lock-free queue for C";
+    homepage = "https://github.com/cameron314/readerwriterqueue";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ doronbehar ];
+    platforms = lib.platforms.all;
+  };
+})

From 7e9c43efd98b06ff12ed3b7e5c6c9665a12d371c Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 24 Apr 2025 21:49:20 -0400
Subject: [PATCH 44/95] morphosis: 48.1 -> 48.2

Diff: https://gitlab.gnome.org/World/morphosis/-/compare/refs/tags/48.1...48.2
---
 pkgs/by-name/mo/morphosis/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/morphosis/package.nix b/pkgs/by-name/mo/morphosis/package.nix
index 72eae1709170..5cf46c7631ce 100644
--- a/pkgs/by-name/mo/morphosis/package.nix
+++ b/pkgs/by-name/mo/morphosis/package.nix
@@ -20,7 +20,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "morphosis";
-  version = "48.1";
+  version = "48.2";
   pyproject = false;
 
   src = fetchFromGitLab {
@@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
     owner = "World";
     repo = "morphosis";
     tag = version;
-    hash = "sha256-8Z1c0TtMAOPxzaFhEHDURTk2islHky8B/EIAdmj5hE0=";
+    hash = "sha256-wDEhXIt1iup7QxKsmWUjQZGTEZhOuNjpLqzpqs+TPHo=";
   };
 
   strictDeps = true;

From 3910beead2d2735e7e60385ddcf08815539b3a15 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 25 Apr 2025 20:12:30 +0800
Subject: [PATCH 45/95] gfn-electron: 2.1.3 -> 2.2.0

Diff: https://github.com/hmlendea/gfn-electron/compare/refs/tags/v2.1.3...refs/tags/v2.2.0
---
 pkgs/by-name/gf/gfn-electron/package.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gf/gfn-electron/package.nix b/pkgs/by-name/gf/gfn-electron/package.nix
index 37eb0397f94f..576a87024575 100644
--- a/pkgs/by-name/gf/gfn-electron/package.nix
+++ b/pkgs/by-name/gf/gfn-electron/package.nix
@@ -5,9 +5,10 @@
   electron,
   nix-update-script,
   makeBinaryWrapper,
+  python3,
 }:
 let
-  version = "2.1.3";
+  version = "2.2.0";
 in
 buildNpmPackage {
   pname = "gfn-electron";
@@ -17,12 +18,18 @@ buildNpmPackage {
     owner = "hmlendea";
     repo = "gfn-electron";
     tag = "v${version}";
-    hash = "sha256-o5p7INuyrs4Fw0uoP9f3UpqpmJzHIFSBCBTTU2NfUMQ=";
+    hash = "sha256-DwrNCgBp0CD+HYXRMDsu0aKEKzG7k/tk7oATJc30DlE=";
   };
 
-  npmDepsHash = "sha256-xp9uZAMrsPut91tQD3XfeENr7fXFg2bE89xShG1AcZk=";
+  npmDepsHash = "sha256-2v5qTTGhdG1EEK8v50LLYz5jE/36lBm1PKQl6HfqhCU=";
 
-  nativeBuildInputs = [ makeBinaryWrapper ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    # node_modules/node-gyp/gyp/pylib/gyp/input.py
+    #   from distutils.version import StrictVersion
+    # ModuleNotFoundError: No module named 'distutils'
+    (python3.withPackages (ps: with ps; [ setuptools ]))
+  ];
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = true;
 

From fafd628d5f957625ea2cd0254695906733805acd Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 26 Apr 2025 15:43:48 +0200
Subject: [PATCH 46/95] python3Packages.torcheval: disable flaky test

    E   AssertionError: Scalars are not close!
    E
    E   Expected 0.0009198983898386359 but got 0.0009198188781738281.
    E   Absolute difference: 7.951166480779648e-08 (up to 1e-08 allowed)
    E   Relative difference: 8.643526903198952e-05 (up to 1e-05 allowed)
---
 pkgs/development/python-modules/torcheval/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/torcheval/default.nix b/pkgs/development/python-modules/torcheval/default.nix
index b0294d21ee71..771d58b498f9 100644
--- a/pkgs/development/python-modules/torcheval/default.nix
+++ b/pkgs/development/python-modules/torcheval/default.nix
@@ -106,6 +106,11 @@ buildPythonPackage {
       # AssertionError: Scalars are not close!
       # Expected -640.4547729492188 but got -640.4707641601562
       "--deselect=tests/metrics/regression/test_mean_squared_error.py::TestMeanSquaredError::test_mean_squared_error_class_update_input_shape_different"
+
+      # -- tests/metrics/window/test_mean_squared_error.py --
+      # AssertionError: Scalars are not close!
+      # Expected 0.0009198983898386359 but got 0.0009198188781738281
+      "--deselect=tests/metrics/window/test_mean_squared_error.py::TestMeanSquaredError::test_mean_squared_error_class_update_input_shape_different"
     ]
 
     # These tests error on darwin platforms.

From cc16403c1d372cd6d6469ede00f69f59347d2ff7 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:42:36 +0200
Subject: [PATCH 47/95] harper: 0.30.0 -> 0.31.0

Changelog: https://github.com/Automattic/harper/releases/tag/v0.31.0
---
 pkgs/by-name/ha/harper/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 91c9a0479fc7..f4524b85bc11 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.30.0";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-Xs0/9LkvPvfLGxou1GZbvDAKnrSuEtKzyAwcT92mrB8=";
+    hash = "sha256-+XO81A7F3QOGcDm/keqUHbURCQfzAHRiAlQmNzGo1IU=";
   };
 
   buildAndTestSubdir = "harper-ls";
   useFetchCargoVendor = true;
-  cargoHash = "sha256-gY3Zm+frVdUqeNFUEwEPrWZog9arWQtL1CyGhlMgwFw=";
+  cargoHash = "sha256-EwWBqVTkBH4p1ljBitXtGkjUlx96Uajxc0z7DDkGawo=";
 
   passthru.updateScript = nix-update-script { };
 

From 642ce3f289a5d21f9375b3e2972240c244b3b967 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:55:21 +0200
Subject: [PATCH 48/95] python313Packages.wheel-filename: unbreak by dropping
 old patch

---
 .../python-modules/wheel-filename/default.nix   | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/wheel-filename/default.nix b/pkgs/development/python-modules/wheel-filename/default.nix
index cf7c12204d86..b1e1241a1f48 100644
--- a/pkgs/development/python-modules/wheel-filename/default.nix
+++ b/pkgs/development/python-modules/wheel-filename/default.nix
@@ -2,12 +2,10 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   pytestCheckHook,
   pytest-cov-stub,
   pythonOlder,
-  setuptools,
-  wheel,
+  hatchling,
 }:
 
 buildPythonPackage rec {
@@ -19,22 +17,13 @@ buildPythonPackage rec {
 
   src = fetchFromGitHub {
     owner = "jwodder";
-    repo = pname;
+    repo = "wheel-filename";
     tag = "v${version}";
     hash = "sha256-KAuUrrSq6HJAy+5Gj6svI4M6oV6Fsle1A79E2q2FKW8=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "remove-wheel-dependency-constraint.patch";
-      url = "https://github.com/jwodder/wheel-filename/commit/11cfa57c8a32fa2a52fb5fe537859997bb642e75.patch";
-      hash = "sha256-ssePCVlJuHPJpPyFET3FnnWRlslLnZbnfn42g52yVN4=";
-    })
-  ];
-
   nativeBuildInputs = [
-    setuptools
-    wheel
+    hatchling
   ];
 
   nativeCheckInputs = [

From f7aeddf6345c7544e55ce55aa1a106af79b3ec20 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Apr 2025 03:56:43 +0200
Subject: [PATCH 49/95] python313Packages.dazl: drop old patch, relaxing
 grpcio, unbreak

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

diff --git a/pkgs/development/python-modules/dazl/default.nix b/pkgs/development/python-modules/dazl/default.nix
index fcc5e41a402b..8569f95a6393 100644
--- a/pkgs/development/python-modules/dazl/default.nix
+++ b/pkgs/development/python-modules/dazl/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  fetchpatch,
 
   poetry-core,
 
@@ -27,23 +26,17 @@
 buildPythonPackage rec {
   pname = "dazl";
   version = "8.0.0";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-2EXbfXNl/vNhOIKfBv18TKMPizab72LlNV7QhEf4aVs=";
   };
 
-  patches = [
-    # Merged, remove this next release
-    (fetchpatch {
-      name = "428.patch"; # https://github.com/digital-asset/dazl-client/pull/428
-      url = "https://github.com/digital-asset/dazl-client/commit/a68bad0471d22210f0abf31447a7732477de39d4.patch";
-      sha256 = "sha256-Gx9W1XkvMPg8FAOAXijDF5QnMbntk5mR0q5+o5i2KAE=";
-    })
+  pythonRelaxDeps = [
+    "grpcio"
   ];
 
-  format = "pyproject";
-
   nativeBuildInputs = [ poetry-core ];
 
   propagatedBuildInputs = [

From 04c98cf2c8dd5b95217f5df57da94730edc6b106 Mon Sep 17 00:00:00 2001
From: Chan Siu Man <siuman.chan@gmail.com>
Date: Thu, 24 Apr 2025 20:16:18 -0700
Subject: [PATCH 50/95] nickel: 1.10.0 -> 1.11.0

This commit bumps version and fixes tests for nickel 1.11.0.

Nickel depends on `git` for testing, e.g., [init_git](https://github.com/tweag/nickel/blob/1.11.0/package/tests/util.rs#L141-L152).

Without `git`, tests fail with:
```
       > failures:
       >     different_specs_different_ids
       >     fetch_if_spec_changes
       >     no_fetch_if_exact_match
````

Previously at `1.10.0`, `nickel/package.nix` modifies `checkFlags` to
skip git related tests.

This commit fixes `nickel` tests by adding `gitMinimal` to
`nativeBuildInputs` instead.
---
 pkgs/by-name/ni/nickel/package.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix
index 96a2864f0dd8..5435356e206e 100644
--- a/pkgs/by-name/ni/nickel/package.nix
+++ b/pkgs/by-name/ni/nickel/package.nix
@@ -4,6 +4,7 @@
   rustPlatform,
   fetchFromGitHub,
   python3,
+  gitMinimal,
   versionCheckHook,
   pkg-config,
   nixVersions,
@@ -13,17 +14,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nickel";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "tweag";
     repo = "nickel";
     tag = finalAttrs.version;
-    hash = "sha256-CnEGC4SnLRfAPl3WTv83xertH2ulG5onseZpq3vxfwc=";
+    hash = "sha256-I7cLVrkJhB3aJeE/A3tpFEUj0AkvcONSXD8NtnE5eQ0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-CyO+W4332fJmeF2CL+9CCdPuion8MrxzkPotLA7my3U=";
+  cargoHash = "sha256-DzSfwBVeRT/GAXWyZKZjlDvj95bQzrkqIgZZ2EZw7eQ=";
 
   cargoBuildFlags = [
     "-p nickel-lang-cli"
@@ -33,6 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs =
     [
       python3
+      gitMinimal
     ]
     ++ lib.optionals enableNixImport [
       pkg-config
@@ -68,13 +70,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--exclude=py-nickel"
   ];
 
-  checkFlags = [
-    # https://github.com/tweag/nickel/blob/1.10.0/git/tests/main.rs#L60
-    # fails because src is not a git repo
-    # `cmd.current_dir(repo.path()).output()` errors with `NotFound`
-    "--skip=fetch_targets"
-  ];
-
   postInstall = ''
     mkdir -p $nls/bin
     mv $out/bin/nls $nls/bin/nls

From 313861a7728e809360e67b25ec873b5cbc2fe5bd Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 24 Apr 2025 10:52:31 +0300
Subject: [PATCH 51/95] forscape: init at 0.0.2-unstable-2025-04-28

---
 pkgs/by-name/fo/forscape/package.nix | 55 ++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 pkgs/by-name/fo/forscape/package.nix

diff --git a/pkgs/by-name/fo/forscape/package.nix b/pkgs/by-name/fo/forscape/package.nix
new file mode 100644
index 000000000000..79925ec2cef2
--- /dev/null
+++ b/pkgs/by-name/fo/forscape/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+
+  # nativeBuildInputs
+  cmake,
+  qt6,
+  python3,
+
+  # buildInputs
+  eigen,
+  parallel-hashmap,
+  readerwriterqueue,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "forscape";
+  version = "0.0.2-unstable-2025-04-28";
+
+  src = fetchFromGitHub {
+    owner = "JohnDTill";
+    repo = "Forscape";
+    rev = "1b6d82cdee7ed1ffeee8adffa56ca2b0a866cb34";
+    hash = "sha256-Ee3SAFZG8I0ZEbggLVViqTYu4SFjNJ62xLcpfLgFlR0=";
+  };
+  cmakeFlags = [
+    "-DUSE_CONAN=OFF"
+  ];
+  # Relative to build directory
+  cmakeDir = "../app";
+
+  nativeBuildInputs = [
+    cmake
+    qt6.wrapQtAppsHook
+    python3
+  ];
+
+  buildInputs = [
+    eigen
+    parallel-hashmap
+    readerwriterqueue
+    qt6.qtbase
+    qt6.qtsvg
+  ];
+
+  meta = {
+    description = "Scientific computing language";
+    homepage = "https://github.com/JohnDTill/Forscape";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ doronbehar ];
+    mainProgram = "Forscape";
+    platforms = lib.platforms.all;
+  };
+})

From 62f650429c011b8813601b9580d42ca0758b47f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Apr 2025 12:16:38 +0000
Subject: [PATCH 52/95] immich-public-proxy: 1.9.1 -> 1.10.0

---
 pkgs/by-name/im/immich-public-proxy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix
index dec310e10472..7a48a7e40a88 100644
--- a/pkgs/by-name/im/immich-public-proxy/package.nix
+++ b/pkgs/by-name/im/immich-public-proxy/package.nix
@@ -8,12 +8,12 @@
 }:
 buildNpmPackage rec {
   pname = "immich-public-proxy";
-  version = "1.9.1";
+  version = "1.10.0";
   src = fetchFromGitHub {
     owner = "alangrainger";
     repo = "immich-public-proxy";
     tag = "v${version}";
-    hash = "sha256-3BXuT2tpK/kU7JkOJUuPjgHl1n+7jE12CEzuwB2wSvA=";
+    hash = "sha256-KTA2nOifVksKfHNwayHBqsTypWw3PB7nDEN6j7UjCCI=";
   };
 
   sourceRoot = "${src.name}/app";

From a8aa1453eac8b8e12a2eadba55bbd955a3981be2 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Mon, 28 Apr 2025 17:16:24 -0400
Subject: [PATCH 53/95] python312Packages.anywidget: unbreak tests

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

diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix
index e7ba3ad2bf24..a41edf056e92 100644
--- a/pkgs/development/python-modules/anywidget/default.nix
+++ b/pkgs/development/python-modules/anywidget/default.nix
@@ -3,12 +3,15 @@
   buildPythonPackage,
   fetchPypi,
   pytestCheckHook,
+  writableTmpDirAsHomeHook,
   pythonOlder,
   hatch-jupyter-builder,
   hatchling,
   importlib-metadata,
+  ipykernel,
   ipywidgets,
   psygnal,
+  pydantic,
   typing-extensions,
   watchfiles,
 }:
@@ -46,7 +49,10 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
+    ipykernel
+    pydantic
     watchfiles
+    writableTmpDirAsHomeHook
   ];
 
   disabledTests = [

From 31728d5b3a08558c4b77ed50f2a253594721294f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 14:26:39 +0000
Subject: [PATCH 54/95] artisan: 3.1.0 -> 3.1.2

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

diff --git a/pkgs/by-name/ar/artisan/package.nix b/pkgs/by-name/ar/artisan/package.nix
index 4cd977e9dc6c..9a71936c00a3 100644
--- a/pkgs/by-name/ar/artisan/package.nix
+++ b/pkgs/by-name/ar/artisan/package.nix
@@ -5,11 +5,11 @@
 }:
 let
   pname = "artisan";
-  version = "3.1.0";
+  version = "3.1.2";
 
   src = fetchurl {
     url = "https://github.com/artisan-roaster-scope/artisan/releases/download/v${version}/${pname}-linux-${version}.AppImage";
-    hash = "sha256-PkrqX2CflSCR1e+4Y4K12iuCrYqDMecD1vf8GKz1StQ=";
+    hash = "sha256-HwzTxuE7aRuXrI7BbySFgYGu74uw3JyBs91iPNGT2Jg=";
   };
 
   appimageContents = appimageTools.extract {

From 3f684c5ae3c7c18124de9c60ea49dc0c8258c898 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 30 Apr 2025 22:09:13 +0100
Subject: [PATCH 55/95] rust-analyzer-unwrapped: 2025-04-21 -> 2025-04-28

Changes: https://github.com/rust-lang/rust-analyzer/releases/tag/2025-04-28
---
 pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
index 0fc9cb4e7640..0fbbc2419ad0 100644
--- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
+++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
@@ -12,15 +12,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
-  version = "2025-04-21";
+  version = "2025-04-28";
   useFetchCargoVendor = true;
-  cargoHash = "sha256-6HKx3zm6RaixTiioij/PI2KvgWGhPFfVQsbECm4LtEc=";
+  cargoHash = "sha256-fPp8aBPSTpWIGLMYFawEDTB5aSdglJtK7ez8RWsP6Hg=";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rust-analyzer";
     rev = version;
-    hash = "sha256-Gw627dJW6/IJydIUCQnI8c2oilpMxhZIwHb7ppGX7hk=";
+    hash = "sha256-fxvRYH/tS7hGQeg9zCVh5RBcSWT+JGJet7RA8Ss+rC0=";
   };
 
   cargoBuildFlags = [

From f755506211ebb7fa86ea99a955d3fce0747a4c9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 21:49:35 +0000
Subject: [PATCH 56/95] claude-code: 0.2.92 -> 0.2.94

---
 pkgs/by-name/cl/claude-code/package-lock.json | 8 ++++----
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index a9c757a8f304..ee7222282e33 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -5,13 +5,13 @@
   "packages": {
     "": {
       "dependencies": {
-        "@anthropic-ai/claude-code": "^0.2.92"
+        "@anthropic-ai/claude-code": "^0.2.94"
       }
     },
     "node_modules/@anthropic-ai/claude-code": {
-      "version": "0.2.92",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.92.tgz",
-      "integrity": "sha512-S/JaRJdenrN++TI7cTBUzu1PwckLlo7rAm/dNo0mSLVzLIIsCxwtTbsGZF+gDFYG3l9D8LymCr/HsuuUKG+rjQ==",
+      "version": "0.2.94",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-0.2.94.tgz",
+      "integrity": "sha512-IHYUqgX9FJbKoMSf1S0727wdmXENABE+fZii0CL2mBYuQ+yxg2FApz2JNX9I7J3Ss8EXZaw3AkoQe6138sSdBw==",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN README.md",
       "dependencies": {
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 4bbd14d36944..38324b3fbc39 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -6,14 +6,14 @@
 
 buildNpmPackage rec {
   pname = "claude-code";
-  version = "0.2.92";
+  version = "0.2.94";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
-    hash = "sha256-PYNtUsexEdl8QphDclgb8v37mN8WvjJO5A8yLiJ6zAs=";
+    hash = "sha256-n8K+gwlKjnQH3TPvoosOTUWhQ1iI9OdGuwUUF3raPKU=";
   };
 
-  npmDepsHash = "sha256-jSiYaCr8iSAi+368orDnBpDt1XbXGkfULMRKs9XURZY=";
+  npmDepsHash = "sha256-1h/AbADvqWE0RnWFhlg01lLQNcvMN1wpOVh1ve2MlME=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 6cca3aedf639860a7575c572b6b93bb342420c52 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Thu, 1 May 2025 03:08:03 +0300
Subject: [PATCH 57/95] yt-dlp: 2025.3.31 -> 2025.4.30

Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2025.04.30
Diff: https://github.com/yt-dlp/yt-dlp/compare/2025.03.31...2025.04.30
---
 pkgs/by-name/yt/yt-dlp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index 00619fdb303c..85195dade4aa 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec {
   # The websites yt-dlp deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2025.3.31";
+  version = "2025.4.30";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "yt_dlp";
-    hash = "sha256-G/4OZg0acKCeJ7LVj5LjCx4uNizEh4KfL4JDRq5J+5E=";
+    hash = "sha256-0BNn0MOulONcseLsy3p8cOGBxMpEj07iN08mSJ0mNgM=";
   };
 
   build-system = with python3Packages; [

From 8124a94557dc7d13608cdef3d5cdfb47d8b5f2c8 Mon Sep 17 00:00:00 2001
From: Rebecca Kelly <bk@ancilla.ca>
Date: Fri, 18 Apr 2025 13:35:35 -0400
Subject: [PATCH 58/95] crossfire-server: r22111 -> git@2025-04-16

This updates the server, maps, and archetypes in lockstep, since changes to the
server means it needs updated data files and changes to the data need the new
server to load them.

It also updates the build configuration to use the new git repo, and drops the
no longer needed cstdint patch.
---
 pkgs/games/crossfire/crossfire-arch.nix   | 11 +++++------
 pkgs/games/crossfire/crossfire-maps.nix   | 11 +++++------
 pkgs/games/crossfire/crossfire-server.nix | 16 +++++-----------
 pkgs/games/crossfire/default.nix          | 12 ++++++------
 4 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/pkgs/games/crossfire/crossfire-arch.nix b/pkgs/games/crossfire/crossfire-arch.nix
index 0d3b3c0e6ed2..5b46a61ad61c 100644
--- a/pkgs/games/crossfire/crossfire-arch.nix
+++ b/pkgs/games/crossfire/crossfire-arch.nix
@@ -1,20 +1,19 @@
 {
   stdenv,
   lib,
-  fetchsvn,
+  fetchgit,
   version,
   rev,
-  sha256,
+  hash,
 }:
 
 stdenv.mkDerivation {
   pname = "crossfire-arch";
   version = rev;
 
-  src = fetchsvn {
-    url = "http://svn.code.sf.net/p/crossfire/code/arch/trunk/";
-    inherit sha256;
-    rev = "r${rev}";
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/crossfire/crossfire-arch";
+    inherit hash rev;
   };
 
   installPhase = ''
diff --git a/pkgs/games/crossfire/crossfire-maps.nix b/pkgs/games/crossfire/crossfire-maps.nix
index 32f2330b23b8..3bbdb2945167 100644
--- a/pkgs/games/crossfire/crossfire-maps.nix
+++ b/pkgs/games/crossfire/crossfire-maps.nix
@@ -1,20 +1,19 @@
 {
   stdenv,
   lib,
-  fetchsvn,
+  fetchgit,
   version,
   rev,
-  sha256,
+  hash,
 }:
 
 stdenv.mkDerivation {
   pname = "crossfire-maps";
   version = rev;
 
-  src = fetchsvn {
-    url = "http://svn.code.sf.net/p/crossfire/code/maps/trunk/";
-    inherit sha256;
-    rev = "r${rev}";
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/crossfire/crossfire-maps";
+    inherit hash rev;
   };
 
   installPhase = ''
diff --git a/pkgs/games/crossfire/crossfire-server.nix b/pkgs/games/crossfire/crossfire-server.nix
index 435d87beb547..8e2368d97d77 100644
--- a/pkgs/games/crossfire/crossfire-server.nix
+++ b/pkgs/games/crossfire/crossfire-server.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  fetchsvn,
+  fetchgit,
   autoconf,
   automake,
   libtool,
@@ -12,7 +12,7 @@
   python3,
   version,
   rev,
-  sha256,
+  hash,
   maps,
   arch,
 }:
@@ -21,16 +21,11 @@ stdenv.mkDerivation {
   pname = "crossfire-server";
   version = rev;
 
-  src = fetchsvn {
-    url = "http://svn.code.sf.net/p/crossfire/code/server/trunk/";
-    inherit sha256;
-    rev = "r${rev}";
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/crossfire/crossfire-server";
+    inherit hash rev;
   };
 
-  patches = [
-    ./add-cstdint-include-to-crossfire-server.patch
-  ];
-
   nativeBuildInputs = [
     autoconf
     automake
@@ -56,7 +51,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    broken = true; # cfpython.c:63:10: fatal error: node.h: No such file or directory
     description = "Server for the Crossfire free MMORPG";
     homepage = "http://crossfire.real-time.com/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/games/crossfire/default.nix b/pkgs/games/crossfire/default.nix
index f494592d6f0a..6ce42386c036 100644
--- a/pkgs/games/crossfire/default.nix
+++ b/pkgs/games/crossfire/default.nix
@@ -9,21 +9,21 @@ rec {
 
   crossfire-server = callPackage ./crossfire-server.nix {
     version = "latest";
-    rev = "22111";
-    sha256 = "04fjif6zv642n2zlw27cgzkak2kknwrxqzg42bvzl7q901bsr9l7";
+    rev = "5f742b9f9f785e4a59a3a463bee1f31c9bc67098";
+    hash = "sha256-e7e3xN7B1cv9+WkZGzOJgrFer50Cs0L/2dYB9RmGCiE=";
     maps = crossfire-maps;
     arch = crossfire-arch;
   };
 
   crossfire-arch = callPackage ./crossfire-arch.nix {
     version = "latest";
-    rev = "22111";
-    sha256 = "0l4rp3idvbhknpxxs0w4i4nqfg01wblzm4v4j375xwxxbf00j0ms";
+    rev = "876eb50b9199e9aa06175b7a7d85832662be3f78";
+    hash = "sha256-jDiAKcjWYvjGiD68LuKlZS4sOR9jW3THp99kAEdE+y0=";
   };
 
   crossfire-maps = callPackage ./crossfire-maps.nix {
     version = "latest";
-    rev = "22111";
-    sha256 = "1dwfc84acjvbjgjakkb8z8pdlksbsn90j0z8z8rq37lqx0kx1sap";
+    rev = "ec57d473064ed1732adb1897415b56f96fbd9382";
+    hash = "sha256-hJOMa8c80T4/NC37NKM270LDHNqWK6NZfKvKnFno9TE=";
   };
 }

From 4bf4ae1bba65071717a8175f8e096a7a3951ab62 Mon Sep 17 00:00:00 2001
From: Rebecca Kelly <bk@ancilla.ca>
Date: Fri, 18 Apr 2025 13:54:04 -0400
Subject: [PATCH 59/95] crossfire-client: 0.75.0 -> git@2025-01-06

Latest stable is last year, and there have been some significant fixes and
features since. There's also a gtk3 branch now, but it's not ready for general
use, so this just updates the gtk2 version.
---
 pkgs/games/crossfire/crossfire-client.nix | 23 +++++++++++------------
 pkgs/games/crossfire/default.nix          |  6 +++---
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/games/crossfire/crossfire-client.nix b/pkgs/games/crossfire/crossfire-client.nix
index 2d3401914109..af29da33cf68 100644
--- a/pkgs/games/crossfire/crossfire-client.nix
+++ b/pkgs/games/crossfire/crossfire-client.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  fetchsvn,
+  fetchgit,
   cmake,
   pkg-config,
   perl,
@@ -17,24 +17,23 @@
   xorg,
   util-linux,
   curl,
-  SDL,
-  SDL_image,
-  SDL_mixer,
+  SDL2,
+  SDL2_image,
+  SDL2_mixer,
   libselinux,
   libsepol,
   version,
   rev,
-  sha256,
+  hash,
 }:
 
 stdenv.mkDerivation {
   pname = "crossfire-client";
   version = rev;
 
-  src = fetchsvn {
-    url = "http://svn.code.sf.net/p/crossfire/code/client/trunk/";
-    inherit sha256;
-    rev = "r${rev}";
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/crossfire/crossfire-client";
+    inherit hash rev;
   };
 
   nativeBuildInputs = [
@@ -55,9 +54,9 @@ stdenv.mkDerivation {
     xorg.libpthreadstubs
     xorg.libXdmcp
     curl
-    SDL
-    SDL_image
-    SDL_mixer
+    SDL2
+    SDL2_image
+    SDL2_mixer
     util-linux
     libselinux
     libsepol
diff --git a/pkgs/games/crossfire/default.nix b/pkgs/games/crossfire/default.nix
index 6ce42386c036..48993b49d8e7 100644
--- a/pkgs/games/crossfire/default.nix
+++ b/pkgs/games/crossfire/default.nix
@@ -2,9 +2,9 @@
 
 rec {
   crossfire-client = callPackage ./crossfire-client.nix {
-    version = "1.75.0";
-    rev = "21760";
-    sha256 = "0b42sak8hj60nywfswkps777asy9p8r9wsn7pmj2nqbd29ng1p9d";
+    version = "latest";
+    rev = "c69f578add358c1db567f6b46f532dd038d2ade0";
+    hash = "sha256-iFm9yVEIBwngr8/0f9TRS4Uw0hnjrW6ngMRfsWY6TX0=";
   };
 
   crossfire-server = callPackage ./crossfire-server.nix {

From 80956ee6b7b48841f7357d27728e20170ed174a2 Mon Sep 17 00:00:00 2001
From: Rebecca Kelly <bk@ancilla.ca>
Date: Fri, 18 Apr 2025 14:45:35 -0400
Subject: [PATCH 60/95] crossfire-*: move to pkgs/by-name/

This covers the server, maps, arch, and client packages. It also gets rid of the
whole hashes-and-versions-in-a-separate-file thing which made sense when I first
wrote it but is kind of clunky now.
---
 .../cr/crossfire-arch/package.nix}            | 12 ++++----
 .../cr/crossfire-client/package.nix}          |  8 ++---
 .../cr/crossfire-maps/package.nix}            | 12 ++++----
 .../cr/crossfire-server/package.nix}          | 14 ++++-----
 ...-cstdint-include-to-crossfire-server.patch | 13 ---------
 pkgs/games/crossfire/default.nix              | 29 -------------------
 pkgs/top-level/all-packages.nix               |  7 -----
 7 files changed, 24 insertions(+), 71 deletions(-)
 rename pkgs/{games/crossfire/crossfire-arch.nix => by-name/cr/crossfire-arch/package.nix} (73%)
 rename pkgs/{games/crossfire/crossfire-client.nix => by-name/cr/crossfire-client/package.nix} (87%)
 rename pkgs/{games/crossfire/crossfire-maps.nix => by-name/cr/crossfire-maps/package.nix} (73%)
 rename pkgs/{games/crossfire/crossfire-server.nix => by-name/cr/crossfire-server/package.nix} (75%)
 delete mode 100644 pkgs/games/crossfire/add-cstdint-include-to-crossfire-server.patch
 delete mode 100644 pkgs/games/crossfire/default.nix

diff --git a/pkgs/games/crossfire/crossfire-arch.nix b/pkgs/by-name/cr/crossfire-arch/package.nix
similarity index 73%
rename from pkgs/games/crossfire/crossfire-arch.nix
rename to pkgs/by-name/cr/crossfire-arch/package.nix
index 5b46a61ad61c..ca29d5ababd1 100644
--- a/pkgs/games/crossfire/crossfire-arch.nix
+++ b/pkgs/by-name/cr/crossfire-arch/package.nix
@@ -2,23 +2,25 @@
   stdenv,
   lib,
   fetchgit,
-  version,
-  rev,
-  hash,
 }:
 
 stdenv.mkDerivation {
   pname = "crossfire-arch";
-  version = rev;
+  version = "2025-04";
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/crossfire/crossfire-arch";
-    inherit hash rev;
+    rev = "876eb50b9199e9aa06175b7a7d85832662be3f78";
+    hash = "sha256-jDiAKcjWYvjGiD68LuKlZS4sOR9jW3THp99kAEdE+y0=";
   };
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p "$out"
     cp -a . "$out/"
+
+    runHook postInstall
   '';
 
   meta = with lib; {
diff --git a/pkgs/games/crossfire/crossfire-client.nix b/pkgs/by-name/cr/crossfire-client/package.nix
similarity index 87%
rename from pkgs/games/crossfire/crossfire-client.nix
rename to pkgs/by-name/cr/crossfire-client/package.nix
index af29da33cf68..58bc840c8c1e 100644
--- a/pkgs/games/crossfire/crossfire-client.nix
+++ b/pkgs/by-name/cr/crossfire-client/package.nix
@@ -22,18 +22,16 @@
   SDL2_mixer,
   libselinux,
   libsepol,
-  version,
-  rev,
-  hash,
 }:
 
 stdenv.mkDerivation {
   pname = "crossfire-client";
-  version = rev;
+  version = "2025-01";
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/crossfire/crossfire-client";
-    inherit hash rev;
+    hash = "sha256-iFm9yVEIBwngr8/0f9TRS4Uw0hnjrW6ngMRfsWY6TX0=";
+    rev = "c69f578add358c1db567f6b46f532dd038d2ade0";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/games/crossfire/crossfire-maps.nix b/pkgs/by-name/cr/crossfire-maps/package.nix
similarity index 73%
rename from pkgs/games/crossfire/crossfire-maps.nix
rename to pkgs/by-name/cr/crossfire-maps/package.nix
index 3bbdb2945167..35575bbaa6b0 100644
--- a/pkgs/games/crossfire/crossfire-maps.nix
+++ b/pkgs/by-name/cr/crossfire-maps/package.nix
@@ -2,23 +2,25 @@
   stdenv,
   lib,
   fetchgit,
-  version,
-  rev,
-  hash,
 }:
 
 stdenv.mkDerivation {
   pname = "crossfire-maps";
-  version = rev;
+  version = "2025-04";
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/crossfire/crossfire-maps";
-    inherit hash rev;
+    rev = "ec57d473064ed1732adb1897415b56f96fbd9382";
+    hash = "sha256-hJOMa8c80T4/NC37NKM270LDHNqWK6NZfKvKnFno9TE=";
   };
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p "$out"
     cp -a . "$out/"
+
+    runHook postInstall
   '';
 
   meta = with lib; {
diff --git a/pkgs/games/crossfire/crossfire-server.nix b/pkgs/by-name/cr/crossfire-server/package.nix
similarity index 75%
rename from pkgs/games/crossfire/crossfire-server.nix
rename to pkgs/by-name/cr/crossfire-server/package.nix
index 8e2368d97d77..58d8d510ff74 100644
--- a/pkgs/games/crossfire/crossfire-server.nix
+++ b/pkgs/by-name/cr/crossfire-server/package.nix
@@ -1,6 +1,7 @@
 {
   stdenv,
   lib,
+  pkgs,
   fetchgit,
   autoconf,
   automake,
@@ -10,20 +11,19 @@
   check,
   pkg-config,
   python3,
-  version,
-  rev,
-  hash,
-  maps,
-  arch,
+  # Included here so that hosts using custom maps/archetypes can easily override.
+  maps ? pkgs.crossfire-maps,
+  arch ? pkgs.crossfire-arch,
 }:
 
 stdenv.mkDerivation {
   pname = "crossfire-server";
-  version = rev;
+  version = "2025-04";
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/crossfire/crossfire-server";
-    inherit hash rev;
+    rev = "5f742b9f9f785e4a59a3a463bee1f31c9bc67098";
+    hash = "sha256-e7e3xN7B1cv9+WkZGzOJgrFer50Cs0L/2dYB9RmGCiE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/games/crossfire/add-cstdint-include-to-crossfire-server.patch b/pkgs/games/crossfire/add-cstdint-include-to-crossfire-server.patch
deleted file mode 100644
index 73c69f533613..000000000000
--- a/pkgs/games/crossfire/add-cstdint-include-to-crossfire-server.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/include/Treasures.h b/include/Treasures.h
-index 614078f..a00b4f6 100644
---- a/include/Treasures.h
-+++ b/include/Treasures.h
-@@ -13,6 +13,8 @@
- #ifndef TREASURES_H
- #define TREASURES_H
- 
-+#include <cstdint>
-+
- #include "AssetsCollection.h"
- 
- extern "C" {
diff --git a/pkgs/games/crossfire/default.nix b/pkgs/games/crossfire/default.nix
deleted file mode 100644
index 48993b49d8e7..000000000000
--- a/pkgs/games/crossfire/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ callPackage, ... }:
-
-rec {
-  crossfire-client = callPackage ./crossfire-client.nix {
-    version = "latest";
-    rev = "c69f578add358c1db567f6b46f532dd038d2ade0";
-    hash = "sha256-iFm9yVEIBwngr8/0f9TRS4Uw0hnjrW6ngMRfsWY6TX0=";
-  };
-
-  crossfire-server = callPackage ./crossfire-server.nix {
-    version = "latest";
-    rev = "5f742b9f9f785e4a59a3a463bee1f31c9bc67098";
-    hash = "sha256-e7e3xN7B1cv9+WkZGzOJgrFer50Cs0L/2dYB9RmGCiE=";
-    maps = crossfire-maps;
-    arch = crossfire-arch;
-  };
-
-  crossfire-arch = callPackage ./crossfire-arch.nix {
-    version = "latest";
-    rev = "876eb50b9199e9aa06175b7a7d85832662be3f78";
-    hash = "sha256-jDiAKcjWYvjGiD68LuKlZS4sOR9jW3THp99kAEdE+y0=";
-  };
-
-  crossfire-maps = callPackage ./crossfire-maps.nix {
-    version = "latest";
-    rev = "ec57d473064ed1732adb1897415b56f96fbd9382";
-    hash = "sha256-hJOMa8c80T4/NC37NKM270LDHNqWK6NZfKvKnFno9TE=";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index edb35316c35e..826a65dff892 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17238,13 +17238,6 @@ with pkgs;
 
   crawl = callPackage ../games/crawl { };
 
-  inherit (import ../games/crossfire pkgs)
-    crossfire-server
-    crossfire-arch
-    crossfire-maps
-    crossfire-client
-    ;
-
   curseofwar = callPackage ../games/curseofwar { SDL = null; };
   curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; };
 

From b622ce87a8996d78a438ad74b71e8b04cdc79a00 Mon Sep 17 00:00:00 2001
From: Rebecca Kelly <bk@ancilla.ca>
Date: Fri, 18 Apr 2025 21:47:55 -0400
Subject: [PATCH 61/95] crossfire-jxclient: init at 2025-01

This is an alternate, fullscreen, Java-based client for Crossfire, usable on the
same servers as the "main" GTK client.

As with many things Crossfire, it hasn't had an official release in a long time
but is still under active development, so I identify it by date of commit.
---
 .../by-name/cr/crossfire-jxclient/package.nix | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 pkgs/by-name/cr/crossfire-jxclient/package.nix

diff --git a/pkgs/by-name/cr/crossfire-jxclient/package.nix b/pkgs/by-name/cr/crossfire-jxclient/package.nix
new file mode 100644
index 000000000000..e5297d6fab50
--- /dev/null
+++ b/pkgs/by-name/cr/crossfire-jxclient/package.nix
@@ -0,0 +1,73 @@
+{
+  stdenv,
+  lib,
+  fetchgit,
+  makeWrapper,
+  gradle,
+  jre,
+  ffmpeg,
+}:
+
+stdenv.mkDerivation rec {
+  name = "crossfire-jxclient";
+  version = "2025-01";
+
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/crossfire/jxclient";
+    rev = "01471f0fdf7a5fd8b4ea6d5b49bde7edead5c505";
+    hash = "sha256-NGBj3NUBZIfS9J3FHqER8lblPuFEEH9dsTKFBqioiik=";
+    # For some reason, submodule fetching fails in nix even though it works in
+    # the shell. So we fetch the sounds repo separately below.
+    fetchSubmodules = false;
+  };
+
+  sounds = fetchgit {
+    url = "https://git.code.sf.net/p/crossfire/crossfire-sounds";
+    rev = "b53f436e1d1cca098c641f34c46f15c828ea9c8f";
+    hash = "sha256-zA+SaQAaNxNroHESCSonDiUsCuCzjZp+WZNzvsJHNXY=";
+  };
+
+  nativeBuildInputs = [
+    jre
+    gradle
+    makeWrapper
+    ffmpeg
+  ];
+
+  patchPhase = ''
+    runHook prePatch
+
+    rm -rf sounds
+    ln -s ${sounds} sounds
+
+    runHook postPatch
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    gradle :createJar
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -pv $out/share/java $out/bin
+    cp jxclient.jar $out/share/java/jxclient.jar
+
+    makeWrapper ${jre}/bin/java $out/bin/crossfire-jxclient \
+      --add-flags "-jar $out/share/java/jxclient.jar" \
+      --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=on' \
+      --set _JAVA_AWT_WM_NONREPARENTING 1
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Java-based fullscreen client for the Crossfire free MMORPG";
+    homepage = "http://crossfire.real-time.com/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ToxicFrog ];
+  };
+}

From 2386aba1fdc41f1c3047e7b176127fa47e2efae7 Mon Sep 17 00:00:00 2001
From: Rebecca Kelly <bk@ancilla.ca>
Date: Sat, 19 Apr 2025 11:28:38 -0400
Subject: [PATCH 62/95] crossfire-gridarta: init at 2025-04

This is the editor for Crossfire map and archetype data.
---
 .../by-name/cr/crossfire-gridarta/package.nix | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 pkgs/by-name/cr/crossfire-gridarta/package.nix

diff --git a/pkgs/by-name/cr/crossfire-gridarta/package.nix b/pkgs/by-name/cr/crossfire-gridarta/package.nix
new file mode 100644
index 000000000000..59d274d9774b
--- /dev/null
+++ b/pkgs/by-name/cr/crossfire-gridarta/package.nix
@@ -0,0 +1,53 @@
+{
+  stdenv,
+  lib,
+  fetchgit,
+  makeWrapper,
+  jre,
+  gradle,
+}:
+
+stdenv.mkDerivation rec {
+  name = "crossfire-gridarta";
+  version = "2025-04";
+
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/gridarta/gridarta";
+    rev = "9ff39a63071fc76141117eac97a27c07d312cfb5";
+    hash = "sha256-UotvRJey0SXhKjyKo0L7MiDtqvsBOUcT0315fkAKwb0=";
+  };
+
+  nativeBuildInputs = [
+    jre
+    gradle
+    makeWrapper
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    gradle :src:crossfire:createEditorJar
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -pv $out/share/java $out/bin
+    cp src/crossfire/build/libs/CrossfireEditor.jar $out/share/java/
+
+    makeWrapper ${jre}/bin/java $out/bin/crossfire-gridarta \
+      --add-flags "-jar $out/share/java/CrossfireEditor.jar" \
+      --set _JAVA_OPTIONS '-Dawt.useSystemAAFontSettings=on' \
+      --set _JAVA_AWT_WM_NONREPARENTING 1
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Map and archetype editor for the Crossfire free MMORPG";
+    homepage = "http://crossfire.real-time.com/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ToxicFrog ];
+  };
+}

From d83c1b55bd3b37f9158c1411eb8b8aee68a20678 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 30 Apr 2025 22:55:16 -0500
Subject: [PATCH 63/95] fastfetch: add additional feature flags

Attempt to allow creating more customization options to reduce closure
size, for those who don't need all the features.
---
 pkgs/by-name/fa/fastfetch/package.nix | 88 ++++++++++++++++++++++-----
 1 file changed, 72 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index f0b8ca3d34d9..d97a5551d192 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -37,11 +37,17 @@
   xorg,
   yyjson,
   zlib,
+  # Feature flags
+  audioSupport ? true,
+  flashfetchSupport ? false,
+  gnomeSupport ? true,
+  imageSupport ? true,
+  openclSupport ? true,
   rpmSupport ? false,
+  sqliteSupport ? true,
   vulkanSupport ? true,
   waylandSupport ? true,
   x11Support ? true,
-  flashfetchSupport ? false,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastfetch";
@@ -68,28 +74,40 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs =
     [
-      chafa
-      imagemagick
+      glib
       pcre
       pcre2
-      sqlite
       yyjson
     ]
+    ++ lib.optionals imageSupport [
+      chafa
+      imagemagick
+    ]
+    ++ lib.optionals sqliteSupport [
+      sqlite
+    ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
-      dbus
-      dconf
-      ddcutil
-      glib
       hwdata
-      libdrm
-      libpulseaudio
       libselinux
       libsepol
-      ocl-icd
-      opencl-headers
       util-linux
       zlib
     ]
+    ++ lib.optionals (stdenv.hostPlatform.isLinux && gnomeSupport) [
+      dbus
+      dconf
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isLinux && audioSupport) [
+      libpulseaudio
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isLinux && openclSupport) [
+      ocl-icd
+      opencl-headers
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isLinux && vulkanSupport) [
+      libdrm
+      ddcutil
+    ]
     ++ lib.optionals rpmSupport [ rpm ]
     ++ lib.optionals vulkanSupport [ vulkan-loader ]
     ++ lib.optionals waylandSupport [ wayland ]
@@ -111,19 +129,42 @@ stdenv.mkDerivation (finalAttrs: {
     [
       (lib.cmakeOptionType "filepath" "CMAKE_INSTALL_SYSCONFDIR" "${placeholder "out"}/etc")
       (lib.cmakeBool "ENABLE_DIRECTX_HEADERS" false)
-      (lib.cmakeBool "ENABLE_DRM" false)
-      (lib.cmakeBool "ENABLE_IMAGEMAGICK6" false)
       (lib.cmakeBool "ENABLE_OSMESA" false)
       (lib.cmakeBool "ENABLE_SYSTEM_YYJSON" true)
-      (lib.cmakeBool "ENABLE_GLX" x11Support)
-      (lib.cmakeBool "ENABLE_RPM" rpmSupport)
+
+      # Feature flags
+      (lib.cmakeBool "ENABLE_IMAGEMAGICK6" false)
+      (lib.cmakeBool "ENABLE_IMAGEMAGICK7" imageSupport)
+      (lib.cmakeBool "ENABLE_CHAFA" imageSupport)
+      (lib.cmakeBool "ENABLE_ZLIB" imageSupport)
+
+      (lib.cmakeBool "ENABLE_SQLITE3" sqliteSupport)
+
+      (lib.cmakeBool "ENABLE_PULSE" audioSupport)
+
+      (lib.cmakeBool "ENABLE_GIO" gnomeSupport)
+      (lib.cmakeBool "ENABLE_DCONF" gnomeSupport)
+      (lib.cmakeBool "ENABLE_DBUS" gnomeSupport)
+
+      (lib.cmakeBool "ENABLE_OPENCL" openclSupport)
+
+      (lib.cmakeBool "ENABLE_DRM" vulkanSupport)
+      (lib.cmakeBool "ENABLE_DRM_AMDGPU" vulkanSupport)
       (lib.cmakeBool "ENABLE_VULKAN" vulkanSupport)
+      (lib.cmakeBool "ENABLE_DDCUTIL" vulkanSupport)
+      (lib.cmakeBool "ENABLE_EGL" vulkanSupport)
+
       (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport)
+
+      (lib.cmakeBool "ENABLE_GLX" x11Support)
       (lib.cmakeBool "ENABLE_X11" x11Support)
       (lib.cmakeBool "ENABLE_XCB" x11Support)
       (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support)
       (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.hostPlatform.isDarwin)))
       (lib.cmakeBool "ENABLE_XRANDR" x11Support)
+
+      (lib.cmakeBool "ENABLE_RPM" rpmSupport)
+
       (lib.cmakeBool "BUILD_FLASHFETCH" flashfetchSupport)
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
@@ -162,5 +203,20 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = lib.platforms.all;
     mainProgram = "fastfetch";
+    longDescription = ''
+      Fast and highly customizable system info script.
+
+      Feature flags (all default to 'true' except rpmSupport and flashfetchSupport):
+      * rpmSupport: RPM package detection (default: false)
+      * vulkanSupport: Vulkan GPU information and DRM features
+      * waylandSupport: Wayland display detection
+      * x11Support: X11 display information
+      * flashfetchSupport: Build the flashfetch utility (default: false)
+      * imageSupport: Image rendering (chafa and imagemagick)
+      * sqliteSupport: Package counting via SQLite
+      * audioSupport: PulseAudio functionality
+      * gnomeSupport: GNOME integration (dconf, dbus, gio)
+      * openclSupport: OpenCL features
+    '';
   };
 })

From a7dd0863cc3acfec1fd51711f7a6ce6806296b1b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 30 Apr 2025 23:10:34 -0500
Subject: [PATCH 64/95] fastfetch: refactor buildInputs

---
 pkgs/by-name/fa/fastfetch/package.nix | 134 ++++++++++++++++----------
 1 file changed, 83 insertions(+), 51 deletions(-)

diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index d97a5551d192..705125a3f3bb 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -73,57 +73,89 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs =
-    [
-      glib
-      pcre
-      pcre2
-      yyjson
-    ]
-    ++ lib.optionals imageSupport [
-      chafa
-      imagemagick
-    ]
-    ++ lib.optionals sqliteSupport [
-      sqlite
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      hwdata
-      libselinux
-      libsepol
-      util-linux
-      zlib
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && gnomeSupport) [
-      dbus
-      dconf
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && audioSupport) [
-      libpulseaudio
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && openclSupport) [
-      ocl-icd
-      opencl-headers
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && vulkanSupport) [
-      libdrm
-      ddcutil
-    ]
-    ++ lib.optionals rpmSupport [ rpm ]
-    ++ lib.optionals vulkanSupport [ vulkan-loader ]
-    ++ lib.optionals waylandSupport [ wayland ]
-    ++ lib.optionals x11Support [
-      libXrandr
-      libglvnd
-      libxcb
-      xorg.libXau
-      xorg.libXdmcp
-      xorg.libXext
-    ]
-    ++ lib.optionals (x11Support && (!stdenv.hostPlatform.isDarwin)) [ xfce.xfconf ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_15
-      moltenvk
-    ];
+    let
+      commonDeps = [
+        pcre
+        pcre2
+        yyjson
+      ];
+
+      # Cross-platform optional dependencies
+      imageDeps = lib.optionals imageSupport [
+        chafa
+        imagemagick
+      ];
+
+      sqliteDeps = lib.optionals sqliteSupport [
+        sqlite
+      ];
+
+      linuxCoreDeps = lib.optionals stdenv.hostPlatform.isLinux [
+        hwdata
+        libselinux
+        libsepol
+        util-linux
+        zlib
+      ];
+
+      linuxFeatureDeps = lib.optionals stdenv.hostPlatform.isLinux (
+        lib.optionals gnomeSupport [
+          dbus
+          dconf
+          glib
+        ]
+        ++ lib.optionals audioSupport [
+          libpulseaudio
+        ]
+        ++ lib.optionals openclSupport [
+          ocl-icd
+          opencl-headers
+        ]
+        ++ lib.optionals vulkanSupport [
+          libdrm
+          ddcutil
+        ]
+        ++ lib.optionals rpmSupport [
+          rpm
+        ]
+      );
+
+      waylandDeps = lib.optionals waylandSupport [
+        wayland
+      ];
+
+      vulkanDeps = lib.optionals vulkanSupport [
+        vulkan-loader
+      ];
+
+      x11Deps = lib.optionals x11Support [
+        libXrandr
+        libglvnd
+        libxcb
+        xorg.libXau
+        xorg.libXdmcp
+        xorg.libXext
+      ];
+
+      x11XfceDeps = lib.optionals (x11Support && (!stdenv.hostPlatform.isDarwin)) [
+        xfce.xfconf
+      ];
+
+      macosDeps = lib.optionals stdenv.hostPlatform.isDarwin [
+        apple-sdk_15
+        moltenvk
+      ];
+    in
+    commonDeps
+    ++ imageDeps
+    ++ sqliteDeps
+    ++ linuxCoreDeps
+    ++ linuxFeatureDeps
+    ++ waylandDeps
+    ++ vulkanDeps
+    ++ x11Deps
+    ++ x11XfceDeps
+    ++ macosDeps;
 
   cmakeFlags =
     [

From 7a73f4d5b1ef4060164f242d187206563e151eba Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 30 Apr 2025 23:10:58 -0500
Subject: [PATCH 65/95] fastfetch: add libsysprof-catpure for glib

Package 'sysprof-capture-4', required by 'glib-2.0', not found
Package sysprof-capture-4 was not found in the pkg-config search path.
fastfetch> Perhaps you should add the directory containing
`sysprof-capture-4.pc'
fastfetch> to the PKG_CONFIG_PATH environment variable
---
 pkgs/by-name/fa/fastfetch/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index 705125a3f3bb..c9ba8fdeb022 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -17,6 +17,7 @@
   libpulseaudio,
   libselinux,
   libsepol,
+  libsysprof-capture,
   libxcb,
   makeBinaryWrapper,
   moltenvk,
@@ -103,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
           dbus
           dconf
           glib
+          libsysprof-capture
         ]
         ++ lib.optionals audioSupport [
           libpulseaudio

From e3cbcd67a72a9ff18b5f7e09e43847f2275cce1c Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <philipp.middendorf@desy.de>
Date: Wed, 30 Apr 2025 10:57:51 +0200
Subject: [PATCH 66/95] brigand: remove

The project hasn't had a release in three years, and I (pmiddend)
don't want to maintain the nixpkgs package anymore, and it fails on
-darwin.
---
 pkgs/by-name/br/brigand/package.nix | 31 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 pkgs/by-name/br/brigand/package.nix

diff --git a/pkgs/by-name/br/brigand/package.nix b/pkgs/by-name/br/brigand/package.nix
deleted file mode 100644
index d1cdee16f2e1..000000000000
--- a/pkgs/by-name/br/brigand/package.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-}:
-
-stdenv.mkDerivation {
-  pname = "brigand";
-  version = "1.3.0";
-
-  src = fetchFromGitHub {
-    owner = "edouarda";
-    repo = "brigand";
-    rev = "4db9f665b4ece31b51aaf35b499b2c8e5811efa3";
-    sha256 = "14b8r3s24zq0l3addy3irzxs5cyqn3763y5s310lmzzswgj1v7r4";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = with lib; {
-    description = "Instant compile time C++ 11 metaprogramming library";
-    longDescription = ''
-      Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library.
-      Everything you were doing with Boost.MPL can be done with Brigand. And if that's not the case, open an issue!'';
-    homepage = "https://github.com/edouarda/brigand";
-    license = licenses.boost;
-    maintainers = with maintainers; [ pmiddend ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 88f642fd6f50..b7835517fccb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -355,6 +355,7 @@ mapAliases {
   bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30
   bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17
   brasero-original = lib.warnOnInstantiate "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29
+  bridgand = throw "'brigand' has been removed due to being unmaintained"; # Added 2025-04-30
   bs-platform = throw "'bs-platform' was removed as it was broken, development ended and 'melange' has superseded it"; # Added 2024-07-29
   buf-language-server = throw "'buf-language-server' was removed as its development has moved to the 'buf' package"; # Added 2024-11-15
 

From 2ed7111217a030dbff823e8286ffac448f6ff073 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 11:03:10 +0000
Subject: [PATCH 67/95] codebook: 0.2.10 -> 0.2.12

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

diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix
index cb03a2915dc3..5349e6e835cb 100644
--- a/pkgs/by-name/co/codebook/package.nix
+++ b/pkgs/by-name/co/codebook/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codebook";
-  version = "0.2.10";
+  version = "0.2.12";
 
   src = fetchFromGitHub {
     owner = "blopker";
     repo = "codebook";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LH5/xMbmHo0vBlPnNTsj3iX6gvBp9PFGZcAy999402E=";
+    hash = "sha256-MGyyN7lq0CpR4F0Ew+ve+KS8OnVFh8sUHQmXTIjh+Ok=";
   };
 
   buildAndTestSubdir = "crates/codebook-lsp";
-  cargoHash = "sha256-EbcG99T0T5Hh7bRI5I3gf9qBiOcnl0EoCtVIfcJHeJg=";
+  cargoHash = "sha256-ry0cHP0NUa9vi7dYuJlgg75ktUeZp3dr9KHQIt8OOK0=";
 
   nativeBuildInputs = [
     pkg-config

From 73ce644ae77ed487fdfb7f9ca1f4aeb77a528bd8 Mon Sep 17 00:00:00 2001
From: amesgen <amesgen@amesgen.de>
Date: Fri, 18 Apr 2025 23:10:27 +0200
Subject: [PATCH 68/95] compactor: fix tests with newer cbor-diag

---
 .../networking/compactor/default.nix          |  3 +
 .../update-golden-cbor2diag-output.patch      | 57 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/applications/networking/compactor/patches/update-golden-cbor2diag-output.patch

diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix
index f729420cee65..b137309458a9 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/pkgs/applications/networking/compactor/default.nix
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./patches/add-a-space-after-type-in-check-response-opt-sh.patch
+
+    # https://github.com/dns-stats/compactor/pull/91
+    ./patches/update-golden-cbor2diag-output.patch
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/compactor/patches/update-golden-cbor2diag-output.patch b/pkgs/applications/networking/compactor/patches/update-golden-cbor2diag-output.patch
new file mode 100644
index 000000000000..49d447c8ce0d
--- /dev/null
+++ b/pkgs/applications/networking/compactor/patches/update-golden-cbor2diag-output.patch
@@ -0,0 +1,57 @@
+From 7b6a93aa669f090952d2def77aaa05e685d0e094 Mon Sep 17 00:00:00 2001
+From: amesgen <amesgen@amesgen.de>
+Date: Fri, 18 Apr 2025 22:58:52 +0200
+Subject: [PATCH] Update golden cbor2diag output for newer versions
+
+Tested with cbor-diag 0.9.6
+---
+ test-scripts/addressprefix.diag                | 2 +-
+ test-scripts/testcontent-endtime.diag          | 2 +-
+ test-scripts/testcontent-exclude-sig.diag      | 2 +-
+ test-scripts/testcontent-exclude-sigflags.diag | 2 +-
+ test-scripts/testcontent-exclude.diag          | 2 +-
+ test-scripts/testcontent.diag                  | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test-scripts/addressprefix.diag b/test-scripts/addressprefix.diag
+index cf7eee3..d02abb9 100644
+--- a/test-scripts/addressprefix.diag
++++ b/test-scripts/addressprefix.diag
+@@ -1 +1 @@
+-["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {0: 1000000, 1: 5000, 2: {0: 261119, 1: 131071, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769], 6: 16, 7: 18, 8: 24, 9: 22}, 1: {0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [{0: {0: [1459884804, 561484]}, 1: {0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {0: [h'D34F7B', h'56ED', h'3249EC', h'3249C0'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {}, 12: {2: 0, 3: 1}}, {0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {}, 12: {2: 2, 3: 1}}]}]]
++["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {_ 0: 1000000, 1: 5000, 2: {0: 261119, 1: 131071, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769], 6: 16, 7: 18, 8: 24, 9: 22}, 1: {_ 0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [_ {_ 0: {0: [1459884804, 561484]}, 1: {_ 0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {_ 0: [h'D34F7B', h'56ED', h'3249EC', h'3249C0'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{_ 0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {_ }, 12: {_ 2: 0, 3: 1}}, {_ 0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {_ }, 12: {_ 2: 2, 3: 1}}]}]]
+diff --git a/test-scripts/testcontent-endtime.diag b/test-scripts/testcontent-endtime.diag
+index ba9dedc..10f5a0d 100644
+--- a/test-scripts/testcontent-endtime.diag
++++ b/test-scripts/testcontent-endtime.diag
+@@ -1 +1 @@
+-["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {0: 1000000, 1: 5000, 2: {0: 261119, 1: 131071, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [{0: {0: [1459884804, 561484], -1: [1459884804, 667820], -2: [1459884804, 561484]}, 1: {0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {0: [h'D34F7BEF', h'56EDAABC', h'3249EDC5124BE8C51248E8C51248E847', h'3249ED7D124BF9C31248E8C512EFE8C5'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {}, 12: {2: 0, 3: 1}}, {0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {}, 12: {2: 2, 3: 1}}]}]]
++["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {_ 0: 1000000, 1: 5000, 2: {0: 261119, 1: 131071, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {_ 0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [_ {_ 0: {0: [1459884804, 561484], -1: [1459884804, 667820], -2: [1459884804, 561484]}, 1: {_ 0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {_ 0: [h'D34F7BEF', h'56EDAABC', h'3249EDC5124BE8C51248E8C51248E847', h'3249ED7D124BF9C31248E8C512EFE8C5'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{_ 0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {_ }, 12: {_ 2: 0, 3: 1}}, {_ 0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {_ }, 12: {_ 2: 2, 3: 1}}]}]]
+diff --git a/test-scripts/testcontent-exclude-sig.diag b/test-scripts/testcontent-exclude-sig.diag
+index 77bfcc4..edab5a8 100644
+--- a/test-scripts/testcontent-exclude-sig.diag
++++ b/test-scripts/testcontent-exclude-sig.diag
+@@ -1 +1 @@
+-["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {0: 1000000, 1: 5000, 2: {0: 261113, 1: 0, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [{0: {0: [1459884804, 561484]}, 1: {0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 1, 2: 86400, 3: 2}, {0: 1, 2: 86400, 3: 3}, {0: 1, 2: 86400, 3: 4}, {0: 1, 2: 86400, 3: 5}, {0: 1, 2: 32768, 3: 6}, {0: 8, 2: 86400, 3: 9}, {0: 8, 2: 86400, 3: 10}]}, 3: [{0: 0, 3: 61888, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {}, 12: {2: 0, 3: 1}}, {0: 106336, 3: 11414, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {}, 12: {2: 2, 3: 1}}]}]]
++["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {_ 0: 1000000, 1: 5000, 2: {0: 261113, 1: 0, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {_ 0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [_ {_ 0: {0: [1459884804, 561484]}, 1: {_ 0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {_ 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 1, 2: 86400, 3: 2}, {0: 1, 2: 86400, 3: 3}, {0: 1, 2: 86400, 3: 4}, {0: 1, 2: 86400, 3: 5}, {0: 1, 2: 32768, 3: 6}, {0: 8, 2: 86400, 3: 9}, {0: 8, 2: 86400, 3: 10}]}, 3: [{_ 0: 0, 3: 61888, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {_ }, 12: {_ 2: 0, 3: 1}}, {_ 0: 106336, 3: 11414, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {_ }, 12: {_ 2: 2, 3: 1}}]}]]
+diff --git a/test-scripts/testcontent-exclude-sigflags.diag b/test-scripts/testcontent-exclude-sigflags.diag
+index a0bd5c9..d508f0c 100644
+--- a/test-scripts/testcontent-exclude-sigflags.diag
++++ b/test-scripts/testcontent-exclude-sigflags.diag
+@@ -1 +1 @@
+-["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {0: 1000000, 1: 5000, 2: {0: 261119, 1: 131055, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [{0: {0: [1459884804, 561484]}, 1: {0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {0: [h'D34F7BEF', h'56EDAABC', h'3249EDC5124BE8C51248E8C51248E847', h'3249ED7D124BF9C31248E8C512EFE8C5'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {}, 12: {2: 0, 3: 1}}, {0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {}, 12: {2: 2, 3: 1}}]}]]
++["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {_ 0: 1000000, 1: 5000, 2: {0: 261119, 1: 131055, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {_ 0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [_ {_ 0: {0: [1459884804, 561484]}, 1: {_ 0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {_ 0: [h'D34F7BEF', h'56EDAABC', h'3249EDC5124BE8C51248E8C51248E847', h'3249ED7D124BF9C31248E8C512EFE8C5'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{_ 0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {_ }, 12: {_ 2: 0, 3: 1}}, {_ 0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {_ }, 12: {_ 2: 2, 3: 1}}]}]]
+diff --git a/test-scripts/testcontent-exclude.diag b/test-scripts/testcontent-exclude.diag
+index c6ba34c..6bb1dad 100644
+--- a/test-scripts/testcontent-exclude.diag
++++ b/test-scripts/testcontent-exclude.diag
+@@ -1 +1 @@
+-["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {0: 1000000, 1: 5000, 2: {0: 261113, 1: 131068, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [{0: {0: [1459884804, 561484]}, 1: {0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{0: 0, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {}, 12: {2: 0, 3: 1}}, {0: 106336, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {}, 12: {2: 2, 3: 1}}]}]]
++["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {_ 0: 1000000, 1: 5000, 2: {0: 261113, 1: 131068, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {_ 0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [_ {_ 0: {0: [1459884804, 561484]}, 1: {_ 0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {_ 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{_ 0: 0, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {_ }, 12: {_ 2: 0, 3: 1}}, {_ 0: 106336, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {_ }, 12: {_ 2: 2, 3: 1}}]}]]
+diff --git a/test-scripts/testcontent.diag b/test-scripts/testcontent.diag
+index ba2d73c..dffcbf2 100644
+--- a/test-scripts/testcontent.diag
++++ b/test-scripts/testcontent.diag
+@@ -1 +1 @@
+-["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {0: 1000000, 1: 5000, 2: {0: 261119, 1: 131071, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [{0: {0: [1459884804, 561484]}, 1: {0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {0: [h'D34F7BEF', h'56EDAABC', h'3249EDC5124BE8C51248E8C51248E847', h'3249ED7D124BF9C31248E8C512EFE8C5'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {}, 12: {2: 0, 3: 1}}, {0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {}, 12: {2: 2, 3: 1}}]}]]
++["C-DNS", {0: 1, 1: 0, 2: 3, 3: [{0: {_ 0: 1000000, 1: 5000, 2: {0: 261119, 1: 131071, 2: 3, 3: 2}, 3: [0, 1, 2, 4, 5, 6], 4: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 249, 250, 251, 252, 253, 254, 255, 256, 257, 32768, 32769]}, 1: {_ 0: 5000, 1: 10, 2: 65535, -1: 53, 3: false}}]}, [_ {_ 0: {0: [1459884804, 561484]}, 1: {_ 0: 4, 1: 2, 2: 0, 3: 0, 4: 0, 5: 0, -1: 0, -2: 0, -3: 0, -4: 0, -5: 0, -6: 4, -7: 0, -8: 0, -9: 0, -10: 0, -11: 0, -12: 0}, 2: {_ 0: [h'D34F7BEF', h'56EDAABC', h'3249EDC5124BE8C51248E8C51248E847', h'3249ED7D124BF9C31248E8C512EFE8C5'], 1: [{0: 33, 1: 1}, {0: 6, 1: 1}, {0: 47, 1: 1}, {0: 46, 1: 1}, {0: 41, 1: 4096}], 2: [h'0D787473736B6235716F6E38736E095F6B65726265726F73045F7463700454455643065F7369746573026463065F6D73646373033137320232300332323202333800', h'', h'00', h'01610C726F6F742D73657276657273036E657400056E73746C640C766572697369676E2D67727303636F6D00782A5635000007080000038400093A8000015180', h'0361616100000722000000000380', h'000608000001518057111E105703E100ECC700175967286EA01D5D4B17984E4CFFC5F127BD4B1FE2A6E0370964601BB48219C765B07A73A94BC7AECBB5A5109F6F54A6A2F22BFF941076D4907643713B1FE0B56729EE03AE996A50AB7CA2BAA76C428CF461AA7FAAFC7C8BF696A6D0BF0F40FAD9C30627F647CCF88F47792C956291CB664ADCF0B408DAAB4CC23EF1555E481C', h'002F08000001518057111E105703E100ECC700830A7ECE23A7B84C70EDAAFD7B83A2BAF364EDD911BB5A731C3E59704510E39FA22AD4D8F69576146946C4403041D8BB198E8AABE505FBA7B55D3E4ECC829383A8FC16BD1836CBBAC59BD13093298070351B16CB57D7AE5E7A509F61E7F315210EB256DAF15C7850788A9B274A59209A8F8767CE99E3EA4CDA680D26FCE8EFA4', h'0C434F3830314D3138303139310D617A636F7272656374696F6E73056C6F63616C00', h'056C6F616E7300', h'056C6F637573000006200000000013', h'002F08010001518057111E105703E100ECC7009F55028A381F5B450951FE3B410E4CD06B9E9F765C2634D28BC928208730FCFE40876118FDC17267D6270EDA32163C0FD055987715A9EC2BCE30A60954975814E5E927376C5368CE6BFDFCCB185AD830BF2C26A1E46154C58A07CE36F434991AE8DDB6821D39C1DA7C63444EA17178049B3E5E1559D4217A2A48052AAC57467A'], 3: [{0: 0, 1: 53, 2: 32, 6: 16512, 4: 15, 9: 1, 8: 0, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}, {0: 2, 1: 53, 2: 1, 6: 16512, 4: 15, 9: 1, 8: 1, 7: 0, 5: 0, 10: 0, 12: 1, 11: 0, 13: 0, 14: 4096, 15: 1, 16: 3}], 6: [[0, 1, 2, 3], [4], [0, 5, 1, 2, 6, 3]], 7: [{0: 2, 1: 1, 2: 86400, 3: 3}, {0: 2, 1: 2, 2: 86400, 3: 4}, {0: 2, 1: 3, 2: 86400, 3: 5}, {0: 2, 1: 3, 2: 86400, 3: 6}, {0: 2, 1: 4, 2: 32768, 3: 1}, {0: 8, 1: 2, 2: 86400, 3: 9}, {0: 8, 1: 3, 2: 86400, 3: 10}]}, 3: [{_ 0: 0, 1: 1, 2: 51644, 3: 61888, 4: 0, 5: 52, 6: 90, 7: 0, 8: 97, 9: 509, 11: {_ }, 12: {_ 2: 0, 3: 1}}, {_ 0: 106336, 1: 3, 2: 47686, 3: 11414, 4: 1, 5: 59, 6: 96, 7: 7, 8: 61, 9: 668, 11: {_ }, 12: {_ 2: 2, 3: 1}}]}]]

From 7561a1ec8d11733762cfe57e108793f3498e29dd Mon Sep 17 00:00:00 2001
From: Juul-Mc-Goa <jules.magois.pro@proton.me>
Date: Thu, 1 May 2025 13:40:08 +0200
Subject: [PATCH 69/95] libdjinterop: 0.22.1 -> 0.24.3

Required when updating mixxx.
---
 pkgs/by-name/li/libdjinterop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libdjinterop/package.nix b/pkgs/by-name/li/libdjinterop/package.nix
index 0b514a34a209..c5a6c7d76f78 100644
--- a/pkgs/by-name/li/libdjinterop/package.nix
+++ b/pkgs/by-name/li/libdjinterop/package.nix
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "xsco";
     repo = "libdjinterop";
-    rev = "0.22.1";
-    hash = "sha256-x0GbuUDmx8ooiaD/8J5VvIG239d5uDdK5H1tnwHd62c=";
+    rev = "0.24.3";
+    hash = "sha256-Fp7AwEOq2JOpL60GDAXmA15ptFeLoG79nnnPXHl1Hjw=";
   };
 
   nativeBuildInputs = [

From eebe42d6ba0b098315ff255b8be79d1baafc77a7 Mon Sep 17 00:00:00 2001
From: Rishik Yalamanchili <73787402+Rishik-Y@users.noreply.github.com>
Date: Sat, 15 Mar 2025 02:06:18 +0530
Subject: [PATCH 70/95] xdg-desktop-portal-luminous: init at 0.1.8

---
 .../xdg-desktop-portal-luminous/package.nix   | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/xd/xdg-desktop-portal-luminous/package.nix

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-luminous/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-luminous/package.nix
new file mode 100644
index 000000000000..94555e6178e4
--- /dev/null
+++ b/pkgs/by-name/xd/xdg-desktop-portal-luminous/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  meson,
+  ninja,
+  rustc,
+  cargo,
+  rustPlatform,
+  xdg-desktop-portal,
+  slurp,
+  cairo,
+  pango,
+  libxkbcommon,
+  glib,
+  pipewire,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xdg-desktop-portal-luminous";
+  version = "0.1.8";
+
+  src = fetchFromGitHub {
+    owner = "waycrate";
+    repo = "xdg-desktop-portal-luminous";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-7i6+arKWubziDmy07FocDDiJdOWAszhO7yOOI1iPfds=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-fatlvc+MoAJZGW/5alnDu1PQyK6mnE0aNQAhrMg7Hio=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    meson
+    ninja
+    rustc
+    cargo
+    rustPlatform.cargoSetupHook
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [
+    xdg-desktop-portal
+    slurp
+    cairo
+    pango
+    glib
+    pipewire
+    libxkbcommon
+  ];
+
+  meta = {
+    description = "xdg-desktop-portal backend for wlroots based compositors, providing screenshot and screencast";
+    homepage = "https://github.com/waycrate/xdg-desktop-portal-luminous";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ Rishik-Y ];
+  };
+})

From 5b779fab1effb31ad2b9c588ff12aa75039234d7 Mon Sep 17 00:00:00 2001
From: Juul-Mc-Goa <jules.magois.pro@proton.me>
Date: Thu, 1 May 2025 13:44:47 +0200
Subject: [PATCH 71/95] mixxx: 2.5.0 -> specific commit

Pin mixxx to the commit solving the build issue. Add a cmake flag.
---
 pkgs/applications/audio/mixxx/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 8c9022df6eca..3c22cdbe3ffe 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -62,8 +62,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mixxxdj";
     repo = "mixxx";
-    rev = version;
-    hash = "sha256-1ZE2hVwacZve0+IOQs+htK/kl7zFsOWkh/KcrnI6u/M=";
+    rev = "9e3f9bfbac5c6fde7c4ee5fed2b550aa62060a95";
+    hash = "sha256-9z4UqmXR/n1CCr1/YzTNl5SdRgbZgN/i1JNfA4TLaXU=";
   };
 
   nativeBuildInputs = [
@@ -130,6 +130,8 @@ stdenv.mkDerivation rec {
   # see https://github.com/mixxxdj/mixxx/blob/2.3.5/CMakeLists.txt#L1381-L1392
   cmakeFlags = [
     "-DINSTALL_USER_UDEV_RULES=OFF"
+    # "BUILD_TESTING=OFF" must imply "BUILD_BENCH=OFF"
+    "-DBUILD_BENCH=OFF"
   ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''

From bf1d1baa2754a4150cbcadc2d62b1cccad2cff01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Chocholat=C3=BD?= <chocholaty.david@protonmail.com>
Date: Thu, 1 May 2025 14:46:34 +0200
Subject: [PATCH 72/95] jjui: 0.8.5 -> 0.8.6

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

diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix
index 0dbc5aa5f388..76c02626e770 100644
--- a/pkgs/by-name/jj/jjui/package.nix
+++ b/pkgs/by-name/jj/jjui/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "jjui";
-  version = "0.8.5";
+  version = "0.8.6";
 
   src = fetchFromGitHub {
     owner = "idursun";
     repo = "jjui";
     tag = "v${version}";
-    hash = "sha256-2M69r3r4VeESymiJzLr2tfKBsmTcAZJsCLEYQkRKoMw=";
+    hash = "sha256-FfodDPHMNiB4vh+v+m2k6x9o82idHM68Os9OuXpyVGY=";
   };
 
   vendorHash = "sha256-YlOK+NvyH/3uvvFcCZixv2+Y2m26TP8+ohUSdl3ppro=";

From cc54c77b73c591d4fc8e3975868c9be14d7bea54 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Thu, 1 May 2025 08:58:14 -0300
Subject: [PATCH 73/95] munin: add darwin to platforms

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

diff --git a/pkgs/by-name/mu/munin/package.nix b/pkgs/by-name/mu/munin/package.nix
index 637d95af89f7..fdf82910c6dc 100644
--- a/pkgs/by-name/mu/munin/package.nix
+++ b/pkgs/by-name/mu/munin/package.nix
@@ -175,6 +175,6 @@ stdenv.mkDerivation rec {
     homepage = "https://munin-monitoring.org/";
     license = licenses.gpl2Only;
     maintainers = [ maintainers.bjornfor ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From c741f94abfe65087e4e2b50cd019f4aa4fcc9a34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 12:49:31 +0000
Subject: [PATCH 74/95] basex: 11.8 -> 11.9

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

diff --git a/pkgs/by-name/ba/basex/package.nix b/pkgs/by-name/ba/basex/package.nix
index b52de9c4c210..ef9457d06651 100644
--- a/pkgs/by-name/ba/basex/package.nix
+++ b/pkgs/by-name/ba/basex/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "basex";
-  version = "11.8";
+  version = "11.9";
 
   src = fetchurl {
     url = "http://files.basex.org/releases/${version}/BaseX${
       builtins.replaceStrings [ "." ] [ "" ] version
     }.zip";
-    hash = "sha256-bzRsKKwOWbXfgbJ51VX3ND9tf+CO3lpB10hw032oJyM=";
+    hash = "sha256-55bZL/ogND4/X8ysMUC67C8AVv3eBWTm3iKfyR7bPVM=";
   };
 
   nativeBuildInputs = [

From b524ef1319816fbe7a13ba570c494907b1faff1a Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 30 Apr 2025 23:19:45 -0500
Subject: [PATCH 75/95] fastfetchMinimal: init at 2.42.0

Fasfetch package with all the feature flags disabled.
---
 pkgs/by-name/fa/fastfetchMinimal/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 pkgs/by-name/fa/fastfetchMinimal/package.nix

diff --git a/pkgs/by-name/fa/fastfetchMinimal/package.nix b/pkgs/by-name/fa/fastfetchMinimal/package.nix
new file mode 100644
index 000000000000..a8cce7333af7
--- /dev/null
+++ b/pkgs/by-name/fa/fastfetchMinimal/package.nix
@@ -0,0 +1,13 @@
+{ fastfetch }:
+fastfetch.override {
+  audioSupport = false;
+  flashfetchSupport = false;
+  gnomeSupport = false;
+  imageSupport = false;
+  openclSupport = false;
+  rpmSupport = false;
+  sqliteSupport = false;
+  vulkanSupport = false;
+  waylandSupport = false;
+  x11Support = false;
+}

From 2aa5d26c1a698ca3e0cd70af408c7b29903e4deb Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 1 May 2025 13:05:58 +0000
Subject: [PATCH 76/95] consul: 1.20.5 -> 1.20.6

https://github.com/hashicorp/consul/releases/tag/v1.20.6
---
 pkgs/by-name/co/consul/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix
index 89ba5a817b3b..7c74fb0ec6e0 100644
--- a/pkgs/by-name/co/consul/package.nix
+++ b/pkgs/by-name/co/consul/package.nix
@@ -8,7 +8,7 @@
 
 buildGoModule rec {
   pname = "consul";
-  version = "1.20.5";
+  version = "1.20.6";
 
   # Note: Currently only release tags are supported, because they have the Consul UI
   # vendored. See
@@ -22,7 +22,7 @@ buildGoModule rec {
     owner = "hashicorp";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-dBx/WHi+qFrOyA0lIjvARcAZ96WvHCjVs94XicSL5L0=";
+    hash = "sha256-R7Bf3hmkn+b6SOxAhy4pFUuyDbywBcOdEB+/M2IeFA8=";
   };
 
   # This corresponds to paths with package main - normally unneeded but consul
@@ -32,7 +32,7 @@ buildGoModule rec {
     "connect/certgen"
   ];
 
-  vendorHash = "sha256-rQDVXMLXI2/D4SNLfs3CT4chDnzhh1aU5xuMMBDMhLI=";
+  vendorHash = "sha256-SHTwfwMHQOnqr0LOb2xxS261qZVVpUnxgl/Tdb0Rmv4=";
 
   doCheck = false;
 

From a313bb52817ffffa6546042ea7b546f0db28b046 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 13:52:44 +0000
Subject: [PATCH 77/95] xreader: 4.2.5 -> 4.2.6

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

diff --git a/pkgs/by-name/xr/xreader/package.nix b/pkgs/by-name/xr/xreader/package.nix
index 1f5d38b94b59..bd3bdfacf302 100644
--- a/pkgs/by-name/xr/xreader/package.nix
+++ b/pkgs/by-name/xr/xreader/package.nix
@@ -36,13 +36,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xreader";
-  version = "4.2.5";
+  version = "4.2.6";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-4riTLU8ElWxxnigNAhmAv+7m1fNneDLCgS2Tj1V0UNk=";
+    hash = "sha256-ELqO8pYMWgU6DUS5vg+F+xFp3w3H6u0Jzms3xaNlTqE=";
   };
 
   nativeBuildInputs = [

From 5b4f88574c7764d44f0f47a28b92951b76f579c2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 2 May 2025 00:13:33 +1000
Subject: [PATCH 78/95] mergiraf: 0.6.0 -> 0.7.0 (#403299)

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

diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix
index c354e7effd6e..74778e2bfb48 100644
--- a/pkgs/by-name/me/mergiraf/package.nix
+++ b/pkgs/by-name/me/mergiraf/package.nix
@@ -11,18 +11,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mergiraf";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "mergiraf";
     repo = "mergiraf";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1GiXGwNgJvA3uftLu2nWa2/Tp/koCybr2r/MXkJR6hk=";
+    hash = "sha256-6psvTt0r+s5GuPpy1PwdvnUJ8n+lfvC2lWfMYzMvUkg=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-+qnaxWkh0ZOi4gKSLHxSeFDMmJsUM9PHL7jaH3+6OhY=";
+  cargoHash = "sha256-IJ/ywVDHMdd37/jCLzkYyBNVEow9sdK6iSDHlCZXKK0=";
 
   nativeCheckInputs = [
     git

From ee4f1a853f128fc96035152a0a006a40848de182 Mon Sep 17 00:00:00 2001
From: nagymathev <nagymathev@gmail.com>
Date: Sat, 15 Feb 2025 20:52:23 +0100
Subject: [PATCH 79/95] ftb-app: init at 1.27.2

ftb-app: remove darwin support

ftb-app: formatting
---
 pkgs/by-name/ft/ftb-app/package.nix | 64 +++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 pkgs/by-name/ft/ftb-app/package.nix

diff --git a/pkgs/by-name/ft/ftb-app/package.nix b/pkgs/by-name/ft/ftb-app/package.nix
new file mode 100644
index 000000000000..f64787188cb4
--- /dev/null
+++ b/pkgs/by-name/ft/ftb-app/package.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  appimageTools,
+  nix-update-script,
+}:
+let
+  pname = "ftb-app";
+  version = "1.27.2";
+
+  src =
+    let
+      src' =
+        {
+          aarch64-linux = {
+            url = "https://piston.feed-the-beast.com/app/ftb-app-linux-${version}-arm64.AppImage";
+            hash = "sha256-il7DIY1c5TDmRSzc86BTOCn4P20P3Wd4STkLGyFm2+c=";
+          };
+          x86_64-linux = {
+            url = "https://piston.feed-the-beast.com/app/ftb-app-linux-${version}-x86_64.AppImage";
+            hash = "sha256-35GEI1OBvVkUvHvQAzzGz8ux9h+5W3acH0Wr5VkqyBw=";
+          };
+        }
+        .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+    in
+    fetchurl src';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Feed the Beast desktop app";
+    homepage = "https://www.feed-the-beast.com/ftb-app";
+    changelog = "https://www.feed-the-beast.com/ftb-app/changes#${version}";
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [ nagymathev ];
+    mainProgram = "ftb-app"; # This might need a change for darwin
+    platforms = with lib.platforms; linux;
+  };
+in
+let
+  appimageContents = appimageTools.extractType2 { inherit pname src version; };
+in
+appimageTools.wrapType2 {
+  inherit
+    pname
+    src
+    version
+    passthru
+    meta
+    ;
+
+  extraInstallCommands = ''
+    for size in 16x16 32x32 48x48 64x64 128x128 256x256 512x512; do
+      install -Dm644 ${appimageContents}/usr/share/icons/hicolor/$size/apps/ftb-app.png \
+        $out/share/icons/hicolor/$size/apps/ftb-app.png
+    done
+
+    install -Dm644 ${appimageContents}/ftb-app.desktop \
+      $out/share/applications/ftb-app.desktop
+    substituteInPlace $out/share/applications/ftb-app.desktop \
+      --replace-fail 'Exec=AppRun' 'Exec=ftb-app'
+  '';
+}

From 582c55b7c414d199687160bf61d49a31e57eb67a Mon Sep 17 00:00:00 2001
From: nagymathev <nagymathev@gmail.com>
Date: Sat, 15 Feb 2025 23:28:56 +0100
Subject: [PATCH 80/95] maintainers: add nagymathev

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 12acd1644d27..e0fb1ab74f7d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16013,6 +16013,12 @@
     name = "Daniel Nagy";
     keys = [ { fingerprint = "F6AE 2C60 9196 A1BC ECD8  7108 1B8E 8DCB 576F B671"; } ];
   };
+  nagymathev = {
+    name = "Viktor Nagymathe";
+    email = "nagymathev@gmail.com";
+    github = "nagymathev";
+    githubId = 49335802;
+  };
   naho = {
     github = "trueNAHO";
     githubId = 90870942;

From 90da7eb1bc0c3842ebee1e2ce9f379431bc3f898 Mon Sep 17 00:00:00 2001
From: Hugo Lageneste <hugo.lageneste@pm.me>
Date: Sat, 26 Apr 2025 12:55:05 +0200
Subject: [PATCH 81/95] pkl: init at 0.28.2

---
 pkgs/by-name/pk/pkl/deps.json                 | 1495 +++++++++++++++++
 pkgs/by-name/pk/pkl/disable_bad_tests.patch   |   12 +
 .../pk/pkl/disable_gradle_codegen_tests.patch |   65 +
 .../by-name/pk/pkl/fix_kotlin_classpath.patch |   14 +
 pkgs/by-name/pk/pkl/package.nix               |  101 ++
 5 files changed, 1687 insertions(+)
 create mode 100644 pkgs/by-name/pk/pkl/deps.json
 create mode 100644 pkgs/by-name/pk/pkl/disable_bad_tests.patch
 create mode 100644 pkgs/by-name/pk/pkl/disable_gradle_codegen_tests.patch
 create mode 100644 pkgs/by-name/pk/pkl/fix_kotlin_classpath.patch
 create mode 100644 pkgs/by-name/pk/pkl/package.nix

diff --git a/pkgs/by-name/pk/pkl/deps.json b/pkgs/by-name/pk/pkl/deps.json
new file mode 100644
index 000000000000..af9adaa00978
--- /dev/null
+++ b/pkgs/by-name/pk/pkl/deps.json
@@ -0,0 +1,1495 @@
+{
+  "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+  "!version": 1,
+  "https://plugins.gradle.org/m2": {
+    "com/github/johnrengelman#shadow/8.1.1": {
+      "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=",
+      "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=",
+      "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU="
+    },
+    "gradle/plugin/org/gradle/crypto#checksum/1.4.0": {
+      "jar": "sha256-GZuCZMulLIpIqibHExIveIFOPB6AGmrwsgoaUdXFsJQ=",
+      "pom": "sha256-9JIlgzqyRZYjC9qx+OQyOJFVNx9h7MBLiRUbL/AydBk="
+    },
+    "gradle/plugin/org/jetbrains/gradle/plugin/idea-ext#gradle-idea-ext/1.1.9": {
+      "jar": "sha256-581IH2xEr1PReSD/VQU256P5SjGC6b0euN+Udy3E6Ow=",
+      "pom": "sha256-FOT6q6pDC/wzpuk92vzIj1Ct88uGb/RXzqqClJEVNcc="
+    },
+    "io/github/gradle-nexus#publish-plugin/2.0.0": {
+      "jar": "sha256-lCwaFtFh9kYxkBtOLa1UHS/L/lHPAyOVXavgLiqe8qo=",
+      "module": "sha256-4T/01uEPKDtihxA8mC8Ha9YZ4qRh+znBbUTR0V1x6Pc=",
+      "pom": "sha256-V4e4+lvBAqYRbTWnztW7vPEZ/XJgQxs3kXPuNQU5rQk="
+    },
+    "io/github/gradle-nexus/publish-plugin#io.github.gradle-nexus.publish-plugin.gradle.plugin/2.0.0": {
+      "pom": "sha256-oymrlfS/3VyJEIPK06uzB0H9xroLspsRUqgP4KadYu8="
+    },
+    "me/champeau/jmh#jmh-gradle-plugin/0.7.2": {
+      "jar": "sha256-2Wcgmf+Pw/m/PU0BWGThWG8H7L0qihd6ZhhO8LaKumU=",
+      "module": "sha256-bYSa50VKs5Fxjl/HDicWQY7z7SZEcjRb2Axt5k4AtsQ=",
+      "pom": "sha256-FdkdAH98O7wCJseQSM3cRf/BJPoegAgu//jhAwxoSg8="
+    },
+    "me/champeau/jmh#me.champeau.jmh.gradle.plugin/0.7.2": {
+      "pom": "sha256-V+DCOsYJRa77WgxKkzm+poopU2TKR8epB5oDL3kBOrs="
+    },
+    "org/gradle/crypto/checksum#org.gradle.crypto.checksum.gradle.plugin/1.4.0": {
+      "pom": "sha256-HzWQYt4QGbCRu7QhGghr4U0xCMX2mXisy9AbZRUFN0w="
+    },
+    "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.2.0": {
+      "jar": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=",
+      "module": "sha256-fxo3x8yLU7tmBAqrbAacidiqWOJ/+nH3s2HGROtaD7A=",
+      "pom": "sha256-uB9ZcQ4lOEW0+Pbe27BWPWfD5/UPg7AiQZXjo2GAtH8="
+    },
+    "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0": {
+      "pom": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc="
+    },
+    "org/gradle/toolchains#foojay-resolver/0.8.0": {
+      "jar": "sha256-+Q5pNRY46QueyYSOdZ0hhjWQfAklQRkRUAN7CyLlFAw=",
+      "module": "sha256-jDzPVNoHLGSkDgaIKqplIzbLKe7C6iMPBtaEOrs4TVE=",
+      "pom": "sha256-pxZyrK0MCu4576V1P1yU+aSjWh2sBl4ii8rDQt6nxUg="
+    },
+    "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.8.0": {
+      "pom": "sha256-O2ciN72cwejoyobvWnkgpnj2nQTS9L+9DFouedRcXLU="
+    },
+    "org/jetbrains/gradle/plugin/idea-ext#org.jetbrains.gradle.plugin.idea-ext.gradle.plugin/1.1.9": {
+      "pom": "sha256-6wJgv+4Rm/1Rks144nHJcBaqRUx54PxVPd2Gbym+vTw="
+    }
+  },
+  "https://repo.maven.apache.org/maven2": {
+    "com/diffplug/durian#durian-collect/1.2.0": {
+      "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=",
+      "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M="
+    },
+    "com/diffplug/durian#durian-core/1.2.0": {
+      "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=",
+      "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI="
+    },
+    "com/diffplug/durian#durian-io/1.2.0": {
+      "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=",
+      "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4="
+    },
+    "com/diffplug/durian#durian-swt.os/4.2.2": {
+      "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=",
+      "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=",
+      "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU="
+    },
+    "com/diffplug/spotless#spotless-lib-extra/2.45.0": {
+      "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=",
+      "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=",
+      "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A="
+    },
+    "com/diffplug/spotless#spotless-lib/2.45.0": {
+      "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=",
+      "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=",
+      "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw="
+    },
+    "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": {
+      "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=",
+      "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=",
+      "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo="
+    },
+    "com/ethlo/time#itu/1.10.3": {
+      "jar": "sha256-I9O6hAldSJpZUkD4kEUIXqUGb7b8HcCRJY1XffnXSrw=",
+      "pom": "sha256-shihqWmXfQEerG6Ttzo6uwuIQGMK0aHxbr//JOWIbXQ="
+    },
+    "com/fasterxml#oss-parent/48": {
+      "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8="
+    },
+    "com/fasterxml#oss-parent/58": {
+      "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA="
+    },
+    "com/fasterxml#oss-parent/61": {
+      "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ="
+    },
+    "com/fasterxml/jackson#jackson-base/2.18.2": {
+      "pom": "sha256-71dLcvW0iUgET2g3a4dMiK4JoCncjgX2Shwwvftt4Uo="
+    },
+    "com/fasterxml/jackson#jackson-bom/2.14.1": {
+      "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw="
+    },
+    "com/fasterxml/jackson#jackson-bom/2.17.2": {
+      "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI="
+    },
+    "com/fasterxml/jackson#jackson-bom/2.18.2": {
+      "pom": "sha256-UkfNwwFyXT9n9+8EkDconVr3CdaXK89LFwluRUjSlWs="
+    },
+    "com/fasterxml/jackson#jackson-parent/2.14": {
+      "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk="
+    },
+    "com/fasterxml/jackson#jackson-parent/2.17": {
+      "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0="
+    },
+    "com/fasterxml/jackson#jackson-parent/2.18.1": {
+      "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw="
+    },
+    "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-core/2.18.2": {
+      "jar": "sha256-2AVK58DRwtL1XSjkYCbr5YkogfP6tfQ5IzGEOBw7Sh8=",
+      "module": "sha256-ynjGBDZ2f8w2zhRrd05PUKnLn2MtExcsRLrojgwDz6I=",
+      "pom": "sha256-4GWwA50h9N/ORr1DEEx9dtWFa9cy4qqGDMWkonDtct4="
+    },
+    "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/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-dataformats-text/2.18.2": {
+      "pom": "sha256-4h1diLBHShG3H+lBAMT1KVv6F08u5q5LCtArdhZHhkg="
+    },
+    "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/module#jackson-modules-java8/2.18.2": {
+      "pom": "sha256-s6z7kQ0CPpOkGZr8zeH/nsX6sMVQ3E+WilBXEXrLCzY="
+    },
+    "com/github/ajalt/clikt#clikt-core-jvm/5.0.3": {
+      "jar": "sha256-acupSiKR90t4yII5zYtn6vPwjg2tKXdJq+ZHez6bgbE=",
+      "module": "sha256-dFtZmw9KoAz3AVYz429KVvJdGLy292htyrOxoRQZ3PE=",
+      "pom": "sha256-CPpCgzMVYwi9KLYyNih6MXIVLcu/ccgx4LOshiPl4XE="
+    },
+    "com/github/ajalt/clikt#clikt-core/5.0.3": {
+      "jar": "sha256-KeBaQXAKBp8NEHSOp9Xwyb8OFjbUsQNXPj98X3q7fDo=",
+      "module": "sha256-CmMddfhkwX5dYQBfYDwSaUtGcy3s1cOckU0pLQXo6zM=",
+      "pom": "sha256-wrBLaB6IqaGSgLZW2mBKIfLj4lUih2i4maaLoejuYBU="
+    },
+    "com/github/ajalt/clikt#clikt-jvm/5.0.3": {
+      "jar": "sha256-nNGeBHgvRh3/6xg9F+V2mE/rt5NJMstAZkasQeQohjs=",
+      "module": "sha256-nSm2J+l1mRLhJ+r7136GAYceul6qUthMgXUKiYIC8Xc=",
+      "pom": "sha256-CcAbsS0foX/hKcoSgvHpmpCAEbGDA5ptT8z2tclaTos="
+    },
+    "com/github/ajalt/clikt#clikt-markdown-jvm/5.0.3": {
+      "jar": "sha256-vLsmkGeKQ0w3YdkF/6Kgt0v6zmGmvu5rj7OrzNBASWg=",
+      "module": "sha256-7m5GD1rHh80CdvxU0fR/FkGPqThJfkiiiNWWh5HmE9M=",
+      "pom": "sha256-j65i2Z1IbZcvnPE8AYPoodAa1qZwJ+Kb7yxnJxV81VE="
+    },
+    "com/github/ajalt/clikt#clikt-markdown/5.0.3": {
+      "jar": "sha256-OVCM/Xz1fhXCfgKU8T5Q5ATSuUnsyxJkr3/T2Iwc0p0=",
+      "module": "sha256-Gugy8ma3VZkKEovS0iFDb8U087ENcqYtznZs1UDjm9o=",
+      "pom": "sha256-vlz5vmknfu7Yz1qiPziHX50MSm+DgGrpMbBasA8BCUM="
+    },
+    "com/github/ajalt/clikt#clikt/5.0.3": {
+      "jar": "sha256-qLzj6fI3DFVs1FG2AY5Yfu1LCfO3jr72SP2D874LgPw=",
+      "module": "sha256-vNNPHTxGfvq1FuoiqeeazD8SRJxIl/DF6sGCEnMizsY=",
+      "pom": "sha256-GwUigSeaOs6FY7svHtP1Khs9Rq15w9T2wzMjI+VzX9g="
+    },
+    "com/github/ajalt/colormath#colormath-jvm/3.6.0": {
+      "jar": "sha256-WfdBrf5iBTBmeC2LGkWv0GaFpLxkszJ35Uh2uZPtiFw=",
+      "module": "sha256-P6dnMPmJ4ChN8YL87IViDZtIrjIhOYhBrGyviEYvYvg=",
+      "pom": "sha256-8Dw11QURDQZzNF9HQOVbzZdqmp+lobE8qirTmPO8Hl0="
+    },
+    "com/github/ajalt/colormath#colormath/3.6.0": {
+      "jar": "sha256-49ox0EqJXlNfXQh2TM9fODQcQr99aNqW6h8ACfclmdY=",
+      "module": "sha256-aQeqSXrbmvY4EsdTZjic7T5ruL7oDnsjmttMU2c/iIQ=",
+      "pom": "sha256-zh3tjA259LxNNjS64Vn9jVu2qWDyzTuWoAyPDnnOZAs="
+    },
+    "com/github/ajalt/mordant#mordant-core-jvm/3.0.1": {
+      "jar": "sha256-nPm0bR9J8tbPJjVGKyncWeDCmx+y8IWzMSiIu+nHzTE=",
+      "module": "sha256-5HRMRxB05ezUFh9wcLRZTfAO8XivBEJlkF5e0c61rJI=",
+      "pom": "sha256-1Ylt5eNKnVarJ4Y5iyYHJLGB85zAUIy7Kh9+iGzSXYc="
+    },
+    "com/github/ajalt/mordant#mordant-core/3.0.1": {
+      "jar": "sha256-c/UXnY6U+FEUR18Zlo0WWURZTmszjbcciwv9sJUe6z4=",
+      "module": "sha256-BWl6xcBV8Uh2cJ/U6f1ejD0VphrHesVy+RZEmTKgjC8=",
+      "pom": "sha256-Ah3YAdKdWJlqDJv/ux8VHWkHytU20syNGnoHuck4UNo="
+    },
+    "com/github/ajalt/mordant#mordant-jvm-ffm-jvm/3.0.1": {
+      "jar": "sha256-IEHC9fe4cJWxFcsZFV7pJXRRhU0I5bhnEWW0O8fhFM8=",
+      "module": "sha256-iE1x/LfBAQrm11qoka5UqYmGEVSwfxIVzVRfDkg34V0=",
+      "pom": "sha256-azbnZhrYKN4DoomS2K6WJWzq3z/aEo+OxImo1lu7rFM="
+    },
+    "com/github/ajalt/mordant#mordant-jvm-ffm/3.0.1": {
+      "module": "sha256-2Frg+0n7bXFHibQ/MbVnUoybit+G0Ou5hpSkGpHgmmc=",
+      "pom": "sha256-/MzpL8GhnxYzgGhDyuVTLIx/2YSnkxRbb7y3iUpk/s0="
+    },
+    "com/github/ajalt/mordant#mordant-jvm-graal-ffi-jvm/3.0.1": {
+      "jar": "sha256-bdS+vBZK6s3azI+Y6Phx4A/SHOe8LrDRgjDqg73fyGo=",
+      "module": "sha256-DYGba/u8pO6XszB4ZoEpaQdmr/lI/ByDF4j04DSFOsM=",
+      "pom": "sha256-Cm95LxyTYJX4dGmR1k2os/+ECazeOUir5d4v1WiIeDo="
+    },
+    "com/github/ajalt/mordant#mordant-jvm-graal-ffi/3.0.1": {
+      "module": "sha256-qu/aIGckg7OwsmDdHvE0LOazTs6IutbfOa4bJgUMjAo=",
+      "pom": "sha256-VAicrH9XCzo84x3cCD+ORgs7ED62oXM8kUE1GgaLR/M="
+    },
+    "com/github/ajalt/mordant#mordant-jvm-jna-jvm/3.0.1": {
+      "jar": "sha256-QQY0QsiJGyd0U2qbh6UGKn/SDm8ZSZdMbacvSUctb00=",
+      "module": "sha256-eBcNkl07qnWGYvl2M2FjkN6Q1CoslON2PqpZBXY3jh4=",
+      "pom": "sha256-/hWoxktH4H8vmdiDKG5O+xR0YkVlh0ayVQ9vlohkX4A="
+    },
+    "com/github/ajalt/mordant#mordant-jvm-jna/3.0.1": {
+      "module": "sha256-cn+1FiNOi6/JJ5Xi7L0No4VNcjoWxphCrGGSC/WIebk=",
+      "pom": "sha256-xbxkikqeKmz3+dGAJMi/ZrIYCVDpPxYIODTHv/OqeGE="
+    },
+    "com/github/ajalt/mordant#mordant-jvm/3.0.1": {
+      "jar": "sha256-ntO5dvzMx42nRtSYZvqOu48QUwqTxUTqBCAlmmB92V4=",
+      "module": "sha256-peTyMSt69CDG2DLDA4kcGg2GN8z6WpTYnxFGxIZpgLo=",
+      "pom": "sha256-sAnaTDfbjhc2uEgrRPIJ2Cdx/xyNO9+UbraE07nOmWU="
+    },
+    "com/github/ajalt/mordant#mordant-markdown-jvm/3.0.1": {
+      "jar": "sha256-tiRG42KjhK3bnB3bpdc2C/7QAU9/8lZ+gVYGI+ouLg0=",
+      "module": "sha256-vVFEMapoiPpX3TZ64fXBfGd7ZLtTDYdiaoHmqbD2DII=",
+      "pom": "sha256-CTcnsaakYK6yzbTSXHsVIIbOxs9JCtQY8OAaZKqQuq0="
+    },
+    "com/github/ajalt/mordant#mordant-markdown/3.0.1": {
+      "jar": "sha256-Si/srE3DCUCL+3jNcQnBmmVFbIATk/mvv9PMwJW3rQk=",
+      "module": "sha256-EtkyhMfHBhsJKCKHmsPNfqdRHyYgCP0Vy2AepLdXowU=",
+      "pom": "sha256-6wdnhNOAGG4CtaSQhIkOH01xqs6YzA/D+Ma4tz3ecS4="
+    },
+    "com/github/ajalt/mordant#mordant/3.0.1": {
+      "jar": "sha256-CQmE0gJpL/70R+iN/ixjaTpd4pZw2ggxuGO8KE2hR+I=",
+      "module": "sha256-lJLcf2NgJt8ulCkim52Ae1d00uZBUQ2Qv4Kb0qyzthU=",
+      "pom": "sha256-BlK5t9Y0kro8J8ZIkANIZRxbKFdEAph7j+KqBUlqkaQ="
+    },
+    "com/github/jknack#handlebars-helpers/4.3.1": {
+      "jar": "sha256-VvCtTe+0RLA4pwio4NADaS3xuRK5EhlzanZN6I/3hnw=",
+      "pom": "sha256-AYv9plPb9sQZG3sF/k7+2KPY1w495wp77RsYim3ibNI="
+    },
+    "com/github/jknack#handlebars.java/4.3.1": {
+      "pom": "sha256-UECkDYFTRzveednE1O+4cSChaQ+uWFtYKAcH1DdCCZk="
+    },
+    "com/github/jknack#handlebars/4.3.1": {
+      "jar": "sha256-VCT9EukRzxW+/RY0G0bg4bxoGqYePLHAcMV+aNzNW70=",
+      "pom": "sha256-/DAp8kYk6YvWC1pGmSEPP1YKOUiTQpzQbMrYROj41BU="
+    },
+    "com/google/code/findbugs#jsr305/3.0.2": {
+      "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+      "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+    },
+    "com/google/code/gson#gson-parent/2.10.1": {
+      "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM="
+    },
+    "com/google/code/gson#gson-parent/2.8.9": {
+      "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s="
+    },
+    "com/google/code/gson#gson/2.10.1": {
+      "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=",
+      "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
+    },
+    "com/google/code/gson#gson/2.8.9": {
+      "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=",
+      "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4="
+    },
+    "com/google/errorprone#error_prone_annotations/2.18.0": {
+      "jar": "sha256-nmgUy3GBaYik/RsHqZOo8hu3BY1SLBYrHehJ4ZvqVK4=",
+      "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw="
+    },
+    "com/google/errorprone#error_prone_annotations/2.3.4": {
+      "jar": "sha256-uvfW6pfOYGxT4RtoVLpfLOfvXCTd3wr6GNEmC9JbACw=",
+      "pom": "sha256-EyZziktPfMrPYHuGahH7hRk+9g9qWUYRh85yZfm+W+0="
+    },
+    "com/google/errorprone#error_prone_annotations/2.36.0": {
+      "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=",
+      "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw="
+    },
+    "com/google/errorprone#error_prone_annotations/2.7.1": {
+      "jar": "sha256-zVJXwIokbPhiiBeuccuCK+GS75H2iByko/z/Tx3hz/M=",
+      "pom": "sha256-Mahy4RScXzqLwF+03kVeXqYI7PrRryIst2N8psdi7iU="
+    },
+    "com/google/errorprone#error_prone_parent/2.18.0": {
+      "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60="
+    },
+    "com/google/errorprone#error_prone_parent/2.3.4": {
+      "pom": "sha256-QElbQ3pg0jmPD9/AVLidnDlKgjR6J0oHIcLpUKQwIYY="
+    },
+    "com/google/errorprone#error_prone_parent/2.36.0": {
+      "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw="
+    },
+    "com/google/errorprone#error_prone_parent/2.7.1": {
+      "pom": "sha256-Cm4kLigQToCTQFrjeWlmCkOLccTBtz/E/3FtuJ2ojeY="
+    },
+    "com/google/guava#failureaccess/1.0.1": {
+      "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=",
+      "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk="
+    },
+    "com/google/guava#failureaccess/1.0.2": {
+      "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=",
+      "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I="
+    },
+    "com/google/guava#guava-parent/26.0-android": {
+      "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
+    },
+    "com/google/guava#guava-parent/28.2-jre": {
+      "pom": "sha256-UEptGOuBum1aJVomK9gj8BaMf0eBTUtST1+jA+pWF8I="
+    },
+    "com/google/guava#guava-parent/31.0.1-jre": {
+      "pom": "sha256-s7a2qnCZwRgXrO6FsyL9kffuMq6mn+CD7jbIc17AZ4g="
+    },
+    "com/google/guava#guava-parent/32.1.1-jre": {
+      "pom": "sha256-BqpdGsBo8vgJUw8/9T+1yMlAFSolNiPQtTxPU/WhOj0="
+    },
+    "com/google/guava#guava-parent/33.4.0-jre": {
+      "pom": "sha256-Okme00oNnuDxvMOSMAIaHNTi990EJqtoRPWFRl1B3Nc="
+    },
+    "com/google/guava#guava/28.2-jre": {
+      "jar": "sha256-/DqjY62HIj0fvqWE7uAVqGIVD200xx8k3HQIimNfCO8=",
+      "pom": "sha256-wIBSYVSNxhykyYK1m/qtZQPkMZD15eRE6Qss9qty25Q="
+    },
+    "com/google/guava#guava/31.0.1-jre": {
+      "jar": "sha256-1b6U1l6HvSGfsxk60VF7qlWjuI/JHSHPc1gmq1rwh7k=",
+      "pom": "sha256-K+VmkgwhxgxcyvKCeGfK/3ZmRuIRO3/MPunCSkCy85Y="
+    },
+    "com/google/guava#guava/32.1.1-jre": {
+      "jar": "sha256-kfu6N/HIslHPnqnn06Np63nrHmpd8dS79IPdA4B0AoE=",
+      "module": "sha256-pY+TjSOeaYtZs8OcrVgO/Ro/1MoTq5KzBCbUJFLE7z4=",
+      "pom": "sha256-LJBx19FSKwx2IFfDToub+uOZJ6DrdVw2qnZRlyGHDXs="
+    },
+    "com/google/guava#guava/33.4.0-jre": {
+      "jar": "sha256-uRjJin5E2+lOvZ/j5Azdqttak+anjrYAi0LfI3JB5Tg=",
+      "module": "sha256-gg6BfobEk6p6/9bLuZHuYJJbbIt0VB90LLIgcPbyBFk=",
+      "pom": "sha256-+pTbQAIt38d1r57PsTDM5RW5b3QNr4LyCvhG2VBUE0s="
+    },
+    "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
+      "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
+      "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
+    },
+    "com/google/j2objc#j2objc-annotations/1.3": {
+      "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=",
+      "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU="
+    },
+    "com/google/j2objc#j2objc-annotations/2.8": {
+      "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=",
+      "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg="
+    },
+    "com/google/j2objc#j2objc-annotations/3.0.0": {
+      "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=",
+      "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc="
+    },
+    "com/google/jimfs#jimfs-parent/1.3.0": {
+      "pom": "sha256-HujPYBb+/5eGQrqvajZ2sUCBNGC08LLKupmaMq5eqR4="
+    },
+    "com/google/jimfs#jimfs/1.3.0": {
+      "jar": "sha256-gklECLtRP1USZS57f2PW8x8B7/V841yHhkT/wtJa7k8=",
+      "pom": "sha256-xH8iAIEN7swu96xiY6NUqF6vIf1U9vGLvHOPUUv+cOs="
+    },
+    "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": {
+      "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=",
+      "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE="
+    },
+    "com/googlecode/javaewah#JavaEWAH/1.2.3": {
+      "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=",
+      "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM="
+    },
+    "com/ibm/icu#icu4j/58.2": {
+      "jar": "sha256-lT4eg7K+fD6i+I2obBNhT0fp5x01eMhSHX8Yd1a2OWI=",
+      "pom": "sha256-R7Zq1yxypJmlRL57ixEzX2xz/bcyFxfRGBHfs+k0FGo="
+    },
+    "com/jayway/jsonpath#json-path/2.9.0": {
+      "jar": "sha256-Eanub4i7MfFFAQjRz2RBN33shKygdetrsjQ74VdXW+o=",
+      "module": "sha256-5ikAQ9rpOnDZqz+hvrh56M9e1ajgqQGD+5bCUVqXCD4=",
+      "pom": "sha256-DCU33em/ncKix5ZzAPwTvFIp0ZJnf8uItv2Jlmk2ZD8="
+    },
+    "com/networknt#json-schema-validator/1.5.5": {
+      "jar": "sha256-+fAA7RyDJ5JyPkotvC4x4Zd8WU0i1ERLRs+N6anT94k=",
+      "pom": "sha256-TU4EN7xfLcgtujWjfNLLKtSft8F3V+jZEtnua+cH4rg="
+    },
+    "com/palantir/javapoet#javapoet/0.6.0": {
+      "jar": "sha256-HI3RzEQEue61xU/vihzyvnoTikJ4O5Rg+66cr4XtWy8=",
+      "pom": "sha256-9uNKJqwJo6aKkcySNcsfjHc2sH/onbWaMkrNjVfZ55c="
+    },
+    "com/shapesecurity#salvation/2.7.2": {
+      "jar": "sha256-UrhnP2KpmupssmLnlGBkH/iJrVDO51e+MeIn2ZWn8rw=",
+      "pom": "sha256-oOTbnCwgUSBjf5XD7eCR3zpte3HGvD7CyzUcIo3k8IM="
+    },
+    "com/squareup#kotlinpoet/1.6.0": {
+      "jar": "sha256-gIXrTIsezk8yJZsi8mv4gLxHt09UjikBCwFGqms48ks=",
+      "pom": "sha256-ehlsmQuPMqA98tIsiMpe2ZLAOdReWzh2JjYIJD9DM0c="
+    },
+    "com/squareup/okhttp3#okhttp/4.12.0": {
+      "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=",
+      "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=",
+      "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg="
+    },
+    "com/squareup/okio#okio-jvm/3.6.0": {
+      "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=",
+      "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=",
+      "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8="
+    },
+    "com/squareup/okio#okio/3.6.0": {
+      "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=",
+      "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU="
+    },
+    "com/tunnelvisionlabs#antlr4-annotations/4.9.0": {
+      "jar": "sha256-B9BT1MMXi7QGt3Iov/5a8jFHNmboS/gBhrHOpDmLy3g=",
+      "pom": "sha256-/RFLtzGoRYoVaFF2Efdw61AbP1gxR+z+lwZwv26rsU0="
+    },
+    "com/tunnelvisionlabs#antlr4-master/4.9.0": {
+      "pom": "sha256-PGDW41sFnx1xFiZQuyKCPZE8xbH2dxQiYptTGBckDIE="
+    },
+    "com/tunnelvisionlabs#antlr4-runtime/4.9.0": {
+      "jar": "sha256-5Bk7qANM7fkgkFvbMYuKUJfXZ/mZ+HupekKY3mnz/6s=",
+      "pom": "sha256-rrWtT7mfiGvPWaqtrMB2l/6VRswGCKs/KA/T6/Jibx8="
+    },
+    "com/tunnelvisionlabs#antlr4/4.9.0": {
+      "jar": "sha256-xGNEWLxKnVdRl56TMU30mRq/X6BhBXySYyVulQPhzDs=",
+      "pom": "sha256-cjuYfLaa8AQaHOq2PkSU1kJBv9gViQp6wQz+IUrZqdo="
+    },
+    "commons-codec#commons-codec/1.10": {
+      "jar": "sha256-QkHfqU5xHUNfKaRgSj4t5cSqPBZeI70Ga+b8H8QwlWk=",
+      "pom": "sha256-vbjbcBLREqbj6o/bfFELMA2Z7/CBnSfd26nEM5fqTPs="
+    },
+    "commons-codec#commons-codec/1.16.0": {
+      "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=",
+      "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ="
+    },
+    "commons-fileupload#commons-fileupload/1.5": {
+      "jar": "sha256-Ufez3LTlDHZimU2i9HIxUZ/5lwelx/t7BfTE06FyjBQ=",
+      "pom": "sha256-zHIPHgWDV52f5Tk8iE7kbQ10+Z0fm6AXsXKzHqGJ4rE="
+    },
+    "commons-io#commons-io/2.11.0": {
+      "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=",
+      "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k="
+    },
+    "commons-io#commons-io/2.4": {
+      "jar": "sha256-zGpB3D6qzJ5ECmvQ0okLINNrTuQI/i1nEi8yi7bgFYE=",
+      "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI="
+    },
+    "commons-logging#commons-logging/1.2": {
+      "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=",
+      "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA="
+    },
+    "de/undercouch#gradle-download-task/5.6.0": {
+      "jar": "sha256-zkN6arnKcZzIVrVbp0kuQsTODumC5tIvtDLNVYh2gb4=",
+      "module": "sha256-P+YJN66Dzs2qpOD2EykVaQKD7d+IQ54m8efjgEV4NSI=",
+      "pom": "sha256-RqMBkMaLY9AegKQEQJfCULu8MgmkXw3FpNDioe1bgKc="
+    },
+    "dev/equo/ide#solstice/1.7.5": {
+      "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=",
+      "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=",
+      "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8="
+    },
+    "io/fabric8#kubernetes-client-bom/5.12.2": {
+      "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs="
+    },
+    "io/leangen/geantyref#geantyref/1.3.16": {
+      "jar": "sha256-fx1ZEJLVFCtqqnz1n5TEx01X2+7wOy+CYpSfjza6xuM=",
+      "pom": "sha256-JCgbY4MutO8QZOfd/b57eWquGr+IeYrb9NC5ZpurpKQ="
+    },
+    "io/netty#netty-bom/4.1.86.Final": {
+      "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0="
+    },
+    "isorelax#isorelax/20030108": {
+      "jar": "sha256-NCcVJDHPf5Z/kuaeXKwWFHxdj7S05ainL1KReI78/4w=",
+      "pom": "sha256-ug/b8qvT+5HXid/DGfVCwbiy1db042K6D5PcR79i9eY="
+    },
+    "jakarta/platform#jakarta.jakartaee-bom/9.0.0": {
+      "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4="
+    },
+    "jakarta/platform#jakartaee-api-parent/9.0.0": {
+      "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs="
+    },
+    "javax/inject#javax.inject/1": {
+      "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=",
+      "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o="
+    },
+    "net/bytebuddy#byte-buddy-parent/1.15.11": {
+      "pom": "sha256-jcUZ16PnkhEqfNhB6vvsTwDbxjPQha3SDEXwq0dspJY="
+    },
+    "net/bytebuddy#byte-buddy/1.15.11": {
+      "jar": "sha256-+giZiq4ee9roO94HEsUOhETXHA4MGWuyJHrejUrQ65A=",
+      "pom": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4="
+    },
+    "net/java/dev/jna#jna/5.14.0": {
+      "jar": "sha256-NO0eHyf6iWvKUNvE6ZzzcylnzsOHp6DV40hsCWc/6MY=",
+      "pom": "sha256-4E4llRUB3yWtx7Hc22xTNzyUiXuE0+FJISknY+4Hrj0="
+    },
+    "net/javacrumbs/json-unit#json-unit-core/2.40.1": {
+      "jar": "sha256-rbfoK/91XIqQw7dBIibzpy7UqLvbDNs3JrRpBQNgUdw=",
+      "pom": "sha256-fQRVja+97tYnCxaDBh2k+nj76qhlAgQ9IeRldagofhE="
+    },
+    "net/javacrumbs/json-unit#json-unit-parent/2.40.1": {
+      "pom": "sha256-GgCNCnykEDwm/lGk3ott86W5KGQZHNGLGfEBumF3yZQ="
+    },
+    "net/minidev#accessors-smart/2.5.1": {
+      "jar": "sha256-J5auhX0Me+S8NYDapNOCjVVSEjVfTIPTjdCvB0KzyBI=",
+      "pom": "sha256-SH53qNvZrDhEGRbIMFAYXDoeSGnOl1N3r+o5Mr9ire4="
+    },
+    "net/minidev#json-smart/2.5.1": {
+      "jar": "sha256-hsDBiVgbebV7Bxn0Q6ck6fYo/7ue72Rc95GU9Zc6EAE=",
+      "pom": "sha256-9GfdUfaGnmaD0QWmcop0I9oReTsIFevTK1DDq/QyH20="
+    },
+    "net/sf/jopt-simple#jopt-simple/5.0.4": {
+      "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=",
+      "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU="
+    },
+    "net/sf/saxon#Saxon-HE/9.6.0-4": {
+      "jar": "sha256-wW6MiyS/b6Fl4B7KaSiMtkNf2TW4s19WeFjFl8yLyrQ=",
+      "pom": "sha256-t/yqK4yQwOrPBGivdO71cu/ehElg1JeTwyXFXgYE3Mk="
+    },
+    "nu/validator#cssvalidator/1.0.8": {
+      "jar": "sha256-sBzzjmk2G81Aux/Yuo2kaVcrkvIsjEqgCltYrXcuBAY=",
+      "pom": "sha256-yQ8wpMPMPMXLtvTWGfz3j5H0JgafiuziZd1NQYhLD/M="
+    },
+    "nu/validator#galimatias/0.1.3": {
+      "jar": "sha256-s3y8RRNYTtaqHY91KevnervijB9U7GOw/yigCi2dKpo=",
+      "pom": "sha256-0pTwlIXl8ZksreBRvbe+5wkiW5sKPOPQkAn36KjwG10="
+    },
+    "nu/validator#htmlparser/1.4.16": {
+      "jar": "sha256-Gh2hDgEJBdA+ZLQ/kLFxkDQOlkSCPLKvKlgiYIJVIRM=",
+      "pom": "sha256-X/JPq97/y7gin1SRPIomRALbzuZEL9DFNSBSgGQgxHI="
+    },
+    "nu/validator#jing/20200702VNU": {
+      "jar": "sha256-jjev/dEa645RrxsKg3CioWS7Bvjs0OR+oC/IGb/VX1o=",
+      "pom": "sha256-FKoIrg/V4KZsswsCx9bnOpOHC98K98jN8ub1flu4zWs="
+    },
+    "nu/validator#langdetect/1.2": {
+      "jar": "sha256-+wJvcyKYtK5eVurhHOXafBpc5AVzCEIInMku15vpanY=",
+      "pom": "sha256-KyE28/fhlC+B4R9FV0x+cnfWeURT27yzmYs8MluPu+g="
+    },
+    "nu/validator#validator/20.7.2": {
+      "jar": "sha256-L9dKzt4kTJ7GcyvLVyR6AfZ+JYCLVztT6EoK4pyfl4U=",
+      "pom": "sha256-GHLq+MRZqWPz+Oo+G6220xgYc8YH4v9aj1CylRNjvkM="
+    },
+    "org/abego/treelayout#org.abego.treelayout.core/1.0.1": {
+      "jar": "sha256-grnjYxrMcIwRUhb6ePl3gNioHbt/FfjYIpGh3DqDsdA=",
+      "pom": "sha256-fIy/ymTpcEQNTyh/NRapbABpKgOU/KHVexKpepbw6hE="
+    },
+    "org/antlr#ST4/4.3": {
+      "jar": "sha256-KFR9ukjPzrd7bvv+Bprr6e0zJK5g29Ugk9E6HWNu0Gk=",
+      "pom": "sha256-Lz9Cw+TSDspiobTm2EFO8MuXODgISZnl4nA8ZOWECs8="
+    },
+    "org/antlr#antlr-master/3.5.2": {
+      "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y="
+    },
+    "org/antlr#antlr-runtime/3.5.2": {
+      "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=",
+      "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU="
+    },
+    "org/apache#apache/13": {
+      "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
+    },
+    "org/apache#apache/15": {
+      "pom": "sha256-NsLy+XmsZ7RQwMtIDk6br2tA86aB8iupaSKH0ROa1JQ="
+    },
+    "org/apache#apache/16": {
+      "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4="
+    },
+    "org/apache#apache/23": {
+      "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
+    },
+    "org/apache#apache/27": {
+      "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk="
+    },
+    "org/apache#apache/29": {
+      "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c="
+    },
+    "org/apache#apache/9": {
+      "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0="
+    },
+    "org/apache/ant#ant-launcher/1.10.13": {
+      "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=",
+      "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o="
+    },
+    "org/apache/ant#ant-parent/1.10.13": {
+      "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk="
+    },
+    "org/apache/ant#ant/1.10.13": {
+      "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=",
+      "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o="
+    },
+    "org/apache/commons#commons-math3/3.6.1": {
+      "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=",
+      "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA="
+    },
+    "org/apache/commons#commons-parent/25": {
+      "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo="
+    },
+    "org/apache/commons#commons-parent/34": {
+      "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w="
+    },
+    "org/apache/commons#commons-parent/35": {
+      "pom": "sha256-cJihq4M27NTJ3CHLvKyGn4LGb2S4rE95iNQbT8tE5Jo="
+    },
+    "org/apache/commons#commons-parent/39": {
+      "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac="
+    },
+    "org/apache/commons#commons-parent/52": {
+      "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+    },
+    "org/apache/commons#commons-parent/56": {
+      "pom": "sha256-VgxwUd3HaOE3LkCHlwdk5MATkDxdxutSwph3Nw2uJpQ="
+    },
+    "org/apache/commons#commons-parent/58": {
+      "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA="
+    },
+    "org/apache/httpcomponents#httpclient/4.4": {
+      "jar": "sha256-xQ6vpUd68vqCF9P3KbgV/zxmnbxGdVLA/u7cYb6WVSM=",
+      "pom": "sha256-ZKLnQYeKsG0yEWJ1cC6TLPjc/UYJNJ+yAL3sNG1elfE="
+    },
+    "org/apache/httpcomponents#httpcomponents-client/4.4": {
+      "pom": "sha256-M/J/3AzbDS+IohFr5amyo1ZTn2u3o5MZdxrbZZ200kM="
+    },
+    "org/apache/httpcomponents#httpcomponents-core/4.4": {
+      "pom": "sha256-UFItaYaRpZowcLDqR6/yag2GqjJAyIRd8rOQlkpci74="
+    },
+    "org/apache/httpcomponents#httpcomponents-parent/13": {
+      "pom": "sha256-5Ch4ZwNYVsc3QgNo3VhuXlfnAgmBNYQM89c+nINj17M="
+    },
+    "org/apache/httpcomponents#httpcore/4.4": {
+      "jar": "sha256-HvjbXTC3dBq1/fbfh2oJCn3VFiPoPzc20LuPsbXq0y8=",
+      "pom": "sha256-rwGjbrhaJe6i0r5BG+ogbQMP3CzwogJLtpUSqK7ME40="
+    },
+    "org/apache/httpcomponents#project/7": {
+      "pom": "sha256-PW66QoVVpVjeBGtddurMH1pUtPXyC4TWNu16/xiqSMM="
+    },
+    "org/apache/httpcomponents/client5#httpclient5-parent/5.4.1": {
+      "pom": "sha256-L6XaD1iLiH/eOrrsd93p7nFumNsuFFJwIjtbVH5woFQ="
+    },
+    "org/apache/httpcomponents/client5#httpclient5/5.4.1": {
+      "jar": "sha256-xsb8YMuz7dnoI9kibWCP8xNetIvSBJu4O9vD70qRETg=",
+      "pom": "sha256-ArD3i0r7w2xCK4Z51CWsPCH5iu7O3OohoC+pTgTXwT0="
+    },
+    "org/apache/httpcomponents/core5#httpcore5-h2/5.3.1": {
+      "jar": "sha256-lj4ZSpcqo9rwkofJIe1aLdTDmFxEGFsBOAApQwJb7Wo=",
+      "pom": "sha256-5tvnRFdwRLoVvwi6ViP5FBcFR8Te1jc42eQDzLiuXII="
+    },
+    "org/apache/httpcomponents/core5#httpcore5-parent/5.3.1": {
+      "pom": "sha256-9fhAvvD1PBeSx1INGq1DOSFfKO5EzjC3rW0NKSlACPk="
+    },
+    "org/apache/httpcomponents/core5#httpcore5/5.3.1": {
+      "jar": "sha256-g/VZrR7nI8GrPoCwQFUc+ssuWlK98E3N01QZpnYNgbM=",
+      "pom": "sha256-ALBBLdLr0s6dltKDnxTT/XMjALC1o0CrCNk30BcnG3E="
+    },
+    "org/apache/logging#logging-parent/3": {
+      "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc="
+    },
+    "org/apache/logging#logging-parent/7": {
+      "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys="
+    },
+    "org/apache/logging/log4j#log4j-1.2-api/2.17.1": {
+      "jar": "sha256-yj6RUPlcMdFbloCmCbiBf4VJvTlVkcXKVZV9HvD0ZNY=",
+      "pom": "sha256-LQAYi3EPC3r8SE5Jb2/Xs+s+ODMeCF886cPiLQLPp5I="
+    },
+    "org/apache/logging/log4j#log4j-api/2.17.1": {
+      "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=",
+      "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io="
+    },
+    "org/apache/logging/log4j#log4j-api/2.20.0": {
+      "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=",
+      "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc="
+    },
+    "org/apache/logging/log4j#log4j-bom/2.20.0": {
+      "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE="
+    },
+    "org/apache/logging/log4j#log4j-core/2.20.0": {
+      "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=",
+      "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4="
+    },
+    "org/apache/logging/log4j#log4j/2.17.1": {
+      "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk="
+    },
+    "org/apache/logging/log4j#log4j/2.20.0": {
+      "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk="
+    },
+    "org/apiguardian#apiguardian-api/1.1.2": {
+      "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+      "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+      "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
+    },
+    "org/assertj#assertj-core/3.27.3": {
+      "jar": "sha256-W4omIF9tXqYK2c5lzkpAoq/kxIq+7GG9B0CgiMJOifU=",
+      "pom": "sha256-jrN+QWt4B+e/833QN8QMBrlWk6dgWcX7m+uFSaTO19w="
+    },
+    "org/checkerframework#checker-qual/2.10.0": {
+      "jar": "sha256-0mH94l1ZD2tp23ch1GmsGwoZoXzKqqdRwx8Ni4JguJQ=",
+      "pom": "sha256-JG5H45X416jBK3IisWa8Oh04Cbw6PTDel0cKo42VKks="
+    },
+    "org/checkerframework#checker-qual/3.12.0": {
+      "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=",
+      "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=",
+      "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk="
+    },
+    "org/checkerframework#checker-qual/3.33.0": {
+      "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=",
+      "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=",
+      "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM="
+    },
+    "org/checkerframework#checker-qual/3.43.0": {
+      "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=",
+      "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=",
+      "pom": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM="
+    },
+    "org/codehaus/groovy#groovy-bom/3.0.14": {
+      "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric="
+    },
+    "org/codehaus/plexus#plexus-utils/3.5.1": {
+      "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=",
+      "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI="
+    },
+    "org/codehaus/plexus#plexus/10": {
+      "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8="
+    },
+    "org/commonmark#commonmark-ext-gfm-tables/0.24.0": {
+      "jar": "sha256-tU3DMvkx5tB8J2YUTAh7CPNpNnfjaBUaZwILTpW7S5k=",
+      "pom": "sha256-vyvnG//gIyTv1T8EXhiKaXlUQJCJQ2taplFIhB99DbI="
+    },
+    "org/commonmark#commonmark-parent/0.24.0": {
+      "pom": "sha256-PeaJsU9vvYC3DerOWehyTzXzXhQpxxb98PNooDaz00g="
+    },
+    "org/commonmark#commonmark/0.24.0": {
+      "jar": "sha256-Z5M44Lf8FcAtJ11ZhlSwGhSYk7woqHmS6QEjyNBq8ls=",
+      "pom": "sha256-DffPmAUxQkwc6POISc3YtqHG0QI5Pm0fXcErVqDSLyY="
+    },
+    "org/eclipse/ee4j#project/1.0.6": {
+      "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0="
+    },
+    "org/eclipse/jetty#jetty-alpn-client/11.0.24": {
+      "jar": "sha256-0+q/fwpQ7pnkwu7T+VWZetfIToMe9tmcpl/N2Gkbg7s=",
+      "pom": "sha256-4ChUPNXWBpMyzMepXiaeCUfgUWY62QK8CRmkbgxrfSk="
+    },
+    "org/eclipse/jetty#jetty-alpn-java-client/11.0.24": {
+      "jar": "sha256-GjsnDNXypSIpCZ1ZDV6pqgTuXkD2//6rffkmvmUzggg=",
+      "pom": "sha256-EXzXCLo3u6kMVwaD9v3LsY9IPiDkpOj0QhRT/JP47a0="
+    },
+    "org/eclipse/jetty#jetty-alpn-java-server/11.0.24": {
+      "jar": "sha256-zIMflTl1QO7wVV8LHht7L8pfYt/e0MT7UPo1jYulTc0=",
+      "pom": "sha256-jq2POCgEbXoevHVoT2OTaLdhQ51Ru19sgiCscdMJ33o="
+    },
+    "org/eclipse/jetty#jetty-alpn-parent/11.0.24": {
+      "pom": "sha256-OEfidTdZ+GkaIo2c8dddJPcwJG4J3FL/8b0r0PTbnVc="
+    },
+    "org/eclipse/jetty#jetty-alpn-server/11.0.24": {
+      "jar": "sha256-oRp4O8Aj5vsgET85ugmM/6H4/F2pkwOXHploc2PlZWI=",
+      "pom": "sha256-Kl+OKVd+qPdvkUmX9VOPjofcGYeJef4SC+UFRtsUoUg="
+    },
+    "org/eclipse/jetty#jetty-bom/11.0.24": {
+      "pom": "sha256-OzjVNA/7MaYiymePR8K2Bawg6lhVJZ84Xm0ujyfs1dk="
+    },
+    "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": {
+      "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM="
+    },
+    "org/eclipse/jetty#jetty-client/11.0.24": {
+      "jar": "sha256-yYOqFTdFGdhxcoDh2EM028XuQiePsQllX29alJQ/TS8=",
+      "pom": "sha256-u68OEXqGWPInb/qKEbdVywctM1NQWvsKPk7BpkzkbP4="
+    },
+    "org/eclipse/jetty#jetty-http/11.0.24": {
+      "jar": "sha256-ZONoY0f2D7GqAlATghVHmVpwjmGomWfAOGrTrcn60R8=",
+      "pom": "sha256-/lve2cVDbsrkT438v4Rw0O96qj/U1nAe+oEuV4EOeP8="
+    },
+    "org/eclipse/jetty#jetty-io/11.0.24": {
+      "jar": "sha256-N5oEGTtOZm15AEePYC0SvU49kavTtfZENNkpJ7BHIPk=",
+      "pom": "sha256-vTPGW6IaAznasQRHEZ9yPb23L7mSM0AHjtTT1ZVTkwc="
+    },
+    "org/eclipse/jetty#jetty-project/11.0.24": {
+      "pom": "sha256-9miJ0dIX26PbBfSwXOwksKIg1PHRbFLSA9m2+3HaYIY="
+    },
+    "org/eclipse/jetty#jetty-project/9.4.18.v20190429": {
+      "pom": "sha256-1GvUDvRMD9fEvW/Hp/MUbHxgL3TrtfN42ipcMDXnmDg="
+    },
+    "org/eclipse/jetty#jetty-proxy/11.0.24": {
+      "jar": "sha256-Sm2GP0PMQH0GsriAgUOHog0hodIptNdV7xx8Ln4QOGc=",
+      "pom": "sha256-NaAFoAOnCQTDSyp+GfgdI71U25KBjCEfYsTiInDyGys="
+    },
+    "org/eclipse/jetty#jetty-security/11.0.24": {
+      "jar": "sha256-B/VW40sEjIGUQLnpn6apwUSeDRDjwNhiikRr5e0IK4g=",
+      "pom": "sha256-NeCJ1jkTMrp34adpkgnU7j7zlq0pkmWDWt4tm/0Esp0="
+    },
+    "org/eclipse/jetty#jetty-server/11.0.24": {
+      "jar": "sha256-ECHKaaTLVr2kZsqbuw/K/z3zFimi7PckBZX2Wuuro0s=",
+      "pom": "sha256-5yEko9Ho+3DaG1JY4VQrgB/+sDOqExYB2hH3lLQpj1Q="
+    },
+    "org/eclipse/jetty#jetty-servlet/11.0.24": {
+      "jar": "sha256-F4yNx+mFFboodMh7NgwZFf53TsbgARxlHmOeoycZvmM=",
+      "pom": "sha256-3uiUnisDmOn03P7p/2yS86l4qZd3aF1i6MheSx+7itg="
+    },
+    "org/eclipse/jetty#jetty-servlets/11.0.24": {
+      "jar": "sha256-x66EoSNNwkBEbqnmbyLhKRBfYvJfETYnME+LPBacz7Y=",
+      "pom": "sha256-gbRgsSDWSrntgs0oDfrdtb4om9P6V2M6D4/1e6R1HoQ="
+    },
+    "org/eclipse/jetty#jetty-util-ajax/9.4.18.v20190429": {
+      "jar": "sha256-sfOmKclI6RzM8O5BwkcYLwjCeKzjCdbzhvJJdFvhrLE=",
+      "pom": "sha256-59pcvWbuHZsx0DFJ1Jj183k6+aU6ghN/+PUsqdBGlW4="
+    },
+    "org/eclipse/jetty#jetty-util/11.0.24": {
+      "jar": "sha256-HscB9QUFZEPeE00OVGTimKoVQAmBIQwQtmigcP/Ze/0=",
+      "pom": "sha256-7ro8qZy7kyAEbuNm6V3wzr8vEQciaPRcouvj4iO2m8o="
+    },
+    "org/eclipse/jetty#jetty-util/9.4.18.v20190429": {
+      "jar": "sha256-2yrpdnnk2d0LluDi4EQj1BQHl3qH7foO0XFMROtceqE=",
+      "pom": "sha256-g/9B2rfamDvQ3Y+IUSZRCz+sQEtSzOlF/YbM4PAeIh4="
+    },
+    "org/eclipse/jetty#jetty-webapp/11.0.24": {
+      "jar": "sha256-McsSrHHqnIzljqDSmfOP3w7abuIzp3CuHqPOj3S5VP4=",
+      "pom": "sha256-Y9pNCE6Eb9AtbJpCi8zGYK+hxb17wkfsIfFsN6cWaBs="
+    },
+    "org/eclipse/jetty#jetty-xml/11.0.24": {
+      "jar": "sha256-gOF06W0GINnCf9Ck0ZqDEnjxRkycVr7Z5DfMikUlX9Q=",
+      "pom": "sha256-JXNlZfHw0Et42x+ZH449AZRmgAWbwqhXauRd7pJu8h8="
+    },
+    "org/eclipse/jetty/http2#http2-common/11.0.24": {
+      "jar": "sha256-XXdG9EmGKB3Ks+fLpeTSSGgnQ3XErF45F4XET5uZJ9E=",
+      "pom": "sha256-aEwrliRzkYCfzaIEvCz/NqLyc7LgCLlDxs6QTrmkCsE="
+    },
+    "org/eclipse/jetty/http2#http2-hpack/11.0.24": {
+      "jar": "sha256-8yapKXQgEU+ZuzCFkHcrQQDNjmL1XWdm5ctJb7JHQ8U=",
+      "pom": "sha256-4N056ZrPI6FKjnFfmLf5Lxe6AgVMJuI4XOXEm85i4jU="
+    },
+    "org/eclipse/jetty/http2#http2-parent/11.0.24": {
+      "pom": "sha256-H/63MlEaizavZ8nPMV5XckiQjy/U8WLyxVezUjFsBis="
+    },
+    "org/eclipse/jetty/http2#http2-server/11.0.24": {
+      "jar": "sha256-p4bvTZ6UpIZcl3XKG6wwdgMA9WNx17QISGixfM4Cw48=",
+      "pom": "sha256-e4PC3DueupOTnXmCIU9A++tU/iean6/NAb9Me0dVdE0="
+    },
+    "org/eclipse/jetty/toolchain#jetty-jakarta-servlet-api/5.0.2": {
+      "jar": "sha256-77IJl3KfMr+myKgxkDfDU/etRg1dSfM2vyMpmOojWNs=",
+      "pom": "sha256-g+y5PmHWvZyMgfwlzcrUp3ONx7LAiCnRcihj7kaaSIo="
+    },
+    "org/eclipse/jetty/toolchain#jetty-toolchain/1.6": {
+      "pom": "sha256-RVY/EXXZhZwcBmoJgPvbn2u0xtPBLgXYlXm7F4P0e2w="
+    },
+    "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": {
+      "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8="
+    },
+    "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": {
+      "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=",
+      "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI="
+    },
+    "org/eclipse/platform#org.eclipse.osgi/3.18.300": {
+      "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=",
+      "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ="
+    },
+    "org/fusesource#fusesource-pom/1.12": {
+      "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE="
+    },
+    "org/fusesource/jansi#jansi/2.4.1": {
+      "jar": "sha256-Ll53Wp3Fj/prvWqm8JnWL4ti3N60w8O7vlzyMBvC3ME=",
+      "pom": "sha256-P5jZeaTTVZ+HefuwBLNK51Fq+t9RDhHffMPNBz6xuzs="
+    },
+    "org/graalvm/compiler#compiler/24.1.2": {
+      "jar": "sha256-gq3hmWcps0qlg7m/JB2VVPTZ2cxj14IQ6FT/hNozVww=",
+      "pom": "sha256-zQTN2Et4pKF1FHqAe3NHa9DPmhq/Qv6zy2IKCHkJSQ0="
+    },
+    "org/graalvm/js#js-community/24.1.2": {
+      "pom": "sha256-/JHs5Fr26PIPfriMs0i6nbz5u0b+t2tXguGQx+I/mio="
+    },
+    "org/graalvm/js#js-language/24.1.2": {
+      "jar": "sha256-xci8J4EZ+BhYerB0FnF/EPhVxDpohezx6cfKtw63azw=",
+      "pom": "sha256-fM8RFfkdp/3tFxuZa+GJt/evoo9rssTMoClYBK9nDvw="
+    },
+    "org/graalvm/js#js/24.1.2": {
+      "pom": "sha256-8N0K3PJg42G3my5F+belkz4PlbiYTu2wc14U+vGXzgE="
+    },
+    "org/graalvm/nativeimage#native-image-base/24.1.2": {
+      "jar": "sha256-qONvRTeFBOi5XdI3NbET05CW6AoQ3jKPyQw6BGpk7Fc=",
+      "pom": "sha256-eNQbHL1x6K0QHYmsZOze5Mujf7rtRrmrqHcxjyBfUxw="
+    },
+    "org/graalvm/nativeimage#objectfile/24.1.2": {
+      "jar": "sha256-b1vpPS25JLVAYJzfO25bn9FAxSmvyLeK196wcK4ZaR8=",
+      "pom": "sha256-rL21b7fdbTN/XKRVuN2lByZNU8Hv9xb5W2RGSdBSfMg="
+    },
+    "org/graalvm/nativeimage#pointsto/24.1.2": {
+      "jar": "sha256-cfH1cZKpPs0EhI8iLqqfbxW0Q+vphJEL86ZYX5xBXpU=",
+      "pom": "sha256-Sy7YHy3/sYiD52THB6Jo0j5tX1TMMl1tdb6d4PAKDtw="
+    },
+    "org/graalvm/nativeimage#svm/24.1.2": {
+      "jar": "sha256-/0YCkZMbK1Nmm6RwhH4aM+bQtGA4v3JjU98Ot4CwEQc=",
+      "pom": "sha256-+Xiugobmr5ie+3pInagYJIHEpQ4i0gxpEeQ8kP9CJY0="
+    },
+    "org/graalvm/nativeimage#truffle-runtime-svm/24.1.2": {
+      "jar": "sha256-2LxJ81SH2ILH20s8l2wXPiaOjDllnlzcLxWIToHjhr8=",
+      "pom": "sha256-5hd5+iy00SVEqhk722OIXKqu5kL93zzEQmKyXc87aD4="
+    },
+    "org/graalvm/polyglot#polyglot/24.1.2": {
+      "jar": "sha256-baP+QqFqbWcMNFhGLfmosfIZh4PiKBn/y29XW6GdX24=",
+      "pom": "sha256-JA4/TNOBxDpQzio1aP8B5uZkxyS1jzUg64w/63b/clw="
+    },
+    "org/graalvm/regex#regex/24.1.2": {
+      "jar": "sha256-9U0ujATkV+FOp+yrrO81WvFPnf0lJZMmtkqly8U6/Ls=",
+      "pom": "sha256-XldkKpbEd7Vj3h7rSpH0FQuxrMFzUL55mgPW31IVgFI="
+    },
+    "org/graalvm/sdk#collections/24.1.2": {
+      "jar": "sha256-y0BGwMpGmWG5PWFZ+Hrhf/RJhHo2d//d5ZugkJG/HYQ=",
+      "pom": "sha256-GpD0olIcFyFLm8B5J8NI5IGDvmMySQdMIFkTm0qaJfQ="
+    },
+    "org/graalvm/sdk#graal-sdk/24.1.2": {
+      "jar": "sha256-8pTBWK6CN7jcm2Gulr7JOYP+wkNa72+2ENvd2lfC0NU=",
+      "pom": "sha256-UT1IZgK0JiB5IUbfkeMOEsS0Zu8MJbFZgS48YudLU3Q="
+    },
+    "org/graalvm/sdk#jniutils/24.1.2": {
+      "jar": "sha256-JbrCp3mGJJaMfGkFbhoqYa3R64o9umCKKx9jYWXwc/c=",
+      "pom": "sha256-YMcw3nPAcZJ0cor/jpzCXLTM+tjgwWSM2m2u4Px2yMQ="
+    },
+    "org/graalvm/sdk#nativebridge/24.1.2": {
+      "jar": "sha256-U2e5IG24xy8v5ZkklbP0/Kf3t0XuaPDlnSs2pf/Txnk=",
+      "pom": "sha256-YPdz2cf5a9aD1LZp+pvhR7Ho+QaizX5fXHuo6GcT3VQ="
+    },
+    "org/graalvm/sdk#nativeimage/24.1.2": {
+      "jar": "sha256-POtoig91AJ0UwvSy9iRCA0es09+CRVAUS6jwLdJH/N0=",
+      "pom": "sha256-7Fs7DGjZTpnYYyE4GUQZLBtihXtUQcGV5dDzjYDLf8c="
+    },
+    "org/graalvm/sdk#word/24.1.2": {
+      "jar": "sha256-BTHpPWpg3aUxP0gKlp0bR5P8qs94Z5iyQPfe1U7r880=",
+      "pom": "sha256-5wZNcSPCVYFG0RAZP3u0rvm1A0WRg0Z7dxr+8C1nzZE="
+    },
+    "org/graalvm/shadowed#icu4j/24.1.2": {
+      "jar": "sha256-lO3/9ZUrQRg3aZgQr6Hvs7UlT/7LdS344SZG0k5VeXA=",
+      "pom": "sha256-P57XxBd+qwIXqv8KQbIfhdpu/7en6GuTv3gzU/KYASo="
+    },
+    "org/graalvm/truffle#truffle-api/24.1.2": {
+      "jar": "sha256-/YhKfGsvigm8G6zkXYr0LasC3KOOEckvQ+QItJC9YKM=",
+      "pom": "sha256-/FGo+tFWW/EKS1NAnGH93pjdkZyiOpbgKnLDZ1E5LzY="
+    },
+    "org/graalvm/truffle#truffle-compiler/24.1.2": {
+      "jar": "sha256-H7rMDaupxoli5eMplVZS9wVRyaERQySff2XicuiRuVw=",
+      "pom": "sha256-lYRyGH1LeiOPlkBmCuQDVfBnSTdVr1vmU54uHFXiX6I="
+    },
+    "org/graalvm/truffle#truffle-dsl-processor/24.1.2": {
+      "jar": "sha256-8cfeDrNNHdo89VlsXCjHe41Q3j4VfRWc6tWIvzCTw4U=",
+      "pom": "sha256-/SaVF3mJNesYpbqWivrKB1LM46Nl+QxxywqP6fjXts4="
+    },
+    "org/graalvm/truffle#truffle-enterprise/24.1.2": {
+      "jar": "sha256-lzki77b3hsYJMmG4QsLHU8wCpXgiDIqwf1IqPMPXbB0=",
+      "pom": "sha256-kOuiMkmvxuZlKxay0RVsSPAmH1TJnc2cqQdvwSQraZc="
+    },
+    "org/graalvm/truffle#truffle-runtime/24.1.2": {
+      "jar": "sha256-C1/otOVMvHywtoEZFxX54Rqr182f6zWroWK/GoV5WgU=",
+      "pom": "sha256-suG7sr5LL/v1+xazdHDtY1p6OJAaICDyvSFdwRMt8gw="
+    },
+    "org/hamcrest#hamcrest-core/2.2": {
+      "jar": "sha256-CU9dkrS32ciiv1PMadNWJDronDSZRXvLS5L37Tv5WHk=",
+      "pom": "sha256-9/3i//UQGl/Do54ogQuRHC2iAt3CvVB2X4nnxv+M590="
+    },
+    "org/hamcrest#hamcrest/2.2": {
+      "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=",
+      "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0="
+    },
+    "org/infinispan#infinispan-bom/11.0.19.Final": {
+      "pom": "sha256-OmBv0rX3f991rPM15brdRnxCQFsR8mjnPBfrkkM+WhE="
+    },
+    "org/infinispan#infinispan-build-configuration-parent/11.0.19.Final": {
+      "pom": "sha256-EghgxWpNd7zBIjy650Dusm8vk1XUmhfV8WWADuCvqno="
+    },
+    "org/jboss#jboss-parent/36": {
+      "pom": "sha256-AA3WFimK69IanVcxh03wg9cphCS5HgN7c8vdB+vIPg4="
+    },
+    "org/jdom#jdom2/2.0.6.1": {
+      "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=",
+      "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M="
+    },
+    "org/jetbrains#annotations/13.0": {
+      "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
+      "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
+    },
+    "org/jetbrains#markdown-jvm/0.7.3": {
+      "jar": "sha256-iTq7MfFbYhb3TccEwMa/HlZ9zytizKKc9C5PUxU2N6w=",
+      "module": "sha256-cCm2PHSWTltDNDCO5ynpW1ONpe1qwSsuR31HhXLQIlI=",
+      "pom": "sha256-rLnRV//Hpk7mK+jt2WANJrXbAycKdOi+U815/gsm880="
+    },
+    "org/jetbrains#markdown/0.7.3": {
+      "jar": "sha256-+Hp+5ADarnOaX9bzGdMb+6MG8E1qV1dAawGd8b8r9qk=",
+      "module": "sha256-2/rnqoU+teoe66MYllOKhANkb1XFmpkZHWh/wDe9rDk=",
+      "pom": "sha256-EeUuCmQOVKSzsjDRSFyVukuneyx7H8KENzkPngEicUc="
+    },
+    "org/jetbrains/intellij/deps#trove4j/1.0.20200330": {
+      "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=",
+      "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k="
+    },
+    "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.0.21": {
+      "jar": "sha256-VNSBSyF3IXiP2GU5gSMImi/P91FQ17NdjnMKI34my9E=",
+      "pom": "sha256-rIU9chaJ+vEV8RiBCjU2/CcvE1to0CdFOqpW6eY79wc="
+    },
+    "org/jetbrains/kotlin#kotlin-assignment/2.0.21": {
+      "module": "sha256-8638yrZURNtqqzwNfSVoZG7AyS8kWCh/KLKu5POXNtw=",
+      "pom": "sha256-QBfCQqfb3Oca6ApXB7S/OyOoIr8jpodahFp7UTYhzQ8="
+    },
+    "org/jetbrains/kotlin#kotlin-assignment/2.0.21/gradle85": {
+      "jar": "sha256-USUeNCELiNTJCAXKZS6Xe93IR4OkVAY5ydIQkJhbrOY="
+    },
+    "org/jetbrains/kotlin#kotlin-build-common/2.0.21": {
+      "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=",
+      "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0="
+    },
+    "org/jetbrains/kotlin#kotlin-build-statistics/2.0.21": {
+      "jar": "sha256-gBILdN8DYz1veeCIZBMe7jt6dIb2wF0vLtyGg3U8VNo=",
+      "pom": "sha256-/iTcYG/sg+yY3Qi8i7HPmeVAXejpF8URnVoMt++sVZ0="
+    },
+    "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": {
+      "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=",
+      "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ="
+    },
+    "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": {
+      "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=",
+      "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE="
+    },
+    "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": {
+      "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=",
+      "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY="
+    },
+    "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": {
+      "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=",
+      "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0="
+    },
+    "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": {
+      "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=",
+      "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA="
+    },
+    "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": {
+      "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=",
+      "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A="
+    },
+    "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.21": {
+      "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=",
+      "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg="
+    },
+    "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": {
+      "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=",
+      "module": "sha256-z29dNExVVVS/rGQFHq0AhcvUM4Z2uqP8h7UD6eSrvjQ=",
+      "pom": "sha256-gV5yqZ4ZFD1mLSTkYlKlnOdWMC18W9/FlIF9fMexI3g="
+    },
+    "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21/gradle85": {
+      "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA="
+    },
+    "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": {
+      "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=",
+      "pom": "sha256-OMyaLLf55K/UOcMQdvgzFThIsfftITMgCDXRtCDfbqs="
+    },
+    "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.21": {
+      "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=",
+      "module": "sha256-YqcNAg27B4BkexFVGIBHE+Z2BkBa6XoQ2P2jgpOI0Uk=",
+      "pom": "sha256-1GjmNf3dsw9EQEuFixCyfcVm6Z1bVIusEMIjOp7OF74="
+    },
+    "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.21": {
+      "jar": "sha256-lR13mJs1cAljH/HvsSsBYczzKcUpxUalKfih0x+bwDw=",
+      "module": "sha256-6qn9n4b71E/2BwoZfce90ZgPDUHo20myUoA9A6pMVaw=",
+      "pom": "sha256-5RVeYOyr2v1kUmVKaYALyyp37n0fxucH+tOo5p8HTCw="
+    },
+    "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21": {
+      "module": "sha256-D5iXoGwHo+h9ZHExzDSQofctGuVMEH8T9yJp1TRLCHo=",
+      "pom": "sha256-RenM7OM+TY36mUHMkS81RYIBqdPwQ3IMMket3lf0f/Y="
+    },
+    "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21/gradle85": {
+      "jar": "sha256-nfXH/xOx/GislFDKY8UxEYkdb2R73ewPQ5iz5yJb9tk="
+    },
+    "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.21": {
+      "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=",
+      "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg="
+    },
+    "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": {
+      "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=",
+      "pom": "sha256-Y/6HvSI1sSlAnHIqCbYsIKe3eueQGeIgMSSK9zawPFQ="
+    },
+    "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.0.21": {
+      "jar": "sha256-2Gv0M4pthBzM37v/LaBb0DpJw9uMP5erhed+AhrQhFs=",
+      "pom": "sha256-esgfO7B8TWqo+pj/WjmaR6vRzhx4bU8/rZbvKBIL34o="
+    },
+    "org/jetbrains/kotlin#kotlin-native-prebuilt/2.0.21": {
+      "pom": "sha256-Gv4wJE4ZR67Wy+01BBrTbFnw6nZK/bxv/56agY7loEE="
+    },
+    "org/jetbrains/kotlin#kotlin-native-utils/2.0.21": {
+      "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=",
+      "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0="
+    },
+    "org/jetbrains/kotlin#kotlin-reflect/1.6.10": {
+      "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=",
+      "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak="
+    },
+    "org/jetbrains/kotlin#kotlin-reflect/2.0.21": {
+      "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=",
+      "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk="
+    },
+    "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.0.21": {
+      "jar": "sha256-x88d6VXfIqFihyImvQZ3yaDItmMKLi1z0R0UfNDFO3M=",
+      "pom": "sha256-cWKsEOFFTpJ2c7FcrQMp2jgvt1jmVPWfy0AHRZ2eyEE="
+    },
+    "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21": {
+      "module": "sha256-kJCVCx7oa4b+KWmV2AKG6opPN5+yshjoVvzt0ErS1Hk=",
+      "pom": "sha256-7lYZBmzLB5zDMy4kcnQ1n9dQXeLVQPuRtyd5ICW2Siw="
+    },
+    "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21/gradle85": {
+      "jar": "sha256-HSNuNiIzuaJx5QsiOlDI2+rdA1C2OiRkYIJWhS2jaKM="
+    },
+    "org/jetbrains/kotlin#kotlin-script-runtime/2.0.21": {
+      "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=",
+      "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ="
+    },
+    "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": {
+      "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=",
+      "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU="
+    },
+    "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": {
+      "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=",
+      "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug="
+    },
+    "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": {
+      "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=",
+      "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE="
+    },
+    "org/jetbrains/kotlin#kotlin-scripting-jsr223/2.0.21": {
+      "jar": "sha256-oA3EJBkEd4i4324+tLSJFK3eNVIPg+adigW1f90Kgls=",
+      "pom": "sha256-dIMa0FAwQx86SWvajE2zVH+IOZD+c4IDewYzDZLVYUU="
+    },
+    "org/jetbrains/kotlin#kotlin-scripting-jvm-host/2.0.21": {
+      "jar": "sha256-+AqFLOSTTUbjnQa7VBUDtvtTpRJ+Fi5LGzTU7s8JGiE=",
+      "pom": "sha256-WalUA6QOq3dIr5wlAat93AV45rnaVdgoddCCVtxfBGY="
+    },
+    "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": {
+      "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=",
+      "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0="
+    },
+    "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.0.21": {
+      "jar": "sha256-3v0m28WB8x1QKe5EmZ4QRpLrAw6rrX2TZMI9jwuP2Fk=",
+      "pom": "sha256-0opI/fcJ0wz4lqL3XMbx7aA3L2r+MYdCDPigSrJCb/w="
+    },
+    "org/jetbrains/kotlin#kotlin-serialization/2.0.21": {
+      "module": "sha256-HXUsci8E/La3an9mSgXqFQAuEO1c/30pBJtd5ZfxID8=",
+      "pom": "sha256-Ju6iFEnSY66HScTjq7enkNl1ubpRP2jVSMzFCOFfUkI="
+    },
+    "org/jetbrains/kotlin#kotlin-serialization/2.0.21/gradle85": {
+      "jar": "sha256-wd9+ggYbMC3WH0hoOT54Uy/qeKprY7eBmybK9sJHRME="
+    },
+    "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": {
+      "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=",
+      "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI="
+    },
+    "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": {
+      "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY="
+    },
+    "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": {
+      "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=",
+      "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU="
+    },
+    "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.0.21": {
+      "jar": "sha256-cS9IB2Dt7uSKhDaea+ifarUjdUCLsso74U72Y/cr7jE=",
+      "pom": "sha256-TXE+dTi5Kh15cX6nHPHQI1eoThFFDEbLkuMgee40224="
+    },
+    "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": {
+      "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg="
+    },
+    "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": {
+      "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=",
+      "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4="
+    },
+    "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.0.21": {
+      "jar": "sha256-FcjArLMRSDwGjRaXUBllR0tw39gKx5WA7KOgPPUeSh0=",
+      "pom": "sha256-MQ1tXGVBPjEQuUAr2AdfyuP0vlGdH9kHMTahj+cnvFc="
+    },
+    "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": {
+      "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c="
+    },
+    "org/jetbrains/kotlin#kotlin-stdlib/1.9.10": {
+      "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=",
+      "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I="
+    },
+    "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": {
+      "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=",
+      "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=",
+      "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o="
+    },
+    "org/jetbrains/kotlin#kotlin-stdlib/2.0.21/all": {
+      "jar": "sha256-UP+t6yC00kVqUmWVpPep6FiJaCcVBz5s26Gx2A461Fg="
+    },
+    "org/jetbrains/kotlin#kotlin-tooling-core/2.0.21": {
+      "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=",
+      "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo="
+    },
+    "org/jetbrains/kotlin#kotlin-util-io/2.0.21": {
+      "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=",
+      "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA="
+    },
+    "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": {
+      "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=",
+      "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU="
+    },
+    "org/jetbrains/kotlin/kotlin-native-prebuilt/2.0.21/kotlin-native-prebuilt-2.0.21-macos-aarch64": {
+      "tar.gz": "sha256-yCN1mUlyXnBw9dwg063YIqMivAeo2Y1USfvb/I2Is1Q="
+    },
+    "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.21": {
+      "pom": "sha256-qWzO0nL6L6tLdB40cgtedO9RS0QRFSMD7fnBJ5V6R6o="
+    },
+    "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": {
+      "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE="
+    },
+    "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": {
+      "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=",
+      "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=",
+      "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ="
+    },
+    "org/jetbrains/kotlinx#kotlinx-html-jvm/0.11.0": {
+      "jar": "sha256-4nb9kD4yUy/2N0RxOj0QJeelDw94rEb75ZEOFZb9HD0=",
+      "module": "sha256-X7HkFdiYoGjNPuH5fEA8qMg7PtA7/WecP2Bs5wOKdw8=",
+      "pom": "sha256-JwybmESOeNZABjIDsKsWdqKS3YDjOj3hiMcvxcIuSVA="
+    },
+    "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.0": {
+      "pom": "sha256-xD5IdSnM/RIJ66hlOrjolZggNGSq+/5fBEje2ZKHFQk="
+    },
+    "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.8.0": {
+      "jar": "sha256-08lOnYKbum4MTNOuR4pAhG3UnVR11nB4d76FOXav5BY=",
+      "module": "sha256-NzH80jhWGpCpdSs0hfHWNeAbRF5Kd4F9ewd/S50vQi0=",
+      "pom": "sha256-QVKRtvWbeTemcau136BLJyl811jLUQLNzHWUFJj5wDw="
+    },
+    "org/jetbrains/kotlinx#kotlinx-serialization-core/1.8.0": {
+      "jar": "sha256-hThiUkHBX0SBQAQyDq6l32fpRK3FKwDduDGY1mTpIlE=",
+      "module": "sha256-mE2aqabpvMONfoNuqNAAsThyCH/GZY0NjWIldjPzlfE=",
+      "pom": "sha256-nVbnQWLOQn4MSetsuXUSR0Mq3PwukTw4KWY+27qr7hM="
+    },
+    "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.8.0": {
+      "jar": "sha256-e3xEWIDO+U3EZPRzPaGzO5S+54gFBB6giuBuhQfkYg4=",
+      "module": "sha256-l+NZl/6prZY63lv0wDko/lOXS4JlIdSwP7+zyrAgiqo=",
+      "pom": "sha256-4CSBj4YiByqIM8DTmVd3Uet3ZJymO9DA/AYATWaRd6Q="
+    },
+    "org/jetbrains/kotlinx#kotlinx-serialization-json/1.8.0": {
+      "jar": "sha256-+qvHPoVryerJe6GdPfT8Suh+FOKt0HZccEG8cupHobs=",
+      "module": "sha256-lK/eU8GRw+Hge5+AiqF3f4YryKlbxQtGYozQkhnVaFg=",
+      "pom": "sha256-WAgq+Zc0Ah1bjbKcQ1sR1FyhGxwP14bHhFIsnSxxeVg="
+    },
+    "org/jline#jline-native/3.23.0": {
+      "jar": "sha256-67QTkCH3PxmswV70H+XfOYk979pEqMt5EEfYT+hlUo8=",
+      "pom": "sha256-4R+TbRRFnwzlLXrIugQX+Jo0F7ZteARXYnIVZPynFJQ="
+    },
+    "org/jline#jline-parent/3.23.0": {
+      "pom": "sha256-FsBy+h0RKs7uO+J1KOm/FX+S++nSrLwiKhIpmRP8Y/4="
+    },
+    "org/jline#jline-reader/3.23.0": {
+      "jar": "sha256-8jn4QWZ3XwUZ+4ioqggjbWzLbfuCHy29DPPYeAp3yXw=",
+      "pom": "sha256-2v464XJ0coWwlqlcxBtcUJAvkRpgiEpJjt/eZ8QjzAE="
+    },
+    "org/jline#jline-terminal-jansi/3.23.0": {
+      "jar": "sha256-5J8/1WLzw+Yug9WNQnA8o9KMNdwIJ2z/J/qiicA/lRQ=",
+      "pom": "sha256-MEQFUqD44DBRCgJEGsJMGpLiWk3ztTSntHMgGmNLyks="
+    },
+    "org/jline#jline-terminal/3.23.0": {
+      "jar": "sha256-hwrs9UUhkKdKOJe0Esle6aeukqP+RPWpqLGi4uZqfhM=",
+      "pom": "sha256-8x3FciyLEYhUc6IZ0wJXKdjvUbL03xLjFJabA5/eaUU="
+    },
+    "org/junit#junit-bom/5.10.2": {
+      "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=",
+      "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg="
+    },
+    "org/junit#junit-bom/5.10.3": {
+      "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=",
+      "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw="
+    },
+    "org/junit#junit-bom/5.11.0": {
+      "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=",
+      "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0="
+    },
+    "org/junit#junit-bom/5.11.4": {
+      "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=",
+      "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU="
+    },
+    "org/junit#junit-bom/5.7.2": {
+      "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=",
+      "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs="
+    },
+    "org/junit#junit-bom/5.8.2": {
+      "module": "sha256-QM+tmT+nDs3yr3TQxW2hSE7iIJZL6Pkyz+YyvponM/o=",
+      "pom": "sha256-g2Bpyp6O48VuSDdiItopEmPxN70/0W2E/dR+/MPyhuI="
+    },
+    "org/junit#junit-bom/5.9.1": {
+      "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=",
+      "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw="
+    },
+    "org/junit#junit-bom/5.9.3": {
+      "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=",
+      "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc="
+    },
+    "org/junit/jupiter#junit-jupiter-api/5.11.4": {
+      "jar": "sha256-q4PvnlGsRZfVnSa0tYgSEpVQ4vV5pATIr30J9c5bQpM=",
+      "module": "sha256-puov77OqWGj9engK4doRYudt2jdgtIAVwqQZ0jcv88s=",
+      "pom": "sha256-US0j/znHZmWho2RVJiMLz4ib1JiEME9/6+BHsBjuszk="
+    },
+    "org/junit/jupiter#junit-jupiter-api/5.8.2": {
+      "jar": "sha256-GAjuh+D3GM1uJfO3WvwXlWrIo+3EjH6bq58Z+aeeOAE=",
+      "module": "sha256-fpr03/9iZ6zd0VfZ4Rug1dyRszL6dLxMZZOeRReht3A=",
+      "pom": "sha256-yb3jYieVswp3NTHoXFgy+NyKp37N0xPu4jXJg8v9Anc="
+    },
+    "org/junit/jupiter#junit-jupiter-engine/5.11.4": {
+      "jar": "sha256-zfisWfP613TKc4rQOJCVDuuRgz7w6JCHUxd+3SbxWBw=",
+      "module": "sha256-25EWOorwBaMnmFZd1nU3clGJWQ3qttoDsx292kVoahg=",
+      "pom": "sha256-sKMjsNA0REQdE9RjC0DbXvhBYNLC9YXU1kbcOIL5kgc="
+    },
+    "org/junit/jupiter#junit-jupiter-engine/5.8.2": {
+      "jar": "sha256-dTt3Js3RWLs0ztuUwWHiKRiW9HgyoentpT2XACCoGE4=",
+      "module": "sha256-pWIExxbCN5lwyo4/4qcuOgMM2QJzKNPOFFfdEMAVDn4=",
+      "pom": "sha256-Ckt92UuvnF+7ZaLpFz0IUii9ACQhNkgCWtBnAk8cZrs="
+    },
+    "org/junit/jupiter#junit-jupiter-params/5.11.4": {
+      "jar": "sha256-AqbgFd586UrH8lbn+gW4CR3qhh/nmlVaeZMxPQ9sfZY=",
+      "module": "sha256-WIZbi0uZi5qxnBP45BO34dSBk3TdXfaXYMTAsLxOmJU=",
+      "pom": "sha256-jDWbvqB8ZKas3YweE7T3cFiyQys16G6ald3GMkmgrVQ="
+    },
+    "org/junit/jupiter#junit-jupiter-params/5.8.2": {
+      "jar": "sha256-0cItb+VINWjAjIkT80q9IwNJDDSAzmwYouoxxl5EECo=",
+      "module": "sha256-UCPk4+wVbsa9PPZV8wcM/Fo+iq1dUbS74CWnkulJjXM=",
+      "pom": "sha256-tGngEBcBfYW8AlIlMCBS+kXPK1n5QVhCRzlGtPpJx8Y="
+    },
+    "org/junit/jupiter#junit-jupiter/5.8.2": {
+      "jar": "sha256-T1wcxkMiRM0W42qg4Ct0vONKgf+VoT1j1QlR7Ezj9L0=",
+      "module": "sha256-2d9Hs8dDGIOrHx8dggwpgOvL11PtxMgrmb9ewsUzrS4=",
+      "pom": "sha256-Q/Vic+es8z4PW10Qecf/pCRTHwHieUqdZHOt/RCkXS4="
+    },
+    "org/junit/platform#junit-platform-commons/1.11.4": {
+      "jar": "sha256-nt2Wmw0GcMVBBbyRrnm9HG9QPhIRX6uoIHO4TIa7wzQ=",
+      "module": "sha256-C54mJcj0aLPNQTLMCoBfif5B+FLRrf/3Xz6xRlyhy2s=",
+      "pom": "sha256-zRLSt8JC8WVUjtnJQGFg3O22CAkltHz3MeD9rl+0vOI="
+    },
+    "org/junit/platform#junit-platform-commons/1.8.2": {
+      "jar": "sha256-0uAV/KcTDnmvL0YI3FRBXksQtZLXczPey0saJ0wYUFA=",
+      "module": "sha256-NChH0wRv6kNVlWkttPBdXwOeDh0eIE9NV1WQJVcIJiY=",
+      "pom": "sha256-zoUuNMahhKpsgO6N8EcXE6dAgTQTTwjjwcPdh8a1mrc="
+    },
+    "org/junit/platform#junit-platform-engine/1.11.4": {
+      "jar": "sha256-sd2Zj2T5rK3BWWbZzT0IB0ZiZ3s+OQ8KOPy/C7THIzA=",
+      "module": "sha256-v2zh+1lR3Gx942re72rq9474LWODHFzOvOOI2p/F/iU=",
+      "pom": "sha256-lDRxV5mEIS++adA+3sfC/0+6sYiL4LgMJl6nCGn9ir0="
+    },
+    "org/junit/platform#junit-platform-engine/1.8.2": {
+      "jar": "sha256-C30AD4w+jl99a4GWSZNue5k4MU6HyPmDgFIY6ldWflk=",
+      "module": "sha256-66d7Nu/fdaZ/RkODM4JfnkSPVQ1SHnJJ2VA1hYDuY2s=",
+      "pom": "sha256-AWhkMmYGDtko71qBgjAD7PrnmpqMC7/Xb0IBxsnXccU="
+    },
+    "org/junit/platform#junit-platform-launcher/1.8.2": {
+      "jar": "sha256-giFWQJ/YPmguTFGZs0YAVCmbU4oFjCxtD1ybalvbdZQ=",
+      "module": "sha256-4XQA7HvnYIwfiI1yG0MAHpc2wVDUD5jIoLzalWPYyus=",
+      "pom": "sha256-tfancaautzyJpud/Vtcp9LqOta/dDxD0TbRNaq25UJU="
+    },
+    "org/msgpack#msgpack-core/0.9.8": {
+      "jar": "sha256-HTpha505JEfSb2siPsv75idr8of4H1SQsMSf9Vtob3w=",
+      "pom": "sha256-u4D60T5fabCRH95YrhGZHTB6n1j2+6UWY59lrL+3Kqg="
+    },
+    "org/openjdk/jmh#jmh-core/1.37": {
+      "jar": "sha256-3A6vK78ANqcLYHmMeF1uA6na8GtouO2w8bqes0IbrrM=",
+      "pom": "sha256-BEU74Abwb4bXxD88SS97TrM2JoDK5PHugLpl2yM3P1o="
+    },
+    "org/openjdk/jmh#jmh-generator-asm/1.37": {
+      "jar": "sha256-3im6zFw6QTIVgA9X3pAX/dobPLblNZ6gyE6+E8lhAiI=",
+      "pom": "sha256-TnnCVbmY4N8L97XZ+c+K5N0cS9CkYoYKqjWYvAmn9ps="
+    },
+    "org/openjdk/jmh#jmh-generator-bytecode/1.37": {
+      "jar": "sha256-YZs9FaXov8TsSdO3pk2+0FOgyoYlggpJpPhp0bjHHQk=",
+      "pom": "sha256-pYKmsrLkBBQXs66E2EQsjxOXEuSmMvdQEhmnfzxyLhg="
+    },
+    "org/openjdk/jmh#jmh-generator-reflection/1.37": {
+      "jar": "sha256-oEIdu+XndpDfLf3vmGGLYoUtgWu7gUxcvQtNRkv/MrA=",
+      "pom": "sha256-LTvap+ugIOZC4DP7pio/DHCy81HFA3KRiaBobOztk/Q="
+    },
+    "org/openjdk/jmh#jmh-parent/1.37": {
+      "pom": "sha256-DCTyFvNjfd52ORFPcCc6aX+FRvekxtWs1Mxtrum+9Mk="
+    },
+    "org/opentest4j#opentest4j/1.2.0": {
+      "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=",
+      "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ="
+    },
+    "org/opentest4j#opentest4j/1.3.0": {
+      "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+      "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+      "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
+    },
+    "org/organicdesign#Paguro/3.10.3": {
+      "jar": "sha256-/Uy9fOJDUeyhDTWUdqZfxQBz29CTlEk28i/LA27PtCE=",
+      "pom": "sha256-JLzMpVgDe1TwX9BC0cPkA6qx3FcHX9CvNDFY4ykVnvM="
+    },
+    "org/ow2#ow2/1.5": {
+      "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs="
+    },
+    "org/ow2#ow2/1.5.1": {
+      "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+    },
+    "org/ow2/asm#asm-bom/9.7": {
+      "pom": "sha256-jIZR874EOzV43SihXAFhhhsV6wObf1JHZ5wMwNvwd4c="
+    },
+    "org/ow2/asm#asm-commons/9.4": {
+      "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=",
+      "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk="
+    },
+    "org/ow2/asm#asm-tree/9.4": {
+      "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=",
+      "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY="
+    },
+    "org/ow2/asm#asm/9.0": {
+      "jar": "sha256-Dfl1dJFK7pL9NJ0MtOAPM0XUWywjngu1DwqQ6tR4iOA=",
+      "module": "sha256-ivgQlu06/6OaRyn8kApVtmOJSRHWfE1L7w6kJDk90/k=",
+      "pom": "sha256-3gNVWQ3Rv8zNyNeQJK6ZKXLoVSaKztua1oLQheA6lK0="
+    },
+    "org/ow2/asm#asm/9.4": {
+      "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=",
+      "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q="
+    },
+    "org/pkl-lang#pkl-config-java-all/0.25.0": {
+      "jar": "sha256-LY60xLafflMRbzLYGxbmvsaLNO0OHCZTpW02Rk8VKhs=",
+      "pom": "sha256-xPMxhJFlYwvKLrOJSTrg82IjMoXHxqQudDvvam5P9zo="
+    },
+    "org/slf4j#slf4j-api/1.7.36": {
+      "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=",
+      "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ="
+    },
+    "org/slf4j#slf4j-api/2.0.16": {
+      "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=",
+      "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c="
+    },
+    "org/slf4j#slf4j-bom/2.0.16": {
+      "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk="
+    },
+    "org/slf4j#slf4j-parent/1.7.36": {
+      "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI="
+    },
+    "org/slf4j#slf4j-parent/2.0.16": {
+      "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU="
+    },
+    "org/slf4j#slf4j-simple/1.7.36": {
+      "jar": "sha256-Lzm+2UPWJN+o9BAtBXEoOhCHC2qjbxl6ilBvFHAQwQ8=",
+      "pom": "sha256-xWuAoKa+oqBGPnDQiSrjOKnlB+SGdnpSBFNAmBIFjRs="
+    },
+    "org/snakeyaml#snakeyaml-engine/2.9": {
+      "jar": "sha256-L3qVdGG21wwABeLDW3ihyXvvbERnBMDuk5POmOSVi6g=",
+      "pom": "sha256-9toG5chpkBVwSG0VOlKn/y1iHc93AIG5MkUxCEUl9to="
+    },
+    "org/sonatype/oss#oss-parent/5": {
+      "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0="
+    },
+    "org/sonatype/oss#oss-parent/7": {
+      "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+    },
+    "org/sonatype/oss#oss-parent/9": {
+      "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+    },
+    "org/springframework#spring-framework-bom/5.3.24": {
+      "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=",
+      "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE="
+    },
+    "org/testcontainers#testcontainers-bom/1.20.1": {
+      "pom": "sha256-CKrS6R3QXKeycG0t/Ap66AxLXFBHAweZyLzbcyfLL0A="
+    },
+    "org/tukaani#xz/1.9": {
+      "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=",
+      "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo="
+    },
+    "org/vafer#jdependency/2.8.0": {
+      "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=",
+      "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0="
+    },
+    "org/wiremock#wiremock/3.11.0": {
+      "jar": "sha256-8EApsHzgUi6AIOT8x/qCDn+3G7lsHpt2I3BCetaRrmo=",
+      "module": "sha256-zD3mqIz4B/lBxfwFgCBh4ndW6wf7b5JHNdRg6/K8/WM=",
+      "pom": "sha256-xpeUPhqOWaXna1Ot+t9mrs19tK600pl5XN9ZSsTSzGQ="
+    },
+    "org/xmlunit#xmlunit-core/2.10.0": {
+      "jar": "sha256-P4mwpinT2cymbhX43eXglHhS+kQXK8d+om7fluPk/Pg=",
+      "pom": "sha256-dm2pvAtCrYEk6vJw6zEgRBdaZWCSkc8coSxXg3iemA0="
+    },
+    "org/xmlunit#xmlunit-legacy/2.10.0": {
+      "jar": "sha256-ICdKuflsM6ZFqlWZ4x9CwS6sXbdb39tO0YfdVGllOZg=",
+      "pom": "sha256-B0sBekWQP79QoP3faxekM90lzFQDmMGvuG+tkOxxwmg="
+    },
+    "org/xmlunit#xmlunit-parent/2.10.0": {
+      "pom": "sha256-XOnCkW1QdlQJ78IKgQf5jvF3BAzr4LG4VwSI4h0JYcc="
+    },
+    "org/xmlunit#xmlunit-placeholders/2.10.0": {
+      "jar": "sha256-AED12T/KxmKkYFSJO5Pog8T5yyZvoRWtQ1kDPp265pI=",
+      "pom": "sha256-41+qK1zuBc03FaViqCOoA4/PQyp97WWZny0lBaGMSes="
+    },
+    "org/yaml#snakeyaml/2.3": {
+      "jar": "sha256-Y6dv5mtlI2C9TCwQfm8CWNqn1LtJIAi6jCb80jD/kUY=",
+      "pom": "sha256-D1omWgYzGwBJ41K+MsoyLeGLF/PU27cGNdQNppLjWC8="
+    }
+  }
+}
diff --git a/pkgs/by-name/pk/pkl/disable_bad_tests.patch b/pkgs/by-name/pk/pkl/disable_bad_tests.patch
new file mode 100644
index 000000000000..6c8028cedda9
--- /dev/null
+++ b/pkgs/by-name/pk/pkl/disable_bad_tests.patch
@@ -0,0 +1,12 @@
+diff --git i/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt w/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt
+index df88c423..ae1db500 100644
+--- i/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt
++++ w/pkl-cli/src/test/kotlin/org/pkl/cli/CliEvaluatorTest.kt
+@@ -1497,6 +1497,7 @@ result = someLib.x
+     assertThat(output).isEqualTo("result = 1\n")
+   }
+ 
++  @Disabled
+   @Test
+   fun `eval file with non-ASCII name`() {
+     val tempDirUri = tempDir.toUri()
diff --git a/pkgs/by-name/pk/pkl/disable_gradle_codegen_tests.patch b/pkgs/by-name/pk/pkl/disable_gradle_codegen_tests.patch
new file mode 100644
index 000000000000..9d12ec70e9cd
--- /dev/null
+++ b/pkgs/by-name/pk/pkl/disable_gradle_codegen_tests.patch
@@ -0,0 +1,65 @@
+diff --git a/pkl-gradle/src/test/kotlin/org/pkl/gradle/JavaCodeGeneratorsTest.kt b/pkl-gradle/src/test/kotlin/org/pkl/gradle/JavaCodeGeneratorsTest.kt
+index 68a5b533..84fe66df 100644
+--- a/pkl-gradle/src/test/kotlin/org/pkl/gradle/JavaCodeGeneratorsTest.kt
++++ b/pkl-gradle/src/test/kotlin/org/pkl/gradle/JavaCodeGeneratorsTest.kt
+@@ -18,9 +18,11 @@ package org.pkl.gradle
+ import kotlin.io.path.listDirectoryEntries
+ import kotlin.io.path.readText
+ import org.assertj.core.api.Assertions.assertThat
++import org.junit.jupiter.api.Disabled;
+ import org.junit.jupiter.api.Test
+ 
+ class JavaCodeGeneratorsTest : AbstractTest() {
++  @Disabled("runTask doesn't use the MITM cache")
+   @Test
+   fun `generate code`() {
+     writeBuildFile()
+@@ -68,6 +70,7 @@ class JavaCodeGeneratorsTest : AbstractTest() {
+     )
+   }
+ 
++  @Disabled("runTask doesn't use the MITM cache")
+   @Test
+   fun `compile generated code`() {
+     writeBuildFile()
+@@ -84,6 +87,7 @@ class JavaCodeGeneratorsTest : AbstractTest() {
+     assertThat(addressClassFile).exists()
+   }
+ 
++  @Disabled("runTask doesn't use the MITM cache")
+   @Test
+   fun `no source modules`() {
+     writeFile(
+diff --git a/pkl-gradle/src/test/kotlin/org/pkl/gradle/KotlinCodeGeneratorsTest.kt b/pkl-gradle/src/test/kotlin/org/pkl/gradle/KotlinCodeGeneratorsTest.kt
+index 2b9ffc88..99b91893 100644
+--- a/pkl-gradle/src/test/kotlin/org/pkl/gradle/KotlinCodeGeneratorsTest.kt
++++ b/pkl-gradle/src/test/kotlin/org/pkl/gradle/KotlinCodeGeneratorsTest.kt
+@@ -18,9 +18,11 @@ package org.pkl.gradle
+ import kotlin.io.path.listDirectoryEntries
+ import kotlin.io.path.readText
+ import org.assertj.core.api.Assertions.assertThat
++import org.junit.jupiter.api.Disabled;
+ import org.junit.jupiter.api.Test
+ 
+ class KotlinCodeGeneratorsTest : AbstractTest() {
++  @Disabled("runTask doesn't use the MITM cache")
+   @Test
+   fun `generate code`() {
+     writeBuildFile()
+@@ -69,6 +71,7 @@ class KotlinCodeGeneratorsTest : AbstractTest() {
+     )
+   }
+ 
++  @Disabled("runTask doesn't use the MITM cache")
+   @Test
+   fun `compile generated code`() {
+     writeBuildFile()
+@@ -84,6 +87,7 @@ class KotlinCodeGeneratorsTest : AbstractTest() {
+     assertThat(addressClassFile).exists()
+   }
+ 
++  @Disabled("runTask doesn't use the MITM cache")
+   @Test
+   fun `no source modules`() {
+     writeFile(
+
diff --git a/pkgs/by-name/pk/pkl/fix_kotlin_classpath.patch b/pkgs/by-name/pk/pkl/fix_kotlin_classpath.patch
new file mode 100644
index 000000000000..98b583b7b5ac
--- /dev/null
+++ b/pkgs/by-name/pk/pkl/fix_kotlin_classpath.patch
@@ -0,0 +1,14 @@
+diff --git a/pkl-gradle/pkl-gradle.gradle.kts b/pkl-gradle/pkl-gradle.gradle.kts
+index 08f0e8ca..a16c7073 100644
+--- a/pkl-gradle/pkl-gradle.gradle.kts
++++ b/pkl-gradle/pkl-gradle.gradle.kts
+@@ -58,7 +58,7 @@ sourceSets {
+     // if `compileClasspath` is filtered, causing "unresolved reference" errors in IntelliJ.
+     // As a workaround, don't perform filtering for IntelliJ (import).
+     if (System.getProperty("idea.sync.active") == null) {
+-      compileClasspath = compileClasspath.filter { !(it.path.contains("dists")) }
++      compileClasspath = compileClasspath.filter { !(it.path.contains("@gradle@") || it.path.contains("generated-gradle-jars/gradle-api-")) }
+     }
+   }
+ }
+
diff --git a/pkgs/by-name/pk/pkl/package.nix b/pkgs/by-name/pk/pkl/package.nix
new file mode 100644
index 000000000000..9d023e18779b
--- /dev/null
+++ b/pkgs/by-name/pk/pkl/package.nix
@@ -0,0 +1,101 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  gradle,
+  temurin-bin-21,
+  kotlin,
+  nix-update-script,
+  replaceVars,
+  makeWrapper,
+}:
+let
+  jdk = temurin-bin-21;
+  gradleOverlay = gradle.override { java = jdk; };
+  kotlinOverlay = kotlin.override { jre = jdk; };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pkl";
+  version = "0.28.2";
+
+  src = fetchFromGitHub {
+    owner = "apple";
+    repo = "pkl";
+    tag = finalAttrs.version;
+    hash = "sha256-ay3V3EWqZHncLH6UR4JOCChkweNcilDeskXzaeAFTR8=";
+    leaveDotGit = true;
+    postFetch = ''
+      pushd $out
+      git rev-parse HEAD | tr -d '\n' > .commit-hash
+      rm -rf .git
+      popd
+    '';
+  };
+
+  patches = [
+    (replaceVars ./fix_kotlin_classpath.patch { gradle = gradle.unwrapped; })
+    ./disable_gradle_codegen_tests.patch
+    ./disable_bad_tests.patch
+  ];
+
+  nativeBuildInputs = [
+    gradleOverlay
+    jdk
+    kotlinOverlay
+    makeWrapper
+  ];
+
+  mitmCache = gradle.fetchDeps {
+    inherit (finalAttrs) pname;
+    data = ./deps.json;
+  };
+
+  doCheck = !(stdenv.hostPlatform.isDarwin);
+
+  gradleFlags = [
+    "-x"
+    "spotlessCheck"
+    "-DreleaseBuild=true"
+    "-Dorg.gradle.java.home=${jdk}"
+    "-Porg.gradle.java.installations.auto-download=false"
+    "-Porg.gradle.java.installations.auto-detect=false"
+  ];
+
+  preBuild = ''
+    gradleFlagsArray+=(-DcommitId=$(cat .commit-hash))
+  '';
+
+  JAVA_TOOL_OPTIONS = "-Dfile.encoding=utf-8";
+  __darwinAllowLocalNetworking = true;
+
+  preCheck = ''
+    export LANG=C.UTF-8
+    export LC_ALL=C.UTF-8
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/bin" "$out/opt/pkl"
+    cp ./pkl-cli/build/executable/jpkl "$out/opt/pkl/jpkl.jar"
+
+    makeWrapper ${lib.getExe jdk} $out/bin/pkl --add-flags "-jar $out/opt/pkl/jpkl.jar"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Configuration-as-code language with rich validation and tooling";
+    homepage = "https://pkl-lang.org";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ hugolgst ];
+    mainProgram = "pkl";
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode # mitm cache
+    ];
+  };
+})

From 3e5e7715e7a381fa0c8a75767424b313b58ee968 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 00:41:59 +0000
Subject: [PATCH 82/95] mbuffer: 20241007 -> 20250429

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

diff --git a/pkgs/by-name/mb/mbuffer/package.nix b/pkgs/by-name/mb/mbuffer/package.nix
index d20292c5269c..c5af0a7ac44c 100644
--- a/pkgs/by-name/mb/mbuffer/package.nix
+++ b/pkgs/by-name/mb/mbuffer/package.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mbuffer";
-  version = "20241007";
+  version = "20250429";
   outputs = [
     "out"
     "man"
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${finalAttrs.version}.tgz";
-    sha256 = "sha256-nXNjAQtO9FsWRva19QJ7SbtqIJxQL7hOKBx713HVa+0=";
+    sha256 = "sha256-qFPvcg1fw+9HwXiPlldHe3bXCrDJuKfZbpleMeNTa78=";
   };
 
   buildInputs = [

From d4ea574d8e29e1d88c0fdb85b77ad5147373fe9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 15:42:42 +0000
Subject: [PATCH 83/95] python312Packages.ufomerge: 1.8.3 -> 1.9.1

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

diff --git a/pkgs/development/python-modules/ufomerge/default.nix b/pkgs/development/python-modules/ufomerge/default.nix
index ed03839cfa3e..f213db1f0825 100644
--- a/pkgs/development/python-modules/ufomerge/default.nix
+++ b/pkgs/development/python-modules/ufomerge/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "ufomerge";
-  version = "1.8.3";
+  version = "1.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "ufomerge";
     tag = "v${version}";
-    hash = "sha256-E/RgFJXyA6/ZktsjydqDecysi03+XQDOD0SeH3rlFZI=";
+    hash = "sha256-Efpfmow9tfPcE9ri13CKfahBDjaiMK1NBUAbG8FhYlM=";
   };
 
   build-system = [

From 15dab23a42759a33cb4288fd17195d5fc09aeab2 Mon Sep 17 00:00:00 2001
From: Juul-Mc-Goa <jules.magois.pro@proton.me>
Date: Thu, 1 May 2025 17:46:05 +0200
Subject: [PATCH 84/95] mixxx: 2.5.0 -> 2.5.1

---
 pkgs/applications/audio/mixxx/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 3c22cdbe3ffe..fd404d0e2b45 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -57,13 +57,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mixxx";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "mixxxdj";
     repo = "mixxx";
-    rev = "9e3f9bfbac5c6fde7c4ee5fed2b550aa62060a95";
-    hash = "sha256-9z4UqmXR/n1CCr1/YzTNl5SdRgbZgN/i1JNfA4TLaXU=";
+    rev = version;
+    hash = "sha256-s66XrcMGgA8KvBDxljg95nbKW1pIv8rJJ+DyxirHwDo=";
   };
 
   nativeBuildInputs = [

From 76c48d819fdfd18c6705403b96c23fcd3b66a68d Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 10 Apr 2025 19:38:37 +0200
Subject: [PATCH 85/95] davmail: remove env-vars from output

---
 pkgs/applications/networking/davmail/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix
index 9a49603f61da..9f19363d74fd 100644
--- a/pkgs/applications/networking/davmail/default.nix
+++ b/pkgs/applications/networking/davmail/default.nix
@@ -1,6 +1,6 @@
 {
   stdenv,
-  fetchurl,
+  fetchzip,
   lib,
   makeWrapper,
   unzip,
@@ -25,17 +25,16 @@ stdenv.mkDerivation rec {
   pname = "davmail";
   version = "6.3.0";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip";
-    hash = "sha256-Yh61ZHsEMF6SchLEyBV3rRI7pJ/bvR2K4G8U6jrPa3A=";
+    hash = "sha256-zJMwCFX/uJnLeThj6/t2usBRM+LIuamZt0EFLG3N+8k=";
+    stripRoot = false;
   };
 
   postPatch = ''
     sed -i -e '/^JAVA_OPTS/d' davmail
   '';
 
-  sourceRoot = ".";
-
   nativeBuildInputs = [
     makeWrapper
     unzip

From 10a6fe9487c55bcee896445991406c516f1c1e31 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 10 Apr 2025 19:38:38 +0200
Subject: [PATCH 86/95] geoserver: remove env-vars from output

---
 pkgs/by-name/ge/geoserver/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix
index 0cac26e6a027..0cee73f25f50 100644
--- a/pkgs/by-name/ge/geoserver/package.nix
+++ b/pkgs/by-name/ge/geoserver/package.nix
@@ -17,12 +17,19 @@ stdenv.mkDerivation (finalAttrs: rec {
     hash = "sha256-bhL+u+BoKgW2cwOXEzaq0h07dKFz9u9WB2jW8nAF0vI=";
   };
 
+  sourceRoot = "source";
+
+  unpackPhase = ''
+    runHook preUnpack
+    unzip $src -d "$sourceRoot"
+    runHook postUnpack
+  '';
+
   patches = [
     # set GEOSERVER_DATA_DIR to current working directory if not provided
     ./data-dir.patch
   ];
 
-  sourceRoot = ".";
   nativeBuildInputs = [
     unzip
     makeWrapper

From 8bf098259ead32c8d3581af2e8cd991058f48f0d Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 10 Apr 2025 19:38:38 +0200
Subject: [PATCH 87/95] ombi: remove env-vars from output

---
 pkgs/servers/ombi/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix
index c537a3de6907..35097500bf0a 100644
--- a/pkgs/servers/ombi/default.nix
+++ b/pkgs/servers/ombi/default.nix
@@ -35,13 +35,20 @@ stdenv.mkDerivation rec {
   pname = "ombi";
   version = "4.47.1";
 
-  sourceRoot = ".";
-
   src = fetchurl {
     url = "https://github.com/Ombi-app/Ombi/releases/download/v${version}/${os}-${arch}.tar.gz";
     sha256 = hash;
   };
 
+  sourceRoot = "source";
+
+  unpackPhase = ''
+    runHook preUnpack
+    mkdir -p "$sourceRoot"
+    tar xf $src --directory="$sourceRoot"
+    runHook postUnpack
+  '';
+
   nativeBuildInputs =
     [ makeWrapper ]
     ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook

From 9dbb7d345925fbd91a73fe02a3867ee02591019b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 10 Apr 2025 19:38:38 +0200
Subject: [PATCH 88/95] powershell: remove env-vars from output

---
 pkgs/by-name/po/powershell/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/po/powershell/package.nix b/pkgs/by-name/po/powershell/package.nix
index 6845d30445ec..258528daa8c3 100644
--- a/pkgs/by-name/po/powershell/package.nix
+++ b/pkgs/by-name/po/powershell/package.nix
@@ -38,7 +38,14 @@ stdenv.mkDerivation rec {
     passthru.sources.${stdenv.hostPlatform.system}
       or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
-  sourceRoot = ".";
+  sourceRoot = "source";
+
+  unpackPhase = ''
+    runHook preUnpack
+    mkdir -p "$sourceRoot"
+    tar xf $src --directory="$sourceRoot"
+    runHook postUnpack
+  '';
 
   strictDeps = true;
 

From 8062d9b70c386366484c8c2cffd0e731f35964e6 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 10 Apr 2025 19:38:39 +0200
Subject: [PATCH 89/95] unihan-database: remove env-vars from output

---
 pkgs/by-name/un/unihan-database/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/un/unihan-database/package.nix b/pkgs/by-name/un/unihan-database/package.nix
index 1cabda4b99dd..e3b2d493c644 100644
--- a/pkgs/by-name/un/unihan-database/package.nix
+++ b/pkgs/by-name/un/unihan-database/package.nix
@@ -18,7 +18,13 @@ stdenv.mkDerivation rec {
     unzip
   ];
 
-  sourceRoot = ".";
+  sourceRoot = "source";
+
+  unpackPhase = ''
+    runHook preUnpack
+    unzip $src -d $sourceRoot
+    runHook postUnpack
+  '';
 
   installPhase = ''
     runHook preInstall

From c68da34e753630939d51d1c029a18411a0f8b845 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 10 Apr 2025 19:38:39 +0200
Subject: [PATCH 90/95] xmage: remove env-vars from output

---
 pkgs/by-name/xm/xmage/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/xm/xmage/package.nix b/pkgs/by-name/xm/xmage/package.nix
index 2fb74e7215a9..5dfb04c6b195 100644
--- a/pkgs/by-name/xm/xmage/package.nix
+++ b/pkgs/by-name/xm/xmage/package.nix
@@ -17,8 +17,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   preferLocalBuild = true;
 
+  nativeBuildInputs = [ unzrip ];
+
+  sourceRoot = "source";
+
   unpackPhase = ''
-    ${unzrip}/bin/unzrip $src
+    runHook preUnpack
+    unzrip $src -d "$sourceRoot"
+    runHook postUnpack
   '';
 
   installPhase =

From bdf596866e71b03c09450414ec5874c3554fc768 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 10 Apr 2025 19:40:46 +0200
Subject: [PATCH 91/95] dotnetPackages.{NewtonsoftJson,Paket}: remove env-vars
 from output

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 1ba6d4a24785..37a7a298b088 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -175,6 +175,7 @@ let
       version = "11.0.2";
       sha256 = "07na27n4mlw77f3hg5jpayzxll7f4gyna6x7k9cybmxpbs6l77k7";
       outputFiles = [ "*" ];
+      postInstall = "rm $target/env-vars"; # fetchNuGet already sets preInstall
     };
 
     Paket = fetchNuGet {
@@ -182,6 +183,7 @@ let
       version = "5.179.1";
       sha256 = "11rzna03i145qj08hwrynya548fwk8xzxmg65swyaf19jd7gzg82";
       outputFiles = [ "*" ];
+      postInstall = "rm $target/env-vars"; # fetchNuGet already sets preInstall
     };
 
   };

From 441ea5a9f4273f622677bb557c13fad3706cdb37 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 30 Apr 2025 06:31:01 +0800
Subject: [PATCH 92/95] libation: 11.5.5 -> 12.3.1

Diff: https://github.com/rmcrackan/Libation/compare/v11.5.5...v12.3.1

Changelog: https://github.com/rmcrackan/Libation/releases/tag/v12.3.1
---
 pkgs/by-name/li/libation/deps.json   | 926 +++++++++++----------------
 pkgs/by-name/li/libation/package.nix |  22 +-
 2 files changed, 376 insertions(+), 572 deletions(-)

diff --git a/pkgs/by-name/li/libation/deps.json b/pkgs/by-name/li/libation/deps.json
index d43c081d300b..ed15ed24cf79 100644
--- a/pkgs/by-name/li/libation/deps.json
+++ b/pkgs/by-name/li/libation/deps.json
@@ -1,108 +1,108 @@
 [
   {
     "pname": "AAXClean",
-    "version": "1.1.2",
-    "hash": "sha256-Abgf22iixOsF1VnVfbutYPtPuUonq0G+aSynhOMLtkM="
+    "version": "2.0.1.1",
+    "hash": "sha256-3xjH9bEapK/LXsJnnAbIHJyIv2BaWyS61gOrsLcv/Xo="
   },
   {
     "pname": "AAXClean.Codecs",
-    "version": "1.1.3",
-    "hash": "sha256-SPbynIf6vtDfnfTWcfpn7WiwKHD15CogCIEyTTVMEkM="
+    "version": "2.0.1.1",
+    "hash": "sha256-4tN56SIHiAkvGCTffUoIGRrmfV2pzetITIMbtmj2cXw="
   },
   {
     "pname": "AudibleApi",
-    "version": "9.2.0.1",
-    "hash": "sha256-2NcRx+2sBLQDmXA+lLFnpGj9/IzyxYnvE5doQP9oCQ8="
+    "version": "9.4.0.1",
+    "hash": "sha256-M8+6dTpNXkY/wIXlyVAqzjXFy9HpR32fDbvc2kCTJwU="
   },
   {
     "pname": "Avalonia",
-    "version": "11.0.5",
-    "hash": "sha256-BqpHqQIObTb7DHTyZAgCD9A5I0pZkHhSoPTN2g6/G9E="
+    "version": "11.2.8",
+    "hash": "sha256-GbZIXopQh6VSRLAg47TRWHvMYEl5/c7rtvNmFnlDhAo="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
-    "version": "2.1.0.2023020321",
-    "hash": "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="
+    "version": "2.1.22045.20230930",
+    "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
   },
   {
     "pname": "Avalonia.BuildServices",
-    "version": "0.0.29",
-    "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="
+    "version": "0.0.31",
+    "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.0.5",
-    "hash": "sha256-Iob8OyWhwXhmHKCdnea7dtL9VQvcrf6/gUGHJ30CKXA="
+    "version": "11.2.8",
+    "hash": "sha256-jcCErs44R9tl6zjMkRxdwU9lBxv13MOZMi9Hcm7Tals="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.0.5",
-    "hash": "sha256-2iVuMPRw7sbsYPGSG4XjQFGFky5WB5B05Jh1+I852ZI="
+    "version": "11.2.8",
+    "hash": "sha256-bAbHI5bKyTYksXsnOS5poBBxdhYQE/HSj52YxqGvkok="
   },
   {
     "pname": "Avalonia.Controls.ItemsRepeater",
-    "version": "11.0.5",
-    "hash": "sha256-e/PyjYtJx0TFPSYS/jLBG7HC2x7o4qJ3NR2T+xchV0w="
+    "version": "11.1.5",
+    "hash": "sha256-k4ZYqXFtyLet3wJB4ZJvaPYbcl0K0oKK04yoesbmCXQ="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.0.5",
-    "hash": "sha256-UKVibxhJoGNvEGh8J/Z0sq8J81FT8yth/yXVPSFHF/8="
+    "version": "11.2.8",
+    "hash": "sha256-Mr2x3hm3ArlQwGlWO9MuFWUelf4EVmVPAGANm1MxM1o="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.0.5",
-    "hash": "sha256-0cUxPYJP2W11wnM6j4qNB3IvHlsUp9EZlY8I/NoAmd4="
+    "version": "11.2.8",
+    "hash": "sha256-3+88G0O1LrQSCSxI6s0aFD34nhgqTH1b3rMXBaXqY0M="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.0.5",
-    "hash": "sha256-O20fC/9YXO3/MZNlh1EgWLHFSyi/ao083MKwjetgxmo="
+    "version": "11.2.8",
+    "hash": "sha256-X9VxRmeK6Vu8c9ILtF/KyDi0B0CmjeZcTRnwouCYOWg="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.0.5",
-    "hash": "sha256-KVUAXXT+f4VrtJ8widfEIzN25GBbtXWog/tpM354gdg="
+    "version": "11.2.8",
+    "hash": "sha256-YVjhd2fjOamYdYEh4jGGZy06xPAq3juTH2nC7cOlGOA="
   },
   {
     "pname": "Avalonia.ReactiveUI",
-    "version": "11.0.5",
-    "hash": "sha256-8tGLyA0PRKt1REb9YeCtEDz5oB886PRG35aO0uZm/jU="
+    "version": "11.2.8",
+    "hash": "sha256-ReMIcC/paWEVWVI8saKhy9j/W4NN89+MNY80GHztUAQ="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.0.5",
-    "hash": "sha256-wTqdxPU3Ql7jC4JFkChbUfaRR0nqUKrYKn8oexdFyig="
+    "version": "11.2.8",
+    "hash": "sha256-v30kDbStvHAS4IOV0wEkWYXOdh4SdjaDEcKVD+6xpzc="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.0.5",
-    "hash": "sha256-rKOgkNLCwEVVcyLCimvhDUDKXnrDOguUryaGVOPFFwE="
+    "version": "11.2.8",
+    "hash": "sha256-V84jNsrMNguAt9ZdSEf74F4OTC3WyXLuLrkByxfHJe4="
   },
   {
     "pname": "Avalonia.Themes.Fluent",
-    "version": "11.0.5",
-    "hash": "sha256-ETOaNvRzTAC0uEVVB3noiyYM9N9nPrPnMwCqiFgID/4="
+    "version": "11.2.8",
+    "hash": "sha256-qHwn8BPAPHxNJ3Ya3xPUhEzItXVjNbI5YjEsNqQLJ8s="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.0.5",
-    "hash": "sha256-27evmgSrIx+EopF6E3N1cT7BvAUc/s99TVEMfmG83cQ="
+    "version": "11.2.8",
+    "hash": "sha256-vEFjwS+X6EkxVXDFk97b4S4AjbLVjPD3dYVADrBnoXo="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.0.5",
-    "hash": "sha256-ncZLGKhpfjuuVPz4Fs+P6L3dM0KRnwAC3xJRqyvpKw8="
+    "version": "11.2.8",
+    "hash": "sha256-3XYJXXT9IMECwCNbrzV49x0pyJZx6Vbib53Vbe9Gfjg="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.0.5",
-    "hash": "sha256-rvs3hwRh3F5E1j3JqcodWJTHV3BTWMKkvzq170tuPa4="
+    "version": "11.2.8",
+    "hash": "sha256-+m8pNxda2vyFVBR+7IhkTaQ4Zm7gqkT0XgKSp+lWWmA="
   },
   {
     "pname": "BouncyCastle.Cryptography",
-    "version": "2.3.0",
-    "hash": "sha256-TIBOegJAEfFRyvtwuPakvKsQbqoPHj1RSTmK7SKYsf0="
+    "version": "2.3.1",
+    "hash": "sha256-r/vNfB00Cjqt1/eFeFdYAoblVhcUuxBRuVUEtqLIT3E="
   },
   {
     "pname": "CommandLineParser",
@@ -116,18 +116,23 @@
   },
   {
     "pname": "Dinah.Core",
-    "version": "8.0.0.1",
-    "hash": "sha256-jYAaIqv67DOl+l+i92QmV7TM3YXL250D8XUZ7dZh1s0="
+    "version": "9.0.0.1",
+    "hash": "sha256-tHuHWUgzj0ZmcXwnnkLPkWwRj0KWy9Y9gxae2cA/qJk="
+  },
+  {
+    "pname": "Dinah.Core",
+    "version": "9.0.1.1",
+    "hash": "sha256-54TDRMzCDNYzEeyFvaNULuucQ3PcVeI3FDLHHRfsJDI="
   },
   {
     "pname": "Dinah.EntityFrameworkCore",
-    "version": "8.0.0.1",
-    "hash": "sha256-xTKKCBE2KfXqUaRMZqgohQmUi51GrWvaIWTW66nRRYQ="
+    "version": "9.0.0.1",
+    "hash": "sha256-OFLJW8MJpMq2iGb8I7R9SSPzZYQhmoW/e0h6mRuLbuc="
   },
   {
     "pname": "DynamicData",
-    "version": "7.9.5",
-    "hash": "sha256-3XjOMuFathku9oWyss360+Ze5UMP7tSmUbMoax7qONU="
+    "version": "8.4.1",
+    "hash": "sha256-r+haH5VlmZFJTEJ3UedsYybw+oddn/CSvfm6x7PrrQ4="
   },
   {
     "pname": "Enums.NET",
@@ -136,38 +141,48 @@
   },
   {
     "pname": "ExtendedNumerics.BigDecimal",
-    "version": "2023.1000.0.230",
-    "hash": "sha256-THVfKgtJoier9RfJamO1a+F1ufVRSWoMw+0lerxxdC8="
+    "version": "2025.1001.2.129",
+    "hash": "sha256-LAlD9SWsKfXxMu0XTqxPBvWuN6MrBnETrWs8BVNDsVk="
+  },
+  {
+    "pname": "Google.Protobuf",
+    "version": "3.30.2",
+    "hash": "sha256-GbyaRLeBNyvJrx4+SkgewClk1nCTtdE7sNqnSjk8VBM="
   },
   {
     "pname": "HarfBuzzSharp",
-    "version": "2.8.2.3",
-    "hash": "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="
+    "version": "7.3.0.3",
+    "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "2.8.2.3",
-    "hash": "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="
+    "version": "7.3.0.3",
+    "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "2.8.2.3",
-    "hash": "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="
+    "version": "7.3.0.3",
+    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
-    "version": "2.8.2.3",
-    "hash": "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="
+    "version": "7.3.0.3",
+    "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Win32",
-    "version": "2.8.2.3",
-    "hash": "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="
+    "version": "7.3.0.3",
+    "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
   },
   {
     "pname": "HtmlAgilityPack",
-    "version": "1.11.54",
-    "hash": "sha256-Cl3l5H5qYOn6fEzX9cl1eMn43l7C13a+tBOAVD1oGp0="
+    "version": "1.11.71",
+    "hash": "sha256-ddNrIXTfiu8gwrUs/5xYDjpD0sOth90kut6qCgxGUSE="
+  },
+  {
+    "pname": "HtmlAgilityPack",
+    "version": "1.12.0",
+    "hash": "sha256-Ps3IfNHKCosY4yg1QAj4aldMHni8u1JnlMre0fLcjHo="
   },
   {
     "pname": "Humanizer.Core",
@@ -176,8 +191,8 @@
   },
   {
     "pname": "LuceneNet303r2",
-    "version": "3.0.3.8",
-    "hash": "sha256-mHfa5OzVff2q5MIgefih9Y269qQKe7It/6G4IwT2Meg="
+    "version": "3.0.3.9",
+    "hash": "sha256-8k9JZMikpSsVKFMSg9CK19YbJFJ9ifpYCKaEtC+f7mY="
   },
   {
     "pname": "MathNet.Numerics.Signed",
@@ -191,213 +206,273 @@
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "6.0.0",
-    "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
+    "version": "7.0.0",
+    "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="
+  },
+  {
+    "pname": "Microsoft.Build.Framework",
+    "version": "16.10.0",
+    "hash": "sha256-Sj41LE1YQ/NfOdiDf5YnZgWSwGOzQ2uVvP1LgF/HSJ0="
+  },
+  {
+    "pname": "Microsoft.Build.Framework",
+    "version": "17.8.3",
+    "hash": "sha256-Rp4dN8ejOXqclIKMUXYvIliM6IYB7WMckMLwdCbVZ34="
+  },
+  {
+    "pname": "Microsoft.Build.Locator",
+    "version": "1.7.8",
+    "hash": "sha256-VhZ4jiJi17Cd5AkENXL1tjG9dV/oGj0aY67IGYd7vNs="
+  },
+  {
+    "pname": "Microsoft.Build.Tasks.Git",
+    "version": "8.0.0",
+    "hash": "sha256-vX6/kPij8vNAu8f7rrvHHhPrNph20IcufmrBgZNxpQA="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "3.0.0",
-    "hash": "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="
-  },
-  {
-    "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "3.3.3",
-    "hash": "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="
+    "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.5.0",
-    "hash": "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I="
+    "version": "4.8.0",
+    "hash": "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4="
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "3.8.0",
-    "hash": "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="
-  },
-  {
-    "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "4.5.0",
-    "hash": "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A="
-  },
-  {
-    "pname": "Microsoft.CodeAnalysis.CSharp.Scripting",
-    "version": "3.8.0",
-    "hash": "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="
+    "version": "4.8.0",
+    "hash": "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU="
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
-    "version": "4.5.0",
-    "hash": "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o="
-  },
-  {
-    "pname": "Microsoft.CodeAnalysis.Scripting.Common",
-    "version": "3.8.0",
-    "hash": "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="
+    "version": "4.8.0",
+    "hash": "sha256-WNzc+6mKqzPviOI0WMdhKyrWs8u32bfGj2XwmfL7bwE="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Workspaces.Common",
-    "version": "4.5.0",
-    "hash": "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI="
+    "version": "4.8.0",
+    "hash": "sha256-X8R4SpWVO/gpip5erVZf5jCCx8EX3VzIRtNrQiLDIoM="
   },
   {
-    "pname": "Microsoft.CSharp",
-    "version": "4.3.0",
-    "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="
+    "pname": "Microsoft.CodeAnalysis.Workspaces.MSBuild",
+    "version": "4.8.0",
+    "hash": "sha256-hxpMKC6OF8OaIiSZhAgJ+Rw7M8nqS6xHdUURnRRxJmU="
   },
   {
     "pname": "Microsoft.Data.Sqlite.Core",
-    "version": "8.0.5",
-    "hash": "sha256-PH+ZS45SGfWSFcYZA+V3m0k1r3kxaDzD3DutVVRyqfQ="
+    "version": "9.0.4",
+    "hash": "sha256-OJs5gZSKnmDabm6UehVhzYFtsgEmScyNrzbQ+ojiRoI="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore",
-    "version": "8.0.0",
-    "hash": "sha256-Z6dlgOQrYcSCcRaXPNnYLC87sg4OGRS+p4Tv3EFXFfY="
+    "version": "9.0.0",
+    "hash": "sha256-pFO6T2UsnYuXqPZzG5SziG0v7fYkLd5GlQ2DWk21XCc="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore",
-    "version": "8.0.5",
-    "hash": "sha256-qR7Z+AQXzwejgYUKhoZIfYTWPOLNpOD6DBJ80xEfLaE="
+    "version": "9.0.4",
+    "hash": "sha256-zjIBv5cnhTVzG7YE+tqSI+havSCAHQdCE3Ha4JjecuQ="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-QxPc73WzjE63Pzuxc/xr/uQc0C+v6xVd2N0iIUJKOQU="
+    "version": "9.0.0",
+    "hash": "sha256-8SPpC6uTLl3TryFCTb2qqqLW4AsF/mTkOQteZ76dcfU="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Abstractions",
-    "version": "8.0.5",
-    "hash": "sha256-2RyxdXMIc2Gzbc5ouEdbbrVDfTrCU8PP9zPYxlcQXpw="
+    "version": "9.0.4",
+    "hash": "sha256-CaGhHINjggzaZSmdP51BBM4osWKpbck/2DgoMVCR3bc="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Analyzers",
-    "version": "8.0.0",
-    "hash": "sha256-SidpTl9AveYiXHa+TtvyHnRTOn02lmab4qXPf0FTi+0="
+    "version": "9.0.0",
+    "hash": "sha256-TzAFoT3LEHcyD7sjoGMXOV7BVWNPSDIn+5+QQg4BYGs="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Analyzers",
-    "version": "8.0.5",
-    "hash": "sha256-tvLA2TZouZC8pgxS8YikG2ui4Znaj6bNrVGAVy7t9rk="
+    "version": "9.0.4",
+    "hash": "sha256-Htc1qQ8dTS+tGDaT0gQVsZNtVar3p/LT54YcFkoHTLI="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Design",
-    "version": "8.0.5",
-    "hash": "sha256-zwDnWBGVf6O+L2iqcwJ/e+gbg5A+hVLf8Tc3vIbl+cA="
+    "version": "9.0.4",
+    "hash": "sha256-mwW5DH+pX0cRx+wRHoh850u2b6/SxvvhBkKjwe8wRiQ="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Relational",
-    "version": "8.0.0",
-    "hash": "sha256-ga+Qp4dZpmxVEmIIn8AcC92HrhVQBaDICyHqE87s+lk="
+    "version": "9.0.0",
+    "hash": "sha256-b7YR7J6mv7IN0+TQIIm6xKw4heEPol0dLDgxVHAUu7s="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Relational",
-    "version": "8.0.5",
-    "hash": "sha256-peIG9ZgXvvEB2wJ2QFxC3u+H8LnZ9xL/HIegw4R00Do="
+    "version": "9.0.4",
+    "hash": "sha256-cZ8qUtvGgICA8F2XS9sNci14AzLC84mcGv6GibifYKc="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Sqlite",
-    "version": "8.0.5",
-    "hash": "sha256-lED2YXKz6PzYAC5iIXW957N74KUuYtJ9cKvoPFiebpk="
+    "version": "9.0.4",
+    "hash": "sha256-9KBVCa/lr6UX2WFrMAU+S4WD0AG51kLI6YP9GxQmZK8="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core",
-    "version": "8.0.5",
-    "hash": "sha256-+6AvDE+Fj0Oc7EfA4SXwFUdkOSvvX6jC5HPtbUhYQwE="
+    "version": "9.0.4",
+    "hash": "sha256-pka9/9W+B4gVY7H7VJ3qCSaEJJW5Thqd6LAdQaIMRQ0="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Tools",
-    "version": "8.0.5",
-    "hash": "sha256-tHtuHXdI4d3CdL+2as595sys0phrBeZtWEof2Gd/A3I="
+    "version": "9.0.4",
+    "hash": "sha256-sUyI6VH/QpBNwz2bjQZlCTP41MjC4SlxCDqr063VVsM="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="
+    "version": "9.0.4",
+    "hash": "sha256-/VJBbIJzRXjzQ07s4Bicb+WNV0ZAC+/naG2nLVxFvjU="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
-    "version": "8.0.0",
-    "hash": "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8="
+    "version": "9.0.0",
+    "hash": "sha256-OZVOVGZOyv9uk5XGJrz6irBkPNjxnBxjfSyW30MnU0s="
+  },
+  {
+    "pname": "Microsoft.Extensions.Caching.Memory",
+    "version": "9.0.4",
+    "hash": "sha256-5uynkW+dK61Zp1+vs5uW6mwpnkZl7mH/bGSQoGjJH2c="
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
-    "version": "8.0.0",
-    "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="
+    "version": "9.0.0",
+    "hash": "sha256-uBLeb4z60y8z7NelHs9uT3cLD6wODkdwyfJm6/YZLDM="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration",
+    "version": "9.0.4",
+    "hash": "sha256-01yWDq/dHgU1Trx2OqVsXK/yobwVTClJXB07LrPc8lU="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
+    "version": "9.0.0",
+    "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Abstractions",
+    "version": "9.0.4",
+    "hash": "sha256-5hwq73FCWAJJ8Yb1VHaaryJJhUUiVsetPTrPLlo8N9o="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
     "version": "8.0.0",
     "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="
   },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "9.0.0",
+    "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU="
+  },
   {
     "pname": "Microsoft.Extensions.Configuration.FileExtensions",
-    "version": "8.0.0",
-    "hash": "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs="
+    "version": "9.0.0",
+    "hash": "sha256-PsLo6mrLGYfbi96rfCG8YS1APXkUXBG4hLstpT60I4s="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.FileExtensions",
+    "version": "9.0.4",
+    "hash": "sha256-i6BP99iTLEVt7aSw2Fu0ogUnY6FlVMat+BMIlndHCkQ="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Json",
-    "version": "8.0.0",
-    "hash": "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg="
+    "version": "9.0.0",
+    "hash": "sha256-qQn7Ol0CvPYuyecYWYBkPpTMdocO7I6n+jXQI2udzLI="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Json",
+    "version": "9.0.4",
+    "hash": "sha256-scTrZeY5CKX9kMcN7MYQPJVgEFwDTvO+JOk+G3wXrjs="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "8.0.0",
-    "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="
+    "version": "9.0.4",
+    "hash": "sha256-ck7PqIL/3vodYky+d7YX218n+detOoEjZeMr1EqTFPg="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
+    "version": "9.0.4",
+    "hash": "sha256-6WcGpsAYRhrpHloEom0oVP7Ff4Gh/O1XWJETJJ3LvEQ="
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "8.0.0",
-    "hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="
+    "version": "8.0.2",
+    "hash": "sha256-PyuO/MyCR9JtYqpA1l/nXGh+WLKCq34QuAXN9qNza9Q="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyModel",
+    "version": "9.0.0",
+    "hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyModel",
+    "version": "9.0.4",
+    "hash": "sha256-ziWOK9GykM9HufwYy18FYu6AyOncLOeumi3F/4W3AVE="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="
+    "version": "9.0.0",
+    "hash": "sha256-mVfLjZ8VrnOQR/uQjv74P2uEG+rgW72jfiGdSZhIfDc="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileProviders.Abstractions",
+    "version": "9.0.4",
+    "hash": "sha256-OkAq+1NUG0d1Ww6zT/hZWcPB5+fCr8AJIWmkpX7CQxU="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Physical",
-    "version": "8.0.0",
-    "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="
+    "version": "9.0.0",
+    "hash": "sha256-IzFpjKHmF1L3eVbFLUZa2N5aH3oJkJ7KE1duGIS7DP8="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileProviders.Physical",
+    "version": "9.0.4",
+    "hash": "sha256-whn/jRYaH56Lha20yChG5wgIllttTq2EtOwyDW+ZDO4="
   },
   {
     "pname": "Microsoft.Extensions.FileSystemGlobbing",
-    "version": "8.0.0",
-    "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="
+    "version": "9.0.0",
+    "hash": "sha256-eBLa8pW/y/hRj+JbEr340zbHRABIeFlcdqE0jf5/Uhc="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileSystemGlobbing",
+    "version": "9.0.4",
+    "hash": "sha256-lzNTCxATfJvnsl1hlAxhI4cibixYYBq99fK9b9tEo0A="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "8.0.0",
-    "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="
+    "version": "9.0.0",
+    "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "9.0.4",
+    "hash": "sha256-Vj+NGOamKeuMrLNUWlVKFFkz7IKGIv6h1A5X4CK9D5E="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
+    "version": "9.0.4",
+    "hash": "sha256-n0ZRhQ7U/5Kv1hVqUXGoa5gfrhzcy77yFhfonjq6VFc="
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "8.0.0",
-    "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="
+    "version": "9.0.4",
+    "hash": "sha256-QyjtRCG+L9eyH/UWHf/S+7/ZiSOmuGNoKGO9nlXmjxI="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "8.0.0",
-    "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
+    "version": "9.0.0",
+    "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "9.0.4",
+    "hash": "sha256-v/Ygyo1TMTUbnhdQSV2wzD4FOgAEWd1mpESo3kZ557g="
   },
   {
     "pname": "Microsoft.IO.RecyclableMemoryStream",
@@ -409,11 +484,6 @@
     "version": "1.1.0",
     "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
   },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "2.1.2",
-    "hash": "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="
-  },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "5.0.0",
@@ -425,14 +495,19 @@
     "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
   },
   {
-    "pname": "Microsoft.Win32.SystemEvents",
-    "version": "6.0.0",
-    "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
+    "pname": "Microsoft.SourceLink.Common",
+    "version": "8.0.0",
+    "hash": "sha256-AfUqleVEqWuHE7z2hNiwOLnquBJ3tuYtbkdGMppHOXc="
+  },
+  {
+    "pname": "Microsoft.SourceLink.GitHub",
+    "version": "8.0.0",
+    "hash": "sha256-hNTkpKdCLY5kIuOmznD1mY+pRdJ0PKu2HypyXog9vb0="
   },
   {
     "pname": "Mono.TextTemplating",
-    "version": "2.2.1",
-    "hash": "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY="
+    "version": "3.0.0",
+    "hash": "sha256-VlgGDvgNZb7MeBbIZ4DE2Nn/j2aD9k6XqNHnASUSDr0="
   },
   {
     "pname": "NameParserSharp",
@@ -451,13 +526,13 @@
   },
   {
     "pname": "NPOI",
-    "version": "2.7.0",
-    "hash": "sha256-zqns3HwLv8OQMyvw+LUtwqPbkAEIrVJU589AMNhnM4s="
+    "version": "2.7.3",
+    "hash": "sha256-xDVGyQoUaynZ0LS7+/gIM3JJO88jakE2vKxTFsVAngo="
   },
   {
     "pname": "Octokit",
-    "version": "11.0.1",
-    "hash": "sha256-24Ym/CXgU3LCFQcMHdFfWp8vUjLfwRcRIyW9fvr4i1s="
+    "version": "14.0.0",
+    "hash": "sha256-pTSI7Tz5VFd4Ydx1laE+VkZfhsl7Rbgw42PBqhyVvyI="
   },
   {
     "pname": "Pluralize.NET",
@@ -466,169 +541,24 @@
   },
   {
     "pname": "Polly",
-    "version": "8.4.1",
-    "hash": "sha256-CPFw0j6f2P5LfcoFAHo1RRDnCx6SXnp8gzHnwYDnYhY="
+    "version": "8.5.2",
+    "hash": "sha256-IrN06ddOIJ0VYuVefe3LvfW0kX20ATRQkEBg9CBomRA="
   },
   {
     "pname": "Polly.Core",
-    "version": "8.4.1",
-    "hash": "sha256-EksA3U5cmsri2joM+SMtbdwOUMUVxIXT8DnH4DSAIpA="
+    "version": "8.5.2",
+    "hash": "sha256-PAwsWqrCieCf/7Y87fV7XMKoaY2abCQNtI+4oyyMifk="
   },
   {
     "pname": "ReactiveUI",
-    "version": "18.3.1",
-    "hash": "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="
-  },
-  {
-    "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": "Serilog",
-    "version": "2.10.0",
-    "hash": "sha256-+8wilkt+VVvW+KFWuLryj7cSFpz9D+sz92KYWICAcSE="
+    "version": "20.1.1",
+    "hash": "sha256-p9l2GMzBRchKb4gW9pQ3DIKhs2O9fX3t/V7jDDztBqE="
   },
   {
     "pname": "Serilog",
     "version": "2.8.0",
     "hash": "sha256-MBL9AWGV8UthhiHXnqH3EsfIyXnxdLWqAdFa6QvQ2To="
   },
-  {
-    "pname": "Serilog",
-    "version": "3.1.0",
-    "hash": "sha256-1CDAp+AjfFjQqoLvKYp/j6pKTUfNOGfKVlWyqCGHo7k="
-  },
   {
     "pname": "Serilog",
     "version": "3.1.1",
@@ -639,6 +569,11 @@
     "version": "4.0.0",
     "hash": "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="
   },
+  {
+    "pname": "Serilog",
+    "version": "4.2.0",
+    "hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs="
+  },
   {
     "pname": "Serilog.Exceptions",
     "version": "8.4.0",
@@ -646,13 +581,13 @@
   },
   {
     "pname": "Serilog.Settings.Configuration",
-    "version": "8.0.0",
-    "hash": "sha256-JQ39fvhOFSUHE6r9DXJvLaZI+Lk7AYzuskQu3ux+hQg="
+    "version": "8.0.4",
+    "hash": "sha256-00abT3H5COh5/A/tMYJwAZ37Mwa6jafVvW/nysLIbNQ="
   },
   {
-    "pname": "Serilog.Sinks.Console",
-    "version": "5.0.0",
-    "hash": "sha256-UOVlegJLhs0vK1ml2DZCjFE5roDRZsGCAqD/53ZaZWI="
+    "pname": "Serilog.Settings.Configuration",
+    "version": "9.0.0",
+    "hash": "sha256-Q/q5UiSrcxoy5a/orod20E2RfiRtHDhxjjGMe1dW35I="
   },
   {
     "pname": "Serilog.Sinks.Console",
@@ -661,13 +596,13 @@
   },
   {
     "pname": "Serilog.Sinks.File",
-    "version": "5.0.0",
-    "hash": "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="
+    "version": "6.0.0",
+    "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="
   },
   {
     "pname": "Serilog.Sinks.File",
-    "version": "6.0.0",
-    "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="
+    "version": "7.0.0",
+    "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo="
   },
   {
     "pname": "Serilog.Sinks.ZipFile",
@@ -676,8 +611,8 @@
   },
   {
     "pname": "SharpZipLib",
-    "version": "1.3.3",
-    "hash": "sha256-HWEQTKh9Ktwg/zIl079dAiH+ob2ShWFAqLgG6XgIMr4="
+    "version": "1.4.2",
+    "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="
   },
   {
     "pname": "SixLabors.Fonts",
@@ -686,88 +621,83 @@
   },
   {
     "pname": "SixLabors.ImageSharp",
-    "version": "2.1.7",
-    "hash": "sha256-CPC3x2vPfjv8ZLyxnQ8uuNhlsUMrIE/+hdYP0dZGLR8="
+    "version": "2.1.10",
+    "hash": "sha256-nmvI1fZtimtmiitXBQJhYXHsYM8IGjEMxlKcsaORC3Y="
   },
   {
     "pname": "SixLabors.ImageSharp",
-    "version": "3.1.5",
-    "hash": "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw="
+    "version": "3.1.8",
+    "hash": "sha256-cE9BQfbCvJ0Mf+fQiTD8elOZEPcfZHjDz2BHdiO+D08="
   },
   {
     "pname": "SkiaSharp",
-    "version": "2.88.6",
-    "hash": "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc="
+    "version": "2.88.9",
+    "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Linux",
-    "version": "2.88.6",
-    "hash": "sha256-VjgGoi73tVvqO/UXmQb1w9ioAbFu2dxH8oHz1l5H4zE="
+    "version": "2.88.9",
+    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
   },
   {
     "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "2.88.6",
-    "hash": "sha256-7hOMjlYTOiNPLNwfLFUjTcdgiGEtmYUI1EubiRiC6bo="
+    "version": "2.88.9",
+    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
   },
   {
     "pname": "SkiaSharp.NativeAssets.WebAssembly",
-    "version": "2.88.6",
-    "hash": "sha256-CIb9fHVgHwIa0R1WafKJ3+GqtDHHRgDohA3ayTHvlws="
+    "version": "2.88.9",
+    "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.6",
-    "hash": "sha256-ljD4QmAO2/vwA6I8GIUNkONpOzmGsOVJJy9vPDnjVfA="
+    "version": "2.88.9",
+    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
   },
   {
     "pname": "Splat",
-    "version": "14.4.1",
-    "hash": "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="
+    "version": "15.1.1",
+    "hash": "sha256-WipAVaUx2HrYNQ9LcYm496LndmSpVbuzJxzP9FA6Ohg="
   },
   {
     "pname": "SQLitePCLRaw.bundle_e_sqlite3",
-    "version": "2.1.6",
-    "hash": "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718="
+    "version": "2.1.10",
+    "hash": "sha256-kZIWjH/TVTXRIsHPZSl7zoC4KAMBMWmgFYGLrQ15Occ="
   },
   {
     "pname": "SQLitePCLRaw.core",
-    "version": "2.1.6",
-    "hash": "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E="
+    "version": "2.1.10",
+    "hash": "sha256-gpZcYwiJVCVwCyJu0R6hYxyMB39VhJDmYh9LxcIVAA8="
   },
   {
     "pname": "SQLitePCLRaw.lib.e_sqlite3",
-    "version": "2.1.6",
-    "hash": "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0="
+    "version": "2.1.10",
+    "hash": "sha256-m2v2RQWol+1MNGZsx+G2N++T9BNtQGLLHXUjcwkdCnc="
   },
   {
     "pname": "SQLitePCLRaw.provider.e_sqlite3",
-    "version": "2.1.6",
-    "hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8="
+    "version": "2.1.10",
+    "hash": "sha256-MLs3jiETLZ7k/TgkHynZegCWuAbgHaDQKTPB0iNv7Fg="
   },
   {
     "pname": "System.CodeDom",
-    "version": "4.4.0",
-    "hash": "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0="
-  },
-  {
-    "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": "6.0.0",
-    "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
+    "hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="
   },
   {
     "pname": "System.Collections.Immutable",
-    "version": "8.0.0",
-    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
+    "version": "7.0.0",
+    "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "9.0.0",
+    "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "9.0.2",
+    "hash": "sha256-brMJqQ4PyRDOJCNq+HTFdFEphlyPD1x9YZGeHUbmtTo="
   },
   {
     "pname": "System.Collections.NonGeneric",
@@ -776,48 +706,43 @@
   },
   {
     "pname": "System.ComponentModel.Annotations",
-    "version": "4.5.0",
-    "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
+    "version": "5.0.0",
+    "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
   },
   {
     "pname": "System.Composition",
-    "version": "6.0.0",
-    "hash": "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw="
+    "version": "7.0.0",
+    "hash": "sha256-YjhxuzuVdAzRBHNQy9y/1ES+ll3QtLcd2o+o8wIyMao="
   },
   {
     "pname": "System.Composition.AttributedModel",
-    "version": "6.0.0",
-    "hash": "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc="
+    "version": "7.0.0",
+    "hash": "sha256-3s52Dyk2J66v/B4LLYFBMyXl0I8DFDshjE+sMjW4ubM="
   },
   {
     "pname": "System.Composition.Convention",
-    "version": "6.0.0",
-    "hash": "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo="
+    "version": "7.0.0",
+    "hash": "sha256-N4MkkBXSQkcFKsEdcSe6zmyFyMmFOHmI2BNo3wWxftk="
   },
   {
     "pname": "System.Composition.Hosting",
-    "version": "6.0.0",
-    "hash": "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4="
+    "version": "7.0.0",
+    "hash": "sha256-7liQGMaVKNZU1iWTIXvqf0SG8zPobRoLsW7q916XC3M="
   },
   {
     "pname": "System.Composition.Runtime",
-    "version": "6.0.0",
-    "hash": "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8="
+    "version": "7.0.0",
+    "hash": "sha256-Oo1BxSGLETmdNcYvnkGdgm7JYAnQmv1jY0gL0j++Pd0="
   },
   {
     "pname": "System.Composition.TypedParts",
-    "version": "6.0.0",
-    "hash": "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k="
+    "version": "7.0.0",
+    "hash": "sha256-6ZzNdk35qQG3ttiAi4OXrihla7LVP+y2fL3bx40/32s="
   },
   {
     "pname": "System.Configuration.ConfigurationManager",
-    "version": "6.0.0",
-    "hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="
-  },
-  {
-    "pname": "System.Configuration.ConfigurationManager",
-    "version": "8.0.0",
-    "hash": "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE="
+    "version": "9.0.0",
+    "hash": "sha256-+pLnTC0YDP6Kjw5DVBiFrV/Q3x5is/+6N6vAtjvhVWk="
   },
   {
     "pname": "System.Diagnostics.Debug",
@@ -826,23 +751,13 @@
   },
   {
     "pname": "System.Diagnostics.EventLog",
-    "version": "8.0.0",
-    "hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="
+    "version": "9.0.0",
+    "hash": "sha256-tPvt6yoAp56sK/fe+/ei8M65eavY2UUhRnbrREj/Ems="
   },
   {
-    "pname": "System.Drawing.Common",
-    "version": "6.0.0",
-    "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
-  },
-  {
-    "pname": "System.Dynamic.Runtime",
-    "version": "4.3.0",
-    "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="
-  },
-  {
-    "pname": "System.Formats.Asn1",
-    "version": "6.0.0",
-    "hash": "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8="
+    "pname": "System.Diagnostics.EventLog",
+    "version": "9.0.2",
+    "hash": "sha256-IoiQbH8To9UqzYgJzYpFbuiRV3KGU85y4ccPTyttP/w="
   },
   {
     "pname": "System.Globalization",
@@ -850,29 +765,14 @@
     "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
   },
   {
-    "pname": "System.IO",
-    "version": "4.3.0",
-    "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
+    "pname": "System.IO.Pipelines",
+    "version": "7.0.0",
+    "hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="
   },
   {
     "pname": "System.IO.Pipelines",
-    "version": "6.0.0",
-    "hash": "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="
-  },
-  {
-    "pname": "System.IO.Pipelines",
-    "version": "6.0.3",
-    "hash": "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck="
-  },
-  {
-    "pname": "System.Linq",
-    "version": "4.3.0",
-    "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
-  },
-  {
-    "pname": "System.Linq.Expressions",
-    "version": "4.3.0",
-    "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
+    "version": "8.0.0",
+    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
   },
   {
     "pname": "System.Memory",
@@ -880,74 +780,24 @@
     "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
   },
   {
-    "pname": "System.Memory",
-    "version": "4.5.4",
-    "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
-  },
-  {
-    "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.0",
+    "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
   },
   {
     "pname": "System.Reactive",
-    "version": "5.0.0",
-    "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="
+    "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": "5.0.0",
-    "hash": "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="
-  },
-  {
-    "pname": "System.Reflection.Metadata",
-    "version": "6.0.1",
-    "hash": "sha256-id27sU4qIEIpgKenO5b4IHt6L1XuNsVe4TR9TKaLWDo="
-  },
-  {
-    "pname": "System.Reflection.Primitives",
-    "version": "4.3.0",
-    "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
-  },
-  {
-    "pname": "System.Reflection.TypeExtensions",
-    "version": "4.3.0",
-    "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
+    "version": "7.0.0",
+    "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI="
   },
   {
     "pname": "System.Reflection.TypeExtensions",
@@ -964,11 +814,6 @@
     "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",
@@ -984,45 +829,20 @@
     "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": "6.0.0",
-    "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="
-  },
   {
     "pname": "System.Security.Cryptography.Pkcs",
-    "version": "6.0.3",
-    "hash": "sha256-p5xbSMTjndPCht9HRbDp5fr1osUOaXunjDZUatualgs="
+    "version": "8.0.1",
+    "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU="
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
-    "version": "6.0.0",
-    "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="
-  },
-  {
-    "pname": "System.Security.Cryptography.ProtectedData",
-    "version": "8.0.0",
-    "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="
+    "version": "9.0.0",
+    "hash": "sha256-gPgPU7k/InTqmXoRzQfUMEKL3QuTnOKowFqmXTnWaBQ="
   },
   {
     "pname": "System.Security.Cryptography.Xml",
-    "version": "6.0.1",
-    "hash": "sha256-spXV8cWZu0V3liek1936REtdpvS4fQwc98JvacO1oJU="
-  },
-  {
-    "pname": "System.Security.Permissions",
-    "version": "6.0.0",
-    "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="
+    "version": "8.0.2",
+    "hash": "sha256-9TCmVyMB4+By/ipU8vdYDtSnw1tkkebnXXVRdT78+28="
   },
   {
     "pname": "System.Security.Principal.Windows",
@@ -1031,18 +851,13 @@
   },
   {
     "pname": "System.ServiceProcess.ServiceController",
-    "version": "8.0.0",
-    "hash": "sha256-mq/Qm8JeMUvitHf32/F8uvw1YJGx4prGnEI/VzdaFAI="
+    "version": "9.0.0",
+    "hash": "sha256-R2tdnqpNudV9Z4BTuI2q7Yqb97ZDEOjLxBNd28HjRX8="
   },
   {
-    "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.ServiceProcess.ServiceController",
+    "version": "9.0.2",
+    "hash": "sha256-7H8oHNlgRX1BK5sP0bZvMhKVGznOjeTgnqiPkgXW+0g="
   },
   {
     "pname": "System.Text.Encoding.CodePages",
@@ -1050,19 +865,14 @@
     "hash": "sha256-YJ5jJqkVPp+6fEzSXOmw1sNSdygB5Rx7TJ0TrNS/wq4="
   },
   {
-    "pname": "System.Text.Encoding.CodePages",
-    "version": "6.0.0",
-    "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="
-  },
-  {
-    "pname": "System.Text.Encodings.Web",
-    "version": "8.0.0",
-    "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="
+    "pname": "System.Text.Json",
+    "version": "7.0.3",
+    "hash": "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4="
   },
   {
     "pname": "System.Text.Json",
-    "version": "8.0.0",
-    "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="
+    "version": "9.0.4",
+    "hash": "sha256-oIOqfOIIUXXVkfFiTCI9wwIJBETQqF7ZcOJv2iYuq1s="
   },
   {
     "pname": "System.Threading",
@@ -1071,27 +881,17 @@
   },
   {
     "pname": "System.Threading.Channels",
-    "version": "6.0.0",
-    "hash": "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="
+    "version": "7.0.0",
+    "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="
   },
   {
     "pname": "System.Threading.Tasks",
     "version": "4.3.0",
     "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
   },
-  {
-    "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.5.4",
-    "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
-  },
-  {
-    "pname": "System.Windows.Extensions",
-    "version": "6.0.0",
-    "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="
-  },
   {
     "pname": "Tmds.DBus.Protocol",
-    "version": "0.15.0",
-    "hash": "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="
+    "version": "0.20.0",
+    "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw="
   }
 ]
diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix
index 131574187409..cfa6b499eaa5 100644
--- a/pkgs/by-name/li/libation/package.nix
+++ b/pkgs/by-name/li/libation/package.nix
@@ -5,26 +5,27 @@
   fetchFromGitHub,
   dotnetCorePackages,
   wrapGAppsHook3,
-
   glew,
   gtk3,
+  xorg,
 }:
 
 buildDotnetModule rec {
   pname = "libation";
-  version = "11.5.5";
+  version = "12.3.1";
 
   src = fetchFromGitHub {
     owner = "rmcrackan";
     repo = "Libation";
-    rev = "v${version}";
-    hash = "sha256-FD3f2Cba1xN15BloyRQ/m/vDovhN8x0AlfeJk+LGVV4=";
+    tag = "v${version}";
+    hash = "sha256-jir1r78HbAhlOiCj6pSw0+o4V9ceCkJQWnKtt6VzLDY=";
   };
 
   sourceRoot = "${src.name}/Source";
 
-  dotnet-sdk = dotnetCorePackages.sdk_8_0;
-  dotnet-runtime = dotnetCorePackages.runtime_8_0;
+  dotnet-sdk = dotnetCorePackages.sdk_9_0;
+
+  dotnet-runtime = dotnetCorePackages.runtime_9_0;
 
   nugetDeps = ./deps.json;
 
@@ -45,6 +46,9 @@ buildDotnetModule rec {
   runtimeDeps = [
     # For Avalonia UI
     glew
+    xorg.libXrandr
+    xorg.libXi
+    xorg.libXcursor
     # For file dialogs
     gtk3
   ];
@@ -53,7 +57,7 @@ buildDotnetModule rec {
     install -Dm644 LoadByOS/LinuxConfigApp/libation_glass.svg $out/share/icons/hicolor/scalable/apps/libation.svg
     install -Dm644 LoadByOS/LinuxConfigApp/Libation.desktop $out/share/applications/libation.desktop
     substituteInPlace $out/share/applications/libation.desktop \
-        --replace-fail "/usr/bin/libation" "${meta.mainProgram}"
+      --replace-fail "/usr/bin/libation" "libation"
   '';
 
   # wrap manually, because we need lower case executables
@@ -75,10 +79,10 @@ buildDotnetModule rec {
   '';
 
   meta = {
-    changelog = "https://github.com/rmcrackan/Libation/releases/tag/${src.rev}";
+    changelog = "https://github.com/rmcrackan/Libation/releases/tag/v${version}";
     description = "Audible audiobook manager";
     homepage = "https://github.com/rmcrackan/Libation";
-    license = lib.licenses.gpl3Only;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "libation";
     maintainers = with lib.maintainers; [ tomasajt ];
   };

From 1963e93d71ab8a5c51901ffd53e68949dd0afb6b Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 1 May 2025 14:28:59 +0800
Subject: [PATCH 93/95] hyprutils: 0.6.0 -> 0.7.0

Diff: https://github.com/hyprwm/hyprutils/compare/refs/tags/v0.6.0...refs/tags/v0.7.0
---
 pkgs/by-name/hy/hyprutils/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix
index 796561fcceb8..79fc26fcea12 100644
--- a/pkgs/by-name/hy/hyprutils/package.nix
+++ b/pkgs/by-name/hy/hyprutils/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprutils";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprutils";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=";
+    hash = "sha256-s3GzsRxBL/N/xYgUXZhQh4t62uR1BN4zxXgWBtJ3lWM=";
   };
 
   nativeBuildInputs = [

From 9eaf61e2ff601d2849c42ec394900d1950bb63b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maret?=
 <sebastien.maret@univ-grenoble-alpes.fr>
Date: Mon, 21 Apr 2025 18:04:09 +0200
Subject: [PATCH 94/95] gildas: add an update script

---
 pkgs/by-name/gi/gildas/package.nix |   4 +-
 pkgs/by-name/gi/gildas/update.py   | 145 +++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+), 1 deletion(-)
 create mode 100755 pkgs/by-name/gi/gildas/update.py

diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix
index 6370487384b4..e9ecdf646aea 100644
--- a/pkgs/by-name/gi/gildas/package.nix
+++ b/pkgs/by-name/gi/gildas/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
       "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz"
     ];
-    sha256 = "sha256-5XKImlE5A6JjA6LLqmGc4IzaMMPoHDo8cUPmgRtnEp0=";
+    hash = "sha256-5XKImlE5A6JjA6LLqmGc4IzaMMPoHDo8cUPmgRtnEp0=";
   };
 
   nativeBuildInputs = [
@@ -97,6 +97,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru.updateScript = ./update.py;
+
   meta = {
     description = "Radioastronomy data analysis software";
     longDescription = ''
diff --git a/pkgs/by-name/gi/gildas/update.py b/pkgs/by-name/gi/gildas/update.py
new file mode 100755
index 000000000000..19e0d09294b1
--- /dev/null
+++ b/pkgs/by-name/gi/gildas/update.py
@@ -0,0 +1,145 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.beautifulsoup4 ps.requests ])"
+
+"""
+Update the gildas package in nixpkgs.
+
+"""
+
+import re
+import subprocess
+import requests
+import os
+from bs4 import BeautifulSoup
+
+
+def to_version(srcVersion):
+    """
+    Convert the source version to the package version
+
+    This function converts the source version from the format "apr25a"
+    to "20250401_a".
+
+    """
+
+    months = {
+        "jan": "01",
+        "feb": "02",
+        "mar": "03",
+        "apr": "04",
+        "may": "05",
+        "jun": "06",
+        "jul": "07",
+        "aug": "08",
+        "sep": "09",
+        "oct": "10",
+        "nov": "11",
+        "dec": "12",
+    }
+
+    month = srcVersion[0:3]
+    year = srcVersion[3:5]
+    revision = srcVersion[5:6]
+
+    return f"20{year}{months[month]}01_{revision}"
+
+
+def get_srcVersion():
+    """
+    Get the available source versions from the gildas website
+
+    """
+
+    srcVersions = []
+    response = requests.get("https://www.iram.fr/~gildas/dist/index.html")
+    soup = BeautifulSoup(response.text, "html.parser")
+    pattern = r"^gildas-src-([a-z]{3}\d{2}[a-z])\.tar\.xz$"
+    for link in soup.find_all("a"):
+        href = link["href"]
+        match = re.search(pattern, href)
+        if match:
+            srcVersions.append(match.group(1))
+
+    return srcVersions
+
+
+def find_latest(srcVersions):
+    """
+    Return the latest source version from a list
+
+    """
+
+    latestVersion = ""
+    for srcVersion in srcVersions:
+        version = to_version(srcVersion)
+        if version > latestVersion:
+            latest = srcVersion
+
+    return latest
+
+
+def get_hash(srcVersion):
+    """
+    Get the hash of a given source versionn
+
+    """
+
+    url = f"http://www.iram.fr/~gildas/dist/gildas-src-{srcVersion}.tar.xz"
+    srcHash = (
+        subprocess.check_output(["nix-prefetch-url", url, "--unpack"]).decode().strip()
+    )
+
+    return f"sha256:{srcHash}"
+
+
+def get_package_attribute(attr):
+    """
+    Get a package attribute
+
+    """
+
+    pattern = attr + r'\s*=\s*"([^"]+)";'
+    with open("package.nix", "r") as f:
+        for line in f:
+            match = re.search(pattern, line)
+            if match:
+                return match.group(1)
+
+
+def update_package(srcVersion, version, srcHash):
+    """
+    Update the package
+
+    """
+
+    current_srcVersion = get_package_attribute("srcVersion")
+    current_version = get_package_attribute("version")
+    current_hash = get_package_attribute("hash")
+
+    with open("package.nix", "r") as f:
+        lines = f.readlines()
+
+    with open("package.nix", "w") as f:
+        for line in lines:
+            line = line.replace(current_srcVersion, srcVersion)
+            line = line.replace(current_version, version)
+            line = line.replace(current_hash, srcHash)
+            f.write(line)
+
+
+def main():
+    os.chdir(os.path.dirname(os.path.abspath(__file__)))  # allow to run from anywhere
+    latest = find_latest(get_srcVersion())
+    if latest != get_package_attribute("srcVersion"):
+        srcVersion = latest
+        version = to_version(srcVersion)
+        print(f"Updating gildas to {version}...")
+        srcHash = get_hash(srcVersion)
+        update_package(srcVersion, version, srcHash)
+        print("done")
+    else:
+        print("Already up to date")
+
+
+if __name__ == "__main__":
+    main()

From 140b3a3a59b33d196164666f121071192cac34aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 May 2025 14:29:49 +0000
Subject: [PATCH 95/95] python312Packages.snakemake: 9.3.0 -> 9.3.3

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

diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix
index 7904bc82687b..86e26c2b85ac 100644
--- a/pkgs/by-name/sn/snakemake/package.nix
+++ b/pkgs/by-name/sn/snakemake/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snakemake";
-  version = "9.3.0";
+  version = "9.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake";
     tag = "v${version}";
-    hash = "sha256-C9XPoYoSxl58ddPe77ddgOaVfXSD1n0fgDhRciLH0uM=";
+    hash = "sha256-XmKwK52njnREOogI/kSIaMoZSbYmMGXiL0tPmJvVutA=";
   };
 
   postPatch = ''