Merge remote-tracking branch 'origin/master' into staging-next

2025-05-01 21:31:48 +03:00 · 2025-05-01 21:31:48 +03:00 · 7388d7aff5
commit 7388d7aff5
parent 6e0ce81324 b5dd9efc91
102 changed files with 3869 additions and 1765 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -16849,6 +16849,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;
@ -19009,6 +19015,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";
--- 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 = version;
-    hash = "sha256-1ZE2hVwacZve0+IOQs+htK/kl7zFsOWkh/KcrnI6u/M=";
+    hash = "sha256-s66XrcMGgA8KvBDxljg95nbKW1pIv8rJJ+DyxirHwDo=";
  };

  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 ''
--- 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;
  };
-}
+})
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@ -17,19 +17,55 @@
  gdk-pixbuf,
  libmediainfo,
  vmtouch,
+  gitUpdater,
 }:

 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
@ -72,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"
@ -118,12 +124,17 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
    )
  '';

-  meta = with lib; {
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
+    ignoredVersions = "a.*";
+  };
+
+  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 ];
  };
 }
--- a/pkgs/applications/misc/edgetx/default.nix
+++ b/pkgs/applications/misc/edgetx/default.nix
@ -1,75 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchFromGitHub,
-  cmake,
-  gcc-arm-embedded,
-  python3Packages,
-  qtbase,
-  qtmultimedia,
-  qttools,
-  SDL,
-  gtest,
-  dfu-util,
-}:
-
-mkDerivation rec {
-  pname = "edgetx";
-  version = "2.7.2";
-
-  src = fetchFromGitHub {
-    owner = "EdgeTX";
-    repo = pname;
-    rev = "v${version}";
-    fetchSubmodules = true;
-    hash = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    gcc-arm-embedded
-    python3Packages.pillow
-    qttools
-  ];
-
-  buildInputs = [
-    qtbase
-    qtmultimedia
-    SDL
-  ];
-
-  postPatch = ''
-    sed -i companion/src/burnconfigdialog.cpp \
-      -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-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"
-  ];
-
-  meta = with lib; {
-    description = "EdgeTX Companion transmitter support software";
-    longDescription = ''
-      EdgeTX Companion is used for many different tasks like loading EdgeTX
-      firmware to the radio, backing up model settings, editing settings and
-      running radio simulators.
-    '';
-    mainProgram = "companion" + lib.concatStrings (lib.take 2 (lib.splitVersion version));
-    homepage = "https://edgetx.org/";
-    license = licenses.gpl2Only;
-    platforms = [
-      "i686-linux"
-      "x86_64-linux"
-      "aarch64-linux"
-    ];
-    maintainers = with maintainers; [
-      elitak
-      lopsided98
-      wucke13
-    ];
-  };
-
-}
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@ -6,15 +6,16 @@
  jdk21,
  wrapGAppsHook3,
  glib,
+  nix-update-script,
 }:

 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 = ''
@ -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";
--- 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 = [
--- a/pkgs/applications/networking/compactor/patches/update-golden-cbor2diag-output.patch
+++ 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}}]}]]
--- 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
--- 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 {
--- 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 = [
--- a/pkgs/by-name/br/brigand/package.nix
+++ b/pkgs/by-name/br/brigand/package.nix
@ -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;
-  };
-}
--- 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
--- 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";
  };
 }
--- a/pkgs/by-name/ck/ckan/package.nix
+++ b/pkgs/by-name/ck/ckan/package.nix
@ -9,15 +9,16 @@
  imagemagick,
  copyDesktopItems,
  makeDesktopItem,
+  nix-update-script,
 }:

 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 {
@ -75,6 +76,8 @@ stdenv.mkDerivation rec {
    })
  ];

+  passthru.updateScript = nix-update-script { };
+
  meta = with lib; {
    description = "Mod manager for Kerbal Space Program";
    mainProgram = "ckan";
--- 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": {
--- 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
--- 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
--- 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;

--- a/pkgs/by-name/cr/crossfire-arch/package.nix
+++ b/pkgs/by-name/cr/crossfire-arch/package.nix
@ -1,25 +1,26 @@
 {
  stdenv,
  lib,
-  fetchsvn,
-  version,
-  rev,
-  sha256,
+  fetchgit,
 }:

 stdenv.mkDerivation {
  pname = "crossfire-arch";
-  version = rev;
+  version = "2025-04";

-  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";
+    rev = "876eb50b9199e9aa06175b7a7d85832662be3f78";
+    hash = "sha256-jDiAKcjWYvjGiD68LuKlZS4sOR9jW3THp99kAEdE+y0=";
  };

  installPhase = ''
+    runHook preInstall
+
    mkdir -p "$out"
    cp -a . "$out/"
+
+    runHook postInstall
  '';

  meta = with lib; {
--- a/pkgs/by-name/cr/crossfire-client/package.nix
+++ b/pkgs/by-name/cr/crossfire-client/package.nix
@ -1,7 +1,7 @@
 {
  stdenv,
  lib,
-  fetchsvn,
+  fetchgit,
  cmake,
  pkg-config,
  perl,
@ -17,24 +17,21 @@
  xorg,
  util-linux,
  curl,
-  SDL,
-  SDL_image,
-  SDL_mixer,
+  SDL2,
+  SDL2_image,
+  SDL2_mixer,
  libselinux,
  libsepol,
-  version,
-  rev,
-  sha256,
 }:

 stdenv.mkDerivation {
  pname = "crossfire-client";
-  version = rev;
+  version = "2025-01";

-  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";
+    hash = "sha256-iFm9yVEIBwngr8/0f9TRS4Uw0hnjrW6ngMRfsWY6TX0=";
+    rev = "c69f578add358c1db567f6b46f532dd038d2ade0";
  };

  nativeBuildInputs = [
@ -55,9 +52,9 @@ stdenv.mkDerivation {
    xorg.libpthreadstubs
    xorg.libXdmcp
    curl
-    SDL
-    SDL_image
-    SDL_mixer
+    SDL2
+    SDL2_image
+    SDL2_mixer
    util-linux
    libselinux
    libsepol
--- a/pkgs/by-name/cr/crossfire-gridarta/package.nix
+++ 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 ];
+  };
+}
--- a/pkgs/by-name/cr/crossfire-jxclient/package.nix
+++ 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 ];
+  };
+}
--- a/pkgs/by-name/cr/crossfire-maps/package.nix
+++ b/pkgs/by-name/cr/crossfire-maps/package.nix
@ -1,25 +1,26 @@
 {
  stdenv,
  lib,
-  fetchsvn,
-  version,
-  rev,
-  sha256,
+  fetchgit,
 }:

 stdenv.mkDerivation {
  pname = "crossfire-maps";
-  version = rev;
+  version = "2025-04";

-  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";
+    rev = "ec57d473064ed1732adb1897415b56f96fbd9382";
+    hash = "sha256-hJOMa8c80T4/NC37NKM270LDHNqWK6NZfKvKnFno9TE=";
  };

  installPhase = ''
+    runHook preInstall
+
    mkdir -p "$out"
    cp -a . "$out/"
+
+    runHook postInstall
  '';

  meta = with lib; {
--- a/pkgs/by-name/cr/crossfire-server/package.nix
+++ b/pkgs/by-name/cr/crossfire-server/package.nix
@ -1,7 +1,8 @@
 {
  stdenv,
  lib,
-  fetchsvn,
+  pkgs,
+  fetchgit,
  autoconf,
  automake,
  libtool,
@ -10,27 +11,21 @@
  check,
  pkg-config,
  python3,
-  version,
-  rev,
-  sha256,
-  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 = 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";
+    rev = "5f742b9f9f785e4a59a3a463bee1f31c9bc67098";
+    hash = "sha256-e7e3xN7B1cv9+WkZGzOJgrFer50Cs0L/2dYB9RmGCiE=";
  };

-  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;
--- 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;
--- 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",
--- a/pkgs/by-name/ed/edgetx/0001-libclang-paths.patch
+++ 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:
--- a/pkgs/by-name/ed/edgetx/package.nix
+++ b/pkgs/by-name/ed/edgetx/package.nix
@ -0,0 +1,183 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  python3,
+  cmake,
+  ninja,
+  libsForQt5,
+  SDL2,
+  fox_1_6,
+  replaceVars,
+  llvmPackages,
+  dfu-util,
+  gtest,
+  miniz,
+  yaml-cpp,
+  # List of targets to build simulators for
+  targetsToBuild ? import ./targets.nix,
+}:
+
+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.11.0-rc3";
+
+  src = fetchFromGitHub {
+    owner = "EdgeTX";
+    repo = "edgetx";
+    tag = "v${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-ipiGkc+R7/itmnRRrlrc4iXn+fLWm4OKc227NfevFhI=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pythonEnv
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
+    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 = [
+    # 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 = {
+    description = "EdgeTX Companion transmitter support software";
+    longDescription = ''
+      EdgeTX Companion is used for many different tasks like loading EdgeTX
+      firmware to the radio, backing up model settings, editing settings and
+      running radio simulators.
+    '';
+    mainProgram = "companion" + lib.concatStrings (lib.take 2 (lib.splitVersion finalAttrs.version));
+    homepage = "https://edgetx.org/";
+    license = lib.licenses.gpl2Only;
+    platforms = [
+      "i686-linux"
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+    maintainers = with lib.maintainers; [
+      elitak
+      lopsided98
+      wucke13
+      xokdvium
+    ];
+  };
+})
--- a/pkgs/by-name/ed/edgetx/targets.nix
+++ 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"
+]
--- 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; };
@ -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}";
  };
--- 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,
@ -37,11 +38,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";
@ -67,63 +74,131 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  buildInputs =
-    [
-      chafa
-      imagemagick
-      pcre
-      pcre2
-      sqlite
-      yyjson
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      dbus
-      dconf
-      ddcutil
-      glib
-      hwdata
-      libdrm
-      libpulseaudio
-      libselinux
-      libsepol
-      ocl-icd
-      opencl-headers
-      util-linux
-      zlib
-    ]
-    ++ 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
+          libsysprof-capture
+        ]
+        ++ 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 =
    [
      (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 +237,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
+    '';
  };
 })
--- a/pkgs/by-name/fa/fastfetchMinimal/package.nix
+++ 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;
+}
--- 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";
--- 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",
--- a/pkgs/by-name/fo/forscape/package.nix
+++ 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;
+  };
+})
--- 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
--- a/pkgs/by-name/ft/ftb-app/package.nix
+++ 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'
+  '';
+}
--- 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 ];
  };
-}
+})
--- a/pkgs/by-name/fu/functiontrace-server/package.nix
+++ b/pkgs/by-name/fu/functiontrace-server/package.nix
@ -2,19 +2,22 @@
  lib,
  rustPlatform,
  fetchCrate,
+  nix-update-script,
 }:

 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=";
+
+  passthru.updateScript = nix-update-script { };

  meta = with lib; {
    description = "Server for FunctionTrace, a graphical Python profiler";
--- 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
--- 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 = ''
--- 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
--- 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;

--- a/pkgs/by-name/gi/gildas/package.nix
+++ b/pkgs/by-name/gi/gildas/package.nix
@ -36,7 +36,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 = [
@ -88,6 +88,8 @@ stdenv.mkDerivation rec {
    done
  '';

+  passthru.updateScript = ./update.py;
+
  meta = {
    description = "Radioastronomy data analysis software";
    longDescription = ''
--- a/pkgs/by-name/gi/gildas/update.py
+++ 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()
--- 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 { };

--- 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 = [
--- 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";
--- 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=";
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@ -282,7 +282,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
--- 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";
  };
 }
--- a/pkgs/by-name/li/libation/deps.json
+++ b/pkgs/by-name/li/libation/deps.json
--- 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 ];
  };
--- 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 = [
--- 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";
--- 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 = [
--- 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
--- 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"

--- 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;
--- 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 = [
--- 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;
  };
 }
--- 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
--- 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 ];
--- a/pkgs/by-name/pk/pkl/deps.json
+++ b/pkgs/by-name/pk/pkl/deps.json
--- a/pkgs/by-name/pk/pkl/disable_bad_tests.patch
+++ 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()
--- a/pkgs/by-name/pk/pkl/disable_gradle_codegen_tests.patch
+++ 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(
+
--- a/pkgs/by-name/pk/pkl/fix_kotlin_classpath.patch
+++ 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-")) }
+     }
+   }
+ }
+
--- a/pkgs/by-name/pk/pkl/package.nix
+++ 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
+    ];
+  };
+})
--- a/pkgs/by-name/po/powershell/package.nix
+++ b/pkgs/by-name/po/powershell/package.nix
@ -37,7 +37,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;

--- 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";
--- 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 ];
  };
 }
--- a/pkgs/by-name/re/readerwriterqueue/package.nix
+++ 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;
+  };
+})
--- 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 = [
--- 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 = {
--- 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 = ''
--- 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",
--- 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";
  };
 }
--- 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
@ -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";
-  };
-}
--- a/pkgs/by-name/sp/space-station-14-launcher/update.sh
+++ b/pkgs/by-name/sp/space-station-14-launcher/update.sh
@ -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)
--- 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";
  };
-}
+})
--- 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
--- 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
--- 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";
  };
-}
+})
--- a/pkgs/by-name/xd/xdg-desktop-portal-luminous/package.nix
+++ 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 ];
+  };
+})
--- 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 =
--- 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 = [
--- 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; [
--- 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 = [
--- 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 = [
--- 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
@ -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 ];
  };
 }
--- 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.
--- 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 = [
--- 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 = [
--- a/pkgs/games/crossfire/add-cstdint-include-to-crossfire-server.patch
+++ b/pkgs/games/crossfire/add-cstdint-include-to-crossfire-server.patch
@ -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" {
--- a/pkgs/games/crossfire/default.nix
+++ b/pkgs/games/crossfire/default.nix
@ -1,29 +0,0 @@
-{ callPackage, ... }:
-
-rec {
-  crossfire-client = callPackage ./crossfire-client.nix {
-    version = "1.75.0";
-    rev = "21760";
-    sha256 = "0b42sak8hj60nywfswkps777asy9p8r9wsn7pmj2nqbd29ng1p9d";
-  };
-
-  crossfire-server = callPackage ./crossfire-server.nix {
-    version = "latest";
-    rev = "22111";
-    sha256 = "04fjif6zv642n2zlw27cgzkak2kknwrxqzg42bvzl7q901bsr9l7";
-    maps = crossfire-maps;
-    arch = crossfire-arch;
-  };
-
-  crossfire-arch = callPackage ./crossfire-arch.nix {
-    version = "latest";
-    rev = "22111";
-    sha256 = "0l4rp3idvbhknpxxs0w4i4nqfg01wblzm4v4j375xwxxbf00j0ms";
-  };
-
-  crossfire-maps = callPackage ./crossfire-maps.nix {
-    version = "latest";
-    rev = "22111";
-    sha256 = "1dwfc84acjvbjgjakkb8z8pdlksbsn90j0z8z8rq37lqx0kx1sap";
-  };
-}
--- 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 = [ ];

--- 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
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@ -11,6 +11,7 @@
  editline,
  ncurses,
  clangStdenv,
+  nix-direnv,
  nix-fast-build,

  storeDir ? "/nix/store",
@ -81,6 +82,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;
        };
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -356,6 +356,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

--- a/Show More
+++ b/Show More