From 594e7f3f4d91c31f99453a1cc2414eeec228a246 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Tue, 1 Jul 2025 16:04:45 -0700
Subject: [PATCH 001/103] mpvScripts.bdanmaku: init at 0-unstable-2025-01-15

---
 .../video/mpv/scripts/bdanmaku.nix            | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/applications/video/mpv/scripts/bdanmaku.nix

diff --git a/pkgs/applications/video/mpv/scripts/bdanmaku.nix b/pkgs/applications/video/mpv/scripts/bdanmaku.nix
new file mode 100644
index 000000000000..05d8924e5e74
--- /dev/null
+++ b/pkgs/applications/video/mpv/scripts/bdanmaku.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildLua,
+  fetchFromGitHub,
+  nix-update-script,
+  biliass,
+}:
+
+buildLua {
+  pname = "bdanmaku";
+  version = "0-unstable-2025-01-15";
+
+  scriptPath = "bdanmaku.lua";
+  src = fetchFromGitHub {
+    owner = "UlyssesZh";
+    repo = "bdanmaku";
+    rev = "c9f2dca413a7148a662f006b8c524ccbd7a1945b";
+    hash = "sha256-XbkKXZoC+Rqn0gSyyw8sn2VJO73MlatOS0lm2tcwcfY=";
+  };
+
+  passthru.extraWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [ biliass ])
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Mpv plugin to correctly display Bilibili danmaku, powered by biliass";
+    homepage = "https://github.com/UlyssesZh/bdanmaku";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+  };
+}

From 107574ad650e047780bfe7cd386e65a930798cef Mon Sep 17 00:00:00 2001
From: George Huebner <george@feyor.sh>
Date: Wed, 9 Jul 2025 14:24:50 -0400
Subject: [PATCH 002/103] one_gadget: use multiarch binutils

The version of objdump used should support {i686,x86_64,aarch64}-linux-gnu, regardless of the
host architecture (e.g. darwin).
---
 pkgs/by-name/on/one_gadget/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/on/one_gadget/package.nix b/pkgs/by-name/on/one_gadget/package.nix
index d03d231e3744..3432638aa3b4 100644
--- a/pkgs/by-name/on/one_gadget/package.nix
+++ b/pkgs/by-name/on/one_gadget/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  binutils,
+  binutils-unwrapped,
   bundlerApp,
   bundlerUpdateScript,
   makeWrapper,
@@ -14,7 +14,9 @@ bundlerApp {
   nativeBuildInputs = [ makeWrapper ];
 
   postBuild = ''
-    wrapProgram $out/bin/one_gadget --prefix PATH : ${binutils}/bin
+    wrapProgram $out/bin/one_gadget --prefix PATH : ${
+      binutils-unwrapped.override { withAllTargets = true; }
+    }/bin
   '';
 
   passthru.updateScript = bundlerUpdateScript "one_gadget";

From b8485829e54be9e028a39e0ad79f1eefea5ac08b Mon Sep 17 00:00:00 2001
From: Sirius902 <10891979+Sirius902@users.noreply.github.com>
Date: Fri, 5 Sep 2025 18:26:58 -0700
Subject: [PATCH 003/103] archipelago: avoid bwrap

Archipelago clients that rely on reading/writing memory of other processes cannot do so under bwrap.
---
 pkgs/by-name/ar/archipelago/package.nix | 92 +++++++++++++++++++------
 1 file changed, 72 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ar/archipelago/package.nix b/pkgs/by-name/ar/archipelago/package.nix
index 995cc280bb6d..60e8c67760ab 100644
--- a/pkgs/by-name/ar/archipelago/package.nix
+++ b/pkgs/by-name/ar/archipelago/package.nix
@@ -1,35 +1,87 @@
 {
   lib,
+  pkgs,
+  stdenvNoCC,
   appimageTools,
+  autoPatchelfHook,
+  makeWrapper,
+  gobject-introspection,
+  openssl,
+  lttng-ust,
+  mtdev,
+  xsel,
+  xclip,
+  zenity,
   fetchurl,
   nix-update-script,
-  extraPackages ? [ ],
 }:
-let
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "archipelago";
   version = "0.6.3";
   src = fetchurl {
-    url = "https://github.com/ArchipelagoMW/Archipelago/releases/download/${version}/Archipelago_${version}_linux-x86_64.AppImage";
+    url = "https://github.com/ArchipelagoMW/Archipelago/releases/download/${finalAttrs.version}/Archipelago_${finalAttrs.version}_linux-x86_64.AppImage";
     hash = "sha256-PetlGYsdhyvThIFqy+7wbPLAXDcgN2Kcl2WF3rta8PA=";
   };
 
-  appimageContents = appimageTools.extractType2 { inherit pname version src; };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
-  extraPkgs =
-    pkgs:
-    [
-      pkgs.xsel
-      pkgs.xclip
-      pkgs.mtdev
-    ]
-    ++ extraPackages;
-  extraInstallCommands = ''
-    install -Dm444 ${appimageContents}/archipelago.desktop -t $out/share/applications
+  dontUnpack = true;
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    makeWrapper
+  ];
+
+  buildInputs = finalAttrs.runtimeDependencies;
+
+  runtimeDependencies = [
+    gobject-introspection
+    lttng-ust
+    openssl
+  ]
+  ++ appimageTools.defaultFhsEnvArgs.targetPkgs pkgs
+  ++ appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;
+
+  libraryPath = lib.makeLibraryPath [
+    mtdev
+  ];
+
+  binPath = lib.makeBinPath [
+    xsel
+    xclip
+    zenity
+  ];
+
+  appimageContents = appimageTools.extractType2 { inherit (finalAttrs) pname version src; };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp ${finalAttrs.appimageContents}/AppRun $out/bin/archipelago
+
+    mkdir -p $out/lib/opt
+    cp -r ${finalAttrs.appimageContents}/opt/* $out/lib/opt
+
+    wrapProgram $out/bin/archipelago \
+      --set APPDIR $out/lib \
+      --prefix LD_LIBRARY_PATH : "${finalAttrs.libraryPath}" \
+      --prefix PATH : "${finalAttrs.binPath}"
+
+    install -Dm444 ${finalAttrs.appimageContents}/archipelago.desktop -t $out/share/applications
     substituteInPlace $out/share/applications/archipelago.desktop \
       --replace-fail 'opt/Archipelago/ArchipelagoLauncher' "archipelago"
-    cp -r ${appimageContents}/usr/share/icons $out/share
+    cp -r ${finalAttrs.appimageContents}/usr/share/icons $out/share
+
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    patchelf \
+      --replace-needed libcrypto.so.1.0.0 libcrypto.so \
+      --replace-needed libssl.so.1.0.0 libssl.so \
+      $out/lib/opt/Archipelago/EnemizerCLI/System.Security.Cryptography.Native.OpenSsl.so
+
+    patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so \
+      $out/lib/opt/Archipelago/EnemizerCLI/libcoreclrtraceptprovider.so
   '';
 
   passthru.updateScript = nix-update-script { };
@@ -37,7 +89,7 @@ appimageTools.wrapType2 {
   meta = {
     description = "Multi-Game Randomizer and Server";
     homepage = "https://archipelago.gg";
-    changelog = "https://github.com/ArchipelagoMW/Archipelago/releases/tag/${version}";
+    changelog = "https://github.com/ArchipelagoMW/Archipelago/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     mainProgram = "archipelago";
     maintainers = with lib.maintainers; [
@@ -46,4 +98,4 @@ appimageTools.wrapType2 {
     ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 0f798216aed9b591ecee58ff2402b85e0fe9b201 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Fri, 19 Sep 2025 14:34:32 -0400
Subject: [PATCH 004/103] lnav: 0.13.1 -> 0.13.2

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

diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix
index ea028c7516de..d69ed07aaa3e 100644
--- a/pkgs/by-name/ln/lnav/package.nix
+++ b/pkgs/by-name/ln/lnav/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lnav";
-  version = "0.13.1";
+  version = "0.13.2";
 
   src = fetchFromGitHub {
     owner = "tstack";
     repo = "lnav";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Pi1S8tRY7Lv0R7sdLOFppuCbTb/6omyAsNW13dmWBqA=";
+    hash = "sha256-IYBcYnai7Se3/GNITzhpSV/XYvCUvcpiZDTF4Y58Zt0=";
   };
 
   enableParallelBuilding = true;

From 4aed0ad33be426735ceac6fc0dc73a91c150bdfb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 09:20:50 +0000
Subject: [PATCH 005/103] ndi-6: 6.2.0 -> 6.2.1.0

---
 pkgs/by-name/nd/ndi-6/version.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/nd/ndi-6/version.json b/pkgs/by-name/nd/ndi-6/version.json
index edbc456e9e4a..3e21f17ec6bd 100644
--- a/pkgs/by-name/nd/ndi-6/version.json
+++ b/pkgs/by-name/nd/ndi-6/version.json
@@ -1 +1 @@
-{"hash": "sha256-C99mJkUn+L43+iLt3SuFFLmGilik2D+AoH2+tHnuFNQ=", "version": "6.2.0"}
+{"hash": "sha256:0bdf66264527f8be37fa22eddd2b8514b9868a58a4d83f80a07dbeb479ee14d4", "version": "6.2.1.0"}

From 494a5d58fb47d195298247818e17027f2772636c Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 1 Mar 2025 11:19:50 +0100
Subject: [PATCH 006/103] nixos/ssh: use known test keys

The SSH keys have been updated to use either the official test vectors
or keys from upstream OpenSSH repository.

The goal is to, hopefully, eliminate the false positive reports the
security team receive about these keys.
---
 nixos/tests/ssh-keys.nix | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/nixos/tests/ssh-keys.nix b/nixos/tests/ssh-keys.nix
index 2c25778a2085..c07a95a30ef9 100644
--- a/nixos/tests/ssh-keys.nix
+++ b/nixos/tests/ssh-keys.nix
@@ -1,27 +1,35 @@
 pkgs: {
+  # This key is used in integration tests
+  # This is NOT a security issue
+  # It uses the test key defined in RFC 9500
+  # https://datatracker.ietf.org/doc/rfc9500/
   snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" ''
     -----BEGIN EC PRIVATE KEY-----
-    MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49
-    AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN
-    r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA==
+    MHcCAQEEIObLW92AqkWunJXowVR2Z5/+yVPBaFHnEedDk5WJxk/BoAoGCCqGSM49
+    AwEHoUQDQgAEQiVI+I+3gv+17KN0RFLHKh5Vj71vc75eSOkyMsxFxbFsTNEMTLjV
+    uKFxOelIgsiZJXKZNCX0FBmrfpCkKklCcg==
     -----END EC PRIVATE KEY-----
   '';
 
   snakeOilPublicKey = pkgs.lib.concatStrings [
     "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA"
-    "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa"
-    "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= snakeoil"
+    "yNTYAAABBBEIlSPiPt4L/teyjdERSxyoeVY+9b3O+XkjpMjLMRcWxbEzRDEy41b"
+    "ihcTnpSILImSVymTQl9BQZq36QpCpJQnI= snakeoil"
   ];
 
+  # This key is used in integration tests
+  # This is NOT a security issue
+  # It uses the same key than the one used in OpenSSH fuzz tests
+  # https://github.com/openssh/openssh-portable/blob/V_9_9_P2/regress/misc/fuzz-harness/fixed-keys.h#L76-L85
   snakeOilEd25519PrivateKey = pkgs.writeText "privkey.snakeoil" ''
     -----BEGIN OPENSSH PRIVATE KEY-----
     b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-    QyNTUxOQAAACAYBTIWo1J4PkY4/7AhVyPT8xvAUI67tp+yYFFRdSm7+QAAAJC89yCivPcg
-    ogAAAAtzc2gtZWQyNTUxOQAAACAYBTIWo1J4PkY4/7AhVyPT8xvAUI67tp+yYFFRdSm7+Q
-    AAAEDJmKp3lX6Pz0unTc0QZwrHb8Eyr9fJUopE9d2/+q+eCxgFMhajUng+Rjj/sCFXI9Pz
-    G8BQjru2n7JgUVF1Kbv5AAAACnRvbUBvemRlc2sBAgM=
+    QyNTUxOQAAACAz0F5hFTFS5nhUcmnyjFVoDw5L/P7kQU8JnBA2rWczAwAAAIhWlP99VpT/
+    fQAAAAtzc2gtZWQyNTUxOQAAACAz0F5hFTFS5nhUcmnyjFVoDw5L/P7kQU8JnBA2rWczAw
+    AAAEDE1rlcMC0s0X3TKVZAOVavZOywwkXw8tO5dLObxaCMEDPQXmEVMVLmeFRyafKMVWgP
+    Dkv8/uRBTwmcEDatZzMDAAAAAAECAwQF
     -----END OPENSSH PRIVATE KEY-----
   '';
 
-  snakeOilEd25519PublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgFMhajUng+Rjj/sCFXI9PzG8BQjru2n7JgUVF1Kbv5 snakeoil";
+  snakeOilEd25519PublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDPQXmEVMVLmeFRyafKMVWgPDkv8/uRBTwmcEDatZzMD snakeoil";
 }

From 22a3483151c2ec676fbb9539047548bbac0e92d4 Mon Sep 17 00:00:00 2001
From: jasonxue <jason@xuechunxi.com>
Date: Wed, 15 Oct 2025 22:22:54 +0800
Subject: [PATCH 007/103] basedpyright: 1.31.6 -> 1.31.7

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

diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix
index e889350a11c6..f8ca0692cc0f 100644
--- a/pkgs/by-name/ba/basedpyright/package.nix
+++ b/pkgs/by-name/ba/basedpyright/package.nix
@@ -18,13 +18,13 @@
 
 buildNpmPackage rec {
   pname = "basedpyright";
-  version = "1.31.6";
+  version = "1.31.7";
 
   src = fetchFromGitHub {
     owner = "detachhead";
     repo = "basedpyright";
     tag = "v${version}";
-    hash = "sha256-SqG51pxkJQ/YrknSOMy6KWn1pvdgJa5CLnFl5naAPMA=";
+    hash = "sha256-mC+qnEI2a7tGjIIZxRzGY+VyfYnTY1brCKGHU3KOf0Q=";
   };
 
   npmDepsHash = "sha256-dwtMl5dFpol+J+cM6EHiwO+F93Iyurwx9Kr317IGtVw=";

From 38b1c19ecd569fc9ebec15028ddb8e9a48526e79 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 15 Oct 2025 20:34:29 +0200
Subject: [PATCH 008/103] nixos/gitlab-runner: clarify the use of
 `extraPackages`

---
 .../modules/services/continuous-integration/gitlab-runner.nix  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index ed9a10cff6ed..8870a8a8730b 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -275,7 +275,8 @@ in
       type = types.listOf types.package;
       default = [ ];
       description = ''
-        Extra packages to add to PATH for the gitlab-runner process.
+        Extra packages to add to `PATH` for the `gitlab-runner` process.
+        These packages won't be added to the system, use `environment.systemPackages` for that.
       '';
     };
     services = mkOption {

From 985ab75c843b026c7cb7d51fc0d59c9e0e30f1e0 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 15 Oct 2025 20:37:47 +0200
Subject: [PATCH 009/103] nixos/gitlab-runner: fix broken link

---
 nixos/modules/services/continuous-integration/gitlab-runner.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index 8870a8a8730b..eb305d1e9a19 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -458,7 +458,7 @@ in
               default = "docker";
               description = ''
                 Select executor, eg. shell, docker, etc.
-                See [runner documentation](https://docs.gitlab.com/runner/executors/README.html) for more information.
+                See [runner executor documentation](https://docs.gitlab.com/runner/executors/) for more information.
               '';
             };
             buildsDir = mkOption {

From 4f408d0d4b033375a1ddc3da6c583d63f71a58be Mon Sep 17 00:00:00 2001
From: Luis Alberto Santos <lasantosr.92@gmail.com>
Date: Thu, 16 Oct 2025 19:01:52 +0200
Subject: [PATCH 010/103] intelli-shell: 3.2.3 -> 3.3.0

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

diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix
index f105fe38466a..90ecba021f18 100644
--- a/pkgs/by-name/in/intelli-shell/package.nix
+++ b/pkgs/by-name/in/intelli-shell/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "intelli-shell";
-  version = "3.2.3";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "lasantosr";
     repo = "intelli-shell";
     rev = "v${version}";
-    hash = "sha256-kwwZzuo/eH+bssSFjBWC3YwP6X/CoRPo8OCa/0wGrp8=";
+    hash = "sha256-Y1wFmere1Ft7AB1voHpI7KThoGjSpRXmAab35uoM6Ms=";
   };
 
-  cargoHash = "sha256-0wS751jE0VK/FaoL7WNc2OezJeDmYJNO+IKezB7Ma1Q=";
+  cargoHash = "sha256-Op96deiAVliE9FuNMh1GExoO0jcmCFEuYGCXMccHAvo=";
 
   nativeBuildInputs = [
     pkg-config

From a3848316a908d5a22d8f9fcfe2f17b4151186131 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 22:00:21 +0000
Subject: [PATCH 011/103] python3Packages.aioesphomeapi: 41.13.0 -> 42.0.0

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

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index b53ab7818c5c..c731241cdba1 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "41.13.0";
+  version = "42.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "aioesphomeapi";
     tag = "v${version}";
-    hash = "sha256-hrGAByVxnGqFk23fTvGRDJipjHglMS35WeJFM7Gk5S4=";
+    hash = "sha256-THhWp5X5oFjFrUMN8Hr0Vs9ElwFro16DoNzvU2Kux/4=";
   };
 
   build-system = [

From 6e0ca184a198bbc3ba3fc3a31b58ac8b1f7c28d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 02:36:55 +0000
Subject: [PATCH 012/103] xk6: 1.1.6 -> 1.2.2

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

diff --git a/pkgs/by-name/xk/xk6/package.nix b/pkgs/by-name/xk/xk6/package.nix
index 79b4bc8b089e..7a24b72fb7e3 100644
--- a/pkgs/by-name/xk/xk6/package.nix
+++ b/pkgs/by-name/xk/xk6/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "xk6";
-  version = "1.1.6";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "xk6";
     tag = "v${version}";
-    hash = "sha256-9sCf4EOYsyOv1OZbFOU/O6B0GN4JVz3bUi75IDveceA=";
+    hash = "sha256-qZCOsduj/oSizkEgy/MydYc5CQiBHgEnxjWeoS2EMX4=";
   };
 
   vendorHash = null;

From 1f78dc1be721cc7fba2127f6c2e1a118f76487db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 04:10:05 +0000
Subject: [PATCH 013/103] github-runner: 2.328.0 -> 2.329.0

---
 pkgs/by-name/gi/github-runner/deps.json   | 4 ++--
 pkgs/by-name/gi/github-runner/package.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gi/github-runner/deps.json b/pkgs/by-name/gi/github-runner/deps.json
index 6146f1957680..be678bbdeb91 100644
--- a/pkgs/by-name/gi/github-runner/deps.json
+++ b/pkgs/by-name/gi/github-runner/deps.json
@@ -6,8 +6,8 @@
   },
   {
     "pname": "Azure.Storage.Blobs",
-    "version": "12.25.0",
-    "hash": "sha256-SjIwM1sIBd4I9ShAeaIAfPUzc3K7tbodW6y1vNAD+4U="
+    "version": "12.25.1",
+    "hash": "sha256-OJgmzE7+BJsrqGMErUwG4wmaguYL1zPbhtdQvvqFuHY="
   },
   {
     "pname": "Azure.Storage.Common",
diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
index 5e331b17c88b..ca76c0781863 100644
--- a/pkgs/by-name/gi/github-runner/package.nix
+++ b/pkgs/by-name/gi/github-runner/package.nix
@@ -35,13 +35,13 @@ assert builtins.all (
 
 buildDotnetModule (finalAttrs: {
   pname = "github-runner";
-  version = "2.328.0";
+  version = "2.329.0";
 
   src = fetchFromGitHub {
     owner = "actions";
     repo = "runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3Q2bscLKdUBPx+5X0qxwtcy3CU6N/wE8yO1CcATSyBQ=";
+    hash = "sha256-Lf8l959y5tfvCsLwI8+tziFGm+LUJnhE2PQIz/zZneA=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git-revision

From ca7df24e033c7adf4feaa16c044a3e7979a37116 Mon Sep 17 00:00:00 2001
From: Simon Hauser <simon.hauser@helsinki-systems.de>
Date: Fri, 17 Oct 2025 09:25:15 +0200
Subject: [PATCH 014/103] mariadb: upgrade default from 10.11 to 11.4

---
 doc/release-notes/rl-2511.section.md | 2 ++
 pkgs/top-level/all-packages.nix      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index cc33de7809e8..b3a3cad5aa5e 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -232,6 +232,8 @@
 
 - `nodePackages.rimraf` has been removed, as it is a Javascript library, and packages that want to use it should depend directly on it instead.
 
+- `mariadb` now defaults to `mariadb_114` instead of `mariadb_1011`, meaning the default version was upgraded from 10.11.x to 11.4.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-11-to-mariadb-11-4/) for potential issues.
+
 ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3c1ef173dd0..5becf0aeb875 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9590,7 +9590,7 @@ with pkgs;
     mariadb_114
     mariadb_118
     ;
-  mariadb = mariadb_1011;
+  mariadb = mariadb_114;
   mariadb-embedded = mariadb.override { withEmbedded = true; };
 
   mongodb = hiPrio mongodb-7_0;

From 5ac0f43972aad7c113cdca2d5c1eada46318b5f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 09:03:43 +0000
Subject: [PATCH 015/103] searxng: 0-unstable-2025-10-13 ->
 0-unstable-2025-10-17

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

diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix
index eac3c1e27d5d..7eda4bf32f0f 100644
--- a/pkgs/by-name/se/searxng/package.nix
+++ b/pkgs/by-name/se/searxng/package.nix
@@ -13,14 +13,14 @@ in
 python.pkgs.toPythonModule (
   python.pkgs.buildPythonApplication rec {
     pname = "searxng";
-    version = "0-unstable-2025-10-13";
+    version = "0-unstable-2025-10-17";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "searxng";
       repo = "searxng";
-      rev = "c34bb612847ce4584f65077b104164993bfa88c5";
-      hash = "sha256-vs64ue9bI86kCrOUdy8Kddd2GTIYmveyy1XunEqPAtw=";
+      rev = "57622793bf80b90a651a566178ae139f64ea5d93";
+      hash = "sha256-LKv/WS8aAgD8s1T7aHeHrkDMVy/E5FiuJEoM+80KLb4=";
     };
 
     nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];

From 3d6371bb4465496e9db4592cc7df7133fd795a7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 21:20:27 +0000
Subject: [PATCH 016/103] libserdes: 8.0.1 -> 8.1.0

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

diff --git a/pkgs/by-name/li/libserdes/package.nix b/pkgs/by-name/li/libserdes/package.nix
index ca7cb36d34c5..13dbbe147d6d 100644
--- a/pkgs/by-name/li/libserdes/package.nix
+++ b/pkgs/by-name/li/libserdes/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libserdes";
-  version = "8.0.1";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "confluentinc";

From 8bc1cf44b41b7e439852eda6e26720d9f841208f Mon Sep 17 00:00:00 2001
From: yuannan <brandon@emergence.ltd>
Date: Fri, 17 Oct 2025 22:28:35 +0100
Subject: [PATCH 017/103] maintainers: add yuannan

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a07d0e41b379..b394fa06412e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28662,6 +28662,12 @@
     githubId = 7040031;
     name = "Yannik Sander";
   };
+  yuannan = {
+    email = "brandon@emergence.ltd";
+    github = "yuannan";
+    githubId = 8006928;
+    name = "Yuannan (Brandon) Lin";
+  };
   yuka = {
     email = "yuka@yuka.dev";
     matrix = "@yuka:yuka.dev";

From ca4788621e326697de2f0bad02224022f854282f Mon Sep 17 00:00:00 2001
From: yuannan <brandon@emergence.ltd>
Date: Fri, 17 Oct 2025 22:35:11 +0100
Subject: [PATCH 018/103] dislocker: 0.7.3 -> 0.7.3-unstable-2025-09-07

---
 pkgs/by-name/di/dislocker/package.nix | 41 +++++++--------------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/di/dislocker/package.nix b/pkgs/by-name/di/dislocker/package.nix
index 72984a914545..a0f844006471 100644
--- a/pkgs/by-name/di/dislocker/package.nix
+++ b/pkgs/by-name/di/dislocker/package.nix
@@ -2,53 +2,31 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   pkg-config,
-  mbedtls_2,
-  fuse,
+  fuse3,
+  mbedtls,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dislocker";
-  version = "0.7.3";
+  version = "0.7.3-unstable-2025-09-07";
 
   src = fetchFromGitHub {
     owner = "Aorimn";
     repo = "dislocker";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-U8BD3kE1CH+Mjh/7SlXG9gKY6/LyF9+ER5C3soNGZqo=";
+    rev = "4ff070f0ea9e56948ab316fb76b91f54dd6727aa";
+    hash = "sha256-hrIt5D9YjBWs0Q9chWGQM2bo1SZ7qLCd898zFHWWcqA=";
   };
 
-  patches = [
-    # This patch
-    #   1. adds support for the latest FUSE on macOS
-    #   2. uses pkg-config to find libfuse instead of searching in predetermined
-    #      paths
-    #
-    # https://github.com/Aorimn/dislocker/pull/246
-    (fetchpatch {
-      name = "feat-support-the-latest-FUSE-on-macOS.patch";
-      url = "https://github.com/Aorimn/dislocker/commit/7744f87c75fcfeeb414d0957771042b10fb64e62.patch";
-      hash = "sha256-JX+4DJLcw9qP1nIs+sZDcduSFvU4YdGyblFLtxZj/i4=";
-    })
-    # fix compatibility with CMake (https://cmake.org/cmake/help/v4.0/command/cmake_minimum_required.html)
-    # https://github.com/Aorimn/dislocker/pull/346
-    (fetchpatch {
-      name = "cmake-raise-minimum-required-version-to-3.5.patch";
-      url = "https://github.com/Aorimn/dislocker/commit/337d05dc7447436539f2fb481eef0e528a000b66.patch";
-      hash = "sha256-6LTRjaZfyGS2BCdpcJy/qo0r8soXJSZqWjZRbaKvcQk=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
 
   buildInputs = [
-    fuse
-    mbedtls_2
+    fuse3
+    mbedtls
   ];
 
   meta = {
@@ -56,7 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/Aorimn/dislocker";
     changelog = "https://github.com/Aorimn/dislocker/raw/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ elitak ];
+    maintainers = with lib.maintainers; [
+      elitak
+      yuannan
+    ];
     platforms = lib.platforms.unix;
   };
 })

From 53cb5c8e97800dd97b42ef65271d4cca2d1ab45b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 17 Oct 2025 16:35:22 -0700
Subject: [PATCH 019/103] semgrep: 1.104.0 -> 1.140.0

Why
===
New version

Changes
===
* fix update script
* Update wheel package format compatible versions
* add missing mcp python package dependency

Test plan
===
```
[ryantm:~/p/nixpkgs]$ ./result/bin/semgrep  --version
[00.05][WARNING](ca-certs): Ignored 176 trust anchors.
1.140.0
```
---
 .../python-modules/semgrep/common.nix         | 16 ++++++------
 .../python-modules/semgrep/default.nix        |  3 +++
 .../python-modules/semgrep/semgrep-core.nix   |  2 +-
 .../python-modules/semgrep/update.sh          | 25 ++-----------------
 4 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/python-modules/semgrep/common.nix b/pkgs/development/python-modules/semgrep/common.nix
index 6c687b88db1e..55ffe9b74ff8 100644
--- a/pkgs/development/python-modules/semgrep/common.nix
+++ b/pkgs/development/python-modules/semgrep/common.nix
@@ -1,9 +1,9 @@
 { lib }:
 
 rec {
-  version = "1.104.0";
+  version = "1.140.0";
 
-  srcHash = "sha256-rVBnjG+g7OaOQ8LYCurqNC2dYY/Dm4hdocgotc4lADg=";
+  srcHash = "sha256-RLcES0kamYMlLo1L4Y+mSJDB91SP84h75oLQxX9eCjQ=";
 
   # submodule dependencies
   # these are fetched so we:
@@ -13,8 +13,8 @@ rec {
     "cli/src/semgrep/semgrep_interfaces" = {
       owner = "semgrep";
       repo = "semgrep-interfaces";
-      rev = "5e0c767ec323f3f2356d3bf8dbdf7c7836497d8a";
-      hash = "sha256-RvkUbS+q/UqkKLDBCvDWkuRYDzWXp+JonFE7qVkEsY8=";
+      rev = "8baadf6b8604b59c9a660dbb371726c12a3666b8";
+      hash = "sha256-37sEprdR8I45tRYsXNNFz0okoTH32MJU9EvMogEMtMw=";
     };
   };
 
@@ -25,19 +25,19 @@ rec {
   core = {
     x86_64-linux = {
       platform = "musllinux_1_0_x86_64.manylinux2014_x86_64";
-      hash = "sha256-Qn97ZJI1//n47z/qX87AuIWRvvXurwH26C/vBrZ12gc=";
+      hash = "sha256-/aZnv5a7ifSk1l98Qf+HKQhnrHKi88SKTuJZwQ7Ons4=";
     };
     aarch64-linux = {
       platform = "musllinux_1_0_aarch64.manylinux2014_aarch64";
-      hash = "sha256-vuLuxsqnaPSbcVuwyhRRTTTwDVCZvOkRJURZUKnh/9I=";
+      hash = "sha256-f0k/sNME/0JGrvV7/H47jWLY3OadslzljfA7Kpp0STo=";
     };
     x86_64-darwin = {
       platform = "macosx_10_14_x86_64";
-      hash = "sha256-QWESQQyBzyupzC1V5zs1GgZBtHEUgayvcKwDn+5pXUc=";
+      hash = "sha256-HldS8Rcx+OkFYfBr/5+rMXVg8prrAuBCDTbkgb8DVsQ=";
     };
     aarch64-darwin = {
       platform = "macosx_11_0_arm64";
-      hash = "sha256-gkX82X79L+v5A1Mby6sCqXcx79fgJGIfmRdARtULmUc=";
+      hash = "sha256-LiIO4Smomx6tHTtg8ewwXaKXdJDpcmE+auJ5FjWi990=";
     };
   };
 
diff --git a/pkgs/development/python-modules/semgrep/default.nix b/pkgs/development/python-modules/semgrep/default.nix
index ee915a30945c..c86bbe502701 100644
--- a/pkgs/development/python-modules/semgrep/default.nix
+++ b/pkgs/development/python-modules/semgrep/default.nix
@@ -22,6 +22,7 @@
   opentelemetry-exporter-otlp-proto-http,
   opentelemetry-instrumentation-requests,
   opentelemetry-sdk,
+  mcp,
   packaging,
   peewee,
   pytest-freezegun,
@@ -97,6 +98,7 @@ buildPythonPackage rec {
     packaging
     jsonschema
     wcmatch
+    mcp
     peewee
     defusedxml
     urllib3
@@ -125,6 +127,7 @@ buildPythonPackage rec {
     "tests/default/e2e"
     "tests/default/e2e-pysemgrep"
     "tests/default/e2e-other"
+    "tests/default/mcp"
   ];
 
   disabledTests = [
diff --git a/pkgs/development/python-modules/semgrep/semgrep-core.nix b/pkgs/development/python-modules/semgrep/semgrep-core.nix
index 5a598631ceae..ea6f1f58eaba 100644
--- a/pkgs/development/python-modules/semgrep/semgrep-core.nix
+++ b/pkgs/development/python-modules/semgrep/semgrep-core.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
       inherit version;
       format = "wheel";
       dist = python;
-      python = "cp39.cp310.cp311.py39.py310.py311";
+      python = "cp310.cp311.cp312.cp313.cp314.py310.py311.py312.py313.py314";
       inherit (data) platform hash;
     };
 
diff --git a/pkgs/development/python-modules/semgrep/update.sh b/pkgs/development/python-modules/semgrep/update.sh
index 914de6c9331f..f4f847f1113f 100755
--- a/pkgs/development/python-modules/semgrep/update.sh
+++ b/pkgs/development/python-modules/semgrep/update.sh
@@ -34,11 +34,6 @@ NEW_VERSION=$(
 NEW_VERSION="${NEW_VERSION:1}"
 OLD_VERSION="$(instantiateClean semgrep.passthru.common.version)"
 
-if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then
-    echo "Already up to date"
-    exit
-fi
-
 replace() {
     sed -i "s@$1@$2@g" "$3"
 }
@@ -48,22 +43,6 @@ fetchgithub() {
     nix-build -A "$1" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g'
     set -eo pipefail
 }
-
-fetch_arch() {
-  VERSION=$1
-  PLATFORM=$2
-  nix-prefetch "{ fetchPypi }:
-fetchPypi rec {
-  pname = \"semgrep\";
-  version = \"$VERSION\";
-  format = \"wheel\";
-  dist = python;
-  python = \"cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311\";
-  platform = \"$PLATFORM\";
-}
-"
-}
-
 replace "$OLD_VERSION" "$NEW_VERSION" "$COMMON_FILE"
 
 echo "Updating src"
@@ -86,8 +65,9 @@ update_core_platform() {
     PLATFORM="$(instantiateClean "semgrep.passthru.common.core.$SYSTEM.platform")"
 
     OLD_HASH="$(instantiateClean "semgrep.passthru.common.core.$SYSTEM.hash")"
+    URL="$(nix-instantiate -A "semgrep.passthru.semgrep-core.src.url" --raw --eval --strict --argstr system "$SYSTEM")"
     echo "Old core hash $OLD_HASH"
-    NEW_HASH="$(fetch_arch "$NEW_VERSION" "$PLATFORM")"
+    NEW_HASH="$(nix hash convert --hash-algo sha256 --to sri $(nix-prefetch-url $URL))"
     echo "New core hash $NEW_HASH"
     replace "$OLD_HASH" "$NEW_HASH" "$COMMON_FILE"
 
@@ -144,4 +124,3 @@ done
 rm -rf "$TMPDIR"
 
 echo "Finished"
-

From 293695e86017bf751a66c7e6ab6be91adaf0a475 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sat, 18 Oct 2025 12:28:00 +0800
Subject: [PATCH 020/103] razergenie: 1.2.0 -> 1.3.0

Diff: https://github.com/z3ntu/RazerGenie/compare/v1.2.0...v1.3.0
---
 pkgs/applications/misc/razergenie/default.nix | 24 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/razergenie/default.nix b/pkgs/applications/misc/razergenie/default.nix
index 04cd8c67714f..571b1f058ca3 100644
--- a/pkgs/applications/misc/razergenie/default.nix
+++ b/pkgs/applications/misc/razergenie/default.nix
@@ -5,22 +5,20 @@
   meson,
   ninja,
   pkg-config,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  qt6,
   cmake,
 }:
 
 let
   libopenrazer = stdenv.mkDerivation (finalAttrs: {
     pname = "libopenrazer";
-    version = "0.3.0";
+    version = "0.4.0";
 
     src = fetchFromGitHub {
       owner = "z3ntu";
       repo = "libopenrazer";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-bU8Zsm/hM4HbPcoD191zwxU3x7f0i51evtVeD4jqw0U=";
+      hash = "sha256-2RH4mevJS5HaEkb5lDNwoMaMNACXJGUVA5RWSYSsakI=";
     };
 
     nativeBuildInputs = [
@@ -30,8 +28,8 @@ let
     ];
 
     buildInputs = [
-      qtbase
-      qttools
+      qt6.qtbase
+      qt6.qttools
     ];
 
     dontWrapQtApps = true;
@@ -46,13 +44,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "razergenie";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "z3ntu";
     repo = "RazerGenie";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kw7/Qf6L63PBuyq3TfgU2iGAKX0qLGiq6JgLnN+3tu4=";
+    hash = "sha256-TxW6IUHmEaNdJPeEGwo57a3EGH6MMyitVTmzStVmZjc=";
   };
 
   postUnpack = ''ln -s ${libopenrazer} libopenrazer'';
@@ -62,12 +60,12 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qttools
+    qt6.qtbase
+    qt6.qttools
     libopenrazer
   ];
 
@@ -75,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/z3ntu/RazerGenie";
     description = "Qt application for configuring your Razer devices under GNU/Linux";
     mainProgram = "razergenie";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       f4814n
       Mogria
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 293fe85c5651..ff8408133395 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2243,7 +2243,7 @@ with pkgs;
     rainloop-standard
     ;
 
-  razergenie = libsForQt5.callPackage ../applications/misc/razergenie { };
+  razergenie = callPackage ../applications/misc/razergenie { };
 
   roundcube = callPackage ../servers/roundcube { };
 

From fe7a69a4efbfb04ebc03e816503f0f0c4dab851b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 04:31:23 +0000
Subject: [PATCH 021/103] re-isearch: 2.20220925.4.0a-unstable-2025-10-10 ->
 2.20220925.4.0a-unstable-2025-10-17

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

diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix
index 091036fb9fd6..45cad3b370a8 100644
--- a/pkgs/by-name/re/re-isearch/package.nix
+++ b/pkgs/by-name/re/re-isearch/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation {
   pname = "re-Isearch";
-  version = "2.20220925.4.0a-unstable-2025-10-10";
+  version = "2.20220925.4.0a-unstable-2025-10-17";
 
   src = fetchFromGitHub {
     owner = "re-Isearch";
     repo = "re-Isearch";
-    rev = "27dd5bc90a85cb168ebb96be173d0c3a98d714e7";
-    hash = "sha256-aNAAdFeGnZG0EhGLU94mhTFeDAOnWbvXVf9N5KRpbUs=";
+    rev = "4487eae1f59e9e9b4affdb612c217f63cf20b0ca";
+    hash = "sha256-VZ7b/SOWDrDN3eN2ZpH+GxfCJVPABWTIKBUJkE1XFDM=";
   };
 
   patches = [

From a7ed13eaddc2e232799f5b17f0ac302d8108c09f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 08:42:57 +0000
Subject: [PATCH 022/103] python3Packages.depyf: 0.19.0 -> 0.20.0

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

diff --git a/pkgs/development/python-modules/depyf/default.nix b/pkgs/development/python-modules/depyf/default.nix
index a59dec3ac9ff..dc29c21c2840 100644
--- a/pkgs/development/python-modules/depyf/default.nix
+++ b/pkgs/development/python-modules/depyf/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "depyf";
-  version = "0.19.0";
+  version = "0.20.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "thuml";
     repo = "depyf";
     tag = "v${version}";
-    hash = "sha256-AGM5Pm0hhqOX9CY7dFijZLqhWmY7xnmKWakh4MUtOMs=";
+    hash = "sha256-GFNlJeD7Nyxr7Ya3aSA6+0AZJSaeDyqXYPEsvhPN1wg=";
   };
 
   # don't try to read git commit

From 7a679fb01c0294d7c6c1181419bc6e557fd33059 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 09:40:47 +0000
Subject: [PATCH 023/103] python3Packages.metaflow: 2.18.11 -> 2.18.12

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

diff --git a/pkgs/development/python-modules/metaflow/default.nix b/pkgs/development/python-modules/metaflow/default.nix
index 5d832f7820a4..e5a5ef10b41e 100644
--- a/pkgs/development/python-modules/metaflow/default.nix
+++ b/pkgs/development/python-modules/metaflow/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "metaflow";
-  version = "2.18.11";
+  version = "2.18.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Netflix";
     repo = "metaflow";
     tag = version;
-    hash = "sha256-MR/QMweDwfvZiG0WqaP1xELnnpiz3zRBvedOtrQnGZM=";
+    hash = "sha256-GHalg2jH8MGJySS2kMyLW04my8d+DTJmiFmexeqJUnY=";
   };
 
   build-system = [

From 23772a00730fd18a689d749a8d407f475ec3d6e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 10:12:36 +0000
Subject: [PATCH 024/103] python3Packages.dvc-ssh: 4.2.1 -> 4.2.2

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

diff --git a/pkgs/development/python-modules/dvc-ssh/default.nix b/pkgs/development/python-modules/dvc-ssh/default.nix
index 5e2206d91342..0ba38995c651 100644
--- a/pkgs/development/python-modules/dvc-ssh/default.nix
+++ b/pkgs/development/python-modules/dvc-ssh/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-ssh";
-  version = "4.2.1";
+  version = "4.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "dvc_ssh";
     inherit version;
-    hash = "sha256-ld6uaAIA+8lHK/TjKtrjtmGKj5847SBMYYvKKN+MkS4=";
+    hash = "sha256-T6yTLF8ivZRE2H1Oez/9bAnMjlbZjrPG1LRDAdNTUBc=";
   };
 
   pythonRemoveDeps = [

From 79dec8752ef558c853067e400c30b6e2feaf9e92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 10:42:05 +0000
Subject: [PATCH 025/103] python3Packages.xdis: 6.1.6 -> 6.1.8

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

diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
index a2fcbc5ebebe..ba7c9fa0f6b5 100644
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "xdis";
-  version = "6.1.6";
+  version = "6.1.8";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "rocky";
     repo = "python-xdis";
     tag = version;
-    hash = "sha256-G4BpvMYjBUBfStP1csfFaFCin0eYEnXwsztCS4amvdY=";
+    hash = "sha256-sAL2D7Rg/iyob2nawXX/b5F/uOGCMsb1q0ZnPLIfh6o=";
   };
 
   build-system = [

From 324523cf9b9bbb7e7f4b28b2441c7223b507684e Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 04:34:06 -0700
Subject: [PATCH 026/103] ardour: move to by-name/

---
 pkgs/{applications/audio => by-name/ar}/ardour/as-flags.patch   | 0
 .../ar}/ardour/default-plugin-search-paths.patch                | 0
 .../audio/ardour/default.nix => by-name/ar/ardour/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 4 files changed, 2 deletions(-)
 rename pkgs/{applications/audio => by-name/ar}/ardour/as-flags.patch (100%)
 rename pkgs/{applications/audio => by-name/ar}/ardour/default-plugin-search-paths.patch (100%)
 rename pkgs/{applications/audio/ardour/default.nix => by-name/ar/ardour/package.nix} (100%)

diff --git a/pkgs/applications/audio/ardour/as-flags.patch b/pkgs/by-name/ar/ardour/as-flags.patch
similarity index 100%
rename from pkgs/applications/audio/ardour/as-flags.patch
rename to pkgs/by-name/ar/ardour/as-flags.patch
diff --git a/pkgs/applications/audio/ardour/default-plugin-search-paths.patch b/pkgs/by-name/ar/ardour/default-plugin-search-paths.patch
similarity index 100%
rename from pkgs/applications/audio/ardour/default-plugin-search-paths.patch
rename to pkgs/by-name/ar/ardour/default-plugin-search-paths.patch
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/by-name/ar/ardour/package.nix
similarity index 100%
rename from pkgs/applications/audio/ardour/default.nix
rename to pkgs/by-name/ar/ardour/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0cfb4ebc4487..a9b36909ca43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10788,8 +10788,6 @@ with pkgs;
   apngasm = callPackage ../applications/graphics/apngasm { };
   apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix { };
 
-  ardour = callPackage ../applications/audio/ardour { };
-
   arelle = with python3Packages; toPythonApplication arelle;
 
   astroid = callPackage ../applications/networking/mailreaders/astroid {

From ef3d6442d4cfc40c6ca4b1711b652906c98d54de Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Sat, 18 Oct 2025 13:43:24 +0200
Subject: [PATCH 027/103] envoy-bin: 1.36.0 -> 1.36.2

https://github.com/envoyproxy/envoy/releases/tag/v1.36.2
https://github.com/envoyproxy/envoy/releases/tag/v1.36.1

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/en/envoy-bin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix
index 17f978d95bd6..f927672f4213 100644
--- a/pkgs/by-name/en/envoy-bin/package.nix
+++ b/pkgs/by-name/en/envoy-bin/package.nix
@@ -8,7 +8,7 @@
   versionCheckHook,
 }:
 let
-  version = "1.36.0";
+  version = "1.36.2";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "envoy-bin is not available for ${system}.";
 
@@ -21,8 +21,8 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-AQFQbCksOJshIzSPvkixRd2jq+hT8+/B5yw1iFzdNqY=";
-      x86_64-linux = "sha256-2fAq74ha9P3KUukQcmu2HxJ7iLAdmAZm/DF832oqMME=";
+      aarch64-linux = "sha256-r3NrtmU8zpxSsvOwkqNgKsIaYKxnVpjQYNxNgoN8Bco=";
+      x86_64-linux = "sha256-r9Z7z+pUhSXudqk1CgpM/rKsJMe1MnlM4zLYQK2M2uc=";
     }
     .${system} or throwSystem;
 in

From e782bbc1768c7342ade0c27e30607e1bdda0d3a6 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 04:58:55 -0700
Subject: [PATCH 028/103] csound: move to by-name/

---
 .../csound/default.nix => by-name/cs/csound/package.nix}  | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)
 rename pkgs/{applications/audio/csound/default.nix => by-name/cs/csound/package.nix} (93%)

diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/by-name/cs/csound/package.nix
similarity index 93%
rename from pkgs/applications/audio/csound/default.nix
rename to pkgs/by-name/cs/csound/package.nix
index 965ff2310bad..155fddc1ca92 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/by-name/cs/csound/package.nix
@@ -79,12 +79,12 @@ stdenv.mkDerivation {
     ln -s $out/lib/CsoundLib64.framework $out/Library/Frameworks
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms";
     homepage = "https://csound.com/";
-    license = licenses.lgpl21Plus;
-    maintainers = [ maintainers.marcweber ];
-    platforms = platforms.unix;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ marcweber ];
+    platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9b36909ca43..aeee7b5efd37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10910,8 +10910,6 @@ with pkgs;
 
   copyq = qt6Packages.callPackage ../applications/misc/copyq { };
 
-  csound = callPackage ../applications/audio/csound { };
-
   csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { };
 
   codeblocksFull = codeblocks.override { contribPlugins = true; };

From ff9fb8f07ccb2b17883b782fdba3780fdd0295b1 Mon Sep 17 00:00:00 2001
From: Hleb Shauchenka <me@marleb.org>
Date: Wed, 15 Oct 2025 17:16:42 +0200
Subject: [PATCH 029/103] nushell: 0.107.0 -> 0.108.0

Diff: https://github.com/nushell/nushell/compare/0.107.0...0.108.0
---
 pkgs/shells/nushell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index f17d4dbfe750..d1b5547e59ab 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -23,7 +23,7 @@ let
   # NOTE: when updating this to a new non-patch version, please also try to
   # update the plugins. Plugins only work if they are compiled for the same
   # major/minor version.
-  version = "0.107.0";
+  version = "0.108.0";
 in
 rustPlatform.buildRustPackage {
   pname = "nushell";
@@ -33,10 +33,10 @@ rustPlatform.buildRustPackage {
     owner = "nushell";
     repo = "nushell";
     tag = version;
-    hash = "sha256-ghBuqkiVHvPxD4zBpvL6NG+qL54SD/aLZNZqWUK4a28=";
+    hash = "sha256-8OMTscMObV+IOSgOoTSzJvZTz6q/l2AjrOb9y3p2tZY=";
   };
 
-  cargoHash = "sha256-HQy6maPKxreYPLni0/XETF/EEJqGGcpAurzf+QTVX18=";
+  cargoHash = "sha256-M2wkhhaS3bVhwaa3O0CUK5hL757qFObr7EDtBFXXwxg=";
 
   nativeBuildInputs = [
     pkg-config

From cb957033a337823916cc7178d13fac33df729a29 Mon Sep 17 00:00:00 2001
From: Hleb Shauchenka <me@marleb.org>
Date: Wed, 15 Oct 2025 17:26:51 +0200
Subject: [PATCH 030/103] nushellPlugins.desktop_notifications: 0.106.1 ->
 0.108.0

Diff:
https://github.com/FMotalleb/nu_plugin_desktop_notifications/compare/v0.106.1...v0.108.0
---
 pkgs/shells/nushell/plugins/desktop_notifications.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/desktop_notifications.nix b/pkgs/shells/nushell/plugins/desktop_notifications.nix
index 1a87a0af4543..6886e659903f 100644
--- a/pkgs/shells/nushell/plugins/desktop_notifications.nix
+++ b/pkgs/shells/nushell/plugins/desktop_notifications.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_desktop_notifications";
-  version = "0.106.1";
+  version = "0.108.0";
 
   src = fetchFromGitHub {
     owner = "FMotalleb";
     repo = "nu_plugin_desktop_notifications";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FuiXHl7O6/DN7kENrVxOys8mJAGbpb11w9iJ+mqQ/ds=";
+    hash = "sha256-9NkWPoTdMxFlI/BkP8w0ltC6UVh3/tg9gjwBuS3k/Cg=";
   };
 
-  cargoHash = "sha256-yFkiRGrg8eGGap5vyZVRMpddsoTYNrwSC94uLYufmdc=";
+  cargoHash = "sha256-GK6ytH/SDHh6GlLrSA2oJLza1tvYOUp4cR5CM6bloz8=";
 
   passthru.updateScript = nix-update-script { };
 

From a1aedb27af6246d5888ae32402267e588a4ba23b Mon Sep 17 00:00:00 2001
From: Hleb Shauchenka <me@marleb.org>
Date: Thu, 16 Oct 2025 21:08:04 +0200
Subject: [PATCH 031/103] nushellPlugins.skim: 0.19.0 -> 0.20.1

Diff: https://github.com/idanarye/nu_plugin_skim/compare/v0.19.0...v0.20.1
---
 pkgs/shells/nushell/plugins/skim.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/skim.nix b/pkgs/shells/nushell/plugins/skim.nix
index cf6ad165372b..80060c2ea7a4 100644
--- a/pkgs/shells/nushell/plugins/skim.nix
+++ b/pkgs/shells/nushell/plugins/skim.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_skim";
-  version = "0.19.0";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "idanarye";
     repo = "nu_plugin_skim";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7yG1/HdapH/Jf6I/cw/1dCjVSwqMPd7XMAK9tG7IqRg=";
+    hash = "sha256-2CqgtV2DnBd8HqnRdZRiT14aw+meaX4A3ndTGvbsMfo=";
   };
 
-  cargoHash = "sha256-FqB4EaHQYSOyT1Oda1FHSbmL4Wrza/9m3nkI01GowUE=";
+  cargoHash = "sha256-3Kua+gZl4Ff6jfSNyEVDbPVH4YfGXhwtuEjcUADecQE=";
 
   nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
 

From b3fe39b9a250bdff9f48075f687687c4865037d5 Mon Sep 17 00:00:00 2001
From: Hleb Shauchenka <me@marleb.org>
Date: Sat, 18 Oct 2025 17:02:27 +0200
Subject: [PATCH 032/103] nushellPlugins.hcl: 0.107.0 -> 0.108.0

Diff: https://github.com/Yethal/nu_plugin_hcl/compare/0.107.0...0.108.0
---
 pkgs/shells/nushell/plugins/hcl.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/hcl.nix b/pkgs/shells/nushell/plugins/hcl.nix
index ee2d5d59f46f..8576fe1cfb26 100644
--- a/pkgs/shells/nushell/plugins/hcl.nix
+++ b/pkgs/shells/nushell/plugins/hcl.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_hcl";
-  version = "0.107.0";
+  version = "0.108.0";
 
   src = fetchFromGitHub {
     owner = "Yethal";
     repo = "nu_plugin_hcl";
     tag = finalAttrs.version;
-    hash = "sha256-KtX1i3iAZcEHnDdceV4JyildA//y/pnIxK/U/NbSw5w=";
+    hash = "sha256-WyZ8uSYWNzurqpE+BP0hKsknurP7Iyf5L8Y5DjVQZsA=";
   };
 
-  cargoHash = "sha256-CaPyAQgUpGBZx65j7ih4NOBR34rDpE0HQ425freGEOk=";
+  cargoHash = "sha256-2b/0B9W01gGuGc482DYQSbRR2LLZXQxUG2fYB5TklPQ=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
 

From aeb5c13c42bd34765daf951d875e4871a0121732 Mon Sep 17 00:00:00 2001
From: Hleb Shauchenka <me@marleb.org>
Date: Sat, 18 Oct 2025 17:05:56 +0200
Subject: [PATCH 033/103] nushellPlugins.highlight: 1.4.8+0.106.0 ->
 1.4.10+0.108.0

Diff: https://github.com/cptpiepmatz/nu-plugin-highlight/compare/v1.4.8+0.106.0...v1.4.10+0.108.0
---
 pkgs/shells/nushell/plugins/highlight.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix
index 9c166c97a772..2c119c71a676 100644
--- a/pkgs/shells/nushell/plugins/highlight.nix
+++ b/pkgs/shells/nushell/plugins/highlight.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_highlight";
-  version = "1.4.8+0.106.0";
+  version = "1.4.10+0.108.0";
 
   src = fetchFromGitHub {
     owner = "cptpiepmatz";
     repo = "nu-plugin-highlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H7bCX13miQECEPCOT2eF+TBkUU3qff+LhOiA008GLdI=";
+    hash = "sha256-ynvLvGMxFiYOYGPDdlv1509lWU5DpfBK9Mwa9gLeHsI=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-Qf6qEY6imcI0rfktGl5ErsbT+HCDgTohl+NKFsrQbzA=";
+  cargoHash = "sha256-Xq7ctnzcrSPzo3M3p3Vxtj0U0U9Miw+2VuyYs6P3GlQ=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
 
@@ -34,6 +34,5 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/cptpiepmatz/nu-plugin-highlight";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mgttlinger ];
-    broken = true;
   };
 })

From c5dc09908f842d8f5e6a8a67491e4cd2725b4a39 Mon Sep 17 00:00:00 2001
From: Hleb Shauchenka <me@marleb.org>
Date: Sat, 18 Oct 2025 17:08:23 +0200
Subject: [PATCH 034/103] nushellPlugins.semver: 0.11.7 -> 0.11.8

Diff: https://github.com/abusch/nu_plugin_semver/compare/v0.11.7...v0.11.8

Changelog: https://github.com/abusch/nu_plugin_semver/blob/v0.11.8/CHANGELOG.md
---
 pkgs/shells/nushell/plugins/semver.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/semver.nix b/pkgs/shells/nushell/plugins/semver.nix
index c969b47ba2b3..a02cad83c534 100644
--- a/pkgs/shells/nushell/plugins/semver.nix
+++ b/pkgs/shells/nushell/plugins/semver.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_semver";
-  version = "0.11.7";
+  version = "0.11.8";
 
   src = fetchFromGitHub {
     owner = "abusch";
     repo = "nu_plugin_semver";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RrkOVo5MTLtVAp6d+Y1oP3jwImXeofXRdGXRFlwYA9I=";
+    hash = "sha256-ui9zyE5g4LiU2+Csv4p0D61fmPXaDMhnpQ34ggEg3eA=";
   };
 
-  cargoHash = "sha256-vKrwoPn8MLjzTrR7p3SH7I2LKKieJCm4tuarp4hktKA=";
+  cargoHash = "sha256-5W0GbKz18rQ+3TjNanzV4H4LE/7TLZ+8/FbGHffE2RY=";
 
   passthru.update-script = nix-update-script { };
 

From 6a2510770b87f585589b48df4a5ccbb364d7b78c Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 05:05:16 -0700
Subject: [PATCH 035/103] goattracker: move to by-name/

---
 .../default.nix => by-name/go/goattracker/package.nix}        | 0
 pkgs/top-level/all-packages.nix                               | 4 +---
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{applications/audio/goattracker/default.nix => by-name/go/goattracker/package.nix} (100%)

diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/by-name/go/goattracker/package.nix
similarity index 100%
rename from pkgs/applications/audio/goattracker/default.nix
rename to pkgs/by-name/go/goattracker/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aeee7b5efd37..e6a480fe9479 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2927,9 +2927,7 @@ with pkgs;
     godot-export-templates-bin
     ;
 
-  goattracker = callPackage ../applications/audio/goattracker { };
-
-  goattracker-stereo = callPackage ../applications/audio/goattracker {
+  goattracker-stereo = callPackage ../by-name/go/goattracker/package.nix {
     isStereo = true;
   };
 

From eaa8f44da9e5e4be5c736a2a0f0039b301dad312 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 05:26:05 -0700
Subject: [PATCH 036/103] lv2lint: modernize, move to by-name/

---
 .../default.nix => by-name/lv/lv2lint/package.nix}     | 10 +++++-----
 pkgs/top-level/all-packages.nix                        |  2 --
 2 files changed, 5 insertions(+), 7 deletions(-)
 rename pkgs/{applications/audio/lv2lint/default.nix => by-name/lv/lv2lint/package.nix} (83%)

diff --git a/pkgs/applications/audio/lv2lint/default.nix b/pkgs/by-name/lv/lv2lint/package.nix
similarity index 83%
rename from pkgs/applications/audio/lv2lint/default.nix
rename to pkgs/by-name/lv/lv2lint/package.nix
index c35e27767537..96204f473a26 100644
--- a/pkgs/applications/audio/lv2lint/default.nix
+++ b/pkgs/by-name/lv/lv2lint/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "open-music-kontrollers.ch";
     owner = "~hp";
     repo = "lv2lint";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-NkzbKteLZ+P+Py+CMOYYipvu6psDslWnM1MAV1XB0TM=";
   };
 
@@ -44,12 +44,12 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "x11-tests" true)
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Check whether a given LV2 plugin is up to the specification";
     homepage = "https://git.open-music-kontrollers.ch/~hp/lv2lint";
-    license = licenses.artistic2;
-    maintainers = [ maintainers.magnetophon ];
-    platforms = platforms.linux;
+    license = lib.licenses.artistic2;
+    maintainers = with lib.maintainers; [ magnetophon ];
+    platforms = lib.platforms.linux;
     mainProgram = "lv2lint";
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6a480fe9479..573509982a6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11793,8 +11793,6 @@ with pkgs;
     steamSupport = false;
   };
 
-  lv2lint = callPackage ../applications/audio/lv2lint/default.nix { };
-
   lxi-tools = callPackage ../tools/networking/lxi-tools { };
   lxi-tools-gui = callPackage ../tools/networking/lxi-tools { withGui = true; };
 

From 8f4420f92ec1f32dcdc61769b68b1ea43ca3b717 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 05:37:35 -0700
Subject: [PATCH 037/103] bitwig-studio3: modernize, move to by-name/

---
 .../bi/bitwig-studio3/package.nix}             | 18 +++++++++---------
 pkgs/top-level/all-packages.nix                |  1 -
 2 files changed, 9 insertions(+), 10 deletions(-)
 rename pkgs/{applications/audio/bitwig-studio/bitwig-studio3.nix => by-name/bi/bitwig-studio3/package.nix} (81%)

diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/by-name/bi/bitwig-studio3/package.nix
similarity index 81%
rename from pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
rename to pkgs/by-name/bi/bitwig-studio3/package.nix
index 7c6c91615465..a65d3b08be92 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/pkgs/by-name/bi/bitwig-studio3/package.nix
@@ -21,13 +21,13 @@
   makeWrapper,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "bitwig-studio";
   version = "3.3.11";
 
   src = fetchurl {
-    url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
-    sha256 = "sha256-cF8gVPjM0KUcKOW09uFccp4/lzbUmZcBkVOwr/A/8Yw=";
+    url = "https://downloads.bitwig.com/stable/${finalAttrs.version}/bitwig-studio-${finalAttrs.version}.deb";
+    hash = "sha256-cF8gVPjM0KUcKOW09uFccp4/lzbUmZcBkVOwr/A/8Yw=";
   };
 
   nativeBuildInputs = [
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     (lib.getLib stdenv.cc.cc)
   ];
 
-  ldLibraryPath = lib.strings.makeLibraryPath buildInputs;
+  ldLibraryPath = lib.strings.makeLibraryPath finalAttrs.buildInputs;
 
   installPhase = ''
     runHook preInstall
@@ -86,13 +86,13 @@ stdenv.mkDerivation rec {
       patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f
       wrapProgram $f \
         "''${gappsWrapperArgs[@]}" \
-        --prefix LD_LIBRARY_PATH : "${ldLibraryPath}" \
+        --prefix LD_LIBRARY_PATH : "${finalAttrs.ldLibraryPath}" \
         --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" \
         --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}"
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Digital audio workstation";
     longDescription = ''
       Bitwig Studio is a multi-platform music-creation system for
@@ -100,13 +100,13 @@ stdenv.mkDerivation rec {
       editing tools and a super-fast workflow.
     '';
     homepage = "https://www.bitwig.com/";
-    license = licenses.unfree;
+    license = lib.licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       bfortz
       michalrus
       mrVanDalo
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 573509982a6f..eb44eb97812c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10827,7 +10827,6 @@ with pkgs;
     callPackage ../applications/science/electronics/bitscope/packages.nix { }
   );
 
-  bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { };
   bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix {
     libjpeg = libjpeg8;
   };

From f1f6a49661d9cd4237c67f21a249bf441f763bef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 18:01:45 +0000
Subject: [PATCH 038/103] waymore: 6.2 -> 6.4

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

diff --git a/pkgs/by-name/wa/waymore/package.nix b/pkgs/by-name/wa/waymore/package.nix
index 12deadd09578..3c7085943b33 100644
--- a/pkgs/by-name/wa/waymore/package.nix
+++ b/pkgs/by-name/wa/waymore/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "waymore";
-  version = "6.2";
+  version = "6.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xnl-h4ck3r";
     repo = "waymore";
     tag = "v${version}";
-    hash = "sha256-5fpG+ulSt/pTUQ3upzyitjkAc3x3jJi/JFblW6M/FUs=";
+    hash = "sha256-XIzUT9OYdtiBAdGYxeCSv89gxYqlvE7wAijt+WJqk2k=";
   };
 
   preBuild = ''

From 3672ded18f5cf8f4b03a0936f6789381bdf18861 Mon Sep 17 00:00:00 2001
From: Adrian Gierakowski <agierakowski@gmail.com>
Date: Sat, 18 Oct 2025 21:47:57 +0200
Subject: [PATCH 039/103] python3Package.pymatting: disable tests which depend
 on OpenCL when cudaSupport = true

fixes https://github.com/NixOS/nixpkgs/issues/453297
---
 pkgs/development/python-modules/pymatting/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/pymatting/default.nix b/pkgs/development/python-modules/pymatting/default.nix
index bef86bb4b0e9..855f4682ca15 100644
--- a/pkgs/development/python-modules/pymatting/default.nix
+++ b/pkgs/development/python-modules/pymatting/default.nix
@@ -52,6 +52,9 @@ buildPythonPackage rec {
     "test_lkm"
   ];
 
+  # pyopencl._cl.LogicError: clGetPlatformIDs failed: PLATFORM_NOT_FOUND_KHR
+  disabledTestPaths = lib.optional cudaSupport "tests/test_foreground.py";
+
   meta = with lib; {
     description = "Python library for alpha matting";
     homepage = "https://github.com/pymatting/pymatting";

From cabad41370df43dcabf61fa6d2e8afd09de0695a Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 19 Oct 2025 04:19:43 +0200
Subject: [PATCH 040/103] nxpmicro-mfgtools: fix build with cmake4

---
 pkgs/by-name/nx/nxpmicro-mfgtools/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix b/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix
index 2f1886881d44..129d1aba36fa 100644
--- a/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix
+++ b/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   pkg-config,
   bzip2,
@@ -23,6 +24,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-t5usUGbcdLQlqPpZkNDeGncka9VfkpO7U933Kw/Sm7U=";
   };
 
+  patches = [
+    # build: support cmake 4.0
+    (fetchpatch {
+      url = "https://github.com/nxp-imx/mfgtools/commit/311ee9b3cca0275fbb5eb5228c56edbb518afd67.patch?full_index=1";
+      hash = "sha256-o4cPfXsPxk88zy5lARX8rcmQncsAkZegOxlAIyoFUpQ=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From f81663034510cc01e8d88d91b897ac4da5765fe9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 19 Oct 2025 15:17:21 +0200
Subject: [PATCH 041/103] python3Packages.aioesphomeapi: disable tests on
 darwin

Due to the lack of network sandboxing on darwin parallel builds of this
package, e.g. during nixpkgs-review, leads to conflicting socket binds,
which makes one of the packages fail.

This issues stretches over multiple files, so that it is tedious to
disasble these tests selectivly.
---
 pkgs/development/python-modules/aioesphomeapi/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index c731241cdba1..c23132d65d2e 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -59,6 +60,10 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  # Lack of network sandboxing leads to conflicting listeners when testing
+  # this package e.g. in nixpkgs-review on the two suppoted python package sets.
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
   disabledTestPaths = [
     # benchmarking requires pytest-codespeed
     "tests/benchmarks"

From a903a33cd38064f447a4c2e5b031295dfe49a9b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 18:03:32 +0000
Subject: [PATCH 042/103] voxinput: 0.6.4 -> 0.7.0

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

diff --git a/pkgs/by-name/vo/voxinput/package.nix b/pkgs/by-name/vo/voxinput/package.nix
index ec769c62ecdd..005ff8565c14 100644
--- a/pkgs/by-name/vo/voxinput/package.nix
+++ b/pkgs/by-name/vo/voxinput/package.nix
@@ -17,16 +17,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "voxinput";
-  version = "0.6.4";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "richiejp";
     repo = "VoxInput";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aFsAAT3hNbTSSkeMH65+jnhpjJRxVvfRUiiXdKIvZqM=";
+    hash = "sha256-b+lyoVugm6FSGnmyB4UcrIRic5ZpTcB5BrJCona14zM=";
   };
 
-  vendorHash = "sha256-jopDuqIuc45zT36B7D7WCtYtdZUn4hvE45s/FLBGrms=";
+  vendorHash = "sha256-CquIwApcQvq5r8CckrcL1Qmet0Y4G1L9R3sZyVrZNqw=";
 
   nativeBuildInputs = [
     makeWrapper

From 6697b05926566fc88ae8365549c5354e7128c07c Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 06:49:31 -0700
Subject: [PATCH 043/103] libmt32emu: modernize, move to by-name/

---
 .../li/libmt32emu/package.nix}                   | 16 ++++++++--------
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 8 insertions(+), 10 deletions(-)
 rename pkgs/{applications/audio/munt/libmt32emu.nix => by-name/li/libmt32emu/package.nix} (63%)

diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/by-name/li/libmt32emu/package.nix
similarity index 63%
rename from pkgs/applications/audio/munt/libmt32emu.nix
rename to pkgs/by-name/li/libmt32emu/package.nix
index 6d42712f4c8c..e01401581474 100644
--- a/pkgs/applications/audio/munt/libmt32emu.nix
+++ b/pkgs/by-name/li/libmt32emu/package.nix
@@ -5,15 +5,15 @@
   cmake,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libmt32emu";
   version = "2.7.2";
 
   src = fetchFromGitHub {
     owner = "munt";
     repo = "munt";
-    rev = "${pname}_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "sha256-wXIvdGoup/AOQggkeXvtbi3pXhyKUKWmyt/ZbGzufds=";
+    tag = "libmt32emu_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
+    hash = "sha256-wXIvdGoup/AOQggkeXvtbi3pXhyKUKWmyt/ZbGzufds=";
   };
 
   outputs = [
@@ -36,11 +36,11 @@ stdenv.mkDerivation rec {
       --replace "$dev/$dev/" "$dev/"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://munt.sourceforge.net/";
     description = "Library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices";
-    license = with licenses; [ lgpl21Plus ];
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.unix; # Not tested on ReactOS yet :)
+    license = with lib.licenses; [ lgpl21Plus ];
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.unix; # Not tested on ReactOS yet :)
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb44eb97812c..8abee87bb687 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11407,8 +11407,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { };
-
   mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { };
 
   mt32emu-smf2wav = callPackage ../applications/audio/munt/mt32emu-smf2wav.nix { };

From a816199c3faf36ce00548ed305077124f0d4783a Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 06:56:52 -0700
Subject: [PATCH 044/103] mt32emu-smf2wav: modernize, move to by-name/

---
 .../mt/mt32emu-smf2wav/package.nix}             | 17 +++++++----------
 pkgs/top-level/all-packages.nix                 |  2 --
 2 files changed, 7 insertions(+), 12 deletions(-)
 rename pkgs/{applications/audio/munt/mt32emu-smf2wav.nix => by-name/mt/mt32emu-smf2wav/package.nix} (68%)

diff --git a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix
similarity index 68%
rename from pkgs/applications/audio/munt/mt32emu-smf2wav.nix
rename to pkgs/by-name/mt/mt32emu-smf2wav/package.nix
index a32c76f77ba2..ea3bd25ef941 100644
--- a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix
+++ b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix
@@ -8,17 +8,14 @@
   pkg-config,
 }:
 
-let
-  char2underscore = char: str: lib.replaceStrings [ char ] [ "_" ] str;
-in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mt32emu-smf2wav";
   version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "munt";
     repo = "munt";
-    rev = "${char2underscore "-" pname}_${char2underscore "." version}";
+    rev = "mt32emu_smf2wav_${lib.replaceString "." "_" finalAttrs.version}";
     sha256 = "sha256-XGds9lDfSiY0D8RhYG4TGyjYEVvVYuAfNSv9+VxiJEs=";
   };
 
@@ -41,12 +38,12 @@ stdenv.mkDerivation rec {
     "-Dmunt_WITH_MT32EMU_SMF2WAV=ON"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://munt.sourceforge.net/";
     description = "Produces a WAVE file from a Standard MIDI file (SMF)";
     mainProgram = "mt32emu-smf2wav";
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.all;
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8abee87bb687..f0401cffebfb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11409,8 +11409,6 @@ with pkgs;
 
   mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { };
 
-  mt32emu-smf2wav = callPackage ../applications/audio/munt/mt32emu-smf2wav.nix { };
-
   noson = libsForQt5.callPackage ../applications/audio/noson { };
 
   pass2csv = python3Packages.callPackage ../tools/security/pass2csv { };

From 7e66f437ab7ecbb5bf18555bd111a6a74eb57f35 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 09:14:39 -0700
Subject: [PATCH 045/103] bucklespring: modernize, move to by-name/

---
 .../bu/bucklespring-libinput/package.nix}     | 21 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  3 +--
 2 files changed, 10 insertions(+), 14 deletions(-)
 rename pkgs/{applications/audio/bucklespring/default.nix => by-name/bu/bucklespring-libinput/package.nix} (80%)

diff --git a/pkgs/applications/audio/bucklespring/default.nix b/pkgs/by-name/bu/bucklespring-libinput/package.nix
similarity index 80%
rename from pkgs/applications/audio/bucklespring/default.nix
rename to pkgs/by-name/bu/bucklespring-libinput/package.nix
index a20e15feb87c..8a7f15686481 100644
--- a/pkgs/applications/audio/bucklespring/default.nix
+++ b/pkgs/by-name/bu/bucklespring-libinput/package.nix
@@ -15,17 +15,14 @@
   libX11,
 }:
 
-let
-  inherit (lib) optionals;
-in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "bucklespring";
   version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "zevv";
     repo = "bucklespring";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "0prhqibivxzmz90k79zpwx3c97h8wa61rk5ihi9a5651mnc46mna";
   };
 
@@ -38,13 +35,13 @@ stdenv.mkDerivation rec {
     openal
     alure
   ]
-  ++ optionals legacy [
+  ++ lib.optionals legacy [
     libXtst
     libX11
   ]
-  ++ optionals (!legacy) [ libinput ];
+  ++ lib.optionals (!legacy) [ libinput ];
 
-  makeFlags = optionals (!legacy) [ "libinput=1" ];
+  makeFlags = lib.optionals (!legacy) [ "libinput=1" ];
 
   installPhase = ''
     runHook preInstall
@@ -58,7 +55,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Nostalgia bucklespring keyboard sound";
     mainProgram = "buckle";
     longDescription = ''
@@ -67,8 +64,8 @@ stdenv.mkDerivation rec {
       <code>users.users.alice.extraGroups = [ "input" ];</code>
     '';
     homepage = "https://github.com/zevv/bucklespring";
-    license = licenses.gpl2Only;
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.unix;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0401cffebfb..fb44f2079ea4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1595,9 +1595,8 @@ with pkgs;
 
   blocksat-cli = with python3Packages; toPythonApplication blocksat-cli;
 
+  bucklespring-x11 = callPackage ../by-name/bu/bucklespring-libinput/package.nix { legacy = true; };
   bucklespring = bucklespring-x11;
-  bucklespring-libinput = callPackage ../applications/audio/bucklespring { };
-  bucklespring-x11 = callPackage ../applications/audio/bucklespring { legacy = true; };
 
   buildbotPackages = recurseIntoAttrs (
     callPackage ../development/tools/continuous-integration/buildbot { }

From 47356e6b20df824d545fa5a63731c368b25c0633 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 12:27:32 -0700
Subject: [PATCH 046/103] musescore: modernize, move to by-name/

---
 .../mu/musescore/package.nix}                 | 41 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 16 insertions(+), 27 deletions(-)
 rename pkgs/{applications/audio/musescore/default.nix => by-name/mu/musescore/package.nix} (89%)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/by-name/mu/musescore/package.nix
similarity index 89%
rename from pkgs/applications/audio/musescore/default.nix
rename to pkgs/by-name/mu/musescore/package.nix
index 3d57250f978d..05adb2aa0ad5 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/by-name/mu/musescore/package.nix
@@ -2,10 +2,8 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   wrapGAppsHook3,
-  wrapQtAppsHook,
   pkg-config,
   ninja,
   alsa-lib,
@@ -19,18 +17,11 @@
   libvorbis,
   portaudio,
   portmidi,
-  qtbase,
-  qtdeclarative,
   flac,
   libopusenc,
   libopus,
   tinyxml-2,
-  qt5compat,
-  qtwayland,
-  qtsvg,
-  qtscxml,
-  qtnetworkauth,
-  qttools,
+  kdePackages,
   nixosTests,
 }:
 
@@ -41,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "musescore";
     repo = "MuseScore";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-3VpptHR9dt8lJeFhFygnPiP0XRf4R29SASC8AicLU5E=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-3VpptHR9dt8lJeFhFygnPiP0XRf4R29SASC8AicLU5E=";
   };
 
   cmakeFlags = [
@@ -87,9 +78,9 @@ stdenv.mkDerivation (finalAttrs: {
   dontWrapGApps = true;
 
   nativeBuildInputs = [
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
     cmake
-    qttools
+    kdePackages.qttools
     pkg-config
     ninja
   ]
@@ -113,16 +104,16 @@ stdenv.mkDerivation (finalAttrs: {
     libopusenc
     libopus
     tinyxml-2
-    qtbase
-    qtdeclarative
-    qt5compat
-    qtsvg
-    qtscxml
-    qtnetworkauth
+    kdePackages.qtbase
+    kdePackages.qtdeclarative
+    kdePackages.qt5compat
+    kdePackages.qtsvg
+    kdePackages.qtscxml
+    kdePackages.qtnetworkauth
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
-    qtwayland
+    kdePackages.qtwayland
   ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -160,16 +151,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.tests = nixosTests.musescore;
 
-  meta = with lib; {
+  meta = {
     description = "Music notation and composition software";
     homepage = "https://musescore.org/";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       vandenoever
       doronbehar
       orivej
     ];
     mainProgram = "mscore";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb44f2079ea4..ffcece520160 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11967,8 +11967,6 @@ with pkgs;
 
   mumble_overlay = (callPackages ../applications/networking/mumble { }).overlay;
 
-  musescore = qt6.callPackage ../applications/audio/musescore { };
-
   mwic = callPackage ../applications/misc/mwic {
     pythonPackages = python3Packages;
   };

From 5a87b6ae4bc71a14901de052cacd6b2fcead5cb6 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 15:38:10 -0700
Subject: [PATCH 047/103] easyaudiosync: modernize, move to by-name/

---
 .../easyaudiosync/0001-fix-project-name.patch |  0
 .../easyaudiosync/0003-fix-darwin-app.patch   |  0
 .../ea}/easyaudiosync/0004-force-qt6.patch    |  0
 .../ea/easyaudiosync/package.nix}             | 24 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 5 files changed, 11 insertions(+), 15 deletions(-)
 rename pkgs/{applications/audio => by-name/ea}/easyaudiosync/0001-fix-project-name.patch (100%)
 rename pkgs/{applications/audio => by-name/ea}/easyaudiosync/0003-fix-darwin-app.patch (100%)
 rename pkgs/{applications/audio => by-name/ea}/easyaudiosync/0004-force-qt6.patch (100%)
 rename pkgs/{applications/audio/easyaudiosync/default.nix => by-name/ea/easyaudiosync/package.nix} (87%)

diff --git a/pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch b/pkgs/by-name/ea/easyaudiosync/0001-fix-project-name.patch
similarity index 100%
rename from pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch
rename to pkgs/by-name/ea/easyaudiosync/0001-fix-project-name.patch
diff --git a/pkgs/applications/audio/easyaudiosync/0003-fix-darwin-app.patch b/pkgs/by-name/ea/easyaudiosync/0003-fix-darwin-app.patch
similarity index 100%
rename from pkgs/applications/audio/easyaudiosync/0003-fix-darwin-app.patch
rename to pkgs/by-name/ea/easyaudiosync/0003-fix-darwin-app.patch
diff --git a/pkgs/applications/audio/easyaudiosync/0004-force-qt6.patch b/pkgs/by-name/ea/easyaudiosync/0004-force-qt6.patch
similarity index 100%
rename from pkgs/applications/audio/easyaudiosync/0004-force-qt6.patch
rename to pkgs/by-name/ea/easyaudiosync/0004-force-qt6.patch
diff --git a/pkgs/applications/audio/easyaudiosync/default.nix b/pkgs/by-name/ea/easyaudiosync/package.nix
similarity index 87%
rename from pkgs/applications/audio/easyaudiosync/default.nix
rename to pkgs/by-name/ea/easyaudiosync/package.nix
index a6f744db1b65..d57c432005e4 100644
--- a/pkgs/applications/audio/easyaudiosync/default.nix
+++ b/pkgs/by-name/ea/easyaudiosync/package.nix
@@ -4,24 +4,22 @@
   fetchFromGitHub,
   pkg-config,
   cmake,
-  qtbase,
-  qttools,
   spdlog,
   ffmpeg,
   taglib,
-  wrapQtAppsHook,
+  kdePackages,
   makeDesktopItem,
   copyDesktopItems,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "easyaudiosync";
   version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "complexlogic";
     repo = "EasyAudioSync";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-UCOL4DzynKjNDvS0HZ4/K+Wn5lOqHZ0bNop0zqJl5kc=";
   };
 
@@ -34,13 +32,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
 
   buildInputs = [
-    qtbase
-    qttools
+    kdePackages.qtbase
+    kdePackages.qttools
     ffmpeg
     spdlog
     taglib
@@ -82,7 +80,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Audio library syncing and conversion utility";
     longDescription = ''
       Easy Audio Sync is an audio library syncing and conversion utility.
@@ -94,8 +92,8 @@ stdenv.mkDerivation rec {
       GUI-based instead of CLI-based.
     '';
     homepage = "https://github.com/complexlogic/EasyAudioSync";
-    license = licenses.unlicense;
-    maintainers = with maintainers; [ matteopacini ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ matteopacini ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffcece520160..024aa65180de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1952,8 +1952,6 @@ with pkgs;
     enableSSH = true;
   };
 
-  easyaudiosync = qt6Packages.callPackage ../applications/audio/easyaudiosync { };
-
   easycrypt = callPackage ../applications/science/logic/easycrypt {
     why3 = pkgs.why3.override {
       ideSupport = false;

From 3b3498f9c9721609a1d29ed0bd7fbe86c17ea796 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 15:54:56 -0700
Subject: [PATCH 048/103] in-formant: modernize, move to by-name/

---
 ...dored-dependencies-we-have-in-nixpkgs.patch |  0
 .../in/in-formant/package.nix}                 | 18 ++++++++----------
 pkgs/top-level/all-packages.nix                |  2 --
 3 files changed, 8 insertions(+), 12 deletions(-)
 rename pkgs/{applications/audio => by-name/in}/in-formant/0001-Avoid-using-vendored-dependencies-we-have-in-nixpkgs.patch (100%)
 rename pkgs/{applications/audio/in-formant/default.nix => by-name/in/in-formant/package.nix} (90%)

diff --git a/pkgs/applications/audio/in-formant/0001-Avoid-using-vendored-dependencies-we-have-in-nixpkgs.patch b/pkgs/by-name/in/in-formant/0001-Avoid-using-vendored-dependencies-we-have-in-nixpkgs.patch
similarity index 100%
rename from pkgs/applications/audio/in-formant/0001-Avoid-using-vendored-dependencies-we-have-in-nixpkgs.patch
rename to pkgs/by-name/in/in-formant/0001-Avoid-using-vendored-dependencies-we-have-in-nixpkgs.patch
diff --git a/pkgs/applications/audio/in-formant/default.nix b/pkgs/by-name/in/in-formant/package.nix
similarity index 90%
rename from pkgs/applications/audio/in-formant/default.nix
rename to pkgs/by-name/in/in-formant/package.nix
index e6eabd58225a..df102858fa98 100644
--- a/pkgs/applications/audio/in-formant/default.nix
+++ b/pkgs/by-name/in/in-formant/package.nix
@@ -3,20 +3,18 @@
   cmake,
   lib,
   fetchFromGitHub,
-  wrapQtAppsHook,
-  qtbase,
-  qtcharts,
   fftw,
   libtorch-bin,
   portaudio,
   eigen,
-  xorg,
   pkg-config,
   autoPatchelfHook,
   soxr,
   libsamplerate,
   armadillo,
   tomlplusplus,
+  libxcb,
+  kdePackages,
 }:
 
 stdenv.mkDerivation {
@@ -40,18 +38,18 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
     autoPatchelfHook
   ];
 
   buildInputs = [
-    qtbase
-    qtcharts
+    kdePackages.qtbase
+    kdePackages.qtcharts
     fftw
     libtorch-bin
     portaudio
     eigen
-    xorg.libxcb
+    libxcb
     soxr
     libsamplerate
     armadillo
@@ -65,11 +63,11 @@ stdenv.mkDerivation {
     install -Dm444 $src/dist-res/in-formant.png -t $out/share/icons/hicolor/512x512/apps
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Real-time pitch and formant tracking software";
     mainProgram = "in-formant";
     homepage = "https://github.com/in-formant/in-formant";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     # currently broken on i686-linux and aarch64-linux due to other nixpkgs dependencies
     platforms = [ "x86_64-linux" ];
     maintainers = [ ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 024aa65180de..90c530ac7a5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3103,8 +3103,6 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  in-formant = qt6Packages.callPackage ../applications/audio/in-formant { };
-
   incus-lts = callPackage ../by-name/in/incus/lts.nix { };
 
   indexed-bzip2 = with python3Packages; toPythonApplication indexed-bzip2;

From 87c1b32e1fe6d4f319fc117466e3a65bf1b0a287 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 16:06:31 -0700
Subject: [PATCH 049/103] miniaudicle: modernize, move to by-name/

---
 .../mi/miniaudicle/package.nix}               | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 9 insertions(+), 13 deletions(-)
 rename pkgs/{applications/audio/miniaudicle/default.nix => by-name/mi/miniaudicle/package.nix} (82%)

diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/by-name/mi/miniaudicle/package.nix
similarity index 82%
rename from pkgs/applications/audio/miniaudicle/default.nix
rename to pkgs/by-name/mi/miniaudicle/package.nix
index b7bdd19a4fcb..66a9035daee5 100644
--- a/pkgs/applications/audio/miniaudicle/default.nix
+++ b/pkgs/by-name/mi/miniaudicle/package.nix
@@ -2,9 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qt6Packages,
   bison,
   flex,
   which,
@@ -12,6 +9,7 @@
   libsndfile,
   libpulseaudio,
   libjack2,
+  kdePackages,
   audioBackend ? "pulse", # "pulse", "alsa", or "jack"
 }:
 
@@ -22,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ccrma";
     repo = "miniAudicle";
-    rev = "chuck-${finalAttrs.version}";
+    tag = "chuck-${finalAttrs.version}";
     hash = "sha256-LYr9Fc4Siqk0BFKHVXfIV2XskJYAN+/0P+nb6FJLsLE=";
     fetchSubmodules = true;
   };
@@ -39,28 +37,28 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     flex
     which
-    qmake
-    wrapQtAppsHook
+    kdePackages.qmake
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
     alsa-lib
     libsndfile
-    qt6Packages.qscintilla
+    kdePackages.qscintilla
   ]
   ++ lib.optional (audioBackend == "pulse") libpulseaudio
   ++ lib.optional (audioBackend == "jack") libjack2;
 
   buildFlags = [ "linux-${audioBackend}" ];
 
-  meta = with lib; {
+  meta = {
     description = "Light-weight integrated development environment for the ChucK digital audio programming language";
     mainProgram = "miniAudicle";
     homepage = "https://audicle.cs.princeton.edu/mini/";
     downloadPage = "https://audicle.cs.princeton.edu/mini/linux/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ fgaz ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ fgaz ];
+    platforms = lib.platforms.all;
     broken = stdenv.hostPlatform.isDarwin; # not attempted
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90c530ac7a5d..ba55e026a1b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11836,8 +11836,6 @@ with pkgs;
 
   michabo = libsForQt5.callPackage ../applications/misc/michabo { };
 
-  miniaudicle = qt6Packages.callPackage ../applications/audio/miniaudicle { };
-
   minitube = libsForQt5.callPackage ../applications/video/minitube { };
 
   mixxx = qt6Packages.callPackage ../applications/audio/mixxx { };

From 2d3cc35cf1398e8030105cad6a8e80bc1d554062 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 16:54:43 -0700
Subject: [PATCH 050/103] polyphone: modernize, move to by-name/

---
 .../po/polyphone/package.nix}                 | 32 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 14 insertions(+), 20 deletions(-)
 rename pkgs/{applications/audio/polyphone/default.nix => by-name/po/polyphone/package.nix} (73%)

diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/by-name/po/polyphone/package.nix
similarity index 73%
rename from pkgs/applications/audio/polyphone/default.nix
rename to pkgs/by-name/po/polyphone/package.nix
index 436a690ffd62..e416259aab08 100644
--- a/pkgs/applications/audio/polyphone/default.nix
+++ b/pkgs/by-name/po/polyphone/package.nix
@@ -3,35 +3,31 @@
   lib,
   fetchFromGitHub,
   pkg-config,
-  qmake,
-  qttools,
-  wrapQtAppsHook,
   alsa-lib,
   flac,
   libjack2,
   libogg,
   libvorbis,
-  qtsvg,
-  qtwayland,
   rtmidi,
+  kdePackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "2.4.1";
   pname = "polyphone";
 
   src = fetchFromGitHub {
     owner = "davy7125";
     repo = "polyphone";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-43EswCgNJv11Ov+4vmj2vS/yJ2atyzkRmk/SoCKYD/0=";
   };
 
   nativeBuildInputs = [
     pkg-config
-    qmake
-    qttools
-    wrapQtAppsHook
+    kdePackages.qmake
+    kdePackages.qttools
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -40,8 +36,8 @@ stdenv.mkDerivation rec {
     libjack2
     libogg
     libvorbis
-    qtsvg
-    qtwayland
+    kdePackages.qtsvg
+    kdePackages.qtwayland
     rtmidi
   ];
 
@@ -52,23 +48,23 @@ stdenv.mkDerivation rec {
   postConfigure = ''
     # Work around https://github.com/NixOS/nixpkgs/issues/214765
     substituteInPlace Makefile \
-      --replace-fail "$(dirname $QMAKE)/lrelease" "${lib.getBin qttools}/bin/lrelease"
+      --replace-fail "$(dirname $QMAKE)/lrelease" "${lib.getBin kdePackages.qttools}/bin/lrelease"
   '';
 
   qmakeFlags = [
     "DEFINES+=USE_LOCAL_STK"
   ];
 
-  meta = with lib; {
+  meta = {
     broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
     description = "Soundfont editor for creating musical instruments";
     mainProgram = "polyphone";
     homepage = "https://www.polyphone-soundfonts.com/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [
       maxdamantus
       orivej
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba55e026a1b1..a6845572ed24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12010,8 +12010,6 @@ with pkgs;
     i3Support = true;
   };
 
-  polyphone = qt6.callPackage ../applications/audio/polyphone { };
-
   scx = recurseIntoAttrs (callPackage ../os-specific/linux/scx { });
 
   shogun = callPackage ../applications/science/machine-learning/shogun {

From a892cc7cd3663785fe35229b43c4f9129f51f7e2 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 16:58:29 -0700
Subject: [PATCH 051/103] spotify-qt: modernize, move to by-name/

---
 .../sp/spotify-qt/package.nix}                | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 9 insertions(+), 13 deletions(-)
 rename pkgs/{applications/audio/spotify-qt/default.nix => by-name/sp/spotify-qt/package.nix} (79%)

diff --git a/pkgs/applications/audio/spotify-qt/default.nix b/pkgs/by-name/sp/spotify-qt/package.nix
similarity index 79%
rename from pkgs/applications/audio/spotify-qt/default.nix
rename to pkgs/by-name/sp/spotify-qt/package.nix
index 5d81c51ddbd7..95829d972ec2 100644
--- a/pkgs/applications/audio/spotify-qt/default.nix
+++ b/pkgs/by-name/sp/spotify-qt/package.nix
@@ -4,10 +4,8 @@
   lib,
   cmake,
   libxcb,
-  qtbase,
-  qtsvg,
-  wrapQtAppsHook,
   procps,
+  kdePackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -17,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kraxarn";
     repo = "spotify-qt";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-R6ucuQdntc1OxDCV8jDAlyjAo/393HN7fjRJH70OdNs=";
   };
 
@@ -28,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    qtbase
-    qtsvg
+    kdePackages.qtbase
+    kdePackages.qtsvg
   ];
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   cmakeFlags = [ (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "") ];
@@ -47,12 +45,12 @@ stdenv.mkDerivation (finalAttrs: {
     ln $out/Applications/spotify-qt.app/Contents/MacOS/spotify-qt $out/bin/spotify-qt
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight unofficial Spotify client using Qt";
     mainProgram = "spotify-qt";
     homepage = "https://github.com/kraxarn/spotify-qt";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ iivusly ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ iivusly ];
+    platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6845572ed24..0e794aad93dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12403,8 +12403,6 @@ with pkgs;
 
   sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { };
 
-  spotify-qt = qt6Packages.callPackage ../applications/audio/spotify-qt { };
-
   stag = callPackage ../applications/misc/stag {
     curses = ncurses;
   };

From 6e90cd6ff337dd6ea49aa7cd6af6bd47b015e595 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 17:04:05 -0700
Subject: [PATCH 052/103] jamesdsp: modernize, move to by-name/

---
 .../ja}/jamesdsp/fix-build-on-qt6_9.diff       |  0
 .../ja/jamesdsp/package.nix}                   | 18 +++++++-----------
 pkgs/top-level/all-packages.nix                |  3 +--
 3 files changed, 8 insertions(+), 13 deletions(-)
 rename pkgs/{applications/audio => by-name/ja}/jamesdsp/fix-build-on-qt6_9.diff (100%)
 rename pkgs/{applications/audio/jamesdsp/default.nix => by-name/ja/jamesdsp/package.nix} (93%)

diff --git a/pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff b/pkgs/by-name/ja/jamesdsp/fix-build-on-qt6_9.diff
similarity index 100%
rename from pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff
rename to pkgs/by-name/ja/jamesdsp/fix-build-on-qt6_9.diff
diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/by-name/ja/jamesdsp/package.nix
similarity index 93%
rename from pkgs/applications/audio/jamesdsp/default.nix
rename to pkgs/by-name/ja/jamesdsp/package.nix
index a3917e48f509..6d7408c76ead 100644
--- a/pkgs/applications/audio/jamesdsp/default.nix
+++ b/pkgs/by-name/ja/jamesdsp/package.nix
@@ -10,14 +10,10 @@
   pipewire,
   pkg-config,
   pulseaudio,
-  qmake,
-  qtbase,
-  qtsvg,
-  qtwayland,
   stdenv,
   usePipewire ? true,
   usePulseaudio ? false,
-  wrapQtAppsHook,
+  kdePackages,
 }:
 
 assert lib.asserts.assertMsg (
@@ -32,15 +28,15 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Audio4Linux";
     repo = "JDSP4Linux";
     fetchSubmodules = true;
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-eVndqIqJ3DRceuFMT++g2riXq0CL5r+TWbvzvaYIfZ8=";
   };
 
   nativeBuildInputs = [
-    qmake
+    kdePackages.qmake
     pkg-config
     copyDesktopItems
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   patches = [
@@ -55,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glibmm
     libarchive
-    qtbase
-    qtsvg
-    qtwayland
+    kdePackages.qtbase
+    kdePackages.qtsvg
+    kdePackages.qtwayland
   ]
   ++ lib.optionals usePipewire [
     pipewire
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e794aad93dc..99ac71eaeac3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3143,8 +3143,7 @@ with pkgs;
 
   jackett = callPackage ../servers/jackett { };
 
-  jamesdsp = qt6Packages.callPackage ../applications/audio/jamesdsp { };
-  jamesdsp-pulse = qt6Packages.callPackage ../applications/audio/jamesdsp {
+  jamesdsp-pulse = callPackage ../by-name/ja/jamesdsp/package.nix {
     usePipewire = false;
     usePulseaudio = true;
   };

From 69538d72e51f1f17bb95b3227bb2d27548dcb96b Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 17:51:16 -0700
Subject: [PATCH 053/103] qpwgraph: modernize, move to by-name/

---
 .../qp/qpwgraph/package.nix}                  | 23 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 10 insertions(+), 15 deletions(-)
 rename pkgs/{applications/audio/qpwgraph/default.nix => by-name/qp/qpwgraph/package.nix} (76%)

diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/by-name/qp/qpwgraph/package.nix
similarity index 76%
rename from pkgs/applications/audio/qpwgraph/default.nix
rename to pkgs/by-name/qp/qpwgraph/package.nix
index 361db3c008ad..9bb5f30d00ff 100644
--- a/pkgs/applications/audio/qpwgraph/default.nix
+++ b/pkgs/by-name/qp/qpwgraph/package.nix
@@ -4,12 +4,9 @@
   fetchFromGitLab,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
-  qtsvg,
-  qtwayland,
   alsa-lib,
   pipewire,
+  kdePackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,27 +17,27 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.freedesktop.org";
     owner = "rncbc";
     repo = "qpwgraph";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-zhp6Mkb8iQF8tGXkYu+lgbMUNN/fk/gWBhzeDS4myJ0=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
-    qtwayland
+    kdePackages.qtbase
+    kdePackages.qtsvg
+    kdePackages.qtwayland
     alsa-lib
     pipewire
   ];
 
   cmakeFlags = [ "-DCONFIG_WAYLAND=ON" ];
 
-  meta = with lib; {
+  meta = {
     description = "Qt graph manager for PipeWire, similar to QjackCtl";
     longDescription = ''
       qpwgraph is a graph manager dedicated for PipeWire,
@@ -48,9 +45,9 @@ stdenv.mkDerivation (finalAttrs: {
       the same of QjackCtl.
     '';
     homepage = "https://gitlab.freedesktop.org/rncbc/qpwgraph";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       kanashimia
       exi
       Scrumplex
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99ac71eaeac3..7ede4d86314a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12255,8 +12255,6 @@ with pkgs;
 
   qnotero = libsForQt5.callPackage ../applications/office/qnotero { };
 
-  qpwgraph = qt6Packages.callPackage ../applications/audio/qpwgraph { };
-
   qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };
 
   qsstv = qt5.callPackage ../applications/radio/qsstv { };

From df6943d363b3306bec609a2116ddca0576769707 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 19:00:38 -0700
Subject: [PATCH 054/103] sonic-lineup: modernize, move to by-name/

---
 .../so}/sonic-lineup/match-vamp.patch          |  0
 .../so/sonic-lineup/package.nix}               | 18 +++++++++---------
 pkgs/top-level/all-packages.nix                |  2 --
 3 files changed, 9 insertions(+), 11 deletions(-)
 rename pkgs/{applications/audio => by-name/so}/sonic-lineup/match-vamp.patch (100%)
 rename pkgs/{applications/audio/sonic-lineup/default.nix => by-name/so/sonic-lineup/package.nix} (84%)

diff --git a/pkgs/applications/audio/sonic-lineup/match-vamp.patch b/pkgs/by-name/so/sonic-lineup/match-vamp.patch
similarity index 100%
rename from pkgs/applications/audio/sonic-lineup/match-vamp.patch
rename to pkgs/by-name/so/sonic-lineup/match-vamp.patch
diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/by-name/so/sonic-lineup/package.nix
similarity index 84%
rename from pkgs/applications/audio/sonic-lineup/default.nix
rename to pkgs/by-name/so/sonic-lineup/package.nix
index 6d41c1cb7abb..4a95a4a89b96 100644
--- a/pkgs/applications/audio/sonic-lineup/default.nix
+++ b/pkgs/by-name/so/sonic-lineup/package.nix
@@ -23,17 +23,17 @@
   serd,
   sord,
   capnproto,
-  wrapQtAppsHook,
   pkg-config,
   libjack2,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sonic-lineup";
   version = "1.1";
 
   src = fetchurl {
-    url = "https://code.soundsoftware.ac.uk/attachments/download/2765/${pname}-${version}.tar.gz";
+    url = "https://code.soundsoftware.ac.uk/attachments/download/2765/sonic-lineup-${finalAttrs.version}.tar.gz";
     sha256 = "0k45k9fawcm4s5yy05x00pgww7j8m7k2cxcc7g0fn9vqy7vcbq9h";
   };
 
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     capnproto # capnp
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   strictDeps = true;
@@ -86,12 +86,12 @@ stdenv.mkDerivation rec {
     sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-lineup.pro
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Comparative visualisation of related audio recordings";
     mainProgram = "sonic-lineup";
     homepage = "https://www.sonicvisualiser.org/sonic-lineup/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.vandenoever ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ vandenoever ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ede4d86314a..b1789e640bd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12467,8 +12467,6 @@ with pkgs;
 
   socialscan = with python3.pkgs; toPythonApplication socialscan;
 
-  sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { };
-
   sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { };
 
   squeezelite-pulse = callPackage ../by-name/sq/squeezelite/package.nix {

From 279844bb6eda14e1a295b329b1e53ba295f861ce Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 20:50:11 -0700
Subject: [PATCH 055/103] noson: modernize, move to by-name/

---
 .../no/noson/package.nix}                     | 26 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 17 deletions(-)
 rename pkgs/{applications/audio/noson/default.nix => by-name/no/noson/package.nix} (70%)

diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/by-name/no/noson/package.nix
similarity index 70%
rename from pkgs/applications/audio/noson/default.nix
rename to pkgs/by-name/no/noson/package.nix
index 5524638023c3..40f0228dfd96 100644
--- a/pkgs/applications/audio/noson/default.nix
+++ b/pkgs/by-name/no/noson/package.nix
@@ -5,11 +5,7 @@
   cmake,
   flac,
   libpulseaudio,
-  qtbase,
-  qtgraphicaleffects,
-  qtquickcontrols2,
-  qtwayland,
-  wrapQtAppsHook,
+  libsForQt5,
   makeWrapper,
 }:
 
@@ -20,25 +16,25 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "janbar";
     repo = "noson-app";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-XJBkPhyDPeyVrcY5Q5W9LtESuVxcbcQ8JoyOzKg+0NU=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     makeWrapper
   ];
 
   buildInputs = [
     flac
     libpulseaudio
-    qtbase
-    qtgraphicaleffects
-    qtquickcontrols2
+    libsForQt5.qtbase
+    libsForQt5.qtgraphicaleffects
+    libsForQt5.qtquickcontrols2
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    qtwayland
+    libsForQt5.qtwayland
   ];
 
   # wrapQtAppsHook doesn't automatically find noson-gui
@@ -49,12 +45,12 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtApp "$out/lib/noson/noson-gui"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "SONOS controller for Linux (and macOS)";
     homepage = "https://janbar.github.io/noson-app/";
     mainProgram = "noson-app";
-    platforms = platforms.linux ++ platforms.darwin;
-    license = [ licenses.gpl3Only ];
-    maintainers = with maintainers; [ callahad ];
+    platforms = with lib.platforms; linux ++ darwin;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ callahad ];
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1789e640bd5..c5e06085ea7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11403,8 +11403,6 @@ with pkgs;
 
   mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { };
 
-  noson = libsForQt5.callPackage ../applications/audio/noson { };
-
   pass2csv = python3Packages.callPackage ../tools/security/pass2csv { };
 
   pinboard = with python3Packages; toPythonApplication pinboard;

From 2bcd5978306bb1e6eab88d890622e2cf8cfc07e0 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 22:31:40 -0700
Subject: [PATCH 056/103] lpd8editor: modernize, move to by-name/

---
 .../lp/lpd8editor/package.nix}                  | 17 ++++++++---------
 pkgs/top-level/all-packages.nix                 |  2 --
 2 files changed, 8 insertions(+), 11 deletions(-)
 rename pkgs/{applications/audio/lpd8editor/default.nix => by-name/lp/lpd8editor/package.nix} (71%)

diff --git a/pkgs/applications/audio/lpd8editor/default.nix b/pkgs/by-name/lp/lpd8editor/package.nix
similarity index 71%
rename from pkgs/applications/audio/lpd8editor/default.nix
rename to pkgs/by-name/lp/lpd8editor/package.nix
index b5071a2c5a41..34a8c5a0b7f1 100644
--- a/pkgs/applications/audio/lpd8editor/default.nix
+++ b/pkgs/by-name/lp/lpd8editor/package.nix
@@ -6,22 +6,21 @@
   fetchFromGitHub,
   cmake,
   alsa-lib,
-  qttools,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lpd8editor";
   version = "0.0.16";
 
   src = fetchFromGitHub {
     owner = "charlesfleche";
     repo = "lpd8editor";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-lRp2RhNiIf1VrryfKqYFSbKG3pktw3M7B49fXVoj+C8=";
   };
 
   buildInputs = [
-    qttools
+    qt5.qttools
     alsa-lib
   ];
 
@@ -31,12 +30,12 @@ stdenv.mkDerivation rec {
     qt5.wrapQtAppsHook
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Linux editor for the Akai LPD8";
     homepage = "https://github.com/charlesfleche/lpd8editor";
-    license = licenses.mit;
-    maintainers = with maintainers; [ pinpox ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pinpox ];
     mainProgram = "lpd8editor";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5e06085ea7e..51a91071871a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2778,8 +2778,6 @@ with pkgs;
 
   gemstash = callPackage ../development/tools/gemstash { };
 
-  lpd8editor = libsForQt5.callPackage ../applications/audio/lpd8editor { };
-
   lp_solve = callPackage ../applications/science/math/lp_solve {
     inherit (darwin) autoSignDarwinBinariesHook;
   };

From e80781d34ca9537f8b4ce85333f161ae49d6e306 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 23:13:25 -0700
Subject: [PATCH 057/103] airwave: modernize, move to by-name/

---
 .../airwave/default.nix => by-name/ai/airwave/package.nix}  | 6 +-----
 pkgs/top-level/all-packages.nix                             | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)
 rename pkgs/{applications/audio/airwave/default.nix => by-name/ai/airwave/package.nix} (97%)

diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/by-name/ai/airwave/package.nix
similarity index 97%
rename from pkgs/applications/audio/airwave/default.nix
rename to pkgs/by-name/ai/airwave/package.nix
index 9789485488be..688088085810 100644
--- a/pkgs/applications/audio/airwave/default.nix
+++ b/pkgs/by-name/ai/airwave/package.nix
@@ -1,14 +1,10 @@
 {
   lib,
-  stdenv,
   multiStdenv,
   fetchFromGitHub,
-  requireFile,
-  unzip,
   wine,
   cmake,
   makeWrapper,
-  wrapQtAppsHook,
   file,
   libX11,
   qt5,
@@ -46,7 +42,7 @@ multiStdenv.mkDerivation {
   nativeBuildInputs = [
     cmake
     makeWrapper
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51a91071871a..48139b2bf2de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10764,8 +10764,6 @@ with pkgs;
     pdfstudioviewer
     ;
 
-  airwave = libsForQt5.callPackage ../applications/audio/airwave { };
-
   androidStudioPackages = recurseIntoAttrs (callPackage ../applications/editors/android-studio { });
   android-studio = androidStudioPackages.stable;
   android-studio-full = android-studio.full;

From a8c5d2b93d0912a12e533d7bff780a307ad696e9 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 19 Oct 2025 11:05:33 -0700
Subject: [PATCH 058/103] padthv1: move to by-name/

---
 .../padthv1/default.nix => by-name/pa/padthv1/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/audio/padthv1/default.nix => by-name/pa/padthv1/package.nix} (100%)

diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/by-name/pa/padthv1/package.nix
similarity index 100%
rename from pkgs/applications/audio/padthv1/default.nix
rename to pkgs/by-name/pa/padthv1/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48139b2bf2de..58e1df9f9952 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3718,8 +3718,6 @@ with pkgs;
 
   packagekit = callPackage ../tools/package-management/packagekit { };
 
-  padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { };
-
   pagefind = libsForQt5.callPackage ../applications/misc/pagefind { };
 
   pakcs = callPackage ../development/compilers/pakcs { };

From 52fff94153e4ed5154a214ec02260fffca7b32a8 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 19 Oct 2025 11:14:24 -0700
Subject: [PATCH 059/103] pipecontrol: modernize, move to by-name/

---
 .../pi/pipecontrol/package.nix}               | 30 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 13 insertions(+), 19 deletions(-)
 rename pkgs/{applications/audio/pipecontrol/default.nix => by-name/pi/pipecontrol/package.nix} (61%)

diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/by-name/pi/pipecontrol/package.nix
similarity index 61%
rename from pkgs/applications/audio/pipecontrol/default.nix
rename to pkgs/by-name/pi/pipecontrol/package.nix
index 2c29dd4b2ccb..7dbdf94f9fd3 100644
--- a/pkgs/applications/audio/pipecontrol/default.nix
+++ b/pkgs/by-name/pi/pipecontrol/package.nix
@@ -5,47 +5,43 @@
   pipewire,
   cmake,
   extra-cmake-modules,
-  wrapQtAppsHook,
-  qtbase,
-  qttools,
-  kirigami2,
-  kcoreaddons,
-  ki18n,
-  qtquickcontrols2,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pipecontrol";
   version = "0.2.12";
 
   src = fetchFromGitHub {
     owner = "portaloffreedom";
     repo = "pipecontrol";
-    rev = "v${version}";
-    sha256 = "sha256-WvQFmoEaxnkI61wPldSnMAoPAxNtI399hdHb/9bkPqc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-WvQFmoEaxnkI61wPldSnMAoPAxNtI399hdHb/9bkPqc=";
   };
 
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
-    wrapQtAppsHook
-    qttools
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
   ];
 
   buildInputs = [
     pipewire
+  ]
+  ++ (with libsForQt5; [
     qtbase
     kirigami2
     kcoreaddons
     ki18n
     qtquickcontrols2
-  ];
+  ]);
 
-  meta = with lib; {
+  meta = {
     description = "Pipewire control GUI program in Qt (Kirigami2)";
     mainProgram = "pipecontrol";
     homepage = "https://github.com/portaloffreedom/pipecontrol";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ tilcreator ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ tilcreator ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58e1df9f9952..8e6fe706bbc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3741,8 +3741,6 @@ with pkgs;
     percona-xtrabackup
     ;
 
-  pipecontrol = libsForQt5.callPackage ../applications/audio/pipecontrol { };
-
   pulumiPackages = recurseIntoAttrs pulumi.pkgs;
 
   pulumi-bin = callPackage ../tools/admin/pulumi-bin { };

From 65d38452b55747c858c9f2b3f3b7b78661f1ce4f Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 19 Oct 2025 11:23:13 -0700
Subject: [PATCH 060/103] drumkv1: modernize, move to by-name/

---
 .../default.nix => by-name/dr/drumkv1/package.nix} | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  2 --
 2 files changed, 7 insertions(+), 9 deletions(-)
 rename pkgs/{applications/audio/drumkv1/default.nix => by-name/dr/drumkv1/package.nix} (77%)

diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/by-name/dr/drumkv1/package.nix
similarity index 77%
rename from pkgs/applications/audio/drumkv1/default.nix
rename to pkgs/by-name/dr/drumkv1/package.nix
index b26d02a76362..c7b30b6e4310 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/by-name/dr/drumkv1/package.nix
@@ -13,12 +13,12 @@
   xorg,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "drumkv1";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/drumkv1/drumkv1-${version}.tar.gz";
+    url = "mirror://sourceforge/drumkv1/drumkv1-${finalAttrs.version}.tar.gz";
     hash = "sha256-Z9F9lbLSAJRlVh7tnSMNTlK7FiZhhlVfeHPlbbVuWXk=";
   };
 
@@ -47,12 +47,12 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_LIBDIR=lib"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Old-school drum-kit sampler synthesizer with stereo fx";
     mainProgram = "drumkv1_jack";
     homepage = "http://drumkv1.sourceforge.net/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.theredstonedev ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ theredstonedev ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e6fe706bbc1..1d9a84fdd3f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13179,8 +13179,6 @@ with pkgs;
   cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { };
   cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { };
 
-  drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { };
-
   phonemizer = with python3Packages; toPythonApplication phonemizer;
 
   ### GAMES

From 918709a9136b3d3cab2d83086771ac4a6dad5b3a Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 19 Oct 2025 11:29:29 -0700
Subject: [PATCH 061/103] tony: modernize, move to by-name/

---
 .../to/tony/package.nix}                      | 28 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 13 insertions(+), 17 deletions(-)
 rename pkgs/{applications/audio/tony/default.nix => by-name/to/tony/package.nix} (78%)

diff --git a/pkgs/applications/audio/tony/default.nix b/pkgs/by-name/to/tony/package.nix
similarity index 78%
rename from pkgs/applications/audio/tony/default.nix
rename to pkgs/by-name/to/tony/package.nix
index 643228bfad91..d2a8d6abd115 100644
--- a/pkgs/applications/audio/tony/default.nix
+++ b/pkgs/by-name/to/tony/package.nix
@@ -4,7 +4,6 @@
   fetchurl,
   fetchpatch2,
   pkg-config,
-  wrapQtAppsHook,
   alsa-lib,
   boost,
   bzip2,
@@ -23,19 +22,18 @@
   libsndfile,
   lrdf,
   opusfile,
-  qtbase,
-  qtsvg,
   rubberband,
   serd,
   sord,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tony";
   version = "2.1.1";
 
   src = fetchurl {
-    url = "https://code.soundsoftware.ac.uk/attachments/download/2616/${pname}-${version}.tar.gz";
+    url = "https://code.soundsoftware.ac.uk/attachments/download/2616/tony-${finalAttrs.version}.tar.gz";
     sha256 = "03g2bmlj08lmgvh54dyd635xccjn730g4wwlhpvsw04bffz8b7fp";
   };
 
@@ -44,20 +42,20 @@ stdenv.mkDerivation rec {
       url = "https://github.com/sonic-visualiser/svcore/commit/5a7b517e43b7f0b3f03b7fc3145102cf4e5b0ffc.patch";
       stripLen = 1;
       extraPrefix = "svcore/";
-      sha256 = "sha256-DOCdQqCihkR0g/6m90DbJxw00QTpyVmFzCxagrVWKiI=";
+      hash = "sha256-DOCdQqCihkR0g/6m90DbJxw00QTpyVmFzCxagrVWKiI=";
     })
     (fetchpatch2 {
       url = "https://github.com/sonic-visualiser/svgui/commit/5b6417891cff5cc614e8c96664d68674eb12b191.patch";
       stripLen = 1;
       extraPrefix = "svgui/";
       excludes = [ "svgui/widgets/CSVExportDialog.cpp" ];
-      sha256 = "sha256-pBCtoMXgjreUm/D0pl6+R9x1Ovwwwj8Ohv994oMX8XA=";
+      hash = "sha256-pBCtoMXgjreUm/D0pl6+R9x1Ovwwwj8Ohv994oMX8XA=";
     })
   ];
 
   nativeBuildInputs = [
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -79,8 +77,8 @@ stdenv.mkDerivation rec {
     libsndfile
     lrdf
     opusfile
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     rubberband
     serd
     sord
@@ -93,12 +91,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Pitch and note annotation of unaccompanied melody";
     mainProgram = "tony";
     homepage = "https://www.sonicvisualiser.org/tony/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ orivej ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ orivej ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d9a84fdd3f5..4d7df523b0c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12634,8 +12634,6 @@ with pkgs;
     inherit (linuxPackages) x86_energy_perf_policy;
   };
 
-  tony = libsForQt5.callPackage ../applications/audio/tony { };
-
   trustedqsl = tqsl; # Alias added 2019-02-10
 
   libtransmission_3 = transmission_3.override {

From 7836a7329671b739fd27ff7080b65ab899e4ff11 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 19 Oct 2025 11:36:01 -0700
Subject: [PATCH 062/103] padthv1: move to by-name/

---
 .../qs/qsynth/package.nix}                    | 25 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 16 deletions(-)
 rename pkgs/{applications/audio/qsynth/default.nix => by-name/qs/qsynth/package.nix} (61%)

diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/by-name/qs/qsynth/package.nix
similarity index 61%
rename from pkgs/applications/audio/qsynth/default.nix
rename to pkgs/by-name/qs/qsynth/package.nix
index 2b73e80a1732..310ce39a4550 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/by-name/qs/qsynth/package.nix
@@ -7,42 +7,39 @@
   libjack2,
   cmake,
   pkg-config,
-  qtbase,
-  qttools,
-  qtx11extras,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qsynth";
   version = "1.0.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/qsynth/qsynth-${finalAttrs.version}.tar.gz";
     hash = "sha256-z4l+Ku3oEQV3NunkogyxzaSKhFJuYhIxlExJsACcumY=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     alsa-lib
     fluidsynth
     libjack2
-    qtbase
-    qttools
-    qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qttools
+    libsForQt5.qtx11extras
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Fluidsynth GUI";
     mainProgram = "qsynth";
     homepage = "https://sourceforge.net/projects/qsynth";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d7df523b0c5..0fcde01139ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12253,8 +12253,6 @@ with pkgs;
 
   qsudo = libsForQt5.callPackage ../applications/misc/qsudo { };
 
-  qsynth = libsForQt5.callPackage ../applications/audio/qsynth { };
-
   qtbitcointrader = libsForQt5.callPackage ../applications/misc/qtbitcointrader { };
 
   qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { };

From 851a3d65acb7ff91aea96279e9969ff6a1ee26c0 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 19 Oct 2025 11:50:55 -0700
Subject: [PATCH 063/103] csound-qt: modernize, move to by-name/

---
 .../cs/csound-qt/package.nix}                 | 21 ++++++++-----------
 .../cs}/csound-qt/rtmidipath.patch            |  0
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 9 insertions(+), 14 deletions(-)
 rename pkgs/{applications/audio/csound/csound-qt/default.nix => by-name/cs/csound-qt/package.nix} (81%)
 rename pkgs/{applications/audio/csound => by-name/cs}/csound-qt/rtmidipath.patch (100%)

diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/by-name/cs/csound-qt/package.nix
similarity index 81%
rename from pkgs/applications/audio/csound/csound-qt/default.nix
rename to pkgs/by-name/cs/csound-qt/package.nix
index 9ff6bb2de902..1ef8907eaf19 100644
--- a/pkgs/applications/audio/csound/csound-qt/default.nix
+++ b/pkgs/by-name/cs/csound-qt/package.nix
@@ -6,21 +6,18 @@
   fetchFromGitHub,
   python3,
   python-qt,
-  qmake,
-  qtwebengine,
-  qtxmlpatterns,
   rtmidi,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "csound-qt";
   version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "CsoundQt";
     repo = "CsoundQt";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ZdQwWRAr6AKLmZ/L0lSxIlvWRLoZIKinn7BAQiR+luk=";
   };
 
@@ -28,7 +25,7 @@ stdenv.mkDerivation rec {
     ./rtmidipath.patch
   ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with libsForQt5; [
     qmake
     qtwebengine
     qtxmlpatterns
@@ -59,11 +56,11 @@ stdenv.mkDerivation rec {
     "PYTHON_VERSION=3.${python3.sourceVersion.minor}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features";
     homepage = "https://csoundqt.github.io/";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ hlolli ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ hlolli ];
   };
-}
+})
diff --git a/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch b/pkgs/by-name/cs/csound-qt/rtmidipath.patch
similarity index 100%
rename from pkgs/applications/audio/csound/csound-qt/rtmidipath.patch
rename to pkgs/by-name/cs/csound-qt/rtmidipath.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0fcde01139ea..e17dbe4f5c9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10893,8 +10893,6 @@ with pkgs;
 
   copyq = qt6Packages.callPackage ../applications/misc/copyq { };
 
-  csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { };
-
   codeblocksFull = codeblocks.override { contribPlugins = true; };
 
   cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; };

From c11d586ace0c69b36f1468b39861a655df7e93de Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 19 Oct 2025 11:56:35 -0700
Subject: [PATCH 064/103] samplebrain: modernize, move to by-name/

---
 .../sa/samplebrain/package.nix}               | 24 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 15 deletions(-)
 rename pkgs/{applications/audio/samplebrain/default.nix => by-name/sa/samplebrain/package.nix} (82%)

diff --git a/pkgs/applications/audio/samplebrain/default.nix b/pkgs/by-name/sa/samplebrain/package.nix
similarity index 82%
rename from pkgs/applications/audio/samplebrain/default.nix
rename to pkgs/by-name/sa/samplebrain/package.nix
index 33c46aca0f85..33a1313bb545 100644
--- a/pkgs/applications/audio/samplebrain/default.nix
+++ b/pkgs/by-name/sa/samplebrain/package.nix
@@ -8,19 +8,17 @@
   libsndfile,
   makeDesktopItem,
   portaudio,
-  qmake,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "samplebrain";
   version = "0.18.5";
 
   src = fetchFromGitLab {
     owner = "then-try-this";
     repo = "samplebrain";
-    rev = "v${version}_release";
+    tag = "v${finalAttrs.version}_release";
     hash = "sha256-/pMHmwly5Dar7w/ZawvR3cWQHw385GQv/Wsl1E2w5p4=";
   };
 
@@ -32,7 +30,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with libsForQt5; [
     qmake
     wrapQtAppsHook
   ];
@@ -42,16 +40,16 @@ stdenv.mkDerivation rec {
     liblo
     libsndfile
     portaudio
-    qtbase
+    libsForQt5.qtbase
   ];
 
   desktopItem = makeDesktopItem {
     type = "Application";
-    desktopName = pname;
-    name = pname;
+    desktopName = "samplebrain";
+    name = "samplebrain";
     comment = "A sample masher designed by Aphex Twin";
-    exec = pname;
-    icon = pname;
+    exec = "samplebrain";
+    icon = "samplebrain";
     categories = [ "Audio" ];
   };
 
@@ -65,9 +63,9 @@ stdenv.mkDerivation rec {
     description = "Custom sample mashing app";
     mainProgram = "samplebrain";
     homepage = "https://thentrythis.org/projects/samplebrain";
-    changelog = "https://gitlab.com/then-try-this/samplebrain/-/releases/v${version}_release";
+    changelog = "https://gitlab.com/then-try-this/samplebrain/-/releases/v${finalAttrs.version}_release";
     maintainers = with lib.maintainers; [ mitchmindtree ];
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e17dbe4f5c9e..42f24d365aa0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6034,8 +6034,6 @@ with pkgs;
   rubyPackages_3_4 = recurseIntoAttrs ruby_3_4.gems;
   rubyPackages_3_5 = recurseIntoAttrs ruby_3_5.gems;
 
-  samplebrain = libsForQt5.callPackage ../applications/audio/samplebrain { };
-
   inherit (callPackages ../applications/networking/cluster/spark { })
     spark_3_5
     spark_3_4

From 499ee63b0c99e000a79989ed1241f93e642dac57 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 19 Oct 2025 12:00:23 -0700
Subject: [PATCH 065/103] flacon: modernize, move to by-name/

---
 .../fl/flacon/package.nix}                    | 26 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 16 deletions(-)
 rename pkgs/{applications/audio/flacon/default.nix => by-name/fl/flacon/package.nix} (71%)

diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/by-name/fl/flacon/package.nix
similarity index 71%
rename from pkgs/applications/audio/flacon/default.nix
rename to pkgs/by-name/fl/flacon/package.nix
index 988b81e2ffb8..c592c8432c9d 100644
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/by-name/fl/flacon/package.nix
@@ -17,30 +17,28 @@
   monkeysAudio,
   sox,
   gtk3,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "flacon";
   version = "12.0.0";
 
   src = fetchFromGitHub {
     owner = "flacon";
     repo = "flacon";
-    rev = "v${version}";
-    sha256 = "sha256-r9SdQg6JTMoGxO2xUtkkBe5F5cajnsndZEq20BjJGuU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-r9SdQg6JTMoGxO2xUtkkBe5F5cajnsndZEq20BjJGuU=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
     libuchardet
     taglib
   ];
@@ -64,12 +62,12 @@ stdenv.mkDerivation rec {
       --prefix PATH : "$bin_path";
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Extracts audio tracks from an audio CD image to separate tracks";
     mainProgram = "flacon";
     homepage = "https://flacon.github.io/";
-    license = licenses.lgpl21;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ snglth ];
+    license = lib.licenses.lgpl21;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ snglth ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42f24d365aa0..81337614ce87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11055,8 +11055,6 @@ with pkgs;
 
   firewalld-gui = firewalld.override { withGui = true; };
 
-  flacon = libsForQt5.callPackage ../applications/audio/flacon { };
-
   fldigi = callPackage ../applications/radio/fldigi {
     hamlib = hamlib_4;
   };

From 189ad91472bcaa1271b7ba92348b169475df5cd0 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 19 Oct 2025 12:40:32 -0700
Subject: [PATCH 066/103] sonic-visualiser: modernize, move to by-name/

---
 .../so/sonic-visualiser/package.nix}          | 26 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 16 deletions(-)
 rename pkgs/{applications/audio/sonic-visualiser/default.nix => by-name/so/sonic-visualiser/package.nix} (74%)

diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/by-name/so/sonic-visualiser/package.nix
similarity index 74%
rename from pkgs/applications/audio/sonic-visualiser/default.nix
rename to pkgs/by-name/so/sonic-visualiser/package.nix
index 636b902520d1..d78e3f0b1703 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/by-name/so/sonic-visualiser/package.nix
@@ -16,8 +16,6 @@
   libsndfile,
   pkg-config,
   libpulseaudio,
-  qtbase,
-  qtsvg,
   redland,
   rubberband,
   serd,
@@ -29,19 +27,19 @@
   libfishsound,
   libid3tag,
   opusfile,
-  wrapQtAppsHook,
   meson,
   ninja,
   cmake,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sonic-visualiser";
   version = "4.5.1";
 
   src = fetchurl {
-    url = "https://code.soundsoftware.ac.uk/attachments/download/2841/${pname}-${version}.tar.gz";
-    sha256 = "1sgg4m3035a03ldipgysz7zqfa9pqaqa4j024gyvvcwh4ml8iasr";
+    url = "https://code.soundsoftware.ac.uk/attachments/download/2841/sonic-visualiser-${finalAttrs.version}.tar.gz";
+    hash = "sha256-WauIaCWQs739IwJIorDCNymH//navxsbHUCVAUYl7+k=";
   };
 
   nativeBuildInputs = [
@@ -49,12 +47,12 @@ stdenv.mkDerivation rec {
     ninja
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     libsndfile
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     fftw
     fftwFloat
     bzip2
@@ -82,11 +80,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "View and analyse contents of music audio files";
     homepage = "https://www.sonicvisualiser.org/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.marcweber ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ marcweber ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81337614ce87..0a0a0c32b3a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12449,8 +12449,6 @@ with pkgs;
 
   socialscan = with python3.pkgs; toPythonApplication socialscan;
 
-  sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { };
-
   squeezelite-pulse = callPackage ../by-name/sq/squeezelite/package.nix {
     audioBackend = "pulse";
   };

From e5bc6ea114c3c500b2c4a9d6c33855ff38dc4a1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 19:47:38 +0000
Subject: [PATCH 067/103] iam-policy-json-to-terraform: 1.9.1 -> 1.9.2

---
 pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix b/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix
index d94101db77ae..0207c0285e11 100644
--- a/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix
+++ b/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "iam-policy-json-to-terraform";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "flosell";
     repo = "iam-policy-json-to-terraform";
     rev = version;
-    sha256 = "sha256-xIhe+Mnvog+xRu1qMA7yxS1pCs91cr5EcaJroO+0zJ8=";
+    sha256 = "sha256-YCkM6ddTue1nYqQj56iUADl9v72Um51TLhwwGK3USEw=";
   };
 
-  vendorHash = "sha256-6EtOMs+Vba39hOQ029dHpHCJ9ke35PZ/em9Xye3dmvg=";
+  vendorHash = "sha256-HOeMkyH7voQAXCRCdfpv/Cy9oLJDY+DXwh4h2yFf7Nk=";
 
   meta = {
     description = "Small tool to convert an IAM Policy in JSON format into a Terraform aws_iam_policy_document";

From 1581bbc35efe8b3f2c9095a6f630fa7df30830d2 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 19 Oct 2025 16:44:12 -0700
Subject: [PATCH 068/103] boringssl: exclude character conversion warning under
 clang

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

diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix
index 92cb25cba6aa..40bd420a157d 100644
--- a/pkgs/by-name/bo/boringssl/package.nix
+++ b/pkgs/by-name/bo/boringssl/package.nix
@@ -47,6 +47,9 @@ buildGoModule (finalAttrs: {
       # Needed with GCC 12 but breaks on darwin (with clang)
       "-Wno-error=stringop-overflow"
     ]
+    ++ lib.optionals stdenv.cc.isClang [
+      "-Wno-error=character-conversion"
+    ]
   );
 
   buildPhase = ''

From cc508f430a00c13affd854cfa10a59cc08b0790c Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 19 Oct 2025 15:19:33 -0700
Subject: [PATCH 069/103] boringssl: 0.20250818.0 -> 0.20251002.0

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

diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix
index 40bd420a157d..9efc590eaaa2 100644
--- a/pkgs/by-name/bo/boringssl/package.nix
+++ b/pkgs/by-name/bo/boringssl/package.nix
@@ -11,12 +11,12 @@
 # reference: https://boringssl.googlesource.com/boringssl/+/refs/tags/0.20250818.0/BUILDING.md
 buildGoModule (finalAttrs: {
   pname = "boringssl";
-  version = "0.20250818.0";
+  version = "0.20251002.0";
 
   src = fetchgit {
     url = "https://boringssl.googlesource.com/boringssl";
     tag = finalAttrs.version;
-    hash = "sha256-lykIlC0tvjtjjS/rQTeX4vK9PgI+A8EnasEC+HYspvg=";
+    hash = "sha256-/78GCbyB37lada0fA8MsOYXVJSUCM7CuC2pHCpy9qto=";
   };
 
   patches = [

From a39ac67aeb8fb17b35d82cd075bd0461177cf73f Mon Sep 17 00:00:00 2001
From: "Berk D. Demir" <bdd@mindcast.org>
Date: Sun, 19 Oct 2025 15:31:35 -0700
Subject: [PATCH 070/103] _1password-gui: update-sources.py use Sequoia instead
 of GnuPG

r-ryantm update environment fails to go through GnuPG backed PGP
signature verification due to various intricacies of GnuPG's IPC
requirements to do rather basic things.

See: https://nixpkgs-update-logs.nix-community.org/_1password-gui-beta/2025-08-20.log

Switch from GnuPG to Sequoia, and use `sq` CLI tool for a more
minimalistic signature verification.

This change also simplifies trust anchor key acquisition to downloading
directly from 1Password's HTTPS service, instead of fetching by key id
from a PGP Key Server.

Testing:

  % for pkg in _1password-gui{,-beta}; do
   nix-shell ~nixpkgs/maintainers/scripts/update.nix --argstr commit true --argstr skip-prompt true --argstr commit true --argstr package ${pkg}
  done

  Going to be running update for following packages:
   - 1password-8.11.11

  Running update for:
  Preparing worktree (new branch 'update-tmp_manrfba')
  Updating files: 100% (49124/49124), done.
  HEAD is now at 1c8e629a6193 _1password-gui: update-sources.py use Sequoia
  Enqueuing group of 1 packages
   - 1password-8.11.11: UPDATING ...
  [master 6228d7811fce] _1password-gui: 8.11.11 -> 8.11.14
   Date: Sun Oct 19 22:42:25 2025 +0000
   1 file changed, 10 insertions(+), 10 deletions(-)
  Deleted branch update-tmp_manrfba (was 6228d7811fce).

  Packages updated!

  Going to be running update for following packages:
   - 1password-8.11.14-19.BETA

  Running update for:
  Preparing worktree (new branch 'update-tmpezi_89b8')
  Updating files: 100% (49124/49124), done.
  HEAD is now at 6228d7811fce _1password-gui: 8.11.11 -> 8.11.14
  Enqueuing group of 1 packages
   - 1password-8.11.14-19.BETA: UPDATING ...
  [master cd5f65a2f240] _1password-gui-beta: 8.11.14-19.BETA -> 8.11.16-30.BETA
   Date: Sun Oct 19 22:43:03 2025 +0000
   1 file changed, 10 insertions(+), 10 deletions(-)
  Deleted branch update-tmpezi_89b8 (was cd5f65a2f240).

  Packages updated!
---
 .../_1/_1password-gui/update-sources.py       | 51 +++++++++----------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-gui/update-sources.py b/pkgs/by-name/_1/_1password-gui/update-sources.py
index c0e9bbb08803..bdf257cb1664 100755
--- a/pkgs/by-name/_1/_1password-gui/update-sources.py
+++ b/pkgs/by-name/_1/_1password-gui/update-sources.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p python3 gnupg
+#!nix-shell -i python3 -p python3 sequoia-sq
 import json
 import os
 import shutil
@@ -9,8 +9,7 @@ import tempfile
 from collections import OrderedDict
 
 DOWNLOADS_BASE_URL = "https://downloads.1password.com"
-OP_PGP_KEYID = "3FEF9748469ADBE15DA7CA80AC2D62742012EA22"
-
+OP_PGP_KEY_URL = "https://downloads.1password.com/linux/keys/1password.asc"
 
 class Sources(OrderedDict):
     def __init__(self):
@@ -21,43 +20,39 @@ class Sources(OrderedDict):
         with open("sources.json", "w") as fp:
             print(json.dumps(self, indent=2), file=fp)
 
-class GPG:
+
+class PGP:
     def __new__(cls):
         if not hasattr(cls, "_instance"):
             cls._instance = super().__new__(cls)
         return cls._instance
 
     def __init__(self):
-        if hasattr(self, "gnupghome"):
+        if hasattr(self, "signer_file"):
             return
 
-        self.gpg = shutil.which("gpg")
-        self.gpgv = shutil.which("gpgv")
-        self.gnupghome = tempfile.mkdtemp(prefix="1password-gui-gnupghome.")
-        self.env = {"GNUPGHOME": self.gnupghome}
-        self._run(
-            self.gpg,
-            "--no-default-keyring",
-            "--keyring",
-            "trustedkeys.kbx",
-            "--keyserver",
-            "keyserver.ubuntu.com",
-            "--receive-keys",
-            OP_PGP_KEYID,
-        )
+        self.sq = shutil.which("sq")
+        if (self.sq is None):
+            raise SystemExit(f"sequoia sq not found")
 
-    def __del__(self):
-        shutil.rmtree(self.gnupghome)
+        self.signer_file, _ = nix_store_prefetch(OP_PGP_KEY_URL)
+
+    def verify(self, sig, tarball):
+        args = [
+            self.sq,
+            "--batch",
+            "--home=none",
+            "verify",
+            f"--signer-file={self.signer_file}",
+            f"--signature-file={sig}",
+            tarball
+        ]
 
-    def _run(self, *args):
         try:
-            subprocess.run(args, env=self.env, check=True, capture_output=True)
+            subprocess.run(args, check=True, capture_output=True)
         except subprocess.CalledProcessError as cpe:
             print(cpe.stderr, file=sys.stderr)
-            raise SystemExit(f"gpg error: {cpe.cmd}")
-
-    def verify(self, sigfile, datafile):
-        return self._run(self.gpgv, sigfile, datafile)
+            raise SystemExit(f"sq error: {cpe.cmd}")
 
 
 def nix_store_prefetch(url):
@@ -89,7 +84,7 @@ def download(channel, os, version, arch):
     # Linux release tarballs come with detached PGP signatures.
     if os == "linux":
         store_path_sig, _ = nix_store_prefetch(url + ".sig")
-        GPG().verify(store_path_sig, store_path_tarball)
+        PGP().verify(store_path_sig, store_path_tarball)
 
     return url, hash
 

From e407efec4b5761ba5d69eb3a916619726dea12a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 00:28:21 +0000
Subject: [PATCH 071/103] lscolors: 0.20.0 -> 0.21.0

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

diff --git a/pkgs/by-name/ls/lscolors/package.nix b/pkgs/by-name/ls/lscolors/package.nix
index 3d146e01c3a0..f9f5f933f379 100644
--- a/pkgs/by-name/ls/lscolors/package.nix
+++ b/pkgs/by-name/ls/lscolors/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lscolors";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchCrate {
     inherit version pname;
-    hash = "sha256-EUUPVSpHc9tN1Hi7917hJ2psTZq5nnGw6PBeApvlVtw=";
+    hash = "sha256-75RE72Vy4HRRjwa7qOybnUAzxxhBUKSlKfrLrm6Ish8=";
   };
 
-  cargoHash = "sha256-WsbzlL+RbR8Hnrsbgr7gFpBlo3RBKcNYPbOsZWygyrI=";
+  cargoHash = "sha256-a8G9snl6TrH90HvlfhDY/U8BuSoD7Fqn7BJSsRvEQ18=";
 
   buildFeatures = [ "nu-ansi-term" ];
 

From aaf8c3ee10ad12f320ef6461208760fef7b31153 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 00:30:39 +0000
Subject: [PATCH 072/103] sogo: 5.12.3 -> 5.12.4

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

diff --git a/pkgs/by-name/so/sogo/package.nix b/pkgs/by-name/so/sogo/package.nix
index b36e3fea31f8..955724f9d660 100644
--- a/pkgs/by-name/so/sogo/package.nix
+++ b/pkgs/by-name/so/sogo/package.nix
@@ -25,14 +25,14 @@
 
 clangStdenv.mkDerivation rec {
   pname = "sogo";
-  version = "5.12.3";
+  version = "5.12.4";
 
   # always update the sope package as well, when updating sogo
   src = fetchFromGitHub {
     owner = "Alinto";
     repo = "sogo";
     rev = "SOGo-${version}";
-    hash = "sha256-HTfe/ZiipqS6QdKQK0wf4Xl6xCTNw5fEdXfRFbBMWMY=";
+    hash = "sha256-L79ABIABaVrO5Y3a3a30ZPyrhI/Nx+Bb5WjOvL0PI7s=";
   };
 
   nativeBuildInputs = [

From 5694c90793e4b6c7b08b3c4ccaef1ff47e03bc04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 19:01:04 -0700
Subject: [PATCH 073/103] python3Packages.zigpy-zboss: replace async-timeout
 with asyncio.timeout

---
 .../python-modules/zigpy-zboss/default.nix        | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-zboss/default.nix b/pkgs/development/python-modules/zigpy-zboss/default.nix
index 6345cc2de86b..0a7684367172 100644
--- a/pkgs/development/python-modules/zigpy-zboss/default.nix
+++ b/pkgs/development/python-modules/zigpy-zboss/default.nix
@@ -1,8 +1,8 @@
 {
-  async-timeout,
   buildPythonPackage,
   coloredlogs,
   fetchFromGitHub,
+  fetchpatch,
   jsonschema,
   lib,
   pytest-asyncio_0,
@@ -25,10 +25,21 @@ buildPythonPackage rec {
     hash = "sha256-T2R291GeFIsnDRI1tAydTlLamA3LF5tKxKFhPtcEUus=";
   };
 
+  patches = [
+    # https://github.com/kardia-as/zigpy-zboss/pull/66
+    (fetchpatch {
+      name = "replace-async-timeout-with-asyncio-timeout.patch";
+      url = "https://github.com/kardia-as/zigpy-zboss/commit/91688873ddbcd0c2196f0da69a857b2e2bec75a6.patch";
+      excludes = [ "setup.cfg" ];
+      hash = "sha256-aC0+FbbtuHDW3ApJDnTG3TUeNWhzecEYVuiSOik03uU=";
+    })
+  ];
+
+  pythonRemoveDeps = [ "async_timeout" ];
+
   build-system = [ setuptools ];
 
   dependencies = [
-    async-timeout
     coloredlogs
     jsonschema
     voluptuous

From 0bff25911f803dedf0bd8bf32fcf09229166851a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 19:06:38 -0700
Subject: [PATCH 074/103] python3Packages.aiodiscover: update dependencies

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

diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix
index 18845fc8c92a..9311e645ad76 100644
--- a/pkgs/development/python-modules/aiodiscover/default.nix
+++ b/pkgs/development/python-modules/aiodiscover/default.nix
@@ -4,7 +4,6 @@
   async-timeout,
   buildPythonPackage,
   cached-ipaddress,
-  dnspython,
   fetchFromGitHub,
   ifaddr,
   netifaces,
@@ -21,8 +20,6 @@ buildPythonPackage rec {
   version = "2.7.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiodiscover";
@@ -33,13 +30,14 @@ buildPythonPackage rec {
   build-system = [ poetry-core ];
 
   dependencies = [
-    async-timeout
     aiodns
     cached-ipaddress
-    dnspython
     ifaddr
     netifaces
     pyroute2
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    async-timeout
   ];
 
   nativeCheckInputs = [

From 2e8f4cfbdecb89c643f568a1988e2eb3ed122e68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 19:34:50 -0700
Subject: [PATCH 075/103] python3Packages.zigpy-zigate: update dependencies

---
 .../python-modules/zigpy-zigate/default.nix    | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix
index 9cb5c4f4b1ab..1d44c28c4976 100644
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -4,13 +4,11 @@
   fetchFromGitHub,
   gpiozero,
   mock,
-  pyserial,
-  pyserial-asyncio,
   pyusb,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
+  voluptuous,
   zigpy,
 }:
 
@@ -19,8 +17,6 @@ buildPythonPackage rec {
   version = "0.13.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-zigate";
@@ -30,22 +26,20 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace ', "setuptools-git-versioning<2"' "" \
-      --replace 'dynamic = ["version"]' 'version = "${version}"'
+      --replace-fail ', "setuptools-git-versioning<2"' "" \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     gpiozero
-    pyserial
-    pyserial-asyncio
     pyusb
+    voluptuous
     zigpy
   ];
 
   nativeCheckInputs = [
-    mock
     pytest-asyncio
     pytestCheckHook
   ];

From 0773375076d70f08fc51f71a440f463f1338a8aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 19:39:28 -0700
Subject: [PATCH 076/103] python3Packages.zha: update dependencies

---
 pkgs/development/python-modules/zha/default.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix
index 73c8a0382729..9f81fac849cd 100644
--- a/pkgs/development/python-modules/zha/default.nix
+++ b/pkgs/development/python-modules/zha/default.nix
@@ -1,22 +1,17 @@
 {
   lib,
-  awesomeversion,
   bellows,
   buildPythonPackage,
   fetchFromGitHub,
   freezegun,
   pyserial,
-  pyserial-asyncio,
   pyserial-asyncio-fast,
   pytest-asyncio_0,
   pytest-timeout,
   pytest-xdist,
   pytestCheckHook,
-  python-slugify,
   pythonOlder,
   setuptools,
-  universal-silabs-flasher,
-  wheel,
   zha-quirks,
   zigpy,
   zigpy-deconz,
@@ -47,17 +42,12 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
-    wheel
   ];
 
   dependencies = [
-    awesomeversion
     bellows
     pyserial
-    pyserial-asyncio
     pyserial-asyncio-fast
-    python-slugify
-    universal-silabs-flasher
     zha-quirks
     zigpy
     zigpy-deconz

From 070834ea2c44f0d8f2b6ef9d0f461267d9007a82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 03:21:31 +0000
Subject: [PATCH 077/103] vacuum-tube: 1.3.20 -> 1.3.21

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

diff --git a/pkgs/by-name/va/vacuum-tube/package.nix b/pkgs/by-name/va/vacuum-tube/package.nix
index e34bddbe5876..8762b242f770 100644
--- a/pkgs/by-name/va/vacuum-tube/package.nix
+++ b/pkgs/by-name/va/vacuum-tube/package.nix
@@ -9,16 +9,16 @@
 
 buildNpmPackage rec {
   pname = "vacuum-tube";
-  version = "1.3.20";
+  version = "1.3.21";
 
   src = fetchFromGitHub {
     owner = "shy1132";
     repo = "VacuumTube";
     tag = "v${version}";
-    hash = "sha256-DmuJ01xrA+rrKnzVQT3X2bfcIwqdn+plWg5o1GwyiS4=";
+    hash = "sha256-0PX9GJsG3jCiARO4ZmchrPo4s5mWodwbgNtKOa801O0=";
   };
 
-  npmDepsHash = "sha256-L/2qSPkHNH7H0Pk4WrX0gfwJs1Dy5DDyJmggCO/ET9s=";
+  npmDepsHash = "sha256-jI+0vrxnOTjckhoF0l4cuv95Yu9HvL1g/HS65ktYxWk=";
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = true;

From f034d78f5c4e5479fe3089e137174653fe3f28c6 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Sun, 19 Oct 2025 21:22:04 -0700
Subject: [PATCH 078/103] llvmPackages_git: 22.0.0-unstable-2025-10-12 ->
 22.0.0-unstable-2025-10-19

---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index e6d8601a1c7a..1c970c62b91c 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -27,9 +27,9 @@ let
     "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
     "21.1.1".officialRelease.sha256 = "sha256-IB9Z3bIMwfgw2W2Vxo89CmtCM9DfOyV2Ei64nqgHrgc=";
     "22.0.0-git".gitRelease = {
-      rev = "1d0a85a78b7ec7b994b280d30ca125fe58dbbd84";
-      rev-version = "22.0.0-unstable-2025-10-12";
-      sha256 = "sha256-68GnNkVPQ9NGyowndSpqqVBb/2AF9gmSwm38bjxmErQ=";
+      rev = "6afccac4148253d4f9a90ad0a51cba0995f92fad";
+      rev-version = "22.0.0-unstable-2025-10-19";
+      sha256 = "sha256-mQBSRibRygpWIMjICzhza2U8xb/y9EM3SmtnNFfCWpY=";
     };
   }
   // llvmVersions;

From 42bc774a30fc80fadeeb50a4f17d291b5ef87075 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Tue, 14 Oct 2025 11:51:04 +0800
Subject: [PATCH 079/103] antlr4_8: drop

---
 pkgs/development/tools/parsing/antlr/4.nix | 11 -----------
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            |  1 -
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/development/tools/parsing/antlr/4.nix b/pkgs/development/tools/parsing/antlr/4.nix
index c30d235c4f8e..6051dbf384e4 100644
--- a/pkgs/development/tools/parsing/antlr/4.nix
+++ b/pkgs/development/tools/parsing/antlr/4.nix
@@ -199,15 +199,4 @@ in
         ./utf8cpp.patch
       ];
     }).antlr;
-
-  antlr4_8 =
-    (mkAntlr {
-      version = "4.8";
-      sourceSha256 = "1qal3add26qxskm85nk7r758arladn5rcyjinmhlhznmpbbv9j8m";
-      jarSha256 = "0nms976cnqyr1ndng3haxkmknpdq6xli4cpf4x4al0yr21l9v93k";
-      extraCppBuildInputs = lib.optional stdenv.hostPlatform.isLinux libuuid;
-      extraCppCmakeFlags = [
-        (lib.cmakeBool "ANTLR4_INSTALL" true)
-      ];
-    }).antlr;
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 48b601634ca9..827e51eeef6a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -457,6 +457,7 @@ mapAliases {
   apacheKafka_3_7 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
   apacheKafka_3_8 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
   antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17
+  antlr4_8 = throw "antlr4_8 has been removed. Consider using a more recent version of antlr4"; # Added 2025-10-20
   apacheAnt = ant; # Added 2024-11-28
   apparmor-kernel-patches = throw "'apparmor-kernel-patches' has been removed as they were unmaintained, irrelevant and effectively broken"; # Added 2025-04-20
   appimagekit = throw "'appimagekit' has been removed as it was broken in nixpkgs and archived upstream"; # Added 2025-04-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ecbf644f5d5d..6600f9cc5eba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6203,7 +6203,6 @@ with pkgs;
   antlr3 = antlr3_5;
 
   inherit (callPackages ../development/tools/parsing/antlr/4.nix { })
-    antlr4_8
     antlr4_9
     antlr4_10
     antlr4_11

From bc8a13da0b88956bb34d2ceb3147127be90e9aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9B=A7-440729=20=5Bsophie=5D?= <sophie@999eagle.moe>
Date: Mon, 20 Oct 2025 09:37:38 +0200
Subject: [PATCH 080/103] nixosTests.searx: fix fancy test

---
 nixos/tests/searx.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix
index 18199e6db3ed..71a9750ac275 100644
--- a/nixos/tests/searx.nix
+++ b/nixos/tests/searx.nix
@@ -97,7 +97,7 @@
             "${pkgs.curl}/bin/curl --fail http://localhost/searx >&2"
         )
         fancy.succeed(
-            "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/simple/js/leaflet.js >&2"
+            "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/simple/js/searxng.core.min.js >&2"
         )
   '';
 }

From d887fbdc31c0e88b50b97a0da8f161221ebb399b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 08:09:49 +0000
Subject: [PATCH 081/103] freediameter: 1.5.0-unstable-2025-03-16 ->
 1.6.0-unstable-2025-10-18

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

diff --git a/pkgs/by-name/fr/freediameter/package.nix b/pkgs/by-name/fr/freediameter/package.nix
index b08fd258bfe3..2c6f7e16c770 100644
--- a/pkgs/by-name/fr/freediameter/package.nix
+++ b/pkgs/by-name/fr/freediameter/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "freediameter";
-  version = "1.5.0-unstable-2025-03-16";
+  version = "1.6.0-unstable-2025-10-18";
 
   src = fetchFromGitHub {
     owner = "freeDiameter";
     repo = "freeDiameter";
-    rev = "8e525acdfd439995f3e8e26d5a802fc4ad95d24c";
-    hash = "sha256-ai2R8scP++tdPh303RAl0qdIpehzFoyykAuAyl2w3MA=";
+    rev = "9d4bc47584bfeced9de708fe00f5629ac4689db5";
+    hash = "sha256-NHOsmRfdBXN59lGZAlDzwEqEkekZaux3shaGhP87Rdc=";
   };
 
   strictDeps = true;

From 019efb7d98c5d0f6feba879e87aa8edcdd536c8c Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Mon, 20 Oct 2025 11:11:02 +0200
Subject: [PATCH 082/103] bruno: fix build on Darwin

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

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 1b9dd41f397e..6d5bd7e5153c 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  clang_20,
   fetchFromGitHub,
   buildNpmPackage,
   nix-update-script,
@@ -38,6 +39,7 @@ buildNpmPackage rec {
   nativeBuildInputs = [
     pkg-config
   ]
+  ++ lib.optional stdenv.isDarwin clang_20 # clang_21 breaks gyp builds
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     makeWrapper
     copyDesktopItems

From 108161b917a963e4ee75fceab7cf3bd7b1913f23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 11:59:36 +0000
Subject: [PATCH 083/103] build(deps): bump cachix/install-nix-action from
 31.8.0 to 31.8.1

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 31.8.0 to 31.8.1.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Changelog](https://github.com/cachix/install-nix-action/blob/master/RELEASE.md)
- [Commits](https://github.com/cachix/install-nix-action/compare/7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801...fd24c48048070c1be9acd18c9d369a83f0fe94d7)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-version: 31.8.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml     | 2 +-
 .github/workflows/check.yml     | 2 +-
 .github/workflows/eval.yml      | 8 ++++----
 .github/workflows/lint.yml      | 6 +++---
 .github/workflows/reviewers.yml | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3f27b3e46538..918c82c94bbe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,7 +52,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
         with:
           # Sandbox is disabled on MacOS by default.
           extra_nix_config: sandbox = true
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index cc36502c89cf..0ee1146a4982 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -79,7 +79,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 7e96518b590e..8ad860a1aed8 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -47,7 +47,7 @@ jobs:
             ci/pinned.json
 
       - name: Install Nix
-        uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+        uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
 
       - name: Load supported versions
         id: versions
@@ -92,7 +92,7 @@ jobs:
           target-as-trusted-at: ${{ inputs.targetSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+        uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -170,7 +170,7 @@ jobs:
           merge-multiple: true
 
       - name: Install Nix
-        uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+        uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
 
       - name: Combine all output paths and eval stats
         run: |
@@ -326,7 +326,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+        uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
 
       - name: Run misc eval tasks in parallel
         run: |
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 1858f463ad83..cb7a61edad83 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
 
       # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,
       # because the cache would be invalidated on every commit - treefmt checks every file.
@@ -66,7 +66,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -94,7 +94,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 32290c179130..245970531477 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -33,7 +33,7 @@ jobs:
           sparse-checkout: ci
 
       - name: Install Nix
-        uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+        uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
 
       - name: Build the requestReviews derivation
         run: nix-build trusted/ci -A requestReviews

From 4aa6555e39211c7c7c29c6e618118ba7c081f434 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 09:05:09 -0300
Subject: [PATCH 084/103] vc_0_7: drop

---
 pkgs/development/libraries/vc/0.7.nix         | 40 -------------------
 .../libraries/vc/vc_0_7_clang_fix.patch       | 28 -------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 pkgs/development/libraries/vc/0.7.nix
 delete mode 100644 pkgs/development/libraries/vc/vc_0_7_clang_fix.patch

diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix
deleted file mode 100644
index 7636fbf2a0f5..000000000000
--- a/pkgs/development/libraries/vc/0.7.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "Vc";
-  version = "0.7.5";
-
-  src = fetchFromGitHub {
-    owner = "VcDevel";
-    repo = "Vc";
-    rev = version;
-    sha256 = "190s4r2n3jsivl4j2m288j3rqmgjj6gl308hi9mzwyhcfn17q8br";
-  };
-
-  # Avoid requesting an unreasonable intrinsic
-  patches = lib.optional stdenv.cc.isClang ./vc_0_7_clang_fix.patch;
-
-  nativeBuildInputs = [ cmake ];
-
-  postPatch = ''
-    sed -i '/OptimizeForArchitecture()/d' cmake/VcMacros.cmake
-    sed -i '/AutodetectHostArchitecture()/d' print_target_architecture.cmake
-  '';
-
-  meta = with lib; {
-    description = "Library for multiprecision complex arithmetic with exact rounding";
-    homepage = "https://github.com/VcDevel/Vc";
-    license = licenses.bsd3;
-    platforms = platforms.all;
-    maintainers = [ ];
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken =
-      (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
-      || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
-  };
-}
diff --git a/pkgs/development/libraries/vc/vc_0_7_clang_fix.patch b/pkgs/development/libraries/vc/vc_0_7_clang_fix.patch
deleted file mode 100644
index 29ea6f529490..000000000000
--- a/pkgs/development/libraries/vc/vc_0_7_clang_fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur a/sse/intrinsics.h b/sse/intrinsics.h
---- a/sse/intrinsics.h	2021-11-12 22:09:50.000000000 -0500
-+++ b/sse/intrinsics.h	2021-11-12 22:14:08.000000000 -0500
-@@ -498,16 +498,6 @@
-         case 0:
-             f = _mm_cvtss_f32(v);
-             break;
--#if defined VC_IMPL_SSE4_1 && !defined VC_MSVC
--        default:
--#ifdef VC_GCC
--            f = __builtin_ia32_vec_ext_v4sf(static_cast<__v4sf>(v), (i));
--#else
--            // MSVC fails to compile this because it can't optimize i to an immediate
--            _MM_EXTRACT_FLOAT(f, v, i);
--#endif
--            break;
--#else
-         case 1:
-             f = _mm_cvtss_f32(_mm_castsi128_ps(_mm_srli_si128(_mm_castps_si128(v), 4)));
-             break;
-@@ -517,7 +507,6 @@
-         case 3:
-             f = _mm_cvtss_f32(_mm_castsi128_ps(_mm_srli_si128(_mm_castps_si128(v), 12)));
-             break;
--#endif
-         }
-         return f;
-     }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c6286ab8bdbe..d5332926bc7c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2703,6 +2703,7 @@ mapAliases {
   varnish76 = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
   varnish76Packages = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
   vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11
+  vc_0_7 = throw "'vc_0_7' has been removed as it was broken, unused in nixpkgs and unmaintained"; # Added 2025-10-20
   vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
   ventoy-bin = ventoy; # Added 2023-04-12
   ventoy-bin-full = ventoy-full; # Added 2023-04-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6a26fe6f280..860868d90a4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8769,8 +8769,6 @@ with pkgs;
 
   vc = callPackage ../development/libraries/vc { };
 
-  vc_0_7 = callPackage ../development/libraries/vc/0.7.nix { };
-
   vencord-web-extension = callPackage ../by-name/ve/vencord/package.nix { buildWebExtension = true; };
 
   vid-stab = callPackage ../development/libraries/vid-stab {

From 93d4318b6f33403e40fd3d9665ebf1a31d59cf9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 12:16:40 +0000
Subject: [PATCH 085/103] taze: 19.7.0 -> 19.8.1

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

diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix
index 7230003001fe..65579ac321c4 100644
--- a/pkgs/by-name/ta/taze/package.nix
+++ b/pkgs/by-name/ta/taze/package.nix
@@ -13,19 +13,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "taze";
-  version = "19.7.0";
+  version = "19.8.1";
 
   src = fetchFromGitHub {
     owner = "antfu-collective";
     repo = "taze";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-O+xeAM6sh6YK+yAtxQCTI59Dle/6Z4/ePbgqRGmZxlU=";
+    hash = "sha256-xIObsjuHXOr/oSaPI+WDax057IT5Wk4+MuDPHWb9dEU=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-vXw5LPNcuF9wyI23rZhsvvMYTsPNOvSY3LoLntFdm3g=";
+    hash = "sha256-XhXqp0eBR5BKtHdJ1JNcZDCHtQA1AEw/aeHIZgA9raQ=";
   };
 
   nativeBuildInputs = [

From c0e40f362818443743b6087262da9a50f743a84e Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 09:35:07 -0300
Subject: [PATCH 086/103] utox: fix build with cmake4

---
 pkgs/by-name/ut/utox/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ut/utox/package.nix b/pkgs/by-name/ut/utox/package.nix
index 701496ddf60c..ac77e70d798f 100644
--- a/pkgs/by-name/ut/utox/package.nix
+++ b/pkgs/by-name/ut/utox/package.nix
@@ -61,6 +61,11 @@ stdenv.mkDerivation rec {
     "-DENABLE_TESTS=${if doCheck then "ON" else "OFF"}"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
   nativeCheckInputs = [ check ];
 

From dca32142129fe66077e13bbd7a6233c25e24aa10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 12:37:55 +0000
Subject: [PATCH 087/103] vimPlugins.fff-nvim: 0-unstable-2025-10-18 ->
 e8850c3-unstable-2025-10-20

---
 .../editors/vim/plugins/non-generated/fff-nvim/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
index 45a1fd7bf1a2..ca3e0231ecd3 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
@@ -9,12 +9,12 @@
   nix-update-script,
 }:
 let
-  version = "0-unstable-2025-10-18";
+  version = "e8850c3-unstable-2025-10-20";
   src = fetchFromGitHub {
     owner = "dmtrKovalenko";
     repo = "fff.nvim";
-    rev = "ee8bd6e839ff3e70660e794d79d4ce26a33a8e1e";
-    hash = "sha256-Wj6YLTUqLzOngiSDkM3ci85WwdQgjoonwHbvXyvN9cE=";
+    rev = "e8850c3c62a13e92f71233350962e842fcabf01b";
+    hash = "sha256-qyzM45FaXqLipnBW2zTao2SvY21qiFsdsX+Mn2Tu3xI=";
   };
   fff-nvim-lib = rustPlatform.buildRustPackage {
     pname = "fff-nvim-lib";

From 00c7cdc8fc1a2d1e3dc2f869409faa5b02a8e640 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 09:44:03 -0300
Subject: [PATCH 088/103] unqlite: fix build with cmake4

---
 pkgs/development/libraries/unqlite/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/unqlite/default.nix b/pkgs/development/libraries/unqlite/default.nix
index 5e15f7e4d103..ae1261f807ec 100644
--- a/pkgs/development/libraries/unqlite/default.nix
+++ b/pkgs/development/libraries/unqlite/default.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://unqlite.org/";
     description = "Self-contained, serverless, zero-conf, transactional NoSQL DB library";

From cd6bc56474d8334801f4d6322afb8a17bc5bc2d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 12:45:08 +0000
Subject: [PATCH 089/103] dprint-plugins.dprint-plugin-json: 0.20.0 -> 0.21.0

---
 pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix
index 90b82ea0a94f..5550c8faa1bc 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "JSON/JSONC code formatter";
-  hash = "sha256-uFcFLi9aYsBrAqkhFmg9GI+LKiV19LxdNjxQ85EH9To=";
+  hash = "sha256-GIoIkW7szyQU4GyLUdj0TTaV8FWg1jzvOerOChHiR7w=";
   initConfig = {
     configExcludes = [ "**/*-lock.json" ];
     configKey = "json";
@@ -9,6 +9,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-json";
   updateUrl = "https://plugins.dprint.dev/dprint/json/latest.json";
-  url = "https://plugins.dprint.dev/json-0.20.0.wasm";
-  version = "0.20.0";
+  url = "https://plugins.dprint.dev/json-0.21.0.wasm";
+  version = "0.21.0";
 }

From 4289c63957f32864604da8d60aed78b5b7de3a38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 12:51:16 +0000
Subject: [PATCH 090/103] exaile: 4.1.4 -> 4.2.0

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

diff --git a/pkgs/by-name/ex/exaile/package.nix b/pkgs/by-name/ex/exaile/package.nix
index e99fa3d0a5b9..e8b14a428189 100644
--- a/pkgs/by-name/ex/exaile/package.nix
+++ b/pkgs/by-name/ex/exaile/package.nix
@@ -36,13 +36,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exaile";
-  version = "4.1.4";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "exaile";
     repo = "exaile";
     rev = version;
-    sha256 = "sha256-iyK2txutlWe67CyfKuyesBrYQypkS5FOf1ZWUkRCq24=";
+    sha256 = "sha256-33lUlJ7H7lmty46GLzGkIUpgbWIv2EqEcPIzKt87dis=";
   };
 
   nativeBuildInputs = [

From 421803a54e3e266b3c4d381a3176194dc9086ccc Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 09:51:43 -0300
Subject: [PATCH 091/103] uhub: fix build with cmake4

---
 pkgs/by-name/uh/uhub/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/uh/uhub/package.nix b/pkgs/by-name/uh/uhub/package.nix
index 0cf1f8d2e8ba..9ad62b6accde 100644
--- a/pkgs/by-name/uh/uhub/package.nix
+++ b/pkgs/by-name/uh/uhub/package.nix
@@ -35,8 +35,9 @@ stdenv.mkDerivation {
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace "/usr/lib/uhub/" "$out/plugins" \
-      --replace "/etc/uhub" "$TMPDIR"
+      --replace-fail "/usr/lib/uhub/" "$out/plugins" \
+      --replace-fail "/etc/uhub" "$TMPDIR" \
+      --replace-fail "cmake_minimum_required (VERSION 2.8.2)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   cmakeFlags = [

From 38025a8756c2767f3ef5a53d0cae60b2320ae760 Mon Sep 17 00:00:00 2001
From: Paul Menhart <paul@menhart.net>
Date: Mon, 20 Oct 2025 14:51:08 +0200
Subject: [PATCH 092/103] sage: update pkgs path in README

---
 pkgs/by-name/sa/sage/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sa/sage/README.md b/pkgs/by-name/sa/sage/README.md
index 94a9b0b6bc29..80e09a0d8616 100644
--- a/pkgs/by-name/sa/sage/README.md
+++ b/pkgs/by-name/sa/sage/README.md
@@ -26,7 +26,7 @@ Then make the needed changes and generate a patch with `git diff`:
 
 ```
 [user@localhost ~]$ <make changes>
-[user@localhost ~]$ git diff -u > /path/to/nixpkgs/pkgs/applications/science/math/sage/patches/name-of-patch.patch
+[user@localhost ~]$ git diff -u > /path/to/nixpkgs/pkgs/by-name/sa/sage/patches/name-of-patch.patch
 ```
 
 Now just add the patch to `sage-src.nix` and test your changes. If they fix the problem, submit a PR upstream (refer to sages [Developer's Guide](http://doc.sagemath.org/html/en/developer/index.html) for further details).

From 16df00d31839102b5ff2f998afea63dde913c90f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 13:00:38 +0000
Subject: [PATCH 093/103] ledger-live-desktop: 2.130.1 -> 2.131.0

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

diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index 58ba050a9d0f..60d2a6f6a6db 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.130.1";
+  version = "2.131.0";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-7o75rSuVir1b/y3gX5Otbgbs4Xcnra2Ku1Q99a/fMJk=";
+    hash = "sha256-GOKXW3yhYuk9hDNqVeC/btFkxiT6URF9TtHy8uN5iXI=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 2a1b3cb22bd7b8b974faf07ea99e62671473d77b Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 10:02:25 -0300
Subject: [PATCH 094/103] ttylog: fix build with cmake4

---
 pkgs/by-name/tt/ttylog/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/tt/ttylog/package.nix b/pkgs/by-name/tt/ttylog/package.nix
index d98e3a27acc7..44d08f59c4a0 100644
--- a/pkgs/by-name/tt/ttylog/package.nix
+++ b/pkgs/by-name/tt/ttylog/package.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://ttylog.sourceforge.net";
     description = "Simple serial port logger";

From d9042b545e1539814672a9ed123cbba477e530f9 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 10:09:17 -0300
Subject: [PATCH 095/103] ttwatch: fix build with cmake4

---
 pkgs/by-name/tt/ttwatch/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/tt/ttwatch/package.nix b/pkgs/by-name/tt/ttwatch/package.nix
index 03913b58134b..1fce9718389f 100644
--- a/pkgs/by-name/tt/ttwatch/package.nix
+++ b/pkgs/by-name/tt/ttwatch/package.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation {
     chmod +x $out/bin/ttbin2mysports
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/ryanbinns/ttwatch";
     description = "Linux TomTom GPS Watch Utilities";

From eb4e221dba63763c8d052890a14af346284286f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 13:35:23 +0000
Subject: [PATCH 096/103] netassert: 2.0.4 -> 2.1.0

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

diff --git a/pkgs/by-name/ne/netassert/package.nix b/pkgs/by-name/ne/netassert/package.nix
index adb140612983..c03b11e851c3 100644
--- a/pkgs/by-name/ne/netassert/package.nix
+++ b/pkgs/by-name/ne/netassert/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "netassert";
-  version = "2.0.4";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "controlplaneio";
     repo = "netassert";
     rev = "v${version}";
-    hash = "sha256-72LwWzn9sQNbtPj8X0WsR0j0Cs0s00ogcYfQqULTffw=";
+    hash = "sha256-9uzidE/b+7UWNMAknxTdeWYKLEjWbV0V9hab18w+E10=";
   };
   vendorHash = "sha256-JuyE1pYlTIeG3IGOsvYgQN1lTAb7NWytkp/Ibh91QgA=";
 

From a0c6dcede70b5247baa32bebf7a1f323d8f47d8f Mon Sep 17 00:00:00 2001
From: bahrom04 <magdiyevbahrom@gmail.com>
Date: Thu, 25 Sep 2025 18:27:59 +0500
Subject: [PATCH 097/103] hunspellDict.uz_UZ: init at 0.1.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

choer: Update pkgs/by-name/hu/hunspell/dictionaries.nix
Co-Authored-By: Gaétan Lepage <gaetan@glepage.com>
---
 pkgs/by-name/hu/hunspell/dictionaries.nix | 27 +++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/pkgs/by-name/hu/hunspell/dictionaries.nix b/pkgs/by-name/hu/hunspell/dictionaries.nix
index 63c24cabe9bb..487ebe3ec86c 100644
--- a/pkgs/by-name/hu/hunspell/dictionaries.nix
+++ b/pkgs/by-name/hu/hunspell/dictionaries.nix
@@ -821,6 +821,33 @@ rec {
     };
   };
 
+  # UZBEK
+  uz_UZ = uz-uz;
+  uz-uz = mkDict rec {
+    pname = "hunspell-dict-uz-uz";
+    version = "0.1.0";
+
+    src = fetchFromGitHub {
+      owner = "uzbek-net";
+      repo = "uz-hunspell";
+      tag = version;
+      hash = "sha256-EUYhnUWUy45AYGH+HoxaFFCBVnotsIm4GlpMBgnHxdo=";
+    };
+
+    shortName = "uz-uz";
+    dictFileName = "uz_UZ";
+    readmeFile = "README.md";
+
+    meta = {
+      description = "Hunspell dictionary for Uzbek";
+      homepage = "https://github.com/uzbek-net/uz-hunspell";
+      license = with lib.licenses; [
+        gpl3Plus
+      ];
+      teams = [ lib.teams.uzinfocom ];
+    };
+  };
+
   # RUSSIAN
 
   ru_RU = ru-ru;

From 7bf1b4d04a753c949d3a1fe9f0945a36fcd18045 Mon Sep 17 00:00:00 2001
From: "Luca A." <me@lucaa.to>
Date: Fri, 10 Oct 2025 20:52:59 +0200
Subject: [PATCH 098/103] nixos/forgejo: add age setting to automatic dump

Currently dump are added to the directory but not cleaned up.
This setting allows the user to customize the cleanup age of dumps.
---
 doc/release-notes/rl-2511.section.md    |  2 ++
 nixos/modules/services/misc/forgejo.nix | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 1d469c87dc7d..6b43ed98efc0 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -121,6 +121,8 @@
 
 - Zig 0.12 has been removed.
 
+- `services.forgejo.dump.age` now defaults to `4w`, which deletes dumps older than 4 weeks. This new behaviour could result in older backups being deleted.
+
 - `ansible-later` has been removed because it was discontinued by the author.
 
 - `k3s` airgap images passthru attributes have changed:
diff --git a/nixos/modules/services/misc/forgejo.nix b/nixos/modules/services/misc/forgejo.nix
index 0b49cb6d726d..ceee3e080eb5 100644
--- a/nixos/modules/services/misc/forgejo.nix
+++ b/nixos/modules/services/misc/forgejo.nix
@@ -285,6 +285,19 @@ in
           description = "Filename to be used for the dump. If `null` a default name is chosen by forgejo.";
           example = "forgejo-dump";
         };
+
+        age = mkOption {
+          type = types.str;
+          default = "4w";
+          example = "5d";
+          description = ''
+            Age of backup used to decide what files to delete when cleaning.
+            If a file or directory is older than the current time minus the age field, it is deleted.
+
+            The format is described in
+            {manpage}`tmpfiles.d(5)`.
+          '';
+        };
       };
 
       lfs = {
@@ -596,7 +609,7 @@ in
     };
 
     systemd.tmpfiles.rules = [
-      "d '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} ${cfg.dump.age} -"
       "z '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
       "d '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"
       "z '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"

From d0086b7bff80a0b8a73281299ed520e56cd8d188 Mon Sep 17 00:00:00 2001
From: jasonxue <jason@xuechunxi.com>
Date: Mon, 20 Oct 2025 22:28:50 +0800
Subject: [PATCH 099/103] rbw: add nushell completion

---
 pkgs/by-name/rb/rbw/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix
index 68ae87c74759..4028ed210d5a 100644
--- a/pkgs/by-name/rb/rbw/package.nix
+++ b/pkgs/by-name/rb/rbw/package.nix
@@ -11,17 +11,14 @@
   withFzf ? false,
   fzf,
   perl,
-
   # rbw-rofi
   withRofi ? false,
   rofi,
   xclip,
-
   # pass-import
   withPass ? false,
   pass,
 }:
-
 rustPlatform.buildRustPackage rec {
   pname = "rbw";
   version = "1.14.1";
@@ -52,6 +49,7 @@ rustPlatform.buildRustPackage rec {
     installShellCompletion --cmd rbw \
       --bash <($out/bin/rbw gen-completions bash) \
       --fish <($out/bin/rbw gen-completions fish) \
+      --nushell <($out/bin/rbw gen-completions nushell) \
       --zsh <($out/bin/rbw gen-completions zsh)
   ''
   + lib.optionalString withFzf ''

From 193954e05fab4f0944897d3d757f270405a9b612 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Mon, 20 Oct 2025 10:29:54 -0400
Subject: [PATCH 100/103] nodePackages.meat: drop

Upstream repo has been removed, and no one seems to be using it, so drop
the package
---
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 154 ------------------
 3 files changed, 1 insertion(+), 155 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 208e274d4468..cb854d38bf89 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -158,6 +158,7 @@ mapAliases {
   inherit (pkgs) markdownlint-cli2; # added 2023-08-22
   inherit (pkgs) mathjax-node-cli; # added 2023-11-02
   mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21
+  meat = throw "meat was removed because it was abandoned upstream."; # Added 2025-10-20
   inherit (pkgs) mermaid-cli; # added 2023-10-01
   meshcommander = throw "meshcommander was removed because it was abandoned upstream"; # added 2024-12-02
   musescore-downloader = pkgs.dl-librescore; # added 2023-08-19
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index a78e8402f509..8c65f3108b44 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -105,7 +105,6 @@
 , "madoko"
 , "mastodon-bot"
 , "mathjax"
-, "meat"
 , "mocha"
 , "multi-file-swagger"
 , "nijs"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 34c579d2fd73..4ea05e93a096 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -8888,15 +8888,6 @@ let
         sha512 = "LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==";
       };
     };
-    "async-0.1.22" = {
-      name = "async";
-      packageName = "async";
-      version = "0.1.22";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz";
-        sha512 = "2tEzliJmf5fHNafNwQLJXUasGzQCVctvsNkXmnlELHwypU0p08/rHohYvkqKIjyXpx+0rkrYv6QbhJ+UF4QkBg==";
-      };
-    };
     "async-0.2.10" = {
       name = "async";
       packageName = "async";
@@ -11894,15 +11885,6 @@ let
         sha512 = "MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g==";
       };
     };
-    "commander-0.6.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
-        sha512 = "0fLycpl1UMTGX257hRsu/arL/cUbcvQM4zMKwvLvzXtfdezIV4yotPS2dYtknF+NmEfWSoCEF6+hj9XLm/6hEw==";
-      };
-    };
     "commander-10.0.1" = {
       name = "commander";
       packageName = "commander";
@@ -12245,15 +12227,6 @@ let
         sha512 = "yk7/5PN5im4qwz0WFZW3PXnzHgPu9mX29Y8uZ3aefe2lBPC1FYttWZRcaW9fKkT0pBCJyuQ2HfbmPVaODi9jcQ==";
       };
     };
-    "connect-1.9.2" = {
-      name = "connect";
-      packageName = "connect";
-      version = "1.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz";
-        sha512 = "6Z9RPjQOHjaI47gK385djHVv7SEkRm1Y9AAvBhiI7gSXpO5sFktTkAD+dkbcaiEo2xaNlS1KIJU3XRxqbPLx6w==";
-      };
-    };
     "connect-3.6.6" = {
       name = "connect";
       packageName = "connect";
@@ -16359,15 +16332,6 @@ let
         sha512 = "8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==";
       };
     };
-    "express-2.5.11" = {
-      name = "express";
-      packageName = "express";
-      version = "2.5.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz";
-        sha512 = "gc3jJ0P3Bh1Zjkxe0ICSNmjhDvYWKiXfQIdDWuRPr8S4IZAZexzJHjrzNz56LsRKHTL0OiXQq602GfwZjZ8xPQ==";
-      };
-    };
     "express-4.21.2" = {
       name = "express";
       packageName = "express";
@@ -17520,15 +17484,6 @@ let
         sha512 = "buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==";
       };
     };
-    "formidable-1.0.17" = {
-      name = "formidable";
-      packageName = "formidable";
-      version = "1.0.17";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz";
-        sha512 = "95MFT5qipMvUiesmuvGP1BI4hh5XWCzyTapiNJ/k8JBQda7rPy7UCWYItz2uZEdTgGNy1eInjzlL9Wx1O9fedg==";
-      };
-    };
     "formidable-1.2.6" = {
       name = "formidable";
       packageName = "formidable";
@@ -22038,15 +21993,6 @@ let
         sha512 = "OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==";
       };
     };
-    "jade-0.27.0" = {
-      name = "jade";
-      packageName = "jade";
-      version = "0.27.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jade/-/jade-0.27.0.tgz";
-        sha512 = "VPrAZm2V9+0tqISXjca7ipt2LPMpLwnFZFM+1VG7q2LmiUQp1imCa++FgSqWxIs4W5gUTp/xlrUlx5xyFHYE6w==";
-      };
-    };
     "jake-10.9.2" = {
       name = "jake";
       packageName = "jake";
@@ -26062,15 +26008,6 @@ let
         sha512 = "/wk9d4Z6/9ZvoEH/6BI4TrTCgmkpZPuSRN/6fI9aUHOfXdNTuj/VhLS7d+NqG26bi6L9YmGXutVYvWC8zQ0qtA==";
       };
     };
-    "mime-1.2.4" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz";
-        sha512 = "u4y8WFj7SnfbHxyzCMSV2nL/GKbfZ+lidPf1V4/XUKCJ49N6ttQWp/xnqpbMQEx3naBSt93i2qtPLFj/mjPDaA==";
-      };
-    };
     "mime-1.6.0" = {
       name = "mime";
       packageName = "mime";
@@ -27485,15 +27422,6 @@ let
         sha512 = "TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA==";
       };
     };
-    "node.extend-1.0.0" = {
-      name = "node.extend";
-      packageName = "node.extend";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz";
-        sha512 = "Jqb2SFiBSqeOUlxHbjpinUo3ZXBkVmCqha8t1REgyo4rYx/cXh+pttzlL2vXIjG63VdklCrwrnqwIXsVBRMrSA==";
-      };
-    };
     "nomnom-1.8.1" = {
       name = "nomnom";
       packageName = "nomnom";
@@ -28349,15 +28277,6 @@ let
         sha512 = "0YZJaT5UFMnaj8ol0U3gG9pVbS27mG9rq/G+ED44GiFsi/Jb3mOtOXScFJXd7tdkOnXHS7oUCp1m7DUQ1BC6sA==";
       };
     };
-    "open-0.0.2" = {
-      name = "open";
-      packageName = "open";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-0.0.2.tgz";
-        sha512 = "gnt725gcNKTaMSul17WNEz4I3rvgVotCq30TkU9thlEZaRJ7ivOV0vEoRupkGU/NJ2+qxqAmVbSK94rwuOWXnw==";
-      };
-    };
     "open-0.0.5" = {
       name = "open";
       packageName = "open";
@@ -29924,15 +29843,6 @@ let
         sha512 = "nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==";
       };
     };
-    "pkginfo-0.2.3" = {
-      name = "pkginfo";
-      packageName = "pkginfo";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz";
-        sha512 = "7W7wTrE/NsY8xv/DTGjwNIyNah81EQH0MWcTzrHL6pOpMocOGZc0Mbdz9aXxSrp+U0mSmkU8jrNCDCfUs3sOBg==";
-      };
-    };
     "pkginfo-0.3.1" = {
       name = "pkginfo";
       packageName = "pkginfo";
@@ -30815,15 +30725,6 @@ let
         sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==";
       };
     };
-    "qs-0.4.2" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz";
-        sha512 = "VAtfWeUtlBOnGiWFok2vOIMmwumiLmpqXDcXQcAEIQmLYgDbjrkHrcFBfth+YVDeRsz7jX44dhJr7IBJR0t/FQ==";
-      };
-    };
     "qs-3.1.0" = {
       name = "qs";
       packageName = "qs";
@@ -32480,15 +32381,6 @@ let
         sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
       };
     };
-    "request-2.9.203" = {
-      name = "request";
-      packageName = "request";
-      version = "2.9.203";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz";
-        sha512 = "OWtna9w7yRI/gcfu3VaURgIwE1FHgbz5+fHGQ9GJTHcJ4+uvHnDjXd+N7mVDOv5+1fp1CRPzUSY2wcM345Z2Fw==";
-      };
-    };
     "request-compose-2.1.7" = {
       name = "request-compose";
       packageName = "request-compose";
@@ -39932,15 +39824,6 @@ let
         sha512 = "IHpzORub7kYlb8A43Iig3reOvlcBJGX9gZ0WycHhghHtA65X0LYnMRuJs+aH1abVnMJztQkvQNlltnbPi5aGIA==";
       };
     };
-    "winston-0.6.2" = {
-      name = "winston";
-      packageName = "winston";
-      version = "0.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
-        sha512 = "BzHNq8X415XGFkGPT+ACKTj95ghSAbR4eThAtKg4OC4PYVn5FLIdTETYUv76f4QxUcG1ps6yqnbO1K/81hGIzQ==";
-      };
-    };
     "winston-0.8.0" = {
       name = "winston";
       packageName = "winston";
@@ -55374,43 +55257,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  meat = nodeEnv.buildNodePackage {
-    name = "meat";
-    packageName = "meat";
-    version = "0.3.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/meat/-/meat-0.3.4.tgz";
-      sha512 = "qaXHW5HwzV9+J4PgnqQ52i9C6V1fhiwQ4skSn+UCQdyPB4H1XYF+0UKIq1kFHINMFhDZ8Lz0WsQjOV09fiImpQ==";
-    };
-    dependencies = [
-      sources."async-0.1.22"
-      sources."colors-0.6.2"
-      sources."commander-0.6.1"
-      sources."connect-1.9.2"
-      sources."cycle-1.0.3"
-      sources."express-2.5.11"
-      sources."eyes-0.1.8"
-      sources."formidable-1.0.17"
-      sources."jade-0.27.0"
-      sources."mime-1.2.4"
-      sources."mkdirp-0.3.0"
-      sources."node.extend-1.0.0"
-      sources."open-0.0.2"
-      sources."pkginfo-0.2.3"
-      sources."qs-0.4.2"
-      sources."request-2.9.203"
-      sources."stack-trace-0.0.10"
-      sources."winston-0.6.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined";
-      homepage = "https://bitbucket.org/aahmed/meat";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";

From f64b99e4b07d8a1830d1467ee31df90daeb4e3ea Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Mon, 6 Oct 2025 21:06:03 +0400
Subject: [PATCH 101/103] simple-binary-encoding: init at 1.36.0

SBE is an OSI layer 6 presentation for encoding and decoding binary
application messages for low-latency financial applications.
---
 .../si/simple-binary-encoding/deps.json       | 580 ++++++++++++++++++
 .../si/simple-binary-encoding/package.nix     | 132 ++++
 .../si/simple-binary-encoding/sbetool.sh      |  51 ++
 .../si/simple-binary-encoding/update.sh       |  24 +
 4 files changed, 787 insertions(+)
 create mode 100644 pkgs/by-name/si/simple-binary-encoding/deps.json
 create mode 100644 pkgs/by-name/si/simple-binary-encoding/package.nix
 create mode 100755 pkgs/by-name/si/simple-binary-encoding/sbetool.sh
 create mode 100755 pkgs/by-name/si/simple-binary-encoding/update.sh

diff --git a/pkgs/by-name/si/simple-binary-encoding/deps.json b/pkgs/by-name/si/simple-binary-encoding/deps.json
new file mode 100644
index 000000000000..a5d6de6710ac
--- /dev/null
+++ b/pkgs/by-name/si/simple-binary-encoding/deps.json
@@ -0,0 +1,580 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://plugins.gradle.org/m2": {
+  "com/fasterxml#oss-parent/55": {
+   "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0="
+  },
+  "com/fasterxml#oss-parent/61": {
+   "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ="
+  },
+  "com/fasterxml#oss-parent/68": {
+   "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.19.1": {
+   "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.19.2": {
+   "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U="
+  },
+  "com/fasterxml/woodstox#woodstox-core/7.1.0": {
+   "jar": "sha256-gSZpIKHNxHMGqKK0cmyZ7Imz+/McJHDk9eR32dhXyp8=",
+   "pom": "sha256-+ZXFCx0gl18KjW8OUyK8jRPHiuPcGCcXdoQUlypmzIU="
+  },
+  "com/github/ben-manes#gradle-versions-plugin/0.53.0": {
+   "jar": "sha256-fystvdI5f/PwQ9e2YuwNYbqr7TqqerImB6702Y7z+mI=",
+   "module": "sha256-KLvVxzKZ1dGYcjzX8klS4b9RQJXE6OrpsisVQaicEII=",
+   "pom": "sha256-aPVU+CLT1aKhQrA6XZ9Wa5FXdPtjnYwds7zfmTyeQI0="
+  },
+  "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.53.0": {
+   "pom": "sha256-yWBPdJaskfaW5HRY2KLWt91U0MqkNn88GspmphyDcvQ="
+  },
+  "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.2.2": {
+   "pom": "sha256-ZLCuyyPFfukfzPJXx4F8uyxpXQT565nM+9pth/TFlOk="
+  },
+  "com/gradleup/shadow#shadow-gradle-plugin/9.2.2": {
+   "jar": "sha256-rqYDnab2KTcMEKFxcOjz2o1nPhS++FgL0aZc3kSQc9A=",
+   "module": "sha256-4tXqtRULxjBI6WcI6t6/0XbmOfIsgFFoBVszcQdo3YI=",
+   "pom": "sha256-bO3IWZV0n5H/XNb8Z3H6PfZ4qlZSIl5uoFjNnXmVjGo="
+  },
+  "com/squareup/moshi#moshi-kotlin/1.12.0": {
+   "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=",
+   "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=",
+   "pom": "sha256-gwdSmAK8nLCHd24CabvdaSBG+kpz8ZDVgUpaj5JmJ24="
+  },
+  "com/squareup/moshi#moshi/1.12.0": {
+   "jar": "sha256-7pCR4dGlkm+ptN8mQsH7e7lq7Ahjm2IZwZ4LhyTUJHU=",
+   "module": "sha256-uGqTFURxITGVpEL4XKBG55oAHG1EbEHU0WiTbahW6+I=",
+   "pom": "sha256-YbyUJDqTc9mUini25xAAl161EPtvf0aoHq/N3TgeR3k="
+  },
+  "com/squareup/okhttp3#okhttp/4.12.0": {
+   "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=",
+   "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=",
+   "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg="
+  },
+  "com/squareup/okio#okio-jvm/3.6.0": {
+   "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=",
+   "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=",
+   "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8="
+  },
+  "com/squareup/okio#okio/3.6.0": {
+   "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=",
+   "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU="
+  },
+  "commons-io#commons-io/2.20.0": {
+   "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=",
+   "pom": "sha256-vb34EHLBkO6aixgaXFj1vZF6dQ+xOiVt679T9dvTOio="
+  },
+  "jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
+   "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
+  },
+  "jakarta/platform#jakartaee-api-parent/9.1.0": {
+   "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA="
+  },
+  "org/apache#apache/35": {
+   "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg="
+  },
+  "org/apache/ant#ant-launcher/1.10.15": {
+   "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=",
+   "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU="
+  },
+  "org/apache/ant#ant-parent/1.10.15": {
+   "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA="
+  },
+  "org/apache/ant#ant/1.10.15": {
+   "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=",
+   "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY="
+  },
+  "org/apache/commons#commons-parent/85": {
+   "pom": "sha256-0Yn/LAAn6Wu2XTHm8iftKvlmFps2rx6XPdW6CJJtx7U="
+  },
+  "org/apache/groovy#groovy-bom/4.0.27": {
+   "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=",
+   "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs="
+  },
+  "org/apache/logging/log4j#log4j-api/2.25.2": {
+   "jar": "sha256-n9Zsn+C+oG+pZmwUeYmkbK+qkrSoh1NpfTlFzEMzjLs=",
+   "module": "sha256-WPeF66u6zDA/Ow5aSF91X9qzKQ9p5JsDT4lj0ngjZV4=",
+   "pom": "sha256-CVYJaiUCQIyVioMXTytqV9yy5bB7uRTISHMrRLirvcM="
+  },
+  "org/apache/logging/log4j#log4j-bom/2.25.2": {
+   "pom": "sha256-Tym32cLZcP0qZpcXa/fd3EFQifYNaW0ov98xsk6S8Rw="
+  },
+  "org/apache/logging/log4j#log4j-core/2.25.2": {
+   "jar": "sha256-5Q23cBQw/5B5gYUO9SekHVGlPdABf1Oghgr8urhXAnc=",
+   "module": "sha256-JRQSc3eFDwR83jJbc7efriEzKSK+tkmiUzr9CEIlihE=",
+   "pom": "sha256-L/9GPTmclAgtmCLCG/v0cOEFHbt9S0XyWw54G8Xg9BI="
+  },
+  "org/apache/logging/log4j#log4j/2.25.2": {
+   "pom": "sha256-HYBXBY0LBcj3clyhrbpoc5y+rHWJjsoGpIymEVRsA+w="
+  },
+  "org/apache/maven#maven-api-annotations/4.0.0-rc-3": {
+   "jar": "sha256-XTSQ9yrTp+gr6IsnYp83xZ/SUxuuURw7E4ZkINXYYr0=",
+   "pom": "sha256-83HUqkRgxMwP4x0W20WC2+eGHvzS5nqvGEPimR8Xx0I="
+  },
+  "org/apache/maven#maven-api-xml/4.0.0-rc-3": {
+   "jar": "sha256-8+OzZCNzxp1MdEHUDroHZeHXROmStiGURS9epUUd/bo=",
+   "pom": "sha256-XxSOOelo08K3a4426hN3mJ8KeetDpqWa5yPZElzLXGE="
+  },
+  "org/apache/maven#maven-xml/4.0.0-rc-3": {
+   "jar": "sha256-BjxCTLR/dRZBJdXuolFnuTHdaU40Jo1QJHN050IR3Rk=",
+   "pom": "sha256-nZZekiyqwDYkl9J7v6UaRI+UydcTYjZnnGhSNwb3KYI="
+  },
+  "org/codehaus/plexus#plexus-utils/4.0.2": {
+   "jar": "sha256-iVcnTnX+LCeLFCjdFqDa7uHdOBUstu/4Fhd6wo/Mtpc=",
+   "pom": "sha256-UVHBO918w6VWlYOn9CZzkvAT/9MRXquNtfht5CCjZq8="
+  },
+  "org/codehaus/plexus#plexus-xml/4.1.0": {
+   "jar": "sha256-huan8HSE6LH3r2bZfTujyz1pKlRhtLHQordnDPV0jok=",
+   "pom": "sha256-uKO6h7WsMXVJUEngIXiIDKJczJ6rGkR9OKGbU3xXgk4="
+  },
+  "org/codehaus/plexus#plexus/20": {
+   "pom": "sha256-p7WUsAL8eRczyOlEcNCQRfT9aak61cN1dS8gV/hGM7Q="
+  },
+  "org/codehaus/woodstox#stax2-api/4.2.2": {
+   "jar": "sha256-phxI1VPvrXi8Af/8SsUovruuZMuuwXCypeOc9h61Gr4=",
+   "pom": "sha256-TpAuxVb8ZZi0HClS7BVz7cgVA35zMOxJIuq2GUImhuI="
+  },
+  "org/eclipse/ee4j#project/1.0.7": {
+   "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
+  },
+  "org/jdom#jdom2/2.0.6.1": {
+   "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=",
+   "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M="
+  },
+  "org/jetbrains#annotations/13.0": {
+   "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
+   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
+  },
+  "org/jetbrains/kotlin#kotlin-bom/2.0.21": {
+   "pom": "sha256-1Ufg3iVCLZY+IsepRPO13pQ8akmClbUtv/49KJXNm+g="
+  },
+  "org/jetbrains/kotlin#kotlin-metadata-jvm/2.2.20": {
+   "jar": "sha256-hSTqyQ9+jg8TZog/LGyCDJO/ph3z12hXyNPoA89nMV0=",
+   "pom": "sha256-e2qAtqLSZ2oEIvaWg4EyMVQlUfYbMgxochz7nh9ZCdA="
+  },
+  "org/jetbrains/kotlin#kotlin-reflect/2.0.21": {
+   "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=",
+   "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.21": {
+   "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=",
+   "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-common/2.2.20": {
+   "module": "sha256-ND2ZRn/LRNPvsSorpwNmTKQ/Oj8m//k8jTGyJoOttX4=",
+   "pom": "sha256-/Xicsy4kEOzGg7hzn3t1AD0J2jMzDD+KZcJp22svbHU="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.0.21": {
+   "jar": "sha256-cS9IB2Dt7uSKhDaea+ifarUjdUCLsso74U72Y/cr7jE=",
+   "pom": "sha256-TXE+dTi5Kh15cX6nHPHQI1eoThFFDEbLkuMgee40224="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.0.21": {
+   "jar": "sha256-FcjArLMRSDwGjRaXUBllR0tw39gKx5WA7KOgPPUeSh0=",
+   "pom": "sha256-MQ1tXGVBPjEQuUAr2AdfyuP0vlGdH9kHMTahj+cnvFc="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": {
+   "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=",
+   "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/2.2.20": {
+   "jar": "sha256-iDbM/9NYX63amQEkSyDUKQHS881YEFjYQ04v+rzzo+c=",
+   "module": "sha256-yRj1IU0CGnLjdn8nVul9EDpSbgTxQj2jZj79+1hH25U=",
+   "pom": "sha256-SosIbmQxvPYjY39Ssv8ZLhrbkTg4dC5cDupwqN7kKcQ="
+  },
+  "org/junit#junit-bom/5.11.4": {
+   "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=",
+   "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU="
+  },
+  "org/junit#junit-bom/5.13.1": {
+   "module": "sha256-M8B6uXJHkKblhZugfWkResUwQ5ckVFqBxBeeMnLHXeg=",
+   "pom": "sha256-+mhFHqgwVy7UP/5R11tqBfel5mWmAqUfSda+AgY6ZfM="
+  },
+  "org/junit#junit-bom/5.13.2": {
+   "module": "sha256-7WfhUiFASsQrXlmBAu33Yt1qlS3JUAHpwMTudKBOgoM=",
+   "pom": "sha256-Q7EQT7P9TvS3KpdR1B4Jwp8AHIvgD/OXIjjcFppzS0k="
+  },
+  "org/mockito#mockito-bom/4.11.0": {
+   "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
+  },
+  "org/ow2#ow2/1.5.1": {
+   "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+  },
+  "org/ow2/asm#asm-commons/9.8": {
+   "jar": "sha256-MwGhwctMWfzFKSZI2sHXxa7UwPBn376IhzuM3+d0BPQ=",
+   "pom": "sha256-95PnjwH3A3F9CUcuVs3yEv4piXDIguIRbo5Un7bRQMI="
+  },
+  "org/ow2/asm#asm-tree/9.8": {
+   "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=",
+   "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c="
+  },
+  "org/ow2/asm#asm/9.8": {
+   "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=",
+   "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o="
+  },
+  "org/springframework#spring-framework-bom/5.3.39": {
+   "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=",
+   "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs="
+  },
+  "org/vafer#jdependency/2.13": {
+   "jar": "sha256-FFxghksjansSllUNMaSap1rWEpWBOO4NRxufywu+3T4=",
+   "pom": "sha256-3Ip1HRudXz2imiihDmKF62+3Q/TW46MleRsZX9B4eXs="
+  }
+ },
+ "https://repo.maven.apache.org/maven2": {
+  "com/google/code/findbugs#jsr305/3.0.2": {
+   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+  },
+  "com/google/errorprone#error_prone_annotations/2.41.0": {
+   "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=",
+   "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4="
+  },
+  "com/google/errorprone#error_prone_parent/2.41.0": {
+   "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI="
+  },
+  "com/google/guava#failureaccess/1.0.3": {
+   "jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=",
+   "pom": "sha256-xUvv839tQtQ+FHItVKUiya1R75f8W3knfmKj6/iC87s="
+  },
+  "com/google/guava#guava-parent/26.0-android": {
+   "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
+  },
+  "com/google/guava#guava-parent/33.4.0-android": {
+   "pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM="
+  },
+  "com/google/guava#guava-parent/33.5.0-jre": {
+   "pom": "sha256-aHGeaHxuTJ/z4P7L73vSCJbw9PezFHQ+0zxy+WJWghU="
+  },
+  "com/google/guava#guava/33.5.0-jre": {
+   "jar": "sha256-HjAfDFKsJIsLFP3D0SKDx3JS1Nb0hSHVcufYxMLMSsc=",
+   "module": "sha256-d+1CyMiyzru5OsngdUP/ZBiqJL24UXWAz1Mk6aZRCVY=",
+   "pom": "sha256-BHj6eKkIs8Mf5td76ZeKqmIeKhgduEAH49OzdCSirGE="
+  },
+  "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
+   "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
+   "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
+  },
+  "com/google/j2objc#j2objc-annotations/3.1": {
+   "jar": "sha256-hNOhUFGEhfgUDqmbiphWVnSWKfZDPJK4DHWzaro7CZs=",
+   "pom": "sha256-FFcIOFAANPwbR8ggXOHJ1rJVwczdLRr9zcv3XomySjM="
+  },
+  "com/puppycrawl/tools#checkstyle/11.1.0": {
+   "jar": "sha256-AdLE4WAjVbKjTd4UCI5lqv9OvhZ4FciGmQi1u/Cn88k=",
+   "pom": "sha256-CtCVc7hBSEy0ade4xc7J4onVgk2cv8WzlhhefWkK5A4="
+  },
+  "commons-beanutils#commons-beanutils/1.11.0": {
+   "jar": "sha256-nkS6aOyaPyEob6Kou7ADtzXA9pEBu0MUS3n0+KqnRwk=",
+   "pom": "sha256-z/nqsddRJkvXdbbj6+0WUHlMrJzYvhxBa0jjpcYTnZM="
+  },
+  "commons-codec#commons-codec/1.15": {
+   "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=",
+   "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g="
+  },
+  "commons-collections#commons-collections/3.2.2": {
+   "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=",
+   "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws="
+  },
+  "info/picocli#picocli/4.7.7": {
+   "jar": "sha256-+G4w//0Q0rE7jKqNSyN6fuYfL/zPWxlB3nGLdl0jW/g=",
+   "pom": "sha256-GxjTYxNN9mYx0rn3R1Bo1zQiW6OJzfkIKhvYvakNV9M="
+  },
+  "net/bytebuddy#byte-buddy-agent/1.17.7": {
+   "jar": "sha256-qbqIfcolKtYbfVFTKU805vO99LJzawQ3PRNhWmlfwP8=",
+   "pom": "sha256-gU7kLWsBF/S40etrHWLBbbTAtZfYOzrY2qV4HrFF19w="
+  },
+  "net/bytebuddy#byte-buddy-parent/1.17.7": {
+   "pom": "sha256-ilfiDczgDaccM+8+GdndhY/p0gQsouK8onhxcA1SaYw="
+  },
+  "net/bytebuddy#byte-buddy/1.17.7": {
+   "jar": "sha256-NXXcuKmPr5Q9PBWVxHoWBHxPzoqD67smJi8aL2dUY1c=",
+   "pom": "sha256-7n+6hWnDu1wekeWBL9n0oPMb4n5WjVNU4a39GRGfl7M="
+  },
+  "net/jqwik#jqwik-api/1.9.3": {
+   "jar": "sha256-S85+gL622dcJKnmfqKUJ12zDHbsgyTiplSllwV0d2bI=",
+   "module": "sha256-aZhEFuoun3/eQM+smD0vVA06N+l2b9OwoG+tqPm0z/I=",
+   "pom": "sha256-X8HYuNdzIklBnz1sHumwBpvAP2oQpoG4FUMIfDh+nFs="
+  },
+  "net/jqwik#jqwik-engine/1.9.3": {
+   "jar": "sha256-uFWS7njjAjnM/cp6E0+RjulOvsUa0poxP8mmdtl7Pt4=",
+   "module": "sha256-LGhHnr2p4zS8kDOr0u8ic1OAjyARTxl5R7XHuWRquOU=",
+   "pom": "sha256-LsR4IRbldQZi945AbP96dhNmAVzsHhwBF8ZX1qF6Q1I="
+  },
+  "net/jqwik#jqwik-time/1.9.3": {
+   "jar": "sha256-n9CQIdjwPUSZBFe/MJXPCq800nhdEQj/IlkChsIzs+U=",
+   "module": "sha256-wrBWV2yHZ7/Nfv3ZgokPvHHmCPtcnID8FFz+5q3uqiQ=",
+   "pom": "sha256-9d95Pt3FV4X1Us/XFsXrZ62I37UWKIuXs/4ZkxUEtNE="
+  },
+  "net/jqwik#jqwik-web/1.9.3": {
+   "jar": "sha256-au6dWDwf+e/jGbL6C8nXX8YW3m0fJA3b0q+eq9pIPb4=",
+   "module": "sha256-OMhhMMi4bBZXtPglbgZe4IVR98XOco0aW+j2MTOxRVQ=",
+   "pom": "sha256-w7/witvsCnsi/QOuNDawNvCPOO1tyE+NI07futcKmEA="
+  },
+  "net/jqwik#jqwik/1.9.3": {
+   "jar": "sha256-Vikx4WZzCBgAVqjOhXkfcauMN8qO/CAGoWO6XWUOX3M=",
+   "module": "sha256-aBMW+FbbTqPKyPzO2BESf8HXAWh15bUKpKVQJFE6k9c=",
+   "pom": "sha256-GQm+BQi5ZZaus0c8BAuptGKSYreS5FRhXHz4cf/hmsA="
+  },
+  "net/sf/jopt-simple#jopt-simple/5.0.4": {
+   "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=",
+   "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU="
+  },
+  "net/sf/saxon#Saxon-HE/12.9": {
+   "jar": "sha256-jzqSFqU3NnEyKT6su6nfBi6s6PixahhK9Z4uSDnUzUE=",
+   "pom": "sha256-+IDp0dQAyZwYkvWWTl/JIN0d7wViI1m5sFjzK1tCaXU="
+  },
+  "org/agrona#agrona/2.3.0": {
+   "jar": "sha256-8mIblkMT6G6sRqvz6CL3VyFYO0bjssgDuS5HZaoD8+k=",
+   "module": "sha256-2wb7uwExy7cFsAgm6itku9binI/bGC7Zcejo4kBU+D0=",
+   "pom": "sha256-7KN5DcPZVKrXneWuqueAkKE5xrRNs0vCaLAhxwke+VY="
+  },
+  "org/antlr#antlr4-master/4.13.2": {
+   "pom": "sha256-Ct2gJmhYc/ZRNgF4v/xEbO7kgzCBc5466dbo8H6NkCo="
+  },
+  "org/antlr#antlr4-runtime/4.13.2": {
+   "jar": "sha256-3T6KE6LWab+E+42DTeNc5IdfJxV2mNIGJB7ISIqtyvc=",
+   "pom": "sha256-A84HonlsURsMlNwU/YbM3W44KMV5Z60jg94wTg0Runk="
+  },
+  "org/apache#apache/16": {
+   "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4="
+  },
+  "org/apache#apache/19": {
+   "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8="
+  },
+  "org/apache#apache/21": {
+   "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
+  },
+  "org/apache#apache/23": {
+   "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
+  },
+  "org/apache#apache/34": {
+   "pom": "sha256-NnGunU0GKuO7mFcxx2CIuy9vfXJU4tME7p9pC5dlEyg="
+  },
+  "org/apache#apache/6": {
+   "pom": "sha256-Eu21CW4T9Aw2LQvUCQJYn6lYZQUSP6Jnmc5QsRb6W7M="
+  },
+  "org/apache/commons#commons-lang3/3.8.1": {
+   "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=",
+   "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU="
+  },
+  "org/apache/commons#commons-math3/3.6.1": {
+   "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=",
+   "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA="
+  },
+  "org/apache/commons#commons-parent/39": {
+   "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac="
+  },
+  "org/apache/commons#commons-parent/45": {
+   "pom": "sha256-nIhiPs+pHwEsZz7kYiwO60Nn5eDSItlg92zSCLGk/aY="
+  },
+  "org/apache/commons#commons-parent/47": {
+   "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc="
+  },
+  "org/apache/commons#commons-parent/52": {
+   "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+  },
+  "org/apache/commons#commons-parent/84": {
+   "pom": "sha256-kjn7lxAdsnBw5Jg9ENM6DpHPZ2ytkb9TgVQiw1Ye+bE="
+  },
+  "org/apache/commons#commons-text/1.3": {
+   "jar": "sha256-gYWzpTEQktg+0fGEwtCTsxBdcmu9doZ8MrNRFUK7mag=",
+   "pom": "sha256-3usrqXAeSV3DHTJjPrhrlLJLCpbg3Gf7h+cGLxUwJ6o="
+  },
+  "org/apache/geronimo/genesis#genesis-default-flava/2.0": {
+   "pom": "sha256-CObhRvTiRSZt/53YALEodd0jZ9P2ejSrZgoSbIESFfg="
+  },
+  "org/apache/geronimo/genesis#genesis-java5-flava/2.0": {
+   "pom": "sha256-58U1i7u8J9qlsyf2O8EmUKdd3J+axtS/oSeJvh8sKds="
+  },
+  "org/apache/geronimo/genesis#genesis/2.0": {
+   "pom": "sha256-ue0vndQ0YxFY13MI7lZIYiwinM7OFyLF43ekKWkj2uY="
+  },
+  "org/apache/httpcomponents#httpclient/4.5.13": {
+   "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=",
+   "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw="
+  },
+  "org/apache/httpcomponents#httpcomponents-client/4.5.13": {
+   "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk="
+  },
+  "org/apache/httpcomponents#httpcomponents-core/4.4.14": {
+   "pom": "sha256-IJ7ZMctXmYJS3+AnyqnAOtpiBhNkIylnkTEWX4scutE="
+  },
+  "org/apache/httpcomponents#httpcomponents-parent/11": {
+   "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o="
+  },
+  "org/apache/httpcomponents#httpcore/4.4.14": {
+   "jar": "sha256-+VYgnkUMsdDFF3bfvSPlPp3Y25oSmO1itwvwlEumOyg=",
+   "pom": "sha256-VXFjmKl48QID+eJciu/AWA2vfwkHxu0K6tgexftrf9g="
+  },
+  "org/apache/maven#maven-parent/34": {
+   "pom": "sha256-Go+vemorhIrLJqlZlU7hFcDXnb51piBvs7jHwvRaI38="
+  },
+  "org/apache/maven/doxia#doxia-core/1.12.0": {
+   "jar": "sha256-XknNgnvrvOpYKdOziD0XrRzhXr1jlK61CtUNff2Tn80=",
+   "pom": "sha256-sDiPdIoIheE+fCxFOSH4u53U+1sZBb50VoVHbPNFbqM="
+  },
+  "org/apache/maven/doxia#doxia-logging-api/1.12.0": {
+   "jar": "sha256-mFMGFiwKn0wwnUYQlEfzDwK/b8m8FqPgOdWeHavQGS8=",
+   "pom": "sha256-ndmbQ1AiOEZYUxBpTERjGLFpK6dG7XFzdtWWGaJxI7Q="
+  },
+  "org/apache/maven/doxia#doxia-module-xdoc/1.12.0": {
+   "jar": "sha256-6HMboApO3TSyDv+eSnKcIEXGLLeWw+SRaSYH3kR2qwE=",
+   "pom": "sha256-+2nZW+S1WvLzsKm2jj6OYgY+aVlMH86+cFpaTbCZbSU="
+  },
+  "org/apache/maven/doxia#doxia-modules/1.12.0": {
+   "pom": "sha256-q4/2u0eTz7pZsU+zg/81GjSbEJHQccZrH8vKco1QW9w="
+  },
+  "org/apache/maven/doxia#doxia-sink-api/1.12.0": {
+   "jar": "sha256-XcpqqqnnDYoHZuFD3c+dsJ3l/eD7zHjLY11052TfzKU=",
+   "pom": "sha256-JrUf3babXKbgRM2ii40cGje2+v0M+5v7FakZ3lfGcdU="
+  },
+  "org/apache/maven/doxia#doxia/1.12.0": {
+   "pom": "sha256-LQKgvWTzMbdnzudFWzGTxvuCEQFDoRmFiryWh5il/Ck="
+  },
+  "org/apache/xbean#xbean-reflect/3.7": {
+   "jar": "sha256-EE5em7WmafhnIvMigZYHAPfsjjIJ71GyPrm20j0WKcs=",
+   "pom": "sha256-l5XBUyLF0ZrzNu69nhZPp9WJfEsASn1m4hY1oXPnSKk="
+  },
+  "org/apache/xbean#xbean/3.7": {
+   "pom": "sha256-6nFxMt6EBLYvyQl6HzIVxwXVJdRXvppfEmU63GjDOrc="
+  },
+  "org/apiguardian#apiguardian-api/1.1.2": {
+   "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
+  },
+  "org/checkerframework#checker-qual/3.51.0": {
+   "jar": "sha256-jpFnbckWgEvRL3kJ5/XcB2RsyYIgFHqLX+p/9CvW/0o=",
+   "module": "sha256-MNCupC4IPfcNa/P5WAA0Mhj4nPn6G8MkN6XqcHrvg+w=",
+   "pom": "sha256-VyZA+ycbWVVBeR7+2+Ch8reFA3M8t1/BglkO3QcbxMs="
+  },
+  "org/codehaus/plexus#plexus-classworlds/2.6.0": {
+   "jar": "sha256-Uvd8XsSfeHycQX6+1dbv2ZIvRKIC8hc3bk+UwNdPNUk=",
+   "pom": "sha256-RppsWfku/6YsB5fOfVLSwDz47hA0uSPDYN14qfUFp7o="
+  },
+  "org/codehaus/plexus#plexus-component-annotations/2.1.0": {
+   "jar": "sha256-veNhfOm1vPlYQSYEYIAEOvaks7rqQKOxU/Aue7wyrKw=",
+   "pom": "sha256-BnC2BSVffcmkVNqux5EpGMzxtUdcv8o3Q2O1H8/U6gA="
+  },
+  "org/codehaus/plexus#plexus-container-default/2.1.0": {
+   "jar": "sha256-bc6xJGsYgVO9y2+WLVQ9Ud22csygfK2Up4+6vJ7fCjk=",
+   "pom": "sha256-i4wg5jC9zHlcyYUCTEwQRcFHvhFgUsLJdeMMYI9/O0U="
+  },
+  "org/codehaus/plexus#plexus-containers/2.1.0": {
+   "pom": "sha256-lNWu2zxGAjJlOWUnz4zn/JRLe9eeTrq5BzhkGOtaCNc="
+  },
+  "org/codehaus/plexus#plexus-utils/3.3.0": {
+   "jar": "sha256-dtF0eSVA4nda+U0D0Q+y08d24s0KwOv0J9PlcAcruc4=",
+   "pom": "sha256-ecl5IHP97jzb69YadrqMLdEWJKn4XRKLrla9oZ4gR1w="
+  },
+  "org/codehaus/plexus#plexus/5.1": {
+   "pom": "sha256-o0PkT/V5au0OpgvhFFTJNc4gqxxfFkrMjaV0SC3Lx+k="
+  },
+  "org/hamcrest#hamcrest/3.0": {
+   "jar": "sha256-XWa2pKaAdVy27XyxBPp4Ne9kRmdYb/Bzet65d8Oezbw=",
+   "module": "sha256-mhBVNzjTWME+a69Zeb8sGlSQ7uScLcas8xcPzKCSDd4=",
+   "pom": "sha256-SgSmgTO/MkYfR7ilPI7p30zi9JoNrZeUvOhxe+5brDE="
+  },
+  "org/javassist#javassist/3.28.0-GA": {
+   "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=",
+   "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0="
+  },
+  "org/json#json/20250517": {
+   "jar": "sha256-PqYbKgbjHt8ckRNP6RBrDrsWYovhafPbdbx6Kwa0V5Y=",
+   "pom": "sha256-caH7hqKwVTejz8HIfbQtA279u/x+nDSbY10hrB+odqc="
+  },
+  "org/jspecify#jspecify/1.0.0": {
+   "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=",
+   "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=",
+   "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y="
+  },
+  "org/junit#junit-bom/5.12.2": {
+   "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=",
+   "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc="
+  },
+  "org/junit#junit-bom/5.13.4": {
+   "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
+   "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
+  },
+  "org/junit/jupiter#junit-jupiter-api/5.13.4": {
+   "jar": "sha256-0buBq/2eA0GDBrTmozkMjbUsWDcudJwpgKwp8MCCePE=",
+   "module": "sha256-/kZNN/XIEKgF/zGRmBZcrDPCVY4iYQIdjzEqglpIZx8=",
+   "pom": "sha256-xWBTV9MRgTZCxABEHgR7ynF8rcFXs/5+GJhbxv8jLls="
+  },
+  "org/junit/jupiter#junit-jupiter-engine/5.13.4": {
+   "jar": "sha256-AnQEqS/mGLckZXkqJXlRSVxQOn1XUeJ5Hg9RyH9n9bw=",
+   "module": "sha256-zu7m0ANKc4E1vZ84IM/gicZWkWPGI7qOPptE9yCP0ho=",
+   "pom": "sha256-E4Nt6C2Xf/JSCPXgypvfEzFV3C7+0Wr2Dfrojp3KzUc="
+  },
+  "org/junit/jupiter#junit-jupiter-params/5.13.4": {
+   "jar": "sha256-OoxjZXFtu2mMDUmgVFbB4a0FxAZhPFUPndUAN4cu/EE=",
+   "module": "sha256-/DZvvmB5ma/IzwK53KldHgKgawzocqRWBanZaMJG9LQ=",
+   "pom": "sha256-wPNik+IEJzLWJu4HWMrlLDeMKklXnUW9CBUojyDdTGw="
+  },
+  "org/junit/jupiter#junit-jupiter/5.13.4": {
+   "jar": "sha256-uWD3khfdAchjAxtnjwffRzC78erGUMdK1rDGH6rXg3k=",
+   "module": "sha256-RpRiJ8KWfRZZ6VX1PTTshzGBHUr0AcKsfWRveTx44fk=",
+   "pom": "sha256-q3sscJnzXPorMVmhpaQLlO414hKyWo172XwSJ7+u5Y4="
+  },
+  "org/junit/platform#junit-platform-commons/1.13.4": {
+   "jar": "sha256-HCXKZB66rkT/OtIcobLvaNDdhL/rB8SAW6eECJm3dAg=",
+   "module": "sha256-Gnot58eYmV+5eyRNbvnpnDpXmbV6D7rNaElrp+6BWdc=",
+   "pom": "sha256-RKWQ1nrsTSdskMUVj+EEePITPwoj7DLPqzqlXUK4aIM="
+  },
+  "org/junit/platform#junit-platform-engine/1.13.4": {
+   "jar": "sha256-OQxfd7hCg6ZLZE+IJRs5fgsN67gL3MUPiZiBrs/0Olo=",
+   "module": "sha256-NeT9aOvzFOYmYBSJNkNrOa4QXTVb6qwapU65HCBmync=",
+   "pom": "sha256-lYOVQk9rRhK9edgWXte9+vWmWU9GmbjviTmVyljDwKU="
+  },
+  "org/junit/platform#junit-platform-launcher/1.13.4": {
+   "jar": "sha256-Cwvq62iAoxFJZB0thIuGNxKIVGlnDBIJlYbX95hSJWQ=",
+   "module": "sha256-EV93RVdA4MPFOYvN2EHIqmmcLYACsRAPKuemQ9lAWSg=",
+   "pom": "sha256-OuOHauC4fbi96hJ5ryuXjaKfE4selfYFoD2aUtE529I="
+  },
+  "org/mockito#mockito-core/5.20.0": {
+   "jar": "sha256-0altJSEo06QkfP2KLnZBLvo8wQOXe+F5M8lCEXok83Q=",
+   "pom": "sha256-mQPiB1XAxIh6q5xPEAYft/ERUdOp+t2WTp+6QnIm0TU="
+  },
+  "org/objenesis#objenesis-parent/3.3": {
+   "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8="
+  },
+  "org/objenesis#objenesis/3.3": {
+   "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=",
+   "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM="
+  },
+  "org/openjdk/jmh#jmh-core/1.37": {
+   "jar": "sha256-3A6vK78ANqcLYHmMeF1uA6na8GtouO2w8bqes0IbrrM=",
+   "pom": "sha256-BEU74Abwb4bXxD88SS97TrM2JoDK5PHugLpl2yM3P1o="
+  },
+  "org/openjdk/jmh#jmh-generator-annprocess/1.37": {
+   "jar": "sha256-alYEtbgE4NrKEUXfEHdgkyFodzSotJOH5J8QVXwYbHc=",
+   "pom": "sha256-5CQCZbVCXDnxzyczr9o67DsTndGT55TVUTe+ySQP9HY="
+  },
+  "org/openjdk/jmh#jmh-parent/1.37": {
+   "pom": "sha256-DCTyFvNjfd52ORFPcCc6aX+FRvekxtWs1Mxtrum+9Mk="
+  },
+  "org/opentest4j#opentest4j/1.3.0": {
+   "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+   "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+   "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
+  },
+  "org/reflections#reflections/0.10.2": {
+   "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=",
+   "pom": "sha256-tsqj6301vXVu1usKKoGGi408D29CJE/q5BdgrGYwbYc="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  },
+  "org/xmlresolver#xmlresolver/5.3.3": {
+   "jar": "sha256-H+TVuS9wjc24LbzhKRngFx5rXKYsbcpiIEg2JQmP618=",
+   "module": "sha256-DeilBgQ5G2UDnI/6PxQRiSJ+x5rFMyPhPiunKIy3no4=",
+   "pom": "sha256-JhradtnmZ2AI3Kw3ek1FiXSRZrYGVZ9Z8uRepi2Ldew="
+  },
+  "org/xmlresolver#xmlresolver/5.3.3/data": {
+   "jar": "sha256-sMSHrS8+VYvo2CnJFtJFjRCspqW6+npNBSS3CEXkilw="
+  }
+ }
+}
diff --git a/pkgs/by-name/si/simple-binary-encoding/package.nix b/pkgs/by-name/si/simple-binary-encoding/package.nix
new file mode 100644
index 000000000000..b463e3926b1d
--- /dev/null
+++ b/pkgs/by-name/si/simple-binary-encoding/package.nix
@@ -0,0 +1,132 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gradle,
+  jre,
+  runtimeShell,
+
+  # Generating the usage instructions for script
+  htmlq,
+  html2text,
+  txt2man,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "simple-binary-encoding";
+  version = "1.36.0";
+
+  src = fetchFromGitHub {
+    owner = "aeron-io";
+    repo = "simple-binary-encoding";
+    tag = finalAttrs.version;
+    hash = "sha256-xqfsJq86qIFBG1542GDWNP0ayGaOzfIZ1KR0s0m8vf0=";
+  };
+
+  nativeBuildInputs = [
+    gradle
+    htmlq
+    html2text
+    txt2man
+  ];
+
+  mitmCache = gradle.fetchDeps {
+    pname = "simple-binary-encoding";
+    pkg = finalAttrs.finalPackage;
+    data = ./deps.json;
+  };
+
+  gradleBuildTask = "build";
+
+  doCheck = true;
+  gradleCheckTask = "runJavaExamples";
+
+  outputs = [
+    "out"
+    "benchmarks"
+    "samples"
+    "tool"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    for output in $outputs; do
+      if [[ "$output" != "out" ]]; then
+        mkdir -p "''${!output}"/share/sbe
+        cp "sbe-$output"/build/libs/*.jar "''${!output}/share/sbe"
+        if [[ -d "sbe-$output"/build/docs/javadoc ]]; then
+          cp -r "sbe-$output"/build/docs/javadoc "''${!output}/share/javadoc"
+        fi
+      fi
+      if [[ "$output" == "tool" ]]; then
+        cp sbe-all/build/libs/*.jar "$tool/share/sbe"
+      fi
+    done
+
+    mkdir -p "$out/"{bin,share/doc,share/man}
+
+    # Generate the usage file from the javadoc
+    shopt -s globstar
+    cat "$tool/share/javadoc"/**/sbe/SbeTool.html \
+      | htmlq '.class-description .block' \
+      | html2text \
+      | sed -e 's/[$] java/$ sbetool/' -e 's/ -jar sbe.jar//' -e 's/System Properties:/Available Options:/' \
+      > "$out/share/doc/sbetool.txt"
+
+    echo >> "$out/share/doc/sbetool.txt"
+    echo "All other arguments will be interpreted by java(1)." >> "$out/share/doc/sbetool.txt"
+
+    # Generate a manpage
+    sed \
+      -e '1i\NAME\nsbetool - ' \
+      -e 's/Usage:/\nSYNOPSIS\n/' \
+      -e 's/Available Options:/\nOPTIONS\n/' \
+      < "$out/share/doc/sbetool.txt" \
+      | txt2man \
+        -P simple-binary-encoding \
+        -t "sbetool" -s1 \
+        -r "$pname $verison" \
+        -v "Simple Binary Encoding" \
+        > "$out/share/man/sbetool.1"
+
+    runtimeShell="${runtimeShell}" java="${lib.getExe jre}" \
+      substituteAll ${./sbetool.sh} "$out/bin/sbetool"
+
+    chmod +x "$out/bin/sbetool"
+
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    # Check that we have some usage documentation
+    "$out"/bin/sbetool --help 2>&1 | grep -q Usage
+
+    # Check that the script can pass arguments to the underlying jar
+    tmpdir="$(mktemp -d)"
+    "$out"/bin/sbetool \
+      sbe-tool/src/test/resources/example-schema.xml \
+      -Dsbe.target.language=golang \
+      -Dsbe.output.dir="$tmpdir"
+    find "$tmpdir/baseline" | grep -q '.*[.]go'
+
+    # Check that -- passes as files
+    tmpdir="$(mktemp -d)"
+    cp sbe-tool/src/test/resources/example-schema.xml -- -e.xml
+    "$out"/bin/sbetool \
+      -Dsbe.target.language=golang \
+      -Dsbe.output.dir="$tmpdir" \
+      -- \
+      -e.xml
+    find "$tmpdir/baseline" | grep -q '.*[.]go'
+  '';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    homepage = "https://github.com/aeron-io/simple-binary-encoding";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ balsoft ];
+    description = "OSI layer 6 presentation for encoding and decoding binary application messages for low-latency financial applications";
+  };
+})
diff --git a/pkgs/by-name/si/simple-binary-encoding/sbetool.sh b/pkgs/by-name/si/simple-binary-encoding/sbetool.sh
new file mode 100755
index 000000000000..d77b433d6e64
--- /dev/null
+++ b/pkgs/by-name/si/simple-binary-encoding/sbetool.sh
@@ -0,0 +1,51 @@
+#!@runtimeShell@
+
+set -euo pipefail
+
+usage() {
+  cat "@out@/share/doc/sbetool.txt" >&2
+}
+
+if [[ $# -lt 1 ]]; then
+  usage
+  exit 1
+fi
+
+files=()
+opts=()
+opt_regex='^-.+$'
+only_files=
+
+for arg in "$@"; do
+  if [[ -n $only_files ]] || ! [[ "$arg" =~ $opt_regex ]]; then
+    files+=("$arg")
+    continue
+  fi
+  if [[ "$arg" == "-h" ]] || [[ "$arg" == "--help" ]]; then
+    usage
+    exit 0
+  fi
+  if [[ "$arg" == "--" ]]; then
+    only_files=true
+    continue
+  fi
+  opts+=("$arg")
+done
+
+if [[ -z "${files[*]}" ]]; then
+  echo "Error: no files provided. If your file starts with -, pass it after -- like this:" >&2
+  echo "    sbetool -- -my-file.xml" >&2
+  echo >&2
+  usage 2>&1 | tail +2 1>&2
+  exit 1
+fi
+
+# NB: `--add-opens` flag is added because newer version of `agrona` (a utility
+# lib used in `sbetool`) depends on jdk.internal.misc.Unsafe
+#
+# The Unsafe API is deprecated and requires special opt-in to use.
+@java@ \
+  --add-opens java.base/jdk.internal.misc=ALL-UNNAMED \
+  "${opts[@]}" \
+  -jar "@tool@/share/sbe/sbe-all-@version@.jar" \
+  "${files[@]}"
diff --git a/pkgs/by-name/si/simple-binary-encoding/update.sh b/pkgs/by-name/si/simple-binary-encoding/update.sh
new file mode 100755
index 000000000000..af9a0050f021
--- /dev/null
+++ b/pkgs/by-name/si/simple-binary-encoding/update.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i bash -p bash nix curl coreutils jq common-updater-scripts
+
+set -eou pipefail
+
+latest=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/aeron-io/simple-binary-encoding/releases/latest)
+latestTag=$(echo "$latest" | jq -r ".tag_name")
+latestVersion="$latestTag"
+
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; simple-binary-encoding.version" | tr -d '"')
+
+echo "latest  version: $latestVersion"
+echo "current version: $currentVersion"
+
+if [[ "$latestVersion" == "$currentVersion" ]]; then
+    echo "package is up-to-date"
+    exit 0
+fi
+
+hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url --unpack "https://github.com/aeron-io/simple-binary-encoding/archive/refs/tags/${latestTag}.tar.gz")")
+update-source-version simple-binary-encoding "$latestVersion" "$hash"
+
+"$(nix-build -A simple-binary-encoding.mitmCache.updateScript)"
+

From 25f1a9dff9c749287a27081d9d93c3911ff7de87 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Mon, 20 Oct 2025 17:48:44 +0200
Subject: [PATCH 102/103] luaPackages.lux-lua: use toLuaModule

---
 pkgs/development/lua-modules/lux-lua.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/lua-modules/lux-lua.nix b/pkgs/development/lua-modules/lux-lua.nix
index b6ca061fce94..4244370de5dc 100644
--- a/pkgs/development/lua-modules/lux-lua.nix
+++ b/pkgs/development/lua-modules/lux-lua.nix
@@ -12,13 +12,14 @@
   perl,
   pkg-config,
   rustPlatform,
+  toLuaModule
 }:
 let
   luaMajorMinor = lib.take 2 (lib.splitVersion lua.version);
   luaVersionDir = if isLuaJIT then "jit" else lib.concatStringsSep "." luaMajorMinor;
   luaFeature = if isLuaJIT then "luajit" else "lua${lib.concatStringsSep "" luaMajorMinor}";
 in
-rustPlatform.buildRustPackage rec {
+toLuaModule (rustPlatform.buildRustPackage rec {
   pname = "lux-lua";
 
   version = lux-cli.version;
@@ -89,4 +90,4 @@ rustPlatform.buildRustPackage rec {
     ];
     platforms = lib.platforms.all;
   };
-}
+})

From 04dfdb03765a8de3ba45e2897290b760d5b6f530 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Mon, 20 Oct 2025 19:18:28 +0200
Subject: [PATCH 103/103] luaPackages.lux-lua: run formatter

---
 pkgs/development/lua-modules/lux-lua.nix | 136 ++++++++++++-----------
 1 file changed, 69 insertions(+), 67 deletions(-)

diff --git a/pkgs/development/lua-modules/lux-lua.nix b/pkgs/development/lua-modules/lux-lua.nix
index 4244370de5dc..e85eb41f0966 100644
--- a/pkgs/development/lua-modules/lux-lua.nix
+++ b/pkgs/development/lua-modules/lux-lua.nix
@@ -12,82 +12,84 @@
   perl,
   pkg-config,
   rustPlatform,
-  toLuaModule
+  toLuaModule,
 }:
 let
   luaMajorMinor = lib.take 2 (lib.splitVersion lua.version);
   luaVersionDir = if isLuaJIT then "jit" else lib.concatStringsSep "." luaMajorMinor;
   luaFeature = if isLuaJIT then "luajit" else "lua${lib.concatStringsSep "" luaMajorMinor}";
 in
-toLuaModule (rustPlatform.buildRustPackage rec {
-  pname = "lux-lua";
+toLuaModule (
+  rustPlatform.buildRustPackage rec {
+    pname = "lux-lua";
 
-  version = lux-cli.version;
+    version = lux-cli.version;
 
-  src = lux-cli.src;
+    src = lux-cli.src;
 
-  buildAndTestSubdir = "lux-lua";
-  buildNoDefaultFeatures = true;
-  buildFeatures = [ luaFeature ];
+    buildAndTestSubdir = "lux-lua";
+    buildNoDefaultFeatures = true;
+    buildFeatures = [ luaFeature ];
 
-  cargoHash = lux-cli.cargoHash;
+    cargoHash = lux-cli.cargoHash;
 
-  nativeBuildInputs = [
-    perl
-    pkg-config
-  ];
-
-  buildInputs = [
-    gnupg
-    gpgme
-    libgit2
-    libgpg-error
-    openssl
-  ];
-
-  propagatedBuildInputs = [
-    lua
-  ];
-
-  doCheck = false; # lux-lua tests are broken in nixpkgs
-  useNextest = true;
-  nativeCheckInputs = [
-    lua
-    nix
-  ];
-
-  env = {
-    LIBGIT2_NO_VENDOR = 1;
-    LIBSSH2_SYS_USE_PKG_CONFIG = 1;
-    LUX_SKIP_IMPURE_TESTS = 1; # Disable impure unit tests
-  };
-
-  buildPhase = ''
-    runHook preBuild
-    cargo xtask-${luaFeature} dist
-    mkdir -p $out
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    cp -r target/dist/share $out
-    cp -r target/dist/lib $out
-    mkdir -p $out/lib/lua
-    ln -s $out/share/lux-lua/${luaVersionDir} $out/lib/lua/${luaVersionDir}
-    runHook postInstall
-  '';
-
-  cargoTestFlags = "--lib"; # Disable impure integration tests
-
-  meta = {
-    description = "Lua API for the Lux package manager";
-    homepage = "https://lux.lumen-labs.org/";
-    changelog = "https://github.com/lumen-oss/lux/blob/${src.tag}/CHANGELOG.md";
-    license = lib.licenses.lgpl3Plus;
-    maintainers = with lib.maintainers; [
-      mrcjkb
+    nativeBuildInputs = [
+      perl
+      pkg-config
     ];
-    platforms = lib.platforms.all;
-  };
-})
+
+    buildInputs = [
+      gnupg
+      gpgme
+      libgit2
+      libgpg-error
+      openssl
+    ];
+
+    propagatedBuildInputs = [
+      lua
+    ];
+
+    doCheck = false; # lux-lua tests are broken in nixpkgs
+    useNextest = true;
+    nativeCheckInputs = [
+      lua
+      nix
+    ];
+
+    env = {
+      LIBGIT2_NO_VENDOR = 1;
+      LIBSSH2_SYS_USE_PKG_CONFIG = 1;
+      LUX_SKIP_IMPURE_TESTS = 1; # Disable impure unit tests
+    };
+
+    buildPhase = ''
+      runHook preBuild
+      cargo xtask-${luaFeature} dist
+      mkdir -p $out
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      cp -r target/dist/share $out
+      cp -r target/dist/lib $out
+      mkdir -p $out/lib/lua
+      ln -s $out/share/lux-lua/${luaVersionDir} $out/lib/lua/${luaVersionDir}
+      runHook postInstall
+    '';
+
+    cargoTestFlags = "--lib"; # Disable impure integration tests
+
+    meta = {
+      description = "Lua API for the Lux package manager";
+      homepage = "https://lux.lumen-labs.org/";
+      changelog = "https://github.com/lumen-oss/lux/blob/${src.tag}/CHANGELOG.md";
+      license = lib.licenses.lgpl3Plus;
+      maintainers = with lib.maintainers; [
+        mrcjkb
+      ];
+      platforms = lib.platforms.all;
+    };
+  }
+)