From 6626f00d755961cd34c5ddf63889caa0c40a5059 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Fri, 29 Aug 2025 04:23:08 +0800
Subject: [PATCH 001/103] xbps: 0.59.2 -> 0.60.5

Diff: https://github.com/void-linux/xbps/compare/0.59.2...0.60.5
---
 pkgs/by-name/xb/xbps/package.nix | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/xb/xbps/package.nix b/pkgs/by-name/xb/xbps/package.nix
index 052e1338eb6d..f0780ad03d3a 100644
--- a/pkgs/by-name/xb/xbps/package.nix
+++ b/pkgs/by-name/xb/xbps/package.nix
@@ -9,15 +9,15 @@
   libarchive,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xbps";
-  version = "0.59.2";
+  version = "0.60.5";
 
   src = fetchFromGitHub {
     owner = "void-linux";
     repo = "xbps";
-    rev = version;
-    hash = "sha256-3+LzFLDZ1zfRPBETMlpEn66zsfHRHQLlgeZPdMtmA14=";
+    tag = finalAttrs.version;
+    hash = "sha256-ht5hhaaE9QAsp+5xmOAYQE9fgL0GBuQvz0qB64z0cbs=";
   };
 
   nativeBuildInputs = [
@@ -37,24 +37,10 @@ stdenv.mkDerivation rec {
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=deprecated-declarations";
 
+  # Don't try to install keys to /var/db/xbps, put in $out/share for now
   postPatch = ''
-    # _BSD_SOURCE causes cpp warning
-    # https://github.com/void-linux/xbps/issues/576
-    substituteInPlace bin/xbps-fbulk/main.c lib/util.c lib/external/dewey.c lib/external/fexec.c \
-      --replace 'define _BSD_SOURCE' 'define _DEFAULT_SOURCE' \
-      --replace '# define _BSD_SOURCE' '#define _DEFAULT_SOURCE'
-
-    # fix calloc argument cause a build failure
-    substituteInPlace bin/xbps-fbulk/main.c \
-      --replace-fail 'calloc(sizeof(*depn), 1)' 'calloc(1UL, sizeof(*depn))'
-
-    # fix unprefixed ranlib (needed on cross)
-    substituteInPlace lib/Makefile \
-      --replace 'SILENT}ranlib ' 'SILENT}$(RANLIB) '
-
-    # Don't try to install keys to /var/db/xbps, put in $out/share for now
     substituteInPlace data/Makefile \
-      --replace '$(DESTDIR)/$(DBDIR)' '$(DESTDIR)/$(SHAREDIR)'
+      --replace-fail '$(DESTDIR)/$(DBDIR)' '$(DESTDIR)/$(SHAREDIR)'
   '';
 
   enableParallelBuilding = true;
@@ -66,4 +52,4 @@ stdenv.mkDerivation rec {
     license = licenses.bsd2;
     maintainers = with maintainers; [ dtzWill ];
   };
-}
+})

From 64f4a38ca27d71724ad5ab7c6745cd562620ba71 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Fri, 29 Aug 2025 04:24:06 +0800
Subject: [PATCH 002/103] xbps: remove with lib

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

diff --git a/pkgs/by-name/xb/xbps/package.nix b/pkgs/by-name/xb/xbps/package.nix
index f0780ad03d3a..8a8af14eb073 100644
--- a/pkgs/by-name/xb/xbps/package.nix
+++ b/pkgs/by-name/xb/xbps/package.nix
@@ -45,11 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/void-linux/xbps";
     description = "X Binary Package System";
-    platforms = platforms.linux; # known to not work on Darwin, at least
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ dtzWill ];
+    platforms = lib.platforms.linux; # known to not work on Darwin, at least
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ dtzWill ];
   };
 })

From 4cf86f289109329a1839a7231587ae6764a2ac61 Mon Sep 17 00:00:00 2001
From: andre4ik3 <andre4ik3@fastmail.com>
Date: Sat, 16 Aug 2025 03:59:23 +0000
Subject: [PATCH 003/103] nixos/binfmt: move magics to separate file

---
 nixos/lib/binfmt-magics.nix          | 112 +++++++++++++++++++++++++
 nixos/lib/utils.nix                  |   8 ++
 nixos/modules/system/boot/binfmt.nix | 120 +--------------------------
 3 files changed, 122 insertions(+), 118 deletions(-)
 create mode 100644 nixos/lib/binfmt-magics.nix

diff --git a/nixos/lib/binfmt-magics.nix b/nixos/lib/binfmt-magics.nix
new file mode 100644
index 000000000000..0d8ae95d73d1
--- /dev/null
+++ b/nixos/lib/binfmt-magics.nix
@@ -0,0 +1,112 @@
+{
+  armv6l-linux = {
+    magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff'';
+  };
+  armv7l-linux = {
+    magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff'';
+  };
+  aarch64-linux = {
+    magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff'';
+  };
+  aarch64_be-linux = {
+    magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
+  };
+  i386-linux = {
+    magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00'';
+    mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
+  };
+  i486-linux = {
+    magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00'';
+    mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
+  };
+  i586-linux = {
+    magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00'';
+    mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
+  };
+  i686-linux = {
+    magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00'';
+    mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
+  };
+  x86_64-linux = {
+    magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00'';
+    mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
+  };
+  alpha-linux = {
+    magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90'';
+    mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
+  };
+  sparc64-linux = {
+    magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
+  };
+  sparc-linux = {
+    magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
+  };
+  powerpc-linux = {
+    magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
+  };
+  powerpc64-linux = {
+    magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
+  };
+  powerpc64le-linux = {
+    magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00'';
+  };
+  mips-linux = {
+    magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20'';
+  };
+  mipsel-linux = {
+    magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00'';
+  };
+  mips64-linux = {
+    magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
+  };
+  mips64el-linux = {
+    magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
+  };
+  mips64-linuxabin32 = {
+    magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20'';
+  };
+  mips64el-linuxabin32 = {
+    magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00'';
+  };
+  riscv32-linux = {
+    magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
+  };
+  riscv64-linux = {
+    magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
+  };
+  loongarch64-linux = {
+    magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02\x01'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\xfc\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
+  };
+  wasm32-wasi = {
+    magicOrExtension = ''\x00asm'';
+    mask = ''\xff\xff\xff\xff'';
+  };
+  wasm64-wasi = {
+    magicOrExtension = ''\x00asm'';
+    mask = ''\xff\xff\xff\xff'';
+  };
+  s390x-linux = {
+    magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16'';
+    mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
+  };
+  x86_64-windows.magicOrExtension = "MZ";
+  i686-windows.magicOrExtension = "MZ";
+}
diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix
index 251e0460dd03..1aef8db81b6f 100644
--- a/nixos/lib/utils.nix
+++ b/nixos/lib/utils.nix
@@ -434,6 +434,14 @@ let
         units = import ./systemd-network-units.nix { inherit lib systemdUtils; };
       };
     };
+
+    /*
+      Mapping of systems to “magicOrExtension” and “mask”. Mostly taken from:
+      - https://github.com/cleverca22/nixos-configs/blob/master/qemu.nix
+      and
+      - https://github.com/qemu/qemu/blob/master/scripts/qemu-binfmt-conf.sh
+    */
+    binfmtMagics = import ./binfmt-magics.nix;
   };
 in
 utils
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix
index 5dfa85e4cd4c..6b904c18d945 100644
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixos/modules/system/boot/binfmt.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  utils,
   ...
 }:
 let
@@ -54,124 +55,7 @@ let
     else
       interpreter;
 
-  # Mapping of systems to “magicOrExtension” and “mask”. Mostly taken from:
-  # - https://github.com/cleverca22/nixos-configs/blob/master/qemu.nix
-  # and
-  # - https://github.com/qemu/qemu/blob/master/scripts/qemu-binfmt-conf.sh
-  # TODO: maybe put these in a JSON file?
-  magics = {
-    armv6l-linux = {
-      magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff'';
-    };
-    armv7l-linux = {
-      magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff'';
-    };
-    aarch64-linux = {
-      magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff'';
-    };
-    aarch64_be-linux = {
-      magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
-    };
-    i386-linux = {
-      magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
-    };
-    i486-linux = {
-      magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
-    };
-    i586-linux = {
-      magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
-    };
-    i686-linux = {
-      magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
-    };
-    x86_64-linux = {
-      magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
-    };
-    alpha-linux = {
-      magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90'';
-      mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
-    };
-    sparc64-linux = {
-      magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
-    };
-    sparc-linux = {
-      magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
-    };
-    powerpc-linux = {
-      magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
-    };
-    powerpc64-linux = {
-      magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
-    };
-    powerpc64le-linux = {
-      magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00'';
-    };
-    mips-linux = {
-      magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20'';
-    };
-    mipsel-linux = {
-      magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00'';
-    };
-    mips64-linux = {
-      magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
-    };
-    mips64el-linux = {
-      magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
-    };
-    mips64-linuxabin32 = {
-      magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20'';
-    };
-    mips64el-linuxabin32 = {
-      magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00'';
-    };
-    riscv32-linux = {
-      magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
-    };
-    riscv64-linux = {
-      magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
-    };
-    loongarch64-linux = {
-      magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02\x01'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\xfc\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
-    };
-    wasm32-wasi = {
-      magicOrExtension = ''\x00asm'';
-      mask = ''\xff\xff\xff\xff'';
-    };
-    wasm64-wasi = {
-      magicOrExtension = ''\x00asm'';
-      mask = ''\xff\xff\xff\xff'';
-    };
-    s390x-linux = {
-      magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16'';
-      mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff'';
-    };
-    x86_64-windows.magicOrExtension = "MZ";
-    i686-windows.magicOrExtension = "MZ";
-  };
-
+  magics = utils.binfmtMagics;
 in
 {
   imports = [

From a32e4ad16b35f70a4e35cb1febead091f0d5db9a Mon Sep 17 00:00:00 2001
From: andre4ik3 <andre4ik3@fastmail.com>
Date: Sat, 16 Aug 2025 03:59:57 +0000
Subject: [PATCH 004/103] nixos/rosetta: use binary magics from utils

---
 nixos/modules/virtualisation/rosetta.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/rosetta.nix b/nixos/modules/virtualisation/rosetta.nix
index 2f1310f95db5..5ac069f89ede 100644
--- a/nixos/modules/virtualisation/rosetta.nix
+++ b/nixos/modules/virtualisation/rosetta.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  utils,
   ...
 }:
 
@@ -72,8 +73,7 @@ in
 
       # The required flags for binfmt are documented by Apple:
       # https://developer.apple.com/documentation/virtualization/running_intel_binaries_in_linux_vms_with_rosetta
-      magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x3e\x00'';
-      mask = ''\xff\xff\xff\xff\xff\xfe\xfe\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'';
+      inherit (utils.binfmtMagics.x86_64-linux) magicOrExtension mask;
       fixBinary = true;
       matchCredentials = true;
       preserveArgvZero = false;

From 226eb9b4706a3b0b57594aaf0e14e88c7d65f3b3 Mon Sep 17 00:00:00 2001
From: William Brockhus <pickeringw@gmail.com>
Date: Wed, 17 Sep 2025 11:36:33 +1000
Subject: [PATCH 005/103] maintainers: add YodaDaCoda

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 09ca05897dba..fdfb328f01f2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28498,6 +28498,12 @@
     githubId = 40352765;
     name = "Yoctocell";
   };
+  YodaDaCoda = {
+    email = "pickeringw@gmail.com";
+    github = "YodaDaCoda";
+    githubId = 365349;
+    name = "William Brockhus";
+  };
   yogansh = {
     email = "yogansh@yogansh.tech";
     github = "YoganshSharma";

From 639cede29296912499f5cab2942ab8abf60773c9 Mon Sep 17 00:00:00 2001
From: William Brockhus <pickeringw@gmail.com>
Date: Wed, 17 Sep 2025 10:43:18 +1000
Subject: [PATCH 006/103] thorium-reader: init at v3.2.2

---
 pkgs/by-name/th/thorium-reader/package.nix | 78 ++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 pkgs/by-name/th/thorium-reader/package.nix

diff --git a/pkgs/by-name/th/thorium-reader/package.nix b/pkgs/by-name/th/thorium-reader/package.nix
new file mode 100644
index 000000000000..c50d24dc2e69
--- /dev/null
+++ b/pkgs/by-name/th/thorium-reader/package.nix
@@ -0,0 +1,78 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nodejs_24,
+  makeWrapper,
+  electron,
+  copyDesktopItems,
+  makeDesktopItem,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "thorium-reader";
+  version = "3.2.2";
+  nodejs = nodejs_24;
+  npmDepsHash = "sha256-T70Oxn97oDyFSxkJ55nlM2ET0UEWpo8ahnipkUwgTcM=";
+  makeCacheWritable = true;
+
+  src = fetchFromGitHub {
+    owner = "edrlab";
+    repo = "thorium-reader";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+1cc8UxcLaqC6Yrc4RYAKDZ4hzoz0eX31HaiUtp/znE=";
+  };
+
+  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+
+  nativeBuildInputs = [
+    makeWrapper
+    copyDesktopItems
+  ];
+
+  postInstall = ''
+    install -Dpm644 resources/icon.png $out/share/icons/hicolor/1024x1024/apps/thorium-reader.png
+
+    cp -r dist/* $out/lib/node_modules/EDRLab.ThoriumReader/
+
+    makeWrapper '${lib.getExe electron}' "$out/bin/thorium-reader" \
+      --add-flags $out/lib/node_modules/EDRLab.ThoriumReader \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --set-default ELECTRON_IS_DEV 0 \
+      --inherit-argv0
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "thorium-reader";
+      desktopName = "Thorium";
+      exec = "thorium-reader %u";
+      terminal = false;
+      type = "Application";
+      icon = "thorium-reader";
+      startupWMClass = "thorium-reader";
+      mimeTypes = [
+        "application/epub+zip"
+        "application/daisy+zip"
+        "application/vnd.readium.lcp.license.v1.0+json"
+        "application/audiobook+zip"
+        "application/webpub+zip"
+        "application/audiobook+lcp"
+        "application/pdf+lcp"
+        "x-scheme-handler/thorium"
+        "x-scheme-handler/opds"
+      ];
+      comment = "Desktop application to read ebooks";
+      categories = [ "Office" ];
+    })
+  ];
+
+  meta = {
+    description = "EPUB reader";
+    homepage = "https://www.edrlab.org/software/thorium-reader/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ YodaDaCoda ];
+    platforms = lib.platforms.all;
+    mainProgram = "thorium-reader";
+  };
+})

From 239496b3259259a884d37d2dc1ababc80d28c6da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 13:40:39 +0000
Subject: [PATCH 007/103] pulumi-esc: 0.19.0 -> 0.20.0

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

diff --git a/pkgs/by-name/pu/pulumi-esc/package.nix b/pkgs/by-name/pu/pulumi-esc/package.nix
index 7ab547b4124d..c92703fee924 100644
--- a/pkgs/by-name/pu/pulumi-esc/package.nix
+++ b/pkgs/by-name/pu/pulumi-esc/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "pulumi-esc";
-  version = "0.19.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "esc";
     rev = "v${version}";
-    hash = "sha256-TsYMGPL4Lru7T1p4v/gaql665JO2LIKayb3GupxYbiI=";
+    hash = "sha256-ZS5mwRua/IYAhA5W+EEZxttArTm+vLArA1RM8SFOK60=";
   };
 
   subPackages = "cmd/esc";

From a92e34b12b2cb03c68f32c583501fb0a106506de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 20:48:05 +0000
Subject: [PATCH 008/103] bingo: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/by-name/bi/bingo/package.nix b/pkgs/by-name/bi/bingo/package.nix
index 91fb2c200f5f..0ddf9cae4d8e 100644
--- a/pkgs/by-name/bi/bingo/package.nix
+++ b/pkgs/by-name/bi/bingo/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "bingo";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "bwplotka";
     repo = "bingo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bzh6P+J8EoewjOofwWXMgtSXAhESetD3y9EiqLNOT54=";
+    hash = "sha256-8rkKYX1LlDLR2NK59YyH15KyP0HQsbwN/K1uKXg1nq8=";
   };
 
-  vendorHash = "sha256-cDeeRkTwuwEKNTqK/6ZEKANrjTIUTeR3o5oClkJQ4AE=";
+  vendorHash = "sha256-7Si2TyH9RKnD5+TvcLSbgZ95ZyEvs7BfadIsnxuEY1U=";
 
   postPatch = ''
     rm get_e2e_test.go get_e2e_utils_test.go

From 07f3ed41b3b7b6e8a486b2fc03d0aa1fbe8bad76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 14 Nov 2025 02:21:15 +0000
Subject: [PATCH 009/103] kuma-dp: 2.12.1 -> 2.12.3

---
 pkgs/applications/networking/cluster/kuma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix
index 490b926c7e27..4fe8efcbcd94 100644
--- a/pkgs/applications/networking/cluster/kuma/default.nix
+++ b/pkgs/applications/networking/cluster/kuma/default.nix
@@ -17,14 +17,14 @@
 
 buildGoModule rec {
   inherit pname;
-  version = "2.12.1";
+  version = "2.12.3";
   tags = lib.optionals enableGateway [ "gateway" ];
 
   src = fetchFromGitHub {
     owner = "kumahq";
     repo = "kuma";
     tag = version;
-    hash = "sha256-9s89fiBFIP6azB1SDCZkTlQWAQ2C6htQXRMvyWrNch0=";
+    hash = "sha256-C/q3fCcMMnqjXeoO/t/YOKHLq8HDNfF+x75nCcjwwvE=";
   };
 
   vendorHash = "sha256-KgZYKopW+FOdwBIGxa2RLiEbefZ/1vAhcsWtcYhgdFs=";

From 6a4107046298f12357b1148d668c3ebd49b5fcee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Nov 2025 02:47:23 +0000
Subject: [PATCH 010/103] wallutils: 5.14.2 -> 5.14.3

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

diff --git a/pkgs/by-name/wa/wallutils/package.nix b/pkgs/by-name/wa/wallutils/package.nix
index 5328e6fb53ea..5e27d5ce4727 100644
--- a/pkgs/by-name/wa/wallutils/package.nix
+++ b/pkgs/by-name/wa/wallutils/package.nix
@@ -14,13 +14,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "wallutils";
-  version = "5.14.2";
+  version = "5.14.3";
 
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "wallutils";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mcleLQIBG8L5cpA4QYZpDsBdZbJlyDx7XXwDtAV4sjU=";
+    hash = "sha256-35JkZa7ihz0vgHwEagIkP7xTd6wLLRqSaeySJY1/Dw8=";
   };
 
   vendorHash = null;

From d94119f94ebf77ce13ad7ce264217d80e80dd66c Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sat, 22 Nov 2025 02:11:58 +0000
Subject: [PATCH 011/103] xbps: 0.60.5 -> 0.60.6

Diff: https://github.com/void-linux/xbps/compare/0.60.5...0.60.6
---
 pkgs/by-name/xb/xbps/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xb/xbps/package.nix b/pkgs/by-name/xb/xbps/package.nix
index 8a8af14eb073..cf79497e1e4d 100644
--- a/pkgs/by-name/xb/xbps/package.nix
+++ b/pkgs/by-name/xb/xbps/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xbps";
-  version = "0.60.5";
+  version = "0.60.6";
 
   src = fetchFromGitHub {
     owner = "void-linux";
     repo = "xbps";
     tag = finalAttrs.version;
-    hash = "sha256-ht5hhaaE9QAsp+5xmOAYQE9fgL0GBuQvz0qB64z0cbs=";
+    hash = "sha256-euV8oi1na+mfILnnUHK5S8Pi6+QuOUA8KhD0FHUqM70=";
   };
 
   nativeBuildInputs = [

From d6dd0625b232e03a9d7108ea388a73f8bca3125a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 25 Nov 2025 01:14:51 +0000
Subject: [PATCH 012/103] ecs-agent: 1.100.1 -> 1.101.0

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

diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix
index 57f8ecbe0cd6..68ea04afc13b 100644
--- a/pkgs/by-name/ec/ecs-agent/package.nix
+++ b/pkgs/by-name/ec/ecs-agent/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "amazon-ecs-agent";
-  version = "1.100.1";
+  version = "1.101.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "aws";
     repo = "amazon-ecs-agent";
-    hash = "sha256-APkYhq4HGxgCNUWaaj5/xK6AwwUZAW4aom48ADd4R7g=";
+    hash = "sha256-1+SWffCxmbYf8hUUazrRds7bRwPX11b1HumaCAizsOQ=";
   };
 
   vendorHash = null;

From 94fbe76f91ee9272ae10941d032a24ade1624255 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 25 Nov 2025 01:27:06 +0000
Subject: [PATCH 013/103] go-containerregistry: 0.20.6 -> 0.20.7

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

diff --git a/pkgs/by-name/go/go-containerregistry/package.nix b/pkgs/by-name/go/go-containerregistry/package.nix
index d651beeadcec..537634913e74 100644
--- a/pkgs/by-name/go/go-containerregistry/package.nix
+++ b/pkgs/by-name/go/go-containerregistry/package.nix
@@ -15,13 +15,13 @@ in
 
 buildGoModule rec {
   pname = "go-containerregistry";
-  version = "0.20.6";
+  version = "0.20.7";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "go-containerregistry";
     rev = "v${version}";
-    sha256 = "sha256-fmn2SPmYecyKY7HMPjPKvovRS/Ez+SwDe+1maccq4Hc=";
+    sha256 = "sha256-UDLKdeQ2Nxf5MCruN4IYNGL0xOp8Em2d+wmXX+R9ow4=";
   };
   vendorHash = null;
 

From c6bb2a921caafb4b16585a053871506c4dad76c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Nov 2025 13:21:17 +0000
Subject: [PATCH 014/103] opam: 2.4.1 -> 2.5.0

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

diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 4198995392f7..1ac4ffa3db94 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -15,11 +15,11 @@ assert lib.versionAtLeast ocaml.version "4.08.0";
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "opam";
-  version = "2.4.1";
+  version = "2.5.0";
 
   src = fetchurl {
     url = "https://github.com/ocaml/opam/releases/download/${finalAttrs.version}/opam-full-${finalAttrs.version}.tar.gz";
-    hash = "sha256-xNBTApeTxxTk5zQLEVdCjA+QeDWF+xfzUVgkemQEZ9k=";
+    hash = "sha256-JfuY+WLEInwSYeFCr8aKQWd45ugZYAvV7j7EoYrh4jg=";
   };
 
   strictDeps = true;

From 064a1c07a7624eb8af4951e105266de6986474ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Dec 2025 02:00:59 +0000
Subject: [PATCH 015/103] plakar: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/by-name/pl/plakar/package.nix b/pkgs/by-name/pl/plakar/package.nix
index dab7c6e06394..8d4cd13755aa 100644
--- a/pkgs/by-name/pl/plakar/package.nix
+++ b/pkgs/by-name/pl/plakar/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "plakar";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "PlakarKorp";
     repo = "plakar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cuPz0xg/cGKczHLpFqSBfFD7KlygCX6fnfrigv0K2Zs=";
+    hash = "sha256-X8m2dXMb+cxWBbKm0MhhY2pNSBTUONyHoPnGlDG9jOg=";
   };
 
-  vendorHash = "sha256-ySzDtj8EdGcWl6H1q44+QR5ebSC76leVygl+c8fa7sk=";
+  vendorHash = "sha256-6MdwUJTu9QvqZ3iGEg39L5B5mce7JssFTF3ZmoTuH3M=";
 
   buildInputs = [
     fuse

From e832d8befd2bf56ebfb9850250a3e156c5d0c8ff Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Mon, 1 Dec 2025 17:03:28 +0100
Subject: [PATCH 016/103] opam-publish: 2.7.0 -> 2.7.1

---
 pkgs/by-name/op/opam-publish/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/op/opam-publish/package.nix b/pkgs/by-name/op/opam-publish/package.nix
index e8014588aa33..fc68b05728ff 100644
--- a/pkgs/by-name/op/opam-publish/package.nix
+++ b/pkgs/by-name/op/opam-publish/package.nix
@@ -17,15 +17,15 @@ let
     ;
 in
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "opam-publish";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "ocaml-opam";
     repo = "opam-publish";
-    rev = version;
-    hash = "sha256-Li7Js8mrxOrRNNuu8z4X+VXbuECfk7Gsgpy4d6R3RwU=";
+    tag = finalAttrs.version;
+    hash = "sha256-yaFkR+MxkN6/skXx9euKVjTGXk9DraxDj+/2XQuHK4I=";
   };
 
   buildInputs = [
@@ -38,14 +38,14 @@ buildDunePackage rec {
     github-unix
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/ocaml-opam/opam-publish";
     description = "Tool to ease contributions to opam repositories";
     mainProgram = "opam-publish";
-    license = with licenses; [
+    license = with lib.licenses; [
       lgpl21Only
       ocamlLgplLinkingException
     ];
-    maintainers = with maintainers; [ niols ];
+    maintainers = with lib.maintainers; [ niols ];
   };
-}
+})

From c97ea4a30ca23aaba63aaf1fd716c8da624538de Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 2 Dec 2025 09:26:48 +0100
Subject: [PATCH 017/103] azure-cli: 2.80.0 -> 2.81.0

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/az/azure-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix
index b6066170892b..313926ebeb3a 100644
--- a/pkgs/by-name/az/azure-cli/package.nix
+++ b/pkgs/by-name/az/azure-cli/package.nix
@@ -26,14 +26,14 @@
 }:
 
 let
-  version = "2.80.0";
+  version = "2.81.0";
 
   src = fetchFromGitHub {
     name = "azure-cli-${version}-src";
     owner = "Azure";
     repo = "azure-cli";
     tag = "azure-cli-${version}";
-    hash = "sha256-PIsOBltX2WBFCV4kdHkGPefBe/FGF9GQ5otXznE87aA=";
+    hash = "sha256-Z8luIR1G9rLlt9GSOsCIAU87JZ9uolv2kHaDz6xlKYU=";
   };
 
   # put packages that needs to be overridden in the py package scope

From 12c438eaf6408023e6761b2d57483ecf75da1772 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 2 Dec 2025 09:27:27 +0100
Subject: [PATCH 018/103] azure-cli-extensions.edge-action: init at 1.0.0b2

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 5f40fe492596..754a9a01a04b 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -405,6 +405,13 @@
     "hash": "sha256-gS+82UbXH2fh7TrIsAxDqyaeM0iMwebt4v0ImJIs07Y=",
     "description": "Microsoft Azure Command-Line Tools Dynatrace Extension"
   },
+  "edge-action": {
+    "pname": "edge-action",
+    "version": "1.0.0b2",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/edge_action-1.0.0b2-py3-none-any.whl",
+    "hash": "sha256-wtIkeQPRlEAEL/PXTVuPaUoQbabFKDKLc/RML+qaBGM=",
+    "description": "Microsoft Azure Command-Line Tools Extension for Azure Front Door Edge Actions"
+  },
   "edgeorder": {
     "pname": "edgeorder",
     "version": "0.1.0",

From 6c840f33fac1fa2e502bf3e3a0748f49dc62242b Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 2 Dec 2025 09:27:29 +0100
Subject: [PATCH 019/103] azure-cli-extensions.cosmosdb-preview: 1.6.1 -> 1.6.2

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 754a9a01a04b..cc072cf09d11 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -246,9 +246,9 @@
   },
   "cosmosdb-preview": {
     "pname": "cosmosdb-preview",
-    "version": "1.6.1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.6.1-py2.py3-none-any.whl",
-    "hash": "sha256-kfhttzgrlnyAoD6pe7PKjGHdKE0U6G1GYNe1a4ZA3f0=",
+    "version": "1.6.2",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.6.2-py2.py3-none-any.whl",
+    "hash": "sha256-le+/kTHWOoDqV/DDgl2yjTboQhx+X/S92PHt8Yqqpf4=",
     "description": "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension"
   },
   "costmanagement": {

From 3e0a153aff66400a52296ed8065cb548adf3fe1d Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 2 Dec 2025 09:27:31 +0100
Subject: [PATCH 020/103] azure-cli-extensions.workload-orchestration: 4.1.0 ->
 4.2.0

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index cc072cf09d11..e3603ae94865 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -1128,9 +1128,9 @@
   },
   "workload-orchestration": {
     "pname": "workload-orchestration",
-    "version": "4.1.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/workload_orchestration-4.1.0-py3-none-any.whl",
-    "hash": "sha256-9+pQFtpZzIEk4971hNJuB6gxu7WtRtDO69zt6jgq60A=",
+    "version": "4.2.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/workload_orchestration-4.2.0-py3-none-any.whl",
+    "hash": "sha256-gl+8YfetxLgAKUzvehihHGGWTLpi0T57LKRzmuwvWww=",
     "description": "Microsoft Azure Command-Line Tools WorkloadOperations Extension"
   },
   "workloads": {

From 5e66d37a1050e48a888eeb329d59def1daabfab2 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 2 Dec 2025 09:27:33 +0100
Subject: [PATCH 021/103] azure-cli-extensions.migrate: 2.0.1b1 -> 3.0.0b1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index e3603ae94865..d86775e7d48c 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -694,9 +694,9 @@
   },
   "migrate": {
     "pname": "migrate",
-    "version": "2.0.1b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/migrate-2.0.1b1-py3-none-any.whl",
-    "hash": "sha256-vRMg/oeqSFXwZaB6J6RO51U6kjWdE4O7EWc/i4LxOmU=",
+    "version": "3.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/migrate-3.0.0b1-py3-none-any.whl",
+    "hash": "sha256-/u8DKXNf95To56AMM3dm4eXueSW7JylQgzW/fBiqB0U=",
     "description": "Support for Azure Migrate preview"
   },
   "mixed-reality": {

From 070b03e43ac118866d6402111735c5f712634262 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 2 Dec 2025 09:27:35 +0100
Subject: [PATCH 022/103] azure-cli-extensions.stack-hci-vm: 1.11.1 -> 1.11.3

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index d86775e7d48c..03a536e0e208 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -981,9 +981,9 @@
   },
   "stack-hci-vm": {
     "pname": "stack-hci-vm",
-    "version": "1.11.1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci_vm-1.11.1-py3-none-any.whl",
-    "hash": "sha256-VMxvHxjPVpnUcLZRMUv8PR95lT490FPulbAXutW9pDo=",
+    "version": "1.11.3",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci_vm-1.11.3-py3-none-any.whl",
+    "hash": "sha256-InE7FOgJKt68+9lpaskYhpINxLAR2VrIKdAbKt7hBOw=",
     "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension"
   },
   "standbypool": {

From 0f119668d8b8461e304f5e427f0b1ae481fbae40 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Tue, 2 Dec 2025 09:27:37 +0100
Subject: [PATCH 023/103] azure-cli-extensions.dataprotection: 1.7.0 -> 1.7.1

---
 pkgs/by-name/az/azure-cli/extensions-generated.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 03a536e0e208..075ae9673996 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -316,9 +316,9 @@
   },
   "dataprotection": {
     "pname": "dataprotection",
-    "version": "1.7.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.7.0-py3-none-any.whl",
-    "hash": "sha256-4JG0UHInWxi49cXPUoLlfP8FIg9VTjmzFiWfn0to3LQ=",
+    "version": "1.7.1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.7.1-py3-none-any.whl",
+    "hash": "sha256-zwyUqKbMpIxrRiN54GKigcok/spfBle2lPojqWpSVs0=",
     "description": "Microsoft Azure Command-Line Tools DataProtectionClient Extension"
   },
   "datashare": {

From 733591bd77150ccbb9f995d5f35e43deb070c70c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 Dec 2025 00:45:17 +0000
Subject: [PATCH 024/103] buildah-unwrapped: 1.42.1 -> 1.42.2

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

diff --git a/pkgs/by-name/bu/buildah-unwrapped/package.nix b/pkgs/by-name/bu/buildah-unwrapped/package.nix
index ae9a75e7828c..96252ce5e273 100644
--- a/pkgs/by-name/bu/buildah-unwrapped/package.nix
+++ b/pkgs/by-name/bu/buildah-unwrapped/package.nix
@@ -18,13 +18,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "buildah";
-  version = "1.42.1";
+  version = "1.42.2";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "buildah";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ABZe+Ei30o7vy156Fiux9r+B5PBSW8ECYpdwnwCn66k=";
+    hash = "sha256-YWyA2wTIlJNwuqcPHOBFZ2wr46Z0I83FWRew/FC3Wxs=";
   };
 
   outputs = [

From 280e1445f19e43e4c35fcd695618ee3a32b8c32c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 Dec 2025 14:58:25 +0000
Subject: [PATCH 025/103] aks-mcp-server: 0.0.11 -> 0.0.12

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

diff --git a/pkgs/by-name/ak/aks-mcp-server/package.nix b/pkgs/by-name/ak/aks-mcp-server/package.nix
index 91a4425ffda5..1a42c78c3805 100644
--- a/pkgs/by-name/ak/aks-mcp-server/package.nix
+++ b/pkgs/by-name/ak/aks-mcp-server/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "aks-mcp-server";
-  version = "0.0.11";
+  version = "0.0.12";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "aks-mcp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-VkX9zqR10h5bvFAfnNpei3f89dv7RQoZysjSRvxkdHQ=";
+    hash = "sha256-WkAfyaJn0iSJTe97rSpAPhjPyjhtezSqjkrbj3YAMYk=";
   };
 
-  vendorHash = "sha256-qN7qqzMnl3l3Z40Mfv9jNWP7Ux7bgDCxKm+QocoruRk=";
+  vendorHash = "sha256-4WF3mxn5eTT6b3Xe34ju4sMLU80Whabc1scGluu7gKk=";
 
   subPackages = [ "cmd/aks-mcp" ];
 

From e14841b8100af8364367673aa7e8d1c9e9397d03 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Wed, 3 Dec 2025 17:43:05 +0100
Subject: [PATCH 026/103] SDL_compat: 1.2.70 -> 1.2.72

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/sd/SDL_compat/package.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix
index c47b15a164ab..1ee22a2e3e9b 100644
--- a/pkgs/by-name/sd/SDL_compat/package.nix
+++ b/pkgs/by-name/sd/SDL_compat/package.nix
@@ -4,7 +4,6 @@
   cmake,
   darwin,
   fetchFromGitHub,
-  fetchpatch2,
   libGLU,
   libiconv,
   libX11,
@@ -28,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_compat";
-  version = "1.2.70";
+  version = "1.2.72";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "sdl12-compat";
     rev = "release-" + finalAttrs.version;
-    hash = "sha256-vmbkeBpuzgq1B/6rp9/Gy8+Y7aF5uz8lC/mK0uA9v7I=";
+    hash = "sha256-dTBsbLJFQSaWWhn1+CCQopq7sBONxvlaAximmo3iYVM=";
   };
 
   nativeBuildInputs = [
@@ -90,12 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
     # adds their include and library paths to environment variables. The sdl-config
     # is patched to use these variables to produce correct flags for compiler.
     ./find-headers.patch
-
-    # https://github.com/libsdl-org/sdl12-compat/issues/382
-    (fetchpatch2 {
-      url = "https://github.com/libsdl-org/sdl12-compat/commit/bef8f7412dd44edc4f7e14dc35d3b20399e25496.patch?full_index=1";
-      hash = "sha256-5kJawjmA8C3uH3OIXHmqQjnIRtoTJtXmm3iLxG3e1qc=";
-    })
   ];
   setupHook = ./setup-hook.sh;
 

From 1a61a1d14f681964765d0ead121b184d7e6756a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 4 Dec 2025 07:44:34 +0000
Subject: [PATCH 027/103] ladybird: 0-unstable-2025-11-27 ->
 0-unstable-2025-12-03

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

diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index a60e23983158..3bbb4abb2fe8 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -33,13 +33,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ladybird";
-  version = "0-unstable-2025-11-27";
+  version = "0-unstable-2025-12-03";
 
   src = fetchFromGitHub {
     owner = "LadybirdBrowser";
     repo = "ladybird";
-    rev = "c790de24ddc7575a4ed2ea754d27afb6cde0ac22";
-    hash = "sha256-DZ4qj4polUH2xQvopY6ia/GyRe+L8WCGJPEryQAn/4E=";
+    rev = "9b4d9966da96b7f6421b59eb0adfe90d484ee920";
+    hash = "sha256-dqTxW1ENc3k9pk8z2BFPsVJVren9ZkFovKKhNAcs1eo=";
   };
 
   postPatch = ''

From aa0f9b1e079368e5443f3b2433ddff52d64f796e Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Thu, 4 Dec 2025 16:04:02 +0100
Subject: [PATCH 028/103] envoy-bin: 1.36.2 -> 1.36.3

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 f927672f4213..e7006804bb84 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.2";
+  version = "1.36.3";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "envoy-bin is not available for ${system}.";
 
@@ -21,8 +21,8 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-r3NrtmU8zpxSsvOwkqNgKsIaYKxnVpjQYNxNgoN8Bco=";
-      x86_64-linux = "sha256-r9Z7z+pUhSXudqk1CgpM/rKsJMe1MnlM4zLYQK2M2uc=";
+      aarch64-linux = "sha256-/YhTx+mSn2pEWZKBdcGKp5QbVrQ/4H4K3jvq9ZuKeiE=";
+      x86_64-linux = "sha256-bcrOxz8P8Y0vaPYF+fBBzQ4cTTDTw4l3BYzZI9qi3qY=";
     }
     .${system} or throwSystem;
 in

From 61b0c5a9bd002fca43ed761fb30b7aeef70b9265 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 5 Dec 2025 12:03:35 +0000
Subject: [PATCH 029/103] lefthook: 1.13.6 -> 2.0.7

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

diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix
index 38d2ec6c1814..a5493eafe927 100644
--- a/pkgs/by-name/le/lefthook/package.nix
+++ b/pkgs/by-name/le/lefthook/package.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "lefthook";
-  version = "1.13.6";
+  version = "2.0.7";
 in
 buildGoModule {
   inherit pname version;
@@ -17,10 +17,10 @@ buildGoModule {
     owner = "evilmartians";
     repo = "lefthook";
     rev = "v${version}";
-    hash = "sha256-R9Cj2mXgAZFZMvEFF7ky1bAhy6L6Z4fcYPHY0CGVBr0=";
+    hash = "sha256-i+3D5nepZDfFQ1zl1ykefRFA0V5tiUEiqLO9BF+UyFc=";
   };
 
-  vendorHash = "sha256-Md2VTvcbSMQ8ce96wyoS4Uw90MERGEeHSZc9iL0pRNs=";
+  vendorHash = "sha256-IUq2Qa26p7OP7Y78Cio3EvhMWD2VAN50wlBbk7AxZyo=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From ee68d7c6eeae34c4bb8d757050d9c63d0ec921bd Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Mon, 1 Dec 2025 17:12:07 +0100
Subject: [PATCH 030/103] ocamlPackages.oui: 0-unstable-2025-10-08 ->
 0-unstable-2025-11-20

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

diff --git a/pkgs/development/ocaml-modules/oui/default.nix b/pkgs/development/ocaml-modules/oui/default.nix
index 98c9d2e12c73..61515bc7968d 100644
--- a/pkgs/development/ocaml-modules/oui/default.nix
+++ b/pkgs/development/ocaml-modules/oui/default.nix
@@ -15,15 +15,15 @@
 
 buildDunePackage (finalAttrs: {
   pname = "oui";
-  version = "0-unstable-2025-10-08";
+  version = "0-unstable-2025-12-02";
 
-  minimalOCamlVersion = "4.10";
+  minimalOCamlVersion = "4.13";
 
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "ocaml-universal-installer";
-    rev = "2fe2e33c3f8e1744fdd4dab04458043451bf9f62";
-    hash = "sha256-ALQIQ3Ab1Gs2xST9OwsO5IxixzgKlUg7uHZvfHMbv7Q=";
+    rev = "202dae889c4850674f7b40ca8d541f98afa2ba0f";
+    hash = "sha256-pwvp6bJF18NzKh/JSet05VHoJNZ7FKr0Hsi/RJ/TK4U=";
   };
 
   nativeBuildInputs = [

From b8c3041d0cd866640986ca2643a334cb45dbc2f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 5 Dec 2025 16:25:09 +0000
Subject: [PATCH 031/103] git-machete: 3.37.1 -> 3.38.0

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

diff --git a/pkgs/by-name/gi/git-machete/package.nix b/pkgs/by-name/gi/git-machete/package.nix
index 793b26abcc23..ba8d9e1ecc52 100644
--- a/pkgs/by-name/gi/git-machete/package.nix
+++ b/pkgs/by-name/gi/git-machete/package.nix
@@ -9,14 +9,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "git-machete";
-  version = "3.37.1";
+  version = "3.38.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "virtuslab";
     repo = "git-machete";
     tag = "v${version}";
-    hash = "sha256-E1rLMCFnczZqwxC+hNDCyhRFHM39/oQMlaa5D363Ac4=";
+    hash = "sha256-cn++U2Vy6LCEZvtmvDOTQydnAxapUZxLUE+6Kxg7Rq8=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From 646a573b938a1f7f66f0b84443e41fe8f78eb3e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 5 Dec 2025 19:05:11 +0000
Subject: [PATCH 032/103] glooctl: 1.20.3 -> 1.20.4

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

diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix
index acd687d5574b..84715a4b78cf 100644
--- a/pkgs/by-name/gl/glooctl/package.nix
+++ b/pkgs/by-name/gl/glooctl/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "glooctl";
-  version = "1.20.3";
+  version = "1.20.4";
 
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
     rev = "v${version}";
-    hash = "sha256-i2+CEPHK2C34ulY4nRTVw0sNBsHzD1WlKiZRjwHJOVc=";
+    hash = "sha256-RPt353Rwahr9a4xodm//4TZGNuHPGOF/GurxchI2y7s=";
   };
 
   vendorHash = "sha256-zJmp3UWzZSI7G54DTOEOEo2ZIKjM6GZ0Cf5/BukaB4o=";

From a6cad823d5b5a6c3863ebae94c206ccb2520b3f3 Mon Sep 17 00:00:00 2001
From: c6rg0 <gdrozbik08@gmail.com>
Date: Fri, 5 Dec 2025 19:54:04 +0000
Subject: [PATCH 033/103] pastel: 0.10.0 -> 0.11OC.0

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

diff --git a/pkgs/by-name/pa/pastel/package.nix b/pkgs/by-name/pa/pastel/package.nix
index b62666463f8d..2da668d73ac7 100644
--- a/pkgs/by-name/pa/pastel/package.nix
+++ b/pkgs/by-name/pa/pastel/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pastel";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "pastel";
     rev = "v${version}";
-    sha256 = "sha256-kr2aLRd143ksVx42ZDO/NILydObinn3AwPCniXVVmY0=";
+    sha256 = "sha256-ISzZZNh9X91vBbVOpYXnYpO3ztGgIhMJTZmoY2T0FRw=";
   };
 
-  cargoHash = "sha256-u+1KDcC2KGqvmOk6k7hOHE16TMvDg92eMOdNMQQszug=";
+  cargoHash = "sha256-r0QiooMrTqFaXq2Y9wVW45zjtHT7qQ6XTWPRhlLpVQ8=";
 
   meta = {
     description = "Command-line tool to generate, analyze, convert and manipulate colors";

From 68a96d2b6c4ce813f336505b209731741e1d5465 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 5 Dec 2025 22:38:39 +0000
Subject: [PATCH 034/103] mgrep: 0.1.4 -> 0.1.6

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

diff --git a/pkgs/by-name/mg/mgrep/package.nix b/pkgs/by-name/mg/mgrep/package.nix
index 7d1892afd7e3..a72cea1eafb1 100644
--- a/pkgs/by-name/mg/mgrep/package.nix
+++ b/pkgs/by-name/mg/mgrep/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mgrep";
-  version = "0.1.4";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "mixedbread-ai";
     repo = "mgrep";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FwgUK5vPXba8cmGrsSItbhXYDNPxkr7x5u1jPxs3SAA=";
+    hash = "sha256-jGzOwonT4nq0nMUBBp4Y7BvwTerHLzkTMss9glM+uP4=";
   };
 
   pnpmDeps = pnpm.fetchDeps {

From 01f5ceec6a90df9fd8261f92fb3360e7622b9308 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Dec 2025 01:40:18 +0000
Subject: [PATCH 035/103] noxdir: 0.10.0 -> 0.11.0

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

diff --git a/pkgs/by-name/no/noxdir/package.nix b/pkgs/by-name/no/noxdir/package.nix
index 1be47f9cac0b..f4117c1d8c65 100644
--- a/pkgs/by-name/no/noxdir/package.nix
+++ b/pkgs/by-name/no/noxdir/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "noxdir";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "crumbyte";
     repo = "noxdir";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FC2+tXsFu8VWgvAqo+DWWII9c9YhURwzM86S4oU92ms=";
+    hash = "sha256-V6tQ9ZERsbc4Hg/Yo5tkLPUu353m2Mu+kBYDuZ2fWCA=";
   };
 
   vendorHash = "sha256-uRJP21bJ8NlJ0qOG81Gax9LJ+HdPfxLKj1Jjzbweync=";

From 3280601ca82c2a001fdc15cb3c3fcf2bf389e191 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Dec 2025 02:38:11 +0000
Subject: [PATCH 036/103] sqlitestudio: 3.4.17 -> 3.4.18

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

diff --git a/pkgs/by-name/sq/sqlitestudio/package.nix b/pkgs/by-name/sq/sqlitestudio/package.nix
index e8e7e6bf81a7..5e7354416509 100644
--- a/pkgs/by-name/sq/sqlitestudio/package.nix
+++ b/pkgs/by-name/sq/sqlitestudio/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "sqlitestudio";
-  version = "3.4.17";
+  version = "3.4.18";
 
   src = fetchFromGitHub {
     owner = "pawelsalawa";
     repo = "sqlitestudio";
     rev = version;
-    hash = "sha256-nGu1MYI3uaQ/3rc5LlixF6YEUU+pUsB6rn/yjFDGYf0=";
+    hash = "sha256-UYu1ViLzzeZfJhoYoKOMCTbytGeK+2TKhwMR3yGpGrI=";
   };
 
   nativeBuildInputs = [

From dd3abf42dce98b81c7322f212b518b1dbf5ecd1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sat, 6 Dec 2025 09:54:17 +0700
Subject: [PATCH 037/103] =?UTF-8?q?soupault:=205.2.0=20=E2=86=92=205.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/so/soupault/package.nix b/pkgs/by-name/so/soupault/package.nix
index 0a5d332bd0df..67dbfd29f629 100644
--- a/pkgs/by-name/so/soupault/package.nix
+++ b/pkgs/by-name/so/soupault/package.nix
@@ -12,7 +12,7 @@
 
 ocamlPackages.buildDunePackage (finalAttrs: {
   pname = "soupault";
-  version = "5.2.0";
+  version = "5.2.1";
 
   minimalOCamlVersion = "5.3";
 
@@ -21,7 +21,7 @@ ocamlPackages.buildDunePackage (finalAttrs: {
       "https://github.com/PataphysicalSociety/soupault/archive/${finalAttrs.version}.tar.gz"
       "https://codeberg.org/PataphysicalSociety/soupault/archive/${finalAttrs.version}.tar.gz"
     ];
-    hash = "sha256-BuQ2yQzf6PpK6HUfuHDscgKkOBttCrs0zTh37hMUR6E=";
+    hash = "sha256-jwVos7KeQ6fBuBWUslFyvrwDuJ3Wgb7pieERm9+b3Zg=";
   };
 
   nativeBuildInputs = [

From 77bca87567ad141883d0f2570c8761fff946afe5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Dec 2025 07:34:48 +0000
Subject: [PATCH 038/103] microsoft-edge: 142.0.3595.94 -> 143.0.3650.66

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

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 322a04c13816..8f73972ffd68 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -162,11 +162,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "142.0.3595.94";
+  version = "143.0.3650.66";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-P+mPXg0gVWqlJqBS2F/Tuf42BikntPO0R693wPASKQc=";
+    hash = "sha256-Oak7r7ykODJsqzdb+cEmzkUrcezTUe+Xl9oo1lUrq6w=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 3495e2ec93c65e2ec4c1a6747ec8ffb7b0220ddc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Dec 2025 08:27:08 +0000
Subject: [PATCH 039/103] typos-lsp: 0.1.45 -> 0.1.46

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

diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix
index 2c750ac6a9ab..d4c04b90833e 100644
--- a/pkgs/by-name/ty/typos-lsp/package.nix
+++ b/pkgs/by-name/ty/typos-lsp/package.nix
@@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec {
   pname = "typos-lsp";
   # Please update the corresponding VSCode extension too.
   # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
-  version = "0.1.45";
+  version = "0.1.46";
 
   src = fetchFromGitHub {
     owner = "tekumara";
     repo = "typos-lsp";
     tag = "v${version}";
-    hash = "sha256-Yyb2i3ymkxZGmyl3N7hcM2pWuJZRMxcWRNk283wdyy4=";
+    hash = "sha256-cl9Ufoj+O0rmLIQ6iRYuF0xmziGdwtb9GeRWxM+9nP0=";
   };
 
-  cargoHash = "sha256-FMKS49Uz7gwsXoa9VjVlMwUzZWUJ5D2kOYjQro9iNwE=";
+  cargoHash = "sha256-PdLMAoezqmIb7RHU+5e8fnjY8ZO85aMJlznzzM2VWXA=";
 
   # fix for compilation on aarch64
   # see https://github.com/NixOS/nixpkgs/issues/145726

From d75859a667501e5a671eb72f794619e068b1faa3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Dec 2025 09:15:31 +0000
Subject: [PATCH 040/103] naja: 0.2.13 -> 0.3.0

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

diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix
index e596ba1a7553..dfc565a5e09f 100644
--- a/pkgs/by-name/na/naja/package.nix
+++ b/pkgs/by-name/na/naja/package.nix
@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "naja";
-  version = "0.2.13";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "najaeda";
     repo = "naja";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OTQA8Uukhjr0Cy1zqMrxy+wke5cBFFx0OjoenxTBW2Q=";
+    hash = "sha256-u7pblUmMJYYd0o7jzT5g9moPrWdOgqhPXPzx+B90ybg=";
     fetchSubmodules = true;
   };
 

From 15744313a0f6781b7a20ac09110e6d7fecf76500 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Dec 2025 09:28:48 +0000
Subject: [PATCH 041/103] fastmail-desktop: 1.0.5 -> 1.0.6

---
 pkgs/by-name/fa/fastmail-desktop/sources.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/fa/fastmail-desktop/sources.nix b/pkgs/by-name/fa/fastmail-desktop/sources.nix
index d0e895a6cbaf..874ee15e85d2 100644
--- a/pkgs/by-name/fa/fastmail-desktop/sources.nix
+++ b/pkgs/by-name/fa/fastmail-desktop/sources.nix
@@ -1,19 +1,19 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2025-11-29
+# Last updated: 2025-12-06
 { fetchurl, fetchzip }:
 {
   aarch64-darwin = {
-    version = "1.0.5";
+    version = "1.0.6";
     src = fetchurl {
-      url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.0.5-arm64-mac.zip";
-      hash = "sha512-/QozVRmwVxOf97GI6TOoR/pAepSVQn/cVd9jdIi9yoOh82/pHUtHZAiL8K+YmxhjfKGumR9oG7rVbAzgrE+jRg==";
+      url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.0.6-arm64-mac.zip";
+      hash = "sha512-viKPE0LS4dQQxw9jimEGjAl65uSE7XeAcuoLzq7n4i/BEfNo9QjzOzDMbxhwkGY0Ba92coddwJRXaSdx48fTTw==";
     };
   };
   x86_64-linux = {
-    version = "1.0.5";
+    version = "1.0.6";
     src = fetchurl {
-      url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/Fastmail-1.0.5.AppImage";
-      hash = "sha512-p9g9K6hi4tceNlyAIgdkpc7VITwfSifsUBqXQWqMJU3aLAM5SH0WZcFQmcn94DWoq6e3bx3Z+7lCV1twhVLiyw==";
+      url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/Fastmail-1.0.6.AppImage";
+      hash = "sha512-WKMhy7dLoFUqUkevkZAgxgxpz5jD4O9VVaKDYxQs0jXJVt5GUcIHDJ6aZIJG6jyinAC18NzF3vJnOftw8ZWdmg==";
     };
   };
 }

From e3c35ed70a8e0f999c051f589dfbfb5caacd9993 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 6 Dec 2025 11:26:54 +0000
Subject: [PATCH 042/103] alistral: 0.6.0 -> 0.6.2

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

diff --git a/pkgs/by-name/al/alistral/package.nix b/pkgs/by-name/al/alistral/package.nix
index 613c2fced83e..3e9a095f2318 100644
--- a/pkgs/by-name/al/alistral/package.nix
+++ b/pkgs/by-name/al/alistral/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "alistral";
-  version = "0.6.0";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "RustyNova016";
     repo = "Alistral";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IJ12v/mmrs6jW6jWPHEjtS74lSLWSIvJejQz4BTFbEQ=";
+    hash = "sha256-ot8FvHDsW8pA4U1Ul4gNiBhDDTN/sRmrCShCySrTORQ=";
   };
 
-  cargoHash = "sha256-x695jOKR/s5J/51LUqPlNMgGzsoq8D8KR9gLjyLPfkA=";
+  cargoHash = "sha256-BfGR4Y9Tn5QtXfGirZ2UsUzhJ7rCfpxkNM83pHls7u8=";
 
   buildNoDefaultFeatures = true;
   # Would be cleaner with an "--all-features" option

From 9c9668ade470d9dcdff8849351429af5080fb5a2 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sat, 6 Dec 2025 13:37:41 +0100
Subject: [PATCH 043/103] opencv: fix hardcoded source path

This should fix builds for non-default fetchedSourceNameDefault and is a no-op for the default.
---
 pkgs/development/libraries/opencv/4.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 9451668a5837..452c234f646a 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -293,7 +293,7 @@ effectiveStdenv.mkDerivation {
   cudaPropagateToOutput = "cxxdev";
 
   postUnpack = optionalString buildContrib ''
-    cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
+    cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/${src.name}/opencv_contrib"
   '';
 
   # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV.
@@ -325,7 +325,7 @@ effectiveStdenv.mkDerivation {
     installExtraFile ade
     + optionalString enableIpp (installExtraFiles ippicv)
     + (optionalString buildContrib ''
-      cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/source/opencv_contrib")
+      cmakeFlagsArray+=("-DOPENCV_EXTRA_MODULES_PATH=$NIX_BUILD_TOP/${src.name}/opencv_contrib")
 
       ${installExtraFiles vgg}
       ${installExtraFiles boostdesc}

From d16b90c19c438e248d3178a83236876fc51247d7 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 6 Dec 2025 21:04:15 +0800
Subject: [PATCH 044/103] rustdesk-flutter: 1.4.3 -> 1.4.4

---
 pkgs/by-name/ru/rustdesk-flutter/package.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix
index 23617a6a1bf3..c4e42b91fafb 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@@ -30,11 +30,13 @@
   yq,
   callPackage,
   addDriverRunpath,
+  perl,
+  openssl,
 }:
 let
   flutterRustBridge = rustPlatform.buildRustPackage rec {
     pname = "flutter_rust_bridge_codegen";
-    version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.4.1/.github/workflows/bridge.yml#L10
+    version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.4.4/.github/workflows/bridge.yml#L10
 
     src = fetchFromGitHub {
       owner = "fzyzcjy";
@@ -64,18 +66,19 @@ let
 in
 flutter329.buildFlutterApplication rec {
   pname = "rustdesk";
-  version = "1.4.3";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "rustdesk";
     repo = "rustdesk";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-TCy1AyqBHqrIlip2ZqdzIaYHjIYddThI+YmbcQHaDqQ=";
+    hash = "sha256-o7jsVWiCkHaKFpAu27r/Lr1Q9g7uR/OYJdwsiQeDJUA=";
   };
 
   strictDeps = true;
   env.VCPKG_ROOT = "/homeless-shelter"; # idk man, makes the build go since https://github.com/21pages/hwcodec/commit/1873c34e3da070a462540f61c0b782b7ab15dc84
+  env.OPENSSL_NO_VENDOR = true;
 
   # Configure the Flutter/Dart build
   sourceRoot = "${src.name}/flutter";
@@ -92,7 +95,7 @@ flutter329.buildFlutterApplication rec {
       src
       patches
       ;
-    hash = "sha256-AOKsTPuq1VD6MR4z1K9l2Clbl8d/7IijTsnMRgBXvyw=";
+    hash = "sha256-gd2vS+p+1QtOWZcRWJWahFGo5rFG+soqxx3vJYSYJUo=";
   };
 
   dontCargoBuild = true;
@@ -116,6 +119,7 @@ flutter329.buildFlutterApplication rec {
     rustPlatform.bindgenHook
     ffigen
     yq
+    perl
   ];
 
   buildInputs = [
@@ -135,6 +139,7 @@ flutter329.buildFlutterApplication rec {
     libyuv
     pam
     xdotool
+    openssl
   ];
 
   prePatch = ''

From 08982f4614dfe4dea785770d080b3deffbccbe9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Dec 2025 13:20:08 +0000
Subject: [PATCH 045/103] obs-cmd: 0.19.2 -> 0.20.1

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

diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix
index 1eabe9359f10..a09fb90a91cc 100644
--- a/pkgs/by-name/ob/obs-cmd/package.nix
+++ b/pkgs/by-name/ob/obs-cmd/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "obs-cmd";
-  version = "0.19.2";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "grigio";
     repo = "obs-cmd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-a7GUv14iJLrgXu6y5uJalD1cx723aIlPLDPOOoemtIY=";
+    hash = "sha256-67kMAUwgrQcGipsbKo0kubkVJA4/T4nfqghEZlhnvHU=";
   };
 
-  cargoHash = "sha256-ZWVNLI900SZhXLMV2/v3WT2eqv+4XofpIgm/f/0eE+U=";
+  cargoHash = "sha256-t0R2QMmNpLgqmqLVL4hgEcqN0xIUIK3gIwxZxzkupbQ=";
 
   meta = {
     description = "Minimal CLI to control OBS Studio via obs-websocket";

From f8ff284e334cbe2be07af25d2d2914c12c258e84 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Dec 2025 13:32:53 +0000
Subject: [PATCH 046/103] vacuum-tube: 1.4.1 -> 1.4.2

---
 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 4f0e7d58f641..6457b79eb00f 100644
--- a/pkgs/by-name/va/vacuum-tube/package.nix
+++ b/pkgs/by-name/va/vacuum-tube/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "vacuum-tube";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "shy1132";
     repo = "VacuumTube";
     tag = "v${version}";
-    hash = "sha256-NZdrueEOzir1/1RncSWk/eDEXFqo3bIhKVspruP4k8s=";
+    hash = "sha256-F1F1p+jQnCiVTZZez30JmykgC8oQLdZ8GEZTkdf3qRs=";
   };
 
-  npmDepsHash = "sha256-JfsZI2V2nsoa/boQ9jBrEK+CkGa8KdsJriqnAv+YpmY=";
+  npmDepsHash = "sha256-BzoKKDllytCByjou48KzyLU1wtAzJoJwRNJb9OwRT9o=";
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = true;

From 304559988386a2db88e40fc02835559db8ac8aa7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Dec 2025 14:02:12 +0000
Subject: [PATCH 047/103] gat: 0.25.7 -> 0.25.8

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

diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix
index de7aa57978fd..b4a27a6e997c 100644
--- a/pkgs/by-name/ga/gat/package.nix
+++ b/pkgs/by-name/ga/gat/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "gat";
-  version = "0.25.7";
+  version = "0.25.8";
 
   src = fetchFromGitHub {
     owner = "koki-develop";
     repo = "gat";
     tag = "v${version}";
-    hash = "sha256-omdIWyBdKNYSzaCZv1vZGPv3L7ileSVwuaX6C+ZUZXY=";
+    hash = "sha256-OT0TiYvbeybWPk2Sku38ip+qmUUuFRMu1wC9936EByY=";
   };
 
-  vendorHash = "sha256-02q83ybAy2U1kdBKV6jJuK1zGFHRsCeEJdqJgWmNQBc=";
+  vendorHash = "sha256-LOim/rW8Uz5stpIQj2Ubx4F3bTv6nNAn2ZbWqW6B4rU=";
 
   env.CGO_ENABLED = 0;
 

From ad2ba44dc833ca1eff560ac30681df8becb75acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= <daniel@serbanescu.dk>
Date: Sat, 6 Dec 2025 15:05:48 +0100
Subject: [PATCH 048/103] tauon: 8.1.4 -> 8.2.2

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

diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix
index bdbf27dc97c0..7514d7e13107 100644
--- a/pkgs/by-name/ta/tauon/package.nix
+++ b/pkgs/by-name/ta/tauon/package.nix
@@ -48,14 +48,14 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "tauon";
-  version = "8.1.4";
+  version = "8.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Taiko2k";
     repo = "Tauon";
     tag = "v${version}";
-    hash = "sha256-AV8B09H/25+2ZOoGux2/A4xP8sBBpRP197JYkS9/awk=";
+    hash = "sha256-d7bEC68ZJthJE/AlcUqBSNM4L4YAjwHXTiWDCtKf598=";
   };
 
   postUnpack = ''

From e3c36d8b8b0b688107be767d8e762ff006b1390b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= <daniel@serbanescu.dk>
Date: Sat, 6 Dec 2025 15:11:28 +0100
Subject: [PATCH 049/103] lynxpresence: 4.4.1 -> 4.6.2

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

diff --git a/pkgs/by-name/ta/tauon/package.nix b/pkgs/by-name/ta/tauon/package.nix
index 7514d7e13107..7a3a4902d640 100644
--- a/pkgs/by-name/ta/tauon/package.nix
+++ b/pkgs/by-name/ta/tauon/package.nix
@@ -32,12 +32,12 @@ let
   # fork of pypresence, to be reverted if/when there's an upstream release
   lynxpresence = python3Packages.buildPythonPackage rec {
     pname = "lynxpresence";
-    version = "4.4.1";
+    version = "4.6.2";
     pyproject = true;
 
     src = fetchPypi {
       inherit pname version;
-      hash = "sha256-y/KboyhEGs9RvyKayEIQu2+WaiQNOdsHDl1/pEoqEkQ=";
+      hash = "sha256-w4WShLTTSf4JGQVL4lTkbOLL8C7cjnf8WwHyfwKK2zA=";
     };
 
     build-system = with python3Packages; [ setuptools ];

From 5ee7dca6a11aa71cf4e26dc7f1c8462dda15aa3c Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Tue, 16 Sep 2025 18:38:44 +0200
Subject: [PATCH 050/103] grooveauthor: init at 1.1.3

Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
 pkgs/by-name/gr/grooveauthor/package.nix | 95 ++++++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 pkgs/by-name/gr/grooveauthor/package.nix

diff --git a/pkgs/by-name/gr/grooveauthor/package.nix b/pkgs/by-name/gr/grooveauthor/package.nix
new file mode 100644
index 000000000000..261ac7b44723
--- /dev/null
+++ b/pkgs/by-name/gr/grooveauthor/package.nix
@@ -0,0 +1,95 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+  autoPatchelfHook,
+  copyDesktopItems,
+  makeDesktopItem,
+  wrapGAppsHook3,
+  alsa-lib,
+  dotnetCorePackages,
+  gtk3,
+  libGL,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "grooveauthor";
+  version = "1.1.3";
+
+  src = fetchzip {
+    url = "https://github.com/PerryAsleep/GrooveAuthor/releases/download/v${finalAttrs.version}/GrooveAuthor-v${finalAttrs.version}-linux-x64.tar.gz";
+    hash = "sha256-XuELs7Sj/M32ros5clKxKuVo/CdCja39Lwc+zsFGvFU=";
+    stripRoot = false;
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    copyDesktopItems
+    wrapGAppsHook3
+  ];
+
+  runtimeDependencies = [ gtk3 ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      desktopName = "GrooveAuthor";
+      name = finalAttrs.pname;
+      genericName = "Editor for StepMania";
+      icon = "GrooveAuthor";
+      exec = "GrooveAuthor";
+      categories = [
+        "AudioVideo"
+        "AudioVideoEditing"
+      ];
+      keywords = [
+        "GrooveAuthor"
+        "StepMania"
+        "ITG"
+        "ITGmania"
+        "DDR"
+        "PIU"
+        "Pump It Up"
+        "Dance"
+        "StepF2"
+        "StepP1"
+      ];
+      prefersNonDefaultGPU = true;
+      singleMainWindow = true;
+      terminal = false;
+    })
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm444 grooveauthor/Icon.svg $out/share/icons/hicolor/scalable/apps/GrooveAuthor.svg
+    mv grooveauthor $out/bin
+    rm $out/bin/{GrooveAuthor.desktop,Icon.svg}
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --set DOTNET_ROOT ${dotnetCorePackages.runtime_8_0}/share/dotnet
+      --suffix LD_LIBRARY_PATH : "${
+        lib.makeLibraryPath [
+          alsa-lib
+          libGL
+        ]
+      }"
+    )
+  '';
+
+  meta = {
+    description = "GrooveAuthor is an editor for authoring StepMania charts";
+    homepage = "https://github.com/PerryAsleep/GrooveAuthor";
+    license = with lib.licenses; [
+      mit
+      mspl
+    ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    platforms = [ "x86_64-linux" ];
+    maintainers = with lib.maintainers; [ ungeskriptet ];
+    mainProgram = "GrooveAuthor";
+  };
+})

From b3a49a49478f4fbe7822ca6a29b546850e8415da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Dec 2025 18:41:19 +0000
Subject: [PATCH 051/103] bikeshed: 5.4.2 -> 7.0.0

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

diff --git a/pkgs/by-name/bi/bikeshed/package.nix b/pkgs/by-name/bi/bikeshed/package.nix
index 2774c5e7d208..cbe0a347ebfc 100644
--- a/pkgs/by-name/bi/bikeshed/package.nix
+++ b/pkgs/by-name/bi/bikeshed/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "bikeshed";
-  version = "5.4.2";
+  version = "7.0.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-6V4hj+Ech/vft9cNPwg2LqKTPzGqgVERooOok3lda94=";
+    hash = "sha256-KDa751bPpyu++7N5rTN1XvOXZ2qOFSaajw7dIe7CAWw=";
   };
 
   build-system = [ python3Packages.setuptools ];

From 4e4dd1114896e5dcce0f048de96f7c725af57f08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Dec 2025 18:57:45 +0000
Subject: [PATCH 052/103] mise: 2025.11.11 -> 2025.12.0

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

diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix
index bf1207cddd03..0ab5d6eb33cc 100644
--- a/pkgs/by-name/mi/mise/package.nix
+++ b/pkgs/by-name/mi/mise/package.nix
@@ -22,16 +22,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mise";
-  version = "2025.11.11";
+  version = "2025.12.0";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "mise";
     rev = "v${version}";
-    hash = "sha256-Qvxh3mxT6Eb2T2x83TonlmdBdmor5AqbVadUUG9p1o8=";
+    hash = "sha256-QQE8Dt/juQTf1E+zigOpqlQmpaiTWr+MTlLduCkjxDU=";
   };
 
-  cargoHash = "sha256-G2cLBPKXkK6LcK2wGIknz9TH2RGndmc4/3oq/QKkw2c=";
+  cargoHash = "sha256-su7HbmVEEUDvqj7147ATln+7ra/dgFCs8q1h+aWqh4Q=";
 
   nativeBuildInputs = [
     installShellFiles

From 8f768107446b059a86af89755f5a861c2bec022b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 6 Dec 2025 19:05:46 +0000
Subject: [PATCH 053/103] alistral: 0.6.2 -> 0.6.3

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

diff --git a/pkgs/by-name/al/alistral/package.nix b/pkgs/by-name/al/alistral/package.nix
index 3e9a095f2318..a94c8219489f 100644
--- a/pkgs/by-name/al/alistral/package.nix
+++ b/pkgs/by-name/al/alistral/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "alistral";
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "RustyNova016";
     repo = "Alistral";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ot8FvHDsW8pA4U1Ul4gNiBhDDTN/sRmrCShCySrTORQ=";
+    hash = "sha256-lbdyE/k28fJzrOQEKDL8ZLnm6tNcAM4tsfHpcGlJB9s=";
   };
 
-  cargoHash = "sha256-BfGR4Y9Tn5QtXfGirZ2UsUzhJ7rCfpxkNM83pHls7u8=";
+  cargoHash = "sha256-smoUGJSMmRKdnUz4L+LvPOH/A6CHVmkiHxdyesu+BTw=";
 
   buildNoDefaultFeatures = true;
   # Would be cleaner with an "--all-features" option

From c5021d9e39a5f4cede2a658ba7ba44c017288152 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Dec 2025 20:02:27 +0000
Subject: [PATCH 054/103] ghorg: 1.11.6 -> 1.11.7

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

diff --git a/pkgs/by-name/gh/ghorg/package.nix b/pkgs/by-name/gh/ghorg/package.nix
index 27bb61be7a3b..ac7a035de0d5 100644
--- a/pkgs/by-name/gh/ghorg/package.nix
+++ b/pkgs/by-name/gh/ghorg/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "ghorg";
-  version = "1.11.6";
+  version = "1.11.7";
 
   src = fetchFromGitHub {
     owner = "gabrie30";
     repo = "ghorg";
     rev = "v${version}";
-    sha256 = "sha256-M1Kd0cpV/GRbxGdGs6nMn9DEnUdrSh9J5U52j7Hm6S8=";
+    sha256 = "sha256-3aFEpSyKICJ6jWZAMprE4nV6OxMFVvM82bmKSV87Sng=";
   };
 
   doCheck = false;

From d5811e8ccbada1e49369b715635ecbc8aa491d3f Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 6 Dec 2025 20:03:31 +0000
Subject: [PATCH 055/103] firefox-beta-unwrapped: 145.0b9 -> 146.0b9

---
 .../networking/browsers/firefox/packages/firefox-beta.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
index 3bfbca592ae1..df74e5e63ae3 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
   pname = "firefox-beta";
   binaryName = "firefox-beta";
-  version = "145.0b9";
+  version = "146.0b9";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "5dee0ec8bb66153d1a5905692c3e9b48e91a1d55728f9e173dfb08f9d0e781fcc8ba978a9e6a8948e56d26cb064bda7c0311260a8828752a1390fdb0e18ce769";
+    sha512 = "77a9a4617f3d24f7eff77289e03e53373998ae617f601893be255a1eba85dd81fea5a26976159a25187aada7401ad8da6cbb0b5a3650c4936a7445a3a7f55d42";
   };
 
   meta = {

From 011c893dc9879b4fb9f9dcf7a87dd6d809548d9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Dec 2025 20:08:43 +0000
Subject: [PATCH 056/103] syncthing: 2.0.10 -> 2.0.12

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 012a4a8b1661..8e68c1e9f0a7 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -19,16 +19,16 @@ let
     }:
     buildGoModule rec {
       pname = stname;
-      version = "2.0.10";
+      version = "2.0.12";
 
       src = fetchFromGitHub {
         owner = "syncthing";
         repo = "syncthing";
         tag = "v${version}";
-        hash = "sha256-N0+i5sj/cTPDv6q428b3Y0hsPRxIl96+RIuS1AyeTbc=";
+        hash = "sha256-bWClKODxzcSbKiKFcgDKbRGih8KaSeVpltiFDAE8sHM=";
       };
 
-      vendorHash = "sha256-iYTAnEy0MqJaTz/cdpteealyviwVrpwDzVigo8nnXqs=";
+      vendorHash = "sha256-Xiod2Bd+uXcOpZ0rt8my8jkNdkdUhuoz5fcce+6JMXY=";
 
       nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
         # Recent versions of macOS seem to require binaries to be signed when

From 8e64f8ffa6fddf480b13331dfa3cc8a708b11932 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Dec 2025 20:27:18 +0000
Subject: [PATCH 057/103] gnote: 49.0 -> 49.1

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

diff --git a/pkgs/by-name/gn/gnote/package.nix b/pkgs/by-name/gn/gnote/package.nix
index 20b5fd96f3d1..66c9e7046f10 100644
--- a/pkgs/by-name/gn/gnote/package.nix
+++ b/pkgs/by-name/gn/gnote/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnote";
-  version = "49.0";
+  version = "49.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-GXUaLyN3Kb+fSElVQKNeNG5FwbobAW25y3VNReztCl0=";
+    hash = "sha256-l845YCx31l3w1d0z4HtbhtakWFdtzh5rbtGx5If14HM=";
   };
 
   buildInputs = [

From ccf65fa2c6f01bca8007b7bb4d04b914c09ddf5b Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Sun, 7 Dec 2025 07:54:20 +0800
Subject: [PATCH 058/103] splayer: 3.0.0-beta.5 -> 3.0.0-beta.6

---
 pkgs/by-name/sp/splayer/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/sp/splayer/package.nix b/pkgs/by-name/sp/splayer/package.nix
index ff2eeae10d2d..365061b56d0b 100644
--- a/pkgs/by-name/sp/splayer/package.nix
+++ b/pkgs/by-name/sp/splayer/package.nix
@@ -10,28 +10,28 @@
   makeDesktopItem,
   nix-update-script,
 }:
-stdenv.mkDerivation (final: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "splayer";
-  version = "3.0.0-beta.5";
+  version = "3.0.0-beta.6";
 
   src = fetchFromGitHub {
     owner = "imsyy";
     repo = "SPlayer";
-    tag = "v${final.version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = false;
-    hash = "sha256-glYq0rHEV2xWoKznpMIU6klUxk1lXYOq4TBRuyTQgOM=";
+    hash = "sha256-7guh5KJ9RbYCiifH0ERXbIXxoJDxanUAHAf/zux7yU4=";
   };
 
   pnpm = pnpm_10;
 
-  pnpmDeps = final.pnpm.fetchDeps {
-    inherit (final) pname version src;
+  pnpmDeps = finalAttrs.pnpm.fetchDeps {
+    inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-ZyQcuZYwfc0a5PgfYgvp2GdfV3cBf5sb8oxJtI4+kp4=";
+    hash = "sha256-3t9Qx+1OQwqVvzgYssP8azGG/PNSJkrG614wQh0W4WQ=";
   };
 
   nativeBuildInputs = [
-    final.pnpm.configHook
+    finalAttrs.pnpm.configHook
     nodejs
     makeWrapper
     copyDesktopItems

From a5f0c9c4162f4b4abde081174438b0b6a2647646 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Dec 2025 03:45:22 +0000
Subject: [PATCH 059/103] ghz: 0.120.0 -> 0.121.0

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

diff --git a/pkgs/by-name/gh/ghz/package.nix b/pkgs/by-name/gh/ghz/package.nix
index a5d37a552d22..993911fa52ff 100644
--- a/pkgs/by-name/gh/ghz/package.nix
+++ b/pkgs/by-name/gh/ghz/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "ghz";
-  version = "0.120.0";
+  version = "0.121.0";
 
   src = fetchFromGitHub {
     owner = "bojand";
     repo = "ghz";
     rev = "v${version}";
-    sha256 = "sha256-EzyQbMoR4veHbc9VaNfiXMi18wXbTbDPfDxo5NCk7CE=";
+    sha256 = "sha256-hfHhsargP/odmpbfO24aDXr5m9VeDNOYyi1n9ji2trU=";
   };
 
-  vendorHash = "sha256-7TrYWmVKxHKVTyiIak7tRYKE4hgG/4zfsM76bJRxnAk=";
+  vendorHash = "sha256-eu0YPKddYfjbOkF0yrUPu2PsjsyIn2pBm9+CDrRlB2k=";
 
   subPackages = [
     "cmd/ghz"

From a7884ed84b655d4fc634322465a4c41d7178943d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Dec 2025 08:21:19 +0000
Subject: [PATCH 060/103] gcsfuse: 3.5.2 -> 3.5.4

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

diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix
index 74bd63f082a1..b6d6e8508e95 100644
--- a/pkgs/by-name/gc/gcsfuse/package.nix
+++ b/pkgs/by-name/gc/gcsfuse/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gcsfuse";
-  version = "3.5.2";
+  version = "3.5.4";
 
   src = fetchFromGitHub {
     owner = "googlecloudplatform";
     repo = "gcsfuse";
     rev = "v${version}";
-    hash = "sha256-48m4/k9BLwFrNIXcRY25jvNd3E/9zwEsuf2ZVG00svM=";
+    hash = "sha256-+FMVAFiOH6LH5CODp7XwCbB98vRmDTNcfSy0qTQbuOI=";
   };
 
   vendorHash = "sha256-gC7ngmy4xIkEp2lHOfGyDaZNqy/J4Uy8ox8F2uP7P/0=";

From 306fdecc120038e8508aac927b74711549e5640b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Dec 2025 12:39:40 +0000
Subject: [PATCH 061/103] wiliwili: 1.5.2 -> 1.5.3

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

diff --git a/pkgs/by-name/wi/wiliwili/package.nix b/pkgs/by-name/wi/wiliwili/package.nix
index 193ecc8aec8b..c2d6343c7710 100644
--- a/pkgs/by-name/wi/wiliwili/package.nix
+++ b/pkgs/by-name/wi/wiliwili/package.nix
@@ -18,14 +18,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wiliwili";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "xfangfang";
     repo = "wiliwili";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-lcHKbEYlOznu9WhWX7ZoOCnxr6h/AJCLbjLmc2ZZTbg=";
+    hash = "sha256-NPJ1PLO6eqm4rBn4t965S0lqzT+npfYLWN6FKYCpnlQ=";
   };
 
   nativeBuildInputs = [

From cd6427db01db06c832cd5e478af85a95cfbaaf24 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sun, 7 Dec 2025 10:04:01 -0400
Subject: [PATCH 062/103] devenv: fix build

---
 pkgs/by-name/de/devenv/package.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix
index c2ff30d72df7..1d9633ccf52e 100644
--- a/pkgs/by-name/de/devenv/package.nix
+++ b/pkgs/by-name/de/devenv/package.nix
@@ -20,12 +20,16 @@ let
   devenvNixVersion = "2.30.4";
 
   devenv_nix =
-    (nixVersions.git.overrideSource (fetchFromGitHub {
-      owner = "cachix";
-      repo = "nix";
-      rev = "devenv-${devenvNixVersion}";
-      hash = "sha256-3+GHIYGg4U9XKUN4rg473frIVNn8YD06bjwxKS1IPrU=";
-    })).overrideAttrs
+    (
+      (nixVersions.nixComponents_git.override { version = devenvNixVersion; })
+      .nix-everything.overrideSource
+      (fetchFromGitHub {
+        owner = "cachix";
+        repo = "nix";
+        rev = "devenv-${devenvNixVersion}";
+        hash = "sha256-3+GHIYGg4U9XKUN4rg473frIVNn8YD06bjwxKS1IPrU=";
+      })
+    ).overrideAttrs
       (old: {
         pname = "devenv-nix";
         version = devenvNixVersion;

From 5bf5d152a1274faed8e3dd615e4d569d8ee6461a Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sun, 7 Dec 2025 23:34:56 +0800
Subject: [PATCH 063/103] cobang: 1.9.1 -> 2.3.1

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

diff --git a/pkgs/by-name/co/cobang/package.nix b/pkgs/by-name/co/cobang/package.nix
index d33a566f4168..d91d8ba0aaf6 100644
--- a/pkgs/by-name/co/cobang/package.nix
+++ b/pkgs/by-name/co/cobang/package.nix
@@ -18,14 +18,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "cobang";
-  version = "1.9.1";
+  version = "2.3.1";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "hongquan";
     repo = "CoBang";
     tag = "v${version}";
-    hash = "sha256-jF6hWpOPbJKRyUWRyZdp4OziCdJupyFpNdrsiOdjByA=";
+    hash = "sha256-8qnF1w4zNYdH3QrzBnNjsPnOSMMD48H2tcTxPkemGEM=";
   };
 
   nativeBuildInputs = [
@@ -58,6 +58,7 @@ python3Packages.buildPythonApplication rec {
     pillow
     pygobject3
     python-zbar
+    qrcode
   ];
 
   # Wrapping this manually for SVG recognition

From 173b500bbfee3df8ecb83aedc1a2103b786cc148 Mon Sep 17 00:00:00 2001
From: ZHAO Jin-Xiang <xiaoxiangmoe@gmail.com>
Date: Sun, 7 Dec 2025 00:58:18 +0800
Subject: [PATCH 064/103] claude-code: fix nix update script

---
 pkgs/by-name/cl/claude-code/package.nix |  8 ++++----
 pkgs/by-name/cl/claude-code/update.sh   | 11 ++++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 6d8fcfbd239c..f3b659a3f577 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -1,3 +1,7 @@
+# NOTE: Use the following command to update the package
+# ```sh
+# nix-shell maintainers/scripts/update.nix --argstr commit true --arg predicate '(path: pkg: builtins.elem path [["claude-code"] ["vscode-extensions" "anthropic" "claude-code"]])'
+# ```
 {
   lib,
   buildNpmPackage,
@@ -7,10 +11,6 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  # NOTE: Use the following command to update the package
-  # ```sh
-  # nix-shell maintainers/scripts/update.nix --argstr commit true --argstr package vscode-extensions.anthropic.claude-code && nix-shell maintainers/scripts/update.nix --argstr commit true --argstr package claude-code
-  # ```
   version = "2.0.59";
 
   src = fetchzip {
diff --git a/pkgs/by-name/cl/claude-code/update.sh b/pkgs/by-name/cl/claude-code/update.sh
index a3fe5d871a99..870f73308600 100755
--- a/pkgs/by-name/cl/claude-code/update.sh
+++ b/pkgs/by-name/cl/claude-code/update.sh
@@ -1,5 +1,5 @@
-#!/usr/bin/env nix-shell
-#!nix-shell --pure --keep NIX_PATH -i bash --packages nodejs nix-update git cacert
+#!/usr/bin/env nix
+#!nix shell --ignore-environment .#cacert .#nodejs .#git .#nix-update .#nix .#gnused .#findutils .#bash --command bash
 
 set -euo pipefail
 
@@ -7,4 +7,9 @@ version=$(npm view @anthropic-ai/claude-code version)
 
 # Update version and hashes
 AUTHORIZED=1 NIXPKGS_ALLOW_UNFREE=1 nix-update claude-code --version="$version" --generate-lockfile
-nix-update vscode-extensions.anthropic.claude-code --use-update-script --version "$version"
+
+# nix-update can't update package-lock.json along with npmDepsHash
+# TODO: Remove this workaround if nix-update can update package-lock.json along with npmDepsHash.
+(nix-build --expr '((import ./.) { system = builtins.currentSystem; }).claude-code.npmDeps.overrideAttrs { outputHash = ""; outputHashAlgo = "sha256"; }' 2>&1 || true) \
+| sed -nE '$s/ *got: *(sha256-[A-Za-z0-9+/=-]+).*/\1/p' \
+| xargs -I{} sed -i 's|npmDepsHash = "sha256-[^"]*";|npmDepsHash = "{}";|' pkgs/by-name/cl/claude-code/package.nix

From f702464472074fa1fccb66116d8a55e5d875fe81 Mon Sep 17 00:00:00 2001
From: ZHAO Jin-Xiang <xiaoxiangmoe@gmail.com>
Date: Sun, 7 Dec 2025 15:49:59 +0000
Subject: [PATCH 065/103] vscode-extensions.anthropic.claude-code: 2.0.59 ->
 2.0.61

---
 .../vscode/extensions/anthropic.claude-code/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 0f9df73767fa..511cb04a355a 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.59";
-    hash = "sha256-rVbKynudnoXLgd5upcCWqkrZsV4739d6qV31HWI2TX0=";
+    version = "2.0.61";
+    hash = "sha256-dZu2CIjRyvAhTRwOuQV2s0SoEUQko+dQfnQg6ECwLv4=";
   };
 
   meta = {

From cff89c1161aa560f9981694df58c16685199f605 Mon Sep 17 00:00:00 2001
From: ZHAO Jin-Xiang <xiaoxiangmoe@gmail.com>
Date: Sun, 7 Dec 2025 15:50:07 +0000
Subject: [PATCH 066/103] claude-code: 2.0.59 -> 2.0.61

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

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index d6d52f786062..857d56f650e8 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.59",
+  "version": "2.0.61",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.59",
+      "version": "2.0.61",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index f3b659a3f577..95ced91e418f 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -11,14 +11,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.59";
+  version = "2.0.61";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-Fl7KpzW8PemrCqQRju8/oWBTZ1Z3cCg0RZ1CAfMQAkY=";
+    hash = "sha256-701TwdPtqudwKuphVngMiI6TbM9y1S/HFVTREhkHgdY=";
   };
 
-  npmDepsHash = "sha256-VaEsT9Iw+iIqWFqOrpZS2O8PRhNOcxwdPHM3SbnhN8s=";
+  npmDepsHash = "sha256-lPWrFSintH3/4T5IKSH9tBX3q3Ow/L0ptk+NsVGR+uQ=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From e57c6f852e2e44a91d9e026b33807a0b2c0a9556 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 7 Dec 2025 12:35:32 +0100
Subject: [PATCH 067/103] treewide: reduce maintenance by globin

---
 ci/OWNERS                                            | 12 ++++++------
 maintainers/team-list.nix                            |  1 -
 nixos/tests/docker-registry.nix                      |  1 -
 nixos/tests/gitlab.nix                               |  1 -
 nixos/tests/roundcube.nix                            |  4 ++--
 pkgs/applications/misc/zathura/core/default.nix      |  2 +-
 pkgs/applications/misc/zathura/default.nix           |  4 +---
 pkgs/applications/misc/zathura/wrapper.nix           |  1 -
 pkgs/applications/version-management/git/default.nix |  1 -
 pkgs/applications/video/mpv/default.nix              |  1 -
 pkgs/by-name/bo/borgbackup/package.nix               |  1 -
 pkgs/by-name/ch/checksec/package.nix                 |  1 -
 pkgs/by-name/cl/clamav/package.nix                   |  1 -
 pkgs/by-name/cl/claws-mail/package.nix               |  1 -
 pkgs/by-name/dm/dmenu/package.nix                    |  1 -
 pkgs/by-name/dn/dnsmasq/package.nix                  |  1 -
 pkgs/by-name/do/dovecot/package.nix                  |  1 -
 pkgs/by-name/do/dovecot_pigeonhole/package.nix       |  2 +-
 pkgs/by-name/fd/fd/package.nix                       |  1 -
 pkgs/by-name/fe/feh/package.nix                      |  1 -
 pkgs/by-name/hu/hub/package.nix                      |  2 +-
 pkgs/by-name/i3/i3status-rust/package.nix            |  1 -
 pkgs/by-name/ip/iproute2/package.nix                 |  1 -
 pkgs/by-name/li/libvirt/package.nix                  |  1 -
 pkgs/by-name/op/opsdroid/package.nix                 |  4 +---
 pkgs/by-name/po/postfix/package.nix                  |  1 -
 pkgs/by-name/re/redis/package.nix                    |  4 +---
 pkgs/by-name/rs/rspamd/package.nix                   |  1 -
 pkgs/by-name/vi/virt-manager/package.nix             |  1 -
 pkgs/by-name/wi/wireguard-tools/package.nix          |  1 -
 pkgs/development/libraries/avahi/default.nix         |  1 -
 pkgs/development/python-modules/delorean/default.nix |  2 +-
 .../python-modules/get-video-properties/default.nix  |  2 +-
 .../python-modules/ibm-cloud-sdk-core/default.nix    |  3 +--
 .../python-modules/ibm-watson/default.nix            |  2 +-
 .../python-modules/mattermostdriver/default.nix      |  2 +-
 pkgs/development/python-modules/mockupdb/default.nix |  2 +-
 pkgs/development/python-modules/motor/default.nix    |  2 +-
 pkgs/development/python-modules/nbformat/default.nix |  2 +-
 .../opsdroid-get-image-size/default.nix              |  2 +-
 .../development/python-modules/puremagic/default.nix |  2 +-
 pkgs/development/python-modules/pycron/default.nix   |  2 +-
 .../development/python-modules/udatetime/default.nix |  2 +-
 pkgs/development/python-modules/watchgod/default.nix |  2 +-
 pkgs/servers/roundcube/default.nix                   |  1 -
 pkgs/servers/sql/mariadb/connector-c/default.nix     |  2 +-
 pkgs/tools/security/sslscan/default.nix              |  1 -
 47 files changed, 28 insertions(+), 60 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index 51888466bd1a..10d5c5091bf6 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -382,12 +382,12 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/applications/editors/vscode/extensions
 
 # PHP interpreter, packages, extensions, tests and documentation
-/doc/languages-frameworks/php.section.md          @aanderse @globin @ma27 @talyz
-/nixos/tests/php                                  @aanderse @globin @ma27 @talyz
-/pkgs/build-support/php/build-pecl.nix            @aanderse @globin @ma27 @talyz
-/pkgs/development/interpreters/php       @jtojnar @aanderse @globin @ma27 @talyz
-/pkgs/development/php-packages                    @aanderse @globin @ma27 @talyz
-/pkgs/top-level/php-packages.nix         @jtojnar @aanderse @globin @ma27 @talyz
+/doc/languages-frameworks/php.section.md          @aanderse @ma27 @talyz
+/nixos/tests/php                                  @aanderse @ma27 @talyz
+/pkgs/build-support/php/build-pecl.nix            @aanderse @ma27 @talyz
+/pkgs/development/interpreters/php       @jtojnar @aanderse @ma27 @talyz
+/pkgs/development/php-packages                    @aanderse @ma27 @talyz
+/pkgs/top-level/php-packages.nix         @jtojnar @aanderse @ma27 @talyz
 
 # Docker tools
 /pkgs/build-support/docker                       @roberth @jhol
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 1766ae022e3a..47cf18b8281d 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -396,7 +396,6 @@ with lib.maintainers;
 
   gitlab = {
     members = [
-      globin
       krav
       leona
       talyz
diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix
index 73658b67fb13..d30c48132d89 100644
--- a/nixos/tests/docker-registry.nix
+++ b/nixos/tests/docker-registry.nix
@@ -4,7 +4,6 @@
   name = "docker-registry";
   meta = with pkgs.lib.maintainers; {
     maintainers = [
-      globin
       ironpinguin
       cafkafk
     ];
diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index ce2edac32386..1a9c1605ec43 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -30,7 +30,6 @@ in
 {
   name = "gitlab";
   meta.maintainers = with lib.maintainers; [
-    globin
     yayayayaka
   ];
 
diff --git a/nixos/tests/roundcube.nix b/nixos/tests/roundcube.nix
index 0010d3141e33..fd9c72915943 100644
--- a/nixos/tests/roundcube.nix
+++ b/nixos/tests/roundcube.nix
@@ -1,8 +1,8 @@
 { pkgs, ... }:
 {
   name = "roundcube";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ globin ];
+  meta = {
+    maintainers = [ ];
   };
 
   nodes = {
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 8ff6cef784f7..84fe0843fab4 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -107,6 +107,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Core component for zathura PDF viewer";
     license = lib.licenses.zlib;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ globin ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index 9290e079d480..1ca50b639bcc 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -1,7 +1,5 @@
 {
-  config,
   lib,
-  stdenv,
   newScope,
   useMupdf ? true,
 }:
@@ -9,7 +7,7 @@
 lib.makeScope newScope (
   self:
   let
-    callPackage = self.callPackage;
+    inherit (self) callPackage;
   in
   {
     inherit useMupdf;
diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix
index 6f5d5bcee4e1..326b0c3fb2ee 100644
--- a/pkgs/applications/misc/zathura/wrapper.nix
+++ b/pkgs/applications/misc/zathura/wrapper.nix
@@ -68,7 +68,6 @@ symlinkJoin {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       smironov
-      globin
       TethysSvensson
     ];
     mainProgram = "zathura";
diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 5ca46db3dcf9..df59adec8f1e 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -561,7 +561,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [
       wmertens
-      globin
       kashw2
       me-and
       philiptaron
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 8b95f6171a23..f2e1aa9663fe 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -347,7 +347,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "mpv";
     maintainers = with lib.maintainers; [
       fpletz
-      globin
       SchweGELBin
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix
index 035a28d2f0c6..d64d4f105631 100644
--- a/pkgs/by-name/bo/borgbackup/package.nix
+++ b/pkgs/by-name/bo/borgbackup/package.nix
@@ -161,7 +161,6 @@ python.pkgs.buildPythonApplication rec {
     mainProgram = "borg";
     maintainers = with maintainers; [
       dotlambda
-      globin
     ];
   };
 }
diff --git a/pkgs/by-name/ch/checksec/package.nix b/pkgs/by-name/ch/checksec/package.nix
index 620b6beeaf81..970b3332da07 100644
--- a/pkgs/by-name/ch/checksec/package.nix
+++ b/pkgs/by-name/ch/checksec/package.nix
@@ -43,7 +43,6 @@ buildGoModule rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [
       thoughtpolice
-      globin
       sdht0
     ];
   };
diff --git a/pkgs/by-name/cl/clamav/package.nix b/pkgs/by-name/cl/clamav/package.nix
index 92ff9ed70751..faf7535349d5 100644
--- a/pkgs/by-name/cl/clamav/package.nix
+++ b/pkgs/by-name/cl/clamav/package.nix
@@ -84,7 +84,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [
       robberer
       qknight
-      globin
     ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/by-name/cl/claws-mail/package.nix b/pkgs/by-name/cl/claws-mail/package.nix
index 26025531421f..35df49ae809c 100644
--- a/pkgs/by-name/cl/claws-mail/package.nix
+++ b/pkgs/by-name/cl/claws-mail/package.nix
@@ -351,7 +351,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [
       fpletz
-      globin
       oxzi
       ajs124
     ];
diff --git a/pkgs/by-name/dm/dmenu/package.nix b/pkgs/by-name/dm/dmenu/package.nix
index 33372ba1a093..bfcd38cc704a 100644
--- a/pkgs/by-name/dm/dmenu/package.nix
+++ b/pkgs/by-name/dm/dmenu/package.nix
@@ -61,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       pSub
-      globin
       qusic
       _0david0mp
     ];
diff --git a/pkgs/by-name/dn/dnsmasq/package.nix b/pkgs/by-name/dn/dnsmasq/package.nix
index 6a05a0b02e3e..ebd5c952ec6d 100644
--- a/pkgs/by-name/dn/dnsmasq/package.nix
+++ b/pkgs/by-name/dn/dnsmasq/package.nix
@@ -117,7 +117,6 @@ stdenv.mkDerivation rec {
     platforms = with platforms; linux ++ darwin;
     maintainers = with maintainers; [
       fpletz
-      globin
     ];
   };
 }
diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix
index 5dd75ba1b615..b505121fd110 100644
--- a/pkgs/by-name/do/dovecot/package.nix
+++ b/pkgs/by-name/do/dovecot/package.nix
@@ -193,7 +193,6 @@ stdenv.mkDerivation rec {
     mainProgram = "dovecot";
     maintainers = with maintainers; [
       fpletz
-      globin
     ];
     teams = [ lib.teams.helsinki-systems ];
     platforms = platforms.unix;
diff --git a/pkgs/by-name/do/dovecot_pigeonhole/package.nix b/pkgs/by-name/do/dovecot_pigeonhole/package.nix
index 7880e5475ca2..58d390469f91 100644
--- a/pkgs/by-name/do/dovecot_pigeonhole/package.nix
+++ b/pkgs/by-name/do/dovecot_pigeonhole/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     homepage = "https://pigeonhole.dovecot.org/";
     description = "Sieve plugin for the Dovecot IMAP server";
     license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ globin ];
+    maintainers = [ ];
     teams = [ teams.helsinki-systems ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix
index edd5776f60c9..f51d7cdcfff9 100644
--- a/pkgs/by-name/fd/fd/package.nix
+++ b/pkgs/by-name/fd/fd/package.nix
@@ -64,7 +64,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [
       dywedir
-      globin
       ma27
       zowoq
       matthiasbeyer
diff --git a/pkgs/by-name/fe/feh/package.nix b/pkgs/by-name/fe/feh/package.nix
index 99ef211419ea..2777de880602 100644
--- a/pkgs/by-name/fe/feh/package.nix
+++ b/pkgs/by-name/fe/feh/package.nix
@@ -73,7 +73,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.mit-feh;
     maintainers = with maintainers; [
       gepbird
-      globin
     ];
     platforms = platforms.unix;
     mainProgram = "feh";
diff --git a/pkgs/by-name/hu/hub/package.nix b/pkgs/by-name/hu/hub/package.nix
index 5dbfba555ffb..f56a610e5635 100644
--- a/pkgs/by-name/hu/hub/package.nix
+++ b/pkgs/by-name/hu/hub/package.nix
@@ -77,6 +77,6 @@ buildGoModule rec {
     description = "Command-line wrapper for git that makes you better at GitHub";
     homepage = "https://hub.github.com/";
     license = licenses.mit;
-    maintainers = with maintainers; [ globin ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/i3/i3status-rust/package.nix b/pkgs/by-name/i3/i3status-rust/package.nix
index 0e36d6600a36..345fd4c22b9e 100644
--- a/pkgs/by-name/i3/i3status-rust/package.nix
+++ b/pkgs/by-name/i3/i3status-rust/package.nix
@@ -93,7 +93,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "i3status-rs";
     maintainers = with maintainers; [
       backuitist
-      globin
     ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix
index fd2e5d893031..e1403cf6d4bf 100644
--- a/pkgs/by-name/ip/iproute2/package.nix
+++ b/pkgs/by-name/ip/iproute2/package.nix
@@ -111,7 +111,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Only;
     maintainers = with maintainers; [
       fpletz
-      globin
     ];
   };
 }
diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix
index 5b19ab79011e..4db2a2fb9988 100644
--- a/pkgs/by-name/li/libvirt/package.nix
+++ b/pkgs/by-name/li/libvirt/package.nix
@@ -412,7 +412,6 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       fpletz
-      globin
       lovesegfault
     ];
   };
diff --git a/pkgs/by-name/op/opsdroid/package.nix b/pkgs/by-name/op/opsdroid/package.nix
index f313846b1bba..fe558b2531fc 100644
--- a/pkgs/by-name/op/opsdroid/package.nix
+++ b/pkgs/by-name/op/opsdroid/package.nix
@@ -68,9 +68,7 @@ python3Packages.buildPythonPackage rec {
     homepage = "https://opsdroid.dev";
     changelog = "https://github.com/opsdroid/opsdroid/releases/tag/v${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
-      globin
-    ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     mainProgram = "opsdroid";
   };
diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix
index 08a0f53ed9e2..4ffc814fdc07 100644
--- a/pkgs/by-name/po/postfix/package.nix
+++ b/pkgs/by-name/po/postfix/package.nix
@@ -199,7 +199,6 @@ stdenv.mkDerivation rec {
     ];
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
-      globin
       dotlambda
       lewo
     ];
diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
index b445c08bb5aa..eaeaf48be7da 100644
--- a/pkgs/by-name/re/redis/package.nix
+++ b/pkgs/by-name/re/redis/package.nix
@@ -128,9 +128,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.agpl3Only;
     platforms = lib.platforms.all;
     changelog = "https://github.com/redis/redis/releases/tag/${finalAttrs.version}";
-    maintainers = with lib.maintainers; [
-      globin
-    ];
+    maintainers = [ ];
     mainProgram = "redis-cli";
   };
 })
diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix
index 86ebff4bccfd..98d94aabdf7e 100644
--- a/pkgs/by-name/rs/rspamd/package.nix
+++ b/pkgs/by-name/rs/rspamd/package.nix
@@ -116,7 +116,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [
       avnik
       fpletz
-      globin
       lewo
     ];
     platforms = with platforms; linux;
diff --git a/pkgs/by-name/vi/virt-manager/package.nix b/pkgs/by-name/vi/virt-manager/package.nix
index b4a7ae7f8758..6ea45f71cac9 100644
--- a/pkgs/by-name/vi/virt-manager/package.nix
+++ b/pkgs/by-name/vi/virt-manager/package.nix
@@ -108,7 +108,6 @@ stdenv.mkDerivation rec {
     mainProgram = "virt-manager";
     maintainers = with maintainers; [
       fpletz
-      globin
     ];
   };
 }
diff --git a/pkgs/by-name/wi/wireguard-tools/package.nix b/pkgs/by-name/wi/wireguard-tools/package.nix
index a2e7631d2019..6364c202dec6 100644
--- a/pkgs/by-name/wi/wireguard-tools/package.nix
+++ b/pkgs/by-name/wi/wireguard-tools/package.nix
@@ -89,7 +89,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Only;
     maintainers = with maintainers; [
       zx2c4
-      globin
       ma27
     ];
     mainProgram = "wg";
diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 9ec7c9c82686..84a9ce8557be 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -234,7 +234,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = with maintainers; [
       lovek323
-      globin
     ];
 
     longDescription = ''
diff --git a/pkgs/development/python-modules/delorean/default.nix b/pkgs/development/python-modules/delorean/default.nix
index f056cde2a6e8..62f89be90f63 100644
--- a/pkgs/development/python-modules/delorean/default.nix
+++ b/pkgs/development/python-modules/delorean/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     description = "Delorean: Time Travel Made Easy";
     homepage = "https://github.com/myusuf3/delorean";
     license = licenses.mit;
-    maintainers = with maintainers; [ globin ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/get-video-properties/default.nix b/pkgs/development/python-modules/get-video-properties/default.nix
index a12dd528531e..c6866c361872 100644
--- a/pkgs/development/python-modules/get-video-properties/default.nix
+++ b/pkgs/development/python-modules/get-video-properties/default.nix
@@ -34,6 +34,6 @@ buildPythonPackage {
     description = "Get video properties";
     homepage = "https://github.com/mvasilkov/python-get-video-properties";
     license = licenses.mit;
-    maintainers = with maintainers; [ globin ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
index 5f79a568bf34..f58fa2958a03 100644
--- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
+++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix
@@ -5,7 +5,6 @@
   pyjwt,
   pytestCheckHook,
   python-dateutil,
-  pythonAtLeast,
   pythonOlder,
   requests,
   responses,
@@ -68,6 +67,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/IBM/python-sdk-core";
     changelog = "https://github.com/IBM/python-sdk-core/blob/${src.tag}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ globin ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix
index 2727df3995fb..8af57edb8956 100644
--- a/pkgs/development/python-modules/ibm-watson/default.nix
+++ b/pkgs/development/python-modules/ibm-watson/default.nix
@@ -57,6 +57,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/watson-developer-cloud/python-sdk";
     changelog = "https://github.com/watson-developer-cloud/python-sdk/blob/${src.tag}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ globin ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mattermostdriver/default.nix b/pkgs/development/python-modules/mattermostdriver/default.nix
index fdf9e52963f4..ce139015640d 100644
--- a/pkgs/development/python-modules/mattermostdriver/default.nix
+++ b/pkgs/development/python-modules/mattermostdriver/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     description = "Python Mattermost Driver";
     homepage = "https://github.com/Vaelor/python-mattermost-driver";
     license = licenses.mit;
-    maintainers = with maintainers; [ globin ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/mockupdb/default.nix b/pkgs/development/python-modules/mockupdb/default.nix
index 47ba794d0a0b..69d9aa2ea3ad 100644
--- a/pkgs/development/python-modules/mockupdb/default.nix
+++ b/pkgs/development/python-modules/mockupdb/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     description = "Simulate a MongoDB server";
     license = licenses.asl20;
     homepage = "https://github.com/ajdavis/mongo-mockup-db";
-    maintainers = with maintainers; [ globin ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix
index d62180f93e19..8769c75114d2 100644
--- a/pkgs/development/python-modules/motor/default.nix
+++ b/pkgs/development/python-modules/motor/default.nix
@@ -41,6 +41,6 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     homepage = "https://github.com/mongodb/motor";
     changelog = "https://github.com/mongodb/motor/releases/tag/${src.tag}";
-    maintainers = with lib.maintainers; [ globin ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix
index 2274c41496dd..838d05659fa0 100644
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -56,6 +56,6 @@ buildPythonPackage rec {
     mainProgram = "jupyter-trust";
     homepage = "https://jupyter.org/";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ globin ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/opsdroid-get-image-size/default.nix b/pkgs/development/python-modules/opsdroid-get-image-size/default.nix
index e20545e9e51b..55083bdd47e3 100644
--- a/pkgs/development/python-modules/opsdroid-get-image-size/default.nix
+++ b/pkgs/development/python-modules/opsdroid-get-image-size/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/opsdroid/image_size";
     changelog = "https://github.com/opsdroid/image_size/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ globin ];
+    maintainers = [ ];
     mainProgram = "get-image-size";
   };
 }
diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix
index 51cdabd8e0d6..97b6561f8e88 100644
--- a/pkgs/development/python-modules/puremagic/default.nix
+++ b/pkgs/development/python-modules/puremagic/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/cdgriffith/puremagic";
     changelog = "https://github.com/cdgriffith/puremagic/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ globin ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pycron/default.nix b/pkgs/development/python-modules/pycron/default.nix
index a31c54f1758f..aaa931c0a9f9 100644
--- a/pkgs/development/python-modules/pycron/default.nix
+++ b/pkgs/development/python-modules/pycron/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Simple cron-like parser for Python, which determines if current datetime matches conditions";
     license = licenses.mit;
     homepage = "https://github.com/kipe/pycron";
-    maintainers = with maintainers; [ globin ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/udatetime/default.nix b/pkgs/development/python-modules/udatetime/default.nix
index 41b97a811502..5b194c53e4e2 100644
--- a/pkgs/development/python-modules/udatetime/default.nix
+++ b/pkgs/development/python-modules/udatetime/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
     mainProgram = "bench_udatetime.py";
     homepage = "https://github.com/freach/udatetime";
     license = licenses.asl20;
-    maintainers = with maintainers; [ globin ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/watchgod/default.nix b/pkgs/development/python-modules/watchgod/default.nix
index 10b93b346dd1..2545b1605c54 100644
--- a/pkgs/development/python-modules/watchgod/default.nix
+++ b/pkgs/development/python-modules/watchgod/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     mainProgram = "watchgod";
     homepage = "https://github.com/samuelcolvin/watchgod";
     license = licenses.mit;
-    maintainers = with maintainers; [ globin ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
index b10167d270bb..0d77f4d5729f 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/pkgs/servers/roundcube/default.nix
@@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
     description = "Open Source Webmail Software";
     maintainers = with lib.maintainers; [
       vskilet
-      globin
       ma27
     ];
     license = lib.licenses.gpl3;
diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix
index 969cf26b5b4c..a53dc025b4c1 100644
--- a/pkgs/servers/sql/mariadb/connector-c/default.nix
+++ b/pkgs/servers/sql/mariadb/connector-c/default.nix
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
     description = "Client library that can be used to connect to MySQL or MariaDB";
     homepage = "https://github.com/mariadb-corporation/mariadb-connector-c";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ globin ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix
index b8901d433da5..753fc2233c0c 100644
--- a/pkgs/tools/security/sslscan/default.nix
+++ b/pkgs/tools/security/sslscan/default.nix
@@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Only;
     maintainers = with maintainers; [
       fpletz
-      globin
     ];
   };
 }

From 1ae3a6d72b18058757758fea1ecced308427bd12 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 7 Dec 2025 16:57:56 +0000
Subject: [PATCH 068/103] typesetter: 0.6.0 -> 0.7.0

Diff: https://codeberg.org/haydn/typesetter/compare/v0.6.0...v0.7.0
---
 pkgs/by-name/ty/typesetter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typesetter/package.nix b/pkgs/by-name/ty/typesetter/package.nix
index 74a034167630..e5b0291eaa71 100644
--- a/pkgs/by-name/ty/typesetter/package.nix
+++ b/pkgs/by-name/ty/typesetter/package.nix
@@ -30,19 +30,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "typesetter";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "haydn";
     repo = "typesetter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZbMg7yKJ9nYVqDfPO614PhEoL8fmVbdHONfWgCbZZ0k=";
+    hash = "sha256-PFqMV5ofEg5Va08ssD6en5YXCpYrRjG7pSVD34l/QQY=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-ZCWMyxzku5FXWF7EkeQ6O9qbZs1MBzuSIw2g198DNt0=";
+    hash = "sha256-RBDb0+6bD7K+FZ+Qg9vV1LDn/LT2xfPh/XsPfQWfwJQ=";
   };
 
   strictDeps = true;

From 5b86073b9709dcea0a04a5994e7fe06ccbca34c7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 7 Dec 2025 17:09:24 +0000
Subject: [PATCH 069/103] ferron: 1.3.5 -> 2.2.1

Diff: https://github.com/ferronweb/ferron/compare/1.3.5...2.2.1

Changelog: https://github.com/ferronweb/ferron/releases/tag/2.2.1
---
 pkgs/by-name/fe/ferron/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fe/ferron/package.nix b/pkgs/by-name/fe/ferron/package.nix
index 834339f6e076..fe0185a23ccb 100644
--- a/pkgs/by-name/fe/ferron/package.nix
+++ b/pkgs/by-name/fe/ferron/package.nix
@@ -10,16 +10,22 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ferron";
-  version = "1.3.5";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "ferronweb";
     repo = "ferron";
     tag = finalAttrs.version;
-    hash = "sha256-bBIhLkh9UV2MJKovQaFk3cC1rYafiyxknRlKWVQ5gwY=";
+    hash = "sha256-+Esbsr+pqRSRd3M7mFhNl+KVcz3wO5YlZrna8mYsV80=";
   };
 
-  cargoHash = "sha256-xsJJglSq8hpWWi0zknPL03nle99GxznPI3HON2o8zco=";
+  # ../../ is cargoDepsCopy, and obviously does not contain monoio's README.md
+  postPatch = ''
+    substituteInPlace $cargoDepsCopy/monoio-0.2.4/src/lib.rs \
+      --replace-fail '#![doc = include_str!("../../README.md")]' ""
+  '';
+
+  cargoHash = "sha256-/F1CqzOKscT/rOsJaY+PwZPMBDxSEoI+zN/GsH5P37k=";
 
   nativeBuildInputs = [
     pkg-config

From d4ee3530965d1c7a3a4bf7d7aac9d548f5507db4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Dec 2025 14:59:21 +0000
Subject: [PATCH 070/103] victoriametrics: 1.130.0 -> 1.131.0

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

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 30dd36a4ab95..6f04dcd8fb41 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaMetrics";
-  version = "1.130.0";
+  version = "1.131.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-upviz4MDwEXzIs21mPwa5TgKywfXiRcsZfdF/d3w/Ao=";
+    hash = "sha256-pfOspKTDEMIRdsRJQ/IVViNKL/hojceHyAUuOKKHJO8=";
   };
 
   vendorHash = null;

From efca7ca9dc82b268c6773189a1fee25b6b6ed670 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Sun, 7 Dec 2025 20:26:19 +0100
Subject: [PATCH 071/103] nixos/victoriametrics: allow mincore syscall

---
 nixos/modules/services/databases/victoriametrics.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/databases/victoriametrics.nix b/nixos/modules/services/databases/victoriametrics.nix
index 53bb1ab59830..3ff94c3d4b96 100644
--- a/nixos/modules/services/databases/victoriametrics.nix
+++ b/nixos/modules/services/databases/victoriametrics.nix
@@ -229,6 +229,7 @@ in
         SystemCallFilter = [
           "@system-service"
           "~@privileged"
+          "mincore"
         ];
       };
 

From cbc5f584521cea3f5bfa7c2f22a3dd41cfe04a25 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 7 Dec 2025 19:56:07 +0000
Subject: [PATCH 072/103] python3Packages.compressai: 1.2.6 -> 1.2.8

Diff: https://github.com/InterDigitalInc/CompressAI/compare/v1.2.6...v1.2.8
---
 .../python-modules/compressai/default.nix     | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/compressai/default.nix b/pkgs/development/python-modules/compressai/default.nix
index 79de2d7596fd..6e453e9488e7 100644
--- a/pkgs/development/python-modules/compressai/default.nix
+++ b/pkgs/development/python-modules/compressai/default.nix
@@ -10,14 +10,17 @@
 
   # dependencies
   einops,
-  numpy,
   matplotlib,
+  numpy,
   pandas,
   pytorch-msssim,
   scipy,
+  tomli,
   torch,
   torch-geometric,
   torchvision,
+  tqdm,
+  typing-extensions,
 
   # optional-dependencies
   ipywidgets,
@@ -30,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "compressai";
-  version = "1.2.6";
+  version = "1.2.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "InterDigitalInc";
     repo = "CompressAI";
     tag = "v${version}";
-    hash = "sha256-xvzhhLn0iBzq3h1nro8/83QWEQe9K4zRa3RSZk+hy3Y=";
+    hash = "sha256-Fgobh7Q1rKomcqAT4kJl2RsM1W13ErO8sFB2urCqrCk=";
     fetchSubmodules = true;
   };
 
@@ -46,16 +49,22 @@ buildPythonPackage rec {
     setuptools
   ];
 
+  pythonRelaxDeps = [
+    "numpy"
+  ];
   dependencies = [
     einops
-    numpy
     matplotlib
+    numpy
     pandas
     pytorch-msssim
     scipy
+    tomli
     torch
     torch-geometric
     torchvision
+    tqdm
+    typing-extensions
   ];
 
   optional-dependencies = {
@@ -70,11 +79,9 @@ buildPythonPackage rec {
     "compressai._CXX"
   ];
 
+  # We have to delete the source because otherwise it is used intead the installed package.
   preCheck = ''
-    # We have to delete the source because otherwise it is used intead the installed package.
     rm -rf compressai
-
-    export HOME=$(mktemp -d)
   '';
 
   nativeCheckInputs = [
@@ -91,6 +98,7 @@ buildPythonPackage rec {
     "test_pretrained"
 
     # Flaky (AssertionError: assert 0.08889999999999998 < 0.064445)
+    "test_compiling"
     "test_find_close"
   ];
 

From 07c10b3282ff0a5b0fa3a684d5174c17e823929a Mon Sep 17 00:00:00 2001
From: Leon Klingele <git@leonklingele.de>
Date: Sun, 7 Dec 2025 21:22:23 +0100
Subject: [PATCH 073/103] golangci-lint: 2.7.1 -> 2.7.2

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

diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix
index b8630e3bef38..2941c2185df6 100644
--- a/pkgs/by-name/go/golangci-lint/package.nix
+++ b/pkgs/by-name/go/golangci-lint/package.nix
@@ -14,16 +14,16 @@
 
 buildGo125Module (finalAttrs: {
   pname = "golangci-lint";
-  version = "2.7.1";
+  version = "2.7.2";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-E4ImAR3+/rgsnGkfPg24ZEoeurTxvbrKURzjKscHk10=";
+    hash = "sha256-8dVIWa+yFvuBz2yXcPG1cBkxltqdjlb+tmQ+AtYuicc=";
   };
 
-  vendorHash = "sha256-PW0Aw5hU2FroEqaqfl0329iF7FpjG2/tKdL75Tg+9pE=";
+  vendorHash = "sha256-MHz9VQvObHkvf62HNcPGfsskv5RJpe6g23CoXHOGUZc";
 
   subPackages = [ "cmd/golangci-lint" ];
 

From 5cedcb0781ff9a69c661a0a8f6baeda86d0cd864 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 7 Dec 2025 20:36:48 +0000
Subject: [PATCH 074/103] python3Packages.array-record: 0.8.1 -> 0.8.3

Diff: https://github.com/google/array_record/compare/v0.8.1...v0.8.3

Changelog: https://github.com/google/array_record/releases/tag/v0.8.3
---
 .../python-modules/array-record/default.nix           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix
index bf52312777c5..f4d804ab8731 100644
--- a/pkgs/development/python-modules/array-record/default.nix
+++ b/pkgs/development/python-modules/array-record/default.nix
@@ -11,10 +11,10 @@
 
 buildPythonPackage rec {
   pname = "array-record";
-  version = "0.8.1";
+  version = "0.8.3";
   format = "wheel";
 
-  disabled = pythonOlder "3.10" || pythonAtLeast "3.14";
+  disabled = pythonOlder "3.11" || pythonAtLeast "3.15";
 
   src =
     let
@@ -29,9 +29,10 @@ buildPythonPackage rec {
       platform = "manylinux2014_x86_64.manylinux_2_17_x86_64";
       hash =
         {
-          cp311 = "sha256-CQ2ChYqTHjdU4QYvXGLCCudk8+XyTnnqkFQ5OAQ4Oo0=";
-          cp312 = "sha256-AF+29PToM7LeHE5RxiCtajCok7RtwWgDnZuzG3FGYHA=";
-          cp313 = "sha256-N7uALh/cmO22CoWVUsfn1JThQc85C/tzUKz9Y0Z9rq4=";
+          cp311 = "sha256-9ABPzOt5YaLMAJACjmij7rkdP1s4wA1gtTP3AE0dP3s=";
+          cp312 = "sha256-RY9mWN6GyTabI//mTcsxOTqRm5GuLxUUfuK+sgELEio=";
+          cp313 = "sha256-E98a7Js4r+mJc79f489SP4PKkEsEI9hTGZMIdxRbjyg=";
+          cp314 = "sha256-idLPX0cJvjxsKzDA02YAUiM3VjP/zmbcsT2SegvcUig=";
         }
         .${pyShortVersion} or (throw "${pname} is missing hash for ${pyShortVersion}");
     };

From 2a15c5b21f42431f67de893615b81db0ef571d11 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 7 Dec 2025 22:03:08 +0100
Subject: [PATCH 075/103] xdg-desktop-portal: enable debug info

---
 pkgs/development/libraries/xdg-desktop-portal/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index e10756567ff0..915ad886485c 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     "out"
     "installedTests"
   ];
+  separateDebugInfo = true;
 
   src = fetchFromGitHub {
     owner = "flatpak";

From 5c57e04f6ddeb01b88c623a842895f5c7cf82159 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 7 Dec 2025 21:34:34 +0000
Subject: [PATCH 076/103] python3Packages.py-machineid: 0.8.1 -> 1.0.0

---
 pkgs/development/python-modules/py-machineid/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/py-machineid/default.nix b/pkgs/development/python-modules/py-machineid/default.nix
index f4d72af682c7..5595a19f22ec 100644
--- a/pkgs/development/python-modules/py-machineid/default.nix
+++ b/pkgs/development/python-modules/py-machineid/default.nix
@@ -7,12 +7,13 @@
 
 buildPythonPackage rec {
   pname = "py-machineid";
-  version = "0.8.1";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-5QQWIhI1yHR1nhnLZOhJne8Sr8K9/9N3v9aPR395ncg=";
+    pname = "py_machineid";
+    inherit version;
+    hash = "sha256-ipAqAProxtZDP0Y2l8IdxM6YxuVaLgU1wCczGaywBHo=";
   };
 
   build-system = [ setuptools ];

From 2c9b6175ce9ea75f155dac7b160d628fef4bcc51 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 7 Dec 2025 20:59:11 +0000
Subject: [PATCH 077/103] python3Packages.torchcodec: 0.8.1 -> 0.9.0

Diff: https://github.com/meta-pytorch/torchcodec/compare/v0.8.1...v0.9.0

Changelog: https://github.com/meta-pytorch/torchcodec/releases/tag/v0.9.0
---
 .../python-modules/torchcodec/default.nix       | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/torchcodec/default.nix b/pkgs/development/python-modules/torchcodec/default.nix
index fe26127cef26..06833d43c5c0 100644
--- a/pkgs/development/python-modules/torchcodec/default.nix
+++ b/pkgs/development/python-modules/torchcodec/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "torchcodec";
-  version = "0.8.1";
+  version = "0.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "meta-pytorch";
     repo = "torchcodec";
     tag = "v${version}";
-    hash = "sha256-trYS4sRPSNmQLHZZS174zxbu74LT+39N23zOJdWwN6Q=";
+    hash = "sha256-QG7LX9G1HV2l75jsgsbM4ts6bg0wvsNhjml19b7yYEQ=";
   };
 
   postPatch = ''
@@ -44,17 +44,10 @@ buildPythonPackage rec {
         '"ffprobe"' \
         '"${lib.getExe' ffmpeg "ffprobe"}"'
 
-    substituteInPlace \
-      test/test_ops.py \
-      test/test_encoders.py \
+    substituteInPlace test/test_encoders.py \
       --replace-fail \
         '"ffmpeg"' \
         '"${lib.getExe ffmpeg}"'
-
-    substituteInPlace test/test_transform_ops.py \
-      --replace-fail \
-        'ffmpeg_cli = "ffmpeg"' \
-        'ffmpeg_cli = "${lib.getExe ffmpeg}"'
   '';
 
   nativeBuildInputs = [
@@ -92,7 +85,7 @@ buildPythonPackage rec {
 
   env = {
     # Upstream (Meta) is cautious with linking against GPL ffmpeg
-    # We explicitly want to link against our packages ffmpeg
+    # We explicitly want to link against our packaged ffmpeg
     I_CONFIRM_THIS_IS_NOT_A_LICENSE_VIOLATION = true;
 
     ENABLE_CUDA = cudaSupport;
@@ -151,8 +144,10 @@ buildPythonPackage rec {
       "test_against_to_file"
       "test_against_to_file"
       "test_contiguit"
+      "test_crf_valid_value"
       "test_encode_to_tensor_long_outpu"
       "test_round_trip"
+      "test_video_encoder_against_ffmpeg_cli"
       "test_video_encoder_round_trip"
 
       # RuntimeError: Requested next frame while there are no more frames left to decode

From 13a213fe6643355a3b046c270198837c0236b3c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 7 Dec 2025 23:04:08 +0000
Subject: [PATCH 078/103] eigenwallet: 3.3.8 -> 3.5.1

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

diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix
index 0b262a893a46..ed08ad2e6dc4 100644
--- a/pkgs/by-name/ei/eigenwallet/package.nix
+++ b/pkgs/by-name/ei/eigenwallet/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eigenwallet";
-  version = "3.3.8";
+  version = "3.5.1";
 
   src = fetchurl {
     url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-Q6KCmLwgk6Z/MhsKWevl9IZmG//Z9zEvawwhj241SrY=";
+    hash = "sha256-+0eZWEqVkJW54ADTC2Ay6cGHqcqRBpxOYJkN5Unil0A=";
   };
 
   nativeBuildInputs = [

From 7e09866ff7327464694b3b13530a30ca32e86276 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 7 Dec 2025 23:20:57 +0000
Subject: [PATCH 079/103] rtg-tools: cleanup

---
 pkgs/by-name/rt/rtg-tools/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/rt/rtg-tools/package.nix b/pkgs/by-name/rt/rtg-tools/package.nix
index 2667bdc92663..572a115a1734 100644
--- a/pkgs/by-name/rt/rtg-tools/package.nix
+++ b/pkgs/by-name/rt/rtg-tools/package.nix
@@ -11,14 +11,14 @@
   unzip,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rtg-tools";
   version = "3.13";
 
   src = fetchFromGitHub {
     owner = "RealTimeGenomics";
     repo = "rtg-tools";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-vPzKrgnX6BCQmn9aOVWWpFLC6SbPBHZhZ+oL1LCbvmo=";
   };
 
@@ -59,11 +59,12 @@ stdenv.mkDerivation rec {
     ant runalltests
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/RealTimeGenomics/rtg-tools";
     description = "Useful utilities for dealing with VCF files and sequence data, especially vcfeval";
-    license = licenses.bsd2;
+    license = lib.licenses.bsd2;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ apraga ];
+    maintainers = with lib.maintainers; [ apraga ];
+    mainProgram = "rtg";
   };
-}
+})

From dab389b79a4631ed054522b7143d558ec08c6416 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 7 Dec 2025 23:21:39 +0000
Subject: [PATCH 080/103] hap-py: cleanup, fix cmake 4 compatibility

---
 pkgs/by-name/ha/hap-py/package.nix | 40 ++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ha/hap-py/package.nix b/pkgs/by-name/ha/hap-py/package.nix
index e86245297da3..b242f3ebd014 100644
--- a/pkgs/by-name/ha/hap-py/package.nix
+++ b/pkgs/by-name/ha/hap-py/package.nix
@@ -37,22 +37,26 @@ let
     ];
   my-python = python3.withPackages my-python-packages;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "hap.py";
   version = "0.3.15";
 
   src = fetchFromGitHub {
     owner = "Illumina";
     repo = "hap.py";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-K8XXhioMGMHw56MKvp0Eo8S6R36JczBzGRaBz035zRQ=";
   };
-  # For illumina script
-  BOOST_ROOT = "${boost.out}";
-  ZLIBSTATIC = "${zlib.static}";
-  # For cmake : boost lib and includedir are in different location
-  BOOST_LIBRARYDIR = "${boost.out}/lib";
-  BOOST_INCLUDEDIR = "${boost.dev}/include";
+
+  # CMake 4 dropped support of versions lower than 3.5,
+  # versions lower than 3.10 are deprecated.
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail \
+        "cmake_minimum_required (VERSION 2.8)" \
+        "cmake_minimum_required (VERSION 3.10)"
+  '';
 
   patches = [
     # Compatibility with nix for boost and library flags : zlib, bzip2, curl, crypto, lzma
@@ -76,17 +80,27 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
+  env = {
+    # For illumina script
+    BOOST_ROOT = "${boost.out}";
+    ZLIBSTATIC = "${zlib.static}";
+
+    # For cmake : boost lib and includedir are in different location
+    BOOST_LIBRARYDIR = "${boost.out}/lib";
+    BOOST_INCLUDEDIR = "${boost.dev}/include";
+  };
+
   postFixup = ''
     wrapProgram $out/bin/hap.py \
        --set PATH ${lib.makeBinPath runtime} \
-       --add-flags "--engine-vcfeval-path=${rtg-tools}/bin/rtg"
+       --add-flags "--engine-vcfeval-path=${lib.getExe rtg-tools}"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Compare genetics variants against a gold dataset";
     homepage = "https://github.com/Illumina/hap.py";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ apraga ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ apraga ];
     mainProgram = "hap.py";
   };
-}
+})

From 6d2cd6c5beee234a7a6ab6dcceff5b5860eb26b7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 8 Dec 2025 01:05:13 +0100
Subject: [PATCH 081/103] python3Packages.rq: 2.4.1 -> 2.6.1

https://github.com/rq/rq/releases/tag/v2.5
https://github.com/rq/rq/releases/tag/v2.6
https://github.com/rq/rq/releases/tag/v2.6.1
---
 pkgs/development/python-modules/rq/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix
index f4af7b1be9d4..2183e41fef23 100644
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/pkgs/development/python-modules/rq/default.nix
@@ -9,6 +9,7 @@
 
   # dependencies
   click,
+  croniter,
   redis,
 
   # tests
@@ -21,20 +22,21 @@
 
 buildPythonPackage rec {
   pname = "rq";
-  version = "2.4.1";
+  version = "2.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rq";
     repo = "rq";
     tag = "v${version}";
-    hash = "sha256-CtxirZg6WNQpTMoXQRvB8i/KB3r58WlKh+wjBvyVMMs=";
+    hash = "sha256-4+zP3pOiZ+r/dt9F2NyxgJsyGPIHgj9XokuPxlWyS1g=";
   };
 
   build-system = [ hatchling ];
 
   dependencies = [
     click
+    croniter
     redis
   ];
 

From f84be4d7b80e8dfefe1bd5d2579c529e7733b83b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 8 Dec 2025 01:05:28 +0100
Subject: [PATCH 082/103] python3Packages.django-rq: 3.1 -> 3.2.1

https://github.com/rq/django-rq/releases/tag/v3.2
https://github.com/rq/django-rq/releases/tag/v3.2.1
---
 pkgs/development/python-modules/django-rq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix
index 1cbd4d7c3011..e2cde4193c0c 100644
--- a/pkgs/development/python-modules/django-rq/default.nix
+++ b/pkgs/development/python-modules/django-rq/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "django-rq";
-  version = "3.1";
+  version = "3.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rq";
     repo = "django-rq";
     tag = "v${version}";
-    hash = "sha256-TnOKgw52ykKcR0gHXcdYfv77js7I63PE1F3POdwJgvc=";
+    hash = "sha256-oHBQpGRiNJFt07KEPC+KcCF6qM5PgSTyr0t35iyYhK4=";
   };
 
   build-system = [ hatchling ];

From db182798e725005bbfbfc737e7aa5df465bd64b0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 8 Dec 2025 01:10:26 +0100
Subject: [PATCH 083/103] python3Packages.django-rq: enable tests

---
 .../python-modules/django-rq/default.nix       | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-rq/default.nix b/pkgs/development/python-modules/django-rq/default.nix
index e2cde4193c0c..e0ceb3a42fb4 100644
--- a/pkgs/development/python-modules/django-rq/default.nix
+++ b/pkgs/development/python-modules/django-rq/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   hatchling,
@@ -8,9 +9,9 @@
   rq,
   prometheus-client,
   sentry-sdk,
-  psycopg,
   pytest-django,
   pytestCheckHook,
+  pyyaml,
   redisTestHook,
 }:
 
@@ -41,7 +42,20 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "django_rq" ];
 
-  doCheck = false; # require redis-server
+  # redis hook does not support darwin
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  nativeCheckInputs = [
+    pytest-django
+    pytestCheckHook
+    pyyaml
+    redisTestHook
+  ]
+  ++ lib.concatAttrValues optional-dependencies;
+
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=tests.settings
+  '';
 
   meta = with lib; {
     description = "Simple app that provides django integration for RQ (Redis Queue)";

From e5b9d917f2186904fecf97962bc6ac9b6592bc07 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 8 Dec 2025 01:21:35 +0100
Subject: [PATCH 084/103] python3Packages.django-tasks: provide redis for tests

---
 pkgs/development/python-modules/django-tasks/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/django-tasks/default.nix b/pkgs/development/python-modules/django-tasks/default.nix
index e8d556f773b4..415108364e3d 100644
--- a/pkgs/development/python-modules/django-tasks/default.nix
+++ b/pkgs/development/python-modules/django-tasks/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
@@ -13,6 +14,7 @@
   fakeredis,
   pytestCheckHook,
   pytest-django,
+  redisTestHook,
 }:
 
 buildPythonPackage rec {
@@ -48,12 +50,16 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "django_tasks" ];
 
+  # redis hook does not support darwin
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
   nativeCheckInputs = [
-    dj-database-url
     django-rq
+    dj-database-url
     fakeredis
     pytestCheckHook
     pytest-django
+    redisTestHook
   ];
 
   disabledTests = [

From b48c8f1604f09c1861beca5d944698260c36433a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Dec 2025 00:44:32 +0000
Subject: [PATCH 085/103] home-assistant-custom-components.roborock_custom_map:
 0.1.1 -> 0.1.4

---
 .../custom-components/roborock_custom_map/package.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/roborock_custom_map/package.nix b/pkgs/servers/home-assistant/custom-components/roborock_custom_map/package.nix
index 82da77373fa5..295c6fd2a681 100644
--- a/pkgs/servers/home-assistant/custom-components/roborock_custom_map/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/roborock_custom_map/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "Lash-L";
   domain = "roborock_custom_map";
-  version = "0.1.1";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "Lash-L";
     repo = "RoborockCustomMap";
     tag = version;
-    hash = "sha256-ZKaUTUTN0tTW8bks0TYixfmbEa7A7ERdJ+xZ365HEbU=";
+    hash = "sha256-jXkKjjof1/JeT0KDKIC4sX+P7JwWOzajbFOhlq772L8=";
   };
 
   meta = {

From e7ebc5583a969c5517a3e11cd5b689f1b244e6b4 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 8 Dec 2025 01:20:10 +0000
Subject: [PATCH 086/103] xdg-desktop-portal-cosmic: enable strictDeps, fix
 cross compilation

---
 pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
index 7e9eab41efda..fe2c17b8d469 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
+  glib,
   libcosmicAppHook,
   pkg-config,
   util-linux,
@@ -29,6 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   cargoHash = "sha256-0PsiB/xvePSi5o1eRUgCq02UAGzuBQEe8+LlFJi5814=";
 
   separateDebugInfo = true;
+  strictDeps = true;
 
   nativeBuildInputs = [
     libcosmicAppHook
@@ -38,6 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   buildInputs = [
+    glib
     libgbm
     pipewire
   ];

From 6e4bec89895043b162708efe99508df4a2de889e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Dec 2025 01:24:06 +0000
Subject: [PATCH 087/103] python3Packages.sphinx-click: 6.1.0 -> 6.2.0

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

diff --git a/pkgs/development/python-modules/sphinx-click/default.nix b/pkgs/development/python-modules/sphinx-click/default.nix
index 2227807ce56d..ea1ab65ae52e 100644
--- a/pkgs/development/python-modules/sphinx-click/default.nix
+++ b/pkgs/development/python-modules/sphinx-click/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "sphinx-click";
-  version = "6.1.0";
+  version = "6.2.0";
   pyproject = true;
 
   build-system = [
@@ -55,7 +55,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "sphinx_click";
-    hash = "sha256-xwLgdRwaC2rWSeT3+uvQ3AmjzHyjtQ+Vlpg4N3L1Du8=";
+    hash = "sha256-/Hi0FUpOUVlGLjbeVbhkN0fabNqGs7Uqi7YiieYDd2w=";
   };
 
   meta = {

From 5be06943a341bbc3d14426f30c976bde9d068a3d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 7 Dec 2025 18:00:13 -0600
Subject: [PATCH 088/103] yaziPlugins: update on 2025-12-07
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- mediainfo: 25.5.31-unstable-2025-11-15 → 25.5.31-unstable-2025-12-04
- recycle-bin: 0-unstable-2025-11-11 → 0-unstable-2025-12-04
- restore: 25.5.31-unstable-2025-09-25 → 25.5.31-unstable-2025-12-04
- starship: 25.4.8-unstable-2025-07-08 → 25.4.8-unstable-2025-12-03

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix   | 6 +++---
 pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix | 6 +++---
 pkgs/by-name/ya/yazi/plugins/restore/default.nix     | 6 +++---
 pkgs/by-name/ya/yazi/plugins/starship/default.nix    | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
index 42ccebb1e014..1b16b9489a8d 100644
--- a/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "mediainfo.yazi";
-  version = "25.5.31-unstable-2025-11-15";
+  version = "25.5.31-unstable-2025-12-04";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "mediainfo.yazi";
-    rev = "1099409ca956282efe49dea8ab53f8be95feb72a";
-    hash = "sha256-K2SHIzmNtICgVchSPB1mtTboyvDPIq+hN3GEOR20hpk=";
+    rev = "af8bdf47a1f4dcfefe433aa2134b04eb9c75a10b";
+    hash = "sha256-io3HyoUniWZu+0efZfbhXn8JoG5p2/lFeH/FguVvjSY=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix b/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix
index b722b6d069d2..6f4f8b61f153 100644
--- a/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "recycle-bin.yazi";
-  version = "0-unstable-2025-11-11";
+  version = "0-unstable-2025-12-04";
 
   src = fetchFromGitHub {
     owner = "uhs-robert";
     repo = "recycle-bin.yazi";
-    rev = "1762676a032e0de6d4712ae06d14973670621f61";
-    hash = "sha256-LzqFBLqaclRgjyLKL0OxlAao+MMivh4Ww7UZf2gcOUM=";
+    rev = "53ad17c77746497e5146ad41fad94e6fc43e900b";
+    hash = "sha256-CasCXkE8ig2INqx1mJj0wyxUVD1WFNM7aZ0SITXEsx0=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/restore/default.nix b/pkgs/by-name/ya/yazi/plugins/restore/default.nix
index 369ad1d8a74a..36491b168d26 100644
--- a/pkgs/by-name/ya/yazi/plugins/restore/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/restore/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "restore.yazi";
-  version = "25.5.31-unstable-2025-09-25";
+  version = "25.5.31-unstable-2025-12-04";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "restore.yazi";
-    rev = "2161735f840e36974a6b4b0007c3e4184a085208";
-    hash = "sha256-W3P7UhEtmv0JfcKUd+g/HBPy4ML8qgmgnOVaYKN0TSU=";
+    rev = "6395e52b3af3a8832f0249970a168c41fb92b31b";
+    hash = "sha256-HfXhYe3XPKkd/ivpQB85EsZyvLiflJE0tRNGVid2A9A=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/starship/default.nix b/pkgs/by-name/ya/yazi/plugins/starship/default.nix
index 232b9ab4dea2..79a245de54fd 100644
--- a/pkgs/by-name/ya/yazi/plugins/starship/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/starship/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "starship.yazi";
-  version = "25.4.8-unstable-2025-07-08";
+  version = "25.4.8-unstable-2025-12-03";
 
   src = fetchFromGitHub {
     owner = "Rolv-Apneseth";
     repo = "starship.yazi";
-    rev = "a63550b2f91f0553cc545fd8081a03810bc41bc0";
-    hash = "sha256-PYeR6fiWDbUMpJbTFSkM57FzmCbsB4W4IXXe25wLncg=";
+    rev = "eca186171c5f2011ce62712f95f699308251c749";
+    hash = "sha256-xcz2+zepICZ3ji0Hm0SSUBSaEpabWUrIdG7JmxUl/ts=";
   };
 
   meta = {

From 466f55860ea6d88750e90c130d08d81ac6a1d0b8 Mon Sep 17 00:00:00 2001
From: Lin Xianyi <iynaix@gmail.com>
Date: Mon, 8 Dec 2025 11:54:05 +0800
Subject: [PATCH 089/103] ly: 1.2.0 -> 1.3.0

Changelog: https://codeberg.org/fairyglade/ly/releases/tag/v1.3.0
Diff: https://codeberg.org/fairyglade/ly/compare/v1.2.0...v1.3.0
---
 pkgs/by-name/ly/ly/deps.nix    | 12 ++++++------
 pkgs/by-name/ly/ly/package.nix |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ly/ly/deps.nix b/pkgs/by-name/ly/ly/deps.nix
index 52c642a9f80e..ad15692d602d 100644
--- a/pkgs/by-name/ly/ly/deps.nix
+++ b/pkgs/by-name/ly/ly/deps.nix
@@ -97,19 +97,19 @@ linkFarm name [
     };
   }
   {
-    name = "zigini-0.3.2-BSkB7WJJAADybd5DGd9MLCp6ikGGUq9wicxsjv0HF1Qc";
+    name = "zigini-0.3.3-36M0FRJJAADZVq5HPm-hYKMpFFTr0OgjbEYcK2ijKZ5n";
     path = fetchZigArtifact {
       name = "zigini";
-      url = "https://github.com/AnErrupTion/zigini/archive/96ca1d9f1a7ec741f07ceb104dae2b3a7bdfd48a.tar.gz";
-      hash = "sha256-Hhc/+a8ToHI9RAJTIQ6Z3KZKQFvoPvd5ODz7HRbytdw=";
+      url = "https://github.com/AnErrupTion/zigini/archive/9281f47702b57779e831d7618e158abb8eb4d4a2.tar.gz";
+      hash = "sha256-/g0az0MRQOmww0DhZQo/1YH2qkJcscoCpaoW4pWGVIk=";
     };
   }
   {
-    name = "ini-0.1.0-YCQ9YkUnAAA7SjpLwvomwrngMn3TConSAlNgo7Q8ibMZ";
+    name = "ini-0.1.0-YCQ9Ys0pAABixEvvQvhVXAdqRE3wrZk_wiL9TPNHhB8d";
     path = fetchZigArtifact {
       name = "ini";
-      url = "https://github.com/AnErrupTion/ini/archive/ac6e656157b2ac6c98392283a139b47c44a85d54.tar.gz";
-      hash = "sha256-rOXuHsd4WiLDODruQioADMWQ7UkNtx5LUdTcK2dve40=";
+      url = "https://github.com/AnErrupTion/ini/archive/918f16d0dcf893d0c1cdffe204faa08bb3584e04.tar.gz";
+      hash = "sha256-z2IMS0grfnf33h6tz1ERv2i6gfnS6p8oMWFz+AmGoA8=";
     };
   }
   {
diff --git a/pkgs/by-name/ly/ly/package.nix b/pkgs/by-name/ly/ly/package.nix
index f6461a3fb1d1..a89eea2df810 100644
--- a/pkgs/by-name/ly/ly/package.nix
+++ b/pkgs/by-name/ly/ly/package.nix
@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ly";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "fairyglade";
     repo = "ly";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2JOpC70uBvGk17edXDNeNhNqn2hHZBpOoQaUxN0IlLk=";
+    hash = "sha256-OmbOWZZR5kvqWJkNhTkV5O2tfFj5BtJPLtINe59Y0tI=";
   };
 
   nativeBuildInputs = [

From 4c6b7bd1ed70d70cce9617afef20aa3e151a0620 Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Sun, 7 Dec 2025 06:19:47 +0800
Subject: [PATCH 090/103] ntfsprogs-plus: init at 1.0.0

---
 pkgs/by-name/nt/ntfsprogs-plus/package.nix | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/nt/ntfsprogs-plus/package.nix

diff --git a/pkgs/by-name/nt/ntfsprogs-plus/package.nix b/pkgs/by-name/nt/ntfsprogs-plus/package.nix
new file mode 100644
index 000000000000..fe96e08882c4
--- /dev/null
+++ b/pkgs/by-name/nt/ntfsprogs-plus/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  pkg-config,
+  libgcrypt,
+  gnutls,
+  gettext,
+  gitUpdater,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ntfsprogs-plus";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "ntfsprogs-plus";
+    repo = "ntfsprogs-plus";
+    tag = finalAttrs.version;
+    hash = "sha256-vbK/lnNMHTycw5H9ijLfX7uRB7mgsI6KGg8gfO3OCGk=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+    "man"
+    "doc"
+  ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    libgcrypt
+    gnutls
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isGnu) [ gettext ];
+
+  configureFlags = [ "--exec-prefix=\${prefix}" ];
+
+  enableParallelBuilding = true;
+
+  passthru.updateScript = gitUpdater { };
+
+  meta = {
+    description = "NTFS filesystem userspace utilities";
+    homepage = "https://github.com/ntfsprogs-plus/ntfsprogs-plus";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ ccicnce113424 ];
+    platforms = lib.platforms.unix;
+  };
+})

From f8d8b3ab192d02a589c6f29e2c111f568d09f5db Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 7 Dec 2025 20:59:27 +0100
Subject: [PATCH 091/103] dbus-cpp: 5.0.5 -> 5.0.6

---
 pkgs/by-name/db/dbus-cpp/package.nix | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix
index a3323397ad35..b72d7f5e546f 100644
--- a/pkgs/by-name/db/dbus-cpp/package.nix
+++ b/pkgs/by-name/db/dbus-cpp/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch2,
   gitUpdater,
   testers,
   boost186,
@@ -21,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dbus-cpp";
-  version = "5.0.5";
+  version = "5.0.6";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lib-cpp/dbus-cpp";
     tag = finalAttrs.version;
-    hash = "sha256-+QqmZsBFmYRwaAFqRyMBxVFFrjZGBDdMaW4YD/7D2gU=";
+    hash = "sha256-ehP+QW/tTR6tLHEiWGDbiYT9oAqlS346UaVTkJC5bSE=";
   };
 
   outputs = [
@@ -37,16 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
     "examples"
   ];
 
-  patches = [
-    # Provide more information when there's an issue in AsyncExecutionLoadTest.RepeatedlyInvokingAnAsyncFunctionWorks
-    # Remove when version > 5.0.5
-    (fetchpatch2 {
-      name = "0001-dbus-cpp-tests-async_execution_load_test-Print-received-error-on-DBus-method-failure.name";
-      url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/8390ce83153c2ae29f21afd2bf5e79e88c59e6d9.diff";
-      hash = "sha256-js2nXT7eG9dcX+yoFMNRVlamQxsbJclmKTX6/5RxxM4=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace doc/CMakeLists.txt \
       --replace-fail 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}'
@@ -101,6 +90,9 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelChecking = false;
 
   disabledTests = [
+    # Flaky flaky flaky. Spams D-Bus with hundreds of requests, and if any is dropped, the test fails.
+    "async_execution_load_test"
+
     # Possible memory corruption in Executor.TimeoutsAreHandledCorrectly
     # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/10
     "executor_test"
@@ -113,9 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     tests.pkg-config = testers.hasPkgConfigModules {
       package = finalAttrs.finalPackage;
-      # Not bumped for 5.0.5: https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/9
-      # Try again on next bump.
-      versionCheck = finalAttrs.version != "5.0.5";
+      versionCheck = true;
     };
     updateScript = gitUpdater { };
   };

From 91d23865b526a7276c03c70b4dc7751aee9eb220 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 7 Dec 2025 20:59:51 +0100
Subject: [PATCH 092/103] dbus-cpp: Unpin boost

No longer necessary.
---
 pkgs/by-name/db/dbus-cpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix
index b72d7f5e546f..7ca68e35d4d7 100644
--- a/pkgs/by-name/db/dbus-cpp/package.nix
+++ b/pkgs/by-name/db/dbus-cpp/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitLab,
   gitUpdater,
   testers,
-  boost186,
+  boost,
   cmake,
   ctestCheckHook,
   dbus,
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    boost186 # uses boost/asio/io_service.hpp
+    boost
     lomiri.cmake-extras
     dbus
     libxml2

From 83a2687ffad0353b8fc5cef8222f045ba1728195 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 7 Dec 2025 21:00:27 +0100
Subject: [PATCH 093/103] lomiri.trust-store: Update reason for boost pin

---
 pkgs/desktops/lomiri/development/trust-store/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lomiri/development/trust-store/default.nix b/pkgs/desktops/lomiri/development/trust-store/default.nix
index f9ec48f3163a..f8f85d470b3a 100644
--- a/pkgs/desktops/lomiri/development/trust-store/default.nix
+++ b/pkgs/desktops/lomiri/development/trust-store/default.nix
@@ -5,8 +5,8 @@
   fetchpatch,
   gitUpdater,
   testers,
-  # dbus-cpp not compatible with Boost 1.87
-  # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/8
+  # Uses boost/asio/io_service.hpp
+  # Waiting for https://gitlab.com/ubports/development/core/trust-store/-/merge_requests/19 to get finished & merged
   boost186,
   cmake,
   cmake-extras,

From 87fd1e1cdb27239e50bf97bdc5bef7a2e14f0e24 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 7 Dec 2025 21:00:43 +0100
Subject: [PATCH 094/103] lomiri.mediascanner2: Unpin boost

Was pinned due to dbus-cpp, underlying issue was resolved.
---
 pkgs/desktops/lomiri/services/mediascanner2/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
index 2fd3c1ca05b1..56370d078c1d 100644
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -5,9 +5,7 @@
   gitUpdater,
   nixosTests,
   testers,
-  # dbus-cpp not compatible with Boost 1.87
-  # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/8
-  boost186,
+  boost,
   cmake,
   cmake-extras,
   dbus,
@@ -60,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    boost186
+    boost
     cmake-extras
     dbus
     dbus-cpp

From c68271d303c9a917dadcc0d4b0624ad96f71343d Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 8 Dec 2025 07:07:27 +0100
Subject: [PATCH 095/103] dumbpipe: 0.27.0 -> 0.33.0

---
 pkgs/by-name/du/dumbpipe/package.nix | 31 ++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix
index 9c9fddfefa72..e76e8e71f581 100644
--- a/pkgs/by-name/du/dumbpipe/package.nix
+++ b/pkgs/by-name/du/dumbpipe/package.nix
@@ -2,20 +2,21 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dumbpipe";
-  version = "0.27.0";
+  version = "0.33.0";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = "dumbpipe";
-    rev = "v${version}";
-    hash = "sha256-IF9KL5Rf7PsM8T/ZdFfycFRDUGmpAqdWyCPFaCGN/ko=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-8iubiYZTOCGD7BjqMDnOi3Or1b7cYffL2HBEikUCXF8=";
   };
 
-  cargoHash = "sha256-qrFARMY5kjxirCJvCW5O1QPU+yaAh16AvULGqbKUY+w=";
+  cargoHash = "sha256-nc/xGi+9kX9OAGLs2uTHMp8Z9+6DLKTvVki2RgNAUV0=";
 
   __darwinAllowLocalNetworking = true;
 
@@ -26,14 +27,26 @@ rustPlatform.buildRustPackage rec {
     (allow file-read* (subpath "/usr/share/icu"))
   '';
 
-  meta = with lib; {
+  checkFlags = [
+    # These tests require network access
+    "--skip=connect_listen_ctrlc_connect"
+    "--skip=connect_listen_ctrlc_listen"
+    "--skip=connect_tcp_happy"
+    "--skip=unix_socket_tests::unix_socket_roundtrip"
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "Connect A to B - Send Data";
     homepage = "https://www.dumbpipe.dev/";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [ cameronfyfe ];
+    maintainers = with lib.maintainers; [ cameronfyfe ];
     mainProgram = "dumbpipe";
   };
-}
+})

From de9ccf73d1e0155fe12cd329e017f28c4b205102 Mon Sep 17 00:00:00 2001
From: builditluc <git@builditluc.eu>
Date: Mon, 8 Dec 2025 07:27:48 +0100
Subject: [PATCH 096/103] wiki-tui: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/by-name/wi/wiki-tui/package.nix b/pkgs/by-name/wi/wiki-tui/package.nix
index 29f3949cab31..3801f7fe4b15 100644
--- a/pkgs/by-name/wi/wiki-tui/package.nix
+++ b/pkgs/by-name/wi/wiki-tui/package.nix
@@ -9,13 +9,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wiki-tui";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "Builditluc";
     repo = "wiki-tui";
     tag = "v${version}";
-    hash = "sha256-eTDxRrTP9vX7F1lmDCuF6g1pfaZChqB8Pv1kfrd7I9w=";
+    hash = "sha256-hUAe2mzz/4xdpyPE2rbTq5WKk0bNa4dSFocFiCXyO4Q=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
     openssl
   ];
 
-  cargoHash = "sha256-Pe6mNbn4GFjhpFZeWMlaRt7Bj5BLiIy789hXWkII2ps=";
+  cargoHash = "sha256-0M3vHj/dzHcI2FJLramTsFMw4m/WGp9vX9Tq52dSW1o=";
 
   meta = {
     description = "Simple and easy to use Wikipedia Text User Interface";

From 3d57dbbb5a5334af9d53a7b6333befbc38236a24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Dec 2025 06:33:44 +0000
Subject: [PATCH 097/103] retroarch-assets: 1.22.0-unstable-2025-11-10 ->
 1.22.0-unstable-2025-12-01

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

diff --git a/pkgs/by-name/re/retroarch-assets/package.nix b/pkgs/by-name/re/retroarch-assets/package.nix
index 79c1c8bd0071..e4cf51cfc25b 100644
--- a/pkgs/by-name/re/retroarch-assets/package.nix
+++ b/pkgs/by-name/re/retroarch-assets/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "retroarch-assets";
-  version = "1.22.0-unstable-2025-11-10";
+  version = "1.22.0-unstable-2025-12-01";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "retroarch-assets";
-    rev = "76cc6cf03507429c5a136cb50d83a14e05430fcd";
-    hash = "sha256-0kxgfuqBoqhT9/D04bHj0Nd0yUYJUa39rSoxTovV6xE=";
+    rev = "a7b711dfd74871e9985ba3b2fe2c15048a928aaf";
+    hash = "sha256-M0abYzsWxGHgwQEobhLKIIKj3XeDxmZBN+5+UER4c9k=";
   };
 
   makeFlags = [

From 472bbee0ade05743fdd4f0ce45575ad926762806 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Mon, 8 Dec 2025 08:44:13 +0100
Subject: [PATCH 098/103] bluetuith: 0.2.5 -> 0.2.6

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/bl/bluetuith/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/bl/bluetuith/package.nix b/pkgs/by-name/bl/bluetuith/package.nix
index e61c102be3e4..f1650b8b90b8 100644
--- a/pkgs/by-name/bl/bluetuith/package.nix
+++ b/pkgs/by-name/bl/bluetuith/package.nix
@@ -1,23 +1,24 @@
 {
   lib,
-  # Module requires Go 1.25, drop pin once buildGoModule uses Go >= 1.25.
-  buildGo125Module,
+  buildGoModule,
   fetchFromGitHub,
   nix-update-script,
 }:
 
-buildGo125Module (finalAttrs: {
+buildGoModule (finalAttrs: {
   pname = "bluetuith";
-  version = "0.2.5";
+  version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "darkhz";
     repo = "bluetuith";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-h7SMGI8wIiu4i2kcKRsmLHM4tu7ZZK0usBXh5zFu94E=";
+    hash = "sha256-jxN4FLefv+edlpBnwDN/pBxZ7sHkv2w+R2tUeNCI6Tw=";
   };
 
-  vendorHash = null;
+  vendorHash = "sha256-baSiOHiB02hfqDt95ldeKwz+tJgunXheTvREznxPUSc=";
+
+  subPackages = [ "." ];
 
   env.CGO_ENABLED = 0;
 

From 0c90cde313a4f4f7d1fbf9e1659c9fae637fa67f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Dec 2025 07:49:07 +0000
Subject: [PATCH 099/103] aws-vault: 7.7.13 -> 7.8.1

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

diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix
index e2bf4633bae5..dc93f6fc4fa6 100644
--- a/pkgs/by-name/aw/aws-vault/package.nix
+++ b/pkgs/by-name/aw/aws-vault/package.nix
@@ -10,17 +10,17 @@
 }:
 buildGoModule rec {
   pname = "aws-vault";
-  version = "7.7.13";
+  version = "7.8.1";
 
   src = fetchFromGitHub {
     owner = "ByteNess";
     repo = "aws-vault";
     rev = "v${version}";
-    hash = "sha256-frwLoksLHa8/YqedpDaWjfdZsE5PkYlzqQzP217nA88=";
+    hash = "sha256-QB967n8UEDaqgQl2HaBHag66r75M6aERkkf+9PeZQlw=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-doEgENt/ceyhxhVNsQej6vA6xw5OgftJ/pGVFBKh4jo=";
+  vendorHash = "sha256-gpStE66S/0oyt7hpyllwx2pxgfua3AUR0OIPvgAMq0k=";
 
   nativeBuildInputs = [
     installShellFiles

From a145c862e3d2a7fb03f44e2e38d323426f9575aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 8 Dec 2025 08:07:09 +0000
Subject: [PATCH 100/103] livebook: 0.18.0 -> 0.18.1

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

diff --git a/pkgs/development/beam-modules/livebook/default.nix b/pkgs/development/beam-modules/livebook/default.nix
index efcf26f1fa99..c358b760cd9d 100644
--- a/pkgs/development/beam-modules/livebook/default.nix
+++ b/pkgs/development/beam-modules/livebook/default.nix
@@ -9,7 +9,7 @@
 
 beamPackages.mixRelease rec {
   pname = "livebook";
-  version = "0.18.0";
+  version = "0.18.1";
 
   inherit (beamPackages) elixir;
 
@@ -21,7 +21,7 @@ beamPackages.mixRelease rec {
     owner = "livebook-dev";
     repo = "livebook";
     tag = "v${version}";
-    hash = "sha256-cALXl9CQZtg7kVAAWEu5CMbimrsjcfpxXLM1LhtxB/g=";
+    hash = "sha256-VwRCZkap8pTlNnOjcF1iTv9kwYOYFFH2YBfYojVKFcQ=";
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {

From 592e7c5b22543691bc7c99722d2c4aa72f7b8dbb Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Fri, 5 Dec 2025 18:40:39 -0500
Subject: [PATCH 101/103] img2pdf: replace gitea src with github

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

diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix
index 29b055ba916a..f6cbbb13c2de 100644
--- a/pkgs/development/python-modules/img2pdf/default.nix
+++ b/pkgs/development/python-modules/img2pdf/default.nix
@@ -2,7 +2,7 @@
   lib,
   pkgs,
   buildPythonPackage,
-  fetchFromGitea,
+  fetchFromGitHub,
   replaceVars,
   colord,
   setuptools,
@@ -25,8 +25,9 @@ buildPythonPackage rec {
   version = "0.6.1";
   pyproject = true;
 
-  src = fetchFromGitea {
-    domain = "gitlab.mister-muffin.de";
+  # gitlab.mister-muffin.de produces a 500 error on 0.6.1
+  # when upgrading, switch src attribute back to gitlab if fixed.
+  src = fetchFromGitHub {
     owner = "josch";
     repo = "img2pdf";
     tag = version;

From 34dd0d96a591e5950c53dd1320dfe3d64e635042 Mon Sep 17 00:00:00 2001
From: Scott Edlund <sedlund@users.noreply.github.com>
Date: Mon, 8 Dec 2025 15:27:31 +0700
Subject: [PATCH 102/103] stc-cli: add -version

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

diff --git a/pkgs/by-name/st/stc-cli/package.nix b/pkgs/by-name/st/stc-cli/package.nix
index 19e76087c588..b4472c2ebc27 100644
--- a/pkgs/by-name/st/stc-cli/package.nix
+++ b/pkgs/by-name/st/stc-cli/package.nix
@@ -1,7 +1,8 @@
 {
-  lib,
   buildGoModule,
   fetchFromGitHub,
+  lib,
+  versionCheckHook,
 }:
 
 buildGoModule rec {
@@ -17,6 +18,12 @@ buildGoModule rec {
 
   vendorHash = "sha256-qLpWXikTr+vB2bIw2EqnoJ0uOxUc/qc6SdGEJQXwmTQ=";
 
+  ldflags = [ "-X main.GitTag=${version}" ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-version";
+
   meta = {
     description = "Syncthing CLI Tool";
     homepage = "https://github.com/tenox7/stc";

From 2c52db6672518c74b425da5de0204c4ff7a42dd0 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Mon, 8 Dec 2025 10:33:05 +0100
Subject: [PATCH 103/103] khal: patch to fix calendar popup

---
 pkgs/by-name/kh/khal/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/kh/khal/package.nix b/pkgs/by-name/kh/khal/package.nix
index 2ca0858819ec..fbd8fb683b24 100644
--- a/pkgs/by-name/kh/khal/package.nix
+++ b/pkgs/by-name/kh/khal/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   glibcLocales,
   installShellFiles,
   python3Packages,
@@ -20,6 +21,15 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-pbBdScyYQMdT2NjCk2dKPkR75Zcizzco2IkXpHkgPR8=";
   };
 
+  patches = [
+    # https://github.com/pimutils/khal/pull/1418/
+    (fetchpatch {
+      name = "fix_calendar_popup";
+      url = "https://github.com/pimutils/khal/commit/3fadf020bb65c9c95bba46b5d3695c2565cceacd.patch";
+      hash = "sha256-KhqP0RLLOXm1d/4rCVAb5f7v0q7N0/U2iM23+TcnJhY=";
+    })
+  ];
+
   build-system = with python3Packages; [
     setuptools
     setuptools-scm