From f4da327262897a1c5a3fe510fa161f0594c23aaf Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Tue, 7 Oct 2025 12:39:42 +0200
Subject: [PATCH 01/60] blobtools: init at 0-unstable-2012-10-24

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

diff --git a/pkgs/by-name/bl/blobtools/package.nix b/pkgs/by-name/bl/blobtools/package.nix
new file mode 100644
index 000000000000..8326de7b9dd6
--- /dev/null
+++ b/pkgs/by-name/bl/blobtools/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+}:
+stdenv.mkDerivation {
+  pname = "blobtools";
+  version = "0-unstable-2012-10-24";
+
+  src = fetchFromGitHub {
+    owner = "AndroidRoot";
+    repo = "BlobTools";
+    rev = "6186e33baa10ce6f1c738d7b91eb5153743105af";
+    hash = "sha256-zg0A5Dm3255jqcioK45P2uzDnaaSAUkl4WtCJh77IuQ=";
+  };
+
+  strictDeps = true;
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm555 {blobpack,blobunpack} -t $out/bin
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://github.com/AndroidRoot/BlobTools";
+    description = "Tools for modifiying ASUS Transformer firmware";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ungeskriptet ];
+    mainProgram = "blobpack";
+  };
+}

From f52f3ec6f291c096478da0fce47aa6b78589f3ca Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 29 Oct 2025 16:52:17 +0100
Subject: [PATCH 02/60] faustlsp: init at unstable-2025-10-29

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

diff --git a/pkgs/by-name/fa/faustlsp/package.nix b/pkgs/by-name/fa/faustlsp/package.nix
new file mode 100644
index 000000000000..fd32f2f6fe2f
--- /dev/null
+++ b/pkgs/by-name/fa/faustlsp/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "faustlsp";
+  version = "0-unstable-2025-10-29";
+
+  src = fetchFromGitHub {
+    owner = "grame-cncm";
+    repo = "faustlsp";
+    rev = "017e28bbf03cf632118a0a7e0d5dbe0c6a6ea52e";
+    hash = "sha256-cidOJYQf58+zS9HlTJkzUy7zStHuX8bVhf4EkG9qR5k=";
+  };
+
+  vendorHash = "sha256-9qARh53TboBuTYp6kGxR53yjDkix0CKIt1VPYBmg0dY=";
+
+  proxyVendor = true;
+
+  doCheck = false;
+
+  meta = {
+    description = "Language Server Protocol (LSP) implementation for the Faust programming language";
+    homepage = "https://github.com/grame-cncm/faustlsp";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ magnetophon ];
+    mainProgram = "faustlsp";
+    platforms = lib.platforms.all;
+  };
+})

From 23ba5e127978d77cdadc00e84aef5ffd7eaf1808 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Fri, 21 Nov 2025 13:31:14 +0000
Subject: [PATCH 03/60] yara-x: Add versionCheckHook

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

diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix
index 489b3c874384..38c73d7ccb66 100644
--- a/pkgs/by-name/ya/yara-x/package.nix
+++ b/pkgs/by-name/ya/yara-x/package.nix
@@ -6,8 +6,7 @@
   rustPlatform,
   installShellFiles,
   cargo-c,
-  testers,
-  yara-x,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -47,9 +46,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=scanner::blocks::tests::block_scanner_timeout"
   ];
 
-  passthru.tests.version = testers.testVersion {
-    package = yara-x;
-  };
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
 
   meta = {
     description = "Tool to do pattern matching for malware research";

From 581c3f71d42e6ced4e8f7bd6be1cd13fcd633ded Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Fri, 21 Nov 2025 13:32:42 +0000
Subject: [PATCH 04/60] yara-x: Enable full LTO

---
 pkgs/by-name/ya/yara-x/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix
index 38c73d7ccb66..74c88e380d57 100644
--- a/pkgs/by-name/ya/yara-x/package.nix
+++ b/pkgs/by-name/ya/yara-x/package.nix
@@ -22,6 +22,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-CT+walpFIFTaO480ATHO1E38K9Tw14QqLRYzztWQmeA=";
 
+  CARGO_PROFILE_RELEASE_LTO = "fat";
+  CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
+
   nativeBuildInputs = [
     installShellFiles
     cargo-c
@@ -45,6 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     # Seems to be flaky
     "--skip=scanner::blocks::tests::block_scanner_timeout"
   ];
+  checkType = "debug";
 
   nativeCheckInputs = [
     versionCheckHook

From 384a9709e783bed744ef9cb8943270acc5ae1021 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 21 Nov 2025 13:06:09 +0100
Subject: [PATCH 05/60] prometheus-cpp-lite: init at 1.0-unstable-2023-08-13

---
 .../missing_includes.patch                    | 11 ++++
 .../pr/prometheus-cpp-lite/package.nix        | 58 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 pkgs/by-name/pr/prometheus-cpp-lite/missing_includes.patch
 create mode 100644 pkgs/by-name/pr/prometheus-cpp-lite/package.nix

diff --git a/pkgs/by-name/pr/prometheus-cpp-lite/missing_includes.patch b/pkgs/by-name/pr/prometheus-cpp-lite/missing_includes.patch
new file mode 100644
index 000000000000..92b2d7428c16
--- /dev/null
+++ b/pkgs/by-name/pr/prometheus-cpp-lite/missing_includes.patch
@@ -0,0 +1,11 @@
+diff --git a/core/include/prometheus/family.h b/core/include/prometheus/family.h
+index 1c625c1..a3d0e85 100644
+--- a/core/include/prometheus/family.h
++++ b/core/include/prometheus/family.h
+@@ -1,5 +1,6 @@
+ #pragma once
+ 
++#include <stdexcept>
+ #include <cstddef>
+ #include <map>
+ #include <memory>
diff --git a/pkgs/by-name/pr/prometheus-cpp-lite/package.nix b/pkgs/by-name/pr/prometheus-cpp-lite/package.nix
new file mode 100644
index 000000000000..9a9cda17c9bb
--- /dev/null
+++ b/pkgs/by-name/pr/prometheus-cpp-lite/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "prometheus-cpp-lite";
+  version = "1.0-unstable-2023-08-13";
+
+  src = fetchFromGitHub {
+    owner = "biaks";
+    repo = "prometheus-cpp-lite";
+    rev = "48d09c45ee6deb90e02579b03037740e1c01fd27";
+    hash = "sha256-XplbP4wHxK9z8Q5fOnaiL7vzXBaZTJyo/tmXUJN/mb4=";
+  };
+
+  patches = [
+    ./missing_includes.patch
+  ];
+
+  postPatch = ''
+    for dir in . core simpleapi; do
+    substituteInPlace $dir/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.2)' \
+      'cmake_minimum_required(VERSION 3.10)'
+    done
+
+    substituteInPlace 3rdpatry/http-client-lite/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.3 FATAL_ERROR)' \
+      'cmake_minimum_required(VERSION 3.10)' \
+  '';
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/include/prometheus $out/lib
+
+    cp ../core/include/prometheus/* $out/include/prometheus
+    cp ../simpleapi/include/prometheus/* $out/include/prometheus
+    cp simpleapi/libprometheus-cpp-simpleapi.* $out/lib/
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "C++ Header-only Prometheus client library";
+    homepage = "https://github.com/biaks/prometheus-cpp-lite";
+    maintainers = [ lib.maintainers.markuskowa ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+  };
+})

From 5f62dbc97bfe7c5ef99f31a1e26688f53084da65 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 21 Nov 2025 13:07:57 +0100
Subject: [PATCH 06/60] ntirpc: 6.3 -> 7.2

---
 pkgs/by-name/nt/ntirpc/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nt/ntirpc/package.nix b/pkgs/by-name/nt/ntirpc/package.nix
index e3f99bcc380c..11be845c0a18 100644
--- a/pkgs/by-name/nt/ntirpc/package.nix
+++ b/pkgs/by-name/nt/ntirpc/package.nix
@@ -7,17 +7,18 @@
   liburcu,
   libtirpc,
   libnsl,
+  prometheus-cpp-lite,
 }:
 
 stdenv.mkDerivation rec {
   pname = "ntirpc";
-  version = "6.3";
+  version = "7.2";
 
   src = fetchFromGitHub {
     owner = "nfs-ganesha";
     repo = "ntirpc";
     rev = "v${version}";
-    sha256 = "sha256-e4eF09xwX2Qf/y9YfOGy7p6yhDFnKGI5cnrQy3o8c98=";
+    hash = "sha256-4E6wDAwinCNn7arRgBulg7e0x9S/steh+mjwNY4X3Vc=";
   };
 
   outputs = [
@@ -38,6 +39,11 @@ stdenv.mkDerivation rec {
     krb5
     liburcu
     libnsl
+    prometheus-cpp-lite
+  ];
+
+  cmakeFlags = [
+    "-DUSE_MONITORING=ON"
   ];
 
   postInstall = ''

From 4cbcfddfc10c8e2f74f0b39f389cce8bf684f85c Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 21 Nov 2025 13:08:24 +0100
Subject: [PATCH 07/60] nfs-ganesha: 6.5 -> 9.2

---
 pkgs/by-name/nf/nfs-ganesha/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/nf/nfs-ganesha/package.nix b/pkgs/by-name/nf/nfs-ganesha/package.nix
index 5626abc7cb8a..2ffe5212ee41 100644
--- a/pkgs/by-name/nf/nfs-ganesha/package.nix
+++ b/pkgs/by-name/nf/nfs-ganesha/package.nix
@@ -16,6 +16,7 @@
   flex,
   nfs-utils,
   acl,
+  prometheus-cpp-lite,
   useCeph ? false,
   ceph,
   useDbus ? true,
@@ -24,7 +25,7 @@
 
 stdenv.mkDerivation rec {
   pname = "nfs-ganesha";
-  version = "6.5";
+  version = "9.2";
 
   outputs = [
     "out"
@@ -35,14 +36,16 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nfs-ganesha";
     repo = "nfs-ganesha";
-    rev = "V${version}";
-    hash = "sha256-OHGmEzHu8y/TPQ70E2sicaLtNgvlf/bRq8JRs6S1tpY=";
+    tag = "V${version}";
+    hash = "sha256-2EAkr+zu7Jc2j/8BrJ/+Skv/D3rTSbh4A5JTRhWafEk=";
   };
 
   patches = lib.optional useDbus ./allow-bypassing-dbus-pkg-config-test.patch;
 
   preConfigure = "cd src";
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-redundant-move";
+
   cmakeFlags = [
     "-DUSE_SYSTEM_NTIRPC=ON"
     "-DSYSSTATEDIR=/var"
@@ -50,6 +53,7 @@ stdenv.mkDerivation rec {
     "-DUSE_ACL_MAPPING=ON"
     "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON"
     "-DUSE_MAN_PAGE=ON"
+    "-DUSE_MONITORING=ON"
   ]
   ++ lib.optionals useCeph [
     "-DUSE_RADOS_RECOV=ON"
@@ -85,14 +89,11 @@ stdenv.mkDerivation rec {
     ntirpc
     liburcu
     nfs-utils
+    prometheus-cpp-lite
   ]
   ++ lib.optional useCeph ceph;
 
   postPatch = ''
-    substituteInPlace src/CMakeLists.txt --replace-fail \
-      "cmake_minimum_required(VERSION 2.6.3)" \
-      "cmake_minimum_required(VERSION 3.10)"
-
     substituteInPlace src/tools/mount.9P --replace-fail "/bin/mount" "/usr/bin/env mount"
   '';
 

From 9319694d25812fbf490fef499f117d5d96e8e40d Mon Sep 17 00:00:00 2001
From: Eli Ribble <eli@gleipnir.technology>
Date: Tue, 17 Jun 2025 08:52:33 -0700
Subject: [PATCH 08/60] nixos/onlyoffice: add wopi setting

Expose setting for enabling WOPI support flag in onlyoffice. It's useful
and previously was hard-coded to disabled.

See https://api.onlyoffice.com/docs/docs-api/more-information/faq/using-wopi/
---
 nixos/modules/services/web-apps/onlyoffice.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/onlyoffice.nix b/nixos/modules/services/web-apps/onlyoffice.nix
index 2d0316761ab3..181baceb3c4c 100644
--- a/nixos/modules/services/web-apps/onlyoffice.nix
+++ b/nixos/modules/services/web-apps/onlyoffice.nix
@@ -97,6 +97,8 @@ in
       default = "amqp://guest:guest@localhost:5672";
       description = "The Rabbitmq in amqp URI style OnlyOffice should connect to.";
     };
+
+    wopi = lib.mkEnableOption "Enable WOPI support";
   };
 
   config = lib.mkIf cfg.enable {
@@ -314,7 +316,8 @@ in
               .services.CoAuthoring.secret.outbox.string = "'"$(cat ${cfg.jwtSecretFile})"'" |
               .services.CoAuthoring.secret.session.string = "'"$(cat ${cfg.jwtSecretFile})"'" |
             ''}
-              .rabbitmq.url = "${cfg.rabbitmqUrl}"
+              .rabbitmq.url = "${cfg.rabbitmqUrl}" |
+              .wopi.enable = "${toString cfg.wopi}"
               ' /run/onlyoffice/config/default.json | sponge /run/onlyoffice/config/default.json
 
             chmod u+w /run/onlyoffice/config/production-linux.json

From eec6d815c91e8bc7b3abe8804a94d728c987e310 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 12 Dec 2025 06:35:52 +0100
Subject: [PATCH 09/60] =?UTF-8?q?ocamlPackages.yojson:=202.2.2=20=E2=86=92?=
 =?UTF-8?q?=203.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ocamlPackages.atdgen-codec-runtime: 2.16.0 → 3.0.1
---
 pkgs/by-name/be/beluga/package.nix            |  4 +-
 pkgs/by-name/sa/satyrographos/package.nix     |  5 +-
 .../ada-modules/gnatprove/default.nix         |  2 +-
 .../vscoq-language-server/default.nix         |  5 +-
 .../development/ocaml-modules/atd/default.nix |  2 -
 .../ocaml-modules/atdgen/codec-runtime.nix    | 10 ++--
 .../development/ocaml-modules/github/unix.nix |  9 +++
 .../ocaml-modules/linol/default.nix           |  2 -
 pkgs/development/ocaml-modules/linol/eio.nix  |  2 -
 pkgs/development/ocaml-modules/linol/lwt.nix  |  2 -
 .../ocaml-modules/morbig/default.nix          |  2 -
 .../ocaml-modules/ocaml-lsp/lsp.nix           | 22 +++++--
 .../development/ocaml-modules/ocf/default.nix | 11 ++--
 .../ocaml-modules/ocf/yojson.patch            | 60 +++++++++++++++++++
 .../ppx_deriving_yojson/default.nix           |  8 ++-
 .../ocaml-modules/yojson/default.nix          | 19 +++---
 .../vsrocq-language-server/default.nix        |  5 +-
 pkgs/development/tools/ocaml/merlin/4.x.nix   |  4 +-
 .../tools/ocaml/merlin/default.nix            |  2 +
 pkgs/top-level/ocaml-packages.nix             | 24 +++++++-
 20 files changed, 150 insertions(+), 50 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/ocf/yojson.patch

diff --git a/pkgs/by-name/be/beluga/package.nix b/pkgs/by-name/be/beluga/package.nix
index b2da0ab0e735..dfe20947eee6 100644
--- a/pkgs/by-name/be/beluga/package.nix
+++ b/pkgs/by-name/be/beluga/package.nix
@@ -15,8 +15,6 @@ ocamlPackages.buildDunePackage rec {
     hash = "sha256-bMaLjHq/3ZrST5E9lBSIX0T2cAhDin+lv1XwgUF4/7w=";
   };
 
-  duneVersion = "3";
-
   buildInputs = with ocamlPackages; [
     gen
     sedlex
@@ -26,7 +24,7 @@ ocamlPackages.buildDunePackage rec {
     omd
     uri
     ounit2
-    yojson
+    yojson_2
   ];
 
   doCheck = true;
diff --git a/pkgs/by-name/sa/satyrographos/package.nix b/pkgs/by-name/sa/satyrographos/package.nix
index 611fdd4331e8..6d0bcff93cdd 100644
--- a/pkgs/by-name/sa/satyrographos/package.nix
+++ b/pkgs/by-name/sa/satyrographos/package.nix
@@ -17,8 +17,6 @@ in
 ocamlPackages.buildDunePackage {
   inherit pname version src;
 
-  duneVersion = "3";
-
   nativeBuildInputs = with ocamlPackages; [
     menhir
   ];
@@ -29,14 +27,13 @@ ocamlPackages.buildDunePackage {
     opam-format
     opam-state
     ppx_deriving
-    ppx_deriving_yojson
+    (ppx_deriving_yojson.override { yojson = yojson_2; })
     ppx_import
     ppx_jane
     shexp
     uri
     uri-sexp
     yaml-sexp
-    yojson
   ];
 
   meta = {
diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix
index a64c38918c8f..2eba4ae77a11 100644
--- a/pkgs/development/ada-modules/gnatprove/default.nix
+++ b/pkgs/development/ada-modules/gnatprove/default.nix
@@ -129,7 +129,7 @@ stdenv.mkDerivation {
     num
     re
     sexplib
-    yojson
+    yojson_2
   ])
   ++ (lib.optionals (gnat_version == "14") [
     gpr2_24_2_next
diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix
index 730b1720efd3..97cfa917da58 100644
--- a/pkgs/development/coq-modules/vscoq-language-server/default.nix
+++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix
@@ -62,7 +62,6 @@ ocamlPackages.buildDunePackage {
   ++ (with ocamlPackages; [
     findlib
     lablgtk3-sourceview3
-    yojson
     zarith
     ppx_inline_test
     ppx_assert
@@ -70,7 +69,9 @@ ocamlPackages.buildDunePackage {
     ppx_deriving
     ppx_import
     sexplib
-    ppx_yojson_conv
+    (ppx_yojson_conv.override {
+      ppx_yojson_conv_lib = ppx_yojson_conv_lib.override { yojson = yojson_2; };
+    })
     lsp
     sel
     ppx_optcomp
diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix
index 581390de33e3..2d5daf55ad41 100644
--- a/pkgs/development/ocaml-modules/atd/default.nix
+++ b/pkgs/development/ocaml-modules/atd/default.nix
@@ -14,8 +14,6 @@ buildDunePackage {
   pname = "atd";
   inherit (atdgen-codec-runtime) version src;
 
-  minimalOCamlVersion = "4.08";
-
   nativeBuildInputs = [ menhir ];
   buildInputs = [ cmdliner ];
   propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix b/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix
index b3ea1fbc26fd..2ec8fd434cb5 100644
--- a/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix
+++ b/pkgs/development/ocaml-modules/atdgen/codec-runtime.nix
@@ -4,13 +4,13 @@
   fetchurl,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "atdgen-codec-runtime";
-  version = "2.16.0";
+  version = "3.0.1";
 
   src = fetchurl {
-    url = "https://github.com/ahrefs/atd/releases/download/${version}/atd-${version}.tbz";
-    hash = "sha256-Wea0RWICQcvWkBqEKzNmg6+w6xJbOtv+4ovZTNVODe8=";
+    url = "https://github.com/ahrefs/atd/releases/download/${finalAttrs.version}/atd-${finalAttrs.version}.tbz";
+    hash = "sha256-A66uRWWjLYu2ishRSvXvx4ALFhnClzlBynE4sSs0SIQ=";
   };
 
   meta = {
@@ -19,4 +19,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
     license = lib.licenses.mit;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/github/unix.nix b/pkgs/development/ocaml-modules/github/unix.nix
index 4dd70fea7feb..54e5dc5daa98 100644
--- a/pkgs/development/ocaml-modules/github/unix.nix
+++ b/pkgs/development/ocaml-modules/github/unix.nix
@@ -1,5 +1,6 @@
 {
   buildDunePackage,
+  fetchpatch,
   github,
   cohttp,
   cohttp-lwt-unix,
@@ -12,6 +13,14 @@ buildDunePackage {
   pname = "github-unix";
   inherit (github) version src;
 
+  patches = [
+    # Compatibility with yojson 3.0
+    (fetchpatch {
+      url = "https://github.com/mirage/ocaml-github/commit/487d7d413363921a8ffbb941610c2f71c811add8.patch";
+      hash = "sha256-ThCsWRQKmlRg7rk8tlorsO87v8RWnBvocHDvgg/WWMA=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace unix/dune --replace 'github bytes' 'github'
   '';
diff --git a/pkgs/development/ocaml-modules/linol/default.nix b/pkgs/development/ocaml-modules/linol/default.nix
index 15262d3386de..60668a60d1d3 100644
--- a/pkgs/development/ocaml-modules/linol/default.nix
+++ b/pkgs/development/ocaml-modules/linol/default.nix
@@ -6,7 +6,6 @@
   ppx_yojson_conv_lib,
   trace,
   uutf,
-  yojson,
 }:
 
 buildDunePackage (finalAttrs: {
@@ -27,7 +26,6 @@ buildDunePackage (finalAttrs: {
     ppx_yojson_conv_lib
     trace
     uutf
-    yojson
   ];
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/linol/eio.nix b/pkgs/development/ocaml-modules/linol/eio.nix
index 807f6d744284..703da109c67f 100644
--- a/pkgs/development/ocaml-modules/linol/eio.nix
+++ b/pkgs/development/ocaml-modules/linol/eio.nix
@@ -2,7 +2,6 @@
   buildDunePackage,
   eio,
   linol,
-  yojson,
 }:
 
 buildDunePackage {
@@ -12,7 +11,6 @@ buildDunePackage {
   propagatedBuildInputs = [
     eio
     linol
-    yojson
   ];
 
   meta = linol.meta // {
diff --git a/pkgs/development/ocaml-modules/linol/lwt.nix b/pkgs/development/ocaml-modules/linol/lwt.nix
index f757db90ee6e..57585e0e8c0a 100644
--- a/pkgs/development/ocaml-modules/linol/lwt.nix
+++ b/pkgs/development/ocaml-modules/linol/lwt.nix
@@ -2,7 +2,6 @@
   buildDunePackage,
   linol,
   lwt,
-  yojson,
 }:
 
 buildDunePackage {
@@ -12,7 +11,6 @@ buildDunePackage {
   propagatedBuildInputs = [
     linol
     lwt
-    yojson
   ];
 
   meta = linol.meta // {
diff --git a/pkgs/development/ocaml-modules/morbig/default.nix b/pkgs/development/ocaml-modules/morbig/default.nix
index 3d5e81721061..9197c9352e1e 100644
--- a/pkgs/development/ocaml-modules/morbig/default.nix
+++ b/pkgs/development/ocaml-modules/morbig/default.nix
@@ -7,7 +7,6 @@
   menhirLib,
   ppx_deriving_yojson,
   visitors,
-  yojson,
 }:
 
 lib.throwIf (lib.versionAtLeast ocaml.version "5.4")
@@ -33,7 +32,6 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.4")
       menhirLib
       ppx_deriving_yojson
       visitors
-      yojson
     ];
 
     meta = {
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
index 11954a620834..15366a975b03 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
@@ -4,6 +4,7 @@
   cppo,
   stdlib-shims,
   ppx_yojson_conv_lib,
+  yojson_2,
   ocaml-syntax-shims,
   jsonrpc,
   omd,
@@ -62,7 +63,6 @@ buildDunePackage rec {
       [
         pp
         re
-        ppx_yojson_conv_lib
         octavius
         dune-build-info
         dune-rpc
@@ -77,7 +77,6 @@ buildDunePackage rec {
       [
         pp
         re
-        ppx_yojson_conv_lib
         octavius
         dune-build-info
         dune-rpc
@@ -109,21 +108,36 @@ buildDunePackage rec {
   nativeBuildInputs = lib.optional (lib.versionOlder version "1.7.0") cppo;
 
   propagatedBuildInputs =
-    if lib.versionAtLeast version "1.14.0" then
+    if lib.versionAtLeast version "1.23.1" then
       [
         jsonrpc
         ppx_yojson_conv_lib
         uutf
       ]
+    else if lib.versionAtLeast version "1.14.0" then
+      [
+        jsonrpc
+        (ppx_yojson_conv_lib.override { yojson = yojson_2; })
+        uutf
+      ]
     else if lib.versionAtLeast version "1.10.0" then
       [
         dyn
         jsonrpc
         ordering
-        ppx_yojson_conv_lib
+        (ppx_yojson_conv_lib.override { yojson = yojson_2; })
         stdune
         uutf
       ]
+    else if lib.versionAtLeast version "1.9.0" then
+      [
+        csexp
+        jsonrpc
+        (pp.override { version = "1.2.0"; })
+        (ppx_yojson_conv_lib.override { yojson = yojson_2; })
+        result
+        uutf
+      ]
     else if lib.versionAtLeast version "1.7.0" then
       [
         csexp
diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix
index d71741fa2e9a..3adcadfda835 100644
--- a/pkgs/development/ocaml-modules/ocf/default.nix
+++ b/pkgs/development/ocaml-modules/ocf/default.nix
@@ -5,17 +5,16 @@
   yojson,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ocf";
   version = "0.9.0";
-  duneVersion = "3";
-  minimalOCamlVersion = "4.03";
+  patches = ./yojson.patch;
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "zoggy";
     repo = "ocf";
-    rev = version;
-    sha256 = "sha256-tTNpvncLO/WfcMbjqRfqzcdPv2Bd877fOU5AZlkkcXA=";
+    tag = finalAttrs.version;
+    hash = "sha256-tTNpvncLO/WfcMbjqRfqzcdPv2Bd877fOU5AZlkkcXA=";
   };
 
   propagatedBuildInputs = [ yojson ];
@@ -26,4 +25,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl3;
     maintainers = with lib.maintainers; [ regnat ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocf/yojson.patch b/pkgs/development/ocaml-modules/ocf/yojson.patch
new file mode 100644
index 000000000000..8f9ffe6f9689
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocf/yojson.patch
@@ -0,0 +1,60 @@
+From caf5430f30830a2222bd7d0e6c5cea7b632e4a6a Mon Sep 17 00:00:00 2001
+From: Zoggy <zoggy@bat8.org>
+Date: Wed, 22 Oct 2025 11:41:52 +0200
+Subject: [PATCH] support Yojson >= 3.0: do not use `Tuple any more, use `List
+ instead
+
+---
+ Changes    |  3 +++
+ lib/ocf.ml | 14 +++++---------
+ 2 files changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/lib/ocf.ml b/lib/ocf.ml
+index 3169d13..3ac98a4 100644
+--- a/lib/ocf.ml
++++ b/lib/ocf.ml
+@@ -130,8 +130,7 @@ module Wrapper =
+     let list w =
+       let to_j ?with_doc l = `List (List.map (w.to_json ?with_doc) l) in
+       let from_j ?def = function
+-      | `List l
+-      | `Tuple l -> List.map (w.from_json ?def: None) l
++      | `List l -> List.map (w.from_json ?def: None) l
+       | `Null -> []
+       | json -> invalid_value json
+       in
+@@ -150,27 +149,24 @@ module Wrapper =
+
+     let pair w1 w2 =
+       let to_j ?with_doc (v1, v2) =
+-        `Tuple [w1.to_json ?with_doc v1 ; w2.to_json ?with_doc v2]
++        `List [w1.to_json ?with_doc v1 ; w2.to_json ?with_doc v2]
+       in
+       let from_j ?def = function
+-        `List [v1 ; v2]
+-      | `Tuple [v1 ; v2] -> (w1.from_json v1, w2.from_json v2)
++      | `List [v1 ; v2] -> (w1.from_json v1, w2.from_json v2)
+       | json -> invalid_value json
+       in
+       make to_j from_j
+
+     let triple w1 w2 w3 =
+       let to_j ?with_doc (v1, v2, v3) =
+-        `Tuple [
++        `List [
+           w1.to_json ?with_doc v1 ;
+           w2.to_json ?with_doc v2 ;
+           w3.to_json ?with_doc v3 ;
+         ]
+       in
+       let from_j ?def = function
+-        `List [v1 ; v2 ; v3]
+-      | `Tuple [v1 ; v2 ; v3] ->
+-          (w1.from_json v1, w2.from_json v2, w3.from_json v3)
++        `List [v1 ; v2 ; v3] -> (w1.from_json v1, w2.from_json v2, w3.from_json v3)
+       | json -> invalid_value json
+       in
+       make to_j from_j
+--
+GitLab
+
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
index 55268ac06f2c..c69bc6fdd15f 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildDunePackage,
   fetchFromGitHub,
+  fetchpatch,
   ocaml,
   ppxlib,
   ounit,
@@ -38,7 +39,10 @@ buildDunePackage rec {
   pname = "ppx_deriving_yojson";
   inherit (param) version;
 
-  minimalOCamlVersion = "4.07";
+  patches = fetchpatch {
+    url = "https://github.com/ocaml-ppx/ppx_deriving_yojson/commit/1bbbe2c4c5822c4297b0b812c59a155cf96c5089.patch";
+    hash = "sha256-jYW2/Ix6T94vfI2mGnIkYSG1rjsWEsnOPA1mufP3sd4=";
+  };
 
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
@@ -54,7 +58,7 @@ buildDunePackage rec {
   ]
   ++ param.propagatedBuildInputs or [ ];
 
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  doCheck = true;
   inherit (param) checkInputs;
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix
index 9c8ed3690615..ecdac537ce37 100644
--- a/pkgs/development/ocaml-modules/yojson/default.nix
+++ b/pkgs/development/ocaml-modules/yojson/default.nix
@@ -5,22 +5,27 @@
   seq,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "yojson";
-  version = "2.2.2";
+  version = "3.0.0";
 
   src = fetchurl {
-    url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";
-    hash = "sha256-mr+tjJp51HI60vZEjmacHmjb/IfMVKG3wGSwyQkSxZU=";
+    url = "https://github.com/ocaml-community/yojson/releases/download/${finalAttrs.version}/yojson-${finalAttrs.version}.tbz";
+    hash =
+      {
+        "3.0.0" = "sha256-mUFNp2CbkqAkdO9LSezaFe3Iy7pSKTQbEk5+RpXDlhA=";
+        "2.2.2" = "sha256-mr+tjJp51HI60vZEjmacHmjb/IfMVKG3wGSwyQkSxZU=";
+      }
+      ."${finalAttrs.version}";
   };
 
-  propagatedBuildInputs = [ seq ];
+  propagatedBuildInputs = lib.optional (!lib.versionAtLeast finalAttrs.version "3.0.0") seq;
 
   meta = {
     description = "Optimized parsing and printing library for the JSON format";
-    homepage = "https://github.com/ocaml-community/${pname}";
+    homepage = "https://github.com/ocaml-community/yojson";
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.vbgl ];
     mainProgram = "ydump";
   };
-}
+})
diff --git a/pkgs/development/rocq-modules/vsrocq-language-server/default.nix b/pkgs/development/rocq-modules/vsrocq-language-server/default.nix
index cc96fe9a78ac..7d724a8328e7 100644
--- a/pkgs/development/rocq-modules/vsrocq-language-server/default.nix
+++ b/pkgs/development/rocq-modules/vsrocq-language-server/default.nix
@@ -48,7 +48,6 @@ ocamlPackages.buildDunePackage {
   ++ (with ocamlPackages; [
     findlib
     lablgtk3-sourceview3
-    yojson
     zarith
     ppx_inline_test
     ppx_assert
@@ -56,7 +55,9 @@ ocamlPackages.buildDunePackage {
     ppx_deriving
     ppx_import
     sexplib
-    ppx_yojson_conv
+    (ppx_yojson_conv.override {
+      ppx_yojson_conv_lib = ppx_yojson_conv_lib.override { yojson = yojson_2; };
+    })
     lsp
     sel
     ppx_optcomp
diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix
index 530c9c6ac829..10774604e01a 100644
--- a/pkgs/development/tools/ocaml/merlin/4.x.nix
+++ b/pkgs/development/tools/ocaml/merlin/4.x.nix
@@ -13,6 +13,7 @@
   menhir,
   menhirLib,
   menhirSdk,
+  seq,
   # Each releases of Merlin support a limited range of versions of OCaml.
   version ?
     {
@@ -85,7 +86,8 @@ buildDunePackage {
     (if lib.versionAtLeast version "4.7-414" then merlin-lib else csexp)
     menhirSdk
     menhirLib
-  ];
+  ]
+  ++ lib.optional (!lib.versionAtLeast version "4.7-414") seq;
 
   doCheck = false;
   checkPhase = ''
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 048ea46551d9..797c2dbdd71e 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -9,6 +9,7 @@
   yojson,
   csexp,
   result,
+  seq,
   menhirSdk,
 }:
 
@@ -43,6 +44,7 @@ buildDunePackage rec {
     yojson
     csexp
     result
+    seq
     menhirSdk
   ];
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 1d8c79728cfe..7abd09c29eab 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -422,7 +422,12 @@ let
 
         dolmen_loop = callPackage ../development/ocaml-modules/dolmen/loop.nix { };
 
-        dolmen_lsp = callPackage ../development/ocaml-modules/dolmen/lsp.nix { };
+        dolmen_lsp = callPackage ../development/ocaml-modules/dolmen/lsp.nix {
+          lsp = lsp.override {
+            jsonrpc = jsonrpc.override { yojson = yojson_2; };
+            ppx_yojson_conv_lib = ppx_yojson_conv_lib.override { yojson = yojson_2; };
+          };
+        };
 
         dolmen_model = callPackage ../development/ocaml-modules/dolmen/model.nix { };
 
@@ -1062,7 +1067,11 @@ let
 
         linksem = callPackage ../development/ocaml-modules/linksem { };
 
-        linol = callPackage ../development/ocaml-modules/linol { };
+        linol = callPackage ../development/ocaml-modules/linol {
+          ppx_yojson_conv_lib = ppx_yojson_conv_lib.override {
+            yojson = yojson_2;
+          };
+        };
 
         linol-eio = callPackage ../development/ocaml-modules/linol/eio.nix { };
 
@@ -1310,7 +1319,11 @@ let
           inherit (pkgs.llvmPackages_19) clang libclang libllvm;
         };
 
-        morbig = callPackage ../development/ocaml-modules/morbig { };
+        morbig = callPackage ../development/ocaml-modules/morbig {
+          ppx_deriving_yojson = ppx_deriving_yojson.override {
+            yojson = yojson_2;
+          };
+        };
 
         mparser = callPackage ../development/ocaml-modules/mparser { };
 
@@ -2190,6 +2203,11 @@ let
 
         yojson = callPackage ../development/ocaml-modules/yojson { };
 
+        yojson_2 = yojson.overrideAttrs (_: {
+          version = "2.2.2";
+          __intentionallyOverridingVersion = true;
+        });
+
         yuscii = callPackage ../development/ocaml-modules/yuscii { };
 
         yuujinchou = callPackage ../development/ocaml-modules/yuujinchou { };

From 9ccf0dc9f1d16bc98981653c5cce23d32db7d2f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Dec 2025 18:45:51 +0000
Subject: [PATCH 10/60] cosmic-ext-applet-minimon: 0.9.0 -> 1.0.0

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

diff --git a/pkgs/by-name/co/cosmic-ext-applet-minimon/package.nix b/pkgs/by-name/co/cosmic-ext-applet-minimon/package.nix
index d04c80281cae..248945e9d132 100644
--- a/pkgs/by-name/co/cosmic-ext-applet-minimon/package.nix
+++ b/pkgs/by-name/co/cosmic-ext-applet-minimon/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-ext-applet-minimon";
-  version = "0.9.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "cosmic-utils";
     repo = "minimon-applet";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tUAp6GN5oJYhALjTpEELMOEBpfao5D9B0hl2ecNtwMg=";
+    hash = "sha256-Vxbzg7LHD+gYOeS+KHbV1zo17O0BsDLgQayYS0yBIOM=";
   };
 
-  cargoHash = "sha256-qgqlEufv9vLLIOcDLiX76xRcXal1Q0S5726ua+8R8Ek=";
+  cargoHash = "sha256-VmpzzEe6rE2LbaH1wZH37FoLJ93y4VIK8KiVDzT/Wj8=";
 
   nativeBuildInputs = [
     just

From 8a6fb2722f77c94fb51f536b06b68eb3c739fb90 Mon Sep 17 00:00:00 2001
From: cyclopentane <cyclopentane@aidoskyneen.eu>
Date: Sun, 14 Dec 2025 14:33:50 +0100
Subject: [PATCH 11/60] nixos/akkoma: change type of extraStatic sources to
 types.pathInStore

This change makes it possible to define `extraStatic` entries directly
from files in the Nix source tree by setting e.g.
`extraStatic."static/terms-of-service.html" = ./tos.html`. Previously,
is was necessary to use hacks like `pkgs.writeText "tos.html"
(builtins.readFile ./tos.html)` to do that.
---
 nixos/modules/services/web-apps/akkoma.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix
index f88e8db6fa5b..250f799718ab 100644
--- a/nixos/modules/services/web-apps/akkoma.nix
+++ b/nixos/modules/services/web-apps/akkoma.nix
@@ -675,9 +675,9 @@ in
       };
 
       extraStatic = mkOption {
-        type = with types; nullOr (attrsOf package);
+        type = with types; nullOr (attrsOf pathInStore);
         description = ''
-          Attribute set of extra packages to add to the static files directory.
+          Attribute set of extra paths to add to the static files directory.
 
           Do not add frontends here. These should be configured through
           [{option}`services.akkoma.frontends`](#opt-services.akkoma.frontends).

From 108c36953a75771675e0056bb94f2467784353cf Mon Sep 17 00:00:00 2001
From: Vikingnope <aidsch0605@outlook.com>
Date: Sun, 14 Dec 2025 21:18:45 +0100
Subject: [PATCH 12/60] jellyfin-media-player: rename to jellyfin-desktop

---
 .../default.nix                               | 42 +++++++++++++------
 .../non-fatal-unique-app.patch                | 19 +++++++++
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 51 insertions(+), 13 deletions(-)
 rename pkgs/applications/video/{jellyfin-media-player => jellyfin-desktop}/default.nix (53%)
 create mode 100644 pkgs/applications/video/jellyfin-desktop/non-fatal-unique-app.patch

diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-desktop/default.nix
similarity index 53%
rename from pkgs/applications/video/jellyfin-media-player/default.nix
rename to pkgs/applications/video/jellyfin-desktop/default.nix
index 4927d2c563f0..2e3cbdbec819 100644
--- a/pkgs/applications/video/jellyfin-media-player/default.nix
+++ b/pkgs/applications/video/jellyfin-desktop/default.nix
@@ -4,40 +4,48 @@
   stdenv,
   cmake,
   ninja,
+  python3,
   wrapQtAppsHook,
   qtbase,
   qtdeclarative,
   qtwebchannel,
   qtwebengine,
+  mpv-unwrapped,
   mpvqt,
   libcec,
   SDL2,
   libXrandr,
+  cacert,
+  nix-update-script,
 }:
 stdenv.mkDerivation rec {
-  pname = "jellyfin-media-player";
+  pname = "jellyfin-desktop";
   version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
-    repo = "jellyfin-media-player";
+    repo = "jellyfin-desktop";
     rev = "v${version}";
-    hash = "sha256-tdjmOeuC3LFEIDSH8X9LG/myvE1FoxwR1zpDQRyaTkQ=";
+    hash = "sha256-ITlYOrMS6COx9kDRSBi4wM6mzL/Q2G5X9GbABwDIOe4=";
+    fetchSubmodules = true;
   };
+  patches = [
+    ./non-fatal-unique-app.patch
+  ];
 
   nativeBuildInputs = [
     cmake
     ninja
     wrapQtAppsHook
-  ];
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin python3;
 
   buildInputs = [
     qtbase
     qtdeclarative
     qtwebchannel
     qtwebengine
-
-    mpvqt
+    mpv-unwrapped
 
     # input sources
     libcec
@@ -45,23 +53,33 @@ stdenv.mkDerivation rec {
 
     # frame rate switching
     libXrandr
-  ];
+    cacert
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) mpvqt;
 
   cmakeFlags = [
     "-DCHECK_FOR_UPDATES=OFF"
-    "-DUSE_STATIC_MPVQT=OFF"
     # workaround for Qt cmake weirdness
     "-DQT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES=ON"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "-DUSE_STATIC_MPVQT=ON"
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) "-DUSE_STATIC_MPVQT=OFF";
+
+  qtWrapperArgs = [
+    "--set QT_STYLE_OVERRIDE Fusion"
+    "--set NIX_SSL_CERT_FILE ${cacert}/etc/ssl/certs/ca-bundle.crt"
   ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/bin $out/Applications
-    mv "$out/Jellyfin Media Player.app" $out/Applications
-    ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer
+    mv "$out/Jellyfin Desktop.app" $out/Applications
+    ln -s "$out/Applications/Jellyfin Desktop.app/Contents/MacOS/Jellyfin Desktop" $out/bin/jellyfindesktop
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
-    homepage = "https://github.com/jellyfin/jellyfin-media-player";
+    homepage = "https://github.com/jellyfin/jellyfin-desktop";
     description = "Jellyfin Desktop Client";
     license = with lib.licenses; [
       gpl2Only
@@ -78,6 +96,6 @@ stdenv.mkDerivation rec {
       kranzes
       paumr
     ];
-    mainProgram = "jellyfinmediaplayer";
+    mainProgram = "jellyfin-desktop";
   };
 }
diff --git a/pkgs/applications/video/jellyfin-desktop/non-fatal-unique-app.patch b/pkgs/applications/video/jellyfin-desktop/non-fatal-unique-app.patch
new file mode 100644
index 000000000000..de50edd43f96
--- /dev/null
+++ b/pkgs/applications/video/jellyfin-desktop/non-fatal-unique-app.patch
@@ -0,0 +1,19 @@
+--- a/src/shared/UniqueApplication.h
++++ b/src/shared/UniqueApplication.h
+@@ -6,6 +6,7 @@
+ #define KONVERGO_UNIQUEAPPLICATION_H
+ 
+ #include <QObject>
++#include <QDebug>
+ #include "Paths.h"
+ #include "LocalJsonServer.h"
+ #include "LocalJsonClient.h"
+@@ -35,7 +36,7 @@
+     });
+ 
+     if (!m_server->listen())
+-      throw FatalException("Failed to listen to uniqueApp socket: " + m_server->errorString());
++      qWarning() << "Failed to listen to uniqueApp socket: " << m_server->errorString();
+   }
+ 
+   bool ensureUnique()
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2db64150f056..748a522ecc24 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -765,6 +765,7 @@ mapAliases {
   jdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
   jdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   jdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
+  jellyfin-media-player = jellyfin-desktop; # Added 2025-12-14
   jesec-rtorrent = throw "'jesec-rtorrent' has been removed due to lack of maintenance upstream."; # Added 2025-11-20
   jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
   jing = jing-trang; # Added 2025-09-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56b684baa014..84affdeb1e8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2046,7 +2046,7 @@ with pkgs;
 
   intensity-normalization = with python3Packages; toPythonApplication intensity-normalization;
 
-  jellyfin-media-player = kdePackages.callPackage ../applications/video/jellyfin-media-player { };
+  jellyfin-desktop = kdePackages.callPackage ../applications/video/jellyfin-desktop { };
 
   jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { };
 

From cbcce89d8c692e4364dfb32e2f3878f2cba38436 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Thu, 18 Dec 2025 11:38:25 +0100
Subject: [PATCH 13/60] pkgs/formats: toml format type is not nullable

---
 pkgs/pkgs-lib/formats.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index 4a81c1319463..14ca988e9c49 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -487,7 +487,10 @@ optionalAttrs allowAliases aliases
     { }:
     json { }
     // {
-      type = mkStructuredType { typeName = "TOML"; };
+      type = mkStructuredType {
+        typeName = "TOML";
+        nullable = false;
+      };
 
       generate =
         name: value:

From 7f2f0b9fcbb0ec5430335ad42a6fc87f24bde4b8 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Thu, 18 Dec 2025 17:30:13 +0000
Subject: [PATCH 14/60] ispc: remove upstreamed disabling of tests

---
 pkgs/by-name/is/ispc/package.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/by-name/is/ispc/package.nix b/pkgs/by-name/is/ispc/package.nix
index c7312abea807..d4e1fa69c181 100644
--- a/pkgs/by-name/is/ispc/package.nix
+++ b/pkgs/by-name/is/ispc/package.nix
@@ -54,14 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace src/util.cpp \
         --replace-fail "#ifdef _LIBCPP_VERSION" "#if FALSE"
-    ''
-    # These tests fail on x86_64-darwin, see ispc/ispc#{3529, 3623}
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
-      substituteInPlace tests/func-tests/round-float16-uniform.ispc \
-        --replace-fail "// See issue #3529" "// rule: skip on OS=mac"
-
-      substituteInPlace tests/func-tests/round-float16-varying.ispc \
-        --replace-fail "// See issue #3529" "// rule: skip on OS=mac"
     '';
 
   inherit testedTargets;

From b0acc9e842ca0b3789bf9761898118d2046c6f40 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 18 Dec 2025 12:59:14 -0500
Subject: [PATCH 15/60] vega-cli: migrate from nodePackages

---
 pkgs/by-name/ve/vega-cli/package.nix          |  77 ++
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 800 ------------------
 pkgs/development/node-packages/overrides.nix  |  11 -
 5 files changed, 78 insertions(+), 812 deletions(-)
 create mode 100644 pkgs/by-name/ve/vega-cli/package.nix

diff --git a/pkgs/by-name/ve/vega-cli/package.nix b/pkgs/by-name/ve/vega-cli/package.nix
new file mode 100644
index 000000000000..d16fb6c64a87
--- /dev/null
+++ b/pkgs/by-name/ve/vega-cli/package.nix
@@ -0,0 +1,77 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  pkg-config,
+  pixman,
+  cairo,
+  pango,
+  jq,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "vega-cli";
+  version = "6.2.0";
+
+  src = fetchFromGitHub {
+    owner = "vega";
+    repo = "vega";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-YO3YzTRNJKDOgCxMXnw2P2d1ZN79Db3//L9iLjDGiyM=";
+  };
+
+  postPatch = ''
+    # We never need this, so just skip it to save some time while building.
+    patchShebangs scripts/postinstall.sh
+    substituteInPlace scripts/postinstall.sh \
+      --replace-fail "npm run data" "true"
+
+    # Patch lerna.json to not use nx
+    mv lerna.json lerna.old.json
+    jq '. + {useNx: false}' < lerna.old.json > lerna.json
+  '';
+
+  npmDepsHash = "sha256-mBe1fHnhor7ZR8CuRNs1zD7JzaZXZI5VM7mdAieVKqE=";
+
+  npmWorkspace = "vega-cli";
+
+  buildInputs = [
+    pixman
+    cairo
+    pango
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    jq
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    npm run build --scope vega-cli --include-dependencies --stream
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    # prune non-prod deps
+    npm prune --omit=dev --no-save --workspace vega-cli
+
+    mkdir -p $out/lib/node_modules/vega-cli
+    rm -rf packages/**/{test,*.md,.npmignore}
+    cp -r ./packages ./node_modules $out/lib/node_modules/vega-cli
+    ln -s $out/lib/node_modules/vega-cli/packages/vega-cli/bin $out/bin
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Command line tools for the Vega visualization grammar";
+    homepage = "https://vega.github.io/vega/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 888896191fef..100191e6ff7d 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -399,6 +399,7 @@ mapAliases {
   inherit (pkgs) ungit; # added 2023-08-20
   unified-language-server = throw "unified-language-server was removed as it is a library that should be imported within a Javascript project, not an end-user tool"; # added 2025-10-02
   inherit (pkgs) uppy-companion; # Added 2025-11-01
+  inherit (pkgs) vega-cli; # Added 2025-12-18
   inherit (pkgs) vega-lite; # Added 2025-11-04
   inherit (pkgs) vim-language-server; # added 2024-06-25
   vls = throw "vls has been deprecated by upstream as vetur is also deprecated. Upstream suggests migrating to Volar for Vue LSP tooling instead."; # added 2024-12-09
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index c671f62f42be..40abd112e972 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -22,7 +22,6 @@
 , "postcss"
 , "sass"
 , "semver"
-, "vega-cli"
 , "vercel"
 , "wavedrom-cli"
 ]
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 534cc6964a9b..fc6963f1cc93 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -1200,15 +1200,6 @@ let
         sha512 = "0hz44rAcrphyXcA8IS7EJ2SCoaBZD2u5goE8S/e+q/DL+dOGpqpcLidVOFeLG3VgML62SXmfRLAhWt0zL1oW4Q==";
       };
     };
-    "@mapbox/node-pre-gyp-1.0.11" = {
-      name = "_at_mapbox_slash_node-pre-gyp";
-      packageName = "@mapbox/node-pre-gyp";
-      version = "1.0.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz";
-        sha512 = "Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==";
-      };
-    };
     "@mapbox/node-pre-gyp-2.0.0" = {
       name = "_at_mapbox_slash_node-pre-gyp";
       packageName = "@mapbox/node-pre-gyp";
@@ -2460,15 +2451,6 @@ let
         sha512 = "52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==";
       };
     };
-    "@types/geojson-7946.0.4" = {
-      name = "_at_types_slash_geojson";
-      packageName = "@types/geojson";
-      version = "7946.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.4.tgz";
-        sha512 = "MHmwBtCb7OCv1DSivz2UNJXPGU/1btAWRKlqJ2saEhVJkpkvqHMMaOpKg0v4sAbDWSQekHGvPVMM8nQ+Jen03Q==";
-      };
-    };
     "@types/get-stdin-5.0.1" = {
       name = "_at_types_slash_get-stdin";
       packageName = "@types/get-stdin";
@@ -3306,15 +3288,6 @@ let
         sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
       };
     };
-    "aproba-2.0.0" = {
-      name = "aproba";
-      packageName = "aproba";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz";
-        sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==";
-      };
-    };
     "arch-2.2.0" = {
       name = "arch";
       packageName = "arch";
@@ -3351,15 +3324,6 @@ let
         sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==";
       };
     };
-    "are-we-there-yet-2.0.0" = {
-      name = "are-we-there-yet";
-      packageName = "are-we-there-yet";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz";
-        sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==";
-      };
-    };
     "arg-4.1.0" = {
       name = "arg";
       packageName = "arg";
@@ -4386,15 +4350,6 @@ let
         sha512 = "qMKdlOfsjlezMqxkUGGMaWWs17i2HoL15tM+wtx8ld4nLrUwU58TFdvyGOz/piNP842KeO8yXvggVQSdQ828NA==";
       };
     };
-    "canvas-2.11.2" = {
-      name = "canvas";
-      packageName = "canvas";
-      version = "2.11.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz";
-        sha512 = "ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==";
-      };
-    };
     "cardinal-2.1.1" = {
       name = "cardinal";
       packageName = "cardinal";
@@ -4890,15 +4845,6 @@ let
         sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
       };
     };
-    "color-support-1.1.3" = {
-      name = "color-support";
-      packageName = "color-support";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz";
-        sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==";
-      };
-    };
     "colorette-2.0.20" = {
       name = "colorette";
       packageName = "colorette";
@@ -4971,15 +4917,6 @@ let
         sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
       };
     };
-    "commander-7.2.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "7.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz";
-        sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==";
-      };
-    };
     "comment-json-4.2.5" = {
       name = "comment-json";
       packageName = "comment-json";
@@ -5439,177 +5376,6 @@ let
         sha512 = "p6JFxJc3M4OTD2li2qaHkDCw9SfMw82Ldr6OC9Je1aXiGfhx2W8p3GaoeaGrPJTUN9NirTM/KTxHWMUdR1rsUg==";
       };
     };
-    "d3-array-3.2.4" = {
-      name = "d3-array";
-      packageName = "d3-array";
-      version = "3.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz";
-        sha512 = "tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==";
-      };
-    };
-    "d3-color-3.1.0" = {
-      name = "d3-color";
-      packageName = "d3-color";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz";
-        sha512 = "zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==";
-      };
-    };
-    "d3-delaunay-6.0.4" = {
-      name = "d3-delaunay";
-      packageName = "d3-delaunay";
-      version = "6.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz";
-        sha512 = "mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==";
-      };
-    };
-    "d3-dispatch-3.0.1" = {
-      name = "d3-dispatch";
-      packageName = "d3-dispatch";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz";
-        sha512 = "rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==";
-      };
-    };
-    "d3-dsv-3.0.1" = {
-      name = "d3-dsv";
-      packageName = "d3-dsv";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz";
-        sha512 = "UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==";
-      };
-    };
-    "d3-force-3.0.0" = {
-      name = "d3-force";
-      packageName = "d3-force";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz";
-        sha512 = "zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==";
-      };
-    };
-    "d3-format-3.1.0" = {
-      name = "d3-format";
-      packageName = "d3-format";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz";
-        sha512 = "YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==";
-      };
-    };
-    "d3-geo-3.1.1" = {
-      name = "d3-geo";
-      packageName = "d3-geo";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz";
-        sha512 = "637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==";
-      };
-    };
-    "d3-geo-projection-4.0.0" = {
-      name = "d3-geo-projection";
-      packageName = "d3-geo-projection";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-4.0.0.tgz";
-        sha512 = "p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg==";
-      };
-    };
-    "d3-hierarchy-3.1.2" = {
-      name = "d3-hierarchy";
-      packageName = "d3-hierarchy";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz";
-        sha512 = "FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==";
-      };
-    };
-    "d3-interpolate-3.0.1" = {
-      name = "d3-interpolate";
-      packageName = "d3-interpolate";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz";
-        sha512 = "3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==";
-      };
-    };
-    "d3-path-3.1.0" = {
-      name = "d3-path";
-      packageName = "d3-path";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz";
-        sha512 = "p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==";
-      };
-    };
-    "d3-quadtree-3.0.1" = {
-      name = "d3-quadtree";
-      packageName = "d3-quadtree";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz";
-        sha512 = "04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==";
-      };
-    };
-    "d3-scale-4.0.2" = {
-      name = "d3-scale";
-      packageName = "d3-scale";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz";
-        sha512 = "GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==";
-      };
-    };
-    "d3-scale-chromatic-3.1.0" = {
-      name = "d3-scale-chromatic";
-      packageName = "d3-scale-chromatic";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz";
-        sha512 = "A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==";
-      };
-    };
-    "d3-shape-3.2.0" = {
-      name = "d3-shape";
-      packageName = "d3-shape";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz";
-        sha512 = "SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==";
-      };
-    };
-    "d3-time-3.1.0" = {
-      name = "d3-time";
-      packageName = "d3-time";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz";
-        sha512 = "VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==";
-      };
-    };
-    "d3-time-format-4.1.0" = {
-      name = "d3-time-format";
-      packageName = "d3-time-format";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz";
-        sha512 = "dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==";
-      };
-    };
-    "d3-timer-3.0.1" = {
-      name = "d3-timer";
-      packageName = "d3-timer";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz";
-        sha512 = "ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==";
-      };
-    };
     "dash-ast-1.0.0" = {
       name = "dash-ast";
       packageName = "dash-ast";
@@ -5718,15 +5484,6 @@ let
         sha512 = "BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==";
       };
     };
-    "decompress-response-4.2.1" = {
-      name = "decompress-response";
-      packageName = "decompress-response";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz";
-        sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==";
-      };
-    };
     "decompress-response-6.0.0" = {
       name = "decompress-response";
       packageName = "decompress-response";
@@ -5817,15 +5574,6 @@ let
         sha512 = "hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==";
       };
     };
-    "delaunator-5.0.1" = {
-      name = "delaunator";
-      packageName = "delaunator";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz";
-        sha512 = "8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==";
-      };
-    };
     "delay-5.0.0" = {
       name = "delay";
       packageName = "delay";
@@ -7518,15 +7266,6 @@ let
         sha512 = "14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==";
       };
     };
-    "gauge-3.0.2" = {
-      name = "gauge";
-      packageName = "gauge";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz";
-        sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==";
-      };
-    };
     "generic-pool-3.4.2" = {
       name = "generic-pool";
       packageName = "generic-pool";
@@ -8742,15 +8481,6 @@ let
         sha512 = "becs5gzcHwPrlHawscYkyQ/ShiOiosrXPhA5RVZ3qyWH4aWdD52RnMfXq/dwQXciHwiieD8aIPwdIWYv6eL+sQ==";
       };
     };
-    "internmap-2.0.3" = {
-      name = "internmap";
-      packageName = "internmap";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz";
-        sha512 = "5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==";
-      };
-    };
     "interpret-1.1.0" = {
       name = "interpret";
       packageName = "interpret";
@@ -11244,15 +10974,6 @@ let
         sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==";
       };
     };
-    "mimic-response-2.1.0" = {
-      name = "mimic-response";
-      packageName = "mimic-response";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz";
-        sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==";
-      };
-    };
     "mimic-response-3.1.0" = {
       name = "mimic-response";
       packageName = "mimic-response";
@@ -11667,15 +11388,6 @@ let
         sha512 = "2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==";
       };
     };
-    "nan-2.22.2" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.22.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz";
-        sha512 = "DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==";
-      };
-    };
     "nanoid-3.3.9" = {
       name = "nanoid";
       packageName = "nanoid";
@@ -11856,15 +11568,6 @@ let
         sha512 = "DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==";
       };
     };
-    "node-fetch-2.7.0" = {
-      name = "node-fetch";
-      packageName = "node-fetch";
-      version = "2.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz";
-        sha512 = "c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==";
-      };
-    };
     "node-fetch-h2-2.3.0" = {
       name = "node-fetch-h2";
       packageName = "node-fetch-h2";
@@ -12144,15 +11847,6 @@ let
         sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
       };
     };
-    "npmlog-5.0.1" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz";
-        sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==";
-      };
-    };
     "number-allocator-1.0.14" = {
       name = "number-allocator";
       packageName = "number-allocator";
@@ -14367,15 +14061,6 @@ let
         sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
       };
     };
-    "rimraf-3.0.2" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz";
-        sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==";
-      };
-    };
     "rimraf-5.0.10" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -14394,15 +14079,6 @@ let
         sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==";
       };
     };
-    "robust-predicates-3.0.2" = {
-      name = "robust-predicates";
-      packageName = "robust-predicates";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz";
-        sha512 = "IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==";
-      };
-    };
     "rollup-4.35.0" = {
       name = "rollup";
       packageName = "rollup";
@@ -14430,15 +14106,6 @@ let
         sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==";
       };
     };
-    "rw-1.3.3" = {
-      name = "rw";
-      packageName = "rw";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz";
-        sha512 = "PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==";
-      };
-    };
     "rx-4.1.0" = {
       name = "rx";
       packageName = "rx";
@@ -14988,15 +14655,6 @@ let
         sha512 = "LH7FpTAkeD+y5xQC4fzS+tFtaNlvt3Ib1zKzvhjv/Y+cioV4zIuw4IZr2yhRLu67CWL7FR9/6KXKnjRoZTvGGQ==";
       };
     };
-    "simple-get-3.1.1" = {
-      name = "simple-get";
-      packageName = "simple-get";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz";
-        sha512 = "CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==";
-      };
-    };
     "simple-get-4.0.1" = {
       name = "simple-get";
       packageName = "simple-get";
@@ -16095,15 +15753,6 @@ let
         sha512 = "6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==";
       };
     };
-    "topojson-client-3.1.0" = {
-      name = "topojson-client";
-      packageName = "topojson-client";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz";
-        sha512 = "605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==";
-      };
-    };
     "tough-cookie-2.5.0" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
@@ -17004,276 +16653,6 @@ let
         sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==";
       };
     };
-    "vega-5.32.0" = {
-      name = "vega";
-      packageName = "vega";
-      version = "5.32.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega/-/vega-5.32.0.tgz";
-        sha512 = "jANt/5+SpV7b7owB5u8+M1TZ/TrF1fK6WlcvKDW38tH3Gb6hM1nzIhv10E41w3GBmwF29BU/qH2ruNkaYKjI5g==";
-      };
-    };
-    "vega-canvas-1.2.7" = {
-      name = "vega-canvas";
-      packageName = "vega-canvas";
-      version = "1.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.7.tgz";
-        sha512 = "OkJ9CACVcN9R5Pi9uF6MZBF06pO6qFpDYHWSKBJsdHP5o724KrsgR6UvbnXFH82FdsiTOff/HqjuaG8C7FL+9Q==";
-      };
-    };
-    "vega-crossfilter-4.1.3" = {
-      name = "vega-crossfilter";
-      packageName = "vega-crossfilter";
-      version = "4.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.1.3.tgz";
-        sha512 = "nyPJAXAUABc3EocUXvAL1J/IWotZVsApIcvOeZaUdEQEtZ7bt8VtP2nj3CLbHBA8FZZVV+K6SmdwvCOaAD4wFQ==";
-      };
-    };
-    "vega-dataflow-5.7.7" = {
-      name = "vega-dataflow";
-      packageName = "vega-dataflow";
-      version = "5.7.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.7.tgz";
-        sha512 = "R2NX2HvgXL+u4E6u+L5lKvvRiCtnE6N6l+umgojfi53suhhkFP+zB+2UAQo4syxuZ4763H1csfkKc4xpqLzKnw==";
-      };
-    };
-    "vega-encode-4.10.2" = {
-      name = "vega-encode";
-      packageName = "vega-encode";
-      version = "4.10.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-encode/-/vega-encode-4.10.2.tgz";
-        sha512 = "fsjEY1VaBAmqwt7Jlpz0dpPtfQFiBdP9igEefvumSpy7XUxOJmDQcRDnT3Qh9ctkv3itfPfI9g8FSnGcv2b4jQ==";
-      };
-    };
-    "vega-event-selector-3.0.1" = {
-      name = "vega-event-selector";
-      packageName = "vega-event-selector";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-3.0.1.tgz";
-        sha512 = "K5zd7s5tjr1LiOOkjGpcVls8GsH/f2CWCrWcpKy74gTCp+llCdwz0Enqo013ZlGaRNjfgD/o1caJRt3GSaec4A==";
-      };
-    };
-    "vega-expression-5.2.0" = {
-      name = "vega-expression";
-      packageName = "vega-expression";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-expression/-/vega-expression-5.2.0.tgz";
-        sha512 = "WRMa4ny3iZIVAzDlBh3ipY2QUuLk2hnJJbfbncPgvTF7BUgbIbKq947z+JicWksYbokl8n1JHXJoqi3XvpG0Zw==";
-      };
-    };
-    "vega-force-4.2.2" = {
-      name = "vega-force";
-      packageName = "vega-force";
-      version = "4.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-force/-/vega-force-4.2.2.tgz";
-        sha512 = "cHZVaY2VNNIG2RyihhSiWniPd2W9R9kJq0znxzV602CgUVgxEfTKtx/lxnVCn8nNrdKAYrGiqIsBzIeKG1GWHw==";
-      };
-    };
-    "vega-format-1.1.3" = {
-      name = "vega-format";
-      packageName = "vega-format";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-format/-/vega-format-1.1.3.tgz";
-        sha512 = "wQhw7KR46wKJAip28FF/CicW+oiJaPAwMKdrxlnTA0Nv8Bf7bloRlc+O3kON4b4H1iALLr9KgRcYTOeXNs2MOA==";
-      };
-    };
-    "vega-functions-5.17.0" = {
-      name = "vega-functions";
-      packageName = "vega-functions";
-      version = "5.17.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.17.0.tgz";
-        sha512 = "EoGvdCtv1Y4M/hLy83Kf0HTs4qInUfrBoanrnhbguzRl00rx7orjcv+bNZFHbCe4HkfVpbOnTrYmz3K2ivaOLw==";
-      };
-    };
-    "vega-geo-4.4.3" = {
-      name = "vega-geo";
-      packageName = "vega-geo";
-      version = "4.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-geo/-/vega-geo-4.4.3.tgz";
-        sha512 = "+WnnzEPKIU1/xTFUK3EMu2htN35gp9usNZcC0ZFg2up1/Vqu6JyZsX0PIO51oXSIeXn9bwk6VgzlOmJUcx92tA==";
-      };
-    };
-    "vega-hierarchy-4.1.3" = {
-      name = "vega-hierarchy";
-      packageName = "vega-hierarchy";
-      version = "4.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.1.3.tgz";
-        sha512 = "0Z+TYKRgOEo8XYXnJc2HWg1EGpcbNAhJ9Wpi9ubIbEyEHqIgjCIyFVN8d4nSfsJOcWDzsSmRqohBztxAhOCSaw==";
-      };
-    };
-    "vega-label-1.3.1" = {
-      name = "vega-label";
-      packageName = "vega-label";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-label/-/vega-label-1.3.1.tgz";
-        sha512 = "Emx4b5s7pvuRj3fBkAJ/E2snCoZACfKAwxVId7f/4kYVlAYLb5Swq6W8KZHrH4M9Qds1XJRUYW9/Y3cceqzEFA==";
-      };
-    };
-    "vega-loader-4.5.3" = {
-      name = "vega-loader";
-      packageName = "vega-loader";
-      version = "4.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.5.3.tgz";
-        sha512 = "dUfIpxTLF2magoMaur+jXGvwMxjtdlDZaIS8lFj6N7IhUST6nIvBzuUlRM+zLYepI5GHtCLOnqdKU4XV0NggCA==";
-      };
-    };
-    "vega-parser-6.5.0" = {
-      name = "vega-parser";
-      packageName = "vega-parser";
-      version = "6.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.5.0.tgz";
-        sha512 = "dPxFKn6IlDyWi6CgHGGv8htSPBAyLHWlJNNGD17eMXh+Kjn4hupSNOIboRcYb8gL5HYt1tYwS6oYZXK84Bc4tg==";
-      };
-    };
-    "vega-projection-1.6.2" = {
-      name = "vega-projection";
-      packageName = "vega-projection";
-      version = "1.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-projection/-/vega-projection-1.6.2.tgz";
-        sha512 = "3pcVaQL9R3Zfk6PzopLX6awzrQUeYOXJzlfLGP2Xd93mqUepBa6m/reVrTUoSFXA3v9lfK4W/PS2AcVzD/MIcQ==";
-      };
-    };
-    "vega-regression-1.3.1" = {
-      name = "vega-regression";
-      packageName = "vega-regression";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-regression/-/vega-regression-1.3.1.tgz";
-        sha512 = "AmccF++Z9uw4HNZC/gmkQGe6JsRxTG/R4QpbcSepyMvQN1Rj5KtVqMcmVFP1r3ivM4dYGFuPlzMWvuqp0iKMkQ==";
-      };
-    };
-    "vega-runtime-6.2.1" = {
-      name = "vega-runtime";
-      packageName = "vega-runtime";
-      version = "6.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.2.1.tgz";
-        sha512 = "b4eot3tWKCk++INWqot+6sLn3wDTj/HE+tRSbiaf8aecuniPMlwJEK7wWuhVGeW2Ae5n8fI/8TeTViaC94bNHA==";
-      };
-    };
-    "vega-scale-7.4.2" = {
-      name = "vega-scale";
-      packageName = "vega-scale";
-      version = "7.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.4.2.tgz";
-        sha512 = "o6Hl76aU1jlCK7Q8DPYZ8OGsp4PtzLdzI6nGpLt8rxoE78QuB3GBGEwGAQJitp4IF7Lb2rL5oAXEl3ZP6xf9jg==";
-      };
-    };
-    "vega-scenegraph-4.13.1" = {
-      name = "vega-scenegraph";
-      packageName = "vega-scenegraph";
-      version = "4.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.13.1.tgz";
-        sha512 = "LFY9+sLIxRfdDI9ZTKjLoijMkIAzPLBWHpPkwv4NPYgdyx+0qFmv+puBpAUGUY9VZqAZ736Uj5NJY9zw+/M3yQ==";
-      };
-    };
-    "vega-selections-5.6.0" = {
-      name = "vega-selections";
-      packageName = "vega-selections";
-      version = "5.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.6.0.tgz";
-        sha512 = "UE2w78rUUbaV3Ph+vQbQDwh8eywIJYRxBiZdxEG/Tr/KtFMLdy2BDgNZuuDO1Nv8jImPJwONmqjNhNDYwM0VJQ==";
-      };
-    };
-    "vega-statistics-1.9.0" = {
-      name = "vega-statistics";
-      packageName = "vega-statistics";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.9.0.tgz";
-        sha512 = "GAqS7mkatpXcMCQKWtFu1eMUKLUymjInU0O8kXshWaQrVWjPIO2lllZ1VNhdgE0qGj4oOIRRS11kzuijLshGXQ==";
-      };
-    };
-    "vega-time-2.1.3" = {
-      name = "vega-time";
-      packageName = "vega-time";
-      version = "2.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-time/-/vega-time-2.1.3.tgz";
-        sha512 = "hFcWPdTV844IiY0m97+WUoMLADCp+8yUQR1NStWhzBzwDDA7QEGGwYGxALhdMOaDTwkyoNj3V/nox2rQAJD/vQ==";
-      };
-    };
-    "vega-transforms-4.12.1" = {
-      name = "vega-transforms";
-      packageName = "vega-transforms";
-      version = "4.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.12.1.tgz";
-        sha512 = "Qxo+xeEEftY1jYyKgzOGc9NuW4/MqGm1YPZ5WrL9eXg2G0410Ne+xL/MFIjHF4hRX+3mgFF4Io2hPpfy/thjLg==";
-      };
-    };
-    "vega-typings-1.5.0" = {
-      name = "vega-typings";
-      packageName = "vega-typings";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-typings/-/vega-typings-1.5.0.tgz";
-        sha512 = "tcZ2HwmiQEOXIGyBMP8sdCnoFoVqHn4KQ4H0MQiHwzFU1hb1EXURhfc+Uamthewk4h/9BICtAM3AFQMjBGpjQA==";
-      };
-    };
-    "vega-util-1.17.3" = {
-      name = "vega-util";
-      packageName = "vega-util";
-      version = "1.17.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-util/-/vega-util-1.17.3.tgz";
-        sha512 = "nSNpZLUrRvFo46M5OK4O6x6f08WD1yOcEzHNlqivF+sDLSsVpstaF6fdJYwrbf/debFi2L9Tkp4gZQtssup9iQ==";
-      };
-    };
-    "vega-view-5.15.0" = {
-      name = "vega-view";
-      packageName = "vega-view";
-      version = "5.15.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-view/-/vega-view-5.15.0.tgz";
-        sha512 = "bm8STHPsI8BjVu2gYlWU8KEVOA2JyTzdtb9cJj8NW6HpN72UxTYsg5y22u9vfcLYjzjmolrlr0756VXR0uI1Cg==";
-      };
-    };
-    "vega-view-transforms-4.6.1" = {
-      name = "vega-view-transforms";
-      packageName = "vega-view-transforms";
-      version = "4.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.6.1.tgz";
-        sha512 = "RYlyMJu5kZV4XXjmyTQKADJWDB25SMHsiF+B1rbE1p+pmdQPlp5tGdPl9r5dUJOp3p8mSt/NGI8GPGucmPMxtw==";
-      };
-    };
-    "vega-voronoi-4.2.4" = {
-      name = "vega-voronoi";
-      packageName = "vega-voronoi";
-      version = "4.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.4.tgz";
-        sha512 = "lWNimgJAXGeRFu2Pz8axOUqVf1moYhD+5yhBzDSmckE9I5jLOyZc/XvgFTXwFnsVkMd1QW1vxJa+y9yfUblzYw==";
-      };
-    };
-    "vega-wordcloud-4.1.6" = {
-      name = "vega-wordcloud";
-      packageName = "vega-wordcloud";
-      version = "4.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.6.tgz";
-        sha512 = "lFmF3u9/ozU0P+WqPjeThQfZm0PigdbXDwpIUCxczrCXKYJLYFmZuZLZR7cxtmpZ0/yuvRvAJ4g123LXbSZF8A==";
-      };
-    };
     "verror-1.10.0" = {
       name = "verror";
       packageName = "verror";
@@ -21700,185 +21079,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  vega-cli = nodeEnv.buildNodePackage {
-    name = "vega-cli";
-    packageName = "vega-cli";
-    version = "5.32.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.32.0.tgz";
-      sha512 = "k3PQ6HDp/GgJUBNKN/KdyfVX1JoVGtjdH8uYZKxXZo7Fmky9yMmdw8+vLzcLinaLDsUdUPhh8oiTC6+wdjipAA==";
-    };
-    dependencies = [
-      sources."@mapbox/node-pre-gyp-1.0.11"
-      sources."@types/estree-1.0.6"
-      sources."@types/geojson-7946.0.4"
-      sources."abbrev-1.1.1"
-      sources."agent-base-6.0.2"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."aproba-2.0.0"
-      sources."are-we-there-yet-2.0.0"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."canvas-2.11.2"
-      sources."chownr-2.0.0"
-      sources."cliui-8.0.1"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."color-support-1.1.3"
-      sources."commander-7.2.0"
-      sources."concat-map-0.0.1"
-      sources."console-control-strings-1.1.0"
-      sources."d3-array-3.2.4"
-      sources."d3-color-3.1.0"
-      sources."d3-delaunay-6.0.4"
-      sources."d3-dispatch-3.0.1"
-      sources."d3-dsv-3.0.1"
-      sources."d3-force-3.0.0"
-      sources."d3-format-3.1.0"
-      sources."d3-geo-3.1.1"
-      sources."d3-geo-projection-4.0.0"
-      sources."d3-hierarchy-3.1.2"
-      sources."d3-interpolate-3.0.1"
-      sources."d3-path-3.1.0"
-      sources."d3-quadtree-3.0.1"
-      sources."d3-scale-4.0.2"
-      sources."d3-scale-chromatic-3.1.0"
-      sources."d3-shape-3.2.0"
-      sources."d3-time-3.1.0"
-      sources."d3-time-format-4.1.0"
-      sources."d3-timer-3.0.1"
-      sources."debug-4.4.0"
-      sources."decompress-response-4.2.1"
-      sources."delaunator-5.0.1"
-      sources."delegates-1.0.0"
-      sources."detect-libc-2.0.3"
-      sources."emoji-regex-8.0.0"
-      sources."encoding-0.1.13"
-      sources."escalade-3.2.0"
-      (
-        sources."fs-minipass-2.1.0"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."fs.realpath-1.0.0"
-      sources."gauge-3.0.2"
-      sources."get-caller-file-2.0.5"
-      sources."glob-7.2.3"
-      sources."has-unicode-2.0.1"
-      sources."https-proxy-agent-5.0.1"
-      sources."iconv-lite-0.6.3"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."internmap-2.0.3"
-      sources."is-fullwidth-code-point-3.0.0"
-      (
-        sources."make-dir-3.1.0"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."mimic-response-2.1.0"
-      sources."minimatch-3.1.2"
-      sources."minipass-5.0.0"
-      (
-        sources."minizlib-2.1.2"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."mkdirp-1.0.4"
-      sources."ms-2.1.3"
-      sources."nan-2.22.2"
-      sources."node-fetch-2.7.0"
-      sources."nopt-5.0.0"
-      sources."npmlog-5.0.1"
-      sources."object-assign-4.1.1"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."readable-stream-3.6.2"
-      sources."require-directory-2.1.1"
-      sources."rimraf-3.0.2"
-      sources."robust-predicates-3.0.2"
-      sources."rw-1.3.3"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."semver-7.7.1"
-      sources."set-blocking-2.0.0"
-      sources."signal-exit-3.0.7"
-      sources."simple-concat-1.0.1"
-      sources."simple-get-3.1.1"
-      sources."string-width-4.2.3"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."tar-6.2.1"
-      (
-        sources."topojson-client-3.1.0"
-        // {
-          dependencies = [
-            sources."commander-2.20.3"
-          ];
-        }
-      )
-      sources."tr46-0.0.3"
-      sources."util-deprecate-1.0.2"
-      sources."vega-5.32.0"
-      sources."vega-canvas-1.2.7"
-      sources."vega-crossfilter-4.1.3"
-      sources."vega-dataflow-5.7.7"
-      sources."vega-encode-4.10.2"
-      sources."vega-event-selector-3.0.1"
-      sources."vega-expression-5.2.0"
-      sources."vega-force-4.2.2"
-      sources."vega-format-1.1.3"
-      sources."vega-functions-5.17.0"
-      sources."vega-geo-4.4.3"
-      sources."vega-hierarchy-4.1.3"
-      sources."vega-label-1.3.1"
-      sources."vega-loader-4.5.3"
-      sources."vega-parser-6.5.0"
-      sources."vega-projection-1.6.2"
-      sources."vega-regression-1.3.1"
-      sources."vega-runtime-6.2.1"
-      sources."vega-scale-7.4.2"
-      sources."vega-scenegraph-4.13.1"
-      sources."vega-selections-5.6.0"
-      sources."vega-statistics-1.9.0"
-      sources."vega-time-2.1.3"
-      sources."vega-transforms-4.12.1"
-      sources."vega-typings-1.5.0"
-      sources."vega-util-1.17.3"
-      sources."vega-view-5.15.0"
-      sources."vega-view-transforms-4.6.1"
-      sources."vega-voronoi-4.2.4"
-      sources."vega-wordcloud-4.1.6"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."wide-align-1.1.5"
-      sources."wrap-ansi-7.0.0"
-      sources."wrappy-1.0.2"
-      sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
-      sources."yargs-17.7.2"
-      sources."yargs-parser-21.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Command line utilities for server-side Vega";
-      homepage = "https://github.com/vega/vega#readme";
-      license = "BSD-3-Clause";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   vercel = nodeEnv.buildNodePackage {
     name = "vercel";
     packageName = "vercel";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index d66a468d54ab..a4c6a96a74f9 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -80,17 +80,6 @@ final: prev: {
     name = "rush";
   };
 
-  vega-cli = prev.vega-cli.override {
-    nativeBuildInputs = [ pkgs.pkg-config ];
-    buildInputs = with pkgs; [
-      node-pre-gyp
-      pixman
-      cairo
-      pango
-      libjpeg
-    ];
-  };
-
   wavedrom-cli = prev.wavedrom-cli.override {
     nativeBuildInputs = [
       pkgs.pkg-config

From ceba9349b61c81a78f284dda150837a5170ee2ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Dec 2025 19:42:06 +0000
Subject: [PATCH 16/60] korrect: 0.3.3 -> 0.3.4

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

diff --git a/pkgs/by-name/ko/korrect/package.nix b/pkgs/by-name/ko/korrect/package.nix
index 270825731b78..9d935cf19abe 100644
--- a/pkgs/by-name/ko/korrect/package.nix
+++ b/pkgs/by-name/ko/korrect/package.nix
@@ -9,13 +9,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "korrect";
-  version = "0.3.3";
+  version = "0.3.4";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-iEbzYcWxDAumGLsr7MlqOrTEj3SwGFmdvw15M5Fz9cs=";
+    hash = "sha256-AOYwknKVtvw/gQ10gwHTNFQ2KvPuldRk8UxRcbkO6tE=";
   };
-  cargoHash = "sha256-RIa1rn74I/DQktjtY4BTWiYIBO1aLpXcKtXMBOAogvE=";
+  cargoHash = "sha256-2od1FlV7yx9bAV1eSvTVeJfm7FsGtFGTzsBPh6Of+SU=";
 
   # Tests create a local http server to check the download functionality
   __darwinAllowLocalNetworking = true;

From f5a8836dea30935f297ee20c75721b2acee0a3c5 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Thu, 18 Dec 2025 23:15:33 +0200
Subject: [PATCH 17/60] jan: 0.6.10 -> 0.7.5

---
 pkgs/by-name/ja/jan/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix
index d10693fc1729..a0f1a65d20dd 100644
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -2,14 +2,17 @@
   lib,
   appimageTools,
   fetchurl,
+  config,
+  cudaPackages,
+  cudaSupport ? config.cudaSupport,
 }:
 
 let
   pname = "Jan";
-  version = "0.6.10";
+  version = "0.7.5";
   src = fetchurl {
     url = "https://github.com/menloresearch/jan/releases/download/v${version}/jan_${version}_amd64.AppImage";
-    hash = "sha256-eag8c/Jp2ahV71kEuFoT2rmz0S9RPbiqy5YBO0Z+ICY=";
+    hash = "sha256-RIEBpeogNIDPMpoY5Gk8q4+t7jxcWJEZLPqJHWyaVk4=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
@@ -22,6 +25,12 @@ appimageTools.wrapType2 {
     cp -r ${appimageContents}/usr/share/icons $out/share
   '';
 
+  extraPkgs =
+    pkgs:
+    lib.optionals cudaSupport [
+      cudaPackages.cudatoolkit
+    ];
+
   meta = {
     changelog = "https://github.com/menloresearch/jan/releases/tag/v${version}";
     description = "Jan is an open source alternative to ChatGPT that runs 100% offline on your computer";

From 2d5f9b1cd318edbfa74e889f9f8d57e625e1a58c Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Thu, 18 Dec 2025 23:28:16 +0200
Subject: [PATCH 18/60] jan: update repo url

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

diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix
index a0f1a65d20dd..492abd69447b 100644
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -11,7 +11,7 @@ let
   pname = "Jan";
   version = "0.7.5";
   src = fetchurl {
-    url = "https://github.com/menloresearch/jan/releases/download/v${version}/jan_${version}_amd64.AppImage";
+    url = "https://github.com/janhq/jan/releases/download/v${version}/jan_${version}_amd64.AppImage";
     hash = "sha256-RIEBpeogNIDPMpoY5Gk8q4+t7jxcWJEZLPqJHWyaVk4=";
   };
 
@@ -32,9 +32,9 @@ appimageTools.wrapType2 {
     ];
 
   meta = {
-    changelog = "https://github.com/menloresearch/jan/releases/tag/v${version}";
+    changelog = "https://github.com/janhq/jan/releases/tag/v${version}";
     description = "Jan is an open source alternative to ChatGPT that runs 100% offline on your computer";
-    homepage = "https://github.com/menloresearch/jan";
+    homepage = "https://github.com/janhq/jan";
     license = lib.licenses.agpl3Plus;
     mainProgram = "Jan";
     maintainers = [ ];

From 7137cdf068e4dc3a5cb4f6221aba355206e2ad8d Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Thu, 18 Dec 2025 23:36:13 +0200
Subject: [PATCH 19/60] jan: update license

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

diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix
index 492abd69447b..82dae088a1e0 100644
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -35,7 +35,7 @@ appimageTools.wrapType2 {
     changelog = "https://github.com/janhq/jan/releases/tag/v${version}";
     description = "Jan is an open source alternative to ChatGPT that runs 100% offline on your computer";
     homepage = "https://github.com/janhq/jan";
-    license = lib.licenses.agpl3Plus;
+    license = lib.licenses.asl20;
     mainProgram = "Jan";
     maintainers = [ ];
     platforms = with lib.systems.inspect; patternLogicalAnd patterns.isLinux patterns.isx86_64;

From dea8c20e86376750a0c0b72dc4c183725d133385 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Dec 2025 21:41:00 +0000
Subject: [PATCH 20/60] trezor-suite: 25.11.3 -> 25.12.2

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

diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix
index 4d33c0fff2a8..81ff177d6109 100644
--- a/pkgs/by-name/tr/trezor-suite/package.nix
+++ b/pkgs/by-name/tr/trezor-suite/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "trezor-suite";
-  version = "25.11.3";
+  version = "25.12.2";
 
   suffix =
     {
@@ -24,8 +24,8 @@ let
     hash =
       {
         # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
-        aarch64-linux = "sha512-fY2X571p71HCtAFGcYxBwvrlb556hJSyBCNkyVJ6s+P3GuBlTqapSTuE/ZAyPraS9H/QMEVnZF+Qpzu/6hgiew==";
-        x86_64-linux = "sha512-00Nnc7xY3snP5gS5GzszgE3MVTNZ6jUiU43D68Pz4aYzgNaPn8JMuh3kC0ybxm4HaHnZ9EC4Eraa9U5gO8Mq3w==";
+        aarch64-linux = "sha512-AneflaNO3OXomrhwiCQC0bw1hvFVVWy9YQ63zmeAAU5YQYFRhdlvXXNCxQEFKXfy6079MvLM67+42FGGsVAf6w==";
+        x86_64-linux = "sha512-/kjqLGF7MY+2UGSE7DnS64o8U2HntzGrw3c5b5AGoXc8wx3emEBjPmTELnDxQpgMdl7L7uaV3O1Sj2ebfweRpQ==";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From 24bc3022da3fd51201d406eb8e96f23e438e6464 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Dec 2025 18:22:10 +0000
Subject: [PATCH 21/60] roslyn-ls: 5.3.0-2.25603.1 -> 5.3.0-2.25604.5

---
 pkgs/by-name/ro/roslyn-ls/deps.json   | 12 ++---
 pkgs/by-name/ro/roslyn-ls/package.nix | 75 ++++++++++++++-------------
 2 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json
index 3075c857130b..d55208802ca9 100644
--- a/pkgs/by-name/ro/roslyn-ls/deps.json
+++ b/pkgs/by-name/ro/roslyn-ls/deps.json
@@ -127,9 +127,9 @@
   },
   {
     "pname": "Microsoft.DotNet.Arcade.Sdk",
-    "version": "11.0.0-beta.25578.1",
-    "hash": "sha256-c8IWX17rJM4aOxvPEbMUDzeLR6kEwWWTstm4waw3d80=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/11.0.0-beta.25578.1/microsoft.dotnet.arcade.sdk.11.0.0-beta.25578.1.nupkg"
+    "version": "11.0.0-beta.25603.2",
+    "hash": "sha256-xXwq/ffFnDXjMnrzKUAT3Du31tKso7aNW4VBvABHX4M=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/11.0.0-beta.25603.2/microsoft.dotnet.arcade.sdk.11.0.0-beta.25603.2.nupkg"
   },
   {
     "pname": "Microsoft.DotNet.FileBasedPrograms",
@@ -139,9 +139,9 @@
   },
   {
     "pname": "Microsoft.DotNet.XliffTasks",
-    "version": "11.0.0-beta.25578.1",
-    "hash": "sha256-EPo2bgR7oW/a8htIps64UrAPuoyyuIYYG54cZRoknUY=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/11.0.0-beta.25578.1/microsoft.dotnet.xlifftasks.11.0.0-beta.25578.1.nupkg"
+    "version": "11.0.0-beta.25603.2",
+    "hash": "sha256-qLUHUextwX33sSm4oK0N4qpbGEZpz6qOw5kabpJ9Xkk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/11.0.0-beta.25603.2/microsoft.dotnet.xlifftasks.11.0.0-beta.25603.2.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix
index 8bc5446a5354..5c8f3f2eba9d 100644
--- a/pkgs/by-name/ro/roslyn-ls/package.nix
+++ b/pkgs/by-name/ro/roslyn-ls/package.nix
@@ -6,16 +6,18 @@
   stdenvNoCC,
   testers,
   jq,
-  writeText,
   runCommand,
   expect,
 }:
 let
   pname = "roslyn-ls";
+  # see https://github.com/dotnet/roslyn/blob/main/eng/targets/TargetFrameworks.props
   dotnet-sdk =
     with dotnetCorePackages;
+    # required sdk
     sdk_10_0
     // {
+      # with additional packages to minimize deps.json
       inherit
         (combinePackages [
           sdk_9_0
@@ -25,45 +27,29 @@ let
         targetPackages
         ;
     };
-  # need sdk on runtime as well
-  dotnet-runtime = dotnetCorePackages.sdk_10_0;
+  # should match the default NetVSCode property
+  # see https://github.com/dotnet/roslyn/blob/main/eng/targets/TargetFrameworks.props
+  dotnet-runtime = dotnetCorePackages.sdk_10_0.runtime;
+
   rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system;
 
   project = "Microsoft.CodeAnalysis.LanguageServer";
-
-  targets = writeText "versions.targets" ''
-    <Project>
-      <ItemGroup>
-        <KnownFrameworkReference Update="@(KnownFrameworkReference)">
-          <LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'net8.0'">${dotnetCorePackages.sdk_8_0.runtime.version}</LatestRuntimeFrameworkVersion>
-          <LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'net9.0'">${dotnetCorePackages.sdk_9_0.runtime.version}</LatestRuntimeFrameworkVersion>
-          <TargetingPackVersion Condition="'%(TargetFramework)' == 'net8.0'">${dotnetCorePackages.sdk_8_0.runtime.version}</TargetingPackVersion>
-          <TargetingPackVersion Condition="'%(TargetFramework)' == 'net9.0'">${dotnetCorePackages.sdk_9_0.runtime.version}</TargetingPackVersion>
-        </KnownFrameworkReference>
-        <KnownAppHostPack Update="@(KnownAppHostPack)">
-          <AppHostPackVersion Condition="'%(TargetFramework)' == 'net8.0'">${dotnetCorePackages.sdk_8_0.runtime.version}</AppHostPackVersion>
-          <AppHostPackVersion Condition="'%(TargetFramework)' == 'net9.0'">${dotnetCorePackages.sdk_9_0.runtime.version}</AppHostPackVersion>
-        </KnownAppHostPack>
-      </ItemGroup>
-    </Project>
-  '';
-
 in
 buildDotnetModule (finalAttrs: rec {
   inherit pname dotnet-sdk dotnet-runtime;
 
-  vsVersion = "2.103.33-prerelease";
+  vsVersion = "2.111.2-prerelease";
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
     rev = "VSCode-CSharp-${vsVersion}";
-    hash = "sha256-uz0V4vTwfmeY5qPv9K30eB0MZTCpPee3PgIdlrXL/qs=";
+    hash = "sha256-oP+mKOvsbc+/NnqJvounE75BlE6UJTIAnmYTBNQlMFA=";
   };
 
   # versioned independently from vscode-csharp
   # "roslyn" in here:
   # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "5.3.0-2.25603.1";
+  version = "5.3.0-2.25604.5";
   projectFile = "src/LanguageServer/${project}/${project}.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.json;
@@ -80,23 +66,34 @@ buildDotnetModule (finalAttrs: rec {
     # Upstream uses rollForward = latestPatch, which pins to an *exact* .NET SDK version.
     jq '.sdk.rollForward = "latestMinor"' < global.json > global.json.tmp
     mv global.json.tmp global.json
-
-    substituteInPlace Directory.Build.targets \
-      --replace-fail '</Project>' '<Import Project="${targets}" /></Project>'
   '';
 
+  # don't build binary
+  useAppHost = false;
   dotnetFlags = [
     "-p:TargetRid=${rid}"
+    # we don't want to build the binary
+    # and useAppHost is not enough, need to explicilty set to false
+    "-p:UseAppHost=false"
+    # avoid platform-specific crossgen packages
+    "-p:PublishReadyToRun=false"
     # this removes the Microsoft.WindowsDesktop.App.Ref dependency
     "-p:EnableWindowsTargeting=false"
-    # this is needed for the KnownAppHostPack changes to work
-    "-p:EnableAppHostPackDownload=true"
+    # avoid unnecessary packages in deps.json
+    "-p:EnableAppHostPackDownload=false"
+    "-p:EnableRuntimePackDownload=false"
   ];
 
-  # two problems solved here:
-  # 1. --no-build removed -> BuildHost project within roslyn is running Build target during publish
-  # 2. missing crossgen2 7.* in local nuget directory when PublishReadyToRun=true
-  # the latter should be fixable here but unsure how
+  executables = [ project ];
+
+  postInstall = ''
+    # fake executable that we substitute in postFixup
+    touch $out/lib/$pname/${project}
+    chmod +x $out/lib/$pname/${project}
+  '';
+
+  # problem and solution:
+  # BuildHost project within roslyn is running Build target during publish -> --no-build removed
   installPhase = ''
     runHook preInstall
 
@@ -104,9 +101,8 @@ buildDotnetModule (finalAttrs: rec {
         -p:ContinuousIntegrationBuild=true \
         -p:Deterministic=true \
         -p:InformationalVersion=$version \
-        -p:UseAppHost=true \
         -p:PublishTrimmed=false \
-        -p:PublishReadyToRun=false \
+        -p:OverwriteReadOnlyFiles=true \
         --configuration Release \
         --no-self-contained \
         --output "$out/lib/$pname" \
@@ -118,6 +114,14 @@ buildDotnetModule (finalAttrs: rec {
     runHook postInstall
   '';
 
+  # force dotnet-runtime to run the dll
+  # but keep the wrapper created with useDotnetFromEnv to allow LS to work properly on codebases
+  postFixup = ''
+    rm -f $out/lib/$pname/${project}
+    substituteInPlace $out/bin/${project} \
+      --replace-fail "$out/lib/$pname/${project}" "${lib.getExe dotnet-runtime}\" \"$out/lib/$pname/${project}.dll"
+  '';
+
   passthru = {
     tests =
       let
@@ -151,6 +155,7 @@ buildDotnetModule (finalAttrs: rec {
       in
       {
         # Make sure we can run with any supported SDK version, as well as without
+        with-net8-sdk = with-sdk dotnetCorePackages.sdk_8_0;
         with-net9-sdk = with-sdk dotnetCorePackages.sdk_9_0;
         with-net10-sdk = with-sdk dotnetCorePackages.sdk_10_0;
         no-sdk = with-sdk null;

From 22b31cdebd92d7b72c5ce38863ebc1b03f42de3f Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Fri, 19 Dec 2025 00:03:00 +0200
Subject: [PATCH 22/60] jan: add darwin support

---
 pkgs/by-name/ja/jan/package.nix | 85 ++++++++++++++++++++++++++-------
 1 file changed, 67 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix
index 82dae088a1e0..5382c883cea6 100644
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -5,31 +5,29 @@
   config,
   cudaPackages,
   cudaSupport ? config.cudaSupport,
+  stdenv,
+  fetchzip,
+  makeWrapper,
 }:
 
 let
   pname = "Jan";
   version = "0.7.5";
-  src = fetchurl {
+
+  darwin-src = fetchzip {
+    url = "https://github.com/janhq/jan/releases/download/v${version}/jan-mac-universal-${version}.zip";
+    hash = "sha256-stTsLKE+2gUKAVwJ2/gOckoL6Nygwr0rkugD1jGj1w4=";
+  };
+
+  linux-src = fetchurl {
     url = "https://github.com/janhq/jan/releases/download/v${version}/jan_${version}_amd64.AppImage";
     hash = "sha256-RIEBpeogNIDPMpoY5Gk8q4+t7jxcWJEZLPqJHWyaVk4=";
   };
 
-  appimageContents = appimageTools.extractType2 { inherit pname version src; };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
-
-  extraInstallCommands = ''
-    install -Dm444 ${appimageContents}/Jan.desktop -t $out/share/applications
-    cp -r ${appimageContents}/usr/share/icons $out/share
-  '';
-
-  extraPkgs =
-    pkgs:
-    lib.optionals cudaSupport [
-      cudaPackages.cudatoolkit
-    ];
+  appimageContents = appimageTools.extractType2 {
+    inherit pname version;
+    src = linux-src;
+  };
 
   meta = {
     changelog = "https://github.com/janhq/jan/releases/tag/v${version}";
@@ -38,6 +36,57 @@ appimageTools.wrapType2 {
     license = lib.licenses.asl20;
     mainProgram = "Jan";
     maintainers = [ ];
-    platforms = with lib.systems.inspect; patternLogicalAnd patterns.isLinux patterns.isx86_64;
+    platforms =
+      lib.platforms.darwin
+      ++ (with lib.systems.inspect; patternLogicalAnd patterns.isLinux patterns.isx86_64);
   };
-}
+
+  linux = appimageTools.wrapType2 {
+    inherit pname version;
+    src = linux-src;
+
+    extraInstallCommands = ''
+      install -Dm444 ${appimageContents}/Jan.desktop -t $out/share/applications
+      cp -r ${appimageContents}/usr/share/icons $out/share
+    '';
+
+    extraPkgs =
+      pkgs:
+      lib.optionals cudaSupport [
+        cudaPackages.cudatoolkit
+      ];
+
+    inherit meta;
+  };
+
+  darwin = stdenv.mkDerivation {
+    inherit
+      pname
+      version
+      meta
+      ;
+
+    src = darwin-src;
+
+    dontUnpack = true;
+
+    sourceRoot = "${pname}.app";
+    nativeBuildInputs = [
+      makeWrapper
+    ];
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/Applications/${pname}.app
+      mkdir -p $out/bin
+      cp -R $src/. $out/Applications/${pname}.app/
+      if [ -x "$out/Applications/${pname}.app/Contents/MacOS/${pname}" ]; then
+        makeWrapper "$out/Applications/${pname}.app/Contents/MacOS/${pname}" $out/bin/${pname}
+      fi
+
+      runHook postInstall
+    '';
+  };
+in
+if stdenv.hostPlatform.isDarwin then darwin else linux

From 5ca1a9e85641709b182cf86804cd579088fdcbd4 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 18 Dec 2025 14:56:21 -0600
Subject: [PATCH 23/60] vimPlugins.markdoc-nvim: remove `nvim-treesitter`
 dependency

Needs the parsers, not the plugin.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/overrides.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 05a9c1a7c42c..135b6a09f08b 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1864,11 +1864,9 @@ assertNoAdditions {
 
   markdoc-nvim = super.markdoc-nvim.overrideAttrs {
     dependencies = with self; [
-      (nvim-treesitter.withPlugins (p: [
-        p.markdown
-        p.markdown_inline
-        p.html
-      ]))
+      nvim-treesitter-parsers.markdown
+      nvim-treesitter-parsers.markdown_inline
+      nvim-treesitter-parsers.html
     ];
   };
 

From a9341d8a754422fa73d6849248c675ff04a36d30 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 18 Dec 2025 14:58:55 -0600
Subject: [PATCH 24/60] vimPlugins.follow-md-links-nvim: remove
 `nvim-treesitter` dependency

Uses the `vim.treesitter` api.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/overrides.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 135b6a09f08b..c4a1eec3b15c 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1231,10 +1231,6 @@ assertNoAdditions {
     dependencies = [ self.plenary-nvim ];
   };
 
-  follow-md-links-nvim = super.follow-md-links-nvim.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
-  };
-
   forms = super.forms.overrideAttrs {
     dependencies = [ self.self ];
   };

From 850d153ecc2bcee9346899eb5a5bde5cfc4d3334 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 18 Dec 2025 15:13:00 -0600
Subject: [PATCH 25/60] vimPlugins.haskell-scope-highlighting-nvim: replace
 `nvim-treesitter` with parser

Uses the `vim.treesitter` api

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/overrides.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index c4a1eec3b15c..9e6ea1c10ac7 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1429,7 +1429,7 @@ assertNoAdditions {
   };
 
   haskell-scope-highlighting-nvim = super.haskell-scope-highlighting-nvim.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter-parsers.haskell ];
   };
 
   haskell-snippets-nvim = super.haskell-snippets-nvim.overrideAttrs {

From fe657b79107948e7ab3480e168017983dcad183e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 18 Dec 2025 15:13:51 -0600
Subject: [PATCH 26/60] vimPlugins.hurl-nvim: remove `nvim-treesitter`
 dependency

Uses the `vim.treesitter` api.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 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 9e6ea1c10ac7..7b098e0fa392 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1477,7 +1477,6 @@ assertNoAdditions {
   hurl-nvim = super.hurl-nvim.overrideAttrs {
     dependencies = with self; [
       nui-nvim
-      nvim-treesitter
       nvim-treesitter-parsers.hurl
       plenary-nvim
     ];

From 249b908b12ca8c5864dc37192c2172ae0c29f5c0 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 18 Dec 2025 15:14:38 -0600
Subject: [PATCH 27/60] vimPlugins.indent-tools-nvim: remove `nvim-treesitter`
 dependency

`nvim-treesitter-objects` dependency

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/overrides.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 7b098e0fa392..d787557948ab 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1507,9 +1507,13 @@ assertNoAdditions {
   };
 
   indent-tools-nvim = super.indent-tools-nvim.overrideAttrs {
+    checkInputs = [
+      # nvim-treesitter-textobjects dep
+      self.nvim-treesitter
+    ];
     dependencies = with self; [
       arshlib-nvim
-      nvim-treesitter
+      # Optional dep for repeatable jumps
       nvim-treesitter-textobjects
     ];
   };

From 64c77ad759a6f5f4b8d434d16d60b5488501f4af Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 18 Dec 2025 15:16:35 -0600
Subject: [PATCH 28/60] vimPlugins.multicursors-nvim: remove `nvim-treesitter`
 dependency

Uses the `vim.treesitter` api.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 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 d787557948ab..432ee4299901 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2006,7 +2006,6 @@ assertNoAdditions {
 
   multicursors-nvim = super.multicursors-nvim.overrideAttrs {
     dependencies = with self; [
-      nvim-treesitter
       hydra-nvim
     ];
   };

From be599943b33325a27d678efe912dc46fe3e9917c Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 18 Dec 2025 15:38:05 -0600
Subject: [PATCH 29/60] vimPlugins.nvim-paredit: remove `nvim-treesitter`
 dependency

Doesn't depend on it
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/overrides.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 432ee4299901..b4bf5819c1ac 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2647,10 +2647,6 @@ assertNoAdditions {
     ];
   };
 
-  nvim-paredit = super.nvim-paredit.overrideAttrs {
-    dependencies = with self; [ nvim-treesitter ];
-  };
-
   nvim-rip-substitute = super.nvim-rip-substitute.overrideAttrs {
     buildInputs = [ ripgrep ];
   };

From ea17f93f0253a7f0e42740f0e371a1238c4e10dd Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 18 Dec 2025 15:54:29 -0600
Subject: [PATCH 30/60] vimPlugins.nvim-surround: remove `nvim-treesitter`
 dependency

Uses the `vim.treesitter` api.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/overrides.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index b4bf5819c1ac..ef0c909230fb 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2665,13 +2665,6 @@ assertNoAdditions {
     ];
   };
 
-  nvim-surround = super.nvim-surround.overrideAttrs {
-    checkInputs = [
-      # Optional treesitter integration
-      self.nvim-treesitter
-    ];
-  };
-
   nvim-teal-maker = super.nvim-teal-maker.overrideAttrs {
     postPatch = ''
       substituteInPlace lua/tealmaker/init.lua \

From 446b2e96edc186661d2476469f5ec539a8c79490 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 18 Dec 2025 16:40:35 -0600
Subject: [PATCH 31/60] vimPlugins.neotest-mocha: remove `nvim-treesitter`
 dependency

Uses the `neotest.lib.treesitter` api.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 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 ef0c909230fb..ac55a8a9d41c 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2215,7 +2215,6 @@ assertNoAdditions {
     dependencies = with self; [
       neotest
       nvim-nio
-      nvim-treesitter
       plenary-nvim
     ];
   };

From b097c26d6f28f16db2d1c9a79f220e22bd235d7f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 18 Dec 2025 16:44:10 -0600
Subject: [PATCH 32/60] vimPlugins.nvim-trevJ-lua: remove `nvim-treesitter`
 dependency

Uses the `vim.treesitter` api.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/overrides.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index ac55a8a9d41c..4c66a11e5222 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2748,10 +2748,6 @@ assertNoAdditions {
     dependencies = [ self.nvim-treesitter ];
   };
 
-  nvim-trevJ-lua = super.nvim-trevJ-lua.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
-  };
-
   nvim-ufo = super.nvim-ufo.overrideAttrs {
     dependencies = [ self.promise-async ];
   };

From 59590eb8b809b6061eaa0e55777ea47760451b13 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 18 Dec 2025 16:44:48 -0600
Subject: [PATCH 33/60] vimPlugins.parpar-nvim: remove `nvim-treesitter`
 dependency

Uses the `vim.treesitter` api.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 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 4c66a11e5222..2dd2dfba1b40 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2948,7 +2948,6 @@ assertNoAdditions {
     dependencies = with self; [
       nvim-parinfer
       nvim-paredit
-      nvim-treesitter
     ];
   };
 

From 9997f36bcb9fdb1014ddd4b36a6d2f054feb4ac2 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 18 Dec 2025 17:05:27 -0600
Subject: [PATCH 34/60] vimPlugins.tssorter-nvim: remove `nvim-treesitter`
 dependency

Uses the `vim.treesitter` api.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/overrides.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 2dd2dfba1b40..7f238cf540d4 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -3627,10 +3627,6 @@ assertNoAdditions {
     nvimSkipModules = "tsc.better-messages-test";
   };
 
-  tssorter-nvim = super.tssorter-nvim.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
-  };
-
   tv-nvim = super.tv-nvim.overrideAttrs {
     runtimeDeps = [ television ];
   };

From 89b92052660b95d00b0a19c3febd2fd4c98907f3 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 18 Dec 2025 17:07:08 -0600
Subject: [PATCH 35/60] vimPlugins.vim-illuminate: remove `nvim-treesitter`
 dependency

Uses the `vim.treesitter` api.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/overrides.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 7f238cf540d4..ad3b710dc235 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -3967,11 +3967,6 @@ assertNoAdditions {
     buildInputs = [ vim ];
   };
 
-  vim-illuminate = super.vim-illuminate.overrideAttrs {
-    # Optional treesitter integration
-    checkInputs = [ self.nvim-treesitter ];
-  };
-
   vim-isort = super.vim-isort.overrideAttrs {
     postPatch = ''
       substituteInPlace autoload/vimisort.vim \

From 06b8f865b7a085d8f5866eeb18962780fc8c8961 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 18 Dec 2025 17:08:31 -0600
Subject: [PATCH 36/60] vimPlugins.refactoring-nvim: remove `nvim-treesitter`
 dependency

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 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 ad3b710dc235..bbcb8888f91d 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -3086,7 +3086,6 @@ assertNoAdditions {
 
   refactoring-nvim = super.refactoring-nvim.overrideAttrs {
     dependencies = with self; [
-      nvim-treesitter
       plenary-nvim
     ];
   };

From e1e2092041573c56aa12e62fc6f55e770be4def4 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 18 Dec 2025 17:11:50 -0600
Subject: [PATCH 37/60] vimPlugins.nvim-nu: remove `nvim-treesitter` dependency

Doesn't use nvim-treesitter directly, bundles queries to be used with
parser.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/overrides.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index bbcb8888f91d..1cb2fbe67d3a 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2641,8 +2641,8 @@ assertNoAdditions {
 
   nvim-nu = super.nvim-nu.overrideAttrs {
     dependencies = with self; [
-      nvim-treesitter
       none-ls-nvim
+      nvim-treesitter-parsers.nu
     ];
   };
 

From 221453c870617e8e34df2ff2db7a81ba222ffdb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 04:14:09 +0000
Subject: [PATCH 38/60] versitygw: 1.0.19 -> 1.0.20

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

diff --git a/pkgs/by-name/ve/versitygw/package.nix b/pkgs/by-name/ve/versitygw/package.nix
index 6ac1b531c780..e4fc52ea9841 100644
--- a/pkgs/by-name/ve/versitygw/package.nix
+++ b/pkgs/by-name/ve/versitygw/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "versitygw";
-  version = "1.0.19";
+  version = "1.0.20";
 
   src = fetchFromGitHub {
     owner = "versity";
     repo = "versitygw";
     tag = "v${version}";
-    hash = "sha256-Cz8hxw+10Cg112Qu+9/FTDWVaf2COBzVJDxZkt8c4Yg=";
+    hash = "sha256-uRYGcV1vXZS7tCuj4riBU4ROQQkYbTFSYYNJa0Dy1mA=";
   };
 
-  vendorHash = "sha256-R2UxUaqPaQ1TPYI79rmIHVqTDceuqhSdRb03OqI2fBc=";
+  vendorHash = "sha256-tZUSxfy9wAFausFrEGRrgXZj8PHp6XeF10jPdD4zyDk=";
 
   doCheck = false; # Require access to online S3 services
 

From 2b0f81cdee82bb1609f59abf070a34fc94237186 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 07:27:18 +0000
Subject: [PATCH 39/60] katex: 0.16.25 -> 0.16.27

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

diff --git a/pkgs/by-name/ka/katex/package.nix b/pkgs/by-name/ka/katex/package.nix
index 3c01de945680..3510d173bbf6 100644
--- a/pkgs/by-name/ka/katex/package.nix
+++ b/pkgs/by-name/ka/katex/package.nix
@@ -10,18 +10,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "katex";
-  version = "0.16.25";
+  version = "0.16.27";
 
   src = fetchFromGitHub {
     owner = "katex";
     repo = "katex";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-XwKjoXkn96YNxrBv2qcUSqKMtHxz9+levevc4Rz1SYw=";
+    hash = "sha256-bw5W8TkM31aeqQ6eJae8voW75RvvUjeTdu7aPQ+lAa0=";
   };
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-vPYzt+ZBbi1sR7T1I08f/syTnN8hnUTqH4fKCBiFIM0=";
+    hash = "sha256-bRzYuiYDAz9LTcaUgI0dvfxU/eo0uTSz0pPP7dH5XW8=";
   };
 
   nativeBuildInputs = [

From eefe18ca934ad6f1ba412c631b1e55c704ee5034 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 09:13:03 +0000
Subject: [PATCH 40/60] xenia-canary: 0-unstable-2025-12-10 ->
 0-unstable-2025-12-18

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

diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix
index e1f494c44c82..032f9c0c0e42 100644
--- a/pkgs/by-name/xe/xenia-canary/package.nix
+++ b/pkgs/by-name/xe/xenia-canary/package.nix
@@ -19,14 +19,14 @@
 }:
 llvmPackages_20.stdenv.mkDerivation {
   pname = "xenia-canary";
-  version = "0-unstable-2025-12-10";
+  version = "0-unstable-2025-12-18";
 
   src = fetchFromGitHub {
     owner = "xenia-canary";
     repo = "xenia-canary";
     fetchSubmodules = true;
-    rev = "4cbcae5b649378d9e839e58e42a121d3a4e69d99";
-    hash = "sha256-VDdwlXAJAIvVWjCDurQdOW96xsykrG8W203bMXSZG/U=";
+    rev = "d78bc3a78934bab4bf609cd3ecee62af2aa3bc48";
+    hash = "sha256-w760nQwqHxsNHJJLogtevRbiqxpo2I7bAUh0N1QfhMY=";
   };
 
   dontConfigure = true;

From c3211c84244bb17e9cd6388dd6b50554a5f73684 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Fri, 5 Dec 2025 22:10:04 +0100
Subject: [PATCH 41/60] forgejo-runner: 11.3.1 -> 12.2.0

Changelog:
- https://code.forgejo.org/forgejo/runner/releases/tag/v12.0.0
- https://code.forgejo.org/forgejo/runner/releases/tag/v12.0.1
- https://code.forgejo.org/forgejo/runner/releases/tag/v12.1.0
- https://code.forgejo.org/forgejo/runner/releases/tag/v12.1.1
- https://code.forgejo.org/forgejo/runner/releases/tag/v12.1.2
- https://code.forgejo.org/forgejo/runner/releases/tag/v12.2.0
---
 pkgs/by-name/fo/forgejo-runner/package.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix
index ca4b73b1cc57..c994cc7efa7d 100644
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -6,6 +6,7 @@
   nixosTests,
   versionCheckHook,
   nix-update-script,
+  git,
 }:
 
 let
@@ -17,7 +18,7 @@ let
     # The following tests were introduced in 9.x with the inclusion of act
     # the pkgs/by-name/ac/act/package.nix just sets doCheck = false;
 
-    # Requires running docker install
+    # Requires running Docker daemon
     "TestDocker"
     "TestJobExecutor"
     "TestRunner"
@@ -29,7 +30,7 @@ let
     # Reaches out to different websites
     "TestFindGitRemoteURL"
     "TestGitFindRef"
-    "TestGitCloneExecutor"
+    "TestClone"
     "TestCloneIfRequired"
     "TestActionCache"
     "TestRunContext_GetGitHubContext"
@@ -46,17 +47,17 @@ let
 in
 buildGoModule rec {
   pname = "forgejo-runner";
-  version = "11.3.1";
+  version = "12.2.0";
 
   src = fetchFromGitea {
     domain = "code.forgejo.org";
     owner = "forgejo";
     repo = "runner";
     rev = "v${version}";
-    hash = "sha256-jvHnTCkRvYaejeCiPpr18ldEmxcAkrEIaOLVVBY11eg=";
+    hash = "sha256-UzBRIa+mhynJDYHzssApMPyLeHdFVSAZ6SZtPbtJpB4=";
   };
 
-  vendorHash = "sha256-7Ybh5qzkqT3CvGtRXiPkc5ShTYGlyvckTxg4EFagM/c=";
+  vendorHash = "sha256-ReGxoPvW4G6DbFfR2OeeT3tupZkpLpX80zK824oeyVg=";
 
   # See upstream Makefile
   # https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile
@@ -68,15 +69,17 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X code.forgejo.org/forgejo/runner/v11/internal/pkg/ver.version=${src.rev}"
+    "-X code.forgejo.org/forgejo/runner/v12/internal/pkg/ver.version=${src.rev}"
   ];
 
   checkFlags = [
     "-skip ${lib.concatStringsSep "|" disabledTests}"
   ];
 
+  nativeCheckInputs = [ git ];
+
   postInstall = ''
-    # fix up go-specific executable naming derived from package name, upstream
+    # Fix up go-specific executable naming derived from package name, upstream
     # also calls it `forgejo-runner`
     mv $out/bin/runner $out/bin/forgejo-runner
     # provide old binary name for compatibility

From 9cb0ab61f4a9a3d8f0fe4ddf929bb013b9c712b1 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Wed, 17 Dec 2025 14:20:35 -0500
Subject: [PATCH 42/60] forgejo-runner: add backward compatibility wrapper

git is now an external requirement
---
 pkgs/by-name/fo/forgejo-runner/package.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix
index c994cc7efa7d..935727f31154 100644
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -6,7 +6,8 @@
   nixosTests,
   versionCheckHook,
   nix-update-script,
-  git,
+  gitMinimal,
+  makeWrapper,
 }:
 
 let
@@ -59,6 +60,8 @@ buildGoModule rec {
 
   vendorHash = "sha256-ReGxoPvW4G6DbFfR2OeeT3tupZkpLpX80zK824oeyVg=";
 
+  nativeBuildInputs = [ makeWrapper ];
+
   # See upstream Makefile
   # https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile
   tags = [
@@ -76,16 +79,20 @@ buildGoModule rec {
     "-skip ${lib.concatStringsSep "|" disabledTests}"
   ];
 
-  nativeCheckInputs = [ git ];
-
   postInstall = ''
     # Fix up go-specific executable naming derived from package name, upstream
     # also calls it `forgejo-runner`
     mv $out/bin/runner $out/bin/forgejo-runner
-    # provide old binary name for compatibility
+
+    # Provide backward compatbility since v12 removed bundled git
+    wrapProgram $out/bin/forgejo-runner --suffix PATH : ${lib.makeBinPath [ gitMinimal ]}
+
+    # Provide old binary name for compatibility
     ln -s $out/bin/forgejo-runner $out/bin/act_runner
   '';
 
+  nativeCheckInputs = [ gitMinimal ];
+
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";

From 91887872dcd35b983ce46a52aa9f1a10a265d791 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 11:03:58 +0000
Subject: [PATCH 43/60] rumdl: 0.0.194 -> 0.0.195

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

diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix
index a1c25a24061c..6f9644e0b74f 100644
--- a/pkgs/by-name/ru/rumdl/package.nix
+++ b/pkgs/by-name/ru/rumdl/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rumdl";
-  version = "0.0.194";
+  version = "0.0.195";
 
   src = fetchFromGitHub {
     owner = "rvben";
     repo = "rumdl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4+JeAFS9ELfAq43fH/HYhjCZoNmlZ+fPf1RVJnWRRnQ=";
+    hash = "sha256-g0cbn+VhSqCiSLxVHMpWoTzBaM9zkK4Neo3Z91ts8ic=";
   };
 
-  cargoHash = "sha256-fUpwSFT/Sg+akzBLq07YFxqCaGwEH0b2LD3c/Eojwpw=";
+  cargoHash = "sha256-sK7HM0lTQFTCCS7dC/Q3+XyskepGBM3r3GORsA0zgsw=";
 
   cargoBuildFlags = [
     "--bin=rumdl"

From bac028c8ec70853bdc65d09b6dc1519bc6a2ba31 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 12:04:51 +0000
Subject: [PATCH 44/60] python3Packages.pysmlight: 0.2.12 -> 0.2.13

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

diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix
index 010ed052b504..cf67952a1f3d 100644
--- a/pkgs/development/python-modules/pysmlight/default.nix
+++ b/pkgs/development/python-modules/pysmlight/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pysmlight";
-  version = "0.2.12";
+  version = "0.2.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "smlight-tech";
     repo = "pysmlight";
     tag = "v${version}";
-    hash = "sha256-oTauF58/xeIzcRqxXjdLN3T8cjPz8ZSWvi/XIm8qSsU=";
+    hash = "sha256-59LrSNI9/F7mtlBNILOJIBzqPcX2ivWQR2Cf/otMlzM=";
   };
 
   build-system = [

From 43816f5cd4d4933f312f864ec0ccb3ce8d8875c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= <tmuehlbacher@posteo.net>
Date: Fri, 19 Dec 2025 13:43:21 +0100
Subject: [PATCH 45/60] fwupd: 2.0.18 -> 2.0.19

Diff: https://github.com/fwupd/fwupd/compare/2.0.18...2.0.19

Changelog: https://github.com/fwupd/fwupd/releases/tag/2.0.19
---
 pkgs/by-name/fw/fwupd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix
index 5cfaac86114e..cbdf4702a393 100644
--- a/pkgs/by-name/fw/fwupd/package.nix
+++ b/pkgs/by-name/fw/fwupd/package.nix
@@ -135,7 +135,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fwupd";
-  version = "2.0.18";
+  version = "2.0.19";
 
   # libfwupd goes to lib
   # daemon, plug-ins and libfwupdplugin go to out
@@ -153,7 +153,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "fwupd";
     repo = "fwupd";
     tag = finalAttrs.version;
-    hash = "sha256-hF0fSn8lh0E0UQ+7HgMvqjltFajjx11s7THZYpt/hlE=";
+    hash = "sha256-DjO+7CEOef5KMbYEPtDr3GrnXTDUO/jwwZ4P17o4oDg=";
   };
 
   patches = [

From a14b85eaa10b3c0f02e1e697f02058d886c6e317 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 13:04:31 +0000
Subject: [PATCH 46/60] cargo-public-api: 0.50.1 -> 0.50.2

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

diff --git a/pkgs/by-name/ca/cargo-public-api/package.nix b/pkgs/by-name/ca/cargo-public-api/package.nix
index 499ac2a562ec..2e72b7526c4e 100644
--- a/pkgs/by-name/ca/cargo-public-api/package.nix
+++ b/pkgs/by-name/ca/cargo-public-api/package.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-public-api";
-  version = "0.50.1";
+  version = "0.50.2";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-npSZT8ivdG1e+8mcRKlFHgjjwgLPOOGRqLHsPcu4vu0=";
+    hash = "sha256-Lg8X0t5u4Mq/eWc0yfuLyn4HlE+j6qSsLE+MFBjBpbk=";
   };
 
-  cargoHash = "sha256-VHZsUWyUEGMVOJkAuIRGVmej4KdAtAiTjagAvv+k/Os=";
+  cargoHash = "sha256-OjuCABObMRkFrTbtV4wpSHzV9Yqmwr/VotmsUW9qUDk=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 6dfcd90885cc712259eb9e6b2de99cf7b0704b6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 14:25:36 +0000
Subject: [PATCH 47/60] parca-agent: 0.44.1 -> 0.44.2

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

diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix
index 47d382df5070..81756629bc77 100644
--- a/pkgs/by-name/pa/parca-agent/package.nix
+++ b/pkgs/by-name/pa/parca-agent/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "parca-agent";
-  version = "0.44.1";
+  version = "0.44.2";
 
   src = fetchFromGitHub {
     owner = "parca-dev";
     repo = "parca-agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CMX6Cl46pHRdVOv/EmMfqN5sdLmRUbU3gR6iwqkx1bg=";
+    hash = "sha256-nRStraxWDk3eY6L4znPsvT+NNz/cIYBae5sdYnOybi0=";
     fetchSubmodules = true;
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-VvO2sDgr+MlKcHDQzcZPpxyIBO/NrkdfF8ntA/SCb2Y=";
+  vendorHash = "sha256-OvhKmCxLIzLXxBmTaLrZFTAIkZXG2C1AZggaVYhlF3I=";
 
   buildInputs = [
     stdenv.cc.libc.static

From 9db45a04b5a916ebc07a18c686f5553a52eaccf3 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 19 Dec 2025 08:11:03 -0600
Subject: [PATCH 48/60] vimPlugins: update on 2025-12-19

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../editors/vim/plugins/generated.nix         | 460 ++++++++----------
 .../editors/vim/plugins/overrides.nix         |   6 +-
 .../plugins/patches/tsc.nvim/fix-path.patch   |  13 -
 3 files changed, 207 insertions(+), 272 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/plugins/patches/tsc.nvim/fix-path.patch

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index cfa071e2e4c6..ee587083d0ec 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -165,12 +165,12 @@ final: prev: {
 
   Ionide-vim = buildVimPlugin {
     pname = "Ionide-vim";
-    version = "0-unstable-2025-05-11";
+    version = "0-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "ionide";
       repo = "Ionide-vim";
-      rev = "6d6583e4a23333b3bc6f7af5d2cbffed377c15a9";
-      hash = "sha256-igD6XP+4EYH216W5INRXMAzSURRCJ51zNm3C6VPwahQ=";
+      rev = "14ad501ffe4cf2fdcd8e1d4d613cafcc6d878583";
+      hash = "sha256-zSXPIHhlRv+vuKal0fyVTh87PKUJSmNsnp2Uz5SX6yQ=";
     };
     meta.homepage = "https://github.com/ionide/Ionide-vim/";
     meta.hydraPlatforms = [ ];
@@ -412,12 +412,12 @@ final: prev: {
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "0-unstable-2025-12-13";
+    version = "0-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "48dba219db5d45baad6f7491e754706f74d12676";
-      hash = "sha256-vXcjzd80kX4vYSJVSwOy7/K4NHpABzw32bf8LR/VoLg=";
+      rev = "806187c790d93625564708c286e16142d87a5cc9";
+      hash = "sha256-OdyC+4pJ5AAKrThY9d3yjCe34J3WsJMjd+kzjg1TqQ0=";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1168,12 +1168,12 @@ final: prev: {
 
   auto-fix-return-nvim = buildVimPlugin {
     pname = "auto-fix-return.nvim";
-    version = "0.2.2-unstable-2025-12-16";
+    version = "0.3.0-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "Jay-Madden";
       repo = "auto-fix-return.nvim";
-      rev = "010462311fca08f1fb790811d69d03620b6d6ba7";
-      hash = "sha256-sqnRP0wr25FS3JzwoPCZizkfwbepwj7/9i+TuBQJisk=";
+      rev = "ae72ee36ccb90c8441820313bf9dff81a08c0932";
+      hash = "sha256-4x1LEBx1ufL+cq4T3uYxGO7zV1I3p2FckjMWdhK0Lbs=";
     };
     meta.homepage = "https://github.com/Jay-Madden/auto-fix-return.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1780,12 +1780,12 @@ final: prev: {
 
   blink-ripgrep-nvim = buildVimPlugin {
     pname = "blink-ripgrep.nvim";
-    version = "2.2.0-unstable-2025-12-15";
+    version = "2.2.1-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "blink-ripgrep.nvim";
-      rev = "1452099314b50bf0e0cc98d5d288fdbff17b41b6";
-      hash = "sha256-Iw+ZULfj2uuJ2+u3R1glxCX6Y1zvry7Fuubbr9n4VY0=";
+      rev = "e27c411ee282d803e54092ea7b5dd23f291997e5";
+      hash = "sha256-8mJ0kCVpKs8T6jA8kiD7KuyQEPEbF4FBFRpLcsdk9EU=";
     };
     meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2300,12 +2300,12 @@ final: prev: {
 
   cmake-tools-nvim = buildVimPlugin {
     pname = "cmake-tools.nvim";
-    version = "0-unstable-2025-12-14";
+    version = "0-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "Civitasv";
       repo = "cmake-tools.nvim";
-      rev = "02d109f18ccbfc527d70f14fefa226d20c014924";
-      hash = "sha256-snSVYP7YXGDAIAbT9/uD8d+sx8WfrK+PEKXjB66orOc=";
+      rev = "f34418d7aa57c730ee91b3e45e7612978506fcf3";
+      hash = "sha256-qv0/H+pb2RYc4aqxka1ucvXe2nu6r7c1OpPBBtwFf8o=";
     };
     meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3080,12 +3080,12 @@ final: prev: {
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "0.0.82-unstable-2025-12-15";
+    version = "0.0.82-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "2b01821065d13d6ad29062b34900c6499b582ac5";
-      hash = "sha256-Wz1HgmwBTzrlJTWFmYqT3r424N1xVPH0B/WPOjl37Sc=";
+      rev = "8fe98adc8c7dc9c157648fa95e394b5d7bfa5ebc";
+      hash = "sha256-V2JtuLfs/PbXIs+cPv8VpXBhZB1uWJbut/TWElpmirE=";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3158,12 +3158,12 @@ final: prev: {
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "18.1.1-unstable-2025-12-15";
+    version = "18.2.1-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      rev = "4c1df6d65548dc08d7bea9ce8e320843672bc90a";
-      hash = "sha256-HWl0j2teGKSiYbJ9MVZ4rSv70Bk17CaG8ac+xwZ8MW4=";
+      rev = "57232d7aedcc0675933fe5596d3167029d9057a8";
+      hash = "sha256-94uX1Ie+BiKSPGCYcUwoZ6DZwSz8tUxaNsa+xTv1ejw=";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3442,19 +3442,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  completion-treesitter = buildVimPlugin {
-    pname = "completion-treesitter";
-    version = "0.1-unstable-2020-06-26";
-    src = fetchFromGitHub {
-      owner = "nvim-treesitter";
-      repo = "completion-treesitter";
-      rev = "45c9b2faff4785539a0d0c655440c2465fed985a";
-      hash = "sha256-dPSMdyW4KsEjSDfITFruu+jNrAVOuvzCKgj/M/9v76Y=";
-    };
-    meta.homepage = "https://github.com/nvim-treesitter/completion-treesitter/";
-    meta.hydraPlatforms = [ ];
-  };
-
   concealedyank-vim = buildVimPlugin {
     pname = "concealedyank.vim";
     version = "0-unstable-2013-03-24";
@@ -3483,12 +3470,12 @@ final: prev: {
 
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "9.1.0-unstable-2025-12-14";
+    version = "9.1.0-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "9b8fa5e0b78168f68bee9bf886dc20f287c61e02";
-      hash = "sha256-4nEMsRSSjDizA+z3w+2tqWGjf78qjYLuF7Itj82vhmA=";
+      rev = "41715945edf518ca73a9bd63ab6cdc23dd5c7b33";
+      hash = "sha256-jC1RC/sUgfvSkFp381zOPdwSGAz44gKoaqaZMprFkeE=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/conform.nvim/";
@@ -3757,12 +3744,12 @@ final: prev: {
 
   cspell-nvim = buildVimPlugin {
     pname = "cspell.nvim";
-    version = "0-unstable-2025-07-30";
+    version = "0-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "davidmh";
       repo = "cspell.nvim";
-      rev = "07d75238648ef99c0c5c05f4cfd83093d0a01dd4";
-      hash = "sha256-NueeXta+dYoRXTPmyj+V2NQf94fkWD9mBK9iUm3NqEk=";
+      rev = "5feecef8d109f5460c576596aba44a6253127aa4";
+      hash = "sha256-NTgIaEWqtubjFEfIrw8sKTjhNbnmJ1In0OcddRg5W0w=";
     };
     meta.homepage = "https://github.com/davidmh/cspell.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4773,12 +4760,12 @@ final: prev: {
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "0-unstable-2025-12-15";
+    version = "0-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "05be49f6ff760fb1a5a9ff4ef4532265b692d3ee";
-      hash = "sha256-M49mjYyKaPoJFJtcRLIzJIy2DmVtgv9bczhP22fOurA=";
+      rev = "0578aa499b4d0dd19678516d553b28c89f39ef1d";
+      hash = "sha256-kiJ3rGXUnFgMm/Y6dMYqu693AxfY7R2D0QXkP+DfGrM=";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6038,12 +6025,12 @@ final: prev: {
 
   gruvbox-alabaster-nvim = buildVimPlugin {
     pname = "gruvbox-alabaster.nvim";
-    version = "0.1.1-unstable-2025-12-08";
+    version = "0.1.3-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "Xoconoch";
       repo = "gruvbox-alabaster.nvim";
-      rev = "246822279aa2c23b9374c5aee8ee71dbc06d26e6";
-      hash = "sha256-H7prkThcl7pgjy9ergMCSL371qbV4E2LoaYOqpIguVA=";
+      rev = "548bca6e8077ff489493869a705ee1c445868107";
+      hash = "sha256-zocBGqqQOBtymRviN1Ptfj6QJ6UI60UqQ11Me4kn/VA=";
     };
     meta.homepage = "https://github.com/Xoconoch/gruvbox-alabaster.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6103,12 +6090,12 @@ final: prev: {
 
   gruvbox-material-nvim = buildVimPlugin {
     pname = "gruvbox-material.nvim";
-    version = "1.7.0-unstable-2025-12-15";
+    version = "1.8.0-unstable-2025-12-16";
     src = fetchFromGitHub {
       owner = "f4z3r";
       repo = "gruvbox-material.nvim";
-      rev = "c99bcdc568844356dac05ec476097eea703a1f39";
-      hash = "sha256-DZR1o+U6RJ+YVTrJXq6TX541Ag5GgPjgGm+qqZ5L7hU=";
+      rev = "d8a0ce9c87bca4f988ac34211cc273533d620e18";
+      hash = "sha256-ihBOEnzsYZRyZkQMYW1baFotJ6YYIUWnVPheFK7bCoI=";
     };
     meta.homepage = "https://github.com/f4z3r/gruvbox-material.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6142,12 +6129,12 @@ final: prev: {
 
   guard-nvim = buildVimPlugin {
     pname = "guard.nvim";
-    version = "2.6.0-unstable-2025-12-15";
+    version = "2.6.2-unstable-2025-12-16";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "guard.nvim";
-      rev = "047555e4e319efb6064a014ae5b98c80280a00d0";
-      hash = "sha256-r6Tn9wGkS3rd+wtjqdPNtzwDNy9gus1FplT40gAffPI=";
+      rev = "c1d2b668e0d1868e9be5757bb9aa278bc1f84c18";
+      hash = "sha256-WwYWYAsaeYE038T1FoVse4aiSOrFoIegIWWmFHLaMt0=";
     };
     meta.homepage = "https://github.com/nvimdev/guard.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6560,12 +6547,12 @@ final: prev: {
 
   hover-nvim = buildVimPlugin {
     pname = "hover.nvim";
-    version = "0-unstable-2025-10-04";
+    version = "0-unstable-2025-12-12";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "hover.nvim";
-      rev = "3b49066e09e03e63be6d6f43ae2b8bcd58301f63";
-      hash = "sha256-rKYwxUWlfEdZk+UwepoJiK+l3NrZPDaUO4ArQle+1Hg=";
+      rev = "e61604205336d4461d2f910ecbb9f2ddc0b947a0";
+      hash = "sha256-TrBzF/jj4Q014Lhi/B9Bev+oTXTnh37lFltbdosNQ64=";
     };
     meta.homepage = "https://github.com/lewis6991/hover.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6690,12 +6677,12 @@ final: prev: {
 
   img-clip-nvim = buildVimPlugin {
     pname = "img-clip.nvim";
-    version = "0.6.0-unstable-2025-12-04";
+    version = "0.6.0-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "HakonHarnes";
       repo = "img-clip.nvim";
-      rev = "93fcf50924108262caec66b900077987dfcb7c7f";
-      hash = "sha256-k2yLqVnD4zGMwsOIfhUBmcocomQXuQ9afUdATPeDaN0=";
+      rev = "b6ddfb97b5600d99afe3452d707444afda658aca";
+      hash = "sha256-LDh5xzIqNrxeGY6+cnB923uSuo8/uEms4NUdFhSDmlg=";
     };
     meta.homepage = "https://github.com/HakonHarnes/img-clip.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6742,12 +6729,12 @@ final: prev: {
 
   incline-nvim = buildVimPlugin {
     pname = "incline.nvim";
-    version = "0.1.0-unstable-2025-11-16";
+    version = "0.1.0-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "incline.nvim";
-      rev = "6a3b0635bcd2490dbb1fa124217d41bf69ca0fa2";
-      hash = "sha256-4YMtnhm1DvywnfxD2D9POZLq+368AsBqbGk6OvNL8/0=";
+      rev = "8b54c59bcb23366645ae10edca6edfb9d3a0853e";
+      hash = "sha256-aOkmH3j1F6Hqxb7ug/fxlj/rhCzhzC8gORdJmetjhoQ=";
     };
     meta.homepage = "https://github.com/b0o/incline.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7068,12 +7055,12 @@ final: prev: {
 
   jule-nvim = buildVimPlugin {
     pname = "jule.nvim";
-    version = "0-unstable-2025-11-15";
+    version = "0-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "julelang";
       repo = "jule.nvim";
-      rev = "eeedcd740989921e3d449da4befb567fca31406b";
-      hash = "sha256-VPu0Jf/1+brTUQLp0eyPy2IzvIXjZ9RJljQNPKbBFsU=";
+      rev = "73f0a305ae593a13f75d6564ca30e4dbd45722e4";
+      hash = "sha256-O6FW9Ftx7McwkI6R4r0tkDCk3FRye1LLNyn8Kva5KNo=";
     };
     meta.homepage = "https://github.com/julelang/jule.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7133,12 +7120,12 @@ final: prev: {
 
   kanso-nvim = buildVimPlugin {
     pname = "kanso.nvim";
-    version = "0-unstable-2025-11-05";
+    version = "0-unstable-2025-12-16";
     src = fetchFromGitHub {
       owner = "webhooked";
       repo = "kanso.nvim";
-      rev = "81041940f469fba3c9eb6efe32eb3174281806df";
-      hash = "sha256-4ADzAn571uqi8QZ0jAat5ljjf6V4oBbQE0DAcjF9le0=";
+      rev = "2aaecdc66e03f85b73ccad47cf2d837312d5bf6a";
+      hash = "sha256-cvSK18VAK7BGISELdXpv1jsFZZwdsjZIE1Wq/dgwI00=";
     };
     meta.homepage = "https://github.com/webhooked/kanso.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7250,12 +7237,12 @@ final: prev: {
 
   kulala-nvim = buildVimPlugin {
     pname = "kulala.nvim";
-    version = "5.3.3-unstable-2025-12-08";
+    version = "5.3.3-unstable-2025-12-16";
     src = fetchFromGitHub {
       owner = "mistweaverco";
       repo = "kulala.nvim";
-      rev = "b36aff673915391e415d4acc7c90ca6ca6891750";
-      hash = "sha256-AGHBvAihjJqKwzIierrcWPsKnw2lthGqEPNPcy5FsaM=";
+      rev = "9fc4831a116fb32b0fd420ed483f5102a873446a";
+      hash = "sha256-A5yNW1XLLoSmsT8/7qB+SGguE7IMmcwv6tnhbF6nb2Y=";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
@@ -7342,12 +7329,12 @@ final: prev: {
 
   lazy-nvim = buildVimPlugin {
     pname = "lazy.nvim";
-    version = "11.17.5-unstable-2025-11-06";
+    version = "11.17.5-unstable-2025-12-17";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazy.nvim";
-      rev = "85c7ff3711b730b4030d03144f6db6375044ae82";
-      hash = "sha256-h5404njTAfqMJFQ3MAr2PWSbV81eS4aIs0cxAXkT0EM=";
+      rev = "306a05526ada86a7b30af95c5cc81ffba93fef97";
+      hash = "sha256-5A4kducPwKb5fKX4oSUFvo898P0dqfsqqLxFaXBsbQY=";
     };
     meta.homepage = "https://github.com/folke/lazy.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7407,12 +7394,12 @@ final: prev: {
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2025.10.1-unstable-2025-12-09";
+    version = "2025.10.1-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "dc5daebd094fbb40c4c3f235eb045987874da02a";
-      hash = "sha256-/HeBEDz9pKpUskaDnWzBcJanYUKVvdXFJO7epJUsJA0=";
+      rev = "f567bd8241044c2ba1e1ab3ca655a43a16374b1b";
+      hash = "sha256-mq+KX2EpLipm/41V366YQP3Lhq33uRr2t7jhmIUkdLM=";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8279,12 +8266,12 @@ final: prev: {
 
   mason-lspconfig-nvim = buildVimPlugin {
     pname = "mason-lspconfig.nvim";
-    version = "2.1.0-unstable-2025-12-15";
+    version = "2.1.0-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "mason-org";
       repo = "mason-lspconfig.nvim";
-      rev = "3b3571b4dadbcb464804466e9872e7246c316af7";
-      hash = "sha256-/zidUgZkISfpACESm+BOFVo2AqW/Pg3GDogiBAMZopk=";
+      rev = "bf9e7205192015dc48727744f21e09ac986664f9";
+      hash = "sha256-e1f6rRDa0PzFd2UEwi9Np5b/QBLLOiwmpiJ/ythf564=";
     };
     meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8487,7 +8474,7 @@ final: prev: {
 
   mini-ai = buildVimPlugin {
     pname = "mini.ai";
-    version = "0.16.0-unstable-2025-11-20";
+    version = "0.17.0-unstable-2025-11-20";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.ai";
@@ -8500,7 +8487,7 @@ final: prev: {
 
   mini-align = buildVimPlugin {
     pname = "mini.align";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.align";
@@ -8513,7 +8500,7 @@ final: prev: {
 
   mini-animate = buildVimPlugin {
     pname = "mini.animate";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.animate";
@@ -8526,7 +8513,7 @@ final: prev: {
 
   mini-base16 = buildVimPlugin {
     pname = "mini.base16";
-    version = "0.16.0-unstable-2025-12-07";
+    version = "0.17.0-unstable-2025-12-07";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.base16";
@@ -8539,7 +8526,7 @@ final: prev: {
 
   mini-basics = buildVimPlugin {
     pname = "mini.basics";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.basics";
@@ -8552,7 +8539,7 @@ final: prev: {
 
   mini-bracketed = buildVimPlugin {
     pname = "mini.bracketed";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.bracketed";
@@ -8565,7 +8552,7 @@ final: prev: {
 
   mini-bufremove = buildVimPlugin {
     pname = "mini.bufremove";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.bufremove";
@@ -8578,7 +8565,7 @@ final: prev: {
 
   mini-clue = buildVimPlugin {
     pname = "mini.clue";
-    version = "0.16.0-unstable-2025-12-11";
+    version = "0.17.0-unstable-2025-12-11";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.clue";
@@ -8591,12 +8578,12 @@ final: prev: {
 
   mini-cmdline = buildVimPlugin {
     pname = "mini.cmdline";
-    version = "0-unstable-2025-12-11";
+    version = "0.17.0-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.cmdline";
-      rev = "2dfa134199ba80aa4a55bc2601ad533e045d426e";
-      hash = "sha256-V8QFradm/KffEB0DOPxNLaPNAWojLQfKTDP+PYPzn3c=";
+      rev = "85159418d11c9cea48372502d40c2679afb4ddd6";
+      hash = "sha256-hSKegkJjAjzdRu/UCbhy2Ta5R1lPcpW4cORjJh0zkzw=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.cmdline/";
     meta.hydraPlatforms = [ ];
@@ -8604,7 +8591,7 @@ final: prev: {
 
   mini-colors = buildVimPlugin {
     pname = "mini.colors";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.colors";
@@ -8617,7 +8604,7 @@ final: prev: {
 
   mini-comment = buildVimPlugin {
     pname = "mini.comment";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.comment";
@@ -8630,7 +8617,7 @@ final: prev: {
 
   mini-completion = buildVimPlugin {
     pname = "mini.completion";
-    version = "0.16.0-unstable-2025-11-11";
+    version = "0.17.0-unstable-2025-11-11";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.completion";
@@ -8643,7 +8630,7 @@ final: prev: {
 
   mini-cursorword = buildVimPlugin {
     pname = "mini.cursorword";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.cursorword";
@@ -8656,7 +8643,7 @@ final: prev: {
 
   mini-deps = buildVimPlugin {
     pname = "mini.deps";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.deps";
@@ -8669,7 +8656,7 @@ final: prev: {
 
   mini-diff = buildVimPlugin {
     pname = "mini.diff";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.diff";
@@ -8682,7 +8669,7 @@ final: prev: {
 
   mini-doc = buildVimPlugin {
     pname = "mini.doc";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.doc";
@@ -8695,7 +8682,7 @@ final: prev: {
 
   mini-extra = buildVimPlugin {
     pname = "mini.extra";
-    version = "0.16.0-unstable-2025-11-14";
+    version = "0.17.0-unstable-2025-11-14";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.extra";
@@ -8708,7 +8695,7 @@ final: prev: {
 
   mini-files = buildVimPlugin {
     pname = "mini.files";
-    version = "0.16.0-unstable-2025-12-12";
+    version = "0.17.0-unstable-2025-12-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.files";
@@ -8721,7 +8708,7 @@ final: prev: {
 
   mini-fuzzy = buildVimPlugin {
     pname = "mini.fuzzy";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.fuzzy";
@@ -8734,7 +8721,7 @@ final: prev: {
 
   mini-git = buildVimPlugin {
     pname = "mini-git";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini-git";
@@ -8747,7 +8734,7 @@ final: prev: {
 
   mini-hipatterns = buildVimPlugin {
     pname = "mini.hipatterns";
-    version = "0.16.0-unstable-2025-11-07";
+    version = "0.17.0-unstable-2025-11-07";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.hipatterns";
@@ -8760,7 +8747,7 @@ final: prev: {
 
   mini-hues = buildVimPlugin {
     pname = "mini.hues";
-    version = "0.16.0-unstable-2025-12-07";
+    version = "0.17.0-unstable-2025-12-07";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.hues";
@@ -8773,7 +8760,7 @@ final: prev: {
 
   mini-icons = buildVimPlugin {
     pname = "mini.icons";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.icons";
@@ -8786,7 +8773,7 @@ final: prev: {
 
   mini-indentscope = buildVimPlugin {
     pname = "mini.indentscope";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.indentscope";
@@ -8799,7 +8786,7 @@ final: prev: {
 
   mini-jump = buildVimPlugin {
     pname = "mini.jump";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.jump";
@@ -8812,7 +8799,7 @@ final: prev: {
 
   mini-jump2d = buildVimPlugin {
     pname = "mini.jump2d";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.jump2d";
@@ -8825,7 +8812,7 @@ final: prev: {
 
   mini-keymap = buildVimPlugin {
     pname = "mini.keymap";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.keymap";
@@ -8838,7 +8825,7 @@ final: prev: {
 
   mini-map = buildVimPlugin {
     pname = "mini.map";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.map";
@@ -8851,7 +8838,7 @@ final: prev: {
 
   mini-misc = buildVimPlugin {
     pname = "mini.misc";
-    version = "0.16.0-unstable-2025-11-11";
+    version = "0.17.0-unstable-2025-11-11";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.misc";
@@ -8864,7 +8851,7 @@ final: prev: {
 
   mini-move = buildVimPlugin {
     pname = "mini.move";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.move";
@@ -8877,7 +8864,7 @@ final: prev: {
 
   mini-notify = buildVimPlugin {
     pname = "mini.notify";
-    version = "0.16.0-unstable-2025-12-11";
+    version = "0.17.0-unstable-2025-12-11";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.notify";
@@ -8890,12 +8877,12 @@ final: prev: {
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "0.16.0-unstable-2025-12-13";
+    version = "0.17.0-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.nvim";
-      rev = "6bd3a01aaf7d248aea1b78aacdd5d44bffa002c1";
-      hash = "sha256-0Gvl6rKW+z64Rpd6DL0vX23QJPsnVRSTRwVu3xse5xE=";
+      rev = "7d57454e8e4c62592badfffef67032db383f3c51";
+      hash = "sha256-n06vM87qA3fIXYJInaFM4r9TBJNZrSguAG2cJGOVS9A=";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8903,7 +8890,7 @@ final: prev: {
 
   mini-operators = buildVimPlugin {
     pname = "mini.operators";
-    version = "0.16.0-unstable-2025-12-12";
+    version = "0.17.0-unstable-2025-12-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.operators";
@@ -8916,7 +8903,7 @@ final: prev: {
 
   mini-pairs = buildVimPlugin {
     pname = "mini.pairs";
-    version = "0.16.0-unstable-2025-12-12";
+    version = "0.17.0-unstable-2025-12-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.pairs";
@@ -8929,7 +8916,7 @@ final: prev: {
 
   mini-pick = buildVimPlugin {
     pname = "mini.pick";
-    version = "0.16.0-unstable-2025-12-12";
+    version = "0.17.0-unstable-2025-12-12";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.pick";
@@ -8942,7 +8929,7 @@ final: prev: {
 
   mini-sessions = buildVimPlugin {
     pname = "mini.sessions";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.sessions";
@@ -8955,7 +8942,7 @@ final: prev: {
 
   mini-snippets = buildVimPlugin {
     pname = "mini.snippets";
-    version = "0.16.0-unstable-2025-11-17";
+    version = "0.17.0-unstable-2025-11-17";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.snippets";
@@ -8968,7 +8955,7 @@ final: prev: {
 
   mini-splitjoin = buildVimPlugin {
     pname = "mini.splitjoin";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.splitjoin";
@@ -8981,7 +8968,7 @@ final: prev: {
 
   mini-starter = buildVimPlugin {
     pname = "mini.starter";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.starter";
@@ -8994,7 +8981,7 @@ final: prev: {
 
   mini-statusline = buildVimPlugin {
     pname = "mini.statusline";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.statusline";
@@ -9007,7 +8994,7 @@ final: prev: {
 
   mini-surround = buildVimPlugin {
     pname = "mini.surround";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.surround";
@@ -9020,7 +9007,7 @@ final: prev: {
 
   mini-tabline = buildVimPlugin {
     pname = "mini.tabline";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.tabline";
@@ -9033,7 +9020,7 @@ final: prev: {
 
   mini-trailspace = buildVimPlugin {
     pname = "mini.trailspace";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.trailspace";
@@ -9046,7 +9033,7 @@ final: prev: {
 
   mini-visits = buildVimPlugin {
     pname = "mini.visits";
-    version = "0.16.0-unstable-2025-11-03";
+    version = "0.17.0-unstable-2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.visits";
@@ -9072,12 +9059,12 @@ final: prev: {
 
   minuet-ai-nvim = buildVimPlugin {
     pname = "minuet-ai.nvim";
-    version = "0.8.0-unstable-2025-12-15";
+    version = "0.8.0-unstable-2025-12-17";
     src = fetchFromGitHub {
       owner = "milanglacier";
       repo = "minuet-ai.nvim";
-      rev = "7522a2cfed5797974c72d3f10f48c51e0a6778e3";
-      hash = "sha256-KRDgdoNrgWtfqhMWUytdV6U2EGZsj4paxOwKgMBVSQM=";
+      rev = "fc483f1e8afdbb6dbe9c8cb1b00d51f8f9c8f7f1";
+      hash = "sha256-67I90jl9PTOe2BOCjALl6a83Fq6EVIoUzqan32Ey+E0=";
     };
     meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9553,12 +9540,12 @@ final: prev: {
 
   neo-tree-nvim = buildVimPlugin {
     pname = "neo-tree.nvim";
-    version = "3.38.0-unstable-2025-12-08";
+    version = "3.38.0-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      rev = "7a6f14c6edde0921333005cd738309b70138964b";
-      hash = "sha256-GWRBBYyoYaUuOlrOFy3SNgnH/iJz6rQ3WNThOKbV8go=";
+      rev = "740101f43da78e6507792f0d3fe7c542c5daac13";
+      hash = "sha256-/jEC/7a02OajrjkHhssX1FUQBvFH9VWJseDO7t4OcPc=";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9579,12 +9566,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "1.4.0-unstable-2025-12-16";
+    version = "1.4.0-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "f7ccc9434a943991725759c1590da28ee4a903c0";
-      hash = "sha256-5dEV6Ihc0cL3gvDQCyZWjoTIFHTfWArNcQ2bLuyXuFE=";
+      rev = "73896d5e3b006259e44acc29b1404bb3c58721fa";
+      hash = "sha256-o7sr3k0N7e8z2jvj9/UpKrVb5rkCN9nBOSyYEAhk8XA=";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9985,12 +9972,12 @@ final: prev: {
 
   neotest-java = buildVimPlugin {
     pname = "neotest-java";
-    version = "0.22.7-unstable-2025-12-08";
+    version = "0.22.7-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "rcasia";
       repo = "neotest-java";
-      rev = "bf3f0f9dc972e36c86798208c205c6a575b72f4b";
-      hash = "sha256-IcFZuyhOWLv6I5fU6nqq9IFCHfT72O8JfAFJX0TEM8A=";
+      rev = "171317247ff242abf61db1e8939099113c4337b2";
+      hash = "sha256-7yoqUioxn9WJcGOrpIlfT/YtJd+EDAoR2YWee/HHqmI=";
     };
     meta.homepage = "https://github.com/rcasia/neotest-java/";
     meta.hydraPlatforms = [ ];
@@ -10466,12 +10453,12 @@ final: prev: {
 
   nlsp-settings-nvim = buildVimPlugin {
     pname = "nlsp-settings.nvim";
-    version = "0-unstable-2025-12-15";
+    version = "0-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "090e0d85f573ff22483d1d57608ce732c9a4329f";
-      hash = "sha256-KUv4zgb7wy6+WyIvMuqWp94Lu4YhkQuNBW+9HSXAh7g=";
+      rev = "ced4f635eb60e2e0e41a92da035a5b93a8192517";
+      hash = "sha256-eINlYOhCVx8g8ha+QB4qaMJxqiOswmXULmenfpktfQY=";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
     meta.hydraPlatforms = [ ];
@@ -10661,12 +10648,12 @@ final: prev: {
 
   nvchad-ui = buildVimPlugin {
     pname = "nvchad-ui";
-    version = "0-unstable-2025-10-25";
+    version = "0-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "ui";
-      rev = "bea2af0a76c1098fac0988ad296aa028cad2a333";
-      hash = "sha256-LbMkrmOrEFC5eqwy08k59eFS6bMYaNOr2c1WUkbHZDs=";
+      rev = "eae966484937c9ef2b5e3f465fd9587464dc277c";
+      hash = "sha256-iigIzz1D0V/6Ca1Bl4/ReUV1FhyI7KqyxCJivc95Iqs=";
     };
     meta.homepage = "https://github.com/nvchad/ui/";
     meta.hydraPlatforms = [ ];
@@ -10713,12 +10700,12 @@ final: prev: {
 
   nvim-autopairs = buildVimPlugin {
     pname = "nvim-autopairs";
-    version = "0.10.0-unstable-2025-12-09";
+    version = "0.10.0-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "windwp";
       repo = "nvim-autopairs";
-      rev = "d9e44e54384e5b0f3536339c65484f2e41b528e3";
-      hash = "sha256-AHQp8586DmM7ukhSYhMF1jxkQsiqG6SOpHXZHrvZDL0=";
+      rev = "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4";
+      hash = "sha256-8k/vGYktoFBX3kjOyn+VR49xmhFhNZbkaI8UmbPSYF4=";
     };
     meta.homepage = "https://github.com/windwp/nvim-autopairs/";
     meta.hydraPlatforms = [ ];
@@ -10999,12 +10986,12 @@ final: prev: {
 
   nvim-dap-view = buildVimPlugin {
     pname = "nvim-dap-view";
-    version = "0-unstable-2025-11-21";
+    version = "0-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "igorlfs";
       repo = "nvim-dap-view";
-      rev = "25ffcf3a6d8d44b6275dac9d5ff9b1f9485907d9";
-      hash = "sha256-p/p9Y04h7adCddQBuumE7QgJfdIP4MbdiUpM/syLFa4=";
+      rev = "3508566d29a1c27429f3a91d6a940c205d5d22a1";
+      hash = "sha256-8ftjoOsDkIskvnUfz4x6I5IbVcpSVyBg3gJ54pSwxNo=";
     };
     meta.homepage = "https://github.com/igorlfs/nvim-dap-view/";
     meta.hydraPlatforms = [ ];
@@ -11116,12 +11103,12 @@ final: prev: {
 
   nvim-genghis = buildVimPlugin {
     pname = "nvim-genghis";
-    version = "0-unstable-2025-12-15";
+    version = "0-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-genghis";
-      rev = "4ea1bd29f002dac83a0c3c21f7fa3cdef1976f08";
-      hash = "sha256-LsyjWLnQCa466bhaYYyTsAMOOuofTh081glzK3cBV/w=";
+      rev = "9fd81c5d18d6f1d28ed11a2ca73ee5848c1af6e4";
+      hash = "sha256-EJmFkeprZ7drZ+77ERyl0p9txMLGNpfsHx9NNPdLCjo=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/";
     meta.hydraPlatforms = [ ];
@@ -11140,19 +11127,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  nvim-gps = buildVimPlugin {
-    pname = "nvim-gps";
-    version = "0-unstable-2022-07-05";
-    src = fetchFromGitHub {
-      owner = "smiteshp";
-      repo = "nvim-gps";
-      rev = "f4734dff6fc2f33b5fd13412e56c4fce06650a74";
-      hash = "sha256-o0pgk0IyeWmb4DOqlrpsWWl//E8geSUfoT06754Fz0k=";
-    };
-    meta.homepage = "https://github.com/smiteshp/nvim-gps/";
-    meta.hydraPlatforms = [ ];
-  };
-
   nvim-highlight-colors = buildVimPlugin {
     pname = "nvim-highlight-colors";
     version = "0-unstable-2025-09-06";
@@ -11376,12 +11350,12 @@ final: prev: {
 
   nvim-lint = buildVimPlugin {
     pname = "nvim-lint";
-    version = "0-unstable-2025-12-13";
+    version = "0-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "ae64d6466ed92b68353122d920e314ff2c8dd0a8";
-      hash = "sha256-kXQxjGjJRhem78lL9dHzGroVlniRAmglCP58GizO25c=";
+      rev = "7a64f4067065c16a355d40d0d599b8ca6b25de6d";
+      hash = "sha256-ysIoJ8uMAHu/OCemQ3yUYMhKIVnSDLQCvJH0SaGIOK4=";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
     meta.hydraPlatforms = [ ];
@@ -11428,12 +11402,12 @@ final: prev: {
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2.5.0-unstable-2025-12-15";
+    version = "2.5.0-unstable-2025-12-17";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "ad95655ec5d13ff7c728d731eb9fd39f34395a03";
-      hash = "sha256-Ktgphl9WlgUa437xdp2cew6N4uXOqZtXiNa74y8EwSY=";
+      rev = "c4f67bf85b01a57e3c130352c0a0e453ab8cd5b9";
+      hash = "sha256-v+vxukv23NbhucNw4ylvWCkHRgXKB7qpUJI4wdnJpdw=";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
     meta.hydraPlatforms = [ ];
@@ -11610,12 +11584,12 @@ final: prev: {
 
   nvim-origami = buildVimPlugin {
     pname = "nvim-origami";
-    version = "1.9-unstable-2025-12-15";
+    version = "1.9-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-origami";
-      rev = "ff30f97a2d6453d22172fd82b523a0a0bae5841e";
-      hash = "sha256-ulavk6i/k/ThBVI6zHPGeYQsljLRGq9UcLlUwqTM9xk=";
+      rev = "d12ae97202db14c7723a2e522d0e1bd0106b0a8a";
+      hash = "sha256-oqVMOKE1BHHa5qlYktPDbnkyQeb6dkVsKS4Dk2pWHO8=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-origami/";
     meta.hydraPlatforms = [ ];
@@ -11727,12 +11701,12 @@ final: prev: {
 
   nvim-rip-substitute = buildVimPlugin {
     pname = "nvim-rip-substitute";
-    version = "0-unstable-2025-12-15";
+    version = "0-unstable-2025-12-17";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-rip-substitute";
-      rev = "2bb104d735c7ea7e3b555112c40c1824a626e15b";
-      hash = "sha256-0u/5gYNFwRYTgjV63F920Nyp4wsixaIHdQIKhxXVMyc=";
+      rev = "3023802f8d00091f8b6b02f8aa1aa96c392c9583";
+      hash = "sha256-ZWCYaG9ptHH0Ep7qyr6CKucEt859Tl/LBYkF52fLS0o=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/";
     meta.hydraPlatforms = [ ];
@@ -11740,12 +11714,12 @@ final: prev: {
 
   nvim-scissors = buildVimPlugin {
     pname = "nvim-scissors";
-    version = "0-unstable-2025-12-15";
+    version = "0-unstable-2025-12-17";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-scissors";
-      rev = "30db53ee8f7c1dc22fc569b9fa5de94ab120631b";
-      hash = "sha256-mEsxc/1jTQwi9xLLAdO4z6XQ+DpXoFOlFmzr3kHd1rs=";
+      rev = "94f8e5cf6b7e7121f0fa91caaaa1c4cff6dd7f52";
+      hash = "sha256-x5AhdFFHi1uFi9BxBcJJjPm4YsD3Eznx1DT2YQj+oRA=";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/";
     meta.hydraPlatforms = [ ];
@@ -12286,12 +12260,12 @@ final: prev: {
 
   obsidian-nvim = buildVimPlugin {
     pname = "obsidian.nvim";
-    version = "3.14.7-unstable-2025-12-15";
+    version = "3.14.8-unstable-2025-12-17";
     src = fetchFromGitHub {
       owner = "obsidian-nvim";
       repo = "obsidian.nvim";
-      rev = "ecc7884fbfb8c1ee91ea5e346424040a01a8dece";
-      hash = "sha256-tajK7sBcvvZt0WPBXYLNTR7KGchw9SHc85/xmLu4ADQ=";
+      rev = "6c16b5ace855338425af6b3175f8ae7b230290be";
+      hash = "sha256-20/J2CNCpRNmmx28b+ZhIT+dHP+iTeeYr7GA/2coFQE=";
     };
     meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12325,12 +12299,12 @@ final: prev: {
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "0-unstable-2025-12-15";
+    version = "0-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "a834e0bd6268746e4c1f49c95180777d152c9d87";
-      hash = "sha256-/BZ9+sC79X0H+cYsGB6k2wGkdHsdYqw6wOxZ9KfFric=";
+      rev = "09ff70efd885fe1cdf62505dce3a9bc6baeb85e1";
+      hash = "sha256-DB+itnonBA9HVP+4LTjQdXpPxo/GpUSjmNHgUVaOq3w=";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12559,12 +12533,12 @@ final: prev: {
 
   opencode-nvim = buildVimPlugin {
     pname = "opencode.nvim";
-    version = "0-unstable-2025-12-15";
+    version = "0-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "NickvanDyke";
       repo = "opencode.nvim";
-      rev = "39a246b597d6050ca319142b5af5a8b81c74e7d9";
-      hash = "sha256-h/Zttho/grrpmcklld15NNGf+3epqLg8RmmRW8eApSo=";
+      rev = "bc42d98c8efb23022d32fde878b0c07018eb73a8";
+      hash = "sha256-exkPf3s+E3DxbQrswcnlVBYtd11TBNmTV8KSz/lcvAI=";
     };
     meta.homepage = "https://github.com/NickvanDyke/opencode.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13000,19 +12974,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  playground = buildVimPlugin {
-    pname = "playground";
-    version = "0-unstable-2023-09-15";
-    src = fetchFromGitHub {
-      owner = "nvim-treesitter";
-      repo = "playground";
-      rev = "ba48c6a62a280eefb7c85725b0915e021a1a0749";
-      hash = "sha256-gOQr61Y3bVa6EAb0P924X9SJmg9lOmGiLcFTMdgu8u0=";
-    };
-    meta.homepage = "https://github.com/nvim-treesitter/playground/";
-    meta.hydraPlatforms = [ ];
-  };
-
   poimandres-nvim = buildVimPlugin {
     pname = "poimandres.nvim";
     version = "0.6.0-unstable-2024-10-19";
@@ -13576,12 +13537,12 @@ final: prev: {
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "8.10.0-unstable-2025-12-15";
+    version = "8.10.0-unstable-2025-12-16";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "686af1e08c47a72e1f969ba2b40a424446d882cf";
-      hash = "sha256-0SOv/Jec2qb4zOfiuIP5dyXp1bz+N3BlbvG3Iu2fDU8=";
+      rev = "07d088bf8bdadd159eb807b90eaee86a4778383f";
+      hash = "sha256-A7pm8sBQWsZl3Kc7JBh3gBUyKb6GfJ5J0zfn3mSGjKs=";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13707,12 +13668,12 @@ final: prev: {
 
   roslyn-nvim = buildVimPlugin {
     pname = "roslyn.nvim";
-    version = "0-unstable-2025-12-12";
+    version = "0-unstable-2025-12-16";
     src = fetchFromGitHub {
       owner = "seblyng";
       repo = "roslyn.nvim";
-      rev = "548d98036ac7f0a11f60e699aa020639fff1c57b";
-      hash = "sha256-s8WvWcPI4CIL9BETBH8VO9Q8Xu2CMTr83OVR2BBgi+I=";
+      rev = "4deb46ce892c279d3183661342c93aa2ec9716c6";
+      hash = "sha256-HyFCP8dyQ8Ak/kheO7uykuhxbI2tL2lAIb7aXVq+vJY=";
     };
     meta.homepage = "https://github.com/seblyng/roslyn.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13824,12 +13785,12 @@ final: prev: {
 
   satellite-nvim = buildVimPlugin {
     pname = "satellite.nvim";
-    version = "1.0.0-unstable-2025-09-18";
+    version = "1.0.0-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "satellite.nvim";
-      rev = "7c2e5a4064abb0066a0bf157e7a137f1bcdeace2";
-      hash = "sha256-Xv++rrZEQUlDL6hdQiA8JiTUlWD2S8zw2nSDqEC02LQ=";
+      rev = "d6c681e3b01e45a899eae5569d0cf08849479683";
+      hash = "sha256-qkxMXDEl6ou92JDJpyac4wpjKhLp38GWL+WX8r+d7uA=";
     };
     meta.homepage = "https://github.com/lewis6991/satellite.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14761,19 +14722,6 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
-  syntax-tree-surfer = buildVimPlugin {
-    pname = "syntax-tree-surfer";
-    version = "0-unstable-2023-10-06";
-    src = fetchFromGitHub {
-      owner = "ziontee113";
-      repo = "syntax-tree-surfer";
-      rev = "732ea6d0f868bcccd2f526be73afa46997d5a2fb";
-      hash = "sha256-jYVNw+2ZlJl5EaGZ0EfjInHOtQHlL6FYGAXZgXu983Q=";
-    };
-    meta.homepage = "https://github.com/ziontee113/syntax-tree-surfer/";
-    meta.hydraPlatforms = [ ];
-  };
-
   tabby-nvim = buildVimPlugin {
     pname = "tabby.nvim";
     version = "2.8.0-unstable-2025-05-23";
@@ -15992,12 +15940,12 @@ final: prev: {
 
   tsc-nvim = buildVimPlugin {
     pname = "tsc.nvim";
-    version = "2.9.0-unstable-2025-11-12";
+    version = "2.9.0-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "dmmulroy";
       repo = "tsc.nvim";
-      rev = "e4773833726beec2e8a8e11f0b21613b5472b97b";
-      hash = "sha256-R8iMrKepiOGuStj93SZ67EIAwlicoUvHKJI8qKzimh4=";
+      rev = "eecf551d69bf683603c77bd31a031873261d0147";
+      hash = "sha256-NpOjtpW6J9tZpEjr4RWvSM2iHxaJ9fGENVY3I2vLDdU=";
     };
     meta.homepage = "https://github.com/dmmulroy/tsc.nvim/";
     meta.hydraPlatforms = [ ];
@@ -16135,12 +16083,12 @@ final: prev: {
 
   typst-vim = buildVimPlugin {
     pname = "typst.vim";
-    version = "0-unstable-2025-10-30";
+    version = "0-unstable-2025-12-17";
     src = fetchFromGitHub {
       owner = "kaarmu";
       repo = "typst.vim";
-      rev = "235e0423ab8b1ec83a29d8b1a45cfbd6c0296382";
-      hash = "sha256-2FZnhkp2pN8axzrwsFy0p28vQTmmPs0eyf2j0ojovnk=";
+      rev = "1d5436c0f55490893892441c0eca55e6cdf4916c";
+      hash = "sha256-qKY+tE7zCP7UNUeeesGGS5zJ9nudCJiQosLaI/TtD08=";
     };
     meta.homepage = "https://github.com/kaarmu/typst.vim/";
     meta.hydraPlatforms = [ ];
@@ -16213,12 +16161,12 @@ final: prev: {
 
   unified-nvim = buildVimPlugin {
     pname = "unified.nvim";
-    version = "0.0.2-unstable-2025-11-06";
+    version = "0.0.2-unstable-2025-12-17";
     src = fetchFromGitHub {
       owner = "axkirillov";
       repo = "unified.nvim";
-      rev = "6442680a541cd0fa8290b7b8894a61eeae4b2e26";
-      hash = "sha256-+YwRgcJZyCxCTHNgUENWhinm4KOJNVgQypZ0bESsL/Q=";
+      rev = "dba480fc448f578bf4ff11989ae4abfcdb84ff39";
+      hash = "sha256-+3swcw2rkg82bWP/0+0I97ZMnJeoxOX11AZtaob0VS8=";
     };
     meta.homepage = "https://github.com/axkirillov/unified.nvim/";
     meta.hydraPlatforms = [ ];
@@ -16252,12 +16200,12 @@ final: prev: {
 
   unison = buildVimPlugin {
     pname = "unison";
-    version = "0-unstable-2025-12-14";
+    version = "0-unstable-2025-12-18";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "51ef936619de19b5ccbc6ce2c9d67ff073d471ae";
-      hash = "sha256-Oy9FPF0k221wB+V7tX1bDX7ajh4PWe/z6iSCDQDLRd4=";
+      rev = "a6527ab2de645fdb42572717401428db75335d8a";
+      hash = "sha256-FC3y5pqn+YUuTD3C6mm+09AKcBdMIGodxi9wWlKzHu0=";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
     meta.hydraPlatforms = [ ];
@@ -16356,12 +16304,12 @@ final: prev: {
 
   vague-nvim = buildVimPlugin {
     pname = "vague.nvim";
-    version = "1.5.0-unstable-2025-12-15";
+    version = "1.6.0-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "vague-theme";
       repo = "vague.nvim";
-      rev = "eee599e434d958b7d0890f8b4a0e5fe6ab5d3a0b";
-      hash = "sha256-Zudl/T2HYzmUu6399LFLnjbDRfw50EU+OT3VTomHc7E=";
+      rev = "fcc283576764474ccfbbcca240797d5d7f4d8a78";
+      hash = "sha256-upqvTAnmJBAIoyzGxv+hq04dvS5wv3bjkbx2pWLCp+s=";
     };
     meta.homepage = "https://github.com/vague-theme/vague.nvim/";
     meta.hydraPlatforms = [ ];
@@ -21142,12 +21090,12 @@ final: prev: {
 
   vim-spirv = buildVimPlugin {
     pname = "vim-spirv";
-    version = "0.5.2-unstable-2025-11-13";
+    version = "0.5.2-unstable-2025-12-17";
     src = fetchFromGitHub {
       owner = "kbenzie";
       repo = "vim-spirv";
-      rev = "457da57f5f557457abbff291506d3e2a0b6f955f";
-      hash = "sha256-164C2hAbDs3qrIiLC5Z680oyWqmgihWxK4BeqvL/4b0=";
+      rev = "38ce902d638e128ba41c8ed37c2c6cf6b20c84fd";
+      hash = "sha256-P0s8jwg+7tf3V8hoC8S/4x2mTs/OXgSsWXuSTWXVyVM=";
     };
     meta.homepage = "https://github.com/kbenzie/vim-spirv/";
     meta.hydraPlatforms = [ ];
@@ -21416,12 +21364,12 @@ final: prev: {
 
   vim-test = buildVimPlugin {
     pname = "vim-test";
-    version = "2.1.0-unstable-2025-12-01";
+    version = "2.1.0-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "vim-test";
       repo = "vim-test";
-      rev = "1eeb12774a0f251571700ccf68da27789b2f0852";
-      hash = "sha256-sI4DYeQgOsvHv4OgZD3xKctpDxlYVFIzVcjzXZVZgMo=";
+      rev = "aa619692ff48a3cf3e6bdb893765039488d4e5f3";
+      hash = "sha256-It6u/WVH+eY6OOgb9B8TojjcIYKWj1tQRq0YOcNMMII=";
     };
     meta.homepage = "https://github.com/vim-test/vim-test/";
     meta.hydraPlatforms = [ ];
@@ -22249,12 +22197,12 @@ final: prev: {
 
   vimtex = buildVimPlugin {
     pname = "vimtex";
-    version = "2.17-unstable-2025-12-07";
+    version = "2.17-unstable-2025-12-17";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "6e1229e23c3bbe93487ef62458b1241a2d8ff6af";
-      hash = "sha256-59xJy6yFIBqV64ScLI6zMZTS6bAhhaWhdFosw2NRezg=";
+      rev = "aed184681f177ae6071e56cd7a2b9441261fca52";
+      hash = "sha256-HMM65aMARC6rVtUXf+iOUSPlJybBz6Ad2J+Xhw3VIng=";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
     meta.hydraPlatforms = [ ];
@@ -22379,12 +22327,12 @@ final: prev: {
 
   vscode-diff-nvim = buildVimPlugin {
     pname = "vscode-diff.nvim";
-    version = "2.0.0-next.9-unstable-2025-12-15";
+    version = "2.0.0-next.16-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "esmuellert";
       repo = "vscode-diff.nvim";
-      rev = "6475f9164aceafbe156fd66374f85d0f23aea254";
-      hash = "sha256-oDwhZ1PAffiRdpHfrtdg9i59+e7hpCLiRw4O7BZUQ94=";
+      rev = "24fd73d889f2d71a467d65db03a01f4ca1255dca";
+      hash = "sha256-ci7j9gCWwIyX7QYMB9G/yQK4oF3FLkC2WQVQpQH/dYY=";
     };
     meta.homepage = "https://github.com/esmuellert/vscode-diff.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22822,12 +22770,12 @@ final: prev: {
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "13.1.0-unstable-2025-12-16";
+    version = "13.1.0-unstable-2025-12-19";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "d0c8418799787766fef9e415e82533e3fa8a28dc";
-      hash = "sha256-lKGFC+4jQGyEZNo7dZJ1/xeqZncE03MWR+K0YzhFc5M=";
+      rev = "275c195596c857955f4627a8b48b68144d79478f";
+      hash = "sha256-Te6XeTCjWu3yXouSHxz5KXk4Pv21f00170xX2jLTWwE=";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
     meta.hydraPlatforms = [ ];
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 87a7a91ac9c3..d3df21156570 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -3612,10 +3612,10 @@ assertNoAdditions {
   };
 
   tsc-nvim = super.tsc-nvim.overrideAttrs {
-    patches = [ ./patches/tsc.nvim/fix-path.patch ];
-
     postPatch = ''
-      substituteInPlace lua/tsc/utils.lua --replace-fail '@tsc@' ${typescript}/bin/tsc
+      substituteInPlace lua/tsc/utils.lua --replace-fail \
+      'bin_name = bin_name or "tsc"' \
+      'bin_name = bin_name or "${typescript}/bin/tsc"'
     '';
 
     # Unit test
diff --git a/pkgs/applications/editors/vim/plugins/patches/tsc.nvim/fix-path.patch b/pkgs/applications/editors/vim/plugins/patches/tsc.nvim/fix-path.patch
deleted file mode 100644
index a311d42e4b7d..000000000000
--- a/pkgs/applications/editors/vim/plugins/patches/tsc.nvim/fix-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lua/tsc/utils.lua b/lua/tsc/utils.lua
-index 6433bcb..75760f9 100644
---- a/lua/tsc/utils.lua
-+++ b/lua/tsc/utils.lua
-@@ -16,7 +16,7 @@ M.find_tsc_bin = function()
-     return node_modules_tsc_binary
-   end
- 
--  return "tsc"
-+  return "@tsc@"
- end
- 
- --- @param run_mono_repo boolean

From 1d4f45280f78048916578f7aed486c2362e1049c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 14:32:05 +0000
Subject: [PATCH 49/60] python3Packages.libuuu: 1.5.239 -> 1.5.243

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

diff --git a/pkgs/development/python-modules/libuuu/default.nix b/pkgs/development/python-modules/libuuu/default.nix
index 8e236742c9c5..f3d18481b265 100644
--- a/pkgs/development/python-modules/libuuu/default.nix
+++ b/pkgs/development/python-modules/libuuu/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "libuuu";
-  version = "1.5.239";
+  version = "1.5.243";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-fknRdLwdB3JCnd6OJzU4jiOWvKgsQJdYkvBgONddaCY=";
+    hash = "sha256-k7DFVrqkHzPLjZMdWyLdfawyOSw+L7Bi4oRdeJo6lxw=";
   };
 
   build-system = [

From 77a1bc61a2258d967470bd50f8e73df5f81dd9ff Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 19 Dec 2025 08:14:25 -0600
Subject: [PATCH 50/60] luaPackages: update on 2025-12-19

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../lua-modules/generated-packages.nix        | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 4f779987cf29..1ca0882bf493 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -814,15 +814,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "fzf-lua";
-      version = "0.0.2365-1";
+      version = "0.0.2384-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/fzf-lua-0.0.2365-1.rockspec";
-          sha256 = "14d2r59w8nlql07q5f0842lnnpz5v7dj0prwq79p0cj17aq6387h";
+          url = "mirror://luarocks/fzf-lua-0.0.2384-1.rockspec";
+          sha256 = "0aqfz3vj3cxvp4f5mb3gnpi8yz9pjcdc9bh7v3f28sakhhz8wnbm";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/ibhagwan/fzf-lua/archive/0284d640fd88c56f100a43f41103c5b564699e15.zip";
-        sha256 = "1n0xk82dacgr24dqpp9sskj1a7gpsa6a7y8flispzagi3glg8ww8";
+        url = "https://github.com/ibhagwan/fzf-lua/archive/9d579feab4d3035627150e5e9b6e8fbf5e814ef6.zip";
+        sha256 = "1vw1w5l9jvy35vzd32clpxfrf2fdx3a636yvan23y702qy529fg4";
       };
 
       disabled = luaOlder "5.1";
@@ -903,15 +903,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "grug-far.nvim";
-      version = "1.6.53-1";
+      version = "1.6.55-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/grug-far.nvim-1.6.53-1.rockspec";
-          sha256 = "0wi4b1iv8clspp5nflmf7qfl56dwgclfzvh83wyp6zgp7i1s0rxm";
+          url = "mirror://luarocks/grug-far.nvim-1.6.55-1.rockspec";
+          sha256 = "0b8yh56saq6ksp031qxkxc8pz8fmm2qzlc1sk6v66v0im9i6wlnc";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/MagicDuck/grug-far.nvim/archive/b58b2d65863f4ebad88b10a1ddd519e5380466e0.zip";
-        sha256 = "06g8710k74ymwcm358y6h2c12v4n8wr95nhs2a0514xlqa3khadq";
+        url = "https://github.com/MagicDuck/grug-far.nvim/archive/bc589a1ba340a00ae40bf1436401eac5b1454687.zip";
+        sha256 = "0fsg38lmg5x90z0zym5x1vyylsrqxfp6l54s25r9q5sdsciap03m";
       };
 
       disabled = luaOlder "5.1";
@@ -3590,15 +3590,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "lze";
-      version = "0.11.7-1";
+      version = "0.12.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/lze-0.11.7-1.rockspec";
-          sha256 = "18jj2g81i6b56a9kyg3q1qsrkgvhcz3kgcp419s4bvza8inkzqcq";
+          url = "mirror://luarocks/lze-0.12.0-1.rockspec";
+          sha256 = "104z5r3wqbjinsh89pv8rm32383b3ia8n3r89g8dkbmj118xb93j";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/BirdeeHub/lze/archive/v0.11.7.zip";
-        sha256 = "0zr8pzib9xg8ngvlx536603ji99xwzgjcggxn7f6fl1b2zm4dj6n";
+        url = "https://github.com/BirdeeHub/lze/archive/v0.12.0.zip";
+        sha256 = "0yak34g547yygxrwav021c2bya98zhbc5mkwrsx5zm2vwa4h55pa";
       };
 
       disabled = luaOlder "5.1";
@@ -3841,15 +3841,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "mini.test";
-      version = "0.16.0-1";
+      version = "0.17.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/mini.test-0.16.0-1.rockspec";
-          sha256 = "0gw9cz6iy01c09gzhprrzlz12yz5pvivmjcxywajs1qq0095d5n1";
+          url = "mirror://luarocks/mini.test-0.17.0-1.rockspec";
+          sha256 = "0k9qvizfb3if0r20zid8had91ckkfy061lznvmi4r9hyy421dwfw";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/echasnovski/mini.test/archive/v0.16.0.zip";
-        sha256 = "0si92d4jc7lmzj2mppz0vcmgqgsbgy64fl4bj8jwdl7z78bhpjwk";
+        url = "https://github.com/echasnovski/mini.test/archive/v0.17.0.zip";
+        sha256 = "0hffg59cn8dlhnjnkcfs9vannf10n2j33lna2d8zbaxajxaa8jks";
       };
 
       disabled = luaOlder "5.1";
@@ -3878,8 +3878,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "leafo";
         repo = "moonscript";
-        rev = "3b134e01ebc5961ca132bff5ba2871c88d65347e";
-        hash = "sha256-ijWmxgoi524fbo3oXxuK/cPHxwHyGt3mMrGOw3+TsfY=";
+        rev = "b9768c893bd25c514c6404767fadec29dfd01060";
+        hash = "sha256-wU3zfDS5Df/4VyNPAjKfCs/dK3vm3ln/rCn4i4jCvDw=";
       };
 
       disabled = luaOlder "5.1";
@@ -5031,8 +5031,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "nvim-telescope";
         repo = "telescope.nvim";
-        rev = "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2";
-        hash = "sha256-e6XSJRv4KB0z+nzGWmlV/YZNwWsyrrpQTloePRKWmw4=";
+        rev = "3d757e586ff0bfc85bdb7b46c9d3d932147a0cde";
+        hash = "sha256-PUqDSm6My5vNoPNKE9KQLfASnx3tlUy+EsXn1wdbSO0=";
       };
 
       disabled = lua.luaversion != "5.1";

From ab931da66e36200759a229ac80ca36ed44d09577 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 14:59:39 +0000
Subject: [PATCH 51/60] vectorcode: 0.7.19 -> 0.7.20

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

diff --git a/pkgs/by-name/ve/vectorcode/package.nix b/pkgs/by-name/ve/vectorcode/package.nix
index f700a7de6c57..6e1ddd3f1f70 100644
--- a/pkgs/by-name/ve/vectorcode/package.nix
+++ b/pkgs/by-name/ve/vectorcode/package.nix
@@ -96,14 +96,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "vectorcode";
-  version = "0.7.19";
+  version = "0.7.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Davidyz";
     repo = "VectorCode";
     tag = version;
-    hash = "sha256-H2Umh4/vRDqaGXVoK/fZaj9guA4IaVSgOEDAVEPsD9A=";
+    hash = "sha256-RU9WnKuPaxDnPW5MQyrxPEw7ufMcVNxSRyJ5QvrzoVs=";
   };
 
   build-system = with python.pkgs; [

From ae576de2aad27af2254170cc104b4c013b81e88b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 19 Dec 2025 08:08:39 -0600
Subject: [PATCH 52/60] =?UTF-8?q?yaziPlugins.lazygit:=200-unstable-2025-08?=
 =?UTF-8?q?-06=20=E2=86=92=200-unstable-2025-12-19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/ya/yazi/plugins/lazygit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/lazygit/default.nix b/pkgs/by-name/ya/yazi/plugins/lazygit/default.nix
index c9e5c8ab2e99..7e1a3937cbbf 100644
--- a/pkgs/by-name/ya/yazi/plugins/lazygit/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/lazygit/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "lazygit.yazi";
-  version = "0-unstable-2025-08-06";
+  version = "0-unstable-2025-12-19";
 
   src = fetchFromGitHub {
     owner = "Lil-Dank";
     repo = "lazygit.yazi";
-    rev = "8f37dc5795f165021098b17d797c7b8f510aeca9";
-    hash = "sha256-rR7SMTtQYrvQjhkzulDaNH/LAA77UnXkcZ50WwBX2Uw=";
+    rev = "ea20d05b4ede88a239830d2b50ba79b1860a3bee";
+    hash = "sha256-uDRd2pDgvYAwrnsKg5U/Dj8ZPtNKzlJRg+YARKjSpCw=";
   };
 
   meta = {

From 34312fbfe38aef3da01b093aeba194ace148877a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 15:08:01 +0000
Subject: [PATCH 53/60] gatus: 5.31.0 -> 5.33.1

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

diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix
index b605edb3ab7b..bed78284b5e2 100644
--- a/pkgs/by-name/ga/gatus/package.nix
+++ b/pkgs/by-name/ga/gatus/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gatus";
-  version = "5.31.0";
+  version = "5.33.1";
 
   src = fetchFromGitHub {
     owner = "TwiN";
     repo = "gatus";
     rev = "v${version}";
-    hash = "sha256-thLS6pAlnu7XcQHritr28CnzmpIOgIcEPIch2IwhZfQ=";
+    hash = "sha256-m7dOgxk1EuyqIuVK4ZDimqZX015Osk5FF+0/SFAkp90=";
   };
 
-  vendorHash = "sha256-VaD/cTf9D00gr6+9gKadK4aTwqhmJN/+cohwNvckxyw=";
+  vendorHash = "sha256-T4BPCDYR/f2rInLNytaVibE2hKWsIYqpJw9asY0TbvY=";
 
   subPackages = [ "." ];
 

From 00a2cb373bcc37b1086d4e5a7d8c957f4eff57d3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 19 Dec 2025 16:25:07 +0100
Subject: [PATCH 54/60] pretix: 2025.10.0 -> 2025.10.1

https://pretix.eu/about/en/blog/20251219-release-2025-10-1/

Fixes: CVE-2025-14881
---
 pkgs/by-name/pr/pretix/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index 2bf65ff43787..94bc5950bfba 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -42,13 +42,13 @@ let
   };
 
   pname = "pretix";
-  version = "2025.10.0";
+  version = "2025.10.1";
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix";
     rev = "refs/tags/v${version}";
-    hash = "sha256-q8h7wYUv5ahWvM3sT9srVHnJv5QnakkUKYhgx1X/j5k=";
+    hash = "sha256-O9HAslZ8xbmLgJi3y91M6mc1oIvJZ8nRJyFRuNorRHs=";
   };
 
   npmDeps = buildNpmPackage {

From 91a9e524bcbf9d8fdbb8047afb4ecaf5d1b08b82 Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Fri, 19 Dec 2025 16:55:58 +0100
Subject: [PATCH 55/60] fastmail-desktop: remove myself as maintainer

---
 pkgs/by-name/fa/fastmail-desktop/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/fa/fastmail-desktop/package.nix b/pkgs/by-name/fa/fastmail-desktop/package.nix
index 531fdce45e84..ae6f88fdd833 100644
--- a/pkgs/by-name/fa/fastmail-desktop/package.nix
+++ b/pkgs/by-name/fa/fastmail-desktop/package.nix
@@ -22,7 +22,6 @@ callPackage (if isDarwin then ./darwin.nix else ./linux.nix) {
     license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = [
-      lib.maintainers.Enzime
       lib.maintainers.nekowinston
     ];
     platforms = [

From 102be1c5ac620f14656fb9df7ba6bd21b5e42e16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Fri, 19 Dec 2025 15:56:41 +0000
Subject: [PATCH 56/60] claude-code: 2.0.72 -> 2.0.73

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

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 19f1a3c41c4c..889102bc4213 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.72",
+  "version": "2.0.73",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.72",
+      "version": "2.0.73",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index c1c109fc8edb..f96d87924592 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -11,14 +11,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.72";
+  version = "2.0.73";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-xa9etUBw1UIoHc44ypQ83PQKVNC0KS/DGwnZrvW9ero=";
+    hash = "sha256-kQRj8Vd735KyPzPZnoieE4TxUKHoCpnC62Blsh5dbWw=";
   };
 
-  npmDepsHash = "sha256-fUxOINLRXoXYyQzxmo2vtolzMr7mBIAct9hwNOAhNdg=";
+  npmDepsHash = "sha256-H6EqVQ7DpccxDzlMu9GuRIAQao8m3AO36mQUh1J0TRI=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From b2d76914c66452659dc477425ee04dc7ba36ea5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Fri, 19 Dec 2025 15:56:51 +0000
Subject: [PATCH 57/60] vscode-extensions.anthropic.claude-code: 2.0.73 ->
 2.0.74

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

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index bb8a63e58c36..087547586b3a 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.73";
-    hash = "sha256-JmhdWX0ukTjb45dydLmKF1UAX1RMc89izgvuMtmdiUI=";
+    version = "2.0.74";
+    hash = "sha256-2GhutC0n56fd3+GwLJQFYKuhUOiYWW6S5M3GlsYOEMM=";
   };
 
   meta = {

From b8e032d57ff9eb1208e9714ec7a8d801e77de9d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 16:02:20 +0000
Subject: [PATCH 58/60] serie: 0.5.5 -> 0.5.6

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

diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix
index 9b32ff770357..58419f8d8ff0 100644
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "serie";
-  version = "0.5.5";
+  version = "0.5.6";
 
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "serie";
     rev = "v${version}";
-    hash = "sha256-qbXbbHu8RFSzeexWY/KQKEDnL+pRQPSV8sweCEcv4Kc=";
+    hash = "sha256-i9muqWkvJOBuUmOJ2ib8S6WOKUwqmiciZFc+rv0GBpI=";
   };
 
-  cargoHash = "sha256-lNJY+iNXE+f1haOmNL6OehS5KsLYJMCvF04U5a/AXhA=";
+  cargoHash = "sha256-8ZTk6Kixiv4MCpvAdYfwiJzJIMqX5MVu9pNaPjMahUs=";
 
   nativeCheckInputs = [ gitMinimal ];
 

From 70b546946f9b93ca4ee27249776e9ad938197549 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Dec 2025 16:33:18 +0000
Subject: [PATCH 59/60] draupnir: 2.8.0 -> 2.9.0

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

diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix
index 0a0dfdc05d16..cbbc893f2c32 100644
--- a/pkgs/by-name/dr/draupnir/package.nix
+++ b/pkgs/by-name/dr/draupnir/package.nix
@@ -22,13 +22,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "draupnir";
-  version = "2.8.0";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "the-draupnir-project";
     repo = "Draupnir";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I9DYiNxD95pzHVsgZ/hJwHfrsVqE/eBALNiePVNDpy0=";
+    hash = "sha256-j5UEW9JpIHhFWGMEwrPE1v0hdFAw5Z4CImRYEm56I4k=";
   };
 
   nativeBuildInputs = [
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = fetchYarnDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-kTdJ6zKNjH5CxcM9EvXzbz2Phrp5xI0+pvNwMLRmLgQ=";
+    hash = "sha256-Ck6Ba/qDlEW5jqKUX8tyB0QbiVXU8+ND2tvhftmYktY=";
   };
 
   preBuild = ''

From 894dd2b4a3b098b6eaf58b74c61fa64c51d337ca Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 19 Dec 2025 18:00:29 +0100
Subject: [PATCH 60/60] colord: fix build for structuredAttrs

---
 pkgs/by-name/co/colord/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/co/colord/package.nix b/pkgs/by-name/co/colord/package.nix
index fcaee7eb20b2..04a22087a26f 100644
--- a/pkgs/by-name/co/colord/package.nix
+++ b/pkgs/by-name/co/colord/package.nix
@@ -122,11 +122,13 @@ stdenv.mkDerivation rec {
     glib-compile-schemas $out/share/glib-2.0/schemas
   '';
 
-  PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
-  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
-  PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d";
-  PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions";
-  PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
+  env = {
+    PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
+    PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
+    PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d";
+    PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions";
+    PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
+  };
 
   passthru = {
     tests = {