From bf9e0019ce48c18636690194e46709feeb39292f Mon Sep 17 00:00:00 2001
From: Winter M <winter@antithesis.com>
Date: Tue, 11 Nov 2025 14:27:30 -0500
Subject: [PATCH 001/202] nixos/installer/tools: use system's configured Nix
 for nixos-option

---
 nixos/modules/installer/tools/tools.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index bf8a27419ae2..1f632078562e 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -317,7 +317,10 @@ in
         name = "nixos-install";
         package = config.system.build.nixos-install;
       })
-      (mkToolModule { name = "nixos-option"; })
+      (mkToolModule {
+        name = "nixos-option";
+        package = pkgs.nixos-option.override { nix = config.nix.package; };
+      })
       (mkToolModule {
         name = "nixos-rebuild";
         package = config.system.build.nixos-rebuild;

From 47eef038d598c19bb14af7b252938e8393516705 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Fri, 5 Dec 2025 15:05:20 +0100
Subject: [PATCH 002/202] signal-desktop-bin: 7.80.0 -> 7.83.0

---
 pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
index d7f1f53ae34a..eddb873fc3d9 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
@@ -1,12 +1,12 @@
 { callPackage, commandLineArgs }:
 callPackage ./generic.nix { inherit commandLineArgs; } rec {
   pname = "signal-desktop-bin";
-  version = "7.80.0";
+  version = "7.83.0";
 
   libdir = "opt/Signal";
   bindir = libdir;
   extractPkg = "dpkg-deb -x $downloadedFile $out";
 
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-d0OTlGtTGN4d7ZIShhVc39TiSJvEg9UMonqeP++R7x4=";
+  hash = "sha256-DhtOOve8dloIbTi78gLHWars/Y9Fv6YkLkHHpRK7OWY=";
 }

From 8e4ed6131748b483f321396686aa92e40cb597df Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 29 Oct 2025 01:42:15 +0800
Subject: [PATCH 003/202] fetchFromGitHub: explicitly support addditional
 fetchgit args

---
 pkgs/build-support/fetchgithub/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index 1283dcd7d25a..74659e559d49 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -27,7 +27,7 @@ lib.makeOverridable (
     varPrefix ? null,
     passthru ? { },
     meta ? { },
-    ... # For hash agility
+    ... # For hash agility and additional fetchgit arguments
   }@args:
 
   assert (

From cd58ed0ab6e94624acd1757c5241d2c4cf4568ad Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 16 Nov 2025 15:16:54 +0800
Subject: [PATCH 004/202] fetchFromGitHub: converge arguments that determines
 useFetchGit

---
 pkgs/build-support/fetchgithub/default.nix | 97 +++++++++++++---------
 1 file changed, 58 insertions(+), 39 deletions(-)

diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index 74659e559d49..7f6cb26e9387 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -4,8 +4,40 @@
   fetchgit,
   fetchzip,
 }:
+let
+  # Here defines fetchFromGitHub arguments that determines useFetchGit,
+  # The attribute value is their default values.
+  # As fetchFromGitHub prefers fetchzip for hash stability,
+  # `defaultFetchGitArgs` attributes should lead to `useFetchGit = false`.
+  useFetchGitArgsDefault = {
+    deepClone = false;
+    fetchSubmodules = false; # This differs from fetchgit's default
+    fetchLFS = false;
+    forceFetchGit = false;
+    leaveDotGit = null;
+    rootDir = "";
+    sparseCheckout = null;
+  };
+  useFetchGitArgsDefaultNullable = {
+    leaveDotGit = false;
+    sparseCheckout = [ ];
+  };
 
-lib.makeOverridable (
+  useFetchGitargsDefaultNonNull = useFetchGitArgsDefault // useFetchGitArgsDefaultNullable;
+
+  # useFetchGitArgsWD to exclude from automatic passing.
+  # Other useFetchGitArgsWD will pass down to fetchgit.
+  excludeUseFetchGitArgNames = [
+    "forceFetchGit"
+  ];
+
+  faUseFetchGit = lib.mapAttrs (_: _: true) useFetchGitArgsDefault;
+
+  adjustFunctionArgs = f: lib.setFunctionArgs f (faUseFetchGit // lib.functionArgs f);
+
+  decorate = f: lib.makeOverridable (adjustFunctionArgs f);
+in
+decorate (
   {
     owner,
     repo,
@@ -13,16 +45,7 @@ lib.makeOverridable (
     rev ? null,
     # TODO(@ShamrockLee): Add back after reconstruction with lib.extendMkDerivation
     # name ? repoRevToNameMaybe finalAttrs.repo (lib.revOrTag finalAttrs.revCustom finalAttrs.tag) "github",
-    # `fetchFromGitHub` defaults to use `fetchzip` for better hash stability.
-    # We default not to fetch submodules, which is contrary to `fetchgit`'s default.
-    fetchSubmodules ? false,
-    leaveDotGit ? null,
-    deepClone ? false,
     private ? false,
-    forceFetchGit ? false,
-    fetchLFS ? false,
-    rootDir ? "",
-    sparseCheckout ? null,
     githubBase ? "github.com",
     varPrefix ? null,
     passthru ? { },
@@ -37,6 +60,16 @@ lib.makeOverridable (
   );
 
   let
+    useFetchGit = useFetchGitArgsWDNonNull != useFetchGitargsDefaultNonNull;
+
+    useFetchGitArgs = lib.intersectAttrs useFetchGitArgsDefault args;
+    useFetchGitArgsWD = useFetchGitArgsDefault // useFetchGitArgs;
+    useFetchGitArgsWDPassing = removeAttrs useFetchGitArgsWD excludeUseFetchGitArgNames;
+    useFetchGitArgsWDNonNull =
+      useFetchGitArgsWD
+      // lib.mapAttrs (
+        name: nonNullDefault: lib.defaultTo nonNullDefault useFetchGitArgsWD.${name}
+      ) useFetchGitArgsDefaultNullable;
 
     position = (
       if args.meta.description or null != null then
@@ -56,26 +89,19 @@ lib.makeOverridable (
         # to indicate where derivation originates, similar to make-derivation.nix's mkDerivation
         position = "${position.file}:${toString position.line}";
       };
-    passthruAttrs = removeAttrs args [
-      "owner"
-      "repo"
-      "tag"
-      "rev"
-      "fetchSubmodules"
-      "forceFetchGit"
-      "private"
-      "githubBase"
-      "varPrefix"
-    ];
+    passthruAttrs = removeAttrs args (
+      [
+        "owner"
+        "repo"
+        "tag"
+        "rev"
+        "private"
+        "githubBase"
+        "varPrefix"
+      ]
+      ++ (if useFetchGit then excludeUseFetchGitArgNames else lib.attrNames faUseFetchGit)
+    );
     varBase = "NIX${lib.optionalString (varPrefix != null) "_${varPrefix}"}_GITHUB_PRIVATE_";
-    useFetchGit =
-      fetchSubmodules
-      || lib.defaultTo false leaveDotGit == true
-      || deepClone
-      || forceFetchGit
-      || fetchLFS
-      || (rootDir != "")
-      || lib.defaultTo [ ] sparseCheckout != [ ];
     # We prefer fetchzip in cases we don't need submodules as the hash
     # is more stable in that case.
     fetcher =
@@ -118,16 +144,9 @@ lib.makeOverridable (
       passthruAttrs
       // (
         if useFetchGit then
-          {
-            inherit
-              tag
-              rev
-              deepClone
-              fetchSubmodules
-              leaveDotGit
-              sparseCheckout
-              fetchLFS
-              ;
+          useFetchGitArgsWDPassing
+          // {
+            inherit tag rev;
             url = gitRepoUrl;
             inherit passthru;
             derivationArgs = {

From 12159ff853c4ec97a1ec7d4b3c896e24baf8fb0a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Dec 2025 18:40:01 +0000
Subject: [PATCH 005/202] python3Packages.libipld: 3.2.0 -> 3.3.2

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

diff --git a/pkgs/development/python-modules/libipld/default.nix b/pkgs/development/python-modules/libipld/default.nix
index b73571391af7..796c7c6b3849 100644
--- a/pkgs/development/python-modules/libipld/default.nix
+++ b/pkgs/development/python-modules/libipld/default.nix
@@ -18,19 +18,19 @@
 
 buildPythonPackage rec {
   pname = "libipld";
-  version = "3.2.0";
+  version = "3.3.2";
   format = "pyproject";
   disabled = pythonOlder "3.8";
 
   # use pypi, GitHub does not include Cargo.lock
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ZUIw/9k4Kl7sKKrU4Nzdk/Ed2H2mVpOdvxODB/KGcSA=";
+    hash = "sha256-foXM2RNhEOY5Q9lSMrGTyJPjacQGJz0jUWDlzEs5yc4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-jVZ3Oml/W6Kb9hYEXazF3/ogFHtl43d1YLd8vZFJDa8=";
+    hash = "sha256-BtFIX6xCJWBkIOzYEr8XohA1jsXC9rhiaMd87pe101w=";
   };
 
   build-system = [

From 9acdb8892172f85f7bc40886122d54a20124355b Mon Sep 17 00:00:00 2001
From: Kornelijus Survila <kornholijo@gmail.com>
Date: Wed, 10 Dec 2025 01:02:33 -0700
Subject: [PATCH 006/202] maintainers: add kornholi

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b4ed4ecc2347..bac49b1dcfd9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13958,6 +13958,12 @@
     githubId = 913109;
     name = "Emil Fresk";
   };
+  kornholi = {
+    email = "kornholijo@gmail.com";
+    github = "kornholi";
+    githubId = 659440;
+    name = "Kornelijus";
+  };
   koschi13 = {
     email = "maximilian.konter@protonmail.com";
     github = "koschi13";

From c2645bc8a1f996ca7acaf4f4f4f8aea4d23f8917 Mon Sep 17 00:00:00 2001
From: Kornelijus Survila <kornholijo@gmail.com>
Date: Wed, 10 Dec 2025 01:05:44 -0700
Subject: [PATCH 007/202] foundationdb: add kornholi as maintainer

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

diff --git a/pkgs/by-name/fo/foundationdb/package.nix b/pkgs/by-name/fo/foundationdb/package.nix
index 4e7b7ee201ab..bea37684bd7b 100644
--- a/pkgs/by-name/fo/foundationdb/package.nix
+++ b/pkgs/by-name/fo/foundationdb/package.nix
@@ -171,6 +171,7 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [
       thoughtpolice
       lostnet
+      kornholi
     ];
   };
 }

From 7d831bec51b321f7d875abfcb3440716b909c746 Mon Sep 17 00:00:00 2001
From: Kornelijus Survila <kornholijo@gmail.com>
Date: Wed, 10 Dec 2025 00:41:15 -0700
Subject: [PATCH 008/202] foundationdb: do not statically link
 libcxx/libstdc++/libgcc

FDB defaults to statically linking libcxx, libstdc++, and libgcc. This leads
to non-obvious problems when the dependencies bring in their own copies. Do
not do that as we're not trying to build and package portable binaries.

Fixes #319537.
Fixes #378888.
---
 pkgs/by-name/fo/foundationdb/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/fo/foundationdb/package.nix b/pkgs/by-name/fo/foundationdb/package.nix
index bea37684bd7b..4929c546d61c 100644
--- a/pkgs/by-name/fo/foundationdb/package.nix
+++ b/pkgs/by-name/fo/foundationdb/package.nix
@@ -107,6 +107,12 @@ stdenv.mkDerivation rec {
 
     "-DBUILD_DOCUMENTATION=FALSE"
 
+    # Disable the default static linking to libc++, libstdc++ and libgcc.
+    #
+    # This leads to various, non-obvious problems as our dependencies bring in
+    # their own copies of these libraries.
+    "-DSTATIC_LINK_LIBCXX=FALSE"
+
     # LTO brings up overall build time, but results in much smaller
     # binaries for all users and the cache.
     "-DUSE_LTO=ON"

From 05a0e8615c7597919b9560d9545ae7f48cd9e136 Mon Sep 17 00:00:00 2001
From: Kornelijus Survila <kornholijo@gmail.com>
Date: Wed, 10 Dec 2025 00:52:53 -0700
Subject: [PATCH 009/202] foundationdb: 7.3.42 -> 7.3.68

This is the latest release validated in production.
---
 pkgs/by-name/fo/foundationdb/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/foundationdb/package.nix b/pkgs/by-name/fo/foundationdb/package.nix
index 4929c546d61c..dd4cb12813a5 100644
--- a/pkgs/by-name/fo/foundationdb/package.nix
+++ b/pkgs/by-name/fo/foundationdb/package.nix
@@ -15,6 +15,7 @@
   toml11,
   jemalloc,
   doctest,
+  zlib,
 }:
 let
   boost = boost186;
@@ -29,13 +30,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "foundationdb";
-  version = "7.3.42";
+  version = "7.3.68";
 
   src = fetchFromGitHub {
     owner = "apple";
     repo = "foundationdb";
     tag = version;
-    hash = "sha256-jQcm+HLai5da2pZZ7iLdN6fpQZxf5+/kkfv9OSXQ57c=";
+    hash = "sha256-OaV7YyBggeX3vrnI2EYwlWdIGRHOAeP5OZN0Rmd/dnw=";
   };
 
   patches = [
@@ -80,6 +81,7 @@ stdenv.mkDerivation rec {
     msgpack-cxx
     openssl
     toml11
+    zlib
   ];
 
   checkInputs = [ doctest ];

From 92f45c5d8879583ef3d83922a643ef9b536e3c83 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 11 Dec 2025 04:56:46 +0800
Subject: [PATCH 010/202] fetchFromGitHub: simplify useFetchGit and
 useFetchGitArgsWDPassing

---
 pkgs/build-support/fetchgithub/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index 7f6cb26e9387..a08f6d5de12b 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -60,16 +60,16 @@ decorate (
   );
 
   let
-    useFetchGit = useFetchGitArgsWDNonNull != useFetchGitargsDefaultNonNull;
+    useFetchGit =
+      lib.mapAttrs (
+        name: nonNullDefault:
+        if args ? ${name} && (useFetchGitArgsDefaultNullable ? ${name} -> args.${name} != null) then
+          args.${name}
+        else
+          nonNullDefault
+      ) useFetchGitargsDefaultNonNull != useFetchGitargsDefaultNonNull;
 
-    useFetchGitArgs = lib.intersectAttrs useFetchGitArgsDefault args;
-    useFetchGitArgsWD = useFetchGitArgsDefault // useFetchGitArgs;
-    useFetchGitArgsWDPassing = removeAttrs useFetchGitArgsWD excludeUseFetchGitArgNames;
-    useFetchGitArgsWDNonNull =
-      useFetchGitArgsWD
-      // lib.mapAttrs (
-        name: nonNullDefault: lib.defaultTo nonNullDefault useFetchGitArgsWD.${name}
-      ) useFetchGitArgsDefaultNullable;
+    useFetchGitArgsWDPassing = lib.overrideExisting (removeAttrs useFetchGitArgsDefault excludeUseFetchGitArgNames) args;
 
     position = (
       if args.meta.description or null != null then

From 304c5d48731b314267edf9650b6f4b380e783ef6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Dec 2025 14:49:23 +0000
Subject: [PATCH 011/202] python3Packages.atproto: 0.0.63 -> 0.0.65

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

diff --git a/pkgs/development/python-modules/atproto/default.nix b/pkgs/development/python-modules/atproto/default.nix
index b9a1c4b24b9b..87431ec4f33a 100644
--- a/pkgs/development/python-modules/atproto/default.nix
+++ b/pkgs/development/python-modules/atproto/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "atproto";
-  version = "0.0.63";
+  version = "0.0.65";
   format = "pyproject";
 
   # use GitHub, pypi does not include tests
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "MarshalX";
     repo = "atproto";
     tag = "v${version}";
-    hash = "sha256-ECqBlvKa0DK96AM0yJNuw2mq0SvZohPHFgxJ2jVHZ5s=";
+    hash = "sha256-0NogKxYO+lCtNhK2ZWwRLQTV7rHU5Oz+lnE4awsoPsM=";
   };
 
   POETRY_DYNAMIC_VERSIONING_BYPASS = version;

From 1f8637ddcce9cdcbdd869abc4d3c4ee1681f8b3f Mon Sep 17 00:00:00 2001
From: Marvin Preuss <marvin@xsteadfastx.org>
Date: Wed, 10 Dec 2025 09:09:41 +0100
Subject: [PATCH 012/202] golines: prevent building of the generate binary

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

diff --git a/pkgs/by-name/go/golines/package.nix b/pkgs/by-name/go/golines/package.nix
index 0c7a02bc81cc..2f1f7d1888c7 100644
--- a/pkgs/by-name/go/golines/package.nix
+++ b/pkgs/by-name/go/golines/package.nix
@@ -17,6 +17,10 @@ buildGoModule rec {
 
   vendorHash = "sha256-94IXh9iBAE0jJXovaElY8oFdXE6hxYg0Ww0ZEHLnEwc=";
 
+  subPackages = [
+    "."
+  ];
+
   meta = {
     description = "Golang formatter that fixes long lines";
     homepage = "https://github.com/segmentio/golines";

From f9fe2a54b9be262ac47ea94d785490e9a740c979 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Dec 2025 23:52:17 +0000
Subject: [PATCH 013/202] nitrokey-app2: 2.4.1 -> 2.4.3

---
 pkgs/tools/security/nitrokey-app2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/tools/security/nitrokey-app2/default.nix
index 384078074af1..b0f66d776454 100644
--- a/pkgs/tools/security/nitrokey-app2/default.nix
+++ b/pkgs/tools/security/nitrokey-app2/default.nix
@@ -22,14 +22,14 @@ in
 
 buildPythonApplication rec {
   pname = "nitrokey-app2";
-  version = "2.4.1";
+  version = "2.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Nitrokey";
     repo = "nitrokey-app2";
     tag = "v${version}";
-    hash = "sha256-nzhhtnKKOHA+Cw1y+BpYsyQklzkDnmFRKGIfaJ/dmaQ=";
+    hash = "sha256-mwcYjkyEP2itwdQ/xAG50uvw6zHfUacAecbDh86GNGA=";
   };
 
   nativeBuildInputs = [

From e2d490999eb9e4d2f0d387bffd219e4aec21ae1a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 17 Dec 2025 08:24:09 +0000
Subject: [PATCH 014/202] python3Packages.nanobind: 2.10.1 -> 2.10.2

Diff: https://github.com/wjakob/nanobind/compare/v2.10.1...v2.10.2

Changelog: https://github.com/wjakob/nanobind/blob/v2.10.2/docs/changelog.rst
---
 pkgs/development/python-modules/nanobind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix
index 4c4dd56d8745..6a7683bb5ef2 100644
--- a/pkgs/development/python-modules/nanobind/default.nix
+++ b/pkgs/development/python-modules/nanobind/default.nix
@@ -26,7 +26,7 @@
 }:
 buildPythonPackage rec {
   pname = "nanobind";
-  version = "2.10.1";
+  version = "2.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     repo = "nanobind";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-LNr3d0ytnkcJOps6DzdZtyiihFwNgv34s5RJsRBD844=";
+    hash = "sha256-io44YhN+VpfHFWyvvLWSanRgbzA0whK8WlDNRi3hahU=";
   };
 
   build-system = [

From 6c021ee561aacd96f60336ca82eccb075cf6dc0d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Dec 2025 10:02:46 +0000
Subject: [PATCH 015/202] python3Packages.langchain-chroma: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix
index d8ff4c47f065..ecb321864727 100644
--- a/pkgs/development/python-modules/langchain-chroma/default.nix
+++ b/pkgs/development/python-modules/langchain-chroma/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-chroma";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-chroma==${version}";
-    hash = "sha256-fKFcl4NiNaypJGoV8bDrH7MwnsXNtnm7Hkxp/+SLc2c=";
+    hash = "sha256-WyW5QNLzbqI+kXIVCDyXLyqpShNOSk7tyBTdNoXGQZ0=";
   };
 
   sourceRoot = "${src.name}/libs/partners/chroma";

From cfe2d591020409618468fea4cffb0a7baa234a7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Dec 2025 20:08:15 +0000
Subject: [PATCH 016/202] zoho-mail-desktop: 1.7.2 -> 1.7.4

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

diff --git a/pkgs/by-name/zo/zoho-mail-desktop/package.nix b/pkgs/by-name/zo/zoho-mail-desktop/package.nix
index caac02759af7..a891a7f31e1d 100644
--- a/pkgs/by-name/zo/zoho-mail-desktop/package.nix
+++ b/pkgs/by-name/zo/zoho-mail-desktop/package.nix
@@ -6,11 +6,11 @@
 
 let
   pname = "zoho-mail-desktop";
-  version = "1.7.2";
+  version = "1.7.4";
 
   src = fetchurl {
     url = "https://downloads.zohocdn.com/zmail-desktop/linux/zoho-mail-desktop-lite-x64-v${version}.AppImage";
-    hash = "sha256-hoWOujwfm5/DS/0Kh69gqIKmc1dnVSOYJP/zypvcy8I=";
+    hash = "sha256-uGz2sksBMbw/17ia/RU/9kJhf4EMeSFrMX27D9XplrI=";
   };
 
   appimageContents = appimageTools.extract {

From dcaea930a09bcc42cebd501b0451c74c1c1ffa99 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 17 Dec 2025 21:25:24 +0100
Subject: [PATCH 017/202] =?UTF-8?q?cvc5:=201.3.1=20=E2=86=92=201.3.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/cv/cvc5/package.nix b/pkgs/by-name/cv/cvc5/package.nix
index 52983f935a73..b9156237f890 100644
--- a/pkgs/by-name/cv/cvc5/package.nix
+++ b/pkgs/by-name/cv/cvc5/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cvc5";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "cvc5";
     repo = "cvc5";
     tag = "cvc5-${version}";
-    hash = "sha256-nxJjrpWZfYPuuKN4CWxOHEuou4r+MdK0AjdEPZHZbHI=";
+    hash = "sha256-Um1x+XgQ5yWSoqtx1ZWbVAnNET2C4GVasIbn0eNfico=";
   };
 
   nativeBuildInputs = [

From cf8f79b9e84ed328d33e2ea71a9e8b4aa1661be6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Dec 2025 00:03:11 +0000
Subject: [PATCH 018/202] python3Packages.python-sat: 1.8.dev24 -> 1.8.dev25

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

diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix
index 9f3b351c005d..9a983d763635 100644
--- a/pkgs/development/python-modules/python-sat/default.nix
+++ b/pkgs/development/python-modules/python-sat/default.nix
@@ -9,7 +9,7 @@
 }:
 buildPythonPackage rec {
   pname = "python-sat";
-  version = "1.8.dev24";
+  version = "1.8.dev25";
   pyproject = true;
 
   build-system = [ setuptools ];
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "python_sat";
-    hash = "sha256-f9NnaPcHdNNInWTvpkg91ieaYejJ29kAAOLcbnbDmM0=";
+    hash = "sha256-3eVCBXg95RyzMA8O8EOss1FKh+1EofnkKYJcVNuQAzY=";
   };
 
   preBuild = ''

From 8687e962dc81d96d9199f8266673961aef17a3a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Dec 2025 07:04:48 +0000
Subject: [PATCH 019/202] python3Packages.langchain-google-genai: 4.0.0 ->
 4.1.1

---
 .../python-modules/langchain-google-genai/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langchain-google-genai/default.nix b/pkgs/development/python-modules/langchain-google-genai/default.nix
index 5d41f44e971e..3871f30d7998 100644
--- a/pkgs/development/python-modules/langchain-google-genai/default.nix
+++ b/pkgs/development/python-modules/langchain-google-genai/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-google-genai";
-  version = "4.0.0";
+  version = "4.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-google";
     tag = "libs/genai/v${version}";
-    hash = "sha256-SVwBJbHcoD8zqBr4r1uP35/gbWZxZsD0ygJuttCdTjY=";
+    hash = "sha256-PqJyT6Z6XpDvbexLlrrfeeycS4mXNR3vpWz3vSy+iac=";
   };
 
   sourceRoot = "${src.name}/libs/genai";

From d1f788bd2369554c3941a3d2fbe6c61c9464920b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Dec 2025 09:46:49 +0000
Subject: [PATCH 020/202] signal-desktop: 7.81.0 -> 7.82.0

---
 pkgs/by-name/si/signal-desktop/libsignal-node.nix  |  8 ++++----
 pkgs/by-name/si/signal-desktop/package.nix         | 10 +++++-----
 pkgs/by-name/si/signal-desktop/ringrtc.nix         |  6 +++---
 pkgs/by-name/si/signal-desktop/webrtc-sources.json |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index 599530664cb3..f9a0174b46f3 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -24,23 +24,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.83.0";
+  version = "0.86.3";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lSk9C2RIRsAlSUr8folhdHkHkpAfPM+vwJ/rZ6mys3Q=";
+    hash = "sha256-MEwtFOYdp8VjZ++R003kXj72m5yY5V/s+PwyORmN5os=";
   };
 
-  cargoHash = "sha256-0P89+p0WlQaa48wpgsaapIhEzlAnWVPl9qD+jnBw9mM=";
+  cargoHash = "sha256-xAYMoOdEhq0502lWSwm1aDFh4gIEP1OYUWdOAqijeGM=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-4sd8JVQfCC4dAkksICbb3e4JjNcgplOW26TyRkAFWp0=";
+    hash = "sha256-6LL0+jLDfvU021EnArI71IAJOM/0HZcxNu5D+HfitS4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 7d6063b28799..b6e3dffd69eb 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -52,13 +52,13 @@ let
     '';
   });
 
-  version = "7.81.0";
+  version = "7.82.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-Ulv4/VZxsMAFKsNshVDdWjqGg4FzazvWdXGohwlyKs4=";
+    hash = "sha256-TcOLv5i1F9zQxbL8p8Smkil01OcnYpiLcfU2QwCGmXA=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -134,15 +134,15 @@ stdenv.mkDerivation (finalAttrs: {
     fetcherVersion = 1;
     hash =
       if withAppleEmojis then
-        "sha256-aNef+j0Kw8ERa1KKerGFi1+14U7YEclHThGIjkmQQow="
+        "sha256-taF3A2YcqMzqcS401fxRW9wEC/Ol7bVJ6belF4RTIRk="
       else
-        "sha256-n5wvPqYCqKGC8ApUJ7K7OSwOHJq1rEivXiowK+HzN8M=";
+        "sha256-sWxxANPW0W5/tmowoJ7ZPBEBSurKN6C+wZAcLa2QHz8=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1764799973;
+    SOURCE_DATE_EPOCH = 1765407102;
   };
 
   preBuild = ''
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index 4a918428b062..eff4bc70f17e 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -19,16 +19,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ringrtc";
-  version = "2.59.4";
+  version = "2.60.7";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "ringrtc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Yj2ARjQsEDoempZmX+N4whhyTiLxDPR6Y/qeeku9GOQ=";
+    hash = "sha256-tTfWAnY7I1Gch/tRr4o7NhoZhZ5+jGoZ1BWgAYl0a+I=";
   };
 
-  cargoHash = "sha256-b17tO22CtVl4JK0ABD7h+JyyYwLOK1VTKTSKIGim2yQ=";
+  cargoHash = "sha256-h44LLxKDKBVfBMVdVUtlQdct+sFK553rRoOAXsSYqIM=";
 
   preConfigure = ''
     # Check for matching webrtc version
diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
index 4e443fb72ed7..930dfda27d7a 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json
+++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
@@ -1,10 +1,10 @@
 {
     "src": {
         "args": {
-            "hash": "sha256-E4qWqB9rxANygL3UMavjbVNcKdsn6GAv0eawXsrmIQg=",
+            "hash": "sha256-bjbMVnTgSrjHbJOpQz+PSf0kppzX3Wvu5wihPTRY9qg=",
             "owner": "signalapp",
             "repo": "webrtc",
-            "tag": "7339d"
+            "tag": "7339f"
         },
         "fetcher": "fetchFromGitHub"
     },

From e73b0a2f0c0c5b23be47128a9b6596f0c9e22764 Mon Sep 17 00:00:00 2001
From: jzbor <jzbor@posteo.net>
Date: Thu, 18 Dec 2025 13:26:27 +0100
Subject: [PATCH 021/202] maintainers: add jzbor

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index de00af8965c9..110c5fb5e606 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13294,6 +13294,12 @@
     githubId = 20658981;
     name = "Jarosław Wygoda";
   };
+  jzbor = {
+    email = "jzbor@posteo.net";
+    github = "jzbor";
+    githubId = 48366877;
+    name = "Julian";
+  };
   jzellner = {
     email = "jeffz@eml.cc";
     github = "sofuture";

From 9cf6c01ac1fb5d8eb9574045ac6bdabd2ef6e997 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 18 Dec 2025 10:01:57 -0800
Subject: [PATCH 022/202] python3Packages.langgraph-sdk: 0.2.15 -> 0.3.0

CHANGELOG: https://github.com/langchain-ai/langgraph/releases/tag/sdk%3D%3D0.3.0
DIFF: https://github.com/langchain-ai/langgraph/compare/sdk%3D%3D0.2.15...sdk%3D%3D0.3.0
---
 pkgs/development/python-modules/langgraph-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix
index 9873caff5b34..bb743b6addb3 100644
--- a/pkgs/development/python-modules/langgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/langgraph-sdk/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-sdk";
-  version = "0.2.15";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "sdk==${version}";
-    hash = "sha256-+T7FBmsSAkteabmhDO475qO46bRJwyAammUBwX2Bo/g=";
+    hash = "sha256-64FlCtUz49KKQoz78NYMVaY3Wcy/AE/D7XGQW4gIMMg=";
   };
 
   sourceRoot = "${src.name}/libs/sdk-py";

From 54d11d2da963c24ea33d0adb7ba75c6e20c12326 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 18 Dec 2025 10:17:32 -0800
Subject: [PATCH 023/202] python3Packages.langgraph: 1.0.4 -> 1.0.5

CHANGELOG: https://github.com/langchain-ai/langgraph/releases/tag/1.0.5
DIFF: https://github.com/langchain-ai/langgraph/compare/1.0.4...1.0.5
---
 pkgs/development/python-modules/langgraph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix
index 8693984000c1..b72307792d0d 100644
--- a/pkgs/development/python-modules/langgraph/default.nix
+++ b/pkgs/development/python-modules/langgraph/default.nix
@@ -40,14 +40,14 @@
 }:
 buildPythonPackage rec {
   pname = "langgraph";
-  version = "1.0.4";
+  version = "1.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = version;
-    hash = "sha256-Lo/Vq48j1my+GoZATKo3gByz5WJrFJEU7pelzfFfDLQ=";
+    hash = "sha256-QvnBb69JxOVfZ/22igX+WVatJNAUrHUrh3aIpztYmmc=";
   };
 
   postgresqlTestSetupPost = ''

From fd8fc73987298e47c02f869e0095b60bcb263433 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 18 Dec 2025 10:21:14 -0800
Subject: [PATCH 024/202] python3Packages.langgraph-cli: 0.4.9 -> 0.4.11

CHANGELOG: https://github.com/langchain-ai/langgraph/releases/tag/cli%3D%3D0.4.11
DIFF: https://github.com/langchain-ai/langgraph/compare/cli%3D%3D0.4.9...cli%3D%3D0.4.11
---
 pkgs/development/python-modules/langgraph-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix
index 3233e6b47686..ff127e61c46c 100644
--- a/pkgs/development/python-modules/langgraph-cli/default.nix
+++ b/pkgs/development/python-modules/langgraph-cli/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-cli";
-  version = "0.4.9";
+  version = "0.4.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "cli==${version}";
-    hash = "sha256-qSKqxmypo9p3hcYTl2RtwqCw/+vYmu/HvnauEJi2zkU=";
+    hash = "sha256-sr3AtcrG9V0c5UBdSXyaX3bCxzrSONpY28L5jlomZuM=";
   };
 
   sourceRoot = "${src.name}/libs/cli";

From e1dc53feb6046ff893af509d0b3b0fe478e1ec13 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Fri, 5 Dec 2025 15:05:40 +0100
Subject: [PATCH 025/202] signal-desktop-bin(aarch64): 7.80.0 -> 7.83.0

---
 .../si/signal-desktop-bin/signal-desktop-aarch64.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
index 517bb4e74713..bb7ddb0568c6 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
@@ -1,7 +1,7 @@
 { callPackage, commandLineArgs }:
 callPackage ./generic.nix { inherit commandLineArgs; } {
   pname = "signal-desktop-bin";
-  version = "7.80.0";
+  version = "7.83.0";
 
   libdir = "usr/lib64/signal-desktop";
   bindir = "usr/bin";
@@ -10,6 +10,6 @@ callPackage ./generic.nix { inherit commandLineArgs; } {
     bsdtar -xf $downloadedFile -C "$out"
   '';
 
-  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09815595-signal-desktop/signal-desktop-7.80.0-1.fc42.aarch64.rpm";
-  hash = "sha256-RunFdBUGBmDmztWdn9Rjbotnzwiid+gCIKPz1Nrc8v0=";
+  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09932085-signal-desktop/signal-desktop-7.83.0-1.fc42.aarch64.rpm";
+  hash = "sha256-OY+sHfAC/WTC2MkjFjlImYXLNflFNAw4VRcbQ/B3s10=";
 }

From 73b35dcfa3f10bb47193851ff7c046c99c7b223f Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Fri, 5 Dec 2025 15:05:54 +0100
Subject: [PATCH 026/202] signal-desktop-bin(darwin): 7.80.0 -> 7.83.0

---
 pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
index 9284e47bc21b..f21bd88b7867 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
@@ -6,11 +6,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "signal-desktop-bin";
-  version = "7.80.0";
+  version = "7.83.0";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
-    hash = "sha256-hoWFoC+l4WwCYVWwlbIudrBNTw0wSUmB8Hyuy4/xyBs=";
+    hash = "sha256-5W70xzjT5+PbzmDHBFIqAUdXn9N1L0aZm1rrdAPUXRw=";
   };
   sourceRoot = ".";
 

From 2a6eab1ceda3d65e0def37af20b1f31a464f8a6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Dec 2025 22:43:55 +0000
Subject: [PATCH 027/202] grafanaPlugins.grafana-pyroscope-app: 1.12.0 ->
 1.14.2

---
 .../grafana/plugins/grafana-pyroscope-app/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
index 36ba4275b5a2..04486f08f241 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-pyroscope-app";
-  version = "1.12.0";
-  zipHash = "sha256-Zxp/ebNEwcq/JRhSbtWsFWVY5mIGEexVnH/jtEnKXec=";
+  version = "1.14.2";
+  zipHash = "sha256-nRKsSPBfTN+CMrKMaV/ETM0CRxVrbkjici3mps19b/0=";
   meta = {
     description = "Integrate seamlessly with Pyroscope, the open-source continuous profiling platform, providing a smooth, query-less experience for browsing and analyzing profiling data";
     license = lib.licenses.agpl3Only;

From f2f3ce2af81912b28e6f99c3f092300cf5b2c860 Mon Sep 17 00:00:00 2001
From: Atlas Yu <pseudoc@163.com>
Date: Fri, 19 Dec 2025 16:57:19 +0800
Subject: [PATCH 028/202] nixos/nixos-generate-config: fix intel-npu imports

The generated configuration during the installation will failed to
evaluate "error: The option `hardware.cpu.intel.npu' does not exist."
on Intel CPUs have NPU support.

- Fix this by adding the missing imports when PCI ID matches.
- Also update the PCI ID list (linux v6.18).

Closes: #470638
---
 .../installer/tools/nixos-generate-config.pl        | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 77139976e7ad..bbd0a093b998 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -205,10 +205,15 @@ sub pciCheck {
         ($device eq "0x4229" || $device eq "0x4230" ||
          $device eq "0x4222" || $device eq "0x4227");
 
-    push @attrs, "hardware.cpu.intel.npu.enable = true;" if
-        $vendor eq "0x8086" &&
-        ($device eq "0x7d1d" || $device eq "0xad1d" ||
-         $device eq "0x643e" || $device eq "0xb03e");
+    # Intel NPU driver
+    # list taken from linux(v6.18): drivers/accel/ivpu/ivpu_drv.h
+    if ($vendor eq "0x8086" &&
+        ($device eq "0xfd3e" || $device eq "0x7d1d" || $device eq "0xad1d" ||
+         $device eq "0x643e" || $device eq "0xb03e"))
+    {
+        push @imports, "(modulesPath + \"/hardware/cpu/intel-npu.nix\")";
+        push @attrs, "hardware.cpu.intel.npu.enable = true;";
+    }
 
     # Assume that all NVIDIA cards are supported by the NVIDIA driver.
     # There may be exceptions (e.g. old cards).

From 20543cadf48f4cffbe54f648305433f786f4c9dd Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Thu, 18 Dec 2025 10:17:59 +0100
Subject: [PATCH 029/202] ironbar: 0.17.1 -> 0.18.0

Changelog: https://github.com/JakeStanger/ironbar/releases/tag/v0.18.0
Diff: https://github.com/JakeStanger/ironbar/compare/v0.17.1...v0.18.0

This version updates GTK3 to GTK4, see:
https://github.com/JakeStanger/ironbar/wiki/gtk4#building
---
 pkgs/by-name/ir/ironbar/package.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix
index 2db15bec9319..7dfade94684e 100644
--- a/pkgs/by-name/ir/ironbar/package.nix
+++ b/pkgs/by-name/ir/ironbar/package.nix
@@ -1,5 +1,5 @@
 {
-  gtk3,
+  gtk4,
   gdk-pixbuf,
   librsvg,
   webp-pixbuf-loader,
@@ -8,11 +8,10 @@
   glib,
   shared-mime-info,
   gsettings-desktop-schemas,
-  wrapGAppsHook3,
-  gtk-layer-shell,
+  wrapGAppsHook4,
+  gtk4-layer-shell,
   adwaita-icon-theme,
   libxkbcommon,
-  libdbusmenu-gtk3,
   openssl,
   pkg-config,
   hicolor-icon-theme,
@@ -26,6 +25,7 @@
   libevdev,
   features ? [ ],
   systemd,
+  dbus,
 }:
 
 let
@@ -33,22 +33,22 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "ironbar";
-  version = "0.17.1";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "JakeStanger";
     repo = "ironbar";
     rev = "v${version}";
-    hash = "sha256-aph9onWsaEYJqz1bcBNijEexnH0MPLtoblpU9KSbksA=";
+    hash = "sha256-vhkNdvzY9xd8qmKgKtpVRTdvmS1QxnGKDFCpttqX1GE=";
   };
 
-  cargoHash = "sha256-puBoRdCd1A8FmEu5PmczgYAdPdTA8FA1CWsh7qWjHzQ=";
+  cargoHash = "sha256-ptzq0407IaNrXXiksQKXDUbs2wPTz4GHtnCG49EbOcY=";
 
   buildInputs = [
-    gtk3
+    gtk4
     gdk-pixbuf
     glib
-    gtk-layer-shell
+    gtk4-layer-shell
     glib-networking
     shared-mime-info
     adwaita-icon-theme
@@ -56,11 +56,11 @@ rustPlatform.buildRustPackage rec {
     gsettings-desktop-schemas
     libxkbcommon
     systemd
+    dbus
   ]
   ++ lib.optionals (hasFeature "http") [ openssl ]
   ++ lib.optionals (hasFeature "volume") [ libpulseaudio ]
   ++ lib.optionals (hasFeature "cairo") [ luajit ]
-  ++ lib.optionals (hasFeature "tray") [ libdbusmenu-gtk3 ]
   ++ lib.optionals (hasFeature "keyboard") [
     libinput
     libevdev
@@ -68,10 +68,10 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [
     pkg-config
-    wrapGAppsHook3
+    wrapGAppsHook4
     gobject-introspection
   ];
-  propagatedBuildInputs = [ gtk3 ];
+  propagatedBuildInputs = [ gtk4 ];
 
   runtimeDeps = [ luajitPackages.lgi ];
 
@@ -86,7 +86,7 @@ rustPlatform.buildRustPackage rec {
     --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
 
     # gtk-launch
-    --suffix PATH : "${lib.makeBinPath [ gtk3 ]}"
+    --suffix PATH : "${lib.makeBinPath [ gtk4 ]}"
   ''
   + lib.optionalString (hasFeature "cairo") ''
     --prefix LUA_PATH : "./?.lua;${luajitPackages.lgi}/share/lua/5.1/?.lua;${luajitPackages.lgi}/share/lua/5.1/?/init.lua;${luajit}/share/lua/5.1/\?.lua;${luajit}/share/lua/5.1/?/init.lua"

From 1678a7cb21dc1adcc4aaf2f2436ec7ab761a18e6 Mon Sep 17 00:00:00 2001
From: John Ott <john@johnott.us>
Date: Fri, 19 Dec 2025 19:40:15 -0800
Subject: [PATCH 030/202] docker_25: add version-specific system plugin dir
 patch for CLI v25

---
 .../cli-system-plugin-dir-from-env-25.patch   | 22 +++++++++++++++++++
 .../virtualization/docker/default.nix         |  7 +++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/virtualization/docker/cli-system-plugin-dir-from-env-25.patch

diff --git a/pkgs/applications/virtualization/docker/cli-system-plugin-dir-from-env-25.patch b/pkgs/applications/virtualization/docker/cli-system-plugin-dir-from-env-25.patch
new file mode 100644
index 000000000000..616b501d2ff8
--- /dev/null
+++ b/pkgs/applications/virtualization/docker/cli-system-plugin-dir-from-env-25.patch
@@ -0,0 +1,22 @@
+diff --git a/cli-plugins/manager/manager_unix.go b/cli-plugins/manager/manager_unix.go
+index 000c058df0..246c427cba 100644
+--- a/cli-plugins/manager/manager_unix.go
++++ b/cli-plugins/manager/manager_unix.go
+@@ -2,7 +2,13 @@
+ 
+ package manager
+ 
+-var defaultSystemPluginDirs = []string{
+-	"/usr/local/lib/docker/cli-plugins", "/usr/local/libexec/docker/cli-plugins",
+-	"/usr/lib/docker/cli-plugins", "/usr/libexec/docker/cli-plugins",
++import (
++    "os"
++    "path/filepath"
++)
++
++var defaultSystemPluginDirs []string
++
++func init() {
++    defaultSystemPluginDirs = filepath.SplitList(os.Getenv("DOCKER_CLI_PLUGIN_DIRS"))
+ }
+ 
\ No newline at end of file
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index c676e421804c..d23949579ac2 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -277,7 +277,12 @@ let
         };
 
         patches = [
-          ./cli-system-plugin-dir-from-env.patch
+          (
+            if lib.versionOlder version "26.0.0" then
+              ./cli-system-plugin-dir-from-env-25.patch
+            else
+              ./cli-system-plugin-dir-from-env.patch
+          )
         ];
 
         vendorHash = null;

From 760eb704d90759e7dacc8fa4b86372bec0b64bbd Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sat, 20 Dec 2025 05:08:45 +0000
Subject: [PATCH 031/202] signal-desktop: fix cross compilation

`nativeBuildInputs = [ (pnpm_10.override { inherit nodejs; }) ]`
uses a `nodejs` built for the host platform, but a `pnpm` built for the
build platform. that causes exec errors, but it seems we don't actually
need `pnpm` to be using the same nodejs version that signal-desktop
itself is built against, so just drop the override.
---
 pkgs/by-name/si/signal-desktop/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index cedd3d933f1d..887d19cdf4b1 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -24,7 +24,7 @@
 }:
 let
   nodejs = nodejs_22;
-  pnpm = pnpm_10.override { inherit nodejs; };
+  pnpm = pnpm_10;
   electron = electron_39;
 
   libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; };

From 72600f7dda3fb2dca8abcc5ea811c802ca666259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 20 Dec 2025 14:09:31 +0100
Subject: [PATCH 032/202] angie: 1.10.2 -> 1.10.3

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

diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix
index 4fab1346b188..0c93f80766be 100644
--- a/pkgs/servers/http/angie/default.nix
+++ b/pkgs/servers/http/angie/default.nix
@@ -8,12 +8,12 @@
 }@args:
 
 callPackage ../nginx/generic.nix args rec {
-  version = "1.10.2";
   pname = "angie";
+  version = "1.10.3";
 
   src = fetchurl {
     url = "https://download.angie.software/files/angie-${version}.tar.gz";
-    hash = "sha256-pcKrk33ySoDnhq9WOJIvRuqKc9FhQYPIyQKYrocwlLg=";
+    hash = "sha256-/4IOydx6yLDoc8Ut3EizQX9QVPFXtdLfXBuO1637IlY=";
   };
 
   configureFlags = lib.optionals withAcme [

From 06de57de0481b77df3950b78ac7bc1558ea4bc23 Mon Sep 17 00:00:00 2001
From: Denperidge <cat@denperidge.com>
Date: Wed, 17 Dec 2025 13:35:46 +0100
Subject: [PATCH 033/202] way-edges: init at 0.11.1

---
 pkgs/by-name/wa/way-edges/package.nix | 48 +++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 pkgs/by-name/wa/way-edges/package.nix

diff --git a/pkgs/by-name/wa/way-edges/package.nix b/pkgs/by-name/wa/way-edges/package.nix
new file mode 100644
index 000000000000..9b587e5c5cd4
--- /dev/null
+++ b/pkgs/by-name/wa/way-edges/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  pkg-config,
+  libxkbcommon,
+  libpulseaudio,
+  cairo,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "way-edges";
+  version = "0.11.1";
+
+  src = fetchFromGitHub {
+    owner = "way-edges";
+    repo = "way-edges";
+    tag = finalAttrs.version;
+    hash = "sha256-1P4iOsoQolxfVGZEe+x0DvcDwB5bdBqR0OsfL+y3qQM=";
+  };
+  cargoHash = "sha256-RSCBQUZp6mxZcwsvr6OwQeXa5CmEhN8QUezv0By5j/s=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+  buildInputs = [
+    cairo
+    libxkbcommon
+    libpulseaudio
+  ];
+
+  RUSTFLAGS = [
+    "--cfg tokio_unstable"
+    "--cfg tokio_uring"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Wayland client focusing on widgets hidden in your screen edge";
+    homepage = "https://github.com/way-edges/way-edges";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ denperidge ];
+    mainProgram = "way-edges";
+    platforms = lib.platforms.linux;
+  };
+})

From 9f8db64bd65626b3914f933de804c04957172ce2 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Sat, 20 Dec 2025 19:02:43 +0100
Subject: [PATCH 034/202] portfolio: 0.80.4 -> 0.81.0

https://github.com/portfolio-performance/portfolio/releases/tag/0.81.0
---
 pkgs/by-name/po/portfolio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix
index ee474f7d738f..bed3f21f2ce0 100644
--- a/pkgs/by-name/po/portfolio/package.nix
+++ b/pkgs/by-name/po/portfolio/package.nix
@@ -34,11 +34,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "PortfolioPerformance";
-  version = "0.80.4";
+  version = "0.81.0";
 
   src = fetchurl {
     url = "https://github.com/buchen/portfolio/releases/download/${finalAttrs.version}/PortfolioPerformance-${finalAttrs.version}-linux.gtk.x86_64.tar.gz";
-    hash = "sha256-IVaowzXl1WKa5wvQiT+Zub81Kxp57JOfb5cZ8egM2q4=";
+    hash = "sha256-j1FoN35ESHfUxS2zBc/ugoDnp92QRdJX86Bhy/q26A0=";
   };
 
   nativeBuildInputs = [

From 4aa3a92433a40175a0cd3678b75e6cd3a1697604 Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Sat, 20 Dec 2025 13:46:11 -0500
Subject: [PATCH 035/202] frugal: drop

---
 pkgs/by-name/fr/frugal/package.nix | 29 -----------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 pkgs/by-name/fr/frugal/package.nix

diff --git a/pkgs/by-name/fr/frugal/package.nix b/pkgs/by-name/fr/frugal/package.nix
deleted file mode 100644
index 82e0a8140756..000000000000
--- a/pkgs/by-name/fr/frugal/package.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-buildGoModule rec {
-  pname = "frugal";
-  version = "3.17.13";
-
-  src = fetchFromGitHub {
-    owner = "Workiva";
-    repo = "frugal";
-    rev = "v${version}";
-    sha256 = "sha256-giPlv3pf0hz2zlQ/9o12SGfwFLCtpN96tfQwP9AaPNo=";
-  };
-
-  subPackages = [ "." ];
-
-  vendorHash = "sha256-DCSS2kH2yco8cfbQBw3IZHcEE4BP5ir7ikxsIsFDqg0=";
-
-  meta = {
-    description = "Thrift improved";
-    mainProgram = "frugal";
-    homepage = "https://github.com/Workiva/frugal";
-    license = with lib.licenses; [ asl20 ];
-    maintainers = with lib.maintainers; [ diogox ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 72e4fdf67493..cd770fc08fe0 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -614,6 +614,7 @@ mapAliases {
   freeimage = throw "freeimage was removed due to numerous vulnerabilities"; # Added 2025-10-23
   freerdp3 = throw "'freerdp3' has been renamed to/replaced by 'freerdp'"; # Converted to throw 2025-10-27
   freerdpUnstable = throw "'freerdpUnstable' has been renamed to/replaced by 'freerdp'"; # Converted to throw 2025-10-27
+  frugal = throw "'frugal' was removed because upstream has been pulled"; # Added 2025-12-20
   fusee-launcher = throw "'fusee-launcher' was removed as upstream removed the original source repository fearing legal repercussions"; # Added 2025-07-05
   futuresql = throw "'futuresql' has been renamed to/replaced by 'libsForQt5.futuresql'"; # Converted to throw 2025-10-27
   fx_cast_bridge = throw "'fx_cast_bridge' has been renamed to/replaced by 'fx-cast-bridge'"; # Converted to throw 2025-10-27

From 4151ec491b4c8e0f5c96f42224539d48e79bc234 Mon Sep 17 00:00:00 2001
From: Gon Solo <gonsolo@gmail.com>
Date: Sun, 21 Dec 2025 23:57:51 +0100
Subject: [PATCH 036/202] silice: 0-unstable-2025-07-03 ->
 0-unstable-2025-10-02

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

diff --git a/pkgs/by-name/si/silice/package.nix b/pkgs/by-name/si/silice/package.nix
index eda8ada65570..0e50623c659d 100644
--- a/pkgs/by-name/si/silice/package.nix
+++ b/pkgs/by-name/si/silice/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "silice";
-  version = "0-unstable-2025-07-03";
+  version = "0-unstable-2025-10-02";
 
   src = fetchFromGitHub {
     owner = "sylefeb";
     repo = "silice";
-    rev = "656632ec300f8be3636cfd9bca5be954fc9c9120";
-    hash = "sha256-0awHQrGm4ggWE9+69ova1cXAaesaMNihbzpgAytRTks=";
+    rev = "73bebc454ef36cf447a99b5c50409af171675279";
+    hash = "sha256-GsIOs41wUjq1IYZcrASMEHAvS2/vJeJRK7I/cqSgzYY=";
     fetchSubmodules = true;
   };
 

From 8563ac71ea5117b97c37f22179847dc8c556c90c Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Mon, 22 Dec 2025 17:43:07 +0800
Subject: [PATCH 037/202] bark-server: 2.2.8 -> 2.3.2

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

diff --git a/pkgs/by-name/ba/bark-server/package.nix b/pkgs/by-name/ba/bark-server/package.nix
index 6e3e1d9aac98..80266a47b580 100644
--- a/pkgs/by-name/ba/bark-server/package.nix
+++ b/pkgs/by-name/ba/bark-server/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "bark-server";
-  version = "2.2.8";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "Finb";
     repo = "bark-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-O4Bo3OuC8uwgFpwAY/zwSUQW6EY7h90Dn3tUjZA3j4E=";
+    hash = "sha256-MXvmS61r/DZ1KL4xh2kv+NpnPhSpRefJn7LuWLoLD0w=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-/h3L4Ow2aBPkbH1hPXCEb9DKrzVEcaLh2+O9iZXkXN8=";
+  vendorHash = "sha256-7C+xYleje6/WcRl/GylE+xvS7QFvJXaCLkCeRW8wwIY=";
 
   ldflags = [
     "-s"

From f37523a63e04d5fdef2743c5605be6212beb5887 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Dec 2025 10:38:59 +0000
Subject: [PATCH 038/202] s7: 11.7-unstable-2025-12-12 ->
 11.7-unstable-2025-12-19

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

diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index 95494ac5e6fb..2e420a04a186 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -26,14 +26,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.7-unstable-2025-12-12";
+  version = "11.7-unstable-2025-12-19";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "0aae934b91975b85eba6de9fb041ec85e55efc8f";
-    hash = "sha256-gjmeP9qKEMrz7dWH5SoLldwZ7wrFswd8gLIN+ae7y5E=";
+    rev = "7fb6a59b5150e6146c6d3df3bb9e9cba7ae449bc";
+    hash = "sha256-nZMvdlaVyI2zH0r8yrZn1ESN+7/Wk2D+OWujzPahnZU=";
   };
 
   buildInputs =

From 1758b749b872123bbb0433f62c723507501370c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Dec 2025 11:13:51 +0000
Subject: [PATCH 039/202] python3Packages.validobj: 1.3 -> 1.5

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

diff --git a/pkgs/development/python-modules/validobj/default.nix b/pkgs/development/python-modules/validobj/default.nix
index 6f0d9b8555b0..e7f5193ca389 100644
--- a/pkgs/development/python-modules/validobj/default.nix
+++ b/pkgs/development/python-modules/validobj/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "validobj";
-  version = "1.3";
+  version = "1.5";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-tab3n3YGTcGk47Ijm/QOocT0zo10LJp4eEF094TJyzg=";
+    hash = "sha256-n2CEcZTPr57tbRhw5uFmcWZ1kHdBt2VzG/fS4+LDSyc=";
   };
 
   nativeBuildInputs = [ flit ];

From 6ceb479053bf024405d8afc84f48253b24fb0b1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Dec 2025 11:15:35 +0000
Subject: [PATCH 040/202] python3Packages.python-owasp-zap-v2-4: 0.4.0 -> 0.5.0

---
 .../python-modules/python-owasp-zap-v2-4/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix b/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix
index e5b7046029c7..2ebcb6aa0d38 100644
--- a/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix
+++ b/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "python-owasp-zap-v2-4";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zaproxy";
     repo = "zap-api-python";
     tag = version;
-    hash = "sha256-UG8+0jJwnywvuc68/9r10kKMqxNIOg5mIdPt2Fx2BZA=";
+    hash = "sha256-8aZbnUoS9lrqM0XQg4PD/j1JFKzGh9dyzWF89Szdzao=";
   };
 
   build-system = [ poetry-core ];

From 00c7639eaffa6a4a56e07e470ea1ac700d9a4eab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Dec 2025 15:39:54 +0000
Subject: [PATCH 041/202] cdncheck: 1.2.14 -> 1.2.15

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

diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index 513d3ece2651..78a466362442 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "cdncheck";
-  version = "1.2.14";
+  version = "1.2.15";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${version}";
-    hash = "sha256-6U0NaNohokLcNcC+WLKHJfQ/duUsIr2iCTpzH0CzHCQ=";
+    hash = "sha256-o6QPCv8c8ssMyKqcZN3HfbnEGy7Wps104pKL+3d+RNk=";
   };
 
-  vendorHash = "sha256-bOYBSbaXRmBn8eHu25xDgkmQoPw6IwbvLyQitOJP4so=";
+  vendorHash = "sha256-sS91wOiFUH6dh3O6icTRnwHRIq5Q1B+j9j33IUehAc0=";
 
   subPackages = [ "cmd/cdncheck/" ];
 

From 6da0544bc55626e865837f72fcfa763940a45d6c Mon Sep 17 00:00:00 2001
From: Pamplemousse <git@xaviermaso.com>
Date: Mon, 22 Dec 2025 18:11:33 +0100
Subject: [PATCH 042/202] vimPlugins.ocaml-nvim: init at 2025-12-02

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 682c90a0004e..dd45ba93d53d 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -11946,6 +11946,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  ocaml-nvim = buildVimPlugin {
+    pname = "ocaml.nvim";
+    version = "2025-12-02";
+    src = fetchFromGitHub {
+      owner = "tarides";
+      repo = "ocaml.nvim";
+      rev = "f13728bbedb02121ee54633465ac392bbf0a8e79";
+      sha256 = "140hh72x96ihzg766rv1nn8x4la27xycxxaqym3vv0wi5jd5v1sx";
+    };
+    meta.homepage = "https://github.com/tarides/ocaml.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   oceanic-material = buildVimPlugin {
     pname = "oceanic-material";
     version = "2023-06-22";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index eed9a04b48f8..98cefdd648f5 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -917,6 +917,7 @@ https://github.com/nvzone/minty/,HEAD,nvzone-minty
 https://github.com/nvzone/typr/,HEAD,nvzone-typr
 https://github.com/nvzone/volt/,HEAD,nvzone-volt
 https://github.com/obsidian-nvim/obsidian.nvim/,HEAD,
+https://github.com/tarides/ocaml.nvim/,HEAD,
 https://github.com/nvimdev/oceanic-material/,,
 https://github.com/mhartington/oceanic-next/,,
 https://github.com/pwntester/octo.nvim/,,

From 16e987dd58b4ed9bf971e6f6cb66932ee068b0f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Dec 2025 17:59:32 +0000
Subject: [PATCH 043/202] siyuan: 3.4.2 -> 3.5.0

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

diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index d13778f968c4..8145a5d2b3c3 100644
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -36,20 +36,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "siyuan";
-  version = "3.4.2";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "siyuan-note";
     repo = "siyuan";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-INwbp6gGqrmOtrM5d/8iEv1nlTUDSuo9AVN0EwNhW9Y=";
+    hash = "sha256-h7oYlxz9Loh4HiZDeQdWV9ycWfCaNNifgFLo1d5zOJk=";
   };
 
   kernel = buildGoModule {
     name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/kernel";
-    vendorHash = "sha256-kt5fnkF/bxpeY9d86zKr9VlShvLy1gtaICfA0PGVGKI=";
+    vendorHash = "sha256-Q6Bpcgav9ClM+d723jYmuunybEP5iHt9nF5ssQ1kokQ=";
 
     patches = [
       (replaceVars ./set-pandoc-path.patch {

From cb7469eacb72d2385138afa6825f6e7f7dde0d16 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 10:56:04 -0800
Subject: [PATCH 044/202] mate.atril: prep for top-level

---
 pkgs/desktops/mate/atril/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index cd14d171eb7b..408eafaa96e1 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -31,14 +31,14 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "atril";
   version = "1.28.2";
 
   src = fetchFromGitHub {
     owner = "mate-desktop";
     repo = "atril";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-NnWD3Gcxn8ZZKdHzg6iclLiSwj3sBvF+BwpNtcU+dSY=";
   };
@@ -96,4 +96,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From ea465d88762ffa490ea44bb1ca49a2f6ca1d5488 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 10:59:47 -0800
Subject: [PATCH 045/202] mate.caja-dropbox: prep for top-level

---
 pkgs/desktops/mate/caja-dropbox/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix
index ea974ff28437..e6e999fad8ff 100644
--- a/pkgs/desktops/mate/caja-dropbox/default.nix
+++ b/pkgs/desktops/mate/caja-dropbox/default.nix
@@ -10,18 +10,18 @@
   gtk3,
   python3,
   dropbox,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
 let
   dropboxd = "${dropbox}/bin/dropbox";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "caja-dropbox";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/caja-dropbox-${finalAttrs.version}.tar.xz";
     sha256 = "t0w4qZQlS9PPfLxxK8LsdRagypQqpleFJs29aqYgGWM=";
   };
 
@@ -57,7 +57,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/caja-dropbox";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Dropbox extension for Caja file manager";
@@ -69,4 +73,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 7bf544381ef9dc634d938a6ef2c6adca2fe5452f Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:17:53 -0800
Subject: [PATCH 046/202] mate.caja-extensions: prep for top-level

---
 pkgs/desktops/mate/caja-extensions/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
index 6b7e6c7a072c..1f1b13e5f8d8 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -12,15 +12,15 @@
   imagemagick,
   mate-desktop,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "caja-extensions";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/caja-extensions-${finalAttrs.version}.tar.xz";
     sha256 = "0phsXgdAg1/icc+9WCPu6vAyka8XYyA/RwCruBCeMXU=";
   };
 
@@ -52,7 +52,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/caja-extensions";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Set of extensions for Caja file manager";
@@ -62,4 +66,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From fbb74c6dac07a242d8de84af324c94c8673109a0 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 10:57:25 -0800
Subject: [PATCH 047/202] mate.caja: prep for top-level

---
 pkgs/desktops/mate/caja/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index a1f096a6bfd1..463677b7a9ed 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -15,10 +15,10 @@
   hicolor-icon-theme,
   wayland,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "caja";
   version = "1.28.0";
   outputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/caja-${finalAttrs.version}.tar.xz";
     sha256 = "HjAUzhRVgX7C73TQnv37aDXYo3LtmhbvtZGe97ghlXo=";
   };
 
@@ -62,7 +62,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/caja";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "File manager for the MATE desktop";
@@ -74,4 +78,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 6f40b88ae20bac90b74d058a8978e70d66af92f8 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:22:47 -0800
Subject: [PATCH 048/202] mate.engrampa: prep for top-level

---
 pkgs/desktops/mate/engrampa/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
index bf650d4ff2d7..ecb5a343fcd9 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -12,18 +12,18 @@
   json-glib,
   mate-desktop,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
   # can be defaulted to true once switch to meson
   withMagic ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
   file,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "engrampa";
   version = "1.28.2";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/engrampa-${finalAttrs.version}.tar.xz";
     hash = "sha256-Hpl3wjdFv4hDo38xUXHZr5eBSglxrqw9d08BdlCsCe8=";
   };
 
@@ -55,7 +55,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/engrampa";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Archive Manager for MATE";
@@ -69,4 +73,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 324bbc2e6c581acf8fba0a6585fce4b86be4254a Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:50 -0800
Subject: [PATCH 049/202] mate.eom: prep for top-level

---
 pkgs/desktops/mate/eom/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index 195212917381..46b8fc44a01b 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -18,15 +18,15 @@
   mate-desktop,
   hicolor-icon-theme,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "eom";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/eom-${finalAttrs.version}.tar.xz";
     sha256 = "mgHKsplaGoxyWMhl6uXxgu1HMMRGcq/cOgfkI+3VOrw=";
   };
 
@@ -61,7 +61,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/eom";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Image viewing and cataloging program for the MATE desktop";
@@ -71,4 +75,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 2fef786435c7f3da6da7b14b2b261a75bbc67514 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:50 -0800
Subject: [PATCH 050/202] mate.libmatekbd: prep for top-level

---
 pkgs/desktops/mate/libmatekbd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix
index f8e62d9dc006..7af06f9df0f4 100644
--- a/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@@ -12,14 +12,14 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libmatekbd";
   version = "1.28.0";
 
   src = fetchFromGitHub {
     owner = "mate-desktop";
     repo = "libmatekbd";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-6s8JiuXbBWOHxbNSuO8rglzOCRKlQ9fx/GsYYc08GmI=";
   };
 
@@ -57,4 +57,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 51594e2741de58b7a93dfd115b49147fff625623 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:50 -0800
Subject: [PATCH 051/202] mate.libmatemixer: prep for top-level

---
 pkgs/desktops/mate/libmatemixer/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix
index 129459d8e68d..b0484fb9ed54 100644
--- a/pkgs/desktops/mate/libmatemixer/default.nix
+++ b/pkgs/desktops/mate/libmatemixer/default.nix
@@ -12,15 +12,15 @@
   pulseaudioSupport ? config.pulseaudio or true,
   libpulseaudio,
   ossSupport ? false,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libmatemixer";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/libmatemixer-${finalAttrs.version}.tar.xz";
     sha256 = "XXO5Ijl/YGiOPJUw61MrzkbDDiYtsbU1L6MsQNhwoMc=";
   };
 
@@ -44,7 +44,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/libmatemixer";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Mixer library for MATE";
@@ -53,4 +57,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 89f525bdcb55fb532f951dd9c552258cad62c16c Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:50 -0800
Subject: [PATCH 052/202] mate.libmateweather: prep for top-level

---
 pkgs/desktops/mate/libmateweather/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index 6e19e5ba8792..44fa0e462b08 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -14,16 +14,16 @@
   libsoup_3,
   tzdata,
   mate-common,
-  mateUpdateScript,
+  gitUpdater,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libmateweather";
   version = "1.28.1";
 
   src = fetchFromGitHub {
     owner = "mate-desktop";
     repo = "libmateweather";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-W0p4+OMr2sgkQP10DGjZLf2VTSGa2A+5ey+nYBr+HJQ=";
   };
 
@@ -66,7 +66,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/libmateweather";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Library to access weather information from online services for MATE";
@@ -75,4 +79,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 267d4a0920104bae6f0bcbd4135634539bba3412 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:50 -0800
Subject: [PATCH 053/202] mate.marco: prep for top-level

---
 pkgs/desktops/mate/marco/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index ae92127de50c..fdfe06118510 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -18,15 +18,15 @@
   mate-desktop,
   mate-settings-daemon,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "marco";
   version = "1.28.1";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/marco-${finalAttrs.version}.tar.xz";
     sha256 = "JJbl5A7pgM1oSUk6w+D4/Q3si4HGdNqNm6GaV38KwuE=";
   };
 
@@ -61,7 +61,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/marco";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "MATE default window manager";
@@ -70,4 +74,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From b79604e10ed77cc64172b236bab6a7268b5cd528 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:50 -0800
Subject: [PATCH 054/202] mate.mate-applets: prep for top-level

---
 pkgs/desktops/mate/mate-applets/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
index b078e5e315a3..e612960e63ed 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -22,10 +22,10 @@
   wirelesstools,
   hicolor-icon-theme,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-applets";
   version = "1.28.1";
   outputs = [
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-applets-${finalAttrs.version}.tar.xz";
     sha256 = "pZZxQVJ9xbFy0yKmADwjruwlMWD2ULs2QwoG3a76fi4=";
   };
 
@@ -72,7 +72,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-applets";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Applets for use with the MATE panel";
@@ -85,4 +89,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 7b8c3cdaaa3294b0b0f0983d2bb6ed2dfa63e2c5 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 13:01:59 -0800
Subject: [PATCH 055/202] mate.mate-backgrounds: prep for top-level

---
 pkgs/desktops/mate/mate-backgrounds/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix
index 45525c5dab02..60490d8063a8 100644
--- a/pkgs/desktops/mate/mate-backgrounds/default.nix
+++ b/pkgs/desktops/mate/mate-backgrounds/default.nix
@@ -5,15 +5,15 @@
   meson,
   ninja,
   gettext,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mate-backgrounds";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-backgrounds-${finalAttrs.version}.tar.xz";
     sha256 = "UNGv0CSGvQesIqWmtu+jAxFI8NSKguSI2QmtVwA6aUM=";
   };
 
@@ -23,7 +23,11 @@ stdenvNoCC.mkDerivation rec {
     ninja
   ];
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-backgrounds";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Background images and data for MATE";
@@ -35,4 +39,4 @@ stdenvNoCC.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From c0b900865498990ef92fdb2a5fb488de85818213 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:51 -0800
Subject: [PATCH 056/202] mate.mate-calc: prep for top-level

---
 pkgs/desktops/mate/mate-calc/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix
index c238bd2f4bdc..3488fd4ba96f 100644
--- a/pkgs/desktops/mate/mate-calc/default.nix
+++ b/pkgs/desktops/mate/mate-calc/default.nix
@@ -10,15 +10,15 @@
   libxml2,
   mpfr,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-calc";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-calc-${finalAttrs.version}.tar.xz";
     sha256 = "gEsSXR4oZLHnSvgW2psquLGUcrmvl0Q37nNVraXmKPU=";
   };
 
@@ -41,7 +41,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-calc";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Calculator for the MATE desktop";
@@ -50,4 +54,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 26ae4b97d68549ef21bc1bbb80d453cf700366a1 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 13:07:51 -0800
Subject: [PATCH 057/202] mate.mate-common: prep for top-level

---
 pkgs/desktops/mate/mate-common/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
index c9c4af42cf18..9d0a13a84cc9 100644
--- a/pkgs/desktops/mate/mate-common/default.nix
+++ b/pkgs/desktops/mate/mate-common/default.nix
@@ -2,21 +2,25 @@
   lib,
   stdenvNoCC,
   fetchurl,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mate-common";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-common-${finalAttrs.version}.tar.xz";
     sha256 = "QrfCzuJo9x1+HBrU9pvNoOzWVXipZyIYfGt2N40mugo=";
   };
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-common";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Common files for development of MATE packages";
@@ -25,4 +29,4 @@ stdenvNoCC.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 9f949f4f2f9c1092a5b7fe9d1a72e854aa8d4e31 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:51 -0800
Subject: [PATCH 058/202] mate.mate-control-center: prep for top-level

---
 pkgs/desktops/mate/mate-control-center/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index 294733a1e701..63374a83fe80 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -33,17 +33,17 @@
   hicolor-icon-theme,
   wrapGAppsHook3,
   yelp-tools,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-control-center";
   version = "1.28.1";
 
   src = fetchFromGitHub {
     owner = "mate-desktop";
     repo = "mate-control-center";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-rsEu3Ig6GxqPOvAFOXhkEoXM+etyjWpQWHGOsA+myJs=";
   };
 
@@ -100,7 +100,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-control-center";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Utilities to configure the MATE desktop";
@@ -109,4 +113,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 99f786f5a3411ad90ee37e8b690ef2c092a2989b Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:51 -0800
Subject: [PATCH 059/202] mate.mate-desktop: prep for top-level

---
 pkgs/desktops/mate/mate-desktop/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index e982d0b4a62b..085ed1d72db0 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -9,10 +9,10 @@
   gtk3,
   dconf,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-desktop";
   version = "1.28.2";
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-desktop-${finalAttrs.version}.tar.xz";
     sha256 = "MrtLeSAUs5HB4biunBioK01EdlCYS0y6fSjpVWSWSqI=";
   };
 
@@ -45,7 +45,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-desktop";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Library with common API for various MATE modules";
@@ -54,4 +58,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     teams = [ lib.teams.mate ];
   };
-}
+})

From e0219b0d4974f5ffa087a0e559c3fda766329b50 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 13:14:18 -0800
Subject: [PATCH 060/202] mate.mate-icon-theme-faenza: prep for top-level

---
 pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
index 157ed1ce2bff..8e87c6fc1c88 100644
--- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
@@ -9,12 +9,12 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-icon-theme-faenza";
   version = "1.20.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-icon-theme-faenza-${finalAttrs.version}.tar.xz";
     sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna";
   };
 
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   passthru.updateScript = gitUpdater {
+    url = "https://github.com/mate-desktop-legacy-archive/mate-icon-theme-faenza";
     rev-prefix = "v";
-    url = "https://github.com/mate-desktop-legacy-archive/${pname}";
   };
 
   meta = {
@@ -50,4 +50,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 583493ff4bc614ce9eb5408f79ddd60d3387e8f2 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:51 -0800
Subject: [PATCH 061/202] mate.mate-icon-theme: prep for top-level

---
 pkgs/desktops/mate/mate-icon-theme/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index c65437a95479..b5ff3c9cadff 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -8,15 +8,15 @@
   librsvg,
   gtk3,
   hicolor-icon-theme,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-icon-theme";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-icon-theme-${finalAttrs.version}.tar.xz";
     sha256 = "lNYHkGDKXfdFQpId5O6ji30C0HVhyRk1bZXeh2+abTo=";
   };
 
@@ -44,7 +44,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-icon-theme";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Icon themes from MATE";
@@ -53,4 +57,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     teams = [ lib.teams.mate ];
   };
-}
+})

From bbedfc215c2ac6b87817894655108bf65fe12bad Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:52 -0800
Subject: [PATCH 062/202] mate.mate-indicator-applet: prep for top-level

---
 .../mate/mate-indicator-applet/default.nix         | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix
index a8c162662c1d..e3137e73cac6 100644
--- a/pkgs/desktops/mate/mate-indicator-applet/default.nix
+++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix
@@ -9,15 +9,15 @@
   mate-panel,
   hicolor-icon-theme,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-indicator-applet";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-indicator-applet-${finalAttrs.version}.tar.xz";
     sha256 = "zrPXA5cKPlWNfNffCxwhceOvdSolSVrO0uIiwemtSc0=";
   };
 
@@ -44,7 +44,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-indicator-applet";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     homepage = "https://github.com/mate-desktop/mate-indicator-applet";
@@ -67,4 +71,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From fe214aa810f5e9d360ce848ff643b6e6dc50b7c6 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:52 -0800
Subject: [PATCH 063/202] mate.mate-media: prep for top-level

---
 pkgs/desktops/mate/mate-media/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix
index 543dd244d294..b3c785487a11 100644
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/pkgs/desktops/mate/mate-media/default.nix
@@ -14,10 +14,10 @@
   mate-panel,
   wayland,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-media";
   version = "1.28.1";
   outputs = [
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-media-${finalAttrs.version}.tar.xz";
     sha256 = "vNwQLiL2P1XmMWbVxwjpHBE1cOajCodDRaiGCeg6mRI=";
   };
 
@@ -52,7 +52,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-media";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Media tools for MATE";
@@ -62,4 +66,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ chpatrick ];
     teams = [ lib.teams.mate ];
   };
-}
+})

From 2471d71f5f689e3f6a66f75c66d890572cca339c Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:52 -0800
Subject: [PATCH 064/202] mate.mate-menus: prep for top-level

---
 pkgs/desktops/mate/mate-menus/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix
index 4ae59c13f4d0..2faa0b376541 100644
--- a/pkgs/desktops/mate/mate-menus/default.nix
+++ b/pkgs/desktops/mate/mate-menus/default.nix
@@ -10,17 +10,17 @@
   gobject-introspection,
   mate-common,
   python3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-menus";
   version = "1.28.1";
 
   src = fetchFromGitHub {
     owner = "mate-desktop";
     repo = "mate-menus";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-GAc9DPsXdswmyNKlbY6cyHBWO2OSKCBygtzttNHN/p4=";
   };
   nativeBuildInputs = [
@@ -44,7 +44,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-menus";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     broken = stdenv.hostPlatform.isDarwin;
@@ -57,4 +61,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From f3788140aa0943b919e5f601ea47b96bfb516d88 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:52 -0800
Subject: [PATCH 065/202] mate.mate-netbook: prep for top-level

---
 pkgs/desktops/mate/mate-netbook/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix
index 7a3ae7a232f5..61e8b2a2b9a5 100644
--- a/pkgs/desktops/mate/mate-netbook/default.nix
+++ b/pkgs/desktops/mate/mate-netbook/default.nix
@@ -10,10 +10,10 @@
   libXtst,
   mate,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-netbook";
   version = "1.26.0";
   outputs = [
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-netbook-${finalAttrs.version}.tar.xz";
     sha256 = "12gdy69nfysl8vmd8lv8b0lknkaagplrrz88nh6n0rmjkxnipgz3";
   };
 
@@ -42,7 +42,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-netbook";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "MATE utilities for netbooks";
@@ -62,4 +66,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From b7021ec05a9e98361ce1f1cd0ce748cf96efe07c Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:52 -0800
Subject: [PATCH 066/202] mate.mate-notification-daemon: prep for top-level

---
 .../mate/mate-notification-daemon/default.nix      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index 90a7da31b9dc..e2fa4aef56d0 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -17,10 +17,10 @@
   mate-desktop,
   mate-panel,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-notification-daemon";
   version = "1.28.5";
   outputs = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mate-desktop";
     repo = "mate-notification-daemon";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-6N6lD63JL9xAtALn9URjYiCEhMZBC9TfIsrdalyY3YY=";
   };
 
@@ -61,7 +61,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-notification-daemon";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Notification daemon for MATE Desktop";
@@ -74,4 +78,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 1ecd3f872b887e7121a0c28d5b00218c46299d60 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:52 -0800
Subject: [PATCH 067/202] mate.mate-panel: prep for top-level

---
 pkgs/desktops/mate/mate-panel/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index 4ecf4510330b..b7254ad1181b 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -29,7 +29,7 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-panel";
   version = "1.28.7";
   outputs = [
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "mate-desktop";
     repo = "mate-panel";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-8GS6JY5kS2YKscItAo8dzudgkZeG51JsSBUj0EfLiZQ=";
   };
@@ -114,4 +114,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From eb2e11be261059ec333d1399b657828c8e690ade Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:52 -0800
Subject: [PATCH 068/202] mate.mate-polkit: prep for top-level

---
 pkgs/desktops/mate/mate-polkit/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix
index 0f31fb9495f7..49b7269fae3e 100644
--- a/pkgs/desktops/mate/mate-polkit/default.nix
+++ b/pkgs/desktops/mate/mate-polkit/default.nix
@@ -8,15 +8,15 @@
   gobject-introspection,
   libayatana-appindicator,
   polkit,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-polkit";
   version = "1.28.1";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-polkit-${finalAttrs.version}.tar.xz";
     sha256 = "NQod0KjtaiycGDz/KiHzlCmelo/MauLoyTxWXa5gSug=";
   };
 
@@ -34,7 +34,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-polkit";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Integrates polkit authentication for MATE desktop";
@@ -43,4 +47,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 56811300b9591d63dcd95f0eba30f942d6480723 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:53 -0800
Subject: [PATCH 069/202] mate.mate-power-manager: prep for top-level

---
 pkgs/desktops/mate/mate-power-manager/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index 4144c176e148..9f67b36f661b 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -18,10 +18,10 @@
   libtool,
   polkit,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-power-manager";
   version = "1.28.1";
   outputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-power-manager-${finalAttrs.version}.tar.xz";
     sha256 = "jr3LdLYH6Ggza6moFGze+Pl7zlNcKwyzv2UMWPce7iE=";
   };
 
@@ -60,7 +60,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-power-manager";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "MATE Power Manager";
@@ -73,4 +77,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ chpatrick ];
     teams = [ lib.teams.mate ];
   };
-}
+})

From ec5ab9e3428d96987eb52c88647e9ddb2384bae9 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:53 -0800
Subject: [PATCH 070/202] mate.mate-screensaver: prep for top-level

---
 pkgs/desktops/mate/mate-screensaver/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix
index ba9d92d9f4ae..450bdef5132c 100644
--- a/pkgs/desktops/mate/mate-screensaver/default.nix
+++ b/pkgs/desktops/mate/mate-screensaver/default.nix
@@ -15,15 +15,15 @@
   pam,
   systemd,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-screensaver";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-screensaver-${finalAttrs.version}.tar.xz";
     sha256 = "ag8kqPhKL5XhARSrU+Y/1KymiKVf3FA+1lDgpBDj6nA=";
   };
 
@@ -52,7 +52,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-screensaver";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Screen saver and locker for the MATE desktop";
@@ -64,4 +68,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 8b7b623e10c2d65dff4d7342055ee3b59a8730c1 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:53 -0800
Subject: [PATCH 071/202] mate.mate-sensors-applet: prep for top-level

---
 pkgs/desktops/mate/mate-sensors-applet/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix
index e78e3accbad0..536b3c3251fa 100644
--- a/pkgs/desktops/mate/mate-sensors-applet/default.nix
+++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix
@@ -14,15 +14,15 @@
   lm_sensors,
   mate-panel,
   hicolor-icon-theme,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-sensors-applet";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-sensors-applet-${finalAttrs.version}.tar.xz";
     sha256 = "1GU2ZoKvj+uGGCg8l4notw22/RfKj6lQrG9xAQIxWoE=";
   };
 
@@ -56,7 +56,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-sensors-applet";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     homepage = "https://github.com/mate-desktop/mate-sensors-applet";
@@ -65,4 +69,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 529f9b7ede706740214291cb0f58853106d6484f Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:53 -0800
Subject: [PATCH 072/202] mate.mate-session-manager: prep for top-level

---
 .../desktops/mate/mate-session-manager/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 841f87bf2e9c..cba2e8c7d722 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -18,15 +18,15 @@
   mate-screensaver,
   wrapGAppsHook3,
   fetchpatch,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-session-manager";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-session-manager-${finalAttrs.version}.tar.xz";
     sha256 = "0yzkWVuh2mUpB3cgPyvIK9lzshSjoECAoe9caJkKLXs=";
   };
 
@@ -69,7 +69,11 @@ stdenv.mkDerivation rec {
 
   passthru.providedSessions = [ "mate" ];
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-session-manager";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "MATE Desktop session manager";
@@ -81,4 +85,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 21fa34a150d99f4552b35fece2b22722cc2dcff2 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:53 -0800
Subject: [PATCH 073/202] mate.mate-settings-daemon: prep for top-level

---
 .../desktops/mate/mate-settings-daemon/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index f236d536ee81..d7083fc8ab21 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -18,11 +18,11 @@
   pulseaudioSupport ? stdenv.config.pulseaudio or true,
   libpulseaudio,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
   udevCheckHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-settings-daemon";
   version = "1.28.0";
   outputs = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-settings-daemon-${finalAttrs.version}.tar.xz";
     sha256 = "TtfNraqkyZ7//AKCuEEXA7t24HLEHEtXmJ+MW0BhGjo=";
   };
 
@@ -64,7 +64,11 @@ stdenv.mkDerivation rec {
 
   doInstallCheck = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-settings-daemon";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "MATE settings daemon";
@@ -78,4 +82,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 06aec009a143c8c80122d0d69f97b7bd8c5f72a1 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:53 -0800
Subject: [PATCH 074/202] mate.mate-system-monitor: prep for top-level

---
 pkgs/desktops/mate/mate-system-monitor/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix
index 87b12ebab56b..bc8715962c5e 100644
--- a/pkgs/desktops/mate/mate-system-monitor/default.nix
+++ b/pkgs/desktops/mate/mate-system-monitor/default.nix
@@ -13,15 +13,15 @@
   systemd,
   wrapGAppsHook3,
   mate-desktop,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-system-monitor";
   version = "1.28.1";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-system-monitor-${finalAttrs.version}.tar.xz";
     sha256 = "QtZj1rkPtTYevBP2VHmD1vHirHXcKuTxysbqYymWWiU=";
   };
 
@@ -52,7 +52,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-system-monitor";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "System monitor for the MATE desktop";
@@ -62,4 +66,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 2409ae94ddd81d493c2c56a1aa7512894bc2ac74 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:53 -0800
Subject: [PATCH 075/202] mate.mate-terminal: prep for top-level

---
 pkgs/desktops/mate/mate-terminal/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
index 6fbd2d2b50e0..050cefb0b611 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -11,16 +11,16 @@
   vte,
   pcre2,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
   nixosTests,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-terminal";
   version = "1.28.1";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-terminal-${finalAttrs.version}.tar.xz";
     sha256 = "8TXrGp4q4ieY7LLcGRT9tM/XdOa7ZcAVK+N8xslGnpI=";
   };
 
@@ -43,7 +43,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-terminal";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   passthru.tests.test = nixosTests.terminal-emulators.mate-terminal;
 
@@ -54,4 +58,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From fb30efc46d34c9498f7ead584c1daf63a7d5b881 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:53 -0800
Subject: [PATCH 076/202] mate.mate-themes: prep for top-level

---
 pkgs/desktops/mate/mate-themes/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index dc97762db452..f5b5faa2010a 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -11,15 +11,15 @@
   gtk-engine-murrine,
   gdk-pixbuf,
   librsvg,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-themes";
   version = "3.22.26";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor finalAttrs.version}/mate-themes-${finalAttrs.version}.tar.xz";
     sha256 = "Ik6J02TrO3Pxz3VtBUlKmEIak8v1Q0miyF/GB+t1Xtc=";
   };
 
@@ -49,7 +49,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-themes";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Set of themes from MATE";
@@ -62,4 +66,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 69bd3b3f3fe7c069ea723316fea35c72545fc0bf Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:54 -0800
Subject: [PATCH 077/202] mate.mate-user-guide: prep for top-level

---
 pkgs/desktops/mate/mate-user-guide/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix
index 669f10705e66..35d3b97283d0 100644
--- a/pkgs/desktops/mate/mate-user-guide/default.nix
+++ b/pkgs/desktops/mate/mate-user-guide/default.nix
@@ -6,15 +6,15 @@
   itstool,
   libxml2,
   yelp,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-user-guide";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-user-guide-${finalAttrs.version}.tar.xz";
     sha256 = "U+8IFPUGVEYU7WGre+UiHMjTqfFPfvlpjJD+fkYBS54=";
   };
 
@@ -35,7 +35,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-user-guide";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "MATE User Guide";
@@ -47,4 +51,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 6c50432f50717b0923bdbc0198ee3577355d1b6d Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:54 -0800
Subject: [PATCH 078/202] mate.mate-user-share: prep for top-level

---
 pkgs/desktops/mate/mate-user-share/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix
index 91bddbab2868..3df42a10b273 100644
--- a/pkgs/desktops/mate/mate-user-share/default.nix
+++ b/pkgs/desktops/mate/mate-user-share/default.nix
@@ -15,18 +15,18 @@
   hicolor-icon-theme,
   mate,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
 let
   inherit (apacheHttpdPackages) apacheHttpd mod_dnssd;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-user-share";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-user-share-${finalAttrs.version}.tar.xz";
     sha256 = "iYVgmZkXllE0jkl+8I81C4YIG5expKcwQHfurlc5rjg=";
   };
 
@@ -65,7 +65,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-user-share";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "User level public file sharing for the MATE desktop";
@@ -75,4 +79,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 1723bcf0a0e3d76e6b8788000467ca802ef90835 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:54 -0800
Subject: [PATCH 079/202] mate.mate-utils: prep for top-level

---
 pkgs/desktops/mate/mate-utils/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix
index 6d9b724539f6..1dd76a649967 100644
--- a/pkgs/desktops/mate/mate-utils/default.nix
+++ b/pkgs/desktops/mate/mate-utils/default.nix
@@ -18,10 +18,10 @@
   hicolor-icon-theme,
   wayland,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mate-utils";
   version = "1.28.0";
   outputs = [
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-utils-${finalAttrs.version}.tar.xz";
     sha256 = "WESdeg0dkA/wO3jKn36Ywh6X9H/Ca+5/8cYYNPIviNM=";
   };
 
@@ -69,7 +69,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mate-utils";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Utilities for the MATE desktop";
@@ -81,4 +85,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 7868086229748691a1ae939b3c2732777657ffb0 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 15:10:16 -0800
Subject: [PATCH 080/202] mate.mate-wayland-session: prep for top-level

---
 pkgs/desktops/mate/mate-wayland-session/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-wayland-session/default.nix b/pkgs/desktops/mate/mate-wayland-session/default.nix
index 89ad31c18d2e..d9f9ca89ef30 100644
--- a/pkgs/desktops/mate/mate-wayland-session/default.nix
+++ b/pkgs/desktops/mate/mate-wayland-session/default.nix
@@ -12,14 +12,14 @@
   gitUpdater,
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mate-wayland-session";
   version = "1.28.4";
 
   src = fetchFromGitHub {
     owner = "mate-desktop";
     repo = "mate-wayland-session";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-jcYkiJOo1k0bMP/LkBW+QIrSyoj6qi8zZMTxqmuNQd0=";
   };
 
@@ -53,4 +53,4 @@ stdenvNoCC.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 2f36eac1aeac4f174b4b2593a54f00c0cda23ce1 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 15:10:31 -0800
Subject: [PATCH 081/202] mate.mozo: prep for top-level

---
 pkgs/desktops/mate/mozo/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix
index ef4c646935fe..a27b94d8e4af 100644
--- a/pkgs/desktops/mate/mozo/default.nix
+++ b/pkgs/desktops/mate/mozo/default.nix
@@ -9,7 +9,7 @@
   glib,
   wrapGAppsHook3,
   gobject-introspection,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
   doCheck = false;
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/mozo-${version}.tar.xz";
     sha256 = "/piYT/1qqMNtBZS879ugPeObQtQeAHJRaAOE8870SSQ=";
   };
 
@@ -43,7 +43,11 @@ python3.pkgs.buildPythonApplication rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/mozo";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "MATE Desktop menu editor";

From 31f1f24708a1820e82e9c5283e7cc134871c2b2e Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:54 -0800
Subject: [PATCH 082/202] mate.pluma: prep for top-level

---
 pkgs/desktops/mate/pluma/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index 4b937a001e17..336a284d1072 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -15,15 +15,15 @@
   libpeas,
   mate-desktop,
   wrapGAppsHook3,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pluma";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/pluma-${finalAttrs.version}.tar.xz";
     sha256 = "qorflYk0UJOlDjCyft5KeKJCHRcnwn9GX8h8Q1llodQ=";
   };
 
@@ -66,7 +66,11 @@ stdenv.mkDerivation rec {
     patchPythonScript $out/lib/pluma/plugins/snippets/Snippet.py
   '';
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/pluma";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Powerful text editor for the MATE desktop";
@@ -80,4 +84,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 55f2ee81cad088133dcad629729871f93324db7f Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 22 Dec 2025 11:25:55 -0800
Subject: [PATCH 083/202] mate.python-caja: prep for top-level

---
 pkgs/desktops/mate/python-caja/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix
index a732baa0dca8..b06000ba2e13 100644
--- a/pkgs/desktops/mate/python-caja/default.nix
+++ b/pkgs/desktops/mate/python-caja/default.nix
@@ -7,15 +7,15 @@
   caja,
   gtk3,
   python3Packages,
-  mateUpdateScript,
+  gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "python-caja";
   version = "1.28.0";
 
   src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/python-caja-${finalAttrs.version}.tar.xz";
     sha256 = "sFbCOdvf4z7QzIQx+zUAqTj3h7Weh19f+TV4umb2gNY=";
   };
 
@@ -36,7 +36,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.updateScript = mateUpdateScript { inherit pname; };
+  passthru.updateScript = gitUpdater {
+    url = "https://git.mate-desktop.org/python-caja";
+    odd-unstable = true;
+    rev-prefix = "v";
+  };
 
   meta = {
     description = "Python binding for Caja components";
@@ -45,4 +49,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     teams = [ lib.teams.mate ];
   };
-}
+})

From 15730df1c255c9c5d1d005d7a2a192e6eb7ace81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 01:07:00 +0000
Subject: [PATCH 084/202] fosrl-olm: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/by-name/fo/fosrl-olm/package.nix b/pkgs/by-name/fo/fosrl-olm/package.nix
index 5bf3a2eb27ca..99725ad52b3b 100644
--- a/pkgs/by-name/fo/fosrl-olm/package.nix
+++ b/pkgs/by-name/fo/fosrl-olm/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "olm";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "fosrl";
     repo = "olm";
     tag = version;
-    hash = "sha256-NVd0kPfP9JzCOBoBtz+9MPmuoX353XyOx4L/m9q8zY0=";
+    hash = "sha256-HwmWwGs62Dy/65HTgApuXLv4YRrFzi37A4JoL7vdLdo=";
   };
 
-  vendorHash = "sha256-BhMJ7x4WDOC6pSi9nW4F2H3cumOeoHkbrQ6Xq9njkog=";
+  vendorHash = "sha256-hLnoQof899zLnjbHrzvW2Y3Jj6fegxCVCRnz3XYKCeQ=";
 
   ldflags = [
     "-s"

From acd9e71eccc8897d5364d513a3a33c211c55b1cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 07:57:48 +0000
Subject: [PATCH 085/202] certinfo-go: 0.1.49 -> 0.1.50

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

diff --git a/pkgs/by-name/ce/certinfo-go/package.nix b/pkgs/by-name/ce/certinfo-go/package.nix
index f3d2dfb75dcf..26e1e6ec53f4 100644
--- a/pkgs/by-name/ce/certinfo-go/package.nix
+++ b/pkgs/by-name/ce/certinfo-go/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "certinfo-go";
-  version = "0.1.49";
+  version = "0.1.50";
 
   src = fetchFromGitHub {
     owner = "paepckehh";
     repo = "certinfo";
     tag = "v${version}";
-    hash = "sha256-28RlCPr3Y43MmVlzzdXp3fSti1zBGuBIYQMkszggAUs=";
+    hash = "sha256-MR7JYhYGE0WUwsBoie8wWEWqCGdpl+k4eUWIVVS5CEg=";
   };
 
-  vendorHash = "sha256-3Jnk2K1ZBfIXt4Oo8Znxqi6y7JzPG6gAKfZ30gHiFsw=";
+  vendorHash = "sha256-3GjVPV8Lwi4yNbIl/IT0fe9yFlWaqqCU1hzfR8H5r7Y=";
 
   ldflags = [
     "-s"

From 6726897b9ed4a48e0a085e44061e7d067ea369a0 Mon Sep 17 00:00:00 2001
From: novenary <novenary@kwak.zip>
Date: Tue, 23 Dec 2025 12:18:47 +0200
Subject: [PATCH 086/202] vintagestory: use finalAttrs instead of rec

This ensures that whatever overrideAttrs changes is properly fed back
into the package definition.
---
 pkgs/by-name/vi/vintagestory/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index d9c3654d7058..63aa284b48f7 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -19,12 +19,12 @@
   dotnet-runtime_8,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vintagestory";
   version = "1.21.6";
 
   src = fetchurl {
-    url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
+    url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz";
     hash = "sha256-LkiL/8W9MKpmJxtK+s5JvqhOza0BLap1SsaDvbLYR0c=";
   };
 
@@ -87,12 +87,12 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory \
-      --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
+      --prefix LD_LIBRARY_PATH : "${finalAttrs.runtimeLibs}" \
       --set-default mesa_glthread true \
       --add-flags $out/share/vintagestory/Vintagestory.dll
 
     makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory-server \
-      --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
+      --prefix LD_LIBRARY_PATH : "${finalAttrs.runtimeLibs}" \
       --set-default mesa_glthread true \
       --add-flags $out/share/vintagestory/VintagestoryServer.dll
 
@@ -116,4 +116,4 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "vintagestory";
   };
-}
+})

From 8cfe61aeee6e1e6ac6453ec57d3e58f8c6aa4646 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Tue, 23 Dec 2025 11:28:16 +0100
Subject: [PATCH 087/202] blockbench: 5.0.4 -> 5.0.6

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

diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix
index cdbfd7a99efd..e47e9bcdd314 100644
--- a/pkgs/by-name/bl/blockbench/package.nix
+++ b/pkgs/by-name/bl/blockbench/package.nix
@@ -12,13 +12,13 @@
 
 buildNpmPackage rec {
   pname = "blockbench";
-  version = "5.0.4";
+  version = "5.0.6";
 
   src = fetchFromGitHub {
     owner = "JannisX11";
     repo = "blockbench";
     tag = "v${version}";
-    hash = "sha256-f7+/OXdQEyN9XSkVRDRVUUdNGGEgyu3e/Y2oS7De96Y=";
+    hash = "sha256-AQAyxNVt8PCDCU/jViYY3IlPdNiesgx5kT9W7yrNJ4I=";
   };
 
   nativeBuildInputs = [

From 0841b49cf12e5a006c9a303d3163da8467eaa644 Mon Sep 17 00:00:00 2001
From: novenary <novenary@kwak.zip>
Date: Tue, 23 Dec 2025 12:28:26 +0200
Subject: [PATCH 088/202] vintagestory: make runtimeLibs more override-friendly

---
 pkgs/by-name/vi/vintagestory/package.nix | 68 ++++++++++++------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 63aa284b48f7..5ab1b9ce9ebe 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -33,25 +33,23 @@ stdenv.mkDerivation (finalAttrs: {
     copyDesktopItems
   ];
 
-  runtimeLibs = lib.makeLibraryPath (
-    [
-      gtk2
-      sqlite
-      openal
-      cairo
-      libGLU
-      SDL2
-      freealut
-      libglvnd
-      pipewire
-      libpulseaudio
-    ]
-    ++ (with xorg; [
-      libX11
-      libXi
-      libXcursor
-    ])
-  );
+  runtimeLibs = [
+    gtk2
+    sqlite
+    openal
+    cairo
+    libGLU
+    SDL2
+    freealut
+    libglvnd
+    pipewire
+    libpulseaudio
+  ]
+  ++ (with xorg; [
+    libX11
+    libXi
+    libXcursor
+  ]);
 
   desktopItems = [
     (makeDesktopItem {
@@ -85,22 +83,26 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  preFixup = ''
-    makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory \
-      --prefix LD_LIBRARY_PATH : "${finalAttrs.runtimeLibs}" \
-      --set-default mesa_glthread true \
-      --add-flags $out/share/vintagestory/Vintagestory.dll
+  preFixup =
+    let
+      runtimeLibs' = lib.strings.makeLibraryPath finalAttrs.runtimeLibs;
+    in
+    ''
+      makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory \
+        --prefix LD_LIBRARY_PATH : "${runtimeLibs'}" \
+        --set-default mesa_glthread true \
+        --add-flags $out/share/vintagestory/Vintagestory.dll
 
-    makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory-server \
-      --prefix LD_LIBRARY_PATH : "${finalAttrs.runtimeLibs}" \
-      --set-default mesa_glthread true \
-      --add-flags $out/share/vintagestory/VintagestoryServer.dll
+      makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory-server \
+        --prefix LD_LIBRARY_PATH : "${runtimeLibs'}" \
+        --set-default mesa_glthread true \
+        --add-flags $out/share/vintagestory/VintagestoryServer.dll
 
-    find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
-      local filename="$(basename -- "$file")"
-      ln -sf "$filename" "''${file%/*}"/"''${filename,,}"
-    done
-  '';
+      find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
+        local filename="$(basename -- "$file")"
+        ln -sf "$filename" "''${file%/*}"/"''${filename,,}"
+      done
+    '';
 
   meta = {
     description = "In-development indie sandbox game about innovation and exploration";

From 20abb59615caff6d8364c249f482b2c5dbfd7661 Mon Sep 17 00:00:00 2001
From: novenary <novenary@kwak.zip>
Date: Tue, 23 Dec 2025 12:47:05 +0200
Subject: [PATCH 089/202] vintagestory: remove with

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

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 5ab1b9ce9ebe..3f9c83418be9 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -45,11 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
     pipewire
     libpulseaudio
   ]
-  ++ (with xorg; [
-    libX11
-    libXi
-    libXcursor
-  ]);
+  ++ [
+    xorg.libX11
+    xorg.libXi
+    xorg.libXcursor
+  ];
 
   desktopItems = [
     (makeDesktopItem {

From 20f8f7251417fffbe4bb57296150c026dafc3d5a Mon Sep 17 00:00:00 2001
From: novenary <novenary@kwak.zip>
Date: Tue, 23 Dec 2025 13:57:15 +0200
Subject: [PATCH 090/202] vintagestory: use lib.meta.getExe

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

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 3f9c83418be9..1a9d4374c728 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -88,12 +88,12 @@ stdenv.mkDerivation (finalAttrs: {
       runtimeLibs' = lib.strings.makeLibraryPath finalAttrs.runtimeLibs;
     in
     ''
-      makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory \
+      makeWrapper ${lib.meta.getExe dotnet-runtime_8} $out/bin/vintagestory \
         --prefix LD_LIBRARY_PATH : "${runtimeLibs'}" \
         --set-default mesa_glthread true \
         --add-flags $out/share/vintagestory/Vintagestory.dll
 
-      makeWrapper ${dotnet-runtime_8}/bin/dotnet $out/bin/vintagestory-server \
+      makeWrapper ${lib.meta.getExe dotnet-runtime_8} $out/bin/vintagestory-server \
         --prefix LD_LIBRARY_PATH : "${runtimeLibs'}" \
         --set-default mesa_glthread true \
         --add-flags $out/share/vintagestory/VintagestoryServer.dll

From e7f3a8df3cfe48753a9760df44b80f07e1c06287 Mon Sep 17 00:00:00 2001
From: novenary <novenary@kwak.zip>
Date: Tue, 23 Dec 2025 13:05:19 +0200
Subject: [PATCH 091/202] vintagestory: add optional Wayland support

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

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 1a9d4374c728..fc7026083f22 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -5,7 +5,6 @@
   makeWrapper,
   makeDesktopItem,
   copyDesktopItems,
-  xorg,
   gtk2,
   sqlite,
   openal,
@@ -17,8 +16,18 @@
   pipewire,
   libpulseaudio,
   dotnet-runtime_8,
+  x11Support ? true,
+  xorg ? null,
+  waylandSupport ? false,
+  wayland ? null,
+  libxkbcommon ? null,
 }:
 
+assert x11Support || waylandSupport;
+assert x11Support -> xorg != null;
+assert waylandSupport -> wayland != null;
+assert waylandSupport -> libxkbcommon != null;
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "vintagestory";
   version = "1.21.6";
@@ -45,10 +54,14 @@ stdenv.mkDerivation (finalAttrs: {
     pipewire
     libpulseaudio
   ]
-  ++ [
+  ++ lib.optionals x11Support [
     xorg.libX11
     xorg.libXi
     xorg.libXcursor
+  ]
+  ++ lib.optionals waylandSupport [
+    wayland
+    libxkbcommon
   ];
 
   desktopItems = [
@@ -91,6 +104,9 @@ stdenv.mkDerivation (finalAttrs: {
       makeWrapper ${lib.meta.getExe dotnet-runtime_8} $out/bin/vintagestory \
         --prefix LD_LIBRARY_PATH : "${runtimeLibs'}" \
         --set-default mesa_glthread true \
+        ${lib.strings.optionalString waylandSupport ''
+          --set-default OPENTK_4_USE_WAYLAND 1 \
+        ''} \
         --add-flags $out/share/vintagestory/Vintagestory.dll
 
       makeWrapper ${lib.meta.getExe dotnet-runtime_8} $out/bin/vintagestory-server \

From 4be827fe0cedc7d308c4dddcdcc285d060db922d Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Tue, 23 Dec 2025 11:39:14 +0000
Subject: [PATCH 092/202] python3Packages.rendercanvas: 2.4.2 -> 2.5.1

Changelog: https://github.com/pygfx/rendercanvas/releases/tag/v2.5.0
Changelog: https://github.com/pygfx/rendercanvas/releases/tag/v2.5.1
---
 .../python-modules/rendercanvas/default.nix           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/rendercanvas/default.nix b/pkgs/development/python-modules/rendercanvas/default.nix
index 9b02a7f1c360..a06d5225e431 100644
--- a/pkgs/development/python-modules/rendercanvas/default.nix
+++ b/pkgs/development/python-modules/rendercanvas/default.nix
@@ -22,14 +22,14 @@
 }:
 buildPythonPackage rec {
   pname = "rendercanvas";
-  version = "2.4.2";
+  version = "2.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pygfx";
     repo = "rendercanvas";
     tag = "v${version}";
-    hash = "sha256-42jnCD0jSGkz6zLokzF1lXjnVP8E2yrPu8AQ80EKEI4=";
+    hash = "sha256-FjKotBAGEtM5JYA3PGeoSl3v4m6vq1EE/r/gCsabdIo=";
   };
 
   postPatch = ''
@@ -38,8 +38,6 @@ buildPythonPackage rec {
 
   build-system = [ flit-core ];
 
-  dependencies = [ sniffio ];
-
   nativeCheckInputs = [
     pytestCheckHook
     glfw
@@ -51,7 +49,10 @@ buildPythonPackage rec {
   ];
 
   # flaky timing and / or interrupt based tests
-  disabledTests = [ "test_offscreen_event_loop" ];
+  disabledTests = [
+    "test_offscreen_event_loop"
+    "test_call_later_thread"
+  ];
   disabledTestPaths = [
     "tests/test_loop.py"
     "tests/test_scheduling.py"

From 32829904eccef8b4051eae6c9ee797a0a1272037 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Tue, 23 Dec 2025 11:39:49 +0000
Subject: [PATCH 093/202] python3Packages.wgpu-py: 0.28.1 -> 0.29.0

Changelog: https://github.com/pygfx/wgpu-py/blob/v0.29.0/CHANGELOG.md
---
 pkgs/development/python-modules/wgpu-py/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/wgpu-py/default.nix b/pkgs/development/python-modules/wgpu-py/default.nix
index 008b493a220c..4a20862682ac 100644
--- a/pkgs/development/python-modules/wgpu-py/default.nix
+++ b/pkgs/development/python-modules/wgpu-py/default.nix
@@ -39,14 +39,14 @@
 }:
 buildPythonPackage rec {
   pname = "wgpu-py";
-  version = "0.28.1";
+  version = "0.29.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pygfx";
     repo = "wgpu-py";
     tag = "v${version}";
-    hash = "sha256-91L0rXaMYtDztk9aJQhWDWa8sG+MHQ4sPyidzZmK+ZI=";
+    hash = "sha256-drXO3NHIuK34tbOZjxOCz1lnlcrfx6mADZ2WlEc9vDU=";
   };
 
   postPatch =

From 45d79792a2bd9d21c1f2e9a1606483a8354128a2 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 23 Dec 2025 21:10:39 +0800
Subject: [PATCH 094/202] xfce: Remove old aliases

---
 pkgs/desktops/xfce/default.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 18df33389d05..50f81008705a 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -160,9 +160,6 @@ makeScopeWithSplicing' {
     }
     // lib.optionalAttrs config.allowAliases {
       #### ALIASES
-
-      automakeAddFlags = throw "xfce.automakeAddFlags has been removed: this setup-hook is no longer used in Nixpkgs"; # added 2024-03-24
-
       genericUpdater = throw "xfce.genericUpdater has been removed: use pkgs.genericUpdater directly"; # added 2025-12-22
 
       mkXfceDerivation = lib.warnOnInstantiate ''
@@ -172,19 +169,10 @@ makeScopeWithSplicing' {
         to your configureFlags.
       '' (callPackage ./mkXfceDerivation.nix { }); # added 2025-12-22
 
-      xinitrc = self.xfce4-session.xinitrc; # added 2019-11-04
-
-      thunar-bare = self.thunar-unwrapped; # added 2019-11-04
-
       xfce4-datetime-plugin = throw ''
         xfce4-datetime-plugin has been removed: this plugin has been merged into the xfce4-panel's built-in clock
         plugin and thus no longer maintained upstream, see https://gitlab.xfce.org/xfce/xfce4-panel/-/issues/563.
       ''; # Added 2025-05-20
-
-      xfce4-embed-plugin = throw "xfce4-embed-plugin has been removed, as it was broken"; # Added 2024-07-15
-
-      xfce4-hardware-monitor-plugin = throw "xfce.xfce4-hardware-monitor-plugin has been removed: abandoned by upstream and does not build"; # added 2023-01-15
-      xfce4-namebar-plugin = throw "xfce.xfce4-namebar-plugin has been removed: abandoned by upstream and does not build"; # added 2024-05-08
     }
   );
 }

From 87a4c9da2cd3b483abfe5f12c16e58843388f27d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 13:57:53 +0000
Subject: [PATCH 095/202] gogup: 0.28.1 -> 0.28.2

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

diff --git a/pkgs/by-name/go/gogup/package.nix b/pkgs/by-name/go/gogup/package.nix
index aaf667871d58..d85cc4a9a471 100644
--- a/pkgs/by-name/go/gogup/package.nix
+++ b/pkgs/by-name/go/gogup/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "gogup";
-  version = "0.28.1";
+  version = "0.28.2";
 
   src = fetchFromGitHub {
     owner = "nao1215";
     repo = "gup";
     rev = "v${version}";
-    hash = "sha256-n8bYmQcVtiuc55a+/LfS44PbVHCUZ7WUAWOmcodcy9Y=";
+    hash = "sha256-ETUCMDF0dU2p/nKC07T2rVtDvKRSatqijRu4PanbxXc=";
   };
 
-  vendorHash = "sha256-ldsGHIKiuVP48taK4kMqtF/xELl+JqAJUCGFKYZdJGU=";
+  vendorHash = "sha256-Dm9g2SA5qYYcmnQ1xApVVvWG7+CaQs5blv7qJOANL8Q=";
   doCheck = false;
 
   ldflags = [

From d70f91bff4ebd078d034c56beb60e7a9793fe31c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 23 Dec 2025 20:49:27 +0800
Subject: [PATCH 096/202] xfce4-dev-tools: Move to top-level

---
 doc/hooks/xfce4-dev-tools.section.md                        | 2 +-
 pkgs/by-name/li/lightdm-gtk-greeter/package.nix             | 4 ++--
 pkgs/by-name/pr/pragha/package.nix                          | 3 ++-
 .../default.nix => by-name/xf/xfce4-dev-tools/package.nix}  | 0
 .../xfce/core => by-name/xf}/xfce4-dev-tools/setup-hook.sh  | 0
 pkgs/desktops/xfce/default.nix                              | 6 ++++--
 6 files changed, 9 insertions(+), 6 deletions(-)
 rename pkgs/{desktops/xfce/core/xfce4-dev-tools/default.nix => by-name/xf/xfce4-dev-tools/package.nix} (100%)
 rename pkgs/{desktops/xfce/core => by-name/xf}/xfce4-dev-tools/setup-hook.sh (100%)

diff --git a/doc/hooks/xfce4-dev-tools.section.md b/doc/hooks/xfce4-dev-tools.section.md
index 6c0d54a0b005..a18295f4db67 100644
--- a/doc/hooks/xfce4-dev-tools.section.md
+++ b/doc/hooks/xfce4-dev-tools.section.md
@@ -1,4 +1,4 @@
-# `xfce.xfce4-dev-tools` {#xfce4-dev-tools}
+# `xfce4-dev-tools` {#xfce4-dev-tools}
 
 This setup hook attempts to run `xdt-autogen` in `xdtAutogenPhase`, which is part of `preConfigurePhases`.
 
diff --git a/pkgs/by-name/li/lightdm-gtk-greeter/package.nix b/pkgs/by-name/li/lightdm-gtk-greeter/package.nix
index b6b62599d139..1279d447353a 100644
--- a/pkgs/by-name/li/lightdm-gtk-greeter/package.nix
+++ b/pkgs/by-name/li/lightdm-gtk-greeter/package.nix
@@ -9,7 +9,7 @@
   linkFarm,
   wrapGAppsHook3,
   gtk3,
-  xfce,
+  xfce4-dev-tools,
   at-spi2-core,
   librsvg,
   hicolor-icon-theme,
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     intltool
-    xfce.xfce4-dev-tools
+    xfce4-dev-tools
     wrapGAppsHook3
   ];
 
diff --git a/pkgs/by-name/pr/pragha/package.nix b/pkgs/by-name/pr/pragha/package.nix
index 067359851eb7..5e92f657a67f 100644
--- a/pkgs/by-name/pr/pragha/package.nix
+++ b/pkgs/by-name/pr/pragha/package.nix
@@ -35,6 +35,7 @@
   libmtp,
   withMtp ? false, # experimental
   xfce,
+  xfce4-dev-tools,
   withXfce4ui ? false,
   totem-pl-parser,
   withTotemPlParser ? false,
@@ -59,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     intltool
     pkg-config
-    xfce.xfce4-dev-tools
+    xfce4-dev-tools
     desktop-file-utils
     installShellFiles
     libsForQt5.wrapQtAppsHook
diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix b/pkgs/by-name/xf/xfce4-dev-tools/package.nix
similarity index 100%
rename from pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix
rename to pkgs/by-name/xf/xfce4-dev-tools/package.nix
diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh b/pkgs/by-name/xf/xfce4-dev-tools/setup-hook.sh
similarity index 100%
rename from pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh
rename to pkgs/by-name/xf/xfce4-dev-tools/setup-hook.sh
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 50f81008705a..f1d1fb001a37 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -59,8 +59,6 @@ makeScopeWithSplicing' {
 
       xfce4-appfinder = callPackage ./core/xfce4-appfinder { };
 
-      xfce4-dev-tools = callPackage ./core/xfce4-dev-tools { };
-
       #### APPLICATIONS
 
       catfish = callPackage ./applications/catfish { };
@@ -176,3 +174,7 @@ makeScopeWithSplicing' {
     }
   );
 }
+// lib.optionalAttrs config.allowAliases {
+  # These aliases need to be placed outside the scope or they will shadow the attributes from parent scope.
+  xfce4-dev-tools = lib.warnOnInstantiate "‘xfce.xfce4-dev-tools’ was moved to top-level. Please use ‘pkgs.xfce4-dev-tools’ directly" pkgs.xfce4-dev-tools; # Added on 2025-12-23
+}

From 2c09a8e8fb98dd5099ee2f263d0805f8e7069c1f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 23 Dec 2025 20:59:19 +0800
Subject: [PATCH 097/202] libxfce4util: Move to top-level

---
 pkgs/by-name/jg/jgmenu/package.nix                             | 3 ++-
 .../default.nix => by-name/li/libxfce4util/package.nix}        | 0
 pkgs/desktops/xfce/default.nix                                 | 3 +--
 pkgs/top-level/all-packages.nix                                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/{desktops/xfce/core/libxfce4util/default.nix => by-name/li/libxfce4util/package.nix} (100%)

diff --git a/pkgs/by-name/jg/jgmenu/package.nix b/pkgs/by-name/jg/jgmenu/package.nix
index db4643e17746..ca8100c20bcf 100644
--- a/pkgs/by-name/jg/jgmenu/package.nix
+++ b/pkgs/by-name/jg/jgmenu/package.nix
@@ -6,6 +6,7 @@
   python3Packages,
   pango,
   librsvg,
+  libxfce4util,
   libxml2,
   menu-cache,
   xorg,
@@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals enableXfcePanelApplet [
     gtk3
-    xfce.libxfce4util
+    libxfce4util
     xfce.xfce4-panel
   ];
 
diff --git a/pkgs/desktops/xfce/core/libxfce4util/default.nix b/pkgs/by-name/li/libxfce4util/package.nix
similarity index 100%
rename from pkgs/desktops/xfce/core/libxfce4util/default.nix
rename to pkgs/by-name/li/libxfce4util/package.nix
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index f1d1fb001a37..0a5ae1737a76 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -23,8 +23,6 @@ makeScopeWithSplicing' {
 
       libxfce4ui = callPackage ./core/libxfce4ui { };
 
-      libxfce4util = callPackage ./core/libxfce4util { };
-
       libxfce4windowing = callPackage ./core/libxfce4windowing { };
 
       thunar-unwrapped = callPackage ./core/thunar { };
@@ -176,5 +174,6 @@ makeScopeWithSplicing' {
 }
 // lib.optionalAttrs config.allowAliases {
   # These aliases need to be placed outside the scope or they will shadow the attributes from parent scope.
+  libxfce4util = lib.warnOnInstantiate "‘xfce.libxfce4util’ was moved to top-level. Please use ‘pkgs.libxfce4util’ directly" pkgs.libxfce4util; # Added on 2025-12-23
   xfce4-dev-tools = lib.warnOnInstantiate "‘xfce.xfce4-dev-tools’ was moved to top-level. Please use ‘pkgs.xfce4-dev-tools’ directly" pkgs.xfce4-dev-tools; # Added on 2025-12-23
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c54fa90f5003..6048d076b74c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12467,7 +12467,7 @@ with pkgs;
   };
 
   xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet {
-    inherit (xfce) libxfce4util xfce4-panel;
+    inherit (xfce) xfce4-panel;
   };
 
   xmonad_log_applet_mate = xmonad_log_applet.override {

From 21e9cc036ccb79febd2e19f9c2775cf6511ff3fd Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 23 Dec 2025 22:23:18 +0800
Subject: [PATCH 098/202] xfconf: Move to top-level

---
 nixos/modules/programs/xfconf.nix                             | 4 ++--
 pkgs/by-name/ca/caffeine-ng/package.nix                       | 4 ++--
 pkgs/by-name/fa/fastfetch/package.nix                         | 4 ++--
 .../core/xfconf/default.nix => by-name/xf/xfconf/package.nix} | 0
 pkgs/desktops/xfce/default.nix                                | 3 +--
 .../xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix      | 3 ++-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename pkgs/{desktops/xfce/core/xfconf/default.nix => by-name/xf/xfconf/package.nix} (100%)

diff --git a/nixos/modules/programs/xfconf.nix b/nixos/modules/programs/xfconf.nix
index 1788b220439c..cc9b6ddf7ac7 100644
--- a/nixos/modules/programs/xfconf.nix
+++ b/nixos/modules/programs/xfconf.nix
@@ -22,11 +22,11 @@ in
 
   config = lib.mkIf cfg.enable {
     environment.systemPackages = [
-      pkgs.xfce.xfconf
+      pkgs.xfconf
     ];
 
     services.dbus.packages = [
-      pkgs.xfce.xfconf
+      pkgs.xfconf
     ];
   };
 }
diff --git a/pkgs/by-name/ca/caffeine-ng/package.nix b/pkgs/by-name/ca/caffeine-ng/package.nix
index bcdb14ea1a96..d166dc2297d0 100644
--- a/pkgs/by-name/ca/caffeine-ng/package.nix
+++ b/pkgs/by-name/ca/caffeine-ng/package.nix
@@ -13,7 +13,7 @@
   xset,
   xautolock,
   xscreensaver,
-  xfce,
+  xfconf,
   wrapGAppsHook3,
 }:
 
@@ -74,7 +74,7 @@ python3Packages.buildPythonApplication rec {
           procps
           xautolock
           xscreensaver
-          xfce.xfconf
+          xfconf
           xset
         ]
       }
diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index f7cce76e7c7c..78aa2ac6d5c7 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -34,7 +34,7 @@
   versionCheckHook,
   vulkan-loader,
   wayland,
-  xfce,
+  xfconf,
   xorg,
   yyjson,
   zlib,
@@ -175,7 +175,7 @@ stdenv.mkDerivation (finalAttrs: {
         ]
         ++ lib.optionals xfceSupport [
           #  Needed for XFWM theme and XFCE Terminal font.
-          xfce.xfconf
+          xfconf
         ]
         ++ lib.optionals zfsSupport [
           # Needed for zpool module
diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/by-name/xf/xfconf/package.nix
similarity index 100%
rename from pkgs/desktops/xfce/core/xfconf/default.nix
rename to pkgs/by-name/xf/xfconf/package.nix
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 0a5ae1737a76..1809881e2284 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -49,8 +49,6 @@ makeScopeWithSplicing' {
 
       xfce4-power-manager = callPackage ./core/xfce4-power-manager { };
 
-      xfconf = callPackage ./core/xfconf { };
-
       xfdesktop = callPackage ./core/xfdesktop { };
 
       xfwm4 = callPackage ./core/xfwm4 { };
@@ -176,4 +174,5 @@ makeScopeWithSplicing' {
   # These aliases need to be placed outside the scope or they will shadow the attributes from parent scope.
   libxfce4util = lib.warnOnInstantiate "‘xfce.libxfce4util’ was moved to top-level. Please use ‘pkgs.libxfce4util’ directly" pkgs.libxfce4util; # Added on 2025-12-23
   xfce4-dev-tools = lib.warnOnInstantiate "‘xfce.xfce4-dev-tools’ was moved to top-level. Please use ‘pkgs.xfce4-dev-tools’ directly" pkgs.xfce4-dev-tools; # Added on 2025-12-23
+  xfconf = lib.warnOnInstantiate "‘xfce.xfconf’ was moved to top-level. Please use ‘pkgs.xfconf’ directly" pkgs.xfconf; # Added on 2025-12-23
 }
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
index 3df3819740f2..fd4ece28a56f 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
@@ -11,6 +11,7 @@
   python3Packages,
   wrapGAppsHook3,
   xfce,
+  xfconf,
 }:
 
 stdenv.mkDerivation rec {
@@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
     keybinder3
     python3Packages.python
     xfce.xfce4-panel
-    xfce.xfconf
+    xfconf
   ]
   ++ pythonPath;
 

From d1fa4b2cc722a2cd1fd3e1b391cf9fa11b717cc6 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 23 Dec 2025 22:27:19 +0800
Subject: [PATCH 099/202] libxfce4ui: Move to top-level

---
 nixos/modules/services/x11/desktop-managers/xfce.nix          | 2 +-
 .../default.nix => by-name/li/libxfce4ui/package.nix}         | 0
 pkgs/by-name/pr/pragha/package.nix                            | 4 ++--
 pkgs/desktops/xfce/default.nix                                | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename pkgs/{desktops/xfce/core/libxfce4ui/default.nix => by-name/li/libxfce4ui/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 74c481dd5b8c..04f4f78de45e 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -131,7 +131,7 @@ in
 
         xfce.exo
         xfce.garcon
-        xfce.libxfce4ui
+        libxfce4ui
 
         xfce.mousepad
         xfce.parole
diff --git a/pkgs/desktops/xfce/core/libxfce4ui/default.nix b/pkgs/by-name/li/libxfce4ui/package.nix
similarity index 100%
rename from pkgs/desktops/xfce/core/libxfce4ui/default.nix
rename to pkgs/by-name/li/libxfce4ui/package.nix
diff --git a/pkgs/by-name/pr/pragha/package.nix b/pkgs/by-name/pr/pragha/package.nix
index 5e92f657a67f..8afac719c45b 100644
--- a/pkgs/by-name/pr/pragha/package.nix
+++ b/pkgs/by-name/pr/pragha/package.nix
@@ -34,7 +34,7 @@
   withGudev ? false, # experimental
   libmtp,
   withMtp ? false, # experimental
-  xfce,
+  libxfce4ui,
   xfce4-dev-tools,
   withXfce4ui ? false,
   totem-pl-parser,
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional withGlyr glyr
     ++ lib.optional withLibsoup libsoup_2_4
     ++ lib.optional withMtp libmtp
-    ++ lib.optional withXfce4ui xfce.libxfce4ui
+    ++ lib.optional withXfce4ui libxfce4ui
     ++ lib.optional withTotemPlParser totem-pl-parser
   # ++ lib.optional withGrilo grilo
   # ++ lib.optional withRygel rygel
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 1809881e2284..767340586773 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -21,8 +21,6 @@ makeScopeWithSplicing' {
 
       garcon = callPackage ./core/garcon { };
 
-      libxfce4ui = callPackage ./core/libxfce4ui { };
-
       libxfce4windowing = callPackage ./core/libxfce4windowing { };
 
       thunar-unwrapped = callPackage ./core/thunar { };
@@ -172,6 +170,7 @@ makeScopeWithSplicing' {
 }
 // lib.optionalAttrs config.allowAliases {
   # These aliases need to be placed outside the scope or they will shadow the attributes from parent scope.
+  libxfce4ui = lib.warnOnInstantiate "‘xfce.libxfce4ui’ was moved to top-level. Please use ‘pkgs.libxfce4ui’ directly" pkgs.libxfce4ui; # Added on 2025-12-23
   libxfce4util = lib.warnOnInstantiate "‘xfce.libxfce4util’ was moved to top-level. Please use ‘pkgs.libxfce4util’ directly" pkgs.libxfce4util; # Added on 2025-12-23
   xfce4-dev-tools = lib.warnOnInstantiate "‘xfce.xfce4-dev-tools’ was moved to top-level. Please use ‘pkgs.xfce4-dev-tools’ directly" pkgs.xfce4-dev-tools; # Added on 2025-12-23
   xfconf = lib.warnOnInstantiate "‘xfce.xfconf’ was moved to top-level. Please use ‘pkgs.xfconf’ directly" pkgs.xfconf; # Added on 2025-12-23

From e78d67ce53bbcad2e492889296a597599e339f58 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 23 Dec 2025 22:36:29 +0800
Subject: [PATCH 100/202] xfce4-exo: Move to top-level

pkgs.exo already exists >_<
---
 nixos/modules/services/x11/desktop-managers/xfce.nix        | 2 +-
 .../exo/default.nix => by-name/xf/xfce4-exo/package.nix}    | 0
 pkgs/desktops/xfce/applications/ristretto/default.nix       | 4 ++--
 pkgs/desktops/xfce/applications/xfburn/default.nix          | 4 ++--
 .../xfce/applications/xfce4-screenshooter/default.nix       | 4 ++--
 pkgs/desktops/xfce/core/thunar-volman/default.nix           | 4 ++--
 pkgs/desktops/xfce/core/thunar/default.nix                  | 6 +++---
 pkgs/desktops/xfce/core/xfce4-panel/default.nix             | 4 ++--
 pkgs/desktops/xfce/core/xfce4-session/default.nix           | 4 ++--
 pkgs/desktops/xfce/core/xfce4-settings/default.nix          | 4 ++--
 pkgs/desktops/xfce/core/xfdesktop/default.nix               | 4 ++--
 pkgs/desktops/xfce/default.nix                              | 3 +--
 .../xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix   | 4 ++--
 .../xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix  | 4 ++--
 .../xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix | 4 ++--
 pkgs/desktops/xfce/thunar-plugins/vcs/default.nix           | 4 ++--
 16 files changed, 29 insertions(+), 30 deletions(-)
 rename pkgs/{desktops/xfce/core/exo/default.nix => by-name/xf/xfce4-exo/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 04f4f78de45e..b115451e0818 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -129,7 +129,7 @@ in
         # Needed by Xfce's xinitrc script
         xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
 
-        xfce.exo
+        xfce4-exo
         xfce.garcon
         libxfce4ui
 
diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/by-name/xf/xfce4-exo/package.nix
similarity index 100%
rename from pkgs/desktops/xfce/core/exo/default.nix
rename to pkgs/by-name/xf/xfce4-exo/package.nix
diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix
index 4c27e4d0056c..a31ad58933bd 100644
--- a/pkgs/desktops/xfce/applications/ristretto/default.nix
+++ b/pkgs/desktops/xfce/applications/ristretto/default.nix
@@ -8,7 +8,7 @@
   pkg-config,
   wrapGAppsHook3,
   cairo,
-  exo,
+  xfce4-exo,
   gtk3,
   libexif,
   libxfce4ui,
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     cairo
-    exo
+    xfce4-exo
     glib
     gtk3
     libexif
diff --git a/pkgs/desktops/xfce/applications/xfburn/default.nix b/pkgs/desktops/xfce/applications/xfburn/default.nix
index a3b816c1a65d..75e0fb873755 100644
--- a/pkgs/desktops/xfce/applications/xfburn/default.nix
+++ b/pkgs/desktops/xfce/applications/xfburn/default.nix
@@ -9,7 +9,7 @@
   ninja,
   pkg-config,
   wrapGAppsHook3,
-  exo,
+  xfce4-exo,
   gst_all_1,
   gtk3,
   libburn,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    exo
+    xfce4-exo
     glib
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
index 9d1264a8ed1e..d539966335bd 100644
--- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
@@ -9,7 +9,7 @@
   pkg-config,
   wayland-scanner,
   wrapGAppsHook3,
-  exo,
+  xfce4-exo,
   gtk3,
   gtk-layer-shell,
   libX11,
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    exo
+    xfce4-exo
     gtk3
     gtk-layer-shell
     libX11
diff --git a/pkgs/desktops/xfce/core/thunar-volman/default.nix b/pkgs/desktops/xfce/core/thunar-volman/default.nix
index 777f845b3de1..995d77c07bd7 100644
--- a/pkgs/desktops/xfce/core/thunar-volman/default.nix
+++ b/pkgs/desktops/xfce/core/thunar-volman/default.nix
@@ -6,7 +6,7 @@
   pkg-config,
   xfce4-dev-tools,
   wrapGAppsHook3,
-  exo,
+  xfce4-exo,
   gtk3,
   libgudev,
   libxfce4ui,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    exo
+    xfce4-exo
     gtk3
     libgudev
     libxfce4ui
diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix
index acb8c43afd8a..f52ce309c469 100644
--- a/pkgs/desktops/xfce/core/thunar/default.nix
+++ b/pkgs/desktops/xfce/core/thunar/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitLab,
   docbook_xsl,
   gettext,
-  exo,
+  xfce4-exo,
   gdk-pixbuf,
   gtk3,
   libexif,
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    exo
+    xfce4-exo
     gdk-pixbuf
     gtk3
     libX11
@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
   preFixup = ''
     gappsWrapperArgs+=(
       # https://github.com/NixOS/nixpkgs/issues/329688
-      --prefix PATH : ${lib.makeBinPath [ exo ]}
+      --prefix PATH : ${lib.makeBinPath [ xfce4-exo ]}
     )
   '';
 
diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
index fe8cfc0a1b33..1b9a92bd8fc0 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
@@ -8,7 +8,7 @@
   xfce4-dev-tools,
   wrapGAppsHook3,
   cairo,
-  exo,
+  xfce4-exo,
   garcon,
   gtk-layer-shell,
   gtk3,
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     cairo
-    exo
+    xfce4-exo
     garcon
     gtk-layer-shell
     libdbusmenu-gtk3
diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix
index 9df164019861..05dbbb9848b3 100644
--- a/pkgs/desktops/xfce/core/xfce4-session/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix
@@ -7,7 +7,7 @@
   xfce4-dev-tools,
   wrapGAppsHook3,
   polkit,
-  exo,
+  xfce4-exo,
   libxfce4util,
   libxfce4ui,
   libxfce4windowing,
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    exo
+    xfce4-exo
     gtk3
     gtk-layer-shell
     glib
diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
index 2fc5f5dddd95..dbc5078e6499 100644
--- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
@@ -7,7 +7,7 @@
   xfce4-dev-tools,
   wayland-scanner,
   wrapGAppsHook3,
-  exo,
+  xfce4-exo,
   garcon,
   gtk3,
   gtk-layer-shell,
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    exo
+    xfce4-exo
     garcon
     glib
     gtk3
diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix
index 5e669868a5a8..9c8e0e2793d1 100644
--- a/pkgs/desktops/xfce/core/xfdesktop/default.nix
+++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix
@@ -6,7 +6,7 @@
   pkg-config,
   xfce4-dev-tools,
   wrapGAppsHook3,
-  exo,
+  xfce4-exo,
   gtk3,
   libxfce4ui,
   libxfce4util,
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    exo
+    xfce4-exo
     gtk3
     libxfce4ui
     libxfce4util
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 767340586773..b47923865891 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -17,8 +17,6 @@ makeScopeWithSplicing' {
     {
       #### CORE
 
-      exo = callPackage ./core/exo { };
-
       garcon = callPackage ./core/garcon { };
 
       libxfce4windowing = callPackage ./core/libxfce4windowing { };
@@ -170,6 +168,7 @@ makeScopeWithSplicing' {
 }
 // lib.optionalAttrs config.allowAliases {
   # These aliases need to be placed outside the scope or they will shadow the attributes from parent scope.
+  exo = lib.warnOnInstantiate "‘xfce.exo’ was moved to top-level. Please use ‘pkgs.xfce4-exo’ directly" pkgs.xfce4-exo; # Added on 2025-12-23
   libxfce4ui = lib.warnOnInstantiate "‘xfce.libxfce4ui’ was moved to top-level. Please use ‘pkgs.libxfce4ui’ directly" pkgs.libxfce4ui; # Added on 2025-12-23
   libxfce4util = lib.warnOnInstantiate "‘xfce.libxfce4util’ was moved to top-level. Please use ‘pkgs.libxfce4util’ directly" pkgs.libxfce4util; # Added on 2025-12-23
   xfce4-dev-tools = lib.warnOnInstantiate "‘xfce.xfce4-dev-tools’ was moved to top-level. Please use ‘pkgs.xfce4-dev-tools’ directly" pkgs.xfce4-dev-tools; # Added on 2025-12-23
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix
index aba48cca097a..9d7419d6df74 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix
@@ -9,7 +9,7 @@
   xfce4-panel,
   libxfce4ui,
   libxfce4util,
-  exo,
+  xfce4-exo,
   glib,
   gtk3,
   gnutls,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxfce4ui
     libxfce4util
     xfce4-panel
-    exo
+    xfce4-exo
     glib
     gtk3
     gnutls
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
index 46aa33786756..36bcd05f03f3 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  exo,
+  xfce4-exo,
   gtk3,
   libcanberra,
   libpulseaudio,
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    exo
+    xfce4-exo
     glib
     gtk3
     keybinder3
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
index ca30bb25da43..9652f3e5d14b 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
@@ -8,7 +8,7 @@
   pkg-config,
   wrapGAppsHook3,
   accountsservice,
-  exo,
+  xfce4-exo,
   garcon,
   glib,
   gtk-layer-shell,
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     accountsservice
-    exo
+    xfce4-exo
     garcon
     glib
     gtk-layer-shell
diff --git a/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix b/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix
index 086c259c6d85..e7ecbbd05a72 100644
--- a/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/vcs/default.nix
@@ -8,7 +8,7 @@
   pkg-config,
   wrapGAppsHook3,
   thunar,
-  exo,
+  xfce4-exo,
   libxfce4ui,
   libxfce4util,
   gtk3,
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     thunar
-    exo
+    xfce4-exo
     libxfce4ui
     libxfce4util
     gtk3

From 6d7f9a3a260bd7978055aa85deaaef240c176b3e Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 23 Dec 2025 22:45:24 +0800
Subject: [PATCH 101/202] libxfce4windowing: Move to top-level

---
 pkgs/by-name/bu/budgie-desktop/package.nix                    | 4 ++--
 pkgs/by-name/bu/budgie-media-player-applet/package.nix        | 4 ++--
 .../default.nix => by-name/li/libxfce4windowing/package.nix}  | 0
 pkgs/desktops/xfce/default.nix                                | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename pkgs/{desktops/xfce/core/libxfce4windowing/default.nix => by-name/li/libxfce4windowing/package.nix} (100%)

diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
index ac014cfcd01a..29e729bfa3d3 100644
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -41,7 +41,7 @@
   upower,
   vala,
   validatePkgConfig,
-  xfce,
+  libxfce4windowing,
   wrapGAppsHook3,
   zenity,
 }:
@@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
     sassc
     udev
     upower
-    xfce.libxfce4windowing
+    libxfce4windowing
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/by-name/bu/budgie-media-player-applet/package.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix
index 7315b6065be6..630103b5a5dc 100644
--- a/pkgs/by-name/bu/budgie-media-player-applet/package.nix
+++ b/pkgs/by-name/bu/budgie-media-player-applet/package.nix
@@ -8,7 +8,7 @@
   ninja,
   nix-update-script,
   python3Packages,
-  xfce,
+  libxfce4windowing,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glib
     gtk3
-    xfce.libxfce4windowing
+    libxfce4windowing
   ];
 
   pythonPath = with python3Packages; [
diff --git a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix b/pkgs/by-name/li/libxfce4windowing/package.nix
similarity index 100%
rename from pkgs/desktops/xfce/core/libxfce4windowing/default.nix
rename to pkgs/by-name/li/libxfce4windowing/package.nix
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index b47923865891..db4afc7a3660 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -19,8 +19,6 @@ makeScopeWithSplicing' {
 
       garcon = callPackage ./core/garcon { };
 
-      libxfce4windowing = callPackage ./core/libxfce4windowing { };
-
       thunar-unwrapped = callPackage ./core/thunar { };
 
       thunar = callPackage ./core/thunar/wrapper.nix { };
@@ -171,6 +169,7 @@ makeScopeWithSplicing' {
   exo = lib.warnOnInstantiate "‘xfce.exo’ was moved to top-level. Please use ‘pkgs.xfce4-exo’ directly" pkgs.xfce4-exo; # Added on 2025-12-23
   libxfce4ui = lib.warnOnInstantiate "‘xfce.libxfce4ui’ was moved to top-level. Please use ‘pkgs.libxfce4ui’ directly" pkgs.libxfce4ui; # Added on 2025-12-23
   libxfce4util = lib.warnOnInstantiate "‘xfce.libxfce4util’ was moved to top-level. Please use ‘pkgs.libxfce4util’ directly" pkgs.libxfce4util; # Added on 2025-12-23
+  libxfce4windowing = lib.warnOnInstantiate "‘xfce.libxfce4windowing’ was moved to top-level. Please use ‘pkgs.libxfce4windowing’ directly" pkgs.libxfce4windowing; # Added on 2025-12-23
   xfce4-dev-tools = lib.warnOnInstantiate "‘xfce.xfce4-dev-tools’ was moved to top-level. Please use ‘pkgs.xfce4-dev-tools’ directly" pkgs.xfce4-dev-tools; # Added on 2025-12-23
   xfconf = lib.warnOnInstantiate "‘xfce.xfconf’ was moved to top-level. Please use ‘pkgs.xfconf’ directly" pkgs.xfconf; # Added on 2025-12-23
 }

From aaf60f73c335a3c43180ec31b816c52efcc17b13 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 23 Dec 2025 22:47:56 +0800
Subject: [PATCH 102/202] garcon: Move to top-level

---
 nixos/modules/services/x11/desktop-managers/xfce.nix           | 2 +-
 .../core/garcon/default.nix => by-name/ga/garcon/package.nix}  | 0
 pkgs/desktops/xfce/default.nix                                 | 3 +--
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename pkgs/{desktops/xfce/core/garcon/default.nix => by-name/ga/garcon/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index b115451e0818..46e5cf358d13 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -130,7 +130,7 @@ in
         xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
 
         xfce4-exo
-        xfce.garcon
+        garcon
         libxfce4ui
 
         xfce.mousepad
diff --git a/pkgs/desktops/xfce/core/garcon/default.nix b/pkgs/by-name/ga/garcon/package.nix
similarity index 100%
rename from pkgs/desktops/xfce/core/garcon/default.nix
rename to pkgs/by-name/ga/garcon/package.nix
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index db4afc7a3660..12989e8332c1 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -17,8 +17,6 @@ makeScopeWithSplicing' {
     {
       #### CORE
 
-      garcon = callPackage ./core/garcon { };
-
       thunar-unwrapped = callPackage ./core/thunar { };
 
       thunar = callPackage ./core/thunar/wrapper.nix { };
@@ -167,6 +165,7 @@ makeScopeWithSplicing' {
 // lib.optionalAttrs config.allowAliases {
   # These aliases need to be placed outside the scope or they will shadow the attributes from parent scope.
   exo = lib.warnOnInstantiate "‘xfce.exo’ was moved to top-level. Please use ‘pkgs.xfce4-exo’ directly" pkgs.xfce4-exo; # Added on 2025-12-23
+  garcon = lib.warnOnInstantiate "‘xfce.garcon’ was moved to top-level. Please use ‘pkgs.garcon’ directly" pkgs.garcon; # Added on 2025-12-23
   libxfce4ui = lib.warnOnInstantiate "‘xfce.libxfce4ui’ was moved to top-level. Please use ‘pkgs.libxfce4ui’ directly" pkgs.libxfce4ui; # Added on 2025-12-23
   libxfce4util = lib.warnOnInstantiate "‘xfce.libxfce4util’ was moved to top-level. Please use ‘pkgs.libxfce4util’ directly" pkgs.libxfce4util; # Added on 2025-12-23
   libxfce4windowing = lib.warnOnInstantiate "‘xfce.libxfce4windowing’ was moved to top-level. Please use ‘pkgs.libxfce4windowing’ directly" pkgs.libxfce4windowing; # Added on 2025-12-23

From db7a3606d45f02816b0f5f39143eafc25d577c6c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 23 Dec 2025 22:54:22 +0800
Subject: [PATCH 103/202] xfce4-panel: Move to top-level

---
 nixos/modules/services/x11/desktop-managers/xfce.nix          | 2 +-
 pkgs/by-name/jg/jgmenu/package.nix                            | 4 ++--
 .../default.nix => by-name/xf/xfce4-panel/package.nix}        | 0
 pkgs/desktops/xfce/default.nix                                | 3 +--
 .../xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix      | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 +---
 6 files changed, 7 insertions(+), 10 deletions(-)
 rename pkgs/{desktops/xfce/core/xfce4-panel/default.nix => by-name/xf/xfce4-panel/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 46e5cf358d13..c40721d7a013 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -160,7 +160,7 @@ in
         xfce.xfwm4-themes
       ]
       ++ lib.optionals (!cfg.noDesktop) [
-        xfce.xfce4-panel
+        xfce4-panel
         xfce.xfdesktop
       ]
       ++ lib.optional cfg.enableScreensaver xfce.xfce4-screensaver
diff --git a/pkgs/by-name/jg/jgmenu/package.nix b/pkgs/by-name/jg/jgmenu/package.nix
index ca8100c20bcf..ce599c2efc51 100644
--- a/pkgs/by-name/jg/jgmenu/package.nix
+++ b/pkgs/by-name/jg/jgmenu/package.nix
@@ -12,7 +12,7 @@
   xorg,
   makeWrapper,
   enableXfcePanelApplet ? false,
-  xfce,
+  xfce4-panel,
   gtk3,
   gitUpdater,
 }:
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   ++ lib.optionals enableXfcePanelApplet [
     gtk3
     libxfce4util
-    xfce.xfce4-panel
+    xfce4-panel
   ];
 
   configureFlags = [
diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/by-name/xf/xfce4-panel/package.nix
similarity index 100%
rename from pkgs/desktops/xfce/core/xfce4-panel/default.nix
rename to pkgs/by-name/xf/xfce4-panel/package.nix
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 12989e8332c1..a232610d7bcb 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -33,8 +33,6 @@ makeScopeWithSplicing' {
 
       tumbler = callPackage ./core/tumbler { };
 
-      xfce4-panel = callPackage ./core/xfce4-panel { };
-
       xfce4-session = callPackage ./core/xfce4-session { };
 
       xfce4-settings = callPackage ./core/xfce4-settings { };
@@ -170,5 +168,6 @@ makeScopeWithSplicing' {
   libxfce4util = lib.warnOnInstantiate "‘xfce.libxfce4util’ was moved to top-level. Please use ‘pkgs.libxfce4util’ directly" pkgs.libxfce4util; # Added on 2025-12-23
   libxfce4windowing = lib.warnOnInstantiate "‘xfce.libxfce4windowing’ was moved to top-level. Please use ‘pkgs.libxfce4windowing’ directly" pkgs.libxfce4windowing; # Added on 2025-12-23
   xfce4-dev-tools = lib.warnOnInstantiate "‘xfce.xfce4-dev-tools’ was moved to top-level. Please use ‘pkgs.xfce4-dev-tools’ directly" pkgs.xfce4-dev-tools; # Added on 2025-12-23
+  xfce4-panel = lib.warnOnInstantiate "‘xfce.xfce4-panel’ was moved to top-level. Please use ‘pkgs.xfce4-panel’ directly" pkgs.xfce4-panel; # Added on 2025-12-23
   xfconf = lib.warnOnInstantiate "‘xfce.xfconf’ was moved to top-level. Please use ‘pkgs.xfconf’ directly" pkgs.xfconf; # Added on 2025-12-23
 }
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
index fd4ece28a56f..cdf9fad0adc6 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix
@@ -10,7 +10,7 @@
   pkg-config,
   python3Packages,
   wrapGAppsHook3,
-  xfce,
+  xfce4-panel,
   xfconf,
 }:
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     keybinder3
     python3Packages.python
-    xfce.xfce4-panel
+    xfce4-panel
     xfconf
   ]
   ++ pythonPath;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6048d076b74c..3b16a60afbfc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12466,9 +12466,7 @@ with pkgs;
     inherit (haskellPackages) ghcWithPackages;
   };
 
-  xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet {
-    inherit (xfce) xfce4-panel;
-  };
+  xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { };
 
   xmonad_log_applet_mate = xmonad_log_applet.override {
     desktopSupport = "mate";

From ef9581e784b702bbf7aca8b944b4e1aa0a115bbb Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 23 Dec 2025 22:57:09 +0800
Subject: [PATCH 104/202] xmonad_log_applet: Move to top-level

---
 .../log-applet => by-name/xm/xmonad_log_applet}/fix-paths.patch | 0
 .../default.nix => by-name/xm/xmonad_log_applet/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/xmonad/log-applet => by-name/xm/xmonad_log_applet}/fix-paths.patch (100%)
 rename pkgs/{applications/window-managers/xmonad/log-applet/default.nix => by-name/xm/xmonad_log_applet/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch b/pkgs/by-name/xm/xmonad_log_applet/fix-paths.patch
similarity index 100%
rename from pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch
rename to pkgs/by-name/xm/xmonad_log_applet/fix-paths.patch
diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/by-name/xm/xmonad_log_applet/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/xmonad/log-applet/default.nix
rename to pkgs/by-name/xm/xmonad_log_applet/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b16a60afbfc..632201b98804 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12466,8 +12466,6 @@ with pkgs;
     inherit (haskellPackages) ghcWithPackages;
   };
 
-  xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { };
-
   xmonad_log_applet_mate = xmonad_log_applet.override {
     desktopSupport = "mate";
   };

From d3fdd7740aa2ce4d4b73315ea9bb0ded0bbb9263 Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Tue, 23 Dec 2025 10:14:45 -0500
Subject: [PATCH 105/202] skeu: drop

---
 pkgs/by-name/sk/skeu/package.nix | 48 --------------------------------
 pkgs/top-level/aliases.nix       |  1 +
 2 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 pkgs/by-name/sk/skeu/package.nix

diff --git a/pkgs/by-name/sk/skeu/package.nix b/pkgs/by-name/sk/skeu/package.nix
deleted file mode 100644
index a49af348a5ab..000000000000
--- a/pkgs/by-name/sk/skeu/package.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  gdk-pixbuf,
-  gtk-engine-murrine,
-  gtk_engines,
-  librsvg,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "skeu";
-  version = "0.5.1";
-
-  src = fetchFromGitHub {
-    owner = "darkomarko42";
-    repo = "skeu";
-    rev = version;
-    sha256 = "0lbl09p0h493ya978fh7cib68qlmxfxahmbj0mpa3b65ynxda645";
-  };
-
-  buildInputs = [
-    gdk-pixbuf
-    gtk_engines
-    librsvg
-  ];
-
-  propagatedUserEnvPkgs = [
-    gtk-engine-murrine
-  ];
-
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/themes
-    cp -a Skeu* $out/share/themes
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "GTK theme with skeuomorphism design";
-    homepage = "https://www.pling.com/p/1363834/";
-    license = lib.licenses.gpl3Only;
-    platforms = lib.platforms.unix;
-    maintainers = [ lib.maintainers.romildo ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 94cb2ff099e1..37df62a88ea7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1484,6 +1484,7 @@ mapAliases {
   siproxd = throw "'siproxd' has been removed as it was unmaintained and incompatible with newer libosip versions"; # Added 2025-05-18
   sipwitch = throw "'sipwitch' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   sisco.lv2 = throw "'sisco.lv2' has been removed as it was unmaintained and broken"; # Added 2025-08-26
+  skeu = throw "'skeu' has been removed as its source is unavailable"; # Added 2025-12-23
   SkypeExport = throw "'skypeexport' was removed since Skype has been shut down in May 2025"; # Added 2025-09-15
   skypeexport = throw "'skypeexport' was removed since Skype has been shut down in May 2025"; # Added 2025-09-15
   sladeUnstable = slade-unstable; # Added 2025-08-26

From d68f8e6d2b1b7d22d015b6e7afe537d5235d5671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 23 Dec 2025 16:50:28 +0100
Subject: [PATCH 106/202] nixos/gnome: enable ibus to fix keyboard handling

GNOME 49 (via GTK4 and Wayland) depends on ibus. Add it to keep having
working dead keys functionality like before.

Fixes https://github.com/nixos/nixpkgs/issues/464473.
---
 nixos/modules/services/desktop-managers/gnome.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix
index 0cc84d435766..dc9f8c11b138 100644
--- a/nixos/modules/services/desktop-managers/gnome.nix
+++ b/nixos/modules/services/desktop-managers/gnome.nix
@@ -320,6 +320,8 @@ in
 
     (lib.mkIf serviceCfg.core-os-services.enable {
       hardware.bluetooth.enable = mkDefault true;
+      i18n.inputMethod.enable = mkDefault true;
+      i18n.inputMethod.type = mkDefault "ibus";
       programs.dconf.enable = true;
       security.polkit.enable = true;
       security.rtkit.enable = mkDefault true;

From fc835d293a5ab75ec36199f2da5de5f120a5dc22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 16:14:31 +0000
Subject: [PATCH 107/202] tutanota-desktop: 315.251204.0 -> 317.251217.0

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

diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
index 07547a27c877..a0b7883b676b 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -8,11 +8,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "tutanota-desktop";
-  version = "315.251204.0";
+  version = "317.251217.0";
 
   src = fetchurl {
     url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
-    hash = "sha256-abXveYT07uLrM5jJb9gd/u+CzhFnFQj2Zcg+AMp+UC4=";
+    hash = "sha256-XvMeH3WPTO1W7B0QhnJjbXz7k9ViJqOHBHxvopuDjSc=";
   };
 
   extraPkgs = pkgs: [ pkgs.libsecret ];

From 19906f1449d23efb6dbc8bc59234bc6ffda0fc00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 16:47:11 +0000
Subject: [PATCH 108/202] podman-tui: 1.9.0 -> 1.10.0

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

diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix
index 42b5c2cb6d13..cea5a5f98f37 100644
--- a/pkgs/by-name/po/podman-tui/package.nix
+++ b/pkgs/by-name/po/podman-tui/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "podman-tui";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vE2GG7lDGORTuziNSoKJWNKGhskcGuEh6U2KHrGu0JQ=";
+    hash = "sha256-Nm0vf+/DfFMFRYrxI48EoIeQZz19LUSJC9260+Vtynk=";
   };
 
   vendorHash = null;

From 3e790fae7666a18986f26364b7ad6a3917691f0e Mon Sep 17 00:00:00 2001
From: pmenke <info@pmenke.de>
Date: Sat, 20 Dec 2025 19:23:47 +0100
Subject: [PATCH 109/202] sdrplay: fix missing udev rules

udev rules were moved from `66-mirics.rules` into `install_lib.sh` in source.

fixes #472729
---
 pkgs/by-name/sd/sdrplay/linux.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sd/sdrplay/linux.nix b/pkgs/by-name/sd/sdrplay/linux.nix
index 1f5393b5df5e..48fc7a86c692 100644
--- a/pkgs/by-name/sd/sdrplay/linux.nix
+++ b/pkgs/by-name/sd/sdrplay/linux.nix
@@ -43,12 +43,13 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    mkdir -p $out/{bin,lib,include}
+    mkdir -p $out/{bin,lib,include,lib/udev/rules.d}
     libName="libsdrplay_api"
     cp "${arch}/$libName.so.$majorMinorVersion" $out/lib/
     ln -s "$out/lib/$libName.so.$majorMinorVersion" "$out/lib/$libName.so.$majorVersion"
     ln -s "$out/lib/$libName.so.$majorVersion" "$out/lib/$libName.so"
     cp "${arch}/sdrplay_apiService" $out/bin/
     cp -r inc/* $out/include/
+    awk 'index($0, "cat > /etc/udev/rules.d/66-sdrplay.rules"){flag=1; next} /EOF/{flag=0} flag' install_lib.sh > $out/lib/udev/rules.d/66-sdrplay.rules
   '';
 }

From aeae91c8b30738ab2d599d7f7193a89b7f112303 Mon Sep 17 00:00:00 2001
From: Samuel Silva <samuel@ossystems.com.br>
Date: Tue, 23 Dec 2025 14:22:23 -0300
Subject: [PATCH 110/202] python3Packages.labgrid: disabled flaky tests

Fixed typo `disabledtests`.

Signed-off-by: Samuel Silva <samuel@ossystems.com.br>
---
 pkgs/development/python-modules/labgrid/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix
index 52cdf89f4e0d..e4bb6ac0eef2 100644
--- a/pkgs/development/python-modules/labgrid/default.nix
+++ b/pkgs/development/python-modules/labgrid/default.nix
@@ -90,9 +90,14 @@ buildPythonPackage rec {
     pytest-dependency
   ];
 
-  disabledtests = [
+  disabledTests = [
     # flaky, timing sensitive
     "test_timing"
+
+    # flaky, depends on ssh connection
+    "test_argument_device_expansion"
+    "test_argument_file_expansion"
+    "test_local_managedfile"
   ];
 
   pytestFlags = [ "--benchmark-disable" ];

From 43ff20f9525e1592aa6a4d876095c50cb251fdb0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 17:51:26 +0000
Subject: [PATCH 111/202] thunderbird-latest-bin-unwrapped: 146.0 -> 146.0.1

---
 .../thunderbird-bin/release_sources.nix       | 530 +++++++++---------
 1 file changed, 265 insertions(+), 265 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 5cda07b97bfc..de04bfb202a0 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,797 +1,797 @@
 {
-  version = "146.0";
+  version = "146.0.1";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/af/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/af/thunderbird-146.0.1.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "0c3dd1da5421b5f10dd89931ba7047e4eef58741d74a257494a3cd53e22ae4bc";
+      sha256 = "d981a255991badddf6267838c55682cb1591c74be50db34e9e0d56b2058dd4c6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/ar/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ar/thunderbird-146.0.1.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "1cee5a171b5f7bf0e1adafd3ca7707691f51e00c34c7e18f32668eec8a4cefa0";
+      sha256 = "90837a1812d292d4262c98003829d3f3dbe5ffa56f3e337c055512ac8ec33f8d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/ast/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ast/thunderbird-146.0.1.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "f5427c36fa432f033159eb367b16f99ba7850533974dd24c2ec1c57dcd1b1cd4";
+      sha256 = "b519195555b63aa6ddccbd63ae1128ff24972a757e41f4f249ba86048101aaf6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/be/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/be/thunderbird-146.0.1.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "85c3769b761a399a22861e641e33a6b45bb347bb1ebb7caca7f2cefa257e9950";
+      sha256 = "71a07d58c038f38bbba3a112bdc817b57a23480db9d4bbcae84cc4dc14ed4771";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/bg/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/bg/thunderbird-146.0.1.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "841e11d745f1586adf367d2127552c5ec7e83e287fbd7a6f8fdb334e92c772fe";
+      sha256 = "c998ab09d84d07127858cecf6c6fc7c33576311d5da08b4588258ab987df70f8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/br/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/br/thunderbird-146.0.1.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "7d89ff5e32aaa88d6194ba6c1a5279874fd32a7fc23b1dd7b5c5f6883a277c59";
+      sha256 = "5a0ef28c481e58cd3eabfa76dc99096ba7a0fb9f78c3a46e99b8f83dde485350";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/ca/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ca/thunderbird-146.0.1.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "a7828e900d598225333525a8a9c81b79e48f2d4f5db22bb5d92fe082d9aa01d7";
+      sha256 = "3cc8bd57ee7b5d1868a792bf0a251343fdf023350a5733cb33230585f150cb51";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/cak/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/cak/thunderbird-146.0.1.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "ee86f9f9270ec5f30c6fd9e150218001dea4b45633128f4b8b075be4480b181f";
+      sha256 = "7acef4083bb55b48f7d8b4e1d8b15012f57d03ed932836e8d84fb890c95faf78";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/cs/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/cs/thunderbird-146.0.1.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "0b441392306f5bc6322d83afcc4a19b224279bcc878fbe0d0c6a3edd6a8a2d42";
+      sha256 = "e9f17a07dabc286859d2647e688b295678c867f558dce96fbb7582797b05d31c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/cy/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/cy/thunderbird-146.0.1.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "eff39f475eb24481411ce3b868616c3a65a074467adacb1650854107f4fe2b78";
+      sha256 = "f8d2c3b43e1e5d4c3811886c644c38dd14cf9a12a4c2fc11634731b098c5fb07";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/da/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/da/thunderbird-146.0.1.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "a2dbcb1e54e40156e27f3c9227a2a040727348af43ebabff0a99f2c5b85506a4";
+      sha256 = "bb4af11735a021a8d643103d6ae467b9b97e08cd9ed5ee955db595c53b68aa7c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/de/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/de/thunderbird-146.0.1.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "d659be8af3f96c7cef1aa5cb362146834fb0cc7da2e49ae0b4eb3cec0dc06677";
+      sha256 = "77e4b6254773701e84d72e6a3d551068838b020dbfbb094509ca0e8fa757ec5e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/dsb/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/dsb/thunderbird-146.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "0085566f037961d07b9ad227bb5a2125113f013f4bf49a97a0ab815b20cdf803";
+      sha256 = "27ac6a7d2979c90ed7c9136ed26a04c2e79f9dcdf6e10e526b0bd01e80654a68";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/el/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/el/thunderbird-146.0.1.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "e6b56151ca574046ddc4ae202e5bbaeca8de15e1584a37dc2dbf98b353b63ad6";
+      sha256 = "393b5336fbe551f562bf57f098dc366ef9c0681f295a22a525776a9f9f7f24f9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/en-CA/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/en-CA/thunderbird-146.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "637943b6e3441518a7b775e1827b7b3bb195eeca2d2695107b28982be3dab885";
+      sha256 = "46aa073e1cafcd9cdec1d0ccba174e855d99e172f90e005b00bea6f6cd4023cc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/en-GB/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/en-GB/thunderbird-146.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "873951ff465dfe937d43d646dc81cc7092b3cafea94fb494ee74ebc09aee7a18";
+      sha256 = "016f6d485ae7af4c2c408fdc347f2c90b07bb6e43f5d3f683b1ced5a45c9752a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/en-US/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/en-US/thunderbird-146.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "4f1def6f7f7b4a5ba130359c65ed169dd12e13411652ab31b92e7ab612524800";
+      sha256 = "d2e49bba5f275e016c4ff775b7405165178e045ab30a721ae041882108a87e33";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/es-AR/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/es-AR/thunderbird-146.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "a04f9f3b629fa4c7e5f14a8936ded1048f741904bf96f4392e92867d2a7c9e3e";
+      sha256 = "2dbb5884243e97a78debb25ec2bc7d4821b17d369c92458607a1939940670599";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/es-ES/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/es-ES/thunderbird-146.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "bda891d776d50c859050a4aac8395601ddf99332fd52bea359aeaeaffe5c97e8";
+      sha256 = "b0d5c2b5574a131bb2e7859204d4765202d82e0b46bffdedd803b6c1246e52b7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/es-MX/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/es-MX/thunderbird-146.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "49c13833877d229a84d938008e3812972073da9c5dcb49e28175cd0a672944fd";
+      sha256 = "5ace903ffacfe0c99307a7257a84ce125a46ef2d59d51637a9f48ae966b006c7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/et/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/et/thunderbird-146.0.1.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "e19cd088af26222423b70925d22f41dc029e0226fa80f128c2c04011a8e4e2ac";
+      sha256 = "975432c045351d6946876cab0bef4ec97fe469b484f913ddc6c379d673436f1f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/eu/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/eu/thunderbird-146.0.1.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "220bfc687b043abc05c272ce1f77b85fd434ed92c6950043df3e29b5a57a8fb1";
+      sha256 = "e91c8c99a617df62e1d3f2fb0063375d28297be8884f4f783c939e55e22d7db3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/fi/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/fi/thunderbird-146.0.1.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "9c86a0c1fc8a83b1caf3bc661168edadad500e4d94758e99df04eeef7d8146a1";
+      sha256 = "bc852f61463e4eea4bc8a85c53eb77b5f995bfa6c6f8008b7e68590742a9935c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/fr/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/fr/thunderbird-146.0.1.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "047e084c5e7d9c0a644de00d4928611b0b9ebc2ef61be9b42fe132497e8ae2b3";
+      sha256 = "efa5c8415081538a0d1b5fdb703db855a5f0d498ac4d5dd016cfd4d17d66ffaf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/fy-NL/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/fy-NL/thunderbird-146.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "768b439104fdc9e088cee0dcd0bf8a737febb2d7043a9817cac5be93213486cb";
+      sha256 = "5f0ba65fe99db544dd61359e48843f6d1900ba891fbd1bab3d60060ff9164c3d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/ga-IE/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ga-IE/thunderbird-146.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "6f29b4939815a285c454ac89c2530fe3198a8fd590f6b3d4e11ea1e29a0da819";
+      sha256 = "6b8a39a6b5344ce667a06186280615ec93ad16675dd0cc93b073113b4508a274";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/gd/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/gd/thunderbird-146.0.1.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "874cfcc05f417b01cf1586cd0cdfaa70ee4a367ef8d9075e9f7f3828fecd50e2";
+      sha256 = "3c337f9609041e97436fd9bb96eb9b0119ebd2c667745064f30a2db1c4bdcb8a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/gl/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/gl/thunderbird-146.0.1.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "ab8c85989f93652ad49e28dda0e344e0ea670020d28826f9dddd06d8dd0006b3";
+      sha256 = "c0855f94bab373ba33d46546a8b15768b8f81c660bbb76a83416059795af02ff";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/he/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/he/thunderbird-146.0.1.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "f7aca5d44ed4987f76a41877663eeb74fb55ebf88600a52fa96b35fc9edaa5e5";
+      sha256 = "d5c458dfa6fd8ff986188a6fcd88c425c8a605b4876401148bc2fb1a461ca4a3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/hr/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/hr/thunderbird-146.0.1.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "4f58e76a4309d13f0e044bcbd9312fbc09992a4d712521780d3e5de81678a1ec";
+      sha256 = "092edaaff1fb539743ce5d17814f64fefb01f94398a47c1c0fa570a6affa707c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/hsb/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/hsb/thunderbird-146.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "9a9ec25a63f7df27fa2dc72e8024b68981eec6ad1ff9f98eae2491b432afb7dc";
+      sha256 = "21638543d1da61e943d88de501c6553de596d7599a9212a4c8b10c446ec61443";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/hu/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/hu/thunderbird-146.0.1.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "35a2e304d23c497e846898d599f847312fce3cd48f4244d8c2d145d74c226299";
+      sha256 = "d4575a6b46fce80568bf53330f16b035f3f467eea976499f672777b791644af7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/hy-AM/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/hy-AM/thunderbird-146.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "5abaccf57e319eed7a859ae368d7cb610245ab45336bd59232092d1f43b347a6";
+      sha256 = "6a8bf0444f480c708bc193394c51a90b91b3bea9e59abd0a7b15c44c82afb7fd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/id/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/id/thunderbird-146.0.1.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "071f61011a257e84aa9380949cad82a47844847587f9a05f8f4a3fd9e2688afe";
+      sha256 = "49a9f95cd9f7a511ef65e1094e6893d16e1f35af98398357a0f8a56ec60cd538";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/is/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/is/thunderbird-146.0.1.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "d2b6733a0aed048b166d3ec002138c3d1367f4f945cf54a91315df9bf3c24d77";
+      sha256 = "6f83c77c77c1a140ada9e38b7f1e6db8e58f48d77a943b3590ac8aa95d1955aa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/it/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/it/thunderbird-146.0.1.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "1d24b3cdbe319552cf55b62ef29996eb01eb8ac80762ce54693bf28a8cdfd10f";
+      sha256 = "f1fce770ce0dacfe003b2c812044b16cd0d819e1eeb5e18cf4346248af08afb5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/ja/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ja/thunderbird-146.0.1.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "47cc0abaf67bf9b65ca895e2629cfdf8cccf36451d37e8384898c18c87c19cb6";
+      sha256 = "5909215ac5239cd223e4b032ae44e41da6d19c162f377bae9bcddf2489f5f742";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/ka/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ka/thunderbird-146.0.1.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "a4d00cd28443834460f16d3c7e3378002cfc0ec63abd36027b92f64c8022d2a1";
+      sha256 = "06b0e91bd58599081569927830c8d63ab74bd2545925111a47d47b4cd5987490";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/kab/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/kab/thunderbird-146.0.1.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "3866c49958a60cadd6a4942c32639fe4da5eb5381600f2dba177265dd77f14fd";
+      sha256 = "3c784c1cd6755fdd232b6ae04f43668dd48aa7d7ea25deeb735f62520247306f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/kk/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/kk/thunderbird-146.0.1.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "c8b1a7afc811cd133b682e674664d3833ad349bf4b085de10722fb3c4e2e6c88";
+      sha256 = "912eedc1f49264dfd7994984a50606b750c89c8056e2967790a4c66d45ce578c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/ko/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ko/thunderbird-146.0.1.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "b56a197a64e9e2e3b0f8a0710e27a92343ee080d91662bf4841c4e1d4d8414f8";
+      sha256 = "c7242bccdf8cc25a137e7939c78cade8bfc9f6c2851860c34e2422d9eab4c321";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/lt/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/lt/thunderbird-146.0.1.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "fddd3c9d6dce06ddc84fd43f69750d9b92a0c6bea8c1dde293be8cf9aabf9737";
+      sha256 = "781b88157bfc9faddcfdc4b25735acfee2660c2b666eb26d238e6cde778de9b1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/lv/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/lv/thunderbird-146.0.1.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "4d2ae9e2f709a636b24438e2bcdadcf8c7ec89c16afc03227d4d9ae54e488391";
+      sha256 = "ce966bd83eb6849e74d2dd653a5980232cb7e704128da78f6a55ece2ccbb1b9d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/ms/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ms/thunderbird-146.0.1.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "1d95a33f45fa01e70d6b19ba02d05615feb3e6175c7ee8a2b08eb0573689e9ea";
+      sha256 = "99f7d4b58d0d473c49ba3c387cd9b24b452688acf77386f49531eea51e131550";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/nb-NO/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/nb-NO/thunderbird-146.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "2c6bfe53697850efe17c03e262bd59eff7f275a17e492872131106d51009639c";
+      sha256 = "b8dd3b1cd37865d368a0cf26ae36855351b6bcd6f7f0d7461d66486a05601105";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/nl/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/nl/thunderbird-146.0.1.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "7c569dc7adc20640cbdfc0c539beea28cf0f8d9ce3ef089cd574540dc9078042";
+      sha256 = "95e42e1e6931ce6fb3b4ffb09e3af2be57a2439408962bf59fc176a5aaa794f1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/nn-NO/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/nn-NO/thunderbird-146.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "e9ae510c88d0d62103e272a06c8c253b04ba384f38b855443c59f7578b1b7c39";
+      sha256 = "b70f5a3a62f91c32e517b94f68473b41c3ddf1a7e981fef193b76654a17969b5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/pa-IN/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/pa-IN/thunderbird-146.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "3c906e43b480d0c7cf875b7d76f5cc68b56d9586b88ac4ac5fd73db632529d62";
+      sha256 = "adda59ed9422f89e2a5fc4f086342ff298d3c4cf99b0cb7c8aa1d3b8a0b2ce4e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/pl/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/pl/thunderbird-146.0.1.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "31f9e3a7d999b40840afa65c9bb378424c1b9bcc86bacb85e1c5c8f7cc163a73";
+      sha256 = "9facc84ad65bee162be8342da0fba929071b2791c531b61562f86e2c65278a0a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/pt-BR/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/pt-BR/thunderbird-146.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "505c5e3cfe0f271d7c2f13892cbb3f3d6aff38ac7edbc25d69d916e99559e3f7";
+      sha256 = "2930e7484e905354e07365368fd6857b217a91207160ad266201c2f5616fc67a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/pt-PT/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/pt-PT/thunderbird-146.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "ff1dca1874c13cba6518255e1e90534e94a9699f26597fea2ddd3f150241f4a7";
+      sha256 = "9560275197fc4f65f576b73c3df213dfda369beb87031c1577a6f68d6ae5b649";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/rm/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/rm/thunderbird-146.0.1.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "08d8d693ad56a38b789a79a03b47f5723d44d7c7581f59c4be7c78de80f585b2";
+      sha256 = "ba4ce786cc17539e994428c40424e524633143f6f2dce340a733365b8a056bd4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/ro/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ro/thunderbird-146.0.1.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "6999241ff292f4e5268969e9e4ead2e3f42b14ef726bdd5308eb238cb0a6281a";
+      sha256 = "995cb37f220dc8c9a637e381c5a9f6e5e62d1f50bf257ed3210770b3502695b6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/ru/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/ru/thunderbird-146.0.1.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "eebf3a31950b1459e1c5f3637f514be8fb4fa3df62241ee0481e7404751a293f";
+      sha256 = "226ed314e80e49e3081d956a953127d30701123e3c630a2b84944d394fe355da";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/sk/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/sk/thunderbird-146.0.1.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "e1504bf092903deb0668957ae8be9ed18ecbe565a0409486abc00adf93de24da";
+      sha256 = "11951db352dce08007ef625c93bf4f4f51f79cfd28650884495b50b4ef48d399";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/sl/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/sl/thunderbird-146.0.1.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "8f1a007bb462bc1cdd38451a39b10a3fa26c0eaf71b1bc337f03928e57f6f176";
+      sha256 = "b4ccccb91ff4929b69e6ed6479518f44fb2c8b346e989c96e29740584ddef3f0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/sq/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/sq/thunderbird-146.0.1.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "32ac231ef6e71953fbdb416c8a3a2d89500621bd001d332b162f752a120c54f8";
+      sha256 = "38cefa80ed52e818b64dc9050bf007a4b1976aed7773a704563d8e1efc7726c2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/sr/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/sr/thunderbird-146.0.1.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "be2f9493c20e55ce96c9e02c2c0f82759b45300e95a114c31e0ba090cf58e71c";
+      sha256 = "4c6c2638d6b81290ccd041df3fc442228eb13d9a9c03d6b3acc4c8afbd6d85a2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/sv-SE/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/sv-SE/thunderbird-146.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "25660c50144647ae8c1e1d3704a7d21a65b2c229f8cb804a7c7055685a628157";
+      sha256 = "41735d81059ead10a333ede3144127542d5c72f0b6b1f48a29ba7e846595cb67";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/th/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/th/thunderbird-146.0.1.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "1393f8fb8ff73d733d8ba46fd3388e33404a8e91939a6a6a27d7a4cc1d09e373";
+      sha256 = "75511f9814d4b37fa8c832a95ea509b1fec0b1767119754db81acd53553b9207";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/tr/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/tr/thunderbird-146.0.1.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "c256e1031b3d45d6aa3c5fde46f46bf432edeb38cd9729c1fc498d8c19fb1227";
+      sha256 = "25a85741204a036692f409a3dca1a98dacf710af86c802d7345a653d35822760";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/uk/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/uk/thunderbird-146.0.1.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "636e3ae7e310cf635affd1a67763364d3ef4200b2d604e51b1ae89425ac6bf17";
+      sha256 = "8d06173389422e607338aa3a22815f2431e59f5e7cb77ca20af9d2d2348af41d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/uz/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/uz/thunderbird-146.0.1.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "ba7f9fccd952699e94db50a08c70e15d2fbae24a1369111bbab84f7ebce9e9e1";
+      sha256 = "18c29c959a5c3a1cde540bde24235810367d9ac596085bd04cfdd101c39f9332";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/vi/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/vi/thunderbird-146.0.1.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "bd9ce768f89c7ebc92c40d4584bbcc08d8533c9427c450313fb933b9fcf399c4";
+      sha256 = "155d9b185772b3d1d08be4d7c88aa03eb6ba1df625b00e16605269a8f4c68d75";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/zh-CN/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/zh-CN/thunderbird-146.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "f51fad61eac37e50d25ed6a4de6d77aa284338debf826dbc60c3ce150e8b27b8";
+      sha256 = "98a2e8be7f9dc3ae8873b12b87374dcd033c3d498c78cb8d0668b4afc246fd72";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/linux-x86_64/zh-TW/thunderbird-146.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/linux-x86_64/zh-TW/thunderbird-146.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "e3bdd687403767f209455852abad066839e571bc03e41a2436a8347bb2c9ad68";
+      sha256 = "b7806eafd1734260e233fb9dd1144a105739d746a0d998e7517adecf3fe7f373";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/af/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/af/Thunderbird%20146.0.1.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "8b7103adcbafa586edd8b93e9ca071773e1b8dbe7299b3266d4f7669c626863f";
+      sha256 = "15ff5f058d558e50a55022a59ff10b06587b09e98e951a4d574260f3ad95b72b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/ar/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ar/Thunderbird%20146.0.1.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "a0cb0ac11737eeb5d87d7240bb5bcf496b22177148ed44dad4c403d7e2e59905";
+      sha256 = "a6b94457a01e227af02b57fc009e2d43145b4899f0d45cecda4927afd5bd9dab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/ast/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ast/Thunderbird%20146.0.1.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "f36847bef915481ad420fa1006a37fe6915bc498f24086508da3dbd13549898d";
+      sha256 = "e37201f38f611b9662a29694a10d8f15e58cde752a19e766bd87dfda535f9df0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/be/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/be/Thunderbird%20146.0.1.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "d5089a1940ea3594008471f8b48a961bcd785e7ba4aa8d53aeaf4533a474642c";
+      sha256 = "a032af69c46654cfd22484a62f25e0ad089fa140b1002389ded4eb35efc93fb4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/bg/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/bg/Thunderbird%20146.0.1.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "83fedc685b1f0072513a66d1212b9eda7881499289fdc7b2abf3bd0d034d75ba";
+      sha256 = "1a052dfb4e89787d8173a6f7dfa4154ea3bba962f03655bc534c8880ba97fd99";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/br/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/br/Thunderbird%20146.0.1.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "49f9d3d7c16a8473bb64358e8db8a8369cc7fafbfe386018f088363ce29d7a5d";
+      sha256 = "e1bc0aa08a50dd8c6c6c2ea1eebd228854bac1a39f5b67f4a1b97f45c2431348";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/ca/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ca/Thunderbird%20146.0.1.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "e613006f1619f6a2c8e63640302b3020ad1f63abc0f316853c31db7f10c4706a";
+      sha256 = "018136e573c9bef83166794f590042d9fd3de2c6ade075e1671f432ba15ebd56";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/cak/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/cak/Thunderbird%20146.0.1.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "0d53146d1e064c3f77f1f6dcb04f2142c3a6e3737b683b1fa8ac74aa8d56eb3a";
+      sha256 = "30da57420e4ef8d32d351df490b324b5fd2c53139ae025713fe80ec89772ed84";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/cs/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/cs/Thunderbird%20146.0.1.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "b51f819d6583054d3af39c283d8ebec5b5250a1c52f8ee9135d58b5ad071f554";
+      sha256 = "38e776c6f0dda6d0e6955c2f9044d7b17141152568d1c08f5641bce015ad9425";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/cy/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/cy/Thunderbird%20146.0.1.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "823e682420d2f9097cfa33cab9715dd23c81b2e8ac0075622efbf8a1b31d54df";
+      sha256 = "d11f1326db344c8f738c9c8e582276ad3a037adc97e1848876d6066096e9d939";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/da/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/da/Thunderbird%20146.0.1.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "ef0663f0bf328efface3350688ee2ed73eb4b802156a67968b85717c75107b04";
+      sha256 = "4a4c49fc3f494921878b0e7761a2f1918089978d535a86395a212a439e6a9567";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/de/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/de/Thunderbird%20146.0.1.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "6a6b5c4c8eeaeca4ad81e471effa41dacf955333719456ab8c823c9995cf9218";
+      sha256 = "39e18093e3473a10564bd79bc3235808258dcdab16107942248b09ee20668342";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/dsb/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/dsb/Thunderbird%20146.0.1.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "907ad551e24d27e3e25c51b13dcee74bcbb64fe4ccac6c365616ea0afae26793";
+      sha256 = "632b8da6324713d7b2f90e3b562c6694da012e09681573adba2166601f0254fe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/el/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/el/Thunderbird%20146.0.1.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "a21cb1f1a93c7405bb0f4378e8721ac871f121301290bf1a4f50b32b5047fdef";
+      sha256 = "65209e444344103e70f00bd8be9322fad56d59cca75d79eb41d49cd1a523fac0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/en-CA/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/en-CA/Thunderbird%20146.0.1.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "4e4ddfb1342d99a6314b4f55be9e68bda7bff04625a0ce1446584ba09d5310d2";
+      sha256 = "d579ba962027732a6f81475e01702a57796d20fa943f6f504e8c55afcde99dbc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/en-GB/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/en-GB/Thunderbird%20146.0.1.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "2b2dc52b7d03130913060c4d21e9a316c9586c928517007be32d0af83d8d4340";
+      sha256 = "e5ee344258ef6d439fb4e7f0ebf205e35011455fc10c7838f0e7d27bee4ce49e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/en-US/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/en-US/Thunderbird%20146.0.1.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "44e0897af5e1a304c67312e817ce1a412c65c8e3b88bfc456c2bbd1524b16ee9";
+      sha256 = "5b729073f032a77589b88f69a032066233a6e0f862b66005de81cee0f2adc601";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/es-AR/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/es-AR/Thunderbird%20146.0.1.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "feac32f5d723b616edc31760d1580640e6194b4c41af986c29bd98497cb3c0dc";
+      sha256 = "fb905803e5f6ed0b6dfa0de701c35bebce1a9e2f8028fb13fcd5d23844a3286c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/es-ES/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/es-ES/Thunderbird%20146.0.1.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "b09594c630d8272a4449dea26202bc714df9545144faad8d1b92b9365b57fe5f";
+      sha256 = "5a492a1703348ab4d7bb7fcd41d4e2ec4f491c6cbc9d26c4d67036174b2aa239";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/es-MX/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/es-MX/Thunderbird%20146.0.1.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "69cd008d9bba78920c01b02b12dbeaa7b96b96590db067c9f8d13f0aa045edc8";
+      sha256 = "82447f466a9e7c54ce4d6b4efcbed1b1a20f61f0000b97776bfca343dec7c516";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/et/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/et/Thunderbird%20146.0.1.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "33794df31ab78c9e841bfc3deffb61af792d634f20f0ff7b501eb4a0624c0fef";
+      sha256 = "33fd3e0f50c75c6444fdf5b2b4cd63b644646b3fd5f8c39c99b40db9c85e2695";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/eu/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/eu/Thunderbird%20146.0.1.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "d4fbe3ba266b72b35bf8d4a7fbd019ee4370156c2ac39c7754a0fa0f382aa1cd";
+      sha256 = "67708d850bcd4573dc45980ffe079e33aae02026b36bd9ce60e3cd94e83364cc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/fi/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/fi/Thunderbird%20146.0.1.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "4a0a0208afb6ab6116e6e4f0e5b275b98394e214b807a2317f83bbf1fbbc3d9b";
+      sha256 = "f18913bd86180a97782614e6af7bd96a8debd25146feb2de321c797416b452c2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/fr/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/fr/Thunderbird%20146.0.1.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "ec1b00de21020e87fd3a40384c16141c9cfc218be074041bb0ec6d570608ec74";
+      sha256 = "e99e5b9bf8ded3d36540b16a5b14d10c5e216388da7126454515c242e0ba66a6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/fy-NL/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/fy-NL/Thunderbird%20146.0.1.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "6b090c3a5e15e5edca700198d880d002f16482f2c47626dea471ab7da1b4028f";
+      sha256 = "0ee6cfbf3668646d8247de610644b2a9f728f9a18cb916f16fb83c767c4e152c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/ga-IE/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ga-IE/Thunderbird%20146.0.1.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "ef45263545109b82692eacfb9ed09f5e1b0ee013397258aaee6e95a47c17b5c7";
+      sha256 = "800c2d3c36289a5b8e05dda9414d7e852b429b9a04f5c75cb8278284beb6d353";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/gd/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/gd/Thunderbird%20146.0.1.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "9e81a33938633232782be27232a21da8cfdf39e4d14c87df25d88a32442fe5b8";
+      sha256 = "ae0b8ec336917f1c90aeb910004079298f9c544c27c354abc8573f2224f39260";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/gl/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/gl/Thunderbird%20146.0.1.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "7074318b1d2fd872c5fdcbdbe8b4a2070883043de03220f851aa45f7da396083";
+      sha256 = "41fdce45c6b91975d42cacd60a76b40d817a2e900428ef94a6160ae571300817";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/he/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/he/Thunderbird%20146.0.1.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "29a1d9a7887707f8f7efa5d0853566fe52e89aa5649c70e936e8c06f1b69fe59";
+      sha256 = "77b284018f5410c89e995a0c0521e67ebe1d212229e1011eeb58e7d4e26a2177";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/hr/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/hr/Thunderbird%20146.0.1.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "1641c69a4cf0080ad098f8eb252e01fdd1e117c78a835eb2bb9be1d9b2c5d4c6";
+      sha256 = "5cf82129d579badc50a69367c1c5087a97ae010076a3d9cd2ca8569236899252";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/hsb/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/hsb/Thunderbird%20146.0.1.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "93e334ea854a3fcaa402e0e4be53d4430113a75c50e1c27f50615225b07ab311";
+      sha256 = "24bb71861c845ae5c5b50d8120d0cb1e6a4b31ff680da12ff7d1248c6df9ec57";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/hu/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/hu/Thunderbird%20146.0.1.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "7bb69e66f25fba1afd6286bf84c51b7ede8129e4cd4269af568bcba9677b91a3";
+      sha256 = "5e74a2fb88cee5b4a85c65e9e2253a3ced22e282ec717981d927c929ea623c7d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/hy-AM/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/hy-AM/Thunderbird%20146.0.1.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "4d46ba3437106f1ce9e58aadaa725fb3cadc5f84c1b767af048b551dc3f799b6";
+      sha256 = "1fa695c7852c0d5ebd032e8525b78ecf4a6b3c607374b7db01adc523ead8c552";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/id/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/id/Thunderbird%20146.0.1.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "5694ea654a9813ca8a7a265c917b58810a57b86521eb3f7d2837df7d2614fa1f";
+      sha256 = "1e2ab777080bb5c86ab40d6b615edad87837f7cf5abe9ca7e568e2497d07615a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/is/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/is/Thunderbird%20146.0.1.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "49d61680532561998c339306e8e4e8e104ee77bfd635e1d8127df3b0820cb193";
+      sha256 = "b16053dee6f778fafc16f77a1e754721b0ade6e457c3372c5d30ed2d2e983f65";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/it/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/it/Thunderbird%20146.0.1.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "cc8ee56b340448ac4920da5a97c50ec7d95a78434f6324e28287f762307535c0";
+      sha256 = "9f248ad96934cdb30c9910cff199d59b1947ccdb77352e9e955d7413dff3af89";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/ja-JP-mac/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ja-JP-mac/Thunderbird%20146.0.1.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "9e2ff529295fd650a6355cada321af19d30f1df04809d3b951df954173ab50d1";
+      sha256 = "25ca0bc952a9c4bf88e67358d1e54ba33960376e65a2adbb0ac3b798e5e835b9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/ka/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ka/Thunderbird%20146.0.1.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "2deb89b12da5e86131c899e49083acec2613da894812ab786c732964c3d5e35c";
+      sha256 = "3c4d61128e3fd194a686db70e0a5ff18afdc5e0e46f35c1c48d948a049f09259";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/kab/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/kab/Thunderbird%20146.0.1.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "854cc06b5eb3ef985db1aaedbd6c58500f72d73789daa4c45ff88cc817800e38";
+      sha256 = "8dc7ce6bfa706b6108d87859154b21ef93a8c22a4aa22930560b50259b29d6b7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/kk/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/kk/Thunderbird%20146.0.1.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "f598c7aaab27afed0b1c4741ac3e8fe042dae2b9b575746aa129b1b1f582caee";
+      sha256 = "86178c30d913830680f7405a0fdcb77a6f98f67a857b6a78fa74331fb81e1deb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/ko/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ko/Thunderbird%20146.0.1.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "0883013c9b8d76b78ac07c6cdfeed3855fc80c984cd51869f6d2c1044ddcc558";
+      sha256 = "ea97b2efcd71481be2bd4851952a18227cfa389fa1bfddb9231cdcdabd5cfb70";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/lt/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/lt/Thunderbird%20146.0.1.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "ab03c4a5c05fea90fd6f3f3b9c877c6c336a2f8077538a99fdd0f542f74256cb";
+      sha256 = "f5eebc6e2e9e281282519944144de083a05ea9a4c48c026a239578455875cfed";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/lv/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/lv/Thunderbird%20146.0.1.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "425076357fbc102c0a834ffc6890ddbe22ff50d6541b234f52a4fd07095ee65d";
+      sha256 = "a80176d6c847e5c3ef6758b62b7c75d3d221f7dead3715f629bdfc9f8193a26d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/ms/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ms/Thunderbird%20146.0.1.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "867750d857718f8e2bef47b3bbb1055ecb1dd7f515b3d6183200e48bd2b043d3";
+      sha256 = "72b01a9a3120dcd44b88ac472a64f97e187a49dd7afb5f125f8582e47481a176";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/nb-NO/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/nb-NO/Thunderbird%20146.0.1.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "1bdef129d25376fc3e5dba550f582eb9162fa8f3ba85c46bd48322717fda3434";
+      sha256 = "f4bb767fcae023e475ef9c3335b494bfc6ac586d2773e586da941fc53d4890cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/nl/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/nl/Thunderbird%20146.0.1.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "4f00ce9513f2ebbdc89d9c320da6426c9a93987c8444292464f3ebdfa650ce42";
+      sha256 = "3fffcf1624fd39242b2538c5a317cdbe164b863fd3814d25fc2983a8a106f0ef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/nn-NO/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/nn-NO/Thunderbird%20146.0.1.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "0f6dcccf5ecdefa2dd9b5e4c1c9d9e5729c67a30d83c10d9349a532562d12ec6";
+      sha256 = "06c2e547367b08a80629d49ce7a9e7bef6d6121d90a0b03fc06960c90f1fb3d5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/pa-IN/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/pa-IN/Thunderbird%20146.0.1.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "a604847b7aa88f5376b7077e0419388041ffa522efdb54d5bbd81b73ee16db01";
+      sha256 = "de82f8e7303170951fef3fdcc807b80ba41b94b5026293147dac6a5a928b746d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/pl/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/pl/Thunderbird%20146.0.1.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "690cbfa356e666c49eec0a80a63d72aee83eb897835f223e0959a58f18cb2354";
+      sha256 = "03ec55112877dc9e34a79fa708a29a957e27b2a5d3e22e1a7f15701f8eacf5be";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/pt-BR/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/pt-BR/Thunderbird%20146.0.1.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "c4cdf33e9fa7eb94511cce423859d11e1d2f2188ffd9918d99777d381b30c017";
+      sha256 = "64549f1a6f26ba880d52e5e540f0bded8cbae1b72cb6bd70709db695dc4f6484";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/pt-PT/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/pt-PT/Thunderbird%20146.0.1.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "f8d52881ea35dd1d8e09f066e4f4aa1c52b69d30010e224b8fe25371b222dcbc";
+      sha256 = "5498cad57f286dfbaed62f3eb494c08763f9c97127283ee8e3a5a4e1517db38e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/rm/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/rm/Thunderbird%20146.0.1.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "63c50ac20f895488b48a61e541b3c83b41ad539b3d4aea21baab743480751e5c";
+      sha256 = "0f7a511c06d197d3699e4d23cc663150c1e117c22521a314f5f61c5907794a66";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/ro/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ro/Thunderbird%20146.0.1.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "f82ca2036e027740c703d3cbf6faa2415431dfa848e5627f8d8c4bf588925a13";
+      sha256 = "7d9c8b56618afad54372e5d44a0df5e9a47a022c45d004cf34126c621bd85535";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/ru/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/ru/Thunderbird%20146.0.1.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "e42537b732a24a243be48c79e32dfa180eadf144a1cd801d7a6c0c7318e7ccbc";
+      sha256 = "a8b065cbcb95a693e939678aff081259d2a073c6fa1c5ff6fd42f3b1209f5bf2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/sk/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/sk/Thunderbird%20146.0.1.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "5aaf29f0e43839bd95fe471b5dedeac17061fda3cd73b1c0ac3aa5cdec9a8f38";
+      sha256 = "2c7d31645950e128e8447bdb268df96f1c47092ee7dbab444381c46eb4bb4715";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/sl/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/sl/Thunderbird%20146.0.1.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "06f7e9c7516e14e8434d7975d3ff923d62e8297220261c4a10981084ae2b9226";
+      sha256 = "3cc4956ac2ce6448656cc0f3377486c0fbbcf20b7e3f39623875a7c7051b56f6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/sq/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/sq/Thunderbird%20146.0.1.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "d2ab2e649f752fc979c7c45d2af20c7d9cc36b234b9774bd5dbccca6c5166a74";
+      sha256 = "8eca9081aafd084cf7b1923cf08062c043664d63edf6136d7274f42eb4a72dcb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/sr/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/sr/Thunderbird%20146.0.1.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "1c7130c8af960c87c69e5dac41aa17c2805680283fe6f26ef6b192a295105406";
+      sha256 = "75105432189c496ba5199ca55c98ad4f0a6deba73e356bc967d2c91a66d1d810";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/sv-SE/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/sv-SE/Thunderbird%20146.0.1.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "c1f82499e1c41c2b5e8a1b696f98cb75b144c97a1f5d5366a644af6476860c88";
+      sha256 = "914037bc2c5f19669f90641d2146cdff64f10c23d977295f5bfd48fb66b77192";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/th/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/th/Thunderbird%20146.0.1.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "80d3b71b0534c6529101c77df5273ab048bde5023f12d03cbb75266b03b1c01b";
+      sha256 = "e4690f6f55d56f0bffb471ff609574e6dfdcc9492f6dd79f2475d9e132f07102";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/tr/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/tr/Thunderbird%20146.0.1.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "5c35cac2ba326ffe2e17a572315e2118bc81e6cf5a32c0199387bbc30e7e0b65";
+      sha256 = "76f878fb5b1175a88a0c3148226c3f21065e3ec7b8fcd6d8614a3ccd0427212d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/uk/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/uk/Thunderbird%20146.0.1.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "861927499d182d41c7c9fb917ba14c780708eedb4afd5567a47c6f91da3b1ee6";
+      sha256 = "1162a9d25cca14d7e198b4dc88d34934397378205511ddc761df9077f0c3946f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/uz/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/uz/Thunderbird%20146.0.1.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "0f6c3ab92741bc63f48cf25d9a45ecf4243feba3ce252f94dbe51536e8ef722a";
+      sha256 = "a00e616bab7f670e58a402e113f949ddbe6de7c4a003b0f2b3dbf76e66e53b4b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/vi/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/vi/Thunderbird%20146.0.1.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "a2fd5343b652fbb83475c08e7d82c29f415da5b1b5b670eaefb7ba00297beda8";
+      sha256 = "71b5df9e7cba580acb587db61a3f49a8c6d25c08a0567988e589ded079c3f44d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/zh-CN/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/zh-CN/Thunderbird%20146.0.1.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "5c54ee49e83c0f264516277439b28b5033a1b7ce63ee0ba9edcc906cf1bccaf8";
+      sha256 = "19635085e3961a365d472d8c1cb82ea5c2cbe2c3df2ce135717951a79bf29836";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0/mac/zh-TW/Thunderbird%20146.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/146.0.1/mac/zh-TW/Thunderbird%20146.0.1.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "a5ed86edd0112c920444827a2fd5d0769bd5bb1a12f0ef0e0bbd042b9337ecb2";
+      sha256 = "e01eaa89e888af9d942504707551fe45c923d00f7be5fa8cbaf64f5bcb775581";
     }
   ];
 }

From cfed7c575340928b91305defce77d891ec3b682b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 18:04:54 +0000
Subject: [PATCH 112/202] libvmi: 0.14.0-unstable-2025-12-14 ->
 0.14.0-unstable-2025-12-17

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

diff --git a/pkgs/by-name/li/libvmi/package.nix b/pkgs/by-name/li/libvmi/package.nix
index aec24a470286..b9fa32d99f22 100644
--- a/pkgs/by-name/li/libvmi/package.nix
+++ b/pkgs/by-name/li/libvmi/package.nix
@@ -24,14 +24,14 @@
 
 let
   pname = "libvmi";
-  version = "0.14.0-unstable-2025-12-14";
+  version = "0.14.0-unstable-2025-12-17";
   libVersion = "0.0.15";
 
   src = fetchFromGitHub {
     owner = "libvmi";
     repo = "libvmi";
-    rev = "b196d72af1c549a494a321a15f725fbd90cd4686";
-    hash = "sha256-JxATmUI/rsWUF/ChavD0lHNNSeblzV5xtG/4BDcJ9T4=";
+    rev = "77a677aa6621927495f1954eded11e601937798b";
+    hash = "sha256-qwZEU41xhY/prgD72CBOKcQ4GqujXeMlUU+NDRJ9U3M=";
   };
 in
 

From c9a827b8fc79988feac432161e293b872ebc0a0c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 18:56:34 +0000
Subject: [PATCH 113/202] python3Packages.langchain-tests: 1.0.2 -> 1.1.1

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

diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix
index e3252f1e7939..6bb4125fba83 100644
--- a/pkgs/development/python-modules/langchain-tests/default.nix
+++ b/pkgs/development/python-modules/langchain-tests/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-tests";
-  version = "1.0.2";
+  version = "1.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-tests==${version}";
-    hash = "sha256-ke/nIvZRtwyeN5uQuqOjJ4KdE+cJOc9XkmDuT+nnZpQ=";
+    hash = "sha256-WJITm+8XIqezr/2U8HpE0J4hYdzg2Z6tw8b5s6SF6m0=";
   };
 
   sourceRoot = "${src.name}/libs/standard-tests";

From 1f2e0b96395335d95e4ac995af6a67f98d24d514 Mon Sep 17 00:00:00 2001
From: luftmensch-luftmensch <valentinobocchetti59@gmail.com>
Date: Tue, 23 Dec 2025 20:02:31 +0100
Subject: [PATCH 114/202] errands: 46.2.9 -> 46.2.10

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

diff --git a/pkgs/by-name/er/errands/package.nix b/pkgs/by-name/er/errands/package.nix
index 410d054f3ac2..b6c9d4842811 100644
--- a/pkgs/by-name/er/errands/package.nix
+++ b/pkgs/by-name/er/errands/package.nix
@@ -18,7 +18,7 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "errands";
-  version = "46.2.9";
+  version = "46.2.10";
 
   pyproject = false;
 
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
     owner = "mrvladus";
     repo = "Errands";
     tag = version;
-    hash = "sha256-+x6zp14leFryxwQJdI0UKPp4N0IuJRIX5/94QrlzDAU=";
+    hash = "sha256-YgKn6tBW1gG6H1zEAzaQjJWzSXh4Na44yZ7lfAnqUFA=";
   };
 
   nativeBuildInputs = [

From 33810348291d426378bd6fb7387904dd84336be8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 20:19:53 +0000
Subject: [PATCH 115/202] LycheeSlicer: 7.5.4 -> 7.5.5

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

diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix
index 4579b29f9d9b..7185edc7935e 100644
--- a/pkgs/by-name/ly/LycheeSlicer/package.nix
+++ b/pkgs/by-name/ly/LycheeSlicer/package.nix
@@ -9,11 +9,11 @@
 }:
 let
   pname = "LycheeSlicer";
-  version = "7.5.4";
+  version = "7.5.5";
 
   src = fetchurl {
     url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage";
-    hash = "sha256-0QP+DOIfvzFd+NmrchXyNVJwGjTxtk8T1lkBqK1RGR0=";
+    hash = "sha256-coPzvcF+kQVkETiKc3AY9tuPvh4vm45LSXi5UCbL9GI=";
   };
 
   desktopItem = makeDesktopItem {

From d27c29c76bfa66bbdb1837def86a34626fe81a72 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 10 Dec 2025 17:05:51 +0000
Subject: [PATCH 116/202] python3Packages.curl-cffi: 0.14.0b2 -> 0.14.0

CHANGELOG: https://github.com/lexiforest/curl_cffi/releases/tag/v0.14.0
DIFF: https://github.com/lexiforest/curl_cffi/compare/v0.14.0b2...v0.14.0
---
 .../python-modules/curl-cffi/default.nix      | 29 ++++---------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix
index 5875f4a29b9b..05ee0ca89e60 100644
--- a/pkgs/development/python-modules/curl-cffi/default.nix
+++ b/pkgs/development/python-modules/curl-cffi/default.nix
@@ -18,40 +18,19 @@
   python-multipart,
   trustme,
   uvicorn,
+  websockets,
   writableTmpDirAsHomeHook,
 }:
-let
-  # This is only used for testing and requires 12.0 specifically
-  # due to incompatible API changes in later versions.
-  websockets = buildPythonPackage rec {
-    pname = "websockets";
-    version = "12.0";
-    pyproject = true;
-
-    src = fetchFromGitHub {
-      owner = "aaugustin";
-      repo = "websockets";
-      tag = version;
-      hash = "sha256-sOL3VI9Ib/PncZs5KN4dAIHOrBc7LfXqT15LO4M6qKg=";
-    };
-
-    build-system = [ setuptools ];
-
-    doCheck = false;
-
-    pythonImportsCheck = [ "websockets" ];
-  };
-in
 buildPythonPackage rec {
   pname = "curl-cffi";
-  version = "0.14.0b2";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lexiforest";
     repo = "curl_cffi";
     tag = "v${version}";
-    hash = "sha256-JXfqZTf26kl2P0OMAw/aTdjQaGtdyTpNnhRPlwMiZNw=";
+    hash = "sha256-5Q9oHAOjefihxj6xU1UGVTl6Ib31XqhrxLtOgI5VABs=";
   };
 
   patches = [ ./use-system-libs.patch ];
@@ -114,6 +93,8 @@ buildPythonPackage rec {
     # FIXME ImpersonateError: Impersonating chrome136 is not supported
     "test_impersonate_without_version"
     "test_with_impersonate"
+    # Impersonating chrome142 is not supported
+    "test_cli"
     # InvalidURL: Invalid URL component 'path'
     "test_update_params"
     # tests access network

From 29a58cd70834aa3d8c49f33985505a407c862d60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 20:57:26 +0000
Subject: [PATCH 117/202] python3Packages.lance-namespace-urllib3-client: 0.3.2
 -> 0.4.0

---
 .../python-modules/lance-namespace-urllib3-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix
index 4598eb5ee540..5c83589693bd 100644
--- a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix
+++ b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "lance-namespace";
-  version = "0.3.2";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance-namespace";
     tag = "v${version}";
-    hash = "sha256-tBInz9BEl6u7E8cAmtlHBqIG65kifPR+iv5/jNV3204=";
+    hash = "sha256-t6VCKG54Sxf92B1OmfXXsWaJww2fyEcMGpJy4z94HZs=";
   };
 
   sourceRoot = "${src.name}/python/lance_namespace_urllib3_client";

From 34aeafef214e60f58fc81835216a7de9bf8bed06 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 20:57:48 +0000
Subject: [PATCH 118/202] coc-rust-analyzer: 0-unstable-2025-12-15 ->
 0-unstable-2025-12-23

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

diff --git a/pkgs/by-name/co/coc-rust-analyzer/package.nix b/pkgs/by-name/co/coc-rust-analyzer/package.nix
index 68bd8a91c9e3..bc6162299386 100644
--- a/pkgs/by-name/co/coc-rust-analyzer/package.nix
+++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage {
   pname = "coc-rust-analyzer";
-  version = "0-unstable-2025-12-15";
+  version = "0-unstable-2025-12-23";
 
   src = fetchFromGitHub {
     owner = "fannheyward";
     repo = "coc-rust-analyzer";
-    rev = "493f10d0537e82d49eb13aba5f9bc4973f92ed2c";
-    hash = "sha256-MmoI4Bu883PNi6t6MBmMbEd+OTcN/dfOfsbJi2EsnzM=";
+    rev = "e64fabb840a35ad1feeedc88b181dd8593c88d8b";
+    hash = "sha256-npAMi7652BUG4coQjkLIcWcSQ4kH+aDwZXsPsLCeZdY=";
   };
 
   npmDepsHash = "sha256-Qksi1G4YeFU94mIccyMpphER9d/UiCOriqbe0w7LA6c=";

From fd6d844f130bf6e17292599f8cc8c989488194c5 Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Tue, 23 Dec 2025 13:19:33 -0800
Subject: [PATCH 119/202] fosrl-gerbil: add water-sucks to maintainers

---
 pkgs/by-name/fo/fosrl-gerbil/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fo/fosrl-gerbil/package.nix b/pkgs/by-name/fo/fosrl-gerbil/package.nix
index dd0e9120a9c9..b3f3ff83116a 100644
--- a/pkgs/by-name/fo/fosrl-gerbil/package.nix
+++ b/pkgs/by-name/fo/fosrl-gerbil/package.nix
@@ -33,6 +33,7 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [
       jackr
       sigmasquadron
+      water-sucks
     ];
     platforms = lib.platforms.linux;
   };

From 19337832c62d9cde49840a3e392859f401e60f0e Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Tue, 23 Dec 2025 13:19:47 -0800
Subject: [PATCH 120/202] fosrl-olm: add water-sucks to maintainers

---
 pkgs/by-name/fo/fosrl-olm/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fo/fosrl-olm/package.nix b/pkgs/by-name/fo/fosrl-olm/package.nix
index 5bf3a2eb27ca..7eb6a0886411 100644
--- a/pkgs/by-name/fo/fosrl-olm/package.nix
+++ b/pkgs/by-name/fo/fosrl-olm/package.nix
@@ -32,6 +32,7 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [
       jackr
       sigmasquadron
+      water-sucks
     ];
     mainProgram = "olm";
   };

From cea85b9f14bd75ab1c082a5db2ca0eaea7c2038f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 21:43:52 +0000
Subject: [PATCH 121/202] python3Packages.dashscope: 1.25.4 -> 1.25.5

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

diff --git a/pkgs/development/python-modules/dashscope/default.nix b/pkgs/development/python-modules/dashscope/default.nix
index 5013d7ca9cf6..68ccb0225d1d 100644
--- a/pkgs/development/python-modules/dashscope/default.nix
+++ b/pkgs/development/python-modules/dashscope/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "dashscope";
-  version = "1.25.4";
+  version = "1.25.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dashscope";
     repo = "dashscope-sdk-python";
     tag = "v${version}";
-    hash = "sha256-Y9L7O+Q0V+Ru1sKDWxa7KntM/fJ3OUBsJQR82qrLFmw=";
+    hash = "sha256-HlztUCtLiDd2XztF3bUR411l1xuynYIErZHyWJUp/co=";
   };
 
   build-system = [ setuptools ];

From 189a637b00f2d8e27e5b90c31e94b93066cd50e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 22:08:47 +0000
Subject: [PATCH 122/202] models-dev: 0-unstable-2025-12-19 ->
 0-unstable-2025-12-23

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

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index 7e5b74980319..8ed8fee1bdbe 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -9,12 +9,12 @@
 }:
 let
   pname = "models-dev";
-  version = "0-unstable-2025-12-19";
+  version = "0-unstable-2025-12-23";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "25a49727b134418f22cfd0c5cabe22d16b588810";
-    hash = "sha256-PYMEs0hFm7XqEwHO0RMuw9/IZFWc1r8cv4Iu8Na+XVw=";
+    rev = "d54bc052ebe97f8fc494e9fbb47a5d6266d20066";
+    hash = "sha256-HiIHiiP2AzMkUtshFBgZJ+wheOO0L+eOn44+C7xzYxA=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 00bd032b28f46897a827624ebc1084129972a332 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 22:09:59 +0000
Subject: [PATCH 123/202] open-policy-agent: 1.9.0 -> 1.12.1

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

diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix
index 1516eaf56a78..2cf17d9bfef0 100644
--- a/pkgs/by-name/op/open-policy-agent/package.nix
+++ b/pkgs/by-name/op/open-policy-agent/package.nix
@@ -14,16 +14,16 @@ assert
 
 buildGoModule (finalAttrs: {
   pname = "open-policy-agent";
-  version = "1.9.0";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VeN62lULKA+4Krd0as2B7LxaA43jcevamYV6S3OxB2o=";
+    hash = "sha256-W3iNyqMiUBz8xRq0kuYAMRW/eRKp1u+FVrHo1fN718E=";
   };
 
-  vendorHash = null;
+  vendorHash = "sha256-vlF4TBjfinaY48UNefXFWbrWenD7eYYYMkByI2M32X8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 93a73d3f4dc4bc6cec1e61ce4689f97ed251ef81 Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Tue, 23 Dec 2025 13:19:58 -0800
Subject: [PATCH 124/202] fosrl-pangolin: add water-sucks to maintainers

---
 nixos/modules/services/networking/pangolin.nix | 1 +
 nixos/tests/pangolin.nix                       | 1 +
 pkgs/by-name/fo/fosrl-pangolin/package.nix     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/nixos/modules/services/networking/pangolin.nix b/nixos/modules/services/networking/pangolin.nix
index fa2ca634138b..8f5b78ec7e11 100644
--- a/nixos/modules/services/networking/pangolin.nix
+++ b/nixos/modules/services/networking/pangolin.nix
@@ -555,5 +555,6 @@ in
   meta.maintainers = with lib.maintainers; [
     jackr
     sigmasquadron
+    water-sucks
   ];
 }
diff --git a/nixos/tests/pangolin.nix b/nixos/tests/pangolin.nix
index 696f3626cd4e..dc69f8116ae1 100644
--- a/nixos/tests/pangolin.nix
+++ b/nixos/tests/pangolin.nix
@@ -16,6 +16,7 @@ in
   meta.maintainers = with lib.maintainers; [
     jackr
     sigmasquadron
+    water-sucks
   ];
 
   # The full test is not yet implemented, but once upstream supports a way to
diff --git a/pkgs/by-name/fo/fosrl-pangolin/package.nix b/pkgs/by-name/fo/fosrl-pangolin/package.nix
index 818f44b685f8..0d9a1aaad83a 100644
--- a/pkgs/by-name/fo/fosrl-pangolin/package.nix
+++ b/pkgs/by-name/fo/fosrl-pangolin/package.nix
@@ -168,6 +168,7 @@ buildNpmPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       jackr
       sigmasquadron
+      water-sucks
     ];
     platforms = lib.platforms.linux;
     mainProgram = "pangolin";

From 3bc2d51765a24667fd50d134a8e3c97828a77636 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 22:39:18 +0000
Subject: [PATCH 125/202] python3Packages.aioqsw: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix
index 08011c184299..015b0603d385 100644
--- a/pkgs/development/python-modules/aioqsw/default.nix
+++ b/pkgs/development/python-modules/aioqsw/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aioqsw";
-  version = "0.4.1";
+  version = "0.4.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.11";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "Noltari";
     repo = "aioqsw";
     tag = version;
-    hash = "sha256-h/rTwMF3lc/hWwpzCvK6UMq0rjq3xkw/tEY3BqOPS2s=";
+    hash = "sha256-SIdEM5YxPnCM6wEJTL19t07Xb89wDAwHzKnz0dKC0tw=";
   };
 
   nativeBuildInputs = [

From 9560a8490da8e4e70e4ded62423c9ca6ea4b69df Mon Sep 17 00:00:00 2001
From: Malix | Alix Brunet <alixbrunetcontact@gmail.com>
Date: Tue, 23 Dec 2025 16:35:33 +0100
Subject: [PATCH 126/202] nixos/nvidia: blacklistedKernelModules add
 `nova_core`

---
 nixos/modules/hardware/video/nvidia.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 0f9dc1fb1bbf..776d4c23f193 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -350,6 +350,7 @@ in
           boot = {
             blacklistedKernelModules = [
               "nouveau"
+              "nova_core"
               "nvidiafb"
             ];
 

From b69a2bc90973a99c989d5c5393515b6a1525ecd1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 23:02:20 +0000
Subject: [PATCH 127/202] python3Packages.nibe: 2.19.0 -> 2.20.0

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

diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix
index 5078046fcfa0..f4b559619fb7 100644
--- a/pkgs/development/python-modules/nibe/default.nix
+++ b/pkgs/development/python-modules/nibe/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "nibe";
-  version = "2.19.0";
+  version = "2.20.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "yozik04";
     repo = "nibe";
     tag = version;
-    hash = "sha256-1Awf/7AUSsLo9O2GrVvdlHm5Fcj2CQ7TdKY152bogfQ=";
+    hash = "sha256-FeYM4UClx0qfv8QuDUBN3hc2MLVkmnnUC6+0wnywAuA=";
   };
 
   pythonRelaxDeps = [ "async-modbus" ];

From 691424f5013f95187aa949771b5a6d3cf91e42a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Dec 2025 23:28:22 +0000
Subject: [PATCH 128/202] ipxe: 1.21.1-unstable-2025-12-15 ->
 1.21.1-unstable-2025-12-22

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

diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix
index 6a9a8148e969..7ff095a8d759 100644
--- a/pkgs/by-name/ip/ipxe/package.nix
+++ b/pkgs/by-name/ip/ipxe/package.nix
@@ -48,7 +48,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ipxe";
-  version = "1.21.1-unstable-2025-12-15";
+  version = "1.21.1-unstable-2025-12-22";
 
   nativeBuildInputs = [
     mtools
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ipxe";
     repo = "ipxe";
-    rev = "3d5cd3d79e8d8adb723e9e560a636947e19114a3";
-    hash = "sha256-6wALX6PtiMxZN164eDZ3ty/QHi42Lg+hm3xkSYSMtYs=";
+    rev = "3832147944209ece35557234102548413ef1b460";
+    hash = "sha256-b65XWsWbMwROEYj3pVgCy6NNTreaQLkAtyCNQZ2xLPs=";
   };
 
   # Calling syslinux on a FAT image isn't going to work on Aarch64.

From 6e9ecb7c3d247cb3189a89af0e3e0fbdf6bdff88 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 23 Dec 2025 23:50:31 +0000
Subject: [PATCH 129/202] python3Packages.lance-namespace: 0.3.2 -> 0.4.0

Diff: https://github.com/lancedb/lance-namespace/compare/v0.3.2...v0.4.0
---
 pkgs/development/python-modules/lance-namespace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lance-namespace/default.nix b/pkgs/development/python-modules/lance-namespace/default.nix
index e57b95a944c1..dacb8e124dc6 100644
--- a/pkgs/development/python-modules/lance-namespace/default.nix
+++ b/pkgs/development/python-modules/lance-namespace/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "lance-namespace";
-  version = "0.3.2";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance-namespace";
     tag = "v${version}";
-    hash = "sha256-tBInz9BEl6u7E8cAmtlHBqIG65kifPR+iv5/jNV3204=";
+    hash = "sha256-t6VCKG54Sxf92B1OmfXXsWaJww2fyEcMGpJy4z94HZs=";
   };
 
   sourceRoot = "${src.name}/python/lance_namespace";

From 4d9594e171e059e54fbabbef114493c2b0499c26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= <stlman@poczta.fm>
Date: Wed, 24 Dec 2025 00:22:28 +0100
Subject: [PATCH 130/202] linux/common-config: select
 RUST_FW_LOADER_ABSTRACTIONS only with Rust

Rust may not be available for i686 and the counfigration would fail.

Fixes: 6b6c8b140268 ("linux/common-config: explicitly select RUST_FW_LOADER_ABSTRACTIONS for now")
---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 28e640404ba1..4c5b100fe3d5 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -564,7 +564,7 @@ let
 
         # Required for Nova
         # FIXME: remove after https://gitlab.freedesktop.org/drm/rust/kernel/-/commit/3d3352e73a55a4ccf110f8b3419bbe2fbfd8a030 lands
-        RUST_FW_LOADER_ABSTRACTIONS = whenAtLeast "6.12" yes;
+        RUST_FW_LOADER_ABSTRACTIONS = lib.mkIf withRust (whenAtLeast "6.12" yes);
       }
       //
         lib.optionalAttrs

From ce6c3ddb770200966310e52b7408c763ca7a3305 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 00:38:16 +0000
Subject: [PATCH 131/202] matrix-conduit: 0.10.9 -> 0.10.10

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

diff --git a/pkgs/by-name/ma/matrix-conduit/package.nix b/pkgs/by-name/ma/matrix-conduit/package.nix
index 5cc269af4c56..2ebbe05c03fc 100644
--- a/pkgs/by-name/ma/matrix-conduit/package.nix
+++ b/pkgs/by-name/ma/matrix-conduit/package.nix
@@ -12,13 +12,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-conduit";
-  version = "0.10.9";
+  version = "0.10.10";
 
   src = fetchFromGitLab {
     owner = "famedly";
     repo = "conduit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rJyuR8Ie/JiNKNjQL21+Q1PWliEAm+lwGraGeDxEHyY=";
+    hash = "sha256-n2k5SDzxafO+nqc0NhX/6GfSPsF9e/qO9aA7VWqSLuk=";
   };
 
   patches = [
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ./fix_validate_event_fields_for_invites_over_federation.patch
   ];
 
-  cargoHash = "sha256-4ZA+3f8Kt+1JAm9KXnMRxAF+X9z8HSJoJe6Ny63SlnA=";
+  cargoHash = "sha256-WprzCSm0O9Cav9WbikeNV5ZMqxlCY4qez03n0lu5KI8=";
 
   # Conduit enables rusqlite's bundled feature by default, but we'd rather use our copy of SQLite.
   preBuild = ''

From 3fd9ab3220dc4b23e17a9dd36924d18eb74fb5ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 00:38:54 +0000
Subject: [PATCH 132/202] python3Packages.leanblueprint: 0.0.19 -> 0.0.20

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

diff --git a/pkgs/development/python-modules/leanblueprint/default.nix b/pkgs/development/python-modules/leanblueprint/default.nix
index 5a43d2388946..21ed95a96115 100644
--- a/pkgs/development/python-modules/leanblueprint/default.nix
+++ b/pkgs/development/python-modules/leanblueprint/default.nix
@@ -19,14 +19,14 @@
 }:
 buildPythonPackage {
   pname = "leanblueprint";
-  version = "0.0.19";
+  version = "0.0.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     repo = "leanblueprint";
     owner = "PatrickMassot";
-    rev = "v0.0.19";
-    hash = "sha256-WARjzalYMvbw5IlhehRX+Na5aEmgM3HKy+s0x3GJNCY=";
+    rev = "v0.0.20";
+    hash = "sha256-jCNIf0pTO/7M4aLrbFyjGcTPmaIQnw32itKJdyCMn+g=";
   };
 
   build-system = [ setuptools ];

From e4ec76a0389c6bfcc5aaeadbf683d883b3c171aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 00:43:26 +0000
Subject: [PATCH 133/202] python3Packages.elasticsearch8: 8.19.2 -> 8.19.3

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

diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix
index 2ca5b6155b4d..c7f39a2a5f96 100644
--- a/pkgs/development/python-modules/elasticsearch8/default.nix
+++ b/pkgs/development/python-modules/elasticsearch8/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "elasticsearch8";
-  version = "8.19.2";
+  version = "8.19.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lDfI5RI8JgtZdmGDv9kVIGdyVChJtpf3inlEbsiQqA4=";
+    hash = "sha256-fv/pWzYCQbbVbvaCGQN6kK0PVnI2FNtUu+V9MwWEAvQ=";
   };
 
   build-system = [ hatchling ];

From 192ac6ac34b3f905d60e4135973d04553fe06982 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 23 Dec 2025 20:17:39 -0500
Subject: [PATCH 134/202] Revert "nixos/nixos-generate-config: fix intel-npu
 imports"

---
 .../installer/tools/nixos-generate-config.pl        | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index bbd0a093b998..77139976e7ad 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -205,15 +205,10 @@ sub pciCheck {
         ($device eq "0x4229" || $device eq "0x4230" ||
          $device eq "0x4222" || $device eq "0x4227");
 
-    # Intel NPU driver
-    # list taken from linux(v6.18): drivers/accel/ivpu/ivpu_drv.h
-    if ($vendor eq "0x8086" &&
-        ($device eq "0xfd3e" || $device eq "0x7d1d" || $device eq "0xad1d" ||
-         $device eq "0x643e" || $device eq "0xb03e"))
-    {
-        push @imports, "(modulesPath + \"/hardware/cpu/intel-npu.nix\")";
-        push @attrs, "hardware.cpu.intel.npu.enable = true;";
-    }
+    push @attrs, "hardware.cpu.intel.npu.enable = true;" if
+        $vendor eq "0x8086" &&
+        ($device eq "0x7d1d" || $device eq "0xad1d" ||
+         $device eq "0x643e" || $device eq "0xb03e");
 
     # Assume that all NVIDIA cards are supported by the NVIDIA driver.
     # There may be exceptions (e.g. old cards).

From e8d9e1d828b1b345b4b6ebd48141f70409b4a296 Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Tue, 23 Dec 2025 21:48:08 -0330
Subject: [PATCH 135/202] mslicer: fix startup on X11

---
 pkgs/by-name/ms/mslicer/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/ms/mslicer/package.nix b/pkgs/by-name/ms/mslicer/package.nix
index ff428aad600b..dde4bd56edaf 100644
--- a/pkgs/by-name/ms/mslicer/package.nix
+++ b/pkgs/by-name/ms/mslicer/package.nix
@@ -7,6 +7,7 @@
   rustPlatform,
   vulkan-loader,
   wayland,
+  xorg,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -27,17 +28,27 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libxkbcommon
     vulkan-loader
     wayland
+    xorg.libXcursor
+    xorg.libXrandr
+    xorg.libXi
+    xorg.libX11
   ];
 
   # Force linking to libEGL, which is always dlopen()ed, and to
   # libwayland-client & libxkbcommon, which is dlopen()ed based on the
   # winit backend.
   NIX_LDFLAGS = [
+    "--push-state"
     "--no-as-needed"
     "-lEGL"
     "-lvulkan"
     "-lwayland-client"
     "-lxkbcommon"
+    "-lX11"
+    "-lXcursor"
+    "-lXrandr"
+    "-lXi"
+    "--pop-state"
   ];
 
   strictDeps = true;

From 761ee1ccc114dd0329269b8af5ee2f5468350378 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 02:09:11 +0000
Subject: [PATCH 136/202] python3Packages.django-axes: 8.0.0 -> 8.1.0

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

diff --git a/pkgs/development/python-modules/django-axes/default.nix b/pkgs/development/python-modules/django-axes/default.nix
index 9fe5294ae069..05e498df22e6 100644
--- a/pkgs/development/python-modules/django-axes/default.nix
+++ b/pkgs/development/python-modules/django-axes/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "django-axes";
-  version = "8.0.0";
+  version = "8.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = "django-axes";
     tag = version;
-    hash = "sha256-RV2/s372+yjSqYAqikH0VOJKt7fRAej32sgdOoKR/Do=";
+    hash = "sha256-yiXj0Wmn9AVKDilmGVTIE+MICmKeO76j2P6jtlt5CFY=";
   };
 
   build-system = [ setuptools-scm ];

From 18d2bcef8042ef5d1af94349537df6931650c181 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 30 Nov 2025 17:25:19 -0500
Subject: [PATCH 137/202] osmtogeojson: regnerate lockfile, run tests

Fixes CVE-2022-39353, CVE-2024-4068, and 6 other security issues with dependencies.
---
 .../by-name/os/osmtogeojson/package-lock.json | 229 ++++++++----------
 pkgs/by-name/os/osmtogeojson/package.nix      |  26 +-
 2 files changed, 132 insertions(+), 123 deletions(-)

diff --git a/pkgs/by-name/os/osmtogeojson/package-lock.json b/pkgs/by-name/os/osmtogeojson/package-lock.json
index 92979c78b203..294e62c0fa78 100644
--- a/pkgs/by-name/os/osmtogeojson/package-lock.json
+++ b/pkgs/by-name/os/osmtogeojson/package-lock.json
@@ -10,7 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@mapbox/geojson-rewind": "0.5.2",
-        "@xmldom/xmldom": "0.8.3",
+        "@xmldom/xmldom": "^0.8.10",
         "concat-stream": "2.0.0",
         "geojson-numeric": "0.2.1",
         "htmlparser2": "3.5.1",
@@ -26,7 +26,7 @@
         "expect.js": "~0.2.0",
         "faucet": "~0.0.1",
         "istanbul": "^0.4.5",
-        "mocha": "~10.1.0",
+        "mocha": "^10.1.0",
         "tape": "~5.6.1"
       },
       "engines": {
@@ -55,9 +55,10 @@
       "optional": true
     },
     "node_modules/@xmldom/xmldom": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.3.tgz",
-      "integrity": "sha512-Lv2vySXypg4nfa51LY1nU8yDAGo/5YwF+EY/rUZgIbfvwVARcd67ttCM8SMsTeJy51YhHYavEq+FS6R0hW9PFQ==",
+      "version": "0.8.11",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.11.tgz",
+      "integrity": "sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==",
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       }
@@ -79,10 +80,11 @@
       }
     },
     "node_modules/ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -300,22 +302,24 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -482,12 +486,13 @@
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -498,12 +503,6 @@
         }
       }
     },
-    "node_modules/debug/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
     "node_modules/decamelize": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
@@ -576,10 +575,11 @@
       }
     },
     "node_modules/diff": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
+      "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
       }
@@ -888,10 +888,11 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -1490,6 +1491,7 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -1689,10 +1691,11 @@
       }
     },
     "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -1811,32 +1814,32 @@
       }
     },
     "node_modules/mocha": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz",
-      "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==",
+      "version": "10.8.2",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz",
+      "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.3",
-        "debug": "4.3.4",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.2.0",
-        "he": "1.2.0",
-        "js-yaml": "4.1.0",
-        "log-symbols": "4.1.0",
-        "minimatch": "5.0.1",
-        "ms": "2.1.3",
-        "nanoid": "3.3.3",
-        "serialize-javascript": "6.0.0",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "workerpool": "6.2.1",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
+        "ansi-colors": "^4.1.3",
+        "browser-stdout": "^1.3.1",
+        "chokidar": "^3.5.3",
+        "debug": "^4.3.5",
+        "diff": "^5.2.0",
+        "escape-string-regexp": "^4.0.0",
+        "find-up": "^5.0.0",
+        "glob": "^8.1.0",
+        "he": "^1.2.0",
+        "js-yaml": "^4.1.0",
+        "log-symbols": "^4.1.0",
+        "minimatch": "^5.1.6",
+        "ms": "^2.1.3",
+        "serialize-javascript": "^6.0.2",
+        "strip-json-comments": "^3.1.1",
+        "supports-color": "^8.1.1",
+        "workerpool": "^6.5.1",
+        "yargs": "^16.2.0",
+        "yargs-parser": "^20.2.9",
+        "yargs-unparser": "^2.0.0"
       },
       "bin": {
         "_mocha": "bin/_mocha",
@@ -1844,10 +1847,6 @@
       },
       "engines": {
         "node": ">= 14.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mochajs"
       }
     },
     "node_modules/mocha/node_modules/argparse": {
@@ -1856,38 +1855,37 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
-    "node_modules/mocha/node_modules/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+    "node_modules/mocha/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/mocha/node_modules/glob": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/mocha/node_modules/glob/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/mocha/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -1898,10 +1896,11 @@
       }
     },
     "node_modules/mocha/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -1910,10 +1909,11 @@
       }
     },
     "node_modules/mocha/node_modules/minimatch": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -1921,15 +1921,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/mocha/node_modules/minimatch/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "node_modules/mocha/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -1951,18 +1942,6 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
-    "node_modules/nanoid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
-      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
-      "dev": true,
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
@@ -2218,6 +2197,7 @@
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -2336,10 +2316,11 @@
       }
     },
     "node_modules/serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -2704,6 +2685,7 @@
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -2839,10 +2821,11 @@
       }
     },
     "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2854,10 +2837,11 @@
       "dev": true
     },
     "node_modules/workerpool": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
-      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
-      "dev": true
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
+      "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==",
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
@@ -2928,10 +2912,11 @@
       }
     },
     "node_modules/yargs-parser": {
-      "version": "20.2.4",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-      "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
diff --git a/pkgs/by-name/os/osmtogeojson/package.nix b/pkgs/by-name/os/osmtogeojson/package.nix
index 9939dbf87974..ddca9e272ac1 100644
--- a/pkgs/by-name/os/osmtogeojson/package.nix
+++ b/pkgs/by-name/os/osmtogeojson/package.nix
@@ -2,6 +2,8 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
+  fetchpatch,
+  nodePackages,
 }:
 
 buildNpmPackage rec {
@@ -15,13 +17,35 @@ buildNpmPackage rec {
     hash = "sha256-T6d/KQQGoXHgV0iNhOms8d9zfjYMfnBNwPLShrEkHG4=";
   };
 
+  patches = [
+    # Fix critical xmldom security issue
+    # Se https://github.com/tyrasd/osmtogeojson/pull/146
+    (fetchpatch {
+      url = "https://github.com/tyrasd/osmtogeojson/commit/536ce2e9cfc3987b7596216223ce40dfbc9603e9.patch";
+      hash = "sha256-+LRithLPalcTROoJXGim7S10rxlnLxfH5mvn0dkFKIo=";
+    })
+  ];
+
   postPatch = ''
     cp ${./package-lock.json} ./package-lock.json
+    # Fix 3 moderate-severity vulnerabilities
+    substituteInPlace package.json --replace-fail '"mocha": "~10.1.0",' '"mocha": "^10.1.0",'
   '';
 
-  npmDepsHash = "sha256-stAVuyjuRQthQ3jQdekmZYjeau9l0GzEEMkV1q5fT2k=";
+  npmDepsHash = "sha256-tjdws4+xIEFa67bfAumewaYjGjjGbTJOiXbcTp/285U=";
   dontNpmBuild = true;
 
+  # "browserify: command not found"
+  nativeBuildInputs = [ nodePackages.browserify ];
+  postBuild = "patchShebangs osmtogeojson";
+
+  doCheck = true;
+  checkPhase = ''
+    runHook preCheck
+    npm run test
+    runHook postCheck
+  '';
+
   meta = {
     description = "Converts OSM data to GeoJSON";
     homepage = "https://tyrasd.github.io/osmtogeojson/";

From 1a34e84586f01a4a2d0e9e8e79ba142720599fe2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 02:32:27 +0000
Subject: [PATCH 138/202] pkgsite: 0-unstable-2025-12-15 ->
 0-unstable-2025-12-23

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

diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index 6dfc66220b0f..5c4562bfa15d 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0-unstable-2025-12-15";
+  version = "0-unstable-2025-12-23";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "4eb0af2c34bf5ae5d7e04cc47cd8f7b6269ef079";
-    hash = "sha256-BpNB8wrb3vR5NXAxwRfrQjwcSllWB1YlQJU25OlS8Hw=";
+    rev = "1a3bd3c788fea11057a8e696fd274c4c3f3e952c";
+    hash = "sha256-GnjzJhmH9mOBdpc+r3Hco0KFsTp4LMkbTn/oMBthemQ=";
   };
 
   vendorHash = "sha256-6wgJNDzUzSCkwzjqGwzpa63+0HoN5PapKxMBFBuu16M=";

From 4b160fddf8046b8d8b2f8bba40995e0cbee8b3db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 02:35:35 +0000
Subject: [PATCH 139/202] ec2-instance-selector: 3.1.2 -> 3.1.3

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

diff --git a/pkgs/by-name/ec/ec2-instance-selector/package.nix b/pkgs/by-name/ec/ec2-instance-selector/package.nix
index 626d370f14e1..58f72da2ba03 100644
--- a/pkgs/by-name/ec/ec2-instance-selector/package.nix
+++ b/pkgs/by-name/ec/ec2-instance-selector/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "ec2-instance-selector";
-  version = "3.1.2";
+  version = "3.1.3";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-ec2-instance-selector";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8tSZkh2ngOgfwup2nCiNXHFX2GhIVVW9PtLuGNP5yoo=";
+    hash = "sha256-lsd0ahIpN8l3qpXofA7Rjlg0f0J+GJtFiPAvo/wy6Mw=";
   };
 
   vendorHash = "sha256-qrxYLnj8DEGNtIq6sC7xvNBLgguG/lj9YLqgLFumQtE=";

From cd657b2094ac6d4dd6ded1b15cebf7146106821d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 02:58:29 +0000
Subject: [PATCH 140/202] python3Packages.fastcore: 1.9.2 -> 1.9.5

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

diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix
index 448a05333f71..94af8a7b0800 100644
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.9.2";
+  version = "1.9.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fastai";
     repo = "fastcore";
     tag = version;
-    hash = "sha256-78zqQ8M0XZ6QcaH+6gw4IJDLk9d1WxjPiCr6puY/srM=";
+    hash = "sha256-7CnnvID4BCI53zrpXqaCu1ii+ZIE15BCbZGXtcfFkC0=";
   };
 
   build-system = [ setuptools ];

From 7fba494b6fddc1226265ac45399736dc595bc8f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 03:22:34 +0000
Subject: [PATCH 141/202] python3Packages.falconpy: 1.5.4 -> 1.5.5

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

diff --git a/pkgs/development/python-modules/falconpy/default.nix b/pkgs/development/python-modules/falconpy/default.nix
index 2526df18b003..79b3d37470ba 100644
--- a/pkgs/development/python-modules/falconpy/default.nix
+++ b/pkgs/development/python-modules/falconpy/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "falconpy";
-  version = "1.5.4";
+  version = "1.5.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CrowdStrike";
     repo = "falconpy";
     tag = "v${version}";
-    hash = "sha256-m/pW9M2HXTtu42UIOCq7J1lr+y9mc3N74lD+qaCjaVE=";
+    hash = "sha256-/ofAp4Hh+gj+2FSwQUI33OIo2iSBoOkbL9gB2F59YHw=";
   };
 
   build-system = [ hatchling ];

From 17d46ab6add870604bae5fd9910904cf83fd46ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 03:31:18 +0000
Subject: [PATCH 142/202] androidStudioPackages.canary: 2025.2.3.5 ->
 2025.3.1.1

---
 pkgs/applications/editors/android-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index f7ac5d8cf7be..cb1d0a38f813 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -24,8 +24,8 @@ let
     sha256Hash = "sha256-ciu+To5Kcus8FPDz1D43AD+qOqfPHaW4JsEBr9fx2PE=";
   };
   latestVersion = {
-    version = "2025.2.3.5"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 Canary 5"
-    sha256Hash = "sha256-gqJXOO7kW4orfsfCn5xOqLSpGu5apH4MpDhLAuOAG5w=";
+    version = "2025.3.1.1"; # "Android Studio Panda 1 | 2025.3.1 Canary 1"
+    sha256Hash = "sha256-hCWt8wMxqA4So/oZL6RzRRY3Kg6vAYr9xDAzQ/5ZXow=";
   };
 in
 {

From e91fa5f815517b075ca4d0fa04504ca7ad415d02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 03:53:46 +0000
Subject: [PATCH 143/202] direwolf-unstable: 1.8.1-unstable-2025-11-30 ->
 1.8.1-unstable-2025-12-19

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

diff --git a/pkgs/by-name/di/direwolf-unstable/package.nix b/pkgs/by-name/di/direwolf-unstable/package.nix
index e13ad6262ad4..697f30bdcedb 100644
--- a/pkgs/by-name/di/direwolf-unstable/package.nix
+++ b/pkgs/by-name/di/direwolf-unstable/package.nix
@@ -12,13 +12,13 @@
   inherit hamlibSupport gpsdSupport extraScripts;
 }).overrideAttrs
   (oldAttrs: {
-    version = "1.8.1-unstable-2025-11-30";
+    version = "1.8.1-unstable-2025-12-19";
 
     src = fetchFromGitHub {
       owner = "wb2osz";
       repo = "direwolf";
-      rev = "c8319fcc7b7d8311ed7b42537ec82650ec48275b";
-      hash = "sha256-yl6aogu9BsHEiUUdd+k031QoWQxTxGa/+qcNTF92J1s=";
+      rev = "1924999dbd24ce155aff69fec76cee35ad478bdd";
+      hash = "sha256-Q9mYeDQHaMNez1oQHaQTfjU/AxAKhpB98UcmaNujMjA=";
     };
 
     # drop upstreamed cmake-4 patch

From 02f42fd3defd8450b8895c921be4ecacb865a6f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 04:24:15 +0000
Subject: [PATCH 144/202] python3Packages.aiodocker: 0.24.0 -> 0.25.0

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

diff --git a/pkgs/development/python-modules/aiodocker/default.nix b/pkgs/development/python-modules/aiodocker/default.nix
index 7380b62f4869..db1bf4cea30a 100644
--- a/pkgs/development/python-modules/aiodocker/default.nix
+++ b/pkgs/development/python-modules/aiodocker/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "aiodocker";
-  version = "0.24.0";
+  version = "0.25.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiodocker";
     tag = "v${version}";
-    hash = "sha256-qCOAM4ZyJoLc91FjQpBO97Nyfo1ZOEi0nhXZ7nwLsHk=";
+    hash = "sha256-SaPTMpMljAh/6Km/JrbEjAOm30gBHH2QBkj7At/BTBA=";
   };
 
   build-system = [

From 637a71f143b8793eb8e0f5e0172c7e5d046f414e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 04:29:43 +0000
Subject: [PATCH 145/202] terraform-providers.vultr_vultr: 2.27.1 -> 2.28.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index cf7428f8e18d..4c658e393993 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1481,13 +1481,13 @@
     "vendorHash": "sha256-rUYHapEVqRupLOPVbcAH8YP0cuXclMmYTQUkqeOwCN0="
   },
   "vultr_vultr": {
-    "hash": "sha256-Vxp8Uv6W6nKGvypPAvlY+TI5O77How79c7xBTJWg/5Q=",
+    "hash": "sha256-ezTWMaM06z1LLBgNqRYlT/SIyw3Vv3x8NFXkY4j5D3Q=",
     "homepage": "https://registry.terraform.io/providers/vultr/vultr",
     "owner": "vultr",
     "repo": "terraform-provider-vultr",
-    "rev": "v2.27.1",
+    "rev": "v2.28.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-OoIlSsR8vbS15TfZvPP+RBDjPvD7Jzr2CpgMk76s6R8="
+    "vendorHash": "sha256-8vYTNSjEwalDsS77UUVw7u2K3bbK4HM3yiUR3Ppi79I="
   },
   "wgebis_mailgun": {
     "hash": "sha256-W+cvYNwsa5T6ZIPeEVbO9ogdZurwDPOKUwJfPXNKSqg=",

From c67620b0cd73a5120012d858890f8382f18a3fb8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 04:45:28 +0000
Subject: [PATCH 146/202] qownnotes: 25.12.6 -> 25.12.7

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

diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index d35528ad13c1..79ff104b6bf9 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -19,11 +19,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "25.12.6";
+  version = "25.12.7";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-zlTyh0D7FXB4LDGQXi4Hb8WeujaM7F7hoO9TccZfzFg=";
+    hash = "sha256-C05YNT6BfrWMuzph8DxNnc5eu2b3nqj06bzWqEWm0hU=";
   };
 
   nativeBuildInputs = [

From 6d87475b70fb3c39afe2ddc2d81e42230c9fb3a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 05:36:12 +0000
Subject: [PATCH 147/202] terraform-providers.bpg_proxmox: 0.89.1 -> 0.90.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index cf7428f8e18d..ffa2d0566607 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -110,11 +110,11 @@
     "vendorHash": null
   },
   "bpg_proxmox": {
-    "hash": "sha256-bla9DS+5nxS2F2LAxUlPQstSUe9aDd1MShbs8sXpeo8=",
+    "hash": "sha256-S4GJqoUkqGNe3oZ0pwPR08+qkG5f2RiReVBU+UHkfFw=",
     "homepage": "https://registry.terraform.io/providers/bpg/proxmox",
     "owner": "bpg",
     "repo": "terraform-provider-proxmox",
-    "rev": "v0.89.1",
+    "rev": "v0.90.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-Vcp/AvcBz7wO8k89c1u3WGjhl0iuNMbWRAOIbEGXhbw="
   },

From 2634c36b6616be240efa9c5f06b6ff1ad3224199 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 05:41:16 +0000
Subject: [PATCH 148/202] anubis: 1.23.1 -> 1.24.0

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

diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index eb12f2b5b96f..faf678b6df56 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -15,21 +15,21 @@
 
 buildGoModule (finalAttrs: {
   pname = "anubis";
-  version = "1.23.1";
+  version = "1.24.0";
 
   src = fetchFromGitHub {
     owner = "TecharoHQ";
     repo = "anubis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nE6LXB0+q313UatT3f4Cn/hbTxc4mSMHQnUm0xzTuvE=";
+    hash = "sha256-CZpQT3Uu0TNC4ra9f+OZWfovOJ+xFyumomETc10fOGA=";
   };
 
-  vendorHash = "sha256-45SQUDvTX2xc8jJ8NXerbqRkQhBv6xyOPypJQf+tExU=";
+  vendorHash = "sha256-9CMD8Rn4q8b+hyrph+BqqS32ijZyJRNsop6ML7z5Zuk=";
 
   npmDeps = fetchNpmDeps {
     name = "anubis-npm-deps";
     inherit (finalAttrs) src;
-    hash = "sha256-zlJD/Mv39bUHx+q+QSXpYWhELvbk7MCNWXLWcB4SP2A=";
+    hash = "sha256-wozZu00ir7V3mO6BLBamaxhI5fTdWgXQK+xGvr3T1gU=";
   };
 
   nativeBuildInputs = [

From 077cb274dfe6dfea4bcdccb17343194eb04d06e8 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 24 Dec 2025 05:59:18 +0000
Subject: [PATCH 149/202] gpsd: 3.27 -> 3.27.2

Changes: https://gitlab.com/gpsd/gpsd/-/blob/release-3.27.2/NEWS
---
 pkgs/by-name/gp/gpsd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gp/gpsd/package.nix b/pkgs/by-name/gp/gpsd/package.nix
index 99de18c531dd..32273a388b1b 100644
--- a/pkgs/by-name/gp/gpsd/package.nix
+++ b/pkgs/by-name/gp/gpsd/package.nix
@@ -35,11 +35,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gpsd";
-  version = "3.27";
+  version = "3.27.2";
 
   src = fetchurl {
     url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-YZUpLdeRC+aMtwGNRRZig+rv0/nbl3P81umnjUnqyZk=";
+    sha256 = "sha256-67Zu2SAYt5zsiO+2DjWllpJe70ZQLPA9b/CupjbudGE=";
   };
 
   # TODO: render & install HTML documentation using asciidoctor

From f06a701c80c94768d724d758f2b3f17537f1fa52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 06:33:30 +0000
Subject: [PATCH 150/202] python3Packages.garth: 0.5.19 -> 0.5.20

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

diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix
index 6f8f4c71c07a..6d1dbe25da26 100644
--- a/pkgs/development/python-modules/garth/default.nix
+++ b/pkgs/development/python-modules/garth/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "garth";
-  version = "0.5.19";
+  version = "0.5.20";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-no9qxDtk6k5YXOEwFfwPJb4EylQRKOGorVIgvhwd4dY=";
+    hash = "sha256-dqn/SeLQMT+6XOr65hlavZf1zdHnICKm9VCFh9DMLpk=";
   };
 
   pythonRelaxDeps = [ "requests-oauthlib" ];

From 188a2a323dedf73a7d4b5305cee55d18cec84544 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 06:52:12 +0000
Subject: [PATCH 151/202] htb-toolkit: 0-unstable-2025-08-12 ->
 0-unstable-2025-12-19

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

diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix
index f778fc1a2074..3087e66da289 100644
--- a/pkgs/by-name/ht/htb-toolkit/package.nix
+++ b/pkgs/by-name/ht/htb-toolkit/package.nix
@@ -16,14 +16,14 @@
 
 rustPlatform.buildRustPackage {
   pname = "htb-toolkit";
-  version = "0-unstable-2025-08-12";
+  version = "0-unstable-2025-12-19";
 
   src = fetchFromGitHub {
     owner = "D3vil0p3r";
     repo = "htb-toolkit";
     # https://github.com/D3vil0p3r/htb-toolkit/issues/3
-    rev = "60996a88fbd5e8aeab78005e754ef37d95ffdba4";
-    hash = "sha256-u+IigAs/W0lzp9kCW43TkjHTIrPCkGdmva6tesQq/Pk=";
+    rev = "4f1c6bded11d8c907c951fcbe63f1fc44568a9f9";
+    hash = "sha256-pkZ5KVSgtrWfXhJ3knmyOIArIjyAjMmm5WcrrB2pCKY=";
   };
 
   cargoHash = "sha256-ReEe8pyW66GXIPwAy6IKsFEAUjxHmzw5mj21i/h4quQ=";

From c66415a8944c77edbd797d53fe058138900d5985 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 07:10:47 +0000
Subject: [PATCH 152/202] python3Packages.dbt-protos: 1.0.412 -> 1.0.413

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

diff --git a/pkgs/development/python-modules/dbt-protos/default.nix b/pkgs/development/python-modules/dbt-protos/default.nix
index 425cd0b8f6cd..e868e99e6708 100644
--- a/pkgs/development/python-modules/dbt-protos/default.nix
+++ b/pkgs/development/python-modules/dbt-protos/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "dbt-protos";
-  version = "1.0.412";
+  version = "1.0.413";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dbt-labs";
     repo = "proto-python-public";
     tag = "v${version}";
-    hash = "sha256-Q9Pki95OaQKpBJn423/2DBLXHUWjpgOqTpJX3ASeXKs=";
+    hash = "sha256-WY8q06FyZliwdbIcLZPzpEpdxG6AeK+6EQU4bm8e4EE=";
   };
 
   build-system = [

From fb498a5341df94596f75ce24743e16474bc8f221 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 24 Dec 2025 10:19:05 +0300
Subject: [PATCH 153/202] wireplumber: 0.5.12 -> 0.5.13

Diff: https://gitlab.freedesktop.org/pipewire/wireplumber/-/compare/0.5.12...0.5.13
---
 pkgs/development/libraries/pipewire/wireplumber.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix
index c1af7a05a943..f091ff12e618 100644
--- a/pkgs/development/libraries/pipewire/wireplumber.nix
+++ b/pkgs/development/libraries/pipewire/wireplumber.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation rec {
   pname = "wireplumber";
-  version = "0.5.12";
+  version = "0.5.13";
 
   outputs = [
     "out"
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     owner = "pipewire";
     repo = "wireplumber";
     rev = version;
-    hash = "sha256-3LdERBiPXal+OF7tgguJcVXrqycBSmD3psFzn4z5krY=";
+    hash = "sha256-iQpMT01mRroaA48spA11zdb47L5AcVmigE4nJuJRaUo=";
   };
 
   nativeBuildInputs = [

From fa4926a0c2a9acc6a7d58bcd2393d2de76ad7d5a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 07:19:40 +0000
Subject: [PATCH 154/202] zerofs: 0.22.6 -> 0.22.8

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

diff --git a/pkgs/by-name/ze/zerofs/package.nix b/pkgs/by-name/ze/zerofs/package.nix
index 7ff464578ee3..93a0ddfdc521 100644
--- a/pkgs/by-name/ze/zerofs/package.nix
+++ b/pkgs/by-name/ze/zerofs/package.nix
@@ -11,18 +11,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zerofs";
-  version = "0.22.6";
+  version = "0.22.8";
 
   src = fetchFromGitHub {
     owner = "Barre";
     repo = "ZeroFS";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6kXdifgRfYWT9/bSyxTekdh2CT+Mqu13oO/cGM1b1qk=";
+    hash = "sha256-YasJ72o/jTgYG9soYbOJpwdzs6I63gaJg4P2sgjwfnQ=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/zerofs";
 
-  cargoHash = "sha256-OsuHhOQJFcigd57HEinwIvOjIaXv0X7/RjJLbY0D0eA=";
+  cargoHash = "sha256-0RgChmyqtvqBdmhLfbtOfLJpAmsPHzBfS483TFFboDw=";
 
   nativeBuildInputs = [ cmake ];
 

From bef2986729d95d0530c58e8729a675781abf5008 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 2 Dec 2025 13:27:58 +0200
Subject: [PATCH 155/202] python3.pkgs.beets: allow to override passthru

---
 .../python-modules/beets/default.nix          | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix
index 250f1ea62d72..47216bc93116 100644
--- a/pkgs/development/python-modules/beets/default.nix
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -145,7 +145,7 @@ buildPythonPackage rec {
     typing-extensions
     lap
   ]
-  ++ (lib.concatMap (p: p.propagatedBuildInputs) (lib.attrValues passthru.plugins.enabled));
+  ++ (lib.concatMap (p: p.propagatedBuildInputs) (lib.attrValues beets.passthru.plugins.enabled));
 
   nativeBuildInputs = [
     gobject-introspection
@@ -186,7 +186,7 @@ buildPythonPackage rec {
   makeWrapperArgs = [
     "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
     "--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\""
-    "--prefix PATH : ${lib.makeBinPath passthru.plugins.wrapperBins}"
+    "--prefix PATH : ${lib.makeBinPath beets.passthru.plugins.wrapperBins}"
   ];
 
   nativeCheckInputs = [
@@ -199,12 +199,12 @@ buildPythonPackage rec {
     pillow
     writableTmpDirAsHomeHook
   ]
-  ++ passthru.plugins.wrapperBins;
+  ++ beets.passthru.plugins.wrapperBins;
 
   __darwinAllowLocalNetworking = true;
 
   disabledTestPaths =
-    passthru.plugins.disabledTestPaths
+    beets.passthru.plugins.disabledTestPaths
     ++ [
       # touches network
       "test/plugins/test_aura.py"
@@ -246,14 +246,14 @@ buildPythonPackage rec {
       \( -name '*.py' -o -path 'beetsplug/*/__init__.py' \) -print \
       | sed -n -re 's|^beetsplug/([^/.]+).*|\1|p' \
       | sort -u > plugins_available
-    ${diffPlugins (lib.attrNames passthru.plugins.builtins) "plugins_available"}
+    ${diffPlugins (lib.attrNames beets.passthru.plugins.builtins) "plugins_available"}
 
     export BEETS_TEST_SHELL="${lib.getExe bashInteractive} --norc"
 
     env EDITOR="${writeScript "beetconfig.sh" ''
       #!${runtimeShell}
       cat > "$1" <<CFG
-      plugins: ${lib.concatStringsSep " " (lib.attrNames passthru.plugins.enabled)}
+      plugins: ${lib.concatStringsSep " " (lib.attrNames beets.passthru.plugins.enabled)}
       CFG
     ''}" "$out/bin/beet" config -e
     env EDITOR=true "$out/bin/beet" config -e
@@ -433,10 +433,10 @@ buildPythonPackage rec {
           testPaths = [ ];
         };
       };
-      base = lib.mapAttrs (_: a: { builtin = true; } // a) passthru.plugins.builtins;
+      base = lib.mapAttrs (_: a: { builtin = true; } // a) beets.passthru.plugins.builtins;
       overrides = lib.mapAttrs (
         plugName:
-        lib.throwIf (passthru.plugins.builtins.${plugName}.deprecated or false)
+        lib.throwIf (beets.passthru.plugins.builtins.${plugName}.deprecated or false)
           "beets evaluation error: Plugin ${plugName} was enabled in pluginOverrides, but it has been removed. Remove the override to fix evaluation."
       ) pluginOverrides;
       all = lib.mapAttrs (
@@ -450,13 +450,13 @@ buildPythonPackage rec {
           wrapperBins = [ ];
         }
         // a
-      ) (lib.recursiveUpdate passthru.plugins.base passthru.plugins.overrides);
-      enabled = lib.filterAttrs (_: p: p.enable) passthru.plugins.all;
-      disabled = lib.filterAttrs (_: p: !p.enable) passthru.plugins.all;
+      ) (lib.recursiveUpdate beets.passthru.plugins.base beets.passthru.plugins.overrides);
+      enabled = lib.filterAttrs (_: p: p.enable) beets.passthru.plugins.all;
+      disabled = lib.filterAttrs (_: p: !p.enable) beets.passthru.plugins.all;
       disabledTestPaths = lib.flatten (
-        lib.attrValues (lib.mapAttrs (_: v: v.testPaths) passthru.plugins.disabled)
+        lib.attrValues (lib.mapAttrs (_: v: v.testPaths) beets.passthru.plugins.disabled)
       );
-      wrapperBins = lib.concatMap (p: p.wrapperBins) (lib.attrValues passthru.plugins.enabled);
+      wrapperBins = lib.concatMap (p: p.wrapperBins) (lib.attrValues beets.passthru.plugins.enabled);
     };
     tests = {
       gstreamer =

From 23b24be9a4f9c8fb84ed4111337ebf5269c2e9ab Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 2 Dec 2025 19:10:31 +0200
Subject: [PATCH 156/202] python3.pkgs.beets: use `let in` for version

---
 pkgs/development/python-modules/beets/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix
index 47216bc93116..a390d64fe7f6 100644
--- a/pkgs/development/python-modules/beets/default.nix
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -106,7 +106,16 @@
   runCommand,
 }:
 
-buildPythonPackage rec {
+let
+  # Avoid using `rec`, so that using e.g `passthru` or any other attributes
+  # defined inside, will have to be done via the beets argument, which can be
+  # overriden. Until `finalAttrs` support reaches `buildPythonPackage`, there
+  # is no way to avoid this. See:
+  #
+  # https://github.com/NixOS/nixpkgs/issues/258246
+  version = "2.5.1";
+in
+buildPythonPackage {
   pname = "beets";
   version = "2.5.1";
   src = fetchFromGitHub {

From 809d433fcfc168362426098044d0144a3640030d Mon Sep 17 00:00:00 2001
From: Jia Jia <35106942+mathjiajia@users.noreply.github.com>
Date: Mon, 1 Dec 2025 00:21:34 +0800
Subject: [PATCH 157/202] vimPlugins.lean-nvim: remove nvim-lspconfig from
 dependencies

---
 pkgs/applications/editors/vim/plugins/overrides.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 477947f3bf35..7500119d0a5e 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1641,7 +1641,6 @@ assertNoAdditions {
 
   lean-nvim = super.lean-nvim.overrideAttrs {
     dependencies = with self; [
-      nvim-lspconfig
       plenary-nvim
     ];
   };

From 79319994853951b7d3f803f93820c49a002f81ce Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Thu, 4 Dec 2025 09:52:18 +0100
Subject: [PATCH 158/202] quark-goldleaf: 1.0.0 -> 1.2.0

Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
 pkgs/by-name/qu/quark-goldleaf/package.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/qu/quark-goldleaf/package.nix b/pkgs/by-name/qu/quark-goldleaf/package.nix
index 454c94976905..e523a7f68a4b 100644
--- a/pkgs/by-name/qu/quark-goldleaf/package.nix
+++ b/pkgs/by-name/qu/quark-goldleaf/package.nix
@@ -3,7 +3,6 @@
   jdk,
   maven,
   fetchFromGitHub,
-  fetchpatch,
   makeDesktopItem,
   copyDesktopItems,
   imagemagick,
@@ -17,13 +16,13 @@ let
 in
 maven.buildMavenPackage rec {
   pname = "quark-goldleaf";
-  version = "1.0.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "XorTroll";
     repo = "Goldleaf";
-    rev = version;
-    hash = "sha256-gagIQGOiygJ0Onm0SrkbFWaovqWX2WJNx7LpSRheCLM=";
+    tag = version;
+    hash = "sha256-ldGNtNmn7ln53JvxRkP1AMPslKH0JtSPhBkyqytSx20=";
   };
 
   sourceRoot = "${src.name}/Quark";
@@ -31,12 +30,6 @@ maven.buildMavenPackage rec {
   patches = [
     ./fix-maven-plugin-versions.patch
     ./remove-pom-jfx.patch
-    (fetchpatch {
-      name = "fix-config-path.patch";
-      url = "https://github.com/XorTroll/Goldleaf/commit/714ecc2755df9c1252615ad02cafff9c0311a739.patch";
-      hash = "sha256-4j+6uLIOdltZ4XIb3OtOzZg9ReH9660gZMMNQpHnn4o=";
-      relative = "Quark";
-    })
   ];
 
   mvnJdk = jdk';
@@ -115,7 +108,7 @@ maven.buildMavenPackage rec {
 
       or by adding the package manually to udev packages:
 
-      `services.udev.packages = [ pkgs.quark-goldleaf ];
+      `services.udev.packages = [ pkgs.quark-goldleaf ];`
     '';
     license = lib.licenses.gpl3Only;
     mainProgram = "quark-goldleaf";

From 1fc29393b958c7ba4c69b82cc00b1785e97968d1 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 24 Dec 2025 09:38:21 +0100
Subject: [PATCH 159/202] fclones: cleanup

---
 pkgs/by-name/fc/fclones/package.nix | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fc/fclones/package.nix b/pkgs/by-name/fc/fclones/package.nix
index bead4c5d5288..a3dfe702b57e 100644
--- a/pkgs/by-name/fc/fclones/package.nix
+++ b/pkgs/by-name/fc/fclones/package.nix
@@ -4,16 +4,18 @@
   fetchFromGitHub,
   stdenv,
   installShellFiles,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "fclones";
   version = "0.35.0";
 
   src = fetchFromGitHub {
     owner = "pkolaczk";
-    repo = pname;
-    rev = "v${version}";
+    repo = "fclones";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-OCRfJh6vfAkL86J1GuLgfs57from3fx0NS1Bh1+/oXE=";
   };
 
@@ -38,14 +40,24 @@ rustPlatform.buildRustPackage rec {
       --zsh <(fclones complete zsh)
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Efficient Duplicate File Finder and Remover";
     homepage = "https://github.com/pkolaczk/fclones";
-    changelog = "https://github.com/pkolaczk/fclones/releases/tag/${src.rev}";
+    changelog = "https://github.com/pkolaczk/fclones/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       cyounkins
     ];
     mainProgram = "fclones";
   };
-}
+})

From 763a1c948ac4f2f79b0858bafefe60127e245523 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 08:47:25 +0000
Subject: [PATCH 160/202] cherry-studio: 1.7.4 -> 1.7.6

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

diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index 238f6cbc4283..f6ad82ec27b8 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cherry-studio";
-  version = "1.7.4";
+  version = "1.7.6";
 
   src = fetchFromGitHub {
     owner = "CherryHQ";
     repo = "cherry-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qoPDQks1OkiWrl6f0zG+BQf7r/DzbyoadlRIsqMuzbo=";
+    hash = "sha256-RxvdGeIHXdrAg0RAYrzvR5D1Siin9me7BmQNddO3iCs=";
   };
 
   postPatch = ''
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-86+bVj77Uo2IaDcKM3igd2rrNEQxpUYfwKDOwLnqceg=";
+    hash = "sha256-3j49i1HlqpYaOQeagB8D/RgcwVMa66fEp7c5GCP45nI=";
   };
 
   nativeBuildInputs = [

From 627cec58a8ef30738338643ccd8a75507eb3adc7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 09:12:35 +0000
Subject: [PATCH 161/202] llama-cpp: 7445 -> 7527

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 5047b1a9aa63..7b9178f65744 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -74,13 +74,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "7445";
+  version = "7527";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-oHQtfGu1altWwHUl4z2ApLVp8ISfd+l9t+k5NqtbWgA=";
+    hash = "sha256-Nl4l812wZvqZs1Y7HOAf2g9zXLY4EwvfxX+So0tdT0U=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From 395eff3e311b36fd1bd784d072e0f024deb6b2f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 09:46:30 +0000
Subject: [PATCH 162/202] fluent-bit: 4.2.0 -> 4.2.2

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

diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix
index b9fedb2941ef..c0cfc17edf14 100644
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fluent-bit";
-  version = "4.2.0";
+  version = "4.2.2";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/38eKwKEmDGJfZxcsnqrcb7OZoNxWgc+R+t3SRqktZY=";
+    hash = "sha256-BYaJ76iX969SLxCUMyIRbHnVt5/N+wjMMvsqxFmLqUI=";
   };
 
   # The source build documentation covers some dependencies and CMake options.

From a772721da00be196b2213a6abcccf6c99db74b39 Mon Sep 17 00:00:00 2001
From: Varun Narravula <varun@snare.dev>
Date: Tue, 23 Dec 2025 17:52:27 -0800
Subject: [PATCH 163/202] pangolin-cli: init at 0.2.0

---
 pkgs/by-name/pa/pangolin-cli/package.nix      | 55 +++++++++++++++
 .../use-tagged-newt-and-olm.patch             | 70 +++++++++++++++++++
 2 files changed, 125 insertions(+)
 create mode 100644 pkgs/by-name/pa/pangolin-cli/package.nix
 create mode 100644 pkgs/by-name/pa/pangolin-cli/use-tagged-newt-and-olm.patch

diff --git a/pkgs/by-name/pa/pangolin-cli/package.nix b/pkgs/by-name/pa/pangolin-cli/package.nix
new file mode 100644
index 000000000000..a9783b4107d1
--- /dev/null
+++ b/pkgs/by-name/pa/pangolin-cli/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "pangolin-cli";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "fosrl";
+    repo = "cli";
+    tag = finalAttrs.version;
+    hash = "sha256-NR8GaOtFjOk6LLTdtDw6Nu691B76bPwllA2EOPSaM94=";
+  };
+
+  patches = [ ./use-tagged-newt-and-olm.patch ];
+
+  vendorHash = "sha256-7LPnmbrIgWV5p4KCHfVVljRvadtZfg2FwLWIE/m3pi4=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    mv $out/bin/cli $out/bin/pangolin
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd pangolin \
+      --bash <($out/bin/pangolin completion bash) \
+      --fish <($out/bin/pangolin completion fish) \
+      --zsh <($out/bin/pangolin completion zsh)
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckKeepEnvironment = [ "HOME" ];
+  versionCheckProgramArg = "version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Pangolin CLI tool and VPN client";
+    homepage = "https://github.com/fosrl/cli";
+    changelog = "https://github.com/fosrl/cli/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
+      water-sucks
+    ];
+    mainProgram = "pangolin";
+  };
+})
diff --git a/pkgs/by-name/pa/pangolin-cli/use-tagged-newt-and-olm.patch b/pkgs/by-name/pa/pangolin-cli/use-tagged-newt-and-olm.patch
new file mode 100644
index 000000000000..14bba945ded8
--- /dev/null
+++ b/pkgs/by-name/pa/pangolin-cli/use-tagged-newt-and-olm.patch
@@ -0,0 +1,70 @@
+commit f251229d0eed13b7863bac74c1a88dd45d94d3c5
+Author: Varun Narravula <varun@snare.dev>
+Date:   Tue Dec 23 15:00:11 2025 -0800
+
+    chore(deps): pin olm and newt to upstream tags
+
+diff --git a/go.mod b/go.mod
+index 4635ea0..5d58e09 100644
+--- a/go.mod
++++ b/go.mod
+@@ -7,11 +7,10 @@ require (
+ 	github.com/charmbracelet/bubbletea v1.3.6
+ 	github.com/charmbracelet/huh v0.8.0
+ 	github.com/charmbracelet/lipgloss v1.1.0
+-	github.com/fosrl/newt v0.0.0
+-	github.com/fosrl/olm v0.0.0
++	github.com/fosrl/newt v1.8.0
++	github.com/fosrl/olm v1.3.0
+ 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
+ 	github.com/spf13/cobra v1.10.1
+-	github.com/spf13/pflag v1.0.10
+ 	github.com/spf13/viper v1.21.0
+ )
+ 
+@@ -51,6 +50,7 @@ require (
+ 	github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
+ 	github.com/spf13/afero v1.15.0 // indirect
+ 	github.com/spf13/cast v1.10.0 // indirect
++	github.com/spf13/pflag v1.0.10 // indirect
+ 	github.com/subosito/gotenv v1.6.0 // indirect
+ 	github.com/vishvananda/netlink v1.3.1 // indirect
+ 	github.com/vishvananda/netns v0.0.5 // indirect
+@@ -74,6 +74,8 @@ require (
+ 	software.sslmate.com/src/go-pkcs12 v0.6.0 // indirect
+ )
+ 
+-replace github.com/fosrl/olm v0.0.0 => ../olm
+-
+-replace github.com/fosrl/newt v0.0.0 => ../newt
++// If changes to Olm or Newt are required, use these
++// replace directives during development.
++//
++// replace github.com/fosrl/olm => ../olm
++// replace github.com/fosrl/newt => ../newt
+diff --git a/go.sum b/go.sum
+index b4118da..de27625 100644
+--- a/go.sum
++++ b/go.sum
+@@ -50,6 +50,10 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
+ github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+ github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
+ github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
++github.com/fosrl/newt v1.8.0 h1:wIRCO2shhCpkFzsbNbb4g2LC7mPzIpp2ialNveBMJy4=
++github.com/fosrl/newt v1.8.0/go.mod h1:pol958CEs0nQmo/35Ltv0CGksheIKCS2hoNvdTVLEcI=
++github.com/fosrl/olm v1.3.0 h1:eYNFqcvTn5u8aujy4lIUDta8W3j09p91WkMcDWCp/VA=
++github.com/fosrl/olm v1.3.0/go.mod h1:FZ0L5GufoIOyZ00/49g8LKtkknodJkhM+icW5gOFdiw=
+ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+ github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+ github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+@@ -60,8 +64,8 @@ github.com/godbus/dbus/v5 v5.2.0 h1:3WexO+U+yg9T70v9FdHr9kCxYlazaAXUhx2VMkbfax8=
+ github.com/godbus/dbus/v5 v5.2.0/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
+ github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
+ github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
+-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
++github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
++github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+ github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=

From 06a3aaa51cf280a73ab5dec7d791d2064a770db1 Mon Sep 17 00:00:00 2001
From: Stzx <silence.m@hotmail.com>
Date: Sun, 14 Dec 2025 12:54:01 +0800
Subject: [PATCH 164/202] udpspeeder: fix crash

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

diff --git a/pkgs/by-name/ud/udpspeeder/package.nix b/pkgs/by-name/ud/udpspeeder/package.nix
index c1be213d7195..1d1f08631254 100644
--- a/pkgs/by-name/ud/udpspeeder/package.nix
+++ b/pkgs/by-name/ud/udpspeeder/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  cmake,
   versionCheckHook,
   nix-update-script,
 }:
@@ -18,15 +17,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-hrwkPSxY1DTEXt9vxDECDEJaoTDzBUS7rVI609uZwdU=";
   };
 
-  preBuild = ''
-    echo "const char *gitversion = \"${finalAttrs.version}\";" > git_version.h # From Makefile
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$PWD"
+  postPatch = ''
+    substituteInPlace makefile \
+      --replace-fail " -static " " " \
+      --replace-fail "\$(shell git rev-parse HEAD)" ${finalAttrs.version}
   '';
 
-  nativeBuildInputs = [
-    cmake
-  ];
-
   installPhase = ''
     runHook preInstall
 

From e80537b82bffbf5acefa92eeb7d367ccf69a5db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= <stlman@poczta.fm>
Date: Wed, 24 Dec 2025 02:02:14 +0100
Subject: [PATCH 165/202] linux/common-config: choose between HIGHMEM4G and
 HIGHMEM64G

The documentation[1] referred in the commit 39f89dc647b0
("linux/common-config: fix crash kernel on i686") applies to kernel
versions 6.15 and newer, where HIGHMEM64G has been removed by the upstream
commit bbeb69ce3013[2].

Thus, while for kernels older than both options are correct with regards
to kdump functions, only one can be selected because the options are
part of "choice".

[1] https://github.com/torvalds/linux/blob/ee94b00c1a648530333d9734200be7a45e6e00cd/Documentation/admin-guide/kdump/kdump.rst#dump-capture-kernel-config-options-arch-dependent-i386-and-x86_64

[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bbeb69ce301323e84f1677484eb8e4cd8fb1f9f8

Fixes: 39f89dc647b0 ("linux/common-config: fix crash kernel on i686")
---
 pkgs/os-specific/linux/kernel/common-config.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 28e640404ba1..6c0546285fd0 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -111,7 +111,9 @@ let
 
       # Enable crashkernel support
       PROC_VMCORE = yes;
-      HIGHMEM4G = lib.mkIf (stdenv.hostPlatform.isx86 && stdenv.hostPlatform.is32bit) yes;
+      HIGHMEM4G = lib.mkIf (stdenv.hostPlatform.isx86 && stdenv.hostPlatform.is32bit) (
+        whenAtLeast "6.15" yes
+      );
 
       # Track memory leaks and performance issues related to allocations.
       MEM_ALLOC_PROFILING = whenAtLeast "6.10" yes;
@@ -954,7 +956,7 @@ let
       KSM = yes;
       VIRT_DRIVERS = yes;
       # We need 64 GB (PAE) support for Xen guest support
-      HIGHMEM64G = {
+      HIGHMEM64G = whenOlder "6.15" {
         optional = true;
         tristate = lib.mkIf (!stdenv.hostPlatform.is64bit) "y";
       };

From 14c11c8ca591be1c160e274a2707eefe9eeca18d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 24 Dec 2025 11:06:48 +0000
Subject: [PATCH 166/202] aws-cdk-cli.tests: fix the eval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change the eval fails on `master` as:

    $ nix build --no-link -f. aws-cdk-cli.tests
    error:
       … while evaluating the attribute 'version'
         at pkgs/by-name/aw/aws-cdk-cli/package.nix:104:5:
          103|   passthru = {
          104|     tests.version = testers.testVersion { package = finalAttrs.package; };
             |     ^
          105|     updateScript = nix-update-script {

       … while evaluating the 'name' attribute of a derivation

       … while evaluating a branch condition
         at lib/strings.nix:2882:5:
         2881|     # First detect the common case of already valid strings, to speed those up
         2882|     if stringLength string <= 207 && okRegex string != null then
             |     ^
         2883|       unsafeDiscardStringContext string

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

       error: attribute 'package' missing
       at pkgs/by-name/aw/aws-cdk-cli/package.nix:104:53:
          103|   passthru = {
          104|     tests.version = testers.testVersion { package = finalAttrs.package; };
             |                                                     ^
          105|     updateScript = nix-update-script {
---
 pkgs/by-name/aw/aws-cdk-cli/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/aw/aws-cdk-cli/package.nix b/pkgs/by-name/aw/aws-cdk-cli/package.nix
index 2af3ec060406..0e9af39956b0 100644
--- a/pkgs/by-name/aw/aws-cdk-cli/package.nix
+++ b/pkgs/by-name/aw/aws-cdk-cli/package.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
   dontFixup = true;
 
   passthru = {
-    tests.version = testers.testVersion { package = finalAttrs.package; };
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
     updateScript = nix-update-script {
       extraArgs = [
         "--version-regex"

From eda3355fc3f99ac803d6d17ad72c0a1c7f12c55a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 24 Dec 2025 12:17:22 +0100
Subject: [PATCH 167/202] python3Packages.django-rq: 3.2.1 -> 3.2.2

https://github.com/rq/django-rq/releases/tag/v3.2.2
---
 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 52c43cf0781e..c78668faa22a 100644
--- a/pkgs/development/python-modules/django-rq/default.nix
+++ b/pkgs/development/python-modules/django-rq/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "django-rq";
-  version = "3.2.1";
+  version = "3.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rq";
     repo = "django-rq";
     tag = "v${version}";
-    hash = "sha256-oHBQpGRiNJFt07KEPC+KcCF6qM5PgSTyr0t35iyYhK4=";
+    hash = "sha256-vKvEFySTgIWqe6RYnl3POtjCEbCJZsRKL2KcRs9bv30=";
   };
 
   build-system = [ hatchling ];

From 6b906cc026c0be8ddadd3d1017781ac087fcbc41 Mon Sep 17 00:00:00 2001
From: jzbor <jzbor@posteo.net>
Date: Thu, 18 Dec 2025 13:45:12 +0100
Subject: [PATCH 168/202] nix-sweep: init at 0.8.0

---
 pkgs/by-name/ni/nix-sweep/package.nix | 50 +++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 pkgs/by-name/ni/nix-sweep/package.nix

diff --git a/pkgs/by-name/ni/nix-sweep/package.nix b/pkgs/by-name/ni/nix-sweep/package.nix
new file mode 100644
index 000000000000..6c89fc29408a
--- /dev/null
+++ b/pkgs/by-name/ni/nix-sweep/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  installShellFiles,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "nix-sweep";
+  version = "0.8.0";
+
+  src = fetchFromGitHub {
+    owner = "jzbor";
+    repo = "nix-sweep";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-C83AtqexEzx+8cNZXZyYUtg4gAUyam00IM0eXO8xOgA=";
+  };
+
+  cargoHash = "sha256-etqSdtoiSPMQLuMgBK/nnJM8dDTdmRk+MT++zu/9IjM=";
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    mkdir ./manpages
+    $out/bin/nix-sweep man ./manpages
+    installManPage ./manpages/*
+    mkdir ./completions
+    $out/bin/nix-sweep completions ./completions
+    installShellCompletion completions/nix-sweep.{bash,fish,zsh}
+  '';
+
+  meta = {
+    description = "Utility to clean up old Nix profile generations and left-over garbage collection roots";
+    homepage = "https://github.com/jzbor/nix-sweep";
+    changelog = "https://github.com/jzbor/nix-sweep/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    mainProgram = "nix-sweep";
+    maintainers = with lib.maintainers; [
+      jzbor
+    ];
+  };
+})

From 0c657710328b44e4bd4554906247ec3b9c6198e0 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 24 Dec 2025 12:47:18 +0100
Subject: [PATCH 169/202] winbox4: 4.0beta42 -> 4.0beta44

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

diff --git a/pkgs/by-name/wi/winbox4/package.nix b/pkgs/by-name/wi/winbox4/package.nix
index 5da3e8aa9f4c..bc787fd3cd2e 100644
--- a/pkgs/by-name/wi/winbox4/package.nix
+++ b/pkgs/by-name/wi/winbox4/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "winbox";
-  version = "4.0beta42";
+  version = "4.0beta44";
 
   metaCommon = {
     description = "Graphical configuration utility for RouterOS-based devices";
@@ -23,13 +23,13 @@ let
   x86_64-zip = callPackage ./build-from-zip.nix {
     inherit pname version metaCommon;
 
-    hash = "sha256-c+aewjTl+W/ahTdp9CIYT+MD4Nf+L58QONFCRifaOHI=";
+    hash = "sha256-LPq7KPOj59NUhoQCxpAVW8qbjXJGxRw8fRJT7/qDtZM=";
   };
 
   x86_64-dmg = callPackage ./build-from-dmg.nix {
     inherit pname version metaCommon;
 
-    hash = "sha256-3/sdKhMw2vx3IQE5IucllXzJyBs1snxXjAXNqumPQk0=";
+    hash = "sha256-96lb8a70dmqieKn5Nr61sZg/aVDLz0sY64sfN83rU+0=";
   };
 in
 (if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: {

From 2b7aee7b8a6a56d289e4b16d6d3a6c3bf48119e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 12:29:03 +0000
Subject: [PATCH 170/202] basex: 12.0 -> 12.1

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

diff --git a/pkgs/by-name/ba/basex/package.nix b/pkgs/by-name/ba/basex/package.nix
index 5f4610931ffc..06925099c5bd 100644
--- a/pkgs/by-name/ba/basex/package.nix
+++ b/pkgs/by-name/ba/basex/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "basex";
-  version = "12.0";
+  version = "12.1";
 
   src = fetchurl {
     url = "http://files.basex.org/releases/${version}/BaseX${
       builtins.replaceStrings [ "." ] [ "" ] version
     }.zip";
-    hash = "sha256-/9TeaAp2jckG77F8+J3aSpkoXWyTFXvXxnxXgpn58Zc=";
+    hash = "sha256-vxndej8+WhnC1G493MWdxXV4MUBXYTSPC8sccyd07ao=";
   };
 
   nativeBuildInputs = [

From 35d011d4b2e94a552f92ecf9fd32d1eba2f4a1e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 12:29:22 +0000
Subject: [PATCH 171/202] go-passbolt-cli: 0.3.2 -> 0.4.0

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

diff --git a/pkgs/by-name/go/go-passbolt-cli/package.nix b/pkgs/by-name/go/go-passbolt-cli/package.nix
index 6ec961336a9b..758107f8e537 100644
--- a/pkgs/by-name/go/go-passbolt-cli/package.nix
+++ b/pkgs/by-name/go/go-passbolt-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "go-passbolt-cli";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "passbolt";
     repo = "go-passbolt-cli";
     rev = "v${version}";
-    hash = "sha256-BtMPOmp9dbi/HoNigEeGWIYXRh1/gorV8ycrtWw9I8s=";
+    hash = "sha256-DTgvhmNzfr7ZXjVn+znXqFL+0bHBeGofFE521H7RUI4=";
   };
 
-  vendorHash = "sha256-wGSrhW7OsSjHlSKLkOf2AYIxU1m2lM1WGUsy16qxBwA=";
+  vendorHash = "sha256-QLTKCb3hl/0JFO2XKfLiOtnwfR/v+WqUx4vuaO/MoXo=";
 
   ldflags = [
     "-X=main.version=${version}"

From 644624c2465a957ad302353d8b4f5dbb08435704 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 12:33:31 +0000
Subject: [PATCH 172/202] gnome-pomodoro: 0.28.0 -> 0.28.1

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

diff --git a/pkgs/by-name/gn/gnome-pomodoro/package.nix b/pkgs/by-name/gn/gnome-pomodoro/package.nix
index 958ef3e745c9..910f4e10025b 100644
--- a/pkgs/by-name/gn/gnome-pomodoro/package.nix
+++ b/pkgs/by-name/gn/gnome-pomodoro/package.nix
@@ -24,13 +24,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "gnome-pomodoro";
-  version = "0.28.0";
+  version = "0.28.1";
 
   src = fetchFromGitHub {
     owner = "gnome-pomodoro";
     repo = "gnome-pomodoro";
     rev = version;
-    hash = "sha256-cVuBJ1Rwh/mjlFKKRJkKmdtDHdWNc6uiEE3ywCesirU=";
+    hash = "sha256-1G0Sv6uR4rE+/TZqEM57mCdBaXoJNpC0cznY4pnPEa4=";
   };
 
   patches = [

From 92580347c8fd38622c65efd7478a0fb693a4e306 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 23 Dec 2025 22:30:50 -0500
Subject: [PATCH 173/202] nixd: 2.7.0 -> 2.8.0

Changelog: https://github.com/nix-community/nixd/releases/tag/2.8.0
---
 pkgs/development/tools/language-servers/nixd/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix
index 0fba91572fc5..389b89855ce3 100644
--- a/pkgs/development/tools/language-servers/nixd/default.nix
+++ b/pkgs/development/tools/language-servers/nixd/default.nix
@@ -22,13 +22,13 @@
 let
   nixComponents = nixVersions.nixComponents_2_30;
   common = rec {
-    version = "2.7.0";
+    version = "2.8.0";
 
     src = fetchFromGitHub {
       owner = "nix-community";
       repo = "nixd";
       tag = version;
-      hash = "sha256-VPUX/68ysFUr1S8JW9I1rU5UcRoyZiCjL+9u2owrs6w=";
+      hash = "sha256-7B6jRkgqX5UCFXd0Bz7JFNG9ce3xeRNwXZyPR4nm4h0=";
     };
 
     nativeBuildInputs = [
@@ -73,6 +73,7 @@ in
       ];
 
       buildInputs = [
+        nixComponents.nix-expr
         gtest
         boost
         nlohmann_json

From ab6928d3e273043e9f1715d40cae6f64dd01a58c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 13:26:36 +0000
Subject: [PATCH 174/202] zwave-js-ui: 11.9.0 -> 11.9.1

---
 pkgs/by-name/zw/zwave-js-ui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix
index 029b5c62cfe7..d0a8256cdca2 100644
--- a/pkgs/by-name/zw/zwave-js-ui/package.nix
+++ b/pkgs/by-name/zw/zwave-js-ui/package.nix
@@ -7,15 +7,15 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-ui";
-  version = "11.9.0";
+  version = "11.9.1";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-ui";
     tag = "v${version}";
-    hash = "sha256-rUrpmjmcVfWY4Z6d7MvLKTxaog3NH5ieEbxVvma2ALI=";
+    hash = "sha256-skDNRBOffNKa6ZXSIfP8Oip1/dp35a2rtm44D5Q8HS0=";
   };
-  npmDepsHash = "sha256-Q7FjXLMl14caowfofShhm5It7cCMxI255ahXebsG8u0=";
+  npmDepsHash = "sha256-oTJKh+mpwB9m8KXF0CJcPkfdcNTQOEozUEH+/zGs+ZI=";
 
   passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
 

From addb357b28f800dec3998a9215887cd5e7a7fc93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 13:51:38 +0000
Subject: [PATCH 175/202] koboldcpp: 1.103 -> 1.104

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

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 393572b2a281..f0a0bd37b91c 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -39,13 +39,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.103";
+  version = "1.104";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lvrsgycFLqIGypB7lZvi9bDBtiKNAte4tLnEnRiPnZU=";
+    hash = "sha256-dhOdmyy+mhV2O/eWw3pNZefqRuhtakdD7iAG/RWOCEg=";
   };
 
   enableParallelBuilding = true;

From 8f114b64c96041ffdfcce5aa8b9116c65c8c46dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 13:56:43 +0000
Subject: [PATCH 176/202] kickstart: 0.5.0 -> 0.6.0

---
 pkgs/by-name/ki/kickstart/package.nix | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ki/kickstart/package.nix b/pkgs/by-name/ki/kickstart/package.nix
index cc1b9a81c8ce..05151ec200d7 100644
--- a/pkgs/by-name/ki/kickstart/package.nix
+++ b/pkgs/by-name/ki/kickstart/package.nix
@@ -2,23 +2,22 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  versionCheckHook,
   nix-update-script,
-  testers,
-  kickstart,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kickstart";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "Keats";
     repo = "kickstart";
-    rev = "v${version}";
-    hash = "sha256-4POxv6fIrp+wKb9V+6Y2YPx3FXp3hpnkq+62H9TwGII=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-WrImCnXkFaPUTMBhNaUgX6PsQS1H9zj6jZ8MbgYCGCM=";
   };
 
-  cargoHash = "sha256-J9sGXJbGbO9UgZfgqxqzbiJz9j6WMpq3qC2ys7OJnII=";
+  cargoHash = "sha256-Km49POZwVS2vYmELG5f7kenKQwaHlMP/bZA5cZ995mE=";
 
   buildFeatures = [ "cli" ];
 
@@ -28,19 +27,22 @@ rustPlatform.buildRustPackage rec {
     "--skip=generation::tests::can_generate_from_remote_repo"
   ];
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   passthru = {
     updateScript = nix-update-script { };
-    tests.version = testers.testVersion {
-      package = kickstart;
-    };
   };
 
   meta = {
     description = "Scaffolding tool to get new projects up and running quickly";
     homepage = "https://github.com/Keats/kickstart";
-    changelog = "https://github.com/Keats/kickstart/releases/tag/v${version}";
+    changelog = "https://github.com/Keats/kickstart/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ gaelreyrol ];
     mainProgram = "kickstart";
   };
-}
+})

From 4dfff61dbfceb954cab5cfe66d873854e2ee59f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 14:11:25 +0000
Subject: [PATCH 177/202] mktxp: 1.2.14 -> 1.2.16

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

diff --git a/pkgs/by-name/mk/mktxp/package.nix b/pkgs/by-name/mk/mktxp/package.nix
index 3c2c4855bb8e..e1ecc170bd3e 100644
--- a/pkgs/by-name/mk/mktxp/package.nix
+++ b/pkgs/by-name/mk/mktxp/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 let
-  version = "1.2.14";
+  version = "1.2.16";
 in
 python3Packages.buildPythonApplication {
   pname = "mktxp";
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication {
     owner = "akpw";
     repo = "mktxp";
     tag = "v${version}";
-    hash = "sha256-4+0aw/r71FcVrxASco3AkYzi7zbFeiEkJB7acGdb1FQ=";
+    hash = "sha256-jxXpgHSwqtbaj2oyPyWif8rr4fZNNo+ACRTFZ7aWQPc=";
   };
 
   nativeBuildInputs = with python3Packages; [

From e7244c71e4bf29b31185b6d63dc1f86a0ef7f865 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 14:35:47 +0000
Subject: [PATCH 178/202] misconfig-mapper: 1.14.14 -> 1.14.16

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

diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix
index 04b15ca9bdb6..3f23d44d9d2a 100644
--- a/pkgs/by-name/mi/misconfig-mapper/package.nix
+++ b/pkgs/by-name/mi/misconfig-mapper/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "misconfig-mapper";
-  version = "1.14.14";
+  version = "1.14.16";
 
   src = fetchFromGitHub {
     owner = "intigriti";
     repo = "misconfig-mapper";
     tag = "v${version}";
-    hash = "sha256-5tugmwr1TyBa89a/yrch+cshyoiJ3uj4EoweltN5d/0=";
+    hash = "sha256-/i1LElC2Yl8dzVOg0OX0CHR1d/01/nK9RVPsKzNvl9o=";
   };
 
-  vendorHash = "sha256-pLhc3Lc8Mp5ZRmNvac3qdQcw1rPQs7bbn4K0UHp04Qs=";
+  vendorHash = "sha256-N9fBmBBq18D+Bbag+SKGDIupGH2b4paWjFiXc1m50n4=";
 
   ldflags = [
     "-s"

From 784ee28c6349097f49ebf3e973913e798ebde284 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 24 Dec 2025 15:18:45 +0000
Subject: [PATCH 179/202] dolibarr: 22.0.3 -> 22.0.4

Diff: https://github.com/Dolibarr/dolibarr/compare/22.0.3...22.0.4

Changelog: https://github.com/Dolibarr/dolibarr/releases/tag/22.0.4
---
 pkgs/by-name/do/dolibarr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/dolibarr/package.nix b/pkgs/by-name/do/dolibarr/package.nix
index 6b21b14b1144..9dfba98b1fb9 100644
--- a/pkgs/by-name/do/dolibarr/package.nix
+++ b/pkgs/by-name/do/dolibarr/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dolibarr";
-  version = "22.0.3";
+  version = "22.0.4";
 
   src = fetchFromGitHub {
     owner = "Dolibarr";
     repo = "dolibarr";
     tag = finalAttrs.version;
-    hash = "sha256-3dcui1A8EzcFogQfUkf9+8A1C1CcFxHPFjOybDLKaCY=";
+    hash = "sha256-jk1sjVZJvFeJtQjxgNRx+WLSDsevMvxUIFCO4JMPEHM=";
   };
 
   dontBuild = true;

From c3de9fd9293df90a2dbe06440057a89e8586893d Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 24 Dec 2025 14:06:19 +0100
Subject: [PATCH 180/202] snitch: 0.1.9 -> 0.2.0

Changelog: https://github.com/karol-broda/snitch/releases/tag/v0.2.0
Diff: https://github.com/karol-broda/snitch/compare/v0.1.9...v0.2.0

PROPOSITION
---
 pkgs/by-name/sn/snitch/package.nix | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/sn/snitch/package.nix b/pkgs/by-name/sn/snitch/package.nix
index c8d44fbe9044..37495236aa28 100644
--- a/pkgs/by-name/sn/snitch/package.nix
+++ b/pkgs/by-name/sn/snitch/package.nix
@@ -3,22 +3,30 @@
   stdenv,
   buildGoModule,
   fetchFromGitHub,
-  apple-sdk_15,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "snitch";
-  version = "0.1.9";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "karol-broda";
     repo = "snitch";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-/0MYXKBat+OumuXnS8XSiMslNHUopVDFO4RdYGECfI8=";
+    hash = "sha256-krZf6bx1CZGgwg7cu2f2dzPYFEU4rM/nZjGtkXgGQkM=";
   };
 
   vendorHash = "sha256-fX3wOqeOgjH7AuWGxPQxJ+wbhp240CW8tiF4rVUUDzk=";
 
+  postPatch = ''
+    substituteInPlace cmd/version.go \
+      --replace-fail \
+        'Version = "dev"' \
+        'Version = "${finalAttrs.version}"'
+  '';
+
   # these below settings (env, buildInputs, ldflags) copied from
   # https://github.com/karol-broda/snitch/blob/master/flake.nix
 
@@ -27,17 +35,23 @@ buildGoModule (finalAttrs: {
     CGO_ENABLED = if stdenv.hostPlatform.isDarwin then 1 else 0;
   };
 
-  # darwin: use macOS 15 SDK for SecTrustCopyCertificateChain (Go 1.25 crypto/x509)
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ];
-
   ldflags = [
     "-s"
-    "-w"
     "-X snitch/cmd.Version=${finalAttrs.version}"
     "-X snitch/cmd.Commit=v${finalAttrs.version}"
     "-X snitch/cmd.Date=1970-01-01"
   ];
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "version";
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "friendlier ss / netstat for humans";
     homepage = "https://github.com/karol-broda/snitch";

From c6ac8c607c0982589c4d2c1beacbc53d08eaf71f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 15:34:33 +0000
Subject: [PATCH 181/202] python3Packages.hcloud: 2.12.0 -> 2.13.0

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

diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix
index eb305ff79585..302c337b2460 100644
--- a/pkgs/development/python-modules/hcloud/default.nix
+++ b/pkgs/development/python-modules/hcloud/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "hcloud";
-  version = "2.12.0";
+  version = "2.13.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8UWxjvxtcP/z1IskTt/eKcD+Pd37utz+cdY/QfUkQfc=";
+    hash = "sha256-l0sio2w0fhE/+LJavSzThoARKISFGStWJynbprIjdeE=";
   };
 
   build-system = [ setuptools ];

From 1d1e90397e95e87f6ce93facefc910b880be8172 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 16:43:27 +0000
Subject: [PATCH 182/202] terraform-providers.linode_linode: 3.6.0 -> 3.7.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a12216d1ae8e..06753645323e 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -842,13 +842,13 @@
     "vendorHash": "sha256-Y1L1nIOubhBN5vNIXY7miQgR9OzoTCS7QA55DEMwDSA="
   },
   "linode_linode": {
-    "hash": "sha256-AxG8N/kEu2+Yym63Ac04SxjrUyCiSp/zmIXQqscpeWM=",
+    "hash": "sha256-gsRrEsR2+2AadSPhY6hwP3iqjNQyCqhxmnsFL2iMbcw=",
     "homepage": "https://registry.terraform.io/providers/linode/linode",
     "owner": "linode",
     "repo": "terraform-provider-linode",
-    "rev": "v3.6.0",
+    "rev": "v3.7.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-2zdUEV84CQ236ktTfMcucAb2gwDPIQ+Br5AfKncZdJA="
+    "vendorHash": "sha256-03uqpurO11HMMxwZRIaD7iuOYk6TuGbztIwE5SPwemU="
   },
   "loafoe_htpasswd": {
     "hash": "sha256-ALTyTTVyS2HHenmk8HVwtQenCmJX05kyXifJTzzmnHE=",

From 5537ea26424f8c2ee960318cedd92e476c93e206 Mon Sep 17 00:00:00 2001
From: sweenu <contact@sweenu.xyz>
Date: Tue, 11 Nov 2025 09:52:17 +0100
Subject: [PATCH 183/202] nixos/n8n: fix malformed env vars

---
 nixos/modules/services/misc/n8n.nix | 4 ++--
 nixos/tests/n8n.nix                 | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/n8n.nix b/nixos/modules/services/misc/n8n.nix
index 60c4e1cfd3f7..4231fc73a51e 100644
--- a/nixos/modules/services/misc/n8n.nix
+++ b/nixos/modules/services/misc/n8n.nix
@@ -59,7 +59,7 @@ in
             readOnly = true;
           };
           N8N_DIAGNOSTICS_ENABLED = lib.mkOption {
-            type = with lib.types; coercedTo bool toString str;
+            type = with lib.types; coercedTo bool builtins.toJSON str;
             default = false;
             description = ''
               Whether to share selected, anonymous telemetry with n8n.
@@ -67,7 +67,7 @@ in
             '';
           };
           N8N_VERSION_NOTIFICATIONS_ENABLED = lib.mkOption {
-            type = with lib.types; coercedTo bool toString str;
+            type = with lib.types; coercedTo bool builtins.toJSON str;
             default = false;
             description = ''
               When enabled, n8n sends notifications of new versions and security updates.
diff --git a/nixos/tests/n8n.nix b/nixos/tests/n8n.nix
index ee1f835f8c99..f9661a5abec4 100644
--- a/nixos/tests/n8n.nix
+++ b/nixos/tests/n8n.nix
@@ -28,5 +28,6 @@ in
     machine.succeed("grep -qF ${webhookUrl} /etc/systemd/system/n8n.service")
     machine.succeed("grep -qF 'HOME=/var/lib/n8n' /etc/systemd/system/n8n.service")
     machine.fail("grep -qF 'GENERIC_TIMEZONE=' /etc/systemd/system/n8n.service")
+    machine.succeed("grep -qF 'N8N_DIAGNOSTICS_ENABLED=false' /etc/systemd/system/n8n.service")
   '';
 }

From 8f88d575251d6595901b0cb57686adb24c8dfd8c Mon Sep 17 00:00:00 2001
From: Mathew Polzin <matt.polzin@gmail.com>
Date: Wed, 24 Dec 2025 10:31:19 -0600
Subject: [PATCH 184/202] idris2Packages.pack: add make runtime dependency

---
 pkgs/development/compilers/idris2/pack.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/idris2/pack.nix b/pkgs/development/compilers/idris2/pack.nix
index 5f38ee28fe51..ed89dd30d7a3 100644
--- a/pkgs/development/compilers/idris2/pack.nix
+++ b/pkgs/development/compilers/idris2/pack.nix
@@ -5,6 +5,7 @@
   clang,
   chez,
   gmp,
+  gnumake,
   zsh,
   makeBinaryWrapper,
   stdenv,
@@ -189,6 +190,7 @@ let
       gmp
       clang
       chez
+      gnumake
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
 
@@ -200,6 +202,7 @@ let
             [
               clang
               chez
+              gnumake
             ]
             ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ]
           )

From 9ad1603ead58a066654607dfaeb16e99ffc97f2c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 17:22:22 +0000
Subject: [PATCH 185/202] tbls: 1.92.1 -> 1.92.2

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

diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix
index a4e0d3b2255d..53095476c91b 100644
--- a/pkgs/by-name/tb/tbls/package.nix
+++ b/pkgs/by-name/tb/tbls/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "tbls";
-  version = "1.92.1";
+  version = "1.92.2";
 
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = "tbls";
     tag = "v${version}";
-    hash = "sha256-78YEBMwizGax6V88r9f6FI03GagI3znTnGHh1C0VAVc=";
+    hash = "sha256-pdbUQ9Zds/z1tSIU9R4njF/Ls3DwoRteY7sI7yMv9+I=";
   };
 
   vendorHash = "sha256-mQE1ZGNKbD9XQMoVBU3JVBjEIt0V0+PiC5yps4aj+kQ=";

From 397a4a0c3fdeb63c3c641eb5af9bc388f693b75b Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 24 Dec 2025 12:24:16 -0500
Subject: [PATCH 186/202] postcss: migrate from nodePackages

---
 pkgs/by-name/po/postcss/package.nix           | 58 +++++++++++++++++++
 .../haskell-modules/configuration-nix.nix     |  2 +-
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 23 --------
 5 files changed, 60 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/by-name/po/postcss/package.nix

diff --git a/pkgs/by-name/po/postcss/package.nix b/pkgs/by-name/po/postcss/package.nix
new file mode 100644
index 000000000000..6e55d512b3c5
--- /dev/null
+++ b/pkgs/by-name/po/postcss/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchPnpmDeps,
+  nodejs,
+  pnpm,
+  pnpmConfigHook,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "postcss";
+  version = "8.5.6";
+
+  src = fetchFromGitHub {
+    owner = "postcss";
+    repo = "postcss";
+    tag = finalAttrs.version;
+    hash = "sha256-7oGCDqKwJG49DXDiyEZaO8EhxZS/Up5PO3/uqqOa+Bo=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    pnpmConfigHook
+    pnpm
+  ];
+
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    fetcherVersion = 3;
+    hash = "sha256-WJTQjlOkzCSqPHkNuT/Dn1BOFyL+3lDSl7RW0S9fakU=";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    rm -rf node_modules
+    pnpm install --production --offline --force
+    mkdir -p $out/lib/node_modules/postcss
+    mv ./* $out/lib/node_modules/postcss
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/postcss/postcss/releases/tag/${finalAttrs.version}";
+    description = "Transforming styles with JS plugins";
+    homepage = "https://postcss.org/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index bde320970349..b65931789812 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -1905,7 +1905,7 @@ builtins.intersectAttrs super {
         nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.buildPackages.makeBinaryWrapper ];
         postInstall = (old.postInstall or "") + ''
           nodePath=""
-          for p in "$out" "${pkgs.nodePackages.postcss}" $plugins; do
+          for p in "$out" "${pkgs.postcss}" $plugins; do
             nodePath="$nodePath''${nodePath:+:}$p/lib/node_modules"
           done
           makeWrapper "$out/bin/tailwindcss" "$out/bin/tailwind" --prefix NODE_PATH : "$nodePath"
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index b6a1f90d49d9..9cb5a2685750 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -283,6 +283,7 @@ mapAliases {
   inherit (pkgs) pm2; # added 2024-01-22
   inherit (pkgs) pnpm; # added 2024-06-26
   poor-mans-t-sql-formatter-cli = throw "'poor-mans-t-sql-formatter-cli' has been removed because it was unmaintained upstream"; # Added 2025-11-14
+  inherit (pkgs) postcss; # Added 2025-12-24
   postcss-cli = throw "postcss-cli has been removed because it was broken"; # added 2025-03-24
   prebuild-install = throw "prebuild-install was removed because it appeared to be unmaintained upstream. See upstream's recommendations for alternatives here: https://github.com/prebuild/prebuild-install#note"; # Added 2025-12-14
   inherit (pkgs) prettier; # added 2025-05-31
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index f5dda4fdd2eb..46b3f6a85d37 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -18,7 +18,6 @@
 , "js-yaml"
 , "lcov-result-merger"
 , "node2nix"
-, "postcss"
 , "sass"
 , "semver"
 , "vercel"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index bc19ca668283..b6ee2bc1c6a2 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -20996,29 +20996,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  postcss = nodeEnv.buildNodePackage {
-    name = "postcss";
-    packageName = "postcss";
-    version = "8.5.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz";
-      sha512 = "dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==";
-    };
-    dependencies = [
-      sources."nanoid-3.3.9"
-      sources."picocolors-1.1.1"
-      sources."source-map-js-1.2.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Tool for transforming styles with JS plugins";
-      homepage = "https://postcss.org/";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   sass = nodeEnv.buildNodePackage {
     name = "sass";
     packageName = "sass";

From 02dec8179d50425b543181330bbc67c896215ced Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Wed, 24 Dec 2025 18:29:11 +0100
Subject: [PATCH 187/202] easyeffects: 8.0.8 -> 8.0.9

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

diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix
index e0962dbb811d..c8404e721196 100644
--- a/pkgs/by-name/ea/easyeffects/package.nix
+++ b/pkgs/by-name/ea/easyeffects/package.nix
@@ -59,13 +59,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "easyeffects";
-  version = "8.0.8";
+  version = "8.0.9";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "easyeffects";
     tag = "v${version}";
-    hash = "sha256-Pw9rMYHrRBSttdtElWDH1YOF0tNWgb2zBzJBI9jJe4Q=";
+    hash = "sha256-cFMbeJeEIDP7uiNi+rRKErgHtjP/PbPKASo+M2qogZQ=";
   };
 
   patches = [ ./qmlmodule-fix.patch ];

From 8e64c7c13aa0acb3b17dae700e0015746463bb5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 17:46:24 +0000
Subject: [PATCH 188/202] libretro.ppsspp: 0-unstable-2025-12-16 ->
 0-unstable-2025-12-22

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

diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
index b2f9a6c8783d..2676741e3e54 100644
--- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix
+++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2025-12-16";
+  version = "0-unstable-2025-12-22";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "dd112491db181114723fed270a1c45ffc1355539";
-    hash = "sha256-NMUpmJySZPcyo/niIohxbXG5MfkyKCdeEF9O8ZPKe8g=";
+    rev = "036013ef87d2ac6b9fea36dbb513617c72e11254";
+    hash = "sha256-T2fUq6Iah/vQ/NaGPE/wa2sJL888VKRpdiNq7hbFsWI=";
     fetchSubmodules = true;
   };
 

From fdd4a223604969743c427e995be5d650722e5c04 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Wed, 24 Dec 2025 17:55:45 +0000
Subject: [PATCH 189/202] hmcl: 3.8.1 -> 3.8.2

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

diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix
index 8125460cb02f..2c705e4b9a0c 100644
--- a/pkgs/by-name/hm/hmcl/package.nix
+++ b/pkgs/by-name/hm/hmcl/package.nix
@@ -39,13 +39,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hmcl";
-  version = "3.8.1";
+  version = "3.8.2";
 
   src = fetchurl {
     # HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key.
     # See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28
     url = "https://github.com/HMCL-dev/HMCL/releases/download/v${finalAttrs.version}/HMCL-${finalAttrs.version}.jar";
-    hash = "sha256-mQ0iuIOVRETdueNbe5s9USbis6IB6n0eA2EzsMzyGng=";
+    hash = "sha256-0vAgyN8PC2AQbor9aVqr/K1oBLt4QGpEQ2vSL2ajQOg=";
   };
 
   # - HMCL prompts users to download prebuilt Terracotta binary for

From 084b2248cacf97fb82da36810f33bd578ce6ee12 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 17:56:29 +0000
Subject: [PATCH 190/202] mpvScripts.sponsorblock-minimal:
 0-unstable-2025-09-09 -> 0-unstable-2025-12-21

---
 .../applications/video/mpv/scripts/sponsorblock-minimal.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix b/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix
index 9b38977da3bb..6bbc22cd4cd6 100644
--- a/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix
+++ b/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix
@@ -9,15 +9,15 @@
 
 buildLua {
   pname = "mpv_sponsorblock_minimal";
-  version = "0-unstable-2025-09-09";
+  version = "0-unstable-2025-12-21";
   scriptPath = "sponsorblock_minimal.lua";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "jouni";
     repo = "mpv_sponsorblock_minimal";
-    rev = "fc0db1fbffc873ca02ced7602274393fde8857e5";
-    hash = "sha256-DOgJ1gZybfIFJQ5qt4B93ugHz1o+RJ7E8Cnb7itYfTs=";
+    rev = "8f4b186d6ea46e6fe0e5e94a53dda2f50dceb576";
+    hash = "sha256-21qucigVnEaniQh7BKwFG/PDkwV51q0kzqe0ipVH6qY=";
   };
   passthru.updateScript = unstableGitUpdater { };
 

From 2b42ee21f0eff3e0b24e59bba686379c6080ed52 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Tue, 23 Dec 2025 22:09:22 -0800
Subject: [PATCH 191/202] widelands: 1.2.1 -> 1.3

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

diff --git a/pkgs/by-name/wi/widelands/package.nix b/pkgs/by-name/wi/widelands/package.nix
index 692cab29ced2..8a2ba417c0a6 100644
--- a/pkgs/by-name/wi/widelands/package.nix
+++ b/pkgs/by-name/wi/widelands/package.nix
@@ -30,23 +30,15 @@
 
 stdenv.mkDerivation rec {
   pname = "widelands";
-  version = "1.2.1";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "widelands";
     repo = "widelands";
     rev = "v${version}";
-    sha256 = "sha256-/MEeb0KnefK812w5y238Icd4gW85d/pvZ08xnlVXDdk=";
+    sha256 = "sha256-943/pkxiIbhnZQMwMNpeu5KKkS+j58zU6r9i6mZGSMg=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "modern-asio.patch";
-      url = "https://codeberg.org/wl/widelands/pulls/5025.patch";
-      sha256 = "sha256-ip9ZG9u/z7G+yG7xrEvi+DH9vsjRzYWhEe0rEjxHzzY=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace xdg/org.widelands.Widelands.desktop \
       --replace 'Exec=widelands' "Exec=$out/bin/widelands"

From 26aca99af7fe3eead44d11c8b6812f5e09047925 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 23 Dec 2025 09:14:55 +0100
Subject: [PATCH 192/202] python313Packages.iamdata: 0.1.202512221 ->
 0.1.202512231

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202512221...v0.1.202512231

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202512231
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 4958b9730c56..76ae1451092f 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202512221";
+  version = "0.1.202512231";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-IEFEynR5gLS9kdIMlytK1XKOawsnxsT+vWvLGZ6yd5g=";
+    hash = "sha256-TR36VDYNLyPIEcE1cJp8n2lHOG0LOBd/VyuWuOaNKD4=";
   };
 
   __darwinAllowLocalNetworking = true;

From eecae9bb58d0eed7dc36f3761960a80dc21c3c14 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 24 Dec 2025 20:44:01 +0100
Subject: [PATCH 193/202] python313Packages.iamdata: 0.1.202512231 ->
 0.1.202512241

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202512231...v0.1.202512241

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202512241
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 76ae1451092f..e70b6af4c618 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202512231";
+  version = "0.1.202512241";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-TR36VDYNLyPIEcE1cJp8n2lHOG0LOBd/VyuWuOaNKD4=";
+    hash = "sha256-q6spPE5sIQP2c/u4gbGIe4MOwM8dfQqg1cvAur1iD/k=";
   };
 
   __darwinAllowLocalNetworking = true;

From 656408fff31a91416f2f695683a93129aaf4f3e0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 24 Dec 2025 20:49:29 +0100
Subject: [PATCH 194/202] python313Packages.nibe: modernize

---
 pkgs/development/python-modules/nibe/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix
index f4b559619fb7..b0a5909c9633 100644
--- a/pkgs/development/python-modules/nibe/default.nix
+++ b/pkgs/development/python-modules/nibe/default.nix
@@ -12,7 +12,6 @@
   pytest-asyncio,
   pytestCheckHook,
   python-slugify,
-  pythonOlder,
   setuptools,
   tenacity,
 }:
@@ -22,8 +21,6 @@ buildPythonPackage rec {
   version = "2.20.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "yozik04";
     repo = "nibe";
@@ -63,7 +60,7 @@ buildPythonPackage rec {
   meta = {
     description = "Library for the communication with Nibe heatpumps";
     homepage = "https://github.com/yozik04/nibe";
-    changelog = "https://github.com/yozik04/nibe/releases/tag/${version}";
+    changelog = "https://github.com/yozik04/nibe/releases/tag/${src.tag}";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fab ];
   };

From 211660be0a8b16318ee46c72ef2fdb86bf8de30f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 24 Dec 2025 20:51:16 +0100
Subject: [PATCH 195/202] python313Packages.aioqsw: modernize

---
 .../python-modules/aioqsw/default.nix           | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/aioqsw/default.nix b/pkgs/development/python-modules/aioqsw/default.nix
index 015b0603d385..aa97da656f53 100644
--- a/pkgs/development/python-modules/aioqsw/default.nix
+++ b/pkgs/development/python-modules/aioqsw/default.nix
@@ -3,17 +3,13 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
-  wheel,
 }:
 
 buildPythonPackage rec {
   pname = "aioqsw";
   version = "0.4.2";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.11";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Noltari";
@@ -22,12 +18,9 @@ buildPythonPackage rec {
     hash = "sha256-SIdEM5YxPnCM6wEJTL19t07Xb89wDAwHzKnz0dKC0tw=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-    wheel
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ aiohttp ];
+  dependencies = [ aiohttp ];
 
   # Module has no tests
   doCheck = false;
@@ -37,8 +30,8 @@ buildPythonPackage rec {
   meta = {
     description = "Library to fetch data from QNAP QSW switches";
     homepage = "https://github.com/Noltari/aioqsw";
-    changelog = "https://github.com/Noltari/aioqsw/releases/tag/${version}";
-    license = with lib.licenses; [ asl20 ];
+    changelog = "https://github.com/Noltari/aioqsw/releases/tag/${src.tag}";
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
 }

From c09c3e522aaf2a06285a5191da81b9b664c23f7d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 24 Dec 2025 20:53:34 +0100
Subject: [PATCH 196/202] misconfig-mapper: update changelog entry

---
 pkgs/by-name/mi/misconfig-mapper/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix
index 3f23d44d9d2a..639e07b885f2 100644
--- a/pkgs/by-name/mi/misconfig-mapper/package.nix
+++ b/pkgs/by-name/mi/misconfig-mapper/package.nix
@@ -25,7 +25,7 @@ buildGoModule rec {
   meta = {
     description = "Tool to uncover security misconfigurations on popular third-party services";
     homepage = "https://github.com/intigriti/misconfig-mapper";
-    changelog = "https://github.com/intigriti/misconfig-mapper/releases/tag/v${version}";
+    changelog = "https://github.com/intigriti/misconfig-mapper/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "misconfig-mapper";

From 975cf8e8e92b7f73f19b2bbde34aa2668cc1fa5a Mon Sep 17 00:00:00 2001
From: BoneWalk3r <thecrimsonknight1230@proton.me>
Date: Wed, 24 Dec 2025 14:56:41 -0500
Subject: [PATCH 197/202] bootdev-cli: 1.21.1 -> 1.22.0

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

diff --git a/pkgs/by-name/bo/bootdev-cli/package.nix b/pkgs/by-name/bo/bootdev-cli/package.nix
index 14179a18a3a4..ffe5f166fbad 100644
--- a/pkgs/by-name/bo/bootdev-cli/package.nix
+++ b/pkgs/by-name/bo/bootdev-cli/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "bootdev-cli";
-  version = "1.21.1";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "bootdotdev";
     repo = "bootdev";
     tag = "v${version}";
-    hash = "sha256-1uPI//w8RVqwRO1sVkI3vtdXduyuFp8632CVyAjkaSA=";
+    hash = "sha256-Fk82JKD8zHRPBoliwnvQKqZNii7TiX13cKENXw5011E=";
   };
 
   vendorHash = "sha256-jhRoPXgfntDauInD+F7koCaJlX4XDj+jQSe/uEEYIMM=";

From 7718d71fa92813d0c538817f149ba0e0e6ef1933 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 19:57:42 +0000
Subject: [PATCH 198/202] lux-cli: 0.22.2 -> 0.22.3

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

diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix
index 43b2f4c71fb7..1ce2a73bd5b0 100644
--- a/pkgs/by-name/lu/lux-cli/package.nix
+++ b/pkgs/by-name/lu/lux-cli/package.nix
@@ -18,18 +18,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lux-cli";
 
-  version = "0.22.2";
+  version = "0.22.3";
 
   src = fetchFromGitHub {
     owner = "lumen-oss";
     repo = "lux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Pae3oifx3G0mouSJL6W/XHGlozmHn6Aj9a8aqTshmVc=";
+    hash = "sha256-YtDo6Njv8Cz8GWlSt1wKQjR9cUDPeru6F+V4g1lO640=";
   };
 
   buildAndTestSubdir = "lux-cli";
 
-  cargoHash = "sha256-XObaVcTbE3pXZurFDt/7jHZUg0TZulV0QwWktqvjAyk=";
+  cargoHash = "sha256-zggaQyzMJm0lI1qHa4Q5o9lMgSy29cp5HJMHqplpe6E=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 0ffe605ebe646845218b10a2f76fd43eb8a7c1a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 20:04:08 +0000
Subject: [PATCH 199/202] freshrss: 1.27.1 -> 1.28.0

---
 pkgs/servers/web-apps/freshrss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix
index 82a01ed0d9be..2a7a61924440 100644
--- a/pkgs/servers/web-apps/freshrss/default.nix
+++ b/pkgs/servers/web-apps/freshrss/default.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "FreshRSS";
-  version = "1.27.1";
+  version = "1.28.0";
 
   src = fetchFromGitHub {
     owner = "FreshRSS";
     repo = "FreshRSS";
     rev = version;
-    hash = "sha256-EpszwgYzobRA7LohtJJtgTefFAEmCXvcP3ilfsu+obo=";
+    hash = "sha256-//UiGxsdJQAc9qAn3P8/bCl8ka5LacfqkydU4b2/TtI=";
   };
 
   postPatch = ''

From bf0527bff3b9b581c266080d57a43d87a97e42a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 20:08:16 +0000
Subject: [PATCH 200/202] vigra: 1.12.2 -> 1.12.3

---
 pkgs/development/libraries/vigra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 46d4965c105f..14760defa896 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -22,13 +22,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "vigra";
-  version = "1.12.2";
+  version = "1.12.3";
 
   src = fetchFromGitHub {
     owner = "ukoethe";
     repo = "vigra";
     tag = "Version-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
-    hash = "sha256-E+O5NbDX1ycDJTht6kW8JzYnhEL6Wd1xp0rcLpdm2HQ=";
+    hash = "sha256-pknZHHIIhjfOxdp+qCOOGvo0W5ByTHXRiIQzzN7Z6M4=";
   };
 
   nativeBuildInputs = [ cmake ];

From 058cb05c15614b2213cc59ea7891459fdbe09bf8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 20:50:24 +0000
Subject: [PATCH 201/202] atlas: 0.38.0 -> 1.0.0

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

diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix
index e7295ec77842..9f85f579387b 100644
--- a/pkgs/by-name/at/atlas/package.nix
+++ b/pkgs/by-name/at/atlas/package.nix
@@ -9,19 +9,19 @@
 
 buildGoModule (finalAttrs: {
   pname = "atlas";
-  version = "0.38.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "ariga";
     repo = "atlas";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OS0UYrE+5spErR/S+7AsYDPcCce3EEWvcBBKh+8FkTo=";
+    hash = "sha256-Ls5N6HZFR3+KfuqoyE6gaaxhjZ/stQC+g1kWIUE8EaE=";
   };
 
   modRoot = "cmd/atlas";
 
   proxyVendor = true;
-  vendorHash = "sha256-xlKU/hxSjQWSQV++7RHfY4hZhm2tWCPS6DcyaGNnmhc=";
+  vendorHash = "sha256-ksSvW+Sc1iQlMf9i6GWMjq4hISdAD3t/uAPlQ3x7wHU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 24d11f6feae797945c998bfeea50b2c01d738293 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Dec 2025 21:48:02 +0000
Subject: [PATCH 202/202] terraform-providers.digitalocean_digitalocean: 2.71.0
 -> 2.72.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a12216d1ae8e..e08a5d889539 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -310,11 +310,11 @@
     "vendorHash": null
   },
   "digitalocean_digitalocean": {
-    "hash": "sha256-V5Ss2GbxDqxm1I3NgqyLkg8B7iK+5tICdJ28YeCiEgM=",
+    "hash": "sha256-A6LxX2zMZAd/Db1VdAVqMplCW2qZx4MNyIpLwTBXkxU=",
     "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
     "owner": "digitalocean",
     "repo": "terraform-provider-digitalocean",
-    "rev": "v2.71.0",
+    "rev": "v2.72.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },