From 351ec8a9223a78c9970502459f5cfd4cc03b0b36 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Oct 2024 22:57:07 +0100
Subject: [PATCH 001/340] normcap: fix on GNOME wayland when used via keybind
 or alt-f2

---
 pkgs/by-name/no/normcap/package.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix
index 8404231fa3921..c58a0b540d943 100644
--- a/pkgs/by-name/no/normcap/package.nix
+++ b/pkgs/by-name/no/normcap/package.nix
@@ -69,6 +69,28 @@ ps.buildPythonApplication rec {
       --set QT_QPA_PLATFORM xcb
       --prefix PATH : ${lib.makeBinPath wrapperDeps}
     )
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    # cursed fix on GNOME+wayland
+    # this works because systemd-run runs the command as an ad-hoc service named run-1234567890.service
+    # FIXME: make something like `--slice=app-com.github.dynobo.normcap.slice`
+    #        work such that the "screenshot screenshot" permission in
+    #        `flatpak permissions` is associated with the xdg app id
+    #        "com.github.dynobo.normcap" and not ""
+    makeWrapperArgs+=(
+      --run '
+        if command -v systemd-run >/dev/null; then
+            exec -a "$0" systemd-run --wait --user \
+              --setenv=PATH="$PATH" \
+              --setenv=PYTHONNOUSERSITE="$PYTHONNOUSERSITE" \
+              --setenv=QT_QPA_PLATFORM="$QT_QPA_PLATFORM" \
+              ${placeholder "out"}/bin/.normcap-wrapped "$@"
+        else
+            exec -a "$0" ${placeholder "out"}/bin/.normcap-wrapped "$@"
+        fi
+        exit $?
+      '
+    )
   '';
 
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''

From d11baac0c2ba9a0df59fb08c6b790156300ed0b3 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 27 Oct 2024 22:56:36 +0100
Subject: [PATCH 002/340] normcap: fix build when `doCheck=false;`

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

diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix
index c58a0b540d943..6794faa5fecd5 100644
--- a/pkgs/by-name/no/normcap/package.nix
+++ b/pkgs/by-name/no/normcap/package.nix
@@ -61,6 +61,7 @@ ps.buildPythonApplication rec {
   dependencies = [
     ps.pyside6
     ps.jeepney
+    ps.toml
   ];
 
   preFixup = ''
@@ -103,7 +104,6 @@ ps.buildPythonApplication rec {
     ps.pytest-cov-stub
     ps.pytest-instafail
     ps.pytest-qt
-    ps.toml
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     ps.pytest-xvfb
     xorg.xvfb

From a3f5de3a736f043a6b00f28a595a356a1a632f7b Mon Sep 17 00:00:00 2001
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Sun, 10 Nov 2024 20:14:26 +0100
Subject: [PATCH 003/340] python3Packages.ropper: 1.3.8 -> 1.3.10

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

diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
index b7f12332711e3..4d88ca3d47d88 100644
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -6,12 +6,13 @@
   filebytes,
   pytestCheckHook,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "ropper";
-  version = "1.13.8";
-  format = "setuptools";
+  version = "1.13.10";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -19,10 +20,12 @@ buildPythonPackage rec {
     owner = "sashs";
     repo = "Ropper";
     rev = "v${version}";
-    hash = "sha256-agbqP5O9QEP5UKkaWI5HxAlMsCBPKNSLnAAo2WFDXS8=";
+    hash = "sha256-yuHJ+EpglumEAXEu0iJKIXK1ouW1yptNahM9Wmk7AW4=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     capstone
     filebytes
   ];

From d8adb24aeb9343ff3683831672dace0874cbb878 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Nov 2024 18:33:04 +0000
Subject: [PATCH 004/340] python312Packages.glfw: 2.7.0 -> 2.8.0

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

diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix
index 56bb2a091748f..d021271439d51 100644
--- a/pkgs/development/python-modules/glfw/default.nix
+++ b/pkgs/development/python-modules/glfw/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "glfw";
-  version = "2.7.0";
+  version = "2.8.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "FlorianRhiem";
     repo = "pyGLFW";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9SNq8jKzgzFzonyMYoyjGbz4NDL83dPKWID9m3HZ7B8=";
+    hash = "sha256-3jcj4YExEtK1ANKDQsq94/NKF6GXXTFTEsXO3Jpf1uQ=";
   };
 
   # Patch path to GLFW shared object

From 1d79af7853dfaa73a12ca5319f38abcde0716885 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 23 Nov 2024 21:08:06 +0000
Subject: [PATCH 005/340] jxrlib: 1.1 -> 1.2~git20170615.f752187-5.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use Debian’s source, which contains additional fixes.
---
 pkgs/by-name/jx/jxrlib/package.nix | 40 +++++++++++-------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/jx/jxrlib/package.nix b/pkgs/by-name/jx/jxrlib/package.nix
index 517746aa9b531..25840b510c497 100644
--- a/pkgs/by-name/jx/jxrlib/package.nix
+++ b/pkgs/by-name/jx/jxrlib/package.nix
@@ -1,34 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
+{ lib, stdenv, fetchFromGitLab, cmake, ninja, quilt }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "jxrlib";
-  version = "1.1";
+  version = "1.2~git20170615.f752187-5.2";
 
-  # Use the source from a fork on github because CodePlex does not
-  # deliver an easily downloadable tarball.
-  src = fetchFromGitHub {
-    owner = "4creators";
-    repo = pname;
-    rev = "f7521879862b9085318e814c6157490dd9dbbdb4";
-    sha256 = "0rk3hbh00nw0wgbfbqk1szrlfg3yq7w6ar16napww3nrlm9cj65w";
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "debian-phototools-team";
+    repo = "jxrlib";
+    rev = "56e10e601a962c2e8d178e60e52cd8cf2d50f9c0";
+    hash = "sha256-BX4kLlFk8AfouKE9KDyG1EFFYLFB/HqYQRxFdjAe2J8=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/df96f9b9c1fbe9cdc97589c337f8a948bc81c4d0/debian/patches/usecmake.patch";
-      sha256 = "sha256-BpCToLgA5856PZk5mXlwAy3Oh9aYP/2wvu2DXDTqufM=";
-    })
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/6c88037293aff8d5bc8a76ea32b36781c430ede3/debian/patches/bug803743.patch";
-      sha256 = "sha256-omIGa+ZrWjaH/IkBn4jgjufF/HEDKw69anVCX4hw+xQ=";
-    })
-    (fetchpatch {
-      url = "https://salsa.debian.org/debian-phototools-team/jxrlib/-/raw/b23d49062ec6a9b2739c9dade86be525a72fc807/debian/patches/pkg-config.patch";
-      sha256 = "sha256-ZACaXEi+rbKIFBHtSBheyFfqV2HYsKKrT+SmTShyUhg=";
-    })
-  ];
-
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ninja quilt ];
 
   strictDeps = true;
 
@@ -36,6 +20,10 @@ stdenv.mkDerivation rec {
     NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
   };
 
+  postPatch = ''
+    QUILT_PATCHES=debian/patches quilt push -a
+  '';
+
   meta = with lib; {
     description = "Implementation of the JPEG XR image codec standard";
     homepage = "https://jxrlib.codeplex.com";

From 92d2131e251a90ed2640d93ccb7b1a49e48d11fa Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 23 Nov 2024 21:25:02 +0000
Subject: [PATCH 006/340] jxrlib: fix warning flags for GCC 14

---
 pkgs/by-name/jx/jxrlib/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/jx/jxrlib/package.nix b/pkgs/by-name/jx/jxrlib/package.nix
index 25840b510c497..982ccbf913f9c 100644
--- a/pkgs/by-name/jx/jxrlib/package.nix
+++ b/pkgs/by-name/jx/jxrlib/package.nix
@@ -16,9 +16,10 @@ stdenv.mkDerivation {
 
   strictDeps = true;
 
-  env = lib.optionalAttrs stdenv.cc.isClang {
-    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
-  };
+  env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " (
+    [ "-Wno-error=implicit-function-declaration"]
+    ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=incompatible-pointer-types" ]
+  );
 
   postPatch = ''
     QUILT_PATCHES=debian/patches quilt push -a

From ed5c3f93c5d03b9c80969290fa5a15c4b1f62150 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 24 Nov 2024 08:38:35 +0000
Subject: [PATCH 007/340] heaptrack: add patch for GCC 14

---
 pkgs/development/tools/profiling/heaptrack/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index 88de0065e8ec2..bc21f81787712 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -1,5 +1,5 @@
 {
-  lib, stdenv, mkDerivation, fetchFromGitHub, cmake, extra-cmake-modules, makeBinaryWrapper,
+  lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, extra-cmake-modules, makeBinaryWrapper,
   zlib, boost179, libunwind, elfutils, sparsehash, zstd,
   qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, kdiagram
 }:
@@ -15,6 +15,14 @@ mkDerivation rec {
     hash = "sha256-pP+s60ERnmOctYTe/vezCg0VYzziApNY0QaF3aTccZU=";
   };
 
+  patches = [
+    # cmake: Fix C compatibility of libunwind probes
+    (fetchpatch {
+      url = "https://invent.kde.org/sdk/heaptrack/-/commit/c6c45f3455a652c38aefa402aece5dafa492e8ab.patch";
+      hash = "sha256-eou53UUQX+S7yrz2RS95GwkAnNIZY/aaze0eAdjnbPU=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake extra-cmake-modules makeBinaryWrapper ];
   buildInputs = [
     zlib boost179 libunwind sparsehash zstd

From d2b95778b58ac46c3127e022eb68abae7140ddcf Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 24 Nov 2024 08:38:35 +0000
Subject: [PATCH 008/340] heaptrack: unpin Boost

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

diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index bc21f81787712..43c4a28d9a7b7 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -1,6 +1,6 @@
 {
   lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, extra-cmake-modules, makeBinaryWrapper,
-  zlib, boost179, libunwind, elfutils, sparsehash, zstd,
+  zlib, boost, libunwind, elfutils, sparsehash, zstd,
   qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, kdiagram
 }:
 
@@ -25,7 +25,7 @@ mkDerivation rec {
 
   nativeBuildInputs = [ cmake extra-cmake-modules makeBinaryWrapper ];
   buildInputs = [
-    zlib boost179 libunwind sparsehash zstd
+    zlib boost libunwind sparsehash zstd
     qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons kdiagram
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     elfutils

From 353717d0b67284bd3a2a0969ec4928fd8281a312 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 23 Nov 2024 21:37:09 +0000
Subject: [PATCH 009/340] colmap: unpin Boost

---
 pkgs/applications/science/misc/colmap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix
index 59e58351c0f6b..10d59e15d2f16 100644
--- a/pkgs/applications/science/misc/colmap/default.nix
+++ b/pkgs/applications/science/misc/colmap/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen,
+{ lib, fetchFromGitHub, cmake, boost, ceres-solver, eigen,
   freeimage, glog, libGLU, glew, qtbase,
   flann,
   cgal,
@@ -17,7 +17,7 @@
 assert cudaSupport -> cudaPackages != { };
 
 let
-  boost_static = boost179.override { enableStatic = true; };
+  boost_static = boost.override { enableStatic = true; };
   stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv;
 
   # TODO: migrate to redist packages

From 9d9e436ae3ed8a1f4dd8e776b3120643503ae692 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 29 Nov 2024 11:32:04 +0100
Subject: [PATCH 010/340] python312Packages.trimesh: 4.5.2 -> 4.5.3

Changelog: https://github.com/mikedh/trimesh/releases/tag/4.5.3
---
 pkgs/development/python-modules/trimesh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index 96bf8cbcf4917..3f902e8306251 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "trimesh";
-  version = "4.5.2";
+  version = "4.5.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FlsS8omMPo3smaLtBexcg+r6L8gVC6jDD4s6YvaTQz8=";
+    hash = "sha256-sa9gOZ9k9HFddExRlXVAaL/rmJgbkv6wwV0BbJk3n4c=";
   };
 
   build-system = [ setuptools ];

From 221a776add173eeb5848ceac70699c51ceae5bba Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 29 Nov 2024 10:32:34 +0000
Subject: [PATCH 011/340] spade: 0.10.0 -> 0.11.0

Changelog: https://gitlab.com/spade-lang/spade/-/blob/v0.11.0/CHANGELOG.md
---
 pkgs/by-name/sp/spade/Cargo.lock  | 33 ++++++++++++++++---------------
 pkgs/by-name/sp/spade/package.nix |  4 ++--
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/sp/spade/Cargo.lock b/pkgs/by-name/sp/spade/Cargo.lock
index 274d64e6947bf..3b6de9a3a94a1 100644
--- a/pkgs/by-name/sp/spade/Cargo.lock
+++ b/pkgs/by-name/sp/spade/Cargo.lock
@@ -991,7 +991,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "spade"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "clap",
  "codespan",
@@ -1025,7 +1025,7 @@ dependencies = [
 
 [[package]]
 name = "spade-ast"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "itertools",
  "num",
@@ -1034,7 +1034,7 @@ dependencies = [
 
 [[package]]
 name = "spade-ast-lowering"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "itertools",
  "local-impl",
@@ -1052,7 +1052,7 @@ dependencies = [
 
 [[package]]
 name = "spade-common"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "codespan",
  "codespan-reporting 0.12.0",
@@ -1077,7 +1077,7 @@ dependencies = [
 
 [[package]]
 name = "spade-diagnostics"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "codespan",
  "codespan-reporting 0.12.0",
@@ -1088,7 +1088,7 @@ dependencies = [
 
 [[package]]
 name = "spade-hir"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "colored",
  "itertools",
@@ -1104,7 +1104,7 @@ dependencies = [
 
 [[package]]
 name = "spade-hir-lowering"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "colored",
  "itertools",
@@ -1125,7 +1125,7 @@ dependencies = [
 
 [[package]]
 name = "spade-macros"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1135,7 +1135,7 @@ dependencies = [
 
 [[package]]
 name = "spade-mir"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "codespan",
  "codespan-reporting 0.12.0",
@@ -1154,7 +1154,7 @@ dependencies = [
 
 [[package]]
 name = "spade-parser"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "codespan",
  "colored",
@@ -1172,7 +1172,7 @@ dependencies = [
 
 [[package]]
 name = "spade-python"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "codespan-reporting 0.12.0",
  "color-eyre",
@@ -1201,7 +1201,7 @@ dependencies = [
 
 [[package]]
 name = "spade-simulation-ext"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "codespan-reporting 0.12.0",
  "color-eyre",
@@ -1221,6 +1221,7 @@ dependencies = [
  "spade-parser",
  "spade-typeinference",
  "spade-types",
+ "thiserror",
  "tracing",
  "tracing-subscriber",
  "tracing-tree",
@@ -1229,7 +1230,7 @@ dependencies = [
 
 [[package]]
 name = "spade-tests"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "codespan-reporting 0.12.0",
  "colored",
@@ -1257,7 +1258,7 @@ dependencies = [
 
 [[package]]
 name = "spade-typeinference"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "assert_matches",
  "colored",
@@ -1277,7 +1278,7 @@ dependencies = [
 
 [[package]]
 name = "spade-types"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "num",
  "serde",
@@ -1286,7 +1287,7 @@ dependencies = [
 
 [[package]]
 name = "spade-wordlength-inference"
-version = "0.10.0"
+version = "0.11.0"
 dependencies = [
  "num",
  "spade-common",
diff --git a/pkgs/by-name/sp/spade/package.nix b/pkgs/by-name/sp/spade/package.nix
index b312ce8683a40..220b605f0970e 100644
--- a/pkgs/by-name/sp/spade/package.nix
+++ b/pkgs/by-name/sp/spade/package.nix
@@ -14,13 +14,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "spade";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitLab {
     owner = "spade-lang";
     repo = "spade";
     rev = "v${version}";
-    hash = "sha256-IAb9Vj5KwyXpARD2SIgYRXhz1ihwcgCTwx3zbgoN6dE=";
+    hash = "sha256-JqKcW6xrb9XBHuwR0/EytZmYUV++N69R7wBNoHv9xJU=";
     # only needed for vatch, which contains test data
     fetchSubmodules = true;
   };

From bcda3bf12ebad1c06b52038207f4bc335324426f Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 29 Nov 2024 10:33:05 +0000
Subject: [PATCH 012/340] swim: 0.10.0 -> 0.11.0

Diff: https://gitlab.com/spade-lang/swim/-/compare/v0.10.0...v0.11.0

Changelog: https://gitlab.com/spade-lang/swim/-/blob/v0.11.0/CHANGELOG.md
---
 pkgs/by-name/sw/swim/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sw/swim/package.nix b/pkgs/by-name/sw/swim/package.nix
index 3e04dce7b78e1..c22e773a8a244 100644
--- a/pkgs/by-name/sw/swim/package.nix
+++ b/pkgs/by-name/sw/swim/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "swim";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitLab {
     owner = "spade-lang";
     repo = "swim";
     rev = "v${version}";
-    hash = "sha256-Yuq1eYjxNnmrydzPyx+UWJJlZnC9sIEP3ZEleKmkzIM=";
+    hash = "sha256-1F9C7robIe/8pWh9Dl/CdyvKEZhrFkLrp5/8QC9Z0X4=";
   };
 
-  cargoHash = "sha256-3WcMXvxlY0I7HnR+GTxHPAN+1HQsQLymjGFMM6q18xQ=";
+  cargoHash = "sha256-kY3eFnei70jfco+7TK9WS/YvbR/hf4JtrUbaRg7KN+8=";
 
   preConfigure = ''
     # de-vendor spade git submodule

From c578c48b7f0bdecaf6c6eb6cef4678f2223b29a9 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Fri, 29 Nov 2024 14:41:40 -0500
Subject: [PATCH 013/340] swift: source darwin-sdk-setup.bash

Fixes builds using xcbuild that redefine SDKROOT in the xcbuild wrapper.
SDKROOT will be set using the same logic that other wrappers use.
---
 pkgs/development/compilers/swift/wrapper/wrapper.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/swift/wrapper/wrapper.sh b/pkgs/development/compilers/swift/wrapper/wrapper.sh
index 3079bb182b1ac..bb9c07a5b4440 100644
--- a/pkgs/development/compilers/swift/wrapper/wrapper.sh
+++ b/pkgs/development/compilers/swift/wrapper/wrapper.sh
@@ -12,6 +12,8 @@ cc_wrapper="${NIX_CC:-@default_cc_wrapper@}"
 
 source $cc_wrapper/nix-support/utils.bash
 
+source $cc_wrapper/nix-support/darwin-sdk-setup.bash
+
 expandResponseParams "$@"
 
 # Check if we should wrap this Swift invocation at all, and how. Specifically,

From 6e80d5ccb4258b4b322842e29a31260111751e4c Mon Sep 17 00:00:00 2001
From: Anthony Loop <anthony@aloop.dev>
Date: Sat, 30 Nov 2024 16:27:19 -0800
Subject: [PATCH 014/340] radicale: add ldap3 dependency to fix ldap support

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

diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix
index 974521ea44f0b..cba1ab45c9a48 100644
--- a/pkgs/by-name/ra/radicale/package.nix
+++ b/pkgs/by-name/ra/radicale/package.nix
@@ -30,6 +30,7 @@ python3.pkgs.buildPythonApplication rec {
       pika
       python-dateutil
       pytz # https://github.com/Kozea/Radicale/issues/816
+      ldap3
     ]
     ++ passlib.optional-dependencies.bcrypt;
 

From 06bffcd1a3102c3245de5cf00c83c92458a87f42 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Fri, 29 Nov 2024 20:00:55 -0500
Subject: [PATCH 015/340] dxvk_1: fix build compatibility with GCC 14

Fixes `redefinition of 'struct __mingw_uuidof_s<ID3D10StateBlock>'` when
building DXVK 1.10.3 with GCC 14.
---
 pkgs/by-name/dx/dxvk_1/gcc14-compat.patch | 14 ++++++++++++++
 pkgs/by-name/dx/dxvk_1/package.nix        |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/by-name/dx/dxvk_1/gcc14-compat.patch

diff --git a/pkgs/by-name/dx/dxvk_1/gcc14-compat.patch b/pkgs/by-name/dx/dxvk_1/gcc14-compat.patch
new file mode 100644
index 0000000000000..917f437fdcc3e
--- /dev/null
+++ b/pkgs/by-name/dx/dxvk_1/gcc14-compat.patch
@@ -0,0 +1,14 @@
+diff --git a/src/d3d10/d3d10_interfaces.h b/src/d3d10/d3d10_interfaces.h
+index aa028ab575..99f1dc4567 100644
+--- a/src/d3d10/d3d10_interfaces.h
++++ b/src/d3d10/d3d10_interfaces.h
+@@ -1,9 +1,3 @@
+ #pragma once
+ 
+ #include "d3d10_include.h"
+-
+-#ifdef _MSC_VER
+-struct __declspec(uuid("0803425a-57f5-4dd6-9465-a87570834a08")) ID3D10StateBlock;
+-#else
+-__CRT_UUID_DECL(ID3D10StateBlock, 0x0803425a,0x57f5,0x4dd6,0x94,0x65,0xa8,0x75,0x70,0x83,0x4a,0x08);
+-#endif
diff --git a/pkgs/by-name/dx/dxvk_1/package.nix b/pkgs/by-name/dx/dxvk_1/package.nix
index 6d24af612e3cd..ace6746f3f2a2 100644
--- a/pkgs/by-name/dx/dxvk_1/package.nix
+++ b/pkgs/by-name/dx/dxvk_1/package.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://github.com/doitsujin/dxvk/commit/1a5afc77b1859e6c7e31b55e11ece899e3b5295a.patch";
         hash = "sha256-tTAsQOMAazgH/6laLNTuG2lki257VUR9EBivnD4vCuY=";
       })
+      # Fixes errors building with GCC 14.
+      ./gcc14-compat.patch
     ]
     ++ lib.optionals enableMoltenVKCompat [
       # Patch DXVK to work with MoltenVK even though it doesn’t support some required features.

From 75a6b64162cb7c5fb023287385f3ad5a453f9d32 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 2 Dec 2024 03:04:43 +0100
Subject: [PATCH 016/340] dolphin-emu: 2409 -> 2412

Diff: https://github.com/dolphin-emu/dolphin/compare/refs/tags/2409...2412
---
 pkgs/applications/emulators/dolphin-emu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix
index 91ad4b876eb9a..290f2f2a0f6c7 100644
--- a/pkgs/applications/emulators/dolphin-emu/default.nix
+++ b/pkgs/applications/emulators/dolphin-emu/default.nix
@@ -55,13 +55,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dolphin-emu";
-  version = "2409";
+  version = "2412";
 
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-x4ZtV/5bwUjcmdYneG7n7uFVyPmYj0sD8TXEqsqbUFU=";
+    hash = "sha256-5Eir8EQPGVSg2QXzzuHH9lf7CrV76KwmRsHiDqs6tD4=";
     fetchSubmodules = true;
   };
 

From f79874b0bd798eecf5c0f9f65322039849048ab4 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Mon, 2 Dec 2024 11:59:57 +0100
Subject: [PATCH 017/340] mealie: 2.2.0 -> 2.3.0

See https://github.com/mealie-recipes/mealie/releases/tag/v2.3.0
---
 pkgs/by-name/me/mealie/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix
index dbfde42f4e023..b3c785eb4575c 100644
--- a/pkgs/by-name/me/mealie/package.nix
+++ b/pkgs/by-name/me/mealie/package.nix
@@ -9,12 +9,12 @@
 }:
 
 let
-  version = "2.2.0";
+  version = "2.3.0";
   src = fetchFromGitHub {
     owner = "mealie-recipes";
     repo = "mealie";
     rev = "v${version}";
-    hash = "sha256-t4YYvj8dG8o9PVAlDxdxVBi2omBGQ2h53/IVv089778=";
+    hash = "sha256-GN+uXyZCvDuFmQnXhn0mFans3bvvEw7Uq6V0OeCPEbE=";
   };
 
   frontend = callPackage (import ./mealie-frontend.nix src version) { };

From 5189f3a28d1e58243f5dab66a9b7ab5b5e44b2ca Mon Sep 17 00:00:00 2001
From: Chris Maniewski <code@chmanie.com>
Date: Mon, 2 Dec 2024 14:51:23 +0100
Subject: [PATCH 018/340] moar: 1.27.2 -> 1.30.0

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

diff --git a/pkgs/by-name/mo/moar/package.nix b/pkgs/by-name/mo/moar/package.nix
index ee5505215f20c..f1aee260c7505 100644
--- a/pkgs/by-name/mo/moar/package.nix
+++ b/pkgs/by-name/mo/moar/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "moar";
-  version = "1.27.2";
+  version = "1.30.0";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ZWAQrf4Y/Qse02T5Yt7byGXZheH1y7RvBsPP2xiF5Kw=";
+    hash = "sha256-fEJttsZt3pET1Xga8AYkLCX5aGkW23R2jGQvML3w+eo=";
   };
 
-  vendorHash = "sha256-Orgh0X/HPfaKvliUvTllhk72LkQ/O3Eh9N/38Cj4Rew=";
+  vendorHash = "sha256-J9u7LxzXk4npRyymmMKyN2ZTmhT4WwKjy0X5ITcHtoE=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 2746d34fb7358358c44252fa7d1d98def5b7f8aa Mon Sep 17 00:00:00 2001
From: Louis Opter <louis@opter.org>
Date: Thu, 23 May 2024 10:18:08 -0700
Subject: [PATCH 019/340] mindforger: upgrade to 2.0.0

Pull MindForger's [fork][cmark-fork] of [cmark-gfm][cmark] alongside
Mindforger and build it in `preBuild`. I am not sure to understand how
mindforger could be built before that.

The patches that were applied have all been upstreamed and could be
removed.

A patch for the Qt project file to use pkg-config to find hunspell was
added. Don't forget to install dictionaries from `hunspellDicts` for
this to be useful.

This currently does not build on Darwin because some vendored transitive
dependency, and I did not bother with that.

Thanks to @FliegendeWurst for picking this PR up, and help with it.

[cmark]: https://github.com/github/cmark-gfm
[cmark-fork]: https://github.com/dvorka/cmark
---
 .../editors/mindforger/default.nix            | 71 +++++++++++++------
 .../mindforger/hunspell_pkgconfig.patch       | 23 ++++++
 .../editors/mindforger/paths.patch            | 42 -----------
 3 files changed, 74 insertions(+), 62 deletions(-)
 create mode 100644 pkgs/applications/editors/mindforger/hunspell_pkgconfig.patch
 delete mode 100644 pkgs/applications/editors/mindforger/paths.patch

diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix
index db4d65de7959e..b113a0e10eace 100644
--- a/pkgs/applications/editors/mindforger/default.nix
+++ b/pkgs/applications/editors/mindforger/default.nix
@@ -1,37 +1,68 @@
 { lib
 , stdenv
-, cmark-gfm
-, fetchurl
-, fetchpatch
+, cmake
+, curl
+, fetchFromGitHub
+, hunspell
+, pkg-config
 , qmake
 , qtbase
 , qtwebengine
 , wrapGAppsHook3
 , wrapQtAppsHook
 }:
-
-stdenv.mkDerivation rec {
+let
+  version = "2.0.0";
+  srcs = {
+    mindforger = fetchFromGitHub {
+      owner = "dvorka";
+      repo = "mindforger";
+      rev = version;
+      sha256 = "sha256-+8miV2xuQcaWGdWCEXPIg6EXjAHtgD9pX7Z8ZNhpMjA=";
+    };
+    cmark-gfm = fetchFromGitHub {
+      owner = "dvorka";
+      repo = "cmark";
+      rev = "4ca8688093228c599432a87d7bd945804c573d51";
+      sha256 = "sha256-0WiG8aot8mc0h1BKPgC924UKQrgunZvKKBy9bD7nhoQ=";
+    };
+    mindforger-repository = fetchFromGitHub {
+      owner = "dvorka";
+      repo = "mindforger-repository";
+      rev = "ec81a27e5de6408bbcd3f6d7733a7c6f3b52e433";
+      sha256 = "sha256-JGTP1He7G2Obmsav64Lf7BLHp8OTvPtg38VHsrEC36o=";
+    };
+  };
+in stdenv.mkDerivation {
   pname = "mindforger";
-  version = "1.52.0";
+  inherit version;
 
-  src = fetchurl {
-    url = "https://github.com/dvorka/mindforger/releases/download/${version}/mindforger_${version}.tgz";
-    sha256 = "1pghsw8kwvjhg3jpmjs0n892h2l0pm0cs6ymi8b23fwk0kfj67rd";
-  };
+  src = srcs.mindforger;
 
-  nativeBuildInputs = [ qmake wrapGAppsHook3 wrapQtAppsHook ];
-  buildInputs = [ qtbase qtwebengine cmark-gfm ];
+  nativeBuildInputs = [ cmake pkg-config qmake wrapGAppsHook3 wrapQtAppsHook ];
+  buildInputs = [ curl hunspell qtbase qtwebengine ];
+
+  # Disable the cmake hook (so we don't try to build MindForger with it), and
+  # build MindForger's internal fork of cmark-gfm ahead of MindForger itself.
+  #
+  # Moreover unpack the docs that are needed for the MacOS build.
+  postUnpack = ''
+    cp -TR ${srcs.cmark-gfm} $sourceRoot/deps/cmark-gfm
+  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    cp -TR ${srcs.mindforger-repository} $sourceRoot/doc
+  '';
+  dontUseCmakeConfigure = true;
+  preBuild = ''(
+      mkdir deps/cmark-gfm/build &&
+      cd deps/cmark-gfm/build &&
+      cmake -DCMARK_TESTS=OFF -DCMARK_SHARED=OFF .. &&
+      cmake --build . --parallel
+  )'';
 
   doCheck = true;
 
   patches = [
-    # this makes the package relocatable - removes hardcoded references to /usr
-    ./paths.patch
-    #  this fixes compilation with QtWebEngine - referencing a commit trying to upstream the change - see https://github.com/dvorka/mindforger/pull/1357
-    (fetchpatch {
-      url = "https://github.com/dvorka/mindforger/commit/d28e2bade0278af1b5249953202810540969026a.diff";
-      sha256 = "sha256-qHKQQNGSc3F9seaOHV0gzBQFFqcTXk91LpKrojjpAUw=";
-    })
+    ./hunspell_pkgconfig.patch
   ];
 
   postPatch = ''
@@ -62,7 +93,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://www.mindforger.com";
     license = licenses.gpl2Plus;
-    platforms = platforms.all;
+    platforms = [ "aarch64-linux" "x86_64-linux" ];
     maintainers = with maintainers; [ cyplo ];
     mainProgram = "mindforger";
   };
diff --git a/pkgs/applications/editors/mindforger/hunspell_pkgconfig.patch b/pkgs/applications/editors/mindforger/hunspell_pkgconfig.patch
new file mode 100644
index 0000000000000..babbf3e42589e
--- /dev/null
+++ b/pkgs/applications/editors/mindforger/hunspell_pkgconfig.patch
@@ -0,0 +1,23 @@
+diff --git a/app/app.pro b/app/app.pro
+index 89ff5c0b..9625ecd1 100644
+--- a/app/app.pro
++++ b/app/app.pro
+@@ -159,12 +159,13 @@ macx {
+ 
+ } else:unix {
+     # pkgconfig-based configuration does not work @ Ubuntu
+-    #  CONFIG += link_pkgconfig
+-    #  PKGCONFIG += hunspell
++    # but does on NixOS
++    CONFIG += link_pkgconfig
++    PKGCONFIG += hunspell
+ 
+-    # hardcoded paths are (unfortunately) more robust:
+-    INCLUDEPATH += /usr/include/hunspell
+-    LIBS += -lhunspell
++    # Where hardcoded paths are (unfortunately) more robust^W^W^W^Wannoying:
++    #  INCLUDEPATH += /usr/include/hunspell
++    #  LIBS += -lhunspell
+ 
+     HEADERS += \
+       ./src/qt/spelling/dictionary_provider_hunspell.h \
diff --git a/pkgs/applications/editors/mindforger/paths.patch b/pkgs/applications/editors/mindforger/paths.patch
deleted file mode 100644
index e9b9244f8dbda..0000000000000
--- a/pkgs/applications/editors/mindforger/paths.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/app/app.pro b/app/app.pro
-index 29f9d9e..15fd2ff 100644
---- a/app/app.pro
-+++ b/app/app.pro
-@@ -370,7 +370,7 @@ RESOURCES += \
- # See http://doc.qt.io/qt-5/qmake-advanced-usage.html
- 
- binfile.files += mindforger
--binfile.path = /usr/bin/
-+binfile.path = $$PREFIX/bin/
- INSTALLS += binfile
- 
- # ########################################
-diff --git a/mindforger.pro b/mindforger.pro
-index bd4f21d..6bb2dbc 100644
---- a/mindforger.pro
-+++ b/mindforger.pro
-@@ -43,20 +43,20 @@ app.depends = lib
- #IMPORTANT: binfile MUST be specified in app/app.pro (project next to/that builds binary)
- 
- docfiles.files += doc/*
--docfiles.path = /usr/share/doc/mindforger/
-+docfiles.path = $$PREFIX/share/doc/mindforger/
- INSTALLS += docfiles
- 
- manfiles.files += man/*
--manfiles.path = /usr/share/man/man1/
-+manfiles.path = $$PREFIX/share/man/man1/
- INSTALLS += manfiles
- 
- iconfiles.files += app/resources/icons/*
--iconfiles.path = /usr/share/icons/mindforger/
-+iconfiles.path = $$PREFIX/share/icons/mindforger/
- INSTALLS += iconfiles
- 
- # experiment w/ file
- shortcutfiles.files += app/resources/gnome-shell/mindforger.desktop
--shortcutfiles.path = /usr/share/applications/
-+shortcutfiles.path = $$PREFIX/share/applications/
- INSTALLS += shortcutfiles
- 
- # eof

From f0e235202d633b3135b9cd3317423c2111a9c603 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Thu, 12 Dec 2024 07:39:28 +0200
Subject: [PATCH 020/340] darwin.xcode: add 16.2

---
 pkgs/os-specific/darwin/xcode/default.nix | 1 +
 pkgs/top-level/darwin-packages.nix        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index c2d99b075d32e..766639fe16b9e 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -100,6 +100,7 @@ lib.makeExtensible (self: {
   xcode_15_4 = requireXcode "15.4" "sha256-yeo+sf6bBIJy9/1sQiMuPEMPniwGXMB6/FXXL0UrI5U=";
   xcode_16 = requireXcode "16" "sha256-i/MMcEi5wCpe5+nGo6gUTsFFCoorORydAn7D/GClEdo=";
   xcode_16_1 = requireXcode "16.1" "sha256-yYg6NRRnYM/5X3hhVMfcXcdoiOV36fIongJNQ5nviD8=";
+  xcode_16_2 = requireXcode "16.2" "sha256-wQjNuFZu/cN82mEEQbC1MaQt39jLLDsntsbnDidJFEs=";
   xcode =
     self."xcode_${
       lib.replaceStrings [ "." ] [ "_" ] (
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index a84ec52e2bc08..f25169dec1eb5 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -276,6 +276,7 @@ makeScopeWithSplicing' {
         xcode_15_4
         xcode_16
         xcode_16_1
+        xcode_16_2
         xcode
         ;
 

From 1db8650fb4671b1495064d3fb2e99ca3457c1ff8 Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Tue, 3 Dec 2024 11:12:11 +0000
Subject: [PATCH 021/340] lib.packagesFromDirectoryRecursive: refactor, again

This is a second take on #359941, which was reverted by
  940db5766a966b5586b53359bb785badac6c5662.

Co-authored-by: Silvan Mosberger <github@infinisil.com>
---
 lib/filesystem.nix | 72 +++++++++++++++++-----------------------------
 1 file changed, 26 insertions(+), 46 deletions(-)

diff --git a/lib/filesystem.nix b/lib/filesystem.nix
index 5a78bcca4ebd6..753088f7542df 100644
--- a/lib/filesystem.nix
+++ b/lib/filesystem.nix
@@ -18,7 +18,10 @@ let
     ;
 
   inherit (lib.filesystem)
+    pathIsDirectory
+    pathIsRegularFile
     pathType
+    packagesFromDirectoryRecursive
     ;
 
   inherit (lib.strings)
@@ -361,51 +364,28 @@ in
       ...
     }:
     let
-      # Determine if a directory entry from `readDir` indicates a package or
-      # directory of packages.
-      directoryEntryIsPackage = basename: type:
-        type == "directory" || hasSuffix ".nix" basename;
-
-      # List directory entries that indicate packages in the given `path`.
-      packageDirectoryEntries = path:
-        filterAttrs directoryEntryIsPackage (readDir path);
-
-      # Transform a directory entry (a `basename` and `type` pair) into a
-      # package.
-      directoryEntryToAttrPair = subdirectory: basename: type:
-        let
-          path = subdirectory + "/${basename}";
-        in
-        if type == "regular"
-        then
-        {
-          name = removeSuffix ".nix" basename;
-          value = callPackage path { };
-        }
-        else
-        if type == "directory"
-        then
-        {
-          name = basename;
-          value = packagesFromDirectory path;
-        }
-        else
-        throw
-          ''
-            lib.filesystem.packagesFromDirectoryRecursive: Unsupported file type ${type} at path ${toString subdirectory}
-          '';
-
-      # Transform a directory into a package (if there's a `package.nix`) or
-      # set of packages (otherwise).
-      packagesFromDirectory = path:
-        let
-          defaultPackagePath = path + "/package.nix";
-        in
-        if pathExists defaultPackagePath
-        then callPackage defaultPackagePath { }
-        else mapAttrs'
-          (directoryEntryToAttrPair path)
-          (packageDirectoryEntries path);
+      inherit (lib.path) append;
+      defaultPath = append directory "package.nix";
     in
-    packagesFromDirectory directory;
+    if pathExists defaultPath then
+      # if `${directory}/package.nix` exists, call it directly
+      callPackage defaultPath {}
+    else lib.concatMapAttrs (name: type:
+      # otherwise, for each directory entry
+      let path = append directory name; in
+      if type == "directory" then {
+        # recurse into directories
+        "${name}" = packagesFromDirectoryRecursive {
+          inherit callPackage;
+          directory = path;
+        };
+      } else if type == "regular" && hasSuffix ".nix" name then {
+        # call .nix files
+        "${lib.removeSuffix ".nix" name}" = callPackage path {};
+      } else if type == "regular" then {
+        # ignore non-nix files
+      } else throw ''
+        lib.filesystem.packagesFromDirectoryRecursive: Unsupported file type ${type} at path ${toString path}
+      ''
+    ) (builtins.readDir directory);
 }

From 065b48084f27798c8500a3c78582318eae25849d Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Thu, 12 Dec 2024 18:02:21 +0000
Subject: [PATCH 022/340] lib.packagesFromDirectoryRecursive: let-bind
 functions called from `lib`

I was told it is better for eval performance:
  https://github.com/NixOS/nixpkgs/pull/361424#discussion_r1879975642
---
 lib/filesystem.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/filesystem.nix b/lib/filesystem.nix
index 753088f7542df..e54776ba908d4 100644
--- a/lib/filesystem.nix
+++ b/lib/filesystem.nix
@@ -364,13 +364,14 @@ in
       ...
     }:
     let
+      inherit (lib) concatMapAttrs removeSuffix;
       inherit (lib.path) append;
       defaultPath = append directory "package.nix";
     in
     if pathExists defaultPath then
       # if `${directory}/package.nix` exists, call it directly
       callPackage defaultPath {}
-    else lib.concatMapAttrs (name: type:
+    else concatMapAttrs (name: type:
       # otherwise, for each directory entry
       let path = append directory name; in
       if type == "directory" then {
@@ -381,7 +382,7 @@ in
         };
       } else if type == "regular" && hasSuffix ".nix" name then {
         # call .nix files
-        "${lib.removeSuffix ".nix" name}" = callPackage path {};
+        "${removeSuffix ".nix" name}" = callPackage path {};
       } else if type == "regular" then {
         # ignore non-nix files
       } else throw ''

From 2be20ed26bafeadb497cadb7402a113132096951 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Fri, 13 Dec 2024 23:17:21 +0100
Subject: [PATCH 023/340] boost187: init at 1.87.0

---
 pkgs/development/libraries/boost/1.87.nix    | 19 +++++++++++++++++++
 pkgs/development/libraries/boost/default.nix |  1 +
 pkgs/top-level/all-packages.nix              |  1 +
 3 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/boost/1.87.nix

diff --git a/pkgs/development/libraries/boost/1.87.nix b/pkgs/development/libraries/boost/1.87.nix
new file mode 100644
index 0000000000000..0e0db34184963
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.87.nix
@@ -0,0 +1,19 @@
+{ callPackage, fetchurl, ... }@args:
+
+callPackage ./generic.nix (
+  args
+  // rec {
+    version = "1.87.0";
+
+    src = fetchurl {
+      urls = [
+        "mirror://sourceforge/boost/boost_${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.bz2"
+        "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${
+          builtins.replaceStrings [ "." ] [ "_" ] version
+        }.tar.bz2"
+      ];
+      # SHA256 from http://www.boost.org/users/history/version_1_87_0.html
+      sha256 = "af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89";
+    };
+  }
+)
diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix
index 59123eb779c4c..39ac38ea07fc8 100644
--- a/pkgs/development/libraries/boost/default.nix
+++ b/pkgs/development/libraries/boost/default.nix
@@ -30,4 +30,5 @@ in
   boost184 = makeBoost ./1.84.nix;
   boost185 = makeBoost ./1.85.nix;
   boost186 = makeBoost ./1.86.nix;
+  boost187 = makeBoost ./1.87.nix;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0967333170e1..4ed6acb9bb89e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8779,6 +8779,7 @@ with pkgs;
     boost184
     boost185
     boost186
+    boost187
   ;
 
   boost = boost181;

From 2787abbd0a3a3caa71390ace79f70164d6420f4d Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Mon, 16 Dec 2024 18:34:56 -0500
Subject: [PATCH 024/340] python312Packages.debugpy: 1.8.9 -> 1.8.11

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

diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index 0a75e20aa0a9b..d3d212926c559 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "debugpy";
-  version = "1.8.9";
+  version = "1.8.11";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -32,8 +32,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "debugpy";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-JgYGdCGzzktigjEKMPbkcSJlFPYSEFEJvmIFfR0qSZM=";
+    tag = "v${version}";
+    hash = "sha256-jq/0Z6Oo/9gjJlziYJIjIC5i9YMayUdPYSGTjnDL8yU=";
   };
 
   patches =

From 85ddc5dc0b46aa12045382c9d48fa763311c8a1a Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 19 Dec 2024 03:13:50 -0800
Subject: [PATCH 025/340] xorg.xorgserver: fix darwin build

disable libunwind detection as the configure step will detect the
libunwind pkg-config stub but then the code will uses the unimplemented
function unw_strerror.

the pkg-config stub was added in ec40b0453730d7555bccccbd94c8dab9e36f3dd6
---
 pkgs/servers/x11/xorg/overrides.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 69f8f2ac8801f..268c3fbc72f1d 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -890,6 +890,7 @@ self: super:
         configureFlags = [
           # note: --enable-xquartz is auto
           "CPPFLAGS=-I${./darwin/dri}"
+          "--disable-libunwind" # libunwind on darwin is missing unw_strerror
           "--disable-glamor"
           "--with-default-font-path="
           "--with-apple-application-name=XQuartz"

From f36388e25a5dab8ff04f177e8c10e2359aab33bf Mon Sep 17 00:00:00 2001
From: Nico Felbinger <nico@felbinger.eu>
Date: Thu, 19 Dec 2024 19:13:57 +0100
Subject: [PATCH 026/340] inkscape-extensions.inkstitch: fix editor opening

Co-authored-by: tropf <29873239+tropf@users.noreply.github.com>
---
 .../inkstitch/0001-force-frozen-true.patch    | 27 +++++++++++++++
 ...tion-use-python-script-as-entrypoint.patch | 34 +++++++++++++++++++
 .../inkscape/extensions/inkstitch/default.nix | 20 +++++++++--
 3 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/graphics/inkscape/extensions/inkstitch/0001-force-frozen-true.patch
 create mode 100644 pkgs/applications/graphics/inkscape/extensions/inkstitch/0002-plugin-invocation-use-python-script-as-entrypoint.patch

diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/0001-force-frozen-true.patch b/pkgs/applications/graphics/inkscape/extensions/inkstitch/0001-force-frozen-true.patch
new file mode 100644
index 0000000000000..ef345bb0aeb05
--- /dev/null
+++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/0001-force-frozen-true.patch
@@ -0,0 +1,27 @@
+From af541a4f8ddda287f74687327e4ed89b79557777 Mon Sep 17 00:00:00 2001
+From: tropf <tropf@noreply.codeberg.org>
+Date: Mon, 5 Aug 2024 21:25:33 +0200
+Subject: [PATCH 1/3] force frozen=true
+
+Enforce installation in frozen mode, i.e. as a packaged version where
+source can not be modified.
+---
+ inkstitch.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/inkstitch.py b/inkstitch.py
+index 50f33d19..398465ca 100644
+--- a/inkstitch.py
++++ b/inkstitch.py
+@@ -40,7 +40,7 @@ else:
+     ini = {}
+ # --------------------------------------------------------------------------------------------
+ 
+-running_as_frozen = getattr(sys, 'frozen', None) is not None  # check if running from pyinstaller bundle
++running_as_frozen = True
+ 
+ if not running_as_frozen:  # override running_as_frozen from DEBUG.toml - for testing
+     if safe_get(ini, "DEBUG", "force_frozen", default=False):
+-- 
+2.36.0
+
diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/0002-plugin-invocation-use-python-script-as-entrypoint.patch b/pkgs/applications/graphics/inkscape/extensions/inkstitch/0002-plugin-invocation-use-python-script-as-entrypoint.patch
new file mode 100644
index 0000000000000..3db643c9f07b5
--- /dev/null
+++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/0002-plugin-invocation-use-python-script-as-entrypoint.patch
@@ -0,0 +1,34 @@
+From a86412c57833c24743214c9d3abb76093365769f Mon Sep 17 00:00:00 2001
+From: tropf <tropf@noreply.codeberg.org>
+Date: Mon, 5 Aug 2024 21:26:13 +0200
+Subject: [PATCH 2/3] plugin invocation: use python script as entrypoint
+
+Ink/Stitch is invoked by calling a script with command line parameters.
+Depending on the distribution format, this is bundled into a standalone
+binary -- at least for vanilla Ink/Stitch. For the nix version, we
+follow manual install, which does *not* bundle the file. Hence, the
+generation is patched to treat this packaged install as manual install,
+and to still refer to the python file.
+
+To keep the patchset small, only an if statement is changed, with the
+intent of only using the else path.
+---
+ lib/inx/utils.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/inx/utils.py b/lib/inx/utils.py
+index 9168f2a2..00313639 100755
+--- a/lib/inx/utils.py
++++ b/lib/inx/utils.py
+@@ -21,7 +21,7 @@ def build_environment():
+         extensions=['jinja2.ext.i18n']
+     )
+ 
+-    if "BUILD" in os.environ:
++    if False:
+         # building a ZIP release, with inkstitch packaged as a binary
+         # Command tag and icons path
+         if sys.platform == "win32":
+-- 
+2.36.0
+
diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
index 0b07ee67a5f0d..f3141c689d3b9 100644
--- a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
@@ -7,7 +7,7 @@
 let
   version = "3.1.0";
 in
-python3.pkgs.buildPythonApplication {
+python3.pkgs.buildPythonApplication rec {
   pname = "inkstitch";
   inherit version;
   pyproject = false; # Uses a Makefile (yikes)
@@ -54,11 +54,27 @@ python3.pkgs.buildPythonApplication {
     runHook preInstall
 
     mkdir -p $out/share/inkscape/extensions
-    cp -a inx $out/share/inkscape/extensions/inkstitch
+    cp -a . $out/share/inkscape/extensions/inkstitch
 
     runHook postInstall
   '';
 
+  patches = [
+    ./0001-force-frozen-true.patch
+    ./0002-plugin-invocation-use-python-script-as-entrypoint.patch
+  ];
+
+  postPatch =
+    let
+      pyEnv = python3.withPackages (_: dependencies);
+    in
+    ''
+      # Add shebang with python dependencies
+      substituteInPlace lib/inx/utils.py --replace-fail ' interpreter="python"' ""
+      sed -i -e '1i#!${pyEnv.interpreter}' inkstitch.py
+      chmod a+x inkstitch.py
+    '';
+
   nativeCheckInputs = with python3.pkgs; [
     pytestCheckHook
   ];

From 5272a9b87570a9674129cf4e5a0541db34f9a2fd Mon Sep 17 00:00:00 2001
From: famfo <famfo@famfo.xyz>
Date: Mon, 2 Dec 2024 17:13:18 +0100
Subject: [PATCH 027/340] halloy: refactor use upstream Cargo.lock

No patches are needed to the Cargo.lock so using the upstream one is
easier to maintain.
---
 pkgs/by-name/ha/halloy/Cargo.lock  | 6089 ----------------------------
 pkgs/by-name/ha/halloy/package.nix |   10 +-
 2 files changed, 2 insertions(+), 6097 deletions(-)
 delete mode 100644 pkgs/by-name/ha/halloy/Cargo.lock

diff --git a/pkgs/by-name/ha/halloy/Cargo.lock b/pkgs/by-name/ha/halloy/Cargo.lock
deleted file mode 100644
index 932ee1bdc8f23..0000000000000
--- a/pkgs/by-name/ha/halloy/Cargo.lock
+++ /dev/null
@@ -1,6089 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "ab_glyph"
-version = "0.2.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb"
-dependencies = [
- "ab_glyph_rasterizer",
- "owned_ttf_parser",
-]
-
-[[package]]
-name = "ab_glyph_rasterizer"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
-
-[[package]]
-name = "addr2line"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "ahash"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "getrandom",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "aliasable"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
-
-[[package]]
-name = "allocator-api2"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
-
-[[package]]
-name = "alsa"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce"
-dependencies = [
- "alsa-sys",
- "bitflags 2.6.0",
- "libc",
-]
-
-[[package]]
-name = "alsa-sys"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "android-activity"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
-dependencies = [
- "android-properties",
- "bitflags 2.6.0",
- "cc",
- "cesu8",
- "jni",
- "jni-sys",
- "libc",
- "log",
- "ndk 0.9.0",
- "ndk-context",
- "ndk-sys 0.6.0+11769913",
- "num_enum",
- "thiserror",
-]
-
-[[package]]
-name = "android-properties"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
-
-[[package]]
-name = "approx"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "arrayref"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
-[[package]]
-name = "as-raw-xcb-connection"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
-
-[[package]]
-name = "ash"
-version = "0.37.3+1.3.251"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
-dependencies = [
- "libloading 0.7.4",
-]
-
-[[package]]
-name = "ashpd"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093"
-dependencies = [
- "enumflags2",
- "futures-channel",
- "futures-util",
- "rand",
- "serde",
- "serde_repr",
- "tokio",
- "url",
- "zbus",
-]
-
-[[package]]
-name = "async-broadcast"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
-dependencies = [
- "event-listener",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-channel"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
-dependencies = [
- "concurrent-queue",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-executor"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
-dependencies = [
- "async-task",
- "concurrent-queue",
- "fastrand",
- "futures-lite",
- "slab",
-]
-
-[[package]]
-name = "async-fs"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
-dependencies = [
- "async-lock",
- "blocking",
- "futures-lite",
-]
-
-[[package]]
-name = "async-http-proxy"
-version = "1.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29faa5d4d308266048bd7505ba55484315a890102f9345b9ff4b87de64201592"
-dependencies = [
- "base64 0.13.1",
- "httparse",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "async-io"
-version = "2.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
-dependencies = [
- "async-lock",
- "cfg-if",
- "concurrent-queue",
- "futures-io",
- "futures-lite",
- "parking",
- "polling",
- "rustix",
- "slab",
- "tracing",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "async-lock"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
-dependencies = [
- "event-listener",
- "event-listener-strategy",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-process"
-version = "2.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374"
-dependencies = [
- "async-channel",
- "async-io",
- "async-lock",
- "async-signal",
- "async-task",
- "blocking",
- "cfg-if",
- "event-listener",
- "futures-lite",
- "rustix",
- "tracing",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "async-recursion"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "async-signal"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
-dependencies = [
- "async-io",
- "async-lock",
- "atomic-waker",
- "cfg-if",
- "futures-core",
- "futures-io",
- "rustix",
- "signal-hook-registry",
- "slab",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "async-task"
-version = "4.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
-
-[[package]]
-name = "async-trait"
-version = "0.1.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
-[[package]]
-name = "autocfg"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
-[[package]]
-name = "backtrace"
-version = "0.3.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
-[[package]]
-name = "bindgen"
-version = "0.69.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
-dependencies = [
- "bitflags 2.6.0",
- "cexpr",
- "clang-sys",
- "itertools 0.12.1",
- "lazy_static",
- "lazycell",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash 1.1.0",
- "shlex",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "bit-set"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
-
-[[package]]
-name = "bit_field"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "block2"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
-dependencies = [
- "objc2",
-]
-
-[[package]]
-name = "blocking"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
-dependencies = [
- "async-channel",
- "async-task",
- "futures-io",
- "futures-lite",
- "piper",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "by_address"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06"
-
-[[package]]
-name = "bytemuck"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31"
-dependencies = [
- "bytemuck_derive",
-]
-
-[[package]]
-name = "bytemuck_derive"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bytes"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
-
-[[package]]
-name = "bytesize"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
-
-[[package]]
-name = "calloop"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298"
-dependencies = [
- "bitflags 2.6.0",
- "log",
- "polling",
- "rustix",
- "slab",
- "thiserror",
-]
-
-[[package]]
-name = "calloop"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
-dependencies = [
- "bitflags 2.6.0",
- "log",
- "polling",
- "rustix",
- "slab",
- "thiserror",
-]
-
-[[package]]
-name = "calloop-wayland-source"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02"
-dependencies = [
- "calloop 0.12.4",
- "rustix",
- "wayland-backend",
- "wayland-client",
-]
-
-[[package]]
-name = "calloop-wayland-source"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
-dependencies = [
- "calloop 0.13.0",
- "rustix",
- "wayland-backend",
- "wayland-client",
-]
-
-[[package]]
-name = "cc"
-version = "1.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
-dependencies = [
- "jobserver",
- "libc",
- "shlex",
-]
-
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "cfg_aliases"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
-
-[[package]]
-name = "cfg_aliases"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
-
-[[package]]
-name = "chrono"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "serde",
- "wasm-bindgen",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "clang-sys"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-dependencies = [
- "glob",
- "libc",
- "libloading 0.8.5",
-]
-
-[[package]]
-name = "claxon"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688"
-
-[[package]]
-name = "clipboard-win"
-version = "5.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
-dependencies = [
- "error-code",
-]
-
-[[package]]
-name = "clipboard_macos"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95"
-dependencies = [
- "objc",
- "objc-foundation",
- "objc_id",
-]
-
-[[package]]
-name = "clipboard_wayland"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "003f886bc4e2987729d10c1db3424e7f80809f3fc22dbc16c685738887cb37b8"
-dependencies = [
- "smithay-clipboard",
-]
-
-[[package]]
-name = "clipboard_x11"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4274ea815e013e0f9f04a2633423e14194e408a0576c943ce3d14ca56c50031c"
-dependencies = [
- "thiserror",
- "x11rb",
-]
-
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-[[package]]
-name = "com"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6"
-dependencies = [
- "com_macros",
-]
-
-[[package]]
-name = "com_macros"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5"
-dependencies = [
- "com_macros_support",
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "com_macros_support"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "combine"
-version = "4.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
-dependencies = [
- "bytes",
- "memchr",
-]
-
-[[package]]
-name = "concurrent-queue"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "const_format"
-version = "0.2.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
-dependencies = [
- "const_format_proc_macros",
-]
-
-[[package]]
-name = "const_format_proc_macros"
-version = "0.2.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "convert_case"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
-[[package]]
-name = "core-graphics"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "core-graphics-types",
- "foreign-types 0.5.0",
- "libc",
-]
-
-[[package]]
-name = "core-graphics-types"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "libc",
-]
-
-[[package]]
-name = "coreaudio-rs"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation-sys",
- "coreaudio-sys",
-]
-
-[[package]]
-name = "coreaudio-sys"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9"
-dependencies = [
- "bindgen",
-]
-
-[[package]]
-name = "cosmic-text"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fd57d82eb4bfe7ffa9b1cec0c05e2fd378155b47f255a67983cb4afe0e80c2"
-dependencies = [
- "bitflags 2.6.0",
- "fontdb",
- "log",
- "rangemap",
- "rayon",
- "rustc-hash 1.1.0",
- "rustybuzz",
- "self_cell",
- "swash",
- "sys-locale",
- "ttf-parser 0.21.1",
- "unicode-bidi",
- "unicode-linebreak",
- "unicode-script",
- "unicode-segmentation",
-]
-
-[[package]]
-name = "cpal"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779"
-dependencies = [
- "alsa",
- "core-foundation-sys",
- "coreaudio-rs",
- "dasp_sample",
- "jni",
- "js-sys",
- "libc",
- "mach2",
- "ndk 0.8.0",
- "ndk-context",
- "oboe",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows 0.54.0",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "ctor-lite"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b"
-
-[[package]]
-name = "cursor-icon"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
-
-[[package]]
-name = "d3d12"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307"
-dependencies = [
- "bitflags 2.6.0",
- "libloading 0.8.5",
- "winapi",
-]
-
-[[package]]
-name = "dark-light"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a76fa97167fa740dcdbfe18e8895601e1bc36525f09b044e00916e717c03a3c"
-dependencies = [
- "dconf_rs",
- "detect-desktop-environment",
- "dirs",
- "objc",
- "rust-ini",
- "web-sys",
- "winreg 0.10.1",
- "zbus",
-]
-
-[[package]]
-name = "dasp_sample"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
-
-[[package]]
-name = "data"
-version = "0.1.0"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "chrono",
- "const_format",
- "derive_more",
- "dirs-next",
- "flate2",
- "futures",
- "hex",
- "iced_core",
- "irc",
- "itertools 0.12.1",
- "log",
- "nom",
- "once_cell",
- "palette",
- "rand",
- "rand_chacha",
- "regex",
- "reqwest",
- "seahash",
- "serde",
- "serde_json",
- "sha2",
- "strum",
- "thiserror",
- "timeago",
- "tokio",
- "tokio-stream",
- "toml",
- "url",
- "walkdir",
- "xdg",
-]
-
-[[package]]
-name = "dconf_rs"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7046468a81e6a002061c01e6a7c83139daf91b11c30e66795b13217c2d885c8b"
-
-[[package]]
-name = "deranged"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
-]
-
-[[package]]
-name = "derive_more"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
-dependencies = [
- "derive_more-impl",
-]
-
-[[package]]
-name = "derive_more-impl"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "syn 2.0.74",
- "unicode-xid",
-]
-
-[[package]]
-name = "detect-desktop-environment"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21d8ad60dd5b13a4ee6bd8fa2d5d88965c597c67bce32b5fc49c94f55cb50810"
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
-[[package]]
-name = "dirs"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "dispatch"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
-
-[[package]]
-name = "dlib"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
-dependencies = [
- "libloading 0.8.5",
-]
-
-[[package]]
-name = "dlv-list"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
-
-[[package]]
-name = "downcast-rs"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
-
-[[package]]
-name = "dpi"
-version = "0.1.1"
-source = "git+https://github.com/iced-rs/winit.git?rev=254d6b3420ce4e674f516f7a2bd440665e05484d#254d6b3420ce4e674f516f7a2bd440665e05484d"
-
-[[package]]
-name = "drm"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1"
-dependencies = [
- "bitflags 2.6.0",
- "bytemuck",
- "drm-ffi",
- "drm-fourcc",
- "rustix",
-]
-
-[[package]]
-name = "drm-ffi"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53"
-dependencies = [
- "drm-sys",
- "rustix",
-]
-
-[[package]]
-name = "drm-fourcc"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4"
-
-[[package]]
-name = "drm-sys"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986"
-dependencies = [
- "libc",
- "linux-raw-sys 0.6.5",
-]
-
-[[package]]
-name = "either"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
-
-[[package]]
-name = "embed-resource"
-version = "2.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602"
-dependencies = [
- "cc",
- "memchr",
- "rustc_version",
- "toml",
- "vswhom",
- "winreg 0.52.0",
-]
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "endi"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
-
-[[package]]
-name = "enumflags2"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
-dependencies = [
- "enumflags2_derive",
- "serde",
-]
-
-[[package]]
-name = "enumflags2_derive"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "errno"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "error-code"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
-
-[[package]]
-name = "etagere"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e2f1e3be19fb10f549be8c1bf013e8675b4066c445e36eb76d2ebb2f54ee495"
-dependencies = [
- "euclid",
- "svg_fmt",
-]
-
-[[package]]
-name = "euclid"
-version = "0.22.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "event-listener"
-version = "5.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
-dependencies = [
- "event-listener",
- "pin-project-lite",
-]
-
-[[package]]
-name = "exr"
-version = "1.72.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4"
-dependencies = [
- "bit_field",
- "flume",
- "half",
- "lebe",
- "miniz_oxide",
- "rayon-core",
- "smallvec",
- "zune-inflate",
-]
-
-[[package]]
-name = "fast-socks5"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f89f36d4ee12370d30d57b16c7e190950a1a916e7dbbb5fd5a412f5ef913fe84"
-dependencies = [
- "anyhow",
- "async-trait",
- "log",
- "thiserror",
- "tokio",
- "tokio-stream",
-]
-
-[[package]]
-name = "fast-srgb8"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1"
-
-[[package]]
-name = "fastrand"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
-
-[[package]]
-name = "fdeflate"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
-dependencies = [
- "simd-adler32",
-]
-
-[[package]]
-name = "fern"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "flate2"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "flume"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
-dependencies = [
- "spin",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "font-types"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "fontconfig-parser"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7"
-dependencies = [
- "roxmltree",
-]
-
-[[package]]
-name = "fontdb"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3"
-dependencies = [
- "fontconfig-parser",
- "log",
- "memmap2",
- "slotmap",
- "tinyvec",
- "ttf-parser 0.20.0",
-]
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared 0.1.1",
-]
-
-[[package]]
-name = "foreign-types"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
-dependencies = [
- "foreign-types-macros",
- "foreign-types-shared 0.3.1",
-]
-
-[[package]]
-name = "foreign-types-macros"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
- "num_cpus",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-
-[[package]]
-name = "futures-lite"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
-dependencies = [
- "fastrand",
- "futures-core",
- "futures-io",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "futures-macro"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
-
-[[package]]
-name = "futures-task"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-
-[[package]]
-name = "futures-util"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "gethostname"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
-dependencies = [
- "libc",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "gif"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
-dependencies = [
- "color_quant",
- "weezl",
-]
-
-[[package]]
-name = "gimli"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
-
-[[package]]
-name = "gl_generator"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
-dependencies = [
- "khronos_api",
- "log",
- "xml-rs",
-]
-
-[[package]]
-name = "glam"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "glow"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
-dependencies = [
- "js-sys",
- "slotmap",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "glutin_wgl_sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead"
-dependencies = [
- "gl_generator",
-]
-
-[[package]]
-name = "glyphon"
-version = "0.5.0"
-source = "git+https://github.com/hecrj/glyphon.git?rev=feef9f5630c2adb3528937e55f7bfad2da561a65#feef9f5630c2adb3528937e55f7bfad2da561a65"
-dependencies = [
- "cosmic-text",
- "etagere",
- "lru",
- "rustc-hash 2.0.0",
- "wgpu",
-]
-
-[[package]]
-name = "gpu-alloc"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
-dependencies = [
- "bitflags 2.6.0",
- "gpu-alloc-types",
-]
-
-[[package]]
-name = "gpu-alloc-types"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
-dependencies = [
- "bitflags 2.6.0",
-]
-
-[[package]]
-name = "gpu-allocator"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884"
-dependencies = [
- "log",
- "presser",
- "thiserror",
- "winapi",
- "windows 0.52.0",
-]
-
-[[package]]
-name = "gpu-descriptor"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c"
-dependencies = [
- "bitflags 2.6.0",
- "gpu-descriptor-types",
- "hashbrown 0.14.5",
-]
-
-[[package]]
-name = "gpu-descriptor-types"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c"
-dependencies = [
- "bitflags 2.6.0",
-]
-
-[[package]]
-name = "guillotiere"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782"
-dependencies = [
- "euclid",
- "svg_fmt",
-]
-
-[[package]]
-name = "h2"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "half"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
-dependencies = [
- "cfg-if",
- "crunchy",
-]
-
-[[package]]
-name = "halloy"
-version = "0.1.0"
-dependencies = [
- "bytesize",
- "chrono",
- "data",
- "embed-resource",
- "fern",
- "futures",
- "iced",
- "image",
- "ipc",
- "itertools 0.13.0",
- "log",
- "notify-rust",
- "once_cell",
- "open",
- "palette",
- "rfd",
- "rodio",
- "strum",
- "thiserror",
- "timeago",
- "tokio",
- "tokio-stream",
- "unicode-segmentation",
- "uuid",
- "windows_exe_info",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash 0.7.8",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash 0.8.11",
- "allocator-api2",
-]
-
-[[package]]
-name = "hassle-rs"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890"
-dependencies = [
- "bitflags 2.6.0",
- "com",
- "libc",
- "libloading 0.8.5",
- "thiserror",
- "widestring",
- "winapi",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hexf-parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
-
-[[package]]
-name = "hound"
-version = "3.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f"
-
-[[package]]
-name = "http"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
-dependencies = [
- "bytes",
- "http",
-]
-
-[[package]]
-name = "http-body-util"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
-dependencies = [
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
-
-[[package]]
-name = "hyper"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "itoa",
- "pin-project-lite",
- "smallvec",
- "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
-dependencies = [
- "futures-util",
- "http",
- "hyper",
- "hyper-util",
- "rustls",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
-dependencies = [
- "bytes",
- "http-body-util",
- "hyper",
- "hyper-util",
- "native-tls",
- "tokio",
- "tokio-native-tls",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core 0.52.0",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "iced"
-version = "0.13.0-dev"
-source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e"
-dependencies = [
- "iced_core",
- "iced_futures",
- "iced_renderer",
- "iced_widget",
- "iced_winit",
- "image",
- "thiserror",
-]
-
-[[package]]
-name = "iced_core"
-version = "0.13.0-dev"
-source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e"
-dependencies = [
- "bitflags 2.6.0",
- "bytes",
- "dark-light",
- "glam",
- "log",
- "num-traits",
- "once_cell",
- "palette",
- "rustc-hash 2.0.0",
- "smol_str",
- "thiserror",
- "web-time",
-]
-
-[[package]]
-name = "iced_futures"
-version = "0.13.0-dev"
-source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e"
-dependencies = [
- "futures",
- "iced_core",
- "log",
- "rustc-hash 2.0.0",
- "tokio",
- "wasm-bindgen-futures",
- "wasm-timer",
-]
-
-[[package]]
-name = "iced_graphics"
-version = "0.13.0-dev"
-source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e"
-dependencies = [
- "bitflags 2.6.0",
- "bytemuck",
- "cosmic-text",
- "half",
- "iced_core",
- "iced_futures",
- "image",
- "kamadak-exif",
- "log",
- "once_cell",
- "raw-window-handle",
- "rustc-hash 2.0.0",
- "thiserror",
- "unicode-segmentation",
-]
-
-[[package]]
-name = "iced_renderer"
-version = "0.13.0-dev"
-source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e"
-dependencies = [
- "iced_graphics",
- "iced_tiny_skia",
- "iced_wgpu",
- "log",
- "thiserror",
-]
-
-[[package]]
-name = "iced_runtime"
-version = "0.13.0-dev"
-source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e"
-dependencies = [
- "bytes",
- "iced_core",
- "iced_futures",
- "raw-window-handle",
- "thiserror",
-]
-
-[[package]]
-name = "iced_tiny_skia"
-version = "0.13.0-dev"
-source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e"
-dependencies = [
- "bytemuck",
- "cosmic-text",
- "iced_graphics",
- "kurbo",
- "log",
- "rustc-hash 2.0.0",
- "softbuffer",
- "tiny-skia",
-]
-
-[[package]]
-name = "iced_wgpu"
-version = "0.13.0-dev"
-source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e"
-dependencies = [
- "bitflags 2.6.0",
- "bytemuck",
- "futures",
- "glam",
- "glyphon",
- "guillotiere",
- "iced_graphics",
- "log",
- "once_cell",
- "rustc-hash 2.0.0",
- "thiserror",
- "wgpu",
-]
-
-[[package]]
-name = "iced_widget"
-version = "0.13.0-dev"
-source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e"
-dependencies = [
- "iced_renderer",
- "iced_runtime",
- "num-traits",
- "once_cell",
- "ouroboros",
- "rustc-hash 2.0.0",
- "thiserror",
- "unicode-segmentation",
-]
-
-[[package]]
-name = "iced_winit"
-version = "0.13.0-dev"
-source = "git+https://github.com/iced-rs/iced?rev=8fb939b5a920e0cd836dbdd24c948f8f2512fc7e#8fb939b5a920e0cd836dbdd24c948f8f2512fc7e"
-dependencies = [
- "iced_futures",
- "iced_graphics",
- "iced_runtime",
- "log",
- "rustc-hash 2.0.0",
- "thiserror",
- "tracing",
- "wasm-bindgen-futures",
- "web-sys",
- "winapi",
- "window_clipboard",
- "winit",
-]
-
-[[package]]
-name = "idna"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "image"
-version = "0.24.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "exr",
- "gif",
- "jpeg-decoder",
- "num-traits",
- "png",
- "qoi",
- "tiff",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.5",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "interprocess"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb"
-dependencies = [
- "blocking",
- "cfg-if",
- "futures-core",
- "futures-io",
- "intmap",
- "libc",
- "once_cell",
- "rustc_version",
- "spinning",
- "thiserror",
- "to_method",
- "tokio",
- "winapi",
-]
-
-[[package]]
-name = "intmap"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9"
-
-[[package]]
-name = "ipc"
-version = "0.1.0"
-dependencies = [
- "data",
- "futures",
- "interprocess",
- "rand",
- "rand_chacha",
- "thiserror",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
-
-[[package]]
-name = "irc"
-version = "0.1.0"
-dependencies = [
- "async-http-proxy",
- "bytes",
- "fast-socks5",
- "futures",
- "irc_proto",
- "rustls-native-certs",
- "rustls-pemfile",
- "thiserror",
- "tokio",
- "tokio-rustls",
- "tokio-util",
-]
-
-[[package]]
-name = "irc_proto"
-version = "0.1.0"
-dependencies = [
- "itertools 0.12.1",
- "nom",
- "thiserror",
-]
-
-[[package]]
-name = "is-docker"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "is-wsl"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
-dependencies = [
- "is-docker",
- "once_cell",
-]
-
-[[package]]
-name = "isolang"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe50d48c77760c55188549098b9a7f6e37ae980c586a24693d6b01c3b2010c3c"
-dependencies = [
- "phf",
-]
-
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "jni"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
-dependencies = [
- "cesu8",
- "cfg-if",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
-[[package]]
-name = "jobserver"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "jpeg-decoder"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
-dependencies = [
- "rayon",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.70"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "kamadak-exif"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4fc70d0ab7e5b6bafa30216a6b48705ea964cdfc29c050f2412295eba58077"
-dependencies = [
- "mutate_once",
-]
-
-[[package]]
-name = "khronos-egl"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
-dependencies = [
- "libc",
- "libloading 0.8.5",
- "pkg-config",
-]
-
-[[package]]
-name = "khronos_api"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
-
-[[package]]
-name = "kurbo"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440"
-dependencies = [
- "arrayvec",
- "smallvec",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
-[[package]]
-name = "lebe"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
-
-[[package]]
-name = "lewton"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030"
-dependencies = [
- "byteorder",
- "ogg",
- "tinyvec",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.156"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a"
-
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if",
- "winapi",
-]
-
-[[package]]
-name = "libloading"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
-dependencies = [
- "cfg-if",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "libm"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
-
-[[package]]
-name = "libredox"
-version = "0.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
-dependencies = [
- "bitflags 2.6.0",
- "libc",
- "redox_syscall 0.4.1",
-]
-
-[[package]]
-name = "libredox"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-dependencies = [
- "bitflags 2.6.0",
- "libc",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7"
-
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-
-[[package]]
-name = "lru"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
-
-[[package]]
-name = "mac-notification-sys"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64"
-dependencies = [
- "cc",
- "dirs-next",
- "objc-foundation",
- "objc_id",
- "time",
-]
-
-[[package]]
-name = "mach2"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "memmap2"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "metal"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25"
-dependencies = [
- "bitflags 2.6.0",
- "block",
- "core-graphics-types",
- "foreign-types 0.5.0",
- "log",
- "objc",
- "paste",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
- "simd-adler32",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
- "wasi",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "mutate_once"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b"
-
-[[package]]
-name = "naga"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843"
-dependencies = [
- "bit-set",
- "bitflags 2.6.0",
- "codespan-reporting",
- "hexf-parse",
- "indexmap",
- "log",
- "num-traits",
- "rustc-hash 1.1.0",
- "spirv",
- "termcolor",
- "thiserror",
- "unicode-xid",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "ndk"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
-dependencies = [
- "bitflags 2.6.0",
- "jni-sys",
- "log",
- "ndk-sys 0.5.0+25.2.9519653",
- "num_enum",
- "thiserror",
-]
-
-[[package]]
-name = "ndk"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
-dependencies = [
- "bitflags 2.6.0",
- "jni-sys",
- "log",
- "ndk-sys 0.6.0+11769913",
- "num_enum",
- "raw-window-handle",
- "thiserror",
-]
-
-[[package]]
-name = "ndk-context"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-
-[[package]]
-name = "ndk-sys"
-version = "0.5.0+25.2.9519653"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
-dependencies = [
- "jni-sys",
-]
-
-[[package]]
-name = "ndk-sys"
-version = "0.6.0+11769913"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
-dependencies = [
- "jni-sys",
-]
-
-[[package]]
-name = "nix"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "cfg_aliases 0.2.1",
- "libc",
- "memoffset",
-]
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "notify-rust"
-version = "4.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26a1d03b6305ecefdd9c6c60150179bb8d9f0cd4e64bbcad1e41419e7bf5e414"
-dependencies = [
- "log",
- "mac-notification-sys",
- "serde",
- "tauri-winrt-notification",
- "zbus",
-]
-
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
-[[package]]
-name = "num-derive"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
-]
-
-[[package]]
-name = "num_enum"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
-dependencies = [
- "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
- "objc_exception",
-]
-
-[[package]]
-name = "objc-foundation"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
-dependencies = [
- "block",
- "objc",
- "objc_id",
-]
-
-[[package]]
-name = "objc-sys"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
-
-[[package]]
-name = "objc2"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
-dependencies = [
- "objc-sys",
- "objc2-encode",
-]
-
-[[package]]
-name = "objc2-app-kit"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
-dependencies = [
- "bitflags 2.6.0",
- "block2",
- "libc",
- "objc2",
- "objc2-core-data",
- "objc2-core-image",
- "objc2-foundation",
- "objc2-quartz-core",
-]
-
-[[package]]
-name = "objc2-cloud-kit"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
-dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-core-location",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-contacts"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
-dependencies = [
- "block2",
- "objc2",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-core-data"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
-dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-core-image"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
-dependencies = [
- "block2",
- "objc2",
- "objc2-foundation",
- "objc2-metal",
-]
-
-[[package]]
-name = "objc2-core-location"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
-dependencies = [
- "block2",
- "objc2",
- "objc2-contacts",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-encode"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
-
-[[package]]
-name = "objc2-foundation"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
-dependencies = [
- "bitflags 2.6.0",
- "block2",
- "dispatch",
- "libc",
- "objc2",
-]
-
-[[package]]
-name = "objc2-link-presentation"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
-dependencies = [
- "block2",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-metal"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
-dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-quartz-core"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
-dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-foundation",
- "objc2-metal",
-]
-
-[[package]]
-name = "objc2-symbols"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
-dependencies = [
- "objc2",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-ui-kit"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
-dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-cloud-kit",
- "objc2-core-data",
- "objc2-core-image",
- "objc2-core-location",
- "objc2-foundation",
- "objc2-link-presentation",
- "objc2-quartz-core",
- "objc2-symbols",
- "objc2-uniform-type-identifiers",
- "objc2-user-notifications",
-]
-
-[[package]]
-name = "objc2-uniform-type-identifiers"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
-dependencies = [
- "block2",
- "objc2",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-user-notifications"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
-dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-core-location",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc_exception"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "objc_id"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b"
-dependencies = [
- "objc",
-]
-
-[[package]]
-name = "object"
-version = "0.36.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "oboe"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb"
-dependencies = [
- "jni",
- "ndk 0.8.0",
- "ndk-context",
- "num-derive",
- "num-traits",
- "oboe-sys",
-]
-
-[[package]]
-name = "oboe-sys"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "ogg"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "open"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3"
-dependencies = [
- "is-wsl",
- "libc",
- "pathdiff",
-]
-
-[[package]]
-name = "openssl"
-version = "0.10.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "foreign-types 0.3.2",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.103"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "orbclient"
-version = "0.3.47"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166"
-dependencies = [
- "libredox 0.0.2",
-]
-
-[[package]]
-name = "ordered-multimap"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
-dependencies = [
- "dlv-list",
- "hashbrown 0.12.3",
-]
-
-[[package]]
-name = "ordered-stream"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
-dependencies = [
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "ouroboros"
-version = "0.18.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "944fa20996a25aded6b4795c6d63f10014a7a83f8be9828a11860b08c5fc4a67"
-dependencies = [
- "aliasable",
- "ouroboros_macro",
- "static_assertions",
-]
-
-[[package]]
-name = "ouroboros_macro"
-version = "0.18.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd"
-dependencies = [
- "heck 0.4.1",
- "itertools 0.12.1",
- "proc-macro2",
- "proc-macro2-diagnostics",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "owned_ttf_parser"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90"
-dependencies = [
- "ttf-parser 0.24.1",
-]
-
-[[package]]
-name = "palette"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6"
-dependencies = [
- "approx",
- "fast-srgb8",
- "palette_derive",
- "phf",
-]
-
-[[package]]
-name = "palette_derive"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30"
-dependencies = [
- "by_address",
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "parking"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.6",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
-dependencies = [
- "lock_api",
- "parking_lot_core 0.9.10",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall 0.5.3",
- "smallvec",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "phf"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
-dependencies = [
- "phf_macros",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
-dependencies = [
- "phf_shared",
- "rand",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "piper"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
-dependencies = [
- "atomic-waker",
- "fastrand",
- "futures-io",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[package]]
-name = "png"
-version = "0.17.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
-dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "fdeflate",
- "flate2",
- "miniz_oxide",
-]
-
-[[package]]
-name = "polling"
-version = "3.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
-dependencies = [
- "cfg-if",
- "concurrent-queue",
- "hermit-abi 0.4.0",
- "pin-project-lite",
- "rustix",
- "tracing",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "pollster"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2"
-
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
-dependencies = [
- "zerocopy",
-]
-
-[[package]]
-name = "presser"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
-
-[[package]]
-name = "proc-macro-crate"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
-dependencies = [
- "toml_edit 0.21.1",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "proc-macro2-diagnostics"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
- "version_check",
- "yansi",
-]
-
-[[package]]
-name = "profiling"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
-
-[[package]]
-name = "qoi"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "quick-xml"
-version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "quick-xml"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "range-alloc"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab"
-
-[[package]]
-name = "rangemap"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684"
-
-[[package]]
-name = "raw-window-handle"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
-
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "read-fonts"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd"
-dependencies = [
- "bytemuck",
- "font-types",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
-dependencies = [
- "bitflags 2.6.0",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
-dependencies = [
- "getrandom",
- "libredox 0.1.3",
- "thiserror",
-]
-
-[[package]]
-name = "regex"
-version = "1.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
-
-[[package]]
-name = "renderdoc-sys"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
-
-[[package]]
-name = "reqwest"
-version = "0.12.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
-dependencies = [
- "base64 0.22.1",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-rustls",
- "hyper-tls",
- "hyper-util",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "system-configuration",
- "tokio",
- "tokio-native-tls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg 0.52.0",
-]
-
-[[package]]
-name = "rfd"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251"
-dependencies = [
- "ashpd",
- "block",
- "dispatch",
- "js-sys",
- "log",
- "objc",
- "objc-foundation",
- "objc_id",
- "pollster",
- "raw-window-handle",
- "urlencoding",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
-dependencies = [
- "cc",
- "cfg-if",
- "getrandom",
- "libc",
- "spin",
- "untrusted",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rodio"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6006a627c1a38d37f3d3a85c6575418cfe34a5392d60a686d0071e1c8d427acb"
-dependencies = [
- "claxon",
- "cpal",
- "hound",
- "lewton",
- "symphonia",
- "thiserror",
-]
-
-[[package]]
-name = "roxmltree"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
-
-[[package]]
-name = "rust-ini"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df"
-dependencies = [
- "cfg-if",
- "ordered-multimap",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustc-hash"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
-dependencies = [
- "bitflags 2.6.0",
- "errno",
- "libc",
- "linux-raw-sys 0.4.14",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
-dependencies = [
- "once_cell",
- "ring",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile",
- "rustls-pki-types",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
-dependencies = [
- "base64 0.22.1",
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.102.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
-
-[[package]]
-name = "rustybuzz"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c"
-dependencies = [
- "bitflags 2.6.0",
- "bytemuck",
- "libm",
- "smallvec",
- "ttf-parser 0.21.1",
- "unicode-bidi-mirroring",
- "unicode-ccc",
- "unicode-properties",
- "unicode-script",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "schannel"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "sctk-adwaita"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7555fcb4f753d095d734fdefebb0ad8c98478a21db500492d87c55913d3b0086"
-dependencies = [
- "ab_glyph",
- "log",
- "memmap2",
- "smithay-client-toolkit 0.18.1",
- "tiny-skia",
-]
-
-[[package]]
-name = "seahash"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
-
-[[package]]
-name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "self_cell"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
-
-[[package]]
-name = "semver"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-
-[[package]]
-name = "serde"
-version = "1.0.208"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.208"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.125"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "simd-adler32"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
-
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
-[[package]]
-name = "skrifa"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23"
-dependencies = [
- "bytemuck",
- "read-fonts",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "slotmap"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "smithay-client-toolkit"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a"
-dependencies = [
- "bitflags 2.6.0",
- "calloop 0.12.4",
- "calloop-wayland-source 0.2.0",
- "cursor-icon",
- "libc",
- "log",
- "memmap2",
- "rustix",
- "thiserror",
- "wayland-backend",
- "wayland-client",
- "wayland-csd-frame",
- "wayland-cursor",
- "wayland-protocols 0.31.2",
- "wayland-protocols-wlr 0.2.0",
- "wayland-scanner",
- "xkeysym",
-]
-
-[[package]]
-name = "smithay-client-toolkit"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
-dependencies = [
- "bitflags 2.6.0",
- "calloop 0.13.0",
- "calloop-wayland-source 0.3.0",
- "cursor-icon",
- "libc",
- "log",
- "memmap2",
- "rustix",
- "thiserror",
- "wayland-backend",
- "wayland-client",
- "wayland-csd-frame",
- "wayland-cursor",
- "wayland-protocols 0.32.3",
- "wayland-protocols-wlr 0.3.3",
- "wayland-scanner",
- "xkeysym",
-]
-
-[[package]]
-name = "smithay-clipboard"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846"
-dependencies = [
- "libc",
- "smithay-client-toolkit 0.19.2",
- "wayland-backend",
-]
-
-[[package]]
-name = "smol_str"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "softbuffer"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d623bff5d06f60d738990980d782c8c866997d9194cfe79ecad00aa2f76826dd"
-dependencies = [
- "as-raw-xcb-connection",
- "bytemuck",
- "cfg_aliases 0.2.1",
- "core-graphics",
- "drm",
- "fastrand",
- "foreign-types 0.5.0",
- "js-sys",
- "log",
- "memmap2",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
- "objc2-quartz-core",
- "raw-window-handle",
- "redox_syscall 0.5.3",
- "rustix",
- "tiny-xlib",
- "wasm-bindgen",
- "wayland-backend",
- "wayland-client",
- "wayland-sys",
- "web-sys",
- "windows-sys 0.52.0",
- "x11rb",
-]
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-dependencies = [
- "lock_api",
-]
-
-[[package]]
-name = "spinning"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d4f0e86297cad2658d92a707320d87bf4e6ae1050287f51d19b67ef3f153a7b"
-dependencies = [
- "lock_api",
-]
-
-[[package]]
-name = "spirv"
-version = "0.3.0+sdk-1.3.268.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
-dependencies = [
- "bitflags 2.6.0",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "strict-num"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
-
-[[package]]
-name = "strum"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
-[[package]]
-name = "svg_fmt"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20e16a0f46cf5fd675563ef54f26e83e20f2366bcf027bcb3cc3ed2b98aaf2ca"
-
-[[package]]
-name = "swash"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac"
-dependencies = [
- "skrifa",
- "yazi",
- "zeno",
-]
-
-[[package]]
-name = "symphonia"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9"
-dependencies = [
- "lazy_static",
- "symphonia-bundle-mp3",
- "symphonia-core",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "symphonia-bundle-mp3"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4"
-dependencies = [
- "lazy_static",
- "log",
- "symphonia-core",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "symphonia-core"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3"
-dependencies = [
- "arrayvec",
- "bitflags 1.3.2",
- "bytemuck",
- "lazy_static",
- "log",
-]
-
-[[package]]
-name = "symphonia-metadata"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c"
-dependencies = [
- "encoding_rs",
- "lazy_static",
- "log",
- "symphonia-core",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.74"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "sync_wrapper"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
-
-[[package]]
-name = "sys-locale"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "tauri-winrt-notification"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871"
-dependencies = [
- "quick-xml 0.31.0",
- "windows 0.56.0",
- "windows-version",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
-dependencies = [
- "cfg-if",
- "fastrand",
- "once_cell",
- "rustix",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "tiff"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
-dependencies = [
- "flate2",
- "jpeg-decoder",
- "weezl",
-]
-
-[[package]]
-name = "time"
-version = "0.3.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
-dependencies = [
- "deranged",
- "num-conv",
- "powerfmt",
- "serde",
- "time-core",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
-[[package]]
-name = "timeago"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1710e589de0a76aaf295cd47a6699f6405737dbfd3cf2b75c92d000b548d0e6"
-dependencies = [
- "chrono",
- "isolang",
-]
-
-[[package]]
-name = "tiny-skia"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"
-dependencies = [
- "arrayref",
- "arrayvec",
- "bytemuck",
- "cfg-if",
- "log",
- "png",
- "tiny-skia-path",
-]
-
-[[package]]
-name = "tiny-skia-path"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
-dependencies = [
- "arrayref",
- "bytemuck",
- "strict-num",
-]
-
-[[package]]
-name = "tiny-xlib"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d52f22673960ad13af14ff4025997312def1223bfa7c8e4949d099e6b3d5d1c"
-dependencies = [
- "as-raw-xcb-connection",
- "ctor-lite",
- "libloading 0.8.5",
- "pkg-config",
- "tracing",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "to_method"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8"
-
-[[package]]
-name = "tokio"
-version = "1.39.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "parking_lot 0.12.3",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "tracing",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
-dependencies = [
- "rustls",
- "rustls-pki-types",
- "tokio",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.22.20",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
-dependencies = [
- "indexmap",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow 0.6.18",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
-[[package]]
-name = "tower-service"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
-
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "ttf-parser"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
-
-[[package]]
-name = "ttf-parser"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
-
-[[package]]
-name = "ttf-parser"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a"
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "uds_windows"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
-dependencies = [
- "memoffset",
- "tempfile",
- "winapi",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
-[[package]]
-name = "unicode-bidi-mirroring"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86"
-
-[[package]]
-name = "unicode-ccc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-linebreak"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-properties"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
-
-[[package]]
-name = "unicode-script"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd"
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
-[[package]]
-name = "url"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
-[[package]]
-name = "uuid"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "vswhom"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
-dependencies = [
- "libc",
- "vswhom-sys",
-]
-
-[[package]]
-name = "vswhom-sys"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
-dependencies = [
- "cfg-if",
- "once_cell",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.74",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
-
-[[package]]
-name = "wasm-timer"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
-dependencies = [
- "futures",
- "js-sys",
- "parking_lot 0.11.2",
- "pin-utils",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "wayland-backend"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993"
-dependencies = [
- "cc",
- "downcast-rs",
- "rustix",
- "scoped-tls",
- "smallvec",
- "wayland-sys",
-]
-
-[[package]]
-name = "wayland-client"
-version = "0.31.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943"
-dependencies = [
- "bitflags 2.6.0",
- "rustix",
- "wayland-backend",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-csd-frame"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
-dependencies = [
- "bitflags 2.6.0",
- "cursor-icon",
- "wayland-backend",
-]
-
-[[package]]
-name = "wayland-cursor"
-version = "0.31.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95"
-dependencies = [
- "rustix",
- "wayland-client",
- "xcursor",
-]
-
-[[package]]
-name = "wayland-protocols"
-version = "0.31.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
-dependencies = [
- "bitflags 2.6.0",
- "wayland-backend",
- "wayland-client",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-protocols"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa"
-dependencies = [
- "bitflags 2.6.0",
- "wayland-backend",
- "wayland-client",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-protocols-plasma"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
-dependencies = [
- "bitflags 2.6.0",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols 0.31.2",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-protocols-wlr"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
-dependencies = [
- "bitflags 2.6.0",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols 0.31.2",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-protocols-wlr"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953"
-dependencies = [
- "bitflags 2.6.0",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols 0.32.3",
- "wayland-scanner",
-]
-
-[[package]]
-name = "wayland-scanner"
-version = "0.31.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6"
-dependencies = [
- "proc-macro2",
- "quick-xml 0.34.0",
- "quote",
-]
-
-[[package]]
-name = "wayland-sys"
-version = "0.31.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148"
-dependencies = [
- "dlib",
- "log",
- "once_cell",
- "pkg-config",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.70"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "web-time"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "weezl"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
-
-[[package]]
-name = "wgpu"
-version = "0.19.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01"
-dependencies = [
- "arrayvec",
- "cfg-if",
- "cfg_aliases 0.1.1",
- "js-sys",
- "log",
- "naga",
- "parking_lot 0.12.3",
- "profiling",
- "raw-window-handle",
- "smallvec",
- "static_assertions",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "wgpu-core",
- "wgpu-hal",
- "wgpu-types",
-]
-
-[[package]]
-name = "wgpu-core"
-version = "0.19.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a"
-dependencies = [
- "arrayvec",
- "bit-vec",
- "bitflags 2.6.0",
- "cfg_aliases 0.1.1",
- "codespan-reporting",
- "indexmap",
- "log",
- "naga",
- "once_cell",
- "parking_lot 0.12.3",
- "profiling",
- "raw-window-handle",
- "rustc-hash 1.1.0",
- "smallvec",
- "thiserror",
- "web-sys",
- "wgpu-hal",
- "wgpu-types",
-]
-
-[[package]]
-name = "wgpu-hal"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfabcfc55fd86611a855816326b2d54c3b2fd7972c27ce414291562650552703"
-dependencies = [
- "android_system_properties",
- "arrayvec",
- "ash",
- "bit-set",
- "bitflags 2.6.0",
- "block",
- "cfg_aliases 0.1.1",
- "core-graphics-types",
- "d3d12",
- "glow",
- "glutin_wgl_sys",
- "gpu-alloc",
- "gpu-allocator",
- "gpu-descriptor",
- "hassle-rs",
- "js-sys",
- "khronos-egl",
- "libc",
- "libloading 0.8.5",
- "log",
- "metal",
- "naga",
- "ndk-sys 0.5.0+25.2.9519653",
- "objc",
- "once_cell",
- "parking_lot 0.12.3",
- "profiling",
- "range-alloc",
- "raw-window-handle",
- "renderdoc-sys",
- "rustc-hash 1.1.0",
- "smallvec",
- "thiserror",
- "wasm-bindgen",
- "web-sys",
- "wgpu-types",
- "winapi",
-]
-
-[[package]]
-name = "wgpu-types"
-version = "0.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805"
-dependencies = [
- "bitflags 2.6.0",
- "js-sys",
- "web-sys",
-]
-
-[[package]]
-name = "widestring"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "window_clipboard"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6d692d46038c433f9daee7ad8757e002a4248c20b0a3fbc991d99521d3bcb6d"
-dependencies = [
- "clipboard-win",
- "clipboard_macos",
- "clipboard_wayland",
- "clipboard_x11",
- "raw-window-handle",
- "thiserror",
-]
-
-[[package]]
-name = "windows"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-dependencies = [
- "windows-core 0.52.0",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows"
-version = "0.54.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
-dependencies = [
- "windows-core 0.54.0",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows"
-version = "0.56.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132"
-dependencies = [
- "windows-core 0.56.0",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.54.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
-dependencies = [
- "windows-result",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.56.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
-dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-result",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.56.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.56.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
-[[package]]
-name = "windows-version"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_exe_info"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e7bfd02caf5cd98a197cec15c852685c8c42605f91d7be3083541a0b40a7ff"
-dependencies = [
- "embed-resource",
-]
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "winit"
-version = "0.30.1"
-source = "git+https://github.com/iced-rs/winit.git?rev=254d6b3420ce4e674f516f7a2bd440665e05484d#254d6b3420ce4e674f516f7a2bd440665e05484d"
-dependencies = [
- "ahash 0.8.11",
- "android-activity",
- "atomic-waker",
- "bitflags 2.6.0",
- "block2",
- "bytemuck",
- "calloop 0.12.4",
- "cfg_aliases 0.2.1",
- "concurrent-queue",
- "core-foundation",
- "core-graphics",
- "cursor-icon",
- "dpi",
- "js-sys",
- "libc",
- "memmap2",
- "ndk 0.9.0",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
- "objc2-ui-kit",
- "orbclient",
- "percent-encoding",
- "pin-project",
- "raw-window-handle",
- "redox_syscall 0.4.1",
- "rustix",
- "sctk-adwaita",
- "smithay-client-toolkit 0.18.1",
- "smol_str",
- "tracing",
- "unicode-segmentation",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols 0.31.2",
- "wayland-protocols-plasma",
- "web-sys",
- "web-time",
- "windows-sys 0.52.0",
- "x11-dl",
- "x11rb",
- "xkbcommon-dl",
-]
-
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winnow"
-version = "0.6.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winreg"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "x11-dl"
-version = "2.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
-dependencies = [
- "libc",
- "once_cell",
- "pkg-config",
-]
-
-[[package]]
-name = "x11rb"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
-dependencies = [
- "as-raw-xcb-connection",
- "gethostname",
- "libc",
- "libloading 0.8.5",
- "once_cell",
- "rustix",
- "x11rb-protocol",
-]
-
-[[package]]
-name = "x11rb-protocol"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
-
-[[package]]
-name = "xcursor"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61"
-
-[[package]]
-name = "xdg"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
-
-[[package]]
-name = "xdg-home"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "xkbcommon-dl"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
-dependencies = [
- "bitflags 2.6.0",
- "dlib",
- "log",
- "once_cell",
- "xkeysym",
-]
-
-[[package]]
-name = "xkeysym"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
-
-[[package]]
-name = "xml-rs"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601"
-
-[[package]]
-name = "yansi"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
-
-[[package]]
-name = "yazi"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1"
-
-[[package]]
-name = "zbus"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
-dependencies = [
- "async-broadcast",
- "async-executor",
- "async-fs",
- "async-io",
- "async-lock",
- "async-process",
- "async-recursion",
- "async-task",
- "async-trait",
- "blocking",
- "enumflags2",
- "event-listener",
- "futures-core",
- "futures-sink",
- "futures-util",
- "hex",
- "nix",
- "ordered-stream",
- "rand",
- "serde",
- "serde_repr",
- "sha1",
- "static_assertions",
- "tokio",
- "tracing",
- "uds_windows",
- "windows-sys 0.52.0",
- "xdg-home",
- "zbus_macros",
- "zbus_names",
- "zvariant",
-]
-
-[[package]]
-name = "zbus_macros"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.74",
- "zvariant_utils",
-]
-
-[[package]]
-name = "zbus_names"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
-dependencies = [
- "serde",
- "static_assertions",
- "zvariant",
-]
-
-[[package]]
-name = "zeno"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697"
-
-[[package]]
-name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "byteorder",
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
-
-[[package]]
-name = "zune-inflate"
-version = "0.2.54"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
-dependencies = [
- "simd-adler32",
-]
-
-[[package]]
-name = "zvariant"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
-dependencies = [
- "endi",
- "enumflags2",
- "serde",
- "static_assertions",
- "url",
- "zvariant_derive",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "4.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 2.0.74",
- "zvariant_utils",
-]
-
-[[package]]
-name = "zvariant_utils"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.74",
-]
diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index 678525c614dd0..670007352477c 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -27,14 +27,8 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NEm6qsU/Kes1rtNCsEauShpJZzrhBtOqo70uzrWpYtE=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "dpi-0.1.1" = "sha256-25sOvEBhlIaekTeWvy3UhjPI1xrJbOQvw/OkTg12kQY=";
-      "glyphon-0.5.0" = "sha256-OGXLqiMjaZ7gR5ANkuCgkfn/I7c/4h9SRE6MZZMW3m4=";
-      "iced-0.13.0-dev" = "sha256-VXaE4+qXakYSyO5rcBbCe4QuJv/oguxdqUEbhXfmh2U=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-K1xbJK7kJsDON+Nd8cUK+yZO2sAXAnA9bcYz7bTSbro=";
 
   nativeBuildInputs = [
     copyDesktopItems

From 45e4bbb3b8158b47c71a41c03f77a1f66795a989 Mon Sep 17 00:00:00 2001
From: famfo <famfo@famfo.xyz>
Date: Mon, 2 Dec 2024 17:13:27 +0100
Subject: [PATCH 028/340] halloy: 2024.12 -> 2024.14

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

diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index 670007352477c..9934399e6d093 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -18,13 +18,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "halloy";
-  version = "2024.12";
+  version = "2024.14";
 
   src = fetchFromGitHub {
     owner = "squidowl";
     repo = "halloy";
     rev = "refs/tags/${version}";
-    hash = "sha256-NEm6qsU/Kes1rtNCsEauShpJZzrhBtOqo70uzrWpYtE=";
+    hash = "sha256-Tns0Jd5v+lizU7NMVqS/hoqjHhmqrc9VVawjoZvhk78=";
   };
 
   useFetchCargoVendor = true;

From 7cd8111802d989f514ce61ea91151477ef5d134a Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 11 Dec 2024 02:41:45 +0300
Subject: [PATCH 029/340] equicord: 1.10.6 -> 1.10.8

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

diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index 0a975b91d4126..9e8ee5928f0d3 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "equicord";
-  version = "1.10.8"; # from package.json
+  version = "1.10.8";
 
   src = fetchFromGitHub {
     owner = "Equicord";
     repo = "Equicord";
-    rev = "935a5eaf6e5894294ec45ec540e9ecb07e850de0";
-    hash = "sha256-dfOzASBP0dEArJXuddLfPLZ7IcsEfKll+ju1jcHarNk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-kbK9tnu0G/nLy4A06xvd2yvlc6UhQfKiC6I9qmJeIwc=";
   };
 
   pnpmDeps = pnpm_9.fetchDeps {
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   env = {
     EQUICORD_REMOTE = "${finalAttrs.src.owner}/${finalAttrs.src.repo}";
-    EQUICORD_HASH = "${finalAttrs.src.rev}";
+    EQUICORD_HASH = "${finalAttrs.src.tag}";
   };
 
   buildPhase = ''

From 930c4ea2d7a9fce9fff266692befabd515ea4069 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Wed, 11 Dec 2024 02:52:43 +0300
Subject: [PATCH 030/340] equicord: add `passthru.updateScript`

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

diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index 9e8ee5928f0d3..f66050898c7a0 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -5,6 +5,7 @@
   nodejs,
   pnpm_9,
   stdenv,
+  nix-update-script,
   buildWebExtension ? false,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -51,6 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "The other cutest Discord client mod";
     homepage = "https://github.com/Equicord/Equicord";

From 7f57cfed98eb27513269c087c29e70dc2e596d20 Mon Sep 17 00:00:00 2001
From: tropf <tropf@users.noreply.github.com>
Date: Fri, 20 Dec 2024 12:41:17 +0100
Subject: [PATCH 031/340] maintainer: add tropf

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 294df339e0d29..199bbfe6dff8a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -23058,6 +23058,12 @@
     githubId = 504580;
     name = "Thibaut Robert";
   };
+  tropf = {
+    name = "tropf";
+    matrix = "@tropf:matrix.org";
+    github = "tropf";
+    githubId = 29873239;
+  };
   troydm = {
     email = "d.geurkov@gmail.com";
     github = "troydm";

From 830b83c2aeba5274c8c129b5b62638b7786ad4de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Dec 2024 17:51:10 +0000
Subject: [PATCH 032/340] nanovna-saver: 0.6.5 -> 0.6.8

---
 .../science/electronics/nanovna-saver/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix
index 03693b69ed4c3..171e7ac5103a7 100644
--- a/pkgs/applications/science/electronics/nanovna-saver/default.nix
+++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix
@@ -7,13 +7,13 @@
 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "nanovna-saver";
-  version = "0.6.5";
+  version = "0.6.8";
 
   src = fetchFromGitHub {
     owner = "NanoVNA-Saver";
     repo = pname;
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-YoIVYK787okl7XHj+nue38RheC4n+tchJLNbld/qdbU=";
+    tag = "v${version}";
+    sha256 = "sha256-XGm3y0C0bFqKbh2ImbYTKOKSYFJ728mE/1N78/WPJqo=";
   };
 
   nativeBuildInputs = [

From 6494c1d470c6ccb9e565398d2b1c44f27b5b10d9 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <contact@paveloom.dev>
Date: Wed, 17 Jul 2024 20:27:31 +0300
Subject: [PATCH 033/340] tracy: reformat

---
 pkgs/by-name/tr/tracy/package.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix
index edeefc4d72a45..10cb8d442a152 100644
--- a/pkgs/by-name/tr/tracy/package.nix
+++ b/pkgs/by-name/tr/tracy/package.nix
@@ -28,12 +28,9 @@ stdenv.mkDerivation rec {
     hash = "sha256-DN1ExvQ5wcIUyhMAfiakFbZkDsx+5l8VMtYGvSdboPA=";
   };
 
-  patches =
-    lib.optionals
-      (stdenv.hostPlatform.isDarwin && !(lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11"))
-      [
-        ./0001-remove-unifiedtypeidentifiers-framework
-      ];
+  patches = lib.optionals (
+    stdenv.hostPlatform.isDarwin && !(lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11")
+  ) [ ./0001-remove-unifiedtypeidentifiers-framework ];
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -126,7 +123,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Real time, nanosecond resolution, remote telemetry frame profiler for games and other applications";
     homepage = "https://github.com/wolfpld/tracy";
-    platforms = platforms.linux ++ platforms.darwin;
     license = licenses.bsd3;
     mainProgram = "tracy";
     maintainers = with maintainers; [
@@ -134,5 +130,6 @@ stdenv.mkDerivation rec {
       nagisa
       paveloom
     ];
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 263212ac6d3672391e46abeb79bfc5c77d790583 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <contact@paveloom.dev>
Date: Thu, 18 Jul 2024 22:47:20 +0300
Subject: [PATCH 034/340] tracy: 0.10 -> 0.11.1

---
 ...01-remove-unifiedtypeidentifiers-framework |  13 --
 ...the-uniformtypeidentifiers-framework.patch |  24 +++
 pkgs/by-name/tr/tracy/package.nix             | 138 +++++++++---------
 3 files changed, 96 insertions(+), 79 deletions(-)
 delete mode 100644 pkgs/by-name/tr/tracy/0001-remove-unifiedtypeidentifiers-framework
 create mode 100644 pkgs/by-name/tr/tracy/dont-use-the-uniformtypeidentifiers-framework.patch

diff --git a/pkgs/by-name/tr/tracy/0001-remove-unifiedtypeidentifiers-framework b/pkgs/by-name/tr/tracy/0001-remove-unifiedtypeidentifiers-framework
deleted file mode 100644
index 0dc5a7eb68f16..0000000000000
--- a/pkgs/by-name/tr/tracy/0001-remove-unifiedtypeidentifiers-framework
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/profiler/build/unix/legacy.mk b/profiler/build/unix/legacy.mk
-index 24765f1a..8baffb68 100644
---- a/profiler/build/unix/legacy.mk
-+++ b/profiler/build/unix/legacy.mk
-@@ -16,7 +16,7 @@ else
- 	UNAME := $(shell uname -s)
- 	ifeq ($(UNAME),Darwin)
- 		SRC3 += ../../../nfd/nfd_cocoa.m
--		LIBS +=  -framework CoreFoundation -framework AppKit -framework UniformTypeIdentifiers
-+		LIBS +=  -framework CoreFoundation -framework AppKit
- 	else
- 		ifdef TRACY_GTK_FILESELECTOR
- 			SRC += ../../../nfd/nfd_gtk.cpp
diff --git a/pkgs/by-name/tr/tracy/dont-use-the-uniformtypeidentifiers-framework.patch b/pkgs/by-name/tr/tracy/dont-use-the-uniformtypeidentifiers-framework.patch
new file mode 100644
index 0000000000000..e521178e9d71d
--- /dev/null
+++ b/pkgs/by-name/tr/tracy/dont-use-the-uniformtypeidentifiers-framework.patch
@@ -0,0 +1,24 @@
+From 05074295013a2bf7fa1b6af1b6575e5e0c491454 Mon Sep 17 00:00:00 2001
+From: Pavel Sobolev <contact@paveloom.dev>
+Date: Thu, 18 Jul 2024 21:54:44 +0300
+Subject: [PATCH] Don't use the `UniformTypeIdentifiers` framework.
+
+---
+ cmake/vendor.cmake | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake
+index bd53a4db..8079d8c2 100644
+--- a/cmake/vendor.cmake
++++ b/cmake/vendor.cmake
+@@ -182,7 +182,6 @@ if (NOT NO_FILESELECTOR AND NOT EMSCRIPTEN)
+
+     if (APPLE)
+         find_library(APPKIT_LIBRARY AppKit)
+-        find_library(UNIFORMTYPEIDENTIFIERS_LIBRARY UniformTypeIdentifiers)
+         target_link_libraries(TracyNfd PUBLIC ${APPKIT_LIBRARY} ${UNIFORMTYPEIDENTIFIERS_LIBRARY})
+     elseif (UNIX)
+         if (GTK_FILESELECTOR)
+--
+2.45.2
+
diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix
index 10cb8d442a152..5273b41a37093 100644
--- a/pkgs/by-name/tr/tracy/package.nix
+++ b/pkgs/by-name/tr/tracy/package.nix
@@ -3,123 +3,129 @@
   stdenv,
   fetchFromGitHub,
 
+  cmake,
+  ninja,
+  pkg-config,
+  wayland-scanner,
+
   capstone,
   darwin,
   dbus,
   freetype,
   glfw,
-  hicolor-icon-theme,
-  pkg-config,
   tbb,
 
+  withGtkFileSelector ? false,
+  gtk3,
+
   withWayland ? stdenv.hostPlatform.isLinux,
+  libglvnd,
   libxkbcommon,
   wayland,
+  wayland-protocols,
 }:
 
 stdenv.mkDerivation rec {
   pname = "tracy";
-  version = "0.10";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "wolfpld";
     repo = "tracy";
     rev = "v${version}";
-    hash = "sha256-DN1ExvQ5wcIUyhMAfiakFbZkDsx+5l8VMtYGvSdboPA=";
+    hash = "sha256-HofqYJT1srDJ6Y1f18h7xtAbI/Gvvz0t9f0wBNnOZK8=";
   };
 
-  patches = lib.optionals (
-    stdenv.hostPlatform.isDarwin && !(lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11")
-  ) [ ./0001-remove-unifiedtypeidentifiers-framework ];
+  patches = lib.optional (
+    stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11"
+  ) ./dont-use-the-uniformtypeidentifiers-framework.patch;
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs =
+    [
+      cmake
+      ninja
+      pkg-config
+    ]
+    ++ lib.optionals stdenv.isLinux [ wayland-scanner ]
+    ++ lib.optionals stdenv.cc.isClang [ stdenv.cc.cc.libllvm ];
 
   buildInputs =
     [
       capstone
       freetype
-      glfw
+      tbb
     ]
+    ++ lib.optionals (stdenv.hostPlatform.isLinux && withGtkFileSelector) [ gtk3 ]
+    ++ lib.optionals (stdenv.hostPlatform.isLinux && !withGtkFileSelector) [ dbus ]
     ++ lib.optionals (stdenv.hostPlatform.isLinux && withWayland) [
+      libglvnd
       libxkbcommon
       wayland
+      wayland-protocols
     ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      dbus
-      hicolor-icon-theme
-      tbb
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin || (stdenv.hostPlatform.isLinux && !withWayland)) [
+      glfw
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.AppKit
-      darwin.apple_sdk.frameworks.Carbon
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]
+    ++ lib.optionals (
+      stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11"
+    ) [ darwin.apple_sdk.frameworks.UniformTypeIdentifiers ];
+
+  cmakeFlags =
+    [
+      "-DDOWNLOAD_CAPSTONE=off"
+      "-DTRACY_STATIC=off"
     ]
-    ++
-      lib.optionals
-        (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11")
-        [
-          darwin.apple_sdk.frameworks.UniformTypeIdentifiers
-        ];
+    ++ lib.optional (stdenv.isLinux && withGtkFileSelector) "-DGTK_FILESELECTOR=ON"
+    ++ lib.optional (stdenv.isLinux && !withWayland) "-DLEGACY=on";
 
   env.NIX_CFLAGS_COMPILE = toString (
     [ ]
-    # Apple's compiler finds a format string security error on
-    # ../../../server/TracyView.cpp:649:34, preventing building.
-    ++ lib.optional stdenv.hostPlatform.isDarwin "-Wno-format-security"
     ++ lib.optional stdenv.hostPlatform.isLinux "-ltbb"
-    ++ lib.optional stdenv.cc.isClang "-faligned-allocation"
+    ++ lib.optional (
+      stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13"
+    ) "-fno-aligned-allocation"
+    # Workaround for https://github.com/NixOS/nixpkgs/issues/19098
+    ++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform.isDarwin) "-fno-lto"
   );
 
-  buildPhase = ''
-    runHook preBuild
+  dontUseCmakeBuildDir = true;
 
-    make -j $NIX_BUILD_CORES -C capture/build/unix release
-    make -j $NIX_BUILD_CORES -C csvexport/build/unix release
-    make -j $NIX_BUILD_CORES -C import-chrome/build/unix release
-    make -j $NIX_BUILD_CORES -C library/unix release
-    make -j $NIX_BUILD_CORES -C profiler/build/unix release \
-      ${lib.optionalString (stdenv.hostPlatform.isLinux && !withWayland) "LEGACY=1"}
-    make -j $NIX_BUILD_CORES -C update/build/unix release
+  postConfigure = ''
+    cmake -B capture/build -S capture $cmakeFlags
+    cmake -B csvexport/build -S csvexport $cmakeFlags
+    cmake -B import/build -S import $cmakeFlags
+    cmake -B profiler/build -S profiler $cmakeFlags
+    cmake -B update/build -S update $cmakeFlags
+  '';
 
-    runHook postBuild
+  postBuild = ''
+    ninja -C capture/build
+    ninja -C csvexport/build
+    ninja -C import/build
+    ninja -C profiler/build
+    ninja -C update/build
   '';
 
-  installPhase =
+  postInstall =
     ''
-      runHook preInstall
-
-      install -D -m 0755 capture/build/unix/capture-release $out/bin/capture
-      install -D -m 0755 csvexport/build/unix/csvexport-release $out/bin/tracy-csvexport
-      install -D -m 0755 import-chrome/build/unix/import-chrome-release $out/bin/import-chrome
-      install -D -m 0755 library/unix/libtracy-release.so $out/lib/libtracy.so
-      install -D -m 0755 profiler/build/unix/Tracy-release $out/bin/tracy
-      install -D -m 0755 update/build/unix/update-release $out/bin/update
-
-      mkdir -p $out/include/Tracy/client
-      mkdir -p $out/include/Tracy/common
-      mkdir -p $out/include/Tracy/tracy
-
-      cp -p public/client/*.{h,hpp} $out/include/Tracy/client
-      cp -p public/common/*.{h,hpp} $out/include/Tracy/common
-      cp -p public/tracy/*.{h,hpp} $out/include/Tracy/tracy
+      install -D -m 0555 capture/build/tracy-capture -t $out/bin
+      install -D -m 0555 csvexport/build/tracy-csvexport $out/bin
+      install -D -m 0555 import/build/{tracy-import-chrome,tracy-import-fuchsia} -t $out/bin
+      install -D -m 0555 profiler/build/tracy-profiler $out/bin/tracy
+      install -D -m 0555 update/build/tracy-update -t $out/bin
     ''
     + lib.optionalString stdenv.hostPlatform.isLinux ''
       substituteInPlace extra/desktop/tracy.desktop \
-        --replace Exec=/usr/bin/tracy Exec=tracy
+        --replace-fail Exec=/usr/bin/tracy Exec=tracy
 
-      install -D -m 0644 extra/desktop/application-tracy.xml $out/share/mime/packages/application-tracy.xml
-      install -D -m 0644 extra/desktop/tracy.desktop $out/share/applications/tracy.desktop
-      install -D -m 0644 icon/application-tracy.svg $out/share/icons/hicolor/scalable/apps/application-tracy.svg
-      install -D -m 0644 icon/icon.png $out/share/icons/hicolor/256x256/apps/tracy.png
-      install -D -m 0644 icon/icon.svg $out/share/icons/hicolor/scalable/apps/tracy.svg
-    ''
-    + ''
-      runHook postInstall
+      install -D -m 0444 extra/desktop/application-tracy.xml $out/share/mime/packages/application-tracy.xml
+      install -D -m 0444 extra/desktop/tracy.desktop $out/share/applications/tracy.desktop
+      install -D -m 0444 icon/application-tracy.svg $out/share/icons/hicolor/scalable/apps/application-tracy.svg
+      install -D -m 0444 icon/icon.png $out/share/icons/hicolor/256x256/apps/tracy.png
+      install -D -m 0444 icon/icon.svg $out/share/icons/hicolor/scalable/apps/tracy.svg
     '';
 
-  postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/tracy
-  '';
-
   meta = with lib; {
     description = "Real time, nanosecond resolution, remote telemetry frame profiler for games and other applications";
     homepage = "https://github.com/wolfpld/tracy";

From 37add730102eb46528675baa636809a354672ce3 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <contact@paveloom.dev>
Date: Sun, 16 Jun 2024 17:21:33 +0300
Subject: [PATCH 035/340] tracy: split the package into `tracy-wayland` and
 `tracy-glfw`

---
 pkgs/by-name/tr/tracy/package.nix | 5 ++++-
 pkgs/top-level/all-packages.nix   | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/tracy/package.nix b/pkgs/by-name/tr/tracy/package.nix
index 5273b41a37093..ab8f06031a93b 100644
--- a/pkgs/by-name/tr/tracy/package.nix
+++ b/pkgs/by-name/tr/tracy/package.nix
@@ -25,8 +25,11 @@
   wayland-protocols,
 }:
 
+assert withGtkFileSelector -> stdenv.isLinux;
+assert withWayland -> stdenv.isLinux;
+
 stdenv.mkDerivation rec {
-  pname = "tracy";
+  pname = if withWayland then "tracy-wayland" else "tracy-glfw";
   version = "0.11.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c07e150ac6a8..cc146de8e32bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3217,7 +3217,9 @@ with pkgs;
 
   tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; };
 
-  tracy-x11 = callPackage ../by-name/tr/tracy/package.nix { withWayland = false; };
+  tracy = callPackage ../by-name/tr/tracy/package.nix { withWayland = stdenv.isLinux; };
+  tracy-glfw = callPackage ../by-name/tr/tracy/package.nix { withWayland = false; };
+  tracy-wayland = callPackage ../by-name/tr/tracy/package.nix { withWayland = true; };
 
   uusi = haskell.lib.compose.justStaticExecutables haskellPackages.uusi;
 

From 18508b6a6a7ff4daf03091f6ee93bc92328c0c6a Mon Sep 17 00:00:00 2001
From: r17x <ri7nz@evilfactory.id>
Date: Sat, 21 Dec 2024 04:57:10 +0700
Subject: [PATCH 036/340] ocamlPackages.gluten-mirage: init at 0.5.2

---
 .../ocaml-modules/gluten/mirage.nix           | 24 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/gluten/mirage.nix

diff --git a/pkgs/development/ocaml-modules/gluten/mirage.nix b/pkgs/development/ocaml-modules/gluten/mirage.nix
new file mode 100644
index 0000000000000..0121c05f28b2b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/gluten/mirage.nix
@@ -0,0 +1,24 @@
+{
+  buildDunePackage,
+  gluten,
+  gluten-lwt,
+  faraday-lwt,
+  conduit-mirage,
+  mirage-flow,
+}:
+
+buildDunePackage {
+  pname = "gluten-mirage";
+  inherit (gluten) src version;
+
+  propagatedBuildInputs = [
+    gluten-lwt
+    faraday-lwt
+    conduit-mirage
+    mirage-flow
+  ];
+
+  meta = gluten.meta // {
+    description = "Mirage support for gluten";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 618e94b927211..5a4f0aa0b537d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -630,6 +630,7 @@ let
     gluten-eio = callPackage ../development/ocaml-modules/gluten/eio.nix { };
     gluten-lwt = callPackage ../development/ocaml-modules/gluten/lwt.nix { };
     gluten-lwt-unix = callPackage ../development/ocaml-modules/gluten/lwt-unix.nix { };
+    gluten-mirage = callPackage ../development/ocaml-modules/gluten/mirage.nix { };
 
     gmap = callPackage ../development/ocaml-modules/gmap { };
 

From 052067c306b130d12f6a67eef5d0153963874105 Mon Sep 17 00:00:00 2001
From: r17x <ri7nz@evilfactory.id>
Date: Sat, 21 Dec 2024 05:07:30 +0700
Subject: [PATCH 037/340] ocamlPackages.gluten-async: init at 0.5.2

---
 .../ocaml-modules/gluten/async.nix            | 23 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/gluten/async.nix

diff --git a/pkgs/development/ocaml-modules/gluten/async.nix b/pkgs/development/ocaml-modules/gluten/async.nix
new file mode 100644
index 0000000000000..b10c99f2d9a73
--- /dev/null
+++ b/pkgs/development/ocaml-modules/gluten/async.nix
@@ -0,0 +1,23 @@
+{
+  buildDunePackage,
+  gluten,
+  async,
+  faraday-async,
+  core,
+}:
+
+buildDunePackage {
+  pname = "gluten-async";
+  inherit (gluten) src version;
+
+  propagatedBuildInputs = [
+    gluten
+    async
+    faraday-async
+    core
+  ];
+
+  meta = gluten.meta // {
+    description = "Async support for gluten";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 618e94b927211..95edbcf38f1ea 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -627,6 +627,7 @@ let
     gluon = callPackage ../development/ocaml-modules/gluon { };
 
     gluten = callPackage ../development/ocaml-modules/gluten { };
+    gluten-async = callPackage ../development/ocaml-modules/gluten/async.nix { };
     gluten-eio = callPackage ../development/ocaml-modules/gluten/eio.nix { };
     gluten-lwt = callPackage ../development/ocaml-modules/gluten/lwt.nix { };
     gluten-lwt-unix = callPackage ../development/ocaml-modules/gluten/lwt-unix.nix { };

From 51c13e73539432e3b16d670a06c61c344b8cba7a Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sat, 21 Dec 2024 11:58:28 +0200
Subject: [PATCH 038/340] darwin: expose `requireXcode`

---
 pkgs/os-specific/darwin/xcode/default.nix | 1 +
 pkgs/top-level/darwin-packages.nix        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index c2d99b075d32e..17debe5968f1e 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -54,6 +54,7 @@ let
 
 in
 lib.makeExtensible (self: {
+  inherit requireXcode;
   xcode_8_1 = requireXcode "8.1" "sha256-VuAovU/b4rcLh+xMtcsZmbTWwTk35VGfMSp+fqPbsqM=";
   xcode_8_2 = requireXcode "8.2" "sha256-ohqgGD7JEEmXEvmfn/N9Ga2lM8jNwhIuh+ky7PQPzY4=";
   xcode_9_1 = requireXcode "9.1" "sha256-LG7pVMh1rNh5uP/bASvV9sKvGDrSGWH90J4gzwcgYSk=";
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index a84ec52e2bc08..9a45d7f5017c4 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -277,6 +277,7 @@ makeScopeWithSplicing' {
         xcode_16
         xcode_16_1
         xcode
+        requireXcode
         ;
 
       xcodeProjectCheckHook = pkgs.makeSetupHook {

From 7d0c25dca2b4db015bda6e7fb3fdcd3eb536889e Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sat, 21 Dec 2024 12:00:00 +0000
Subject: [PATCH 039/340] nixos/sane: ensure saned can access usb scanners

For a user to be able to scan with an USB scanner, it must have write access
to the corresponding file in /dev/bus/usb. Enabling the sane module
adds SANE's upstream hwdb file and udev rules to udev search path. The
hwdb file tags the scanner as `libsane_matched` and a builtin (from
systemd upstream) udev rule marks all `libsane_matched` devices as
uaccess. When a physical user logins, logind adds an acl allowing them
to write to the device.

Unfortunately, saned is a daemon. Therefore, uaccess has no effect for
it, and if no other udev rule changes the device to belong to the
scanner group or the lp group, (there are such rules, but they are not
complete enough, in that some scanners known by SANE rules are not known
by these rules), it will not be able to write to the scanner.

This solves this by adding a udev rule so that all libsane_matched
devices have an acl rules so that users in the scanner group can write.

A similar rule is present on Arch and Debian at least.

Note that we don't chgroup the file instead, because this posed problems
in the past: scanners are often also printers, and a device's group
cannot be simultaneously lp and scanner.

Fixes: https://github.com/NixOS/nixpkgs/issues/361981
---
 nixos/modules/services/hardware/sane.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index 7afdb630b0a73..4a7398721f232 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -184,6 +184,12 @@ in
       environment.etc."sane-config".source = config.hardware.sane.configDir;
       environment.etc."sane-libs".source = "${saneConfig}/lib/sane";
       services.udev.packages = backends;
+      # sane sets up udev rules that tag scanners with `uaccess`. This way, physically logged in users
+      # can access them without belonging to the `scanner` group. However, the `scanner` user used by saned
+      # does not have a real logind seat, so `uaccess` is not enough.
+      services.udev.extraRules = ''
+        ENV{DEVNAME}!="", ENV{libsane_matched}=="yes", RUN+="${pkgs.acl}/bin/setfacl -m g:scanner:rw $env{DEVNAME}"
+      '';
 
       users.groups.scanner.gid = config.ids.gids.scanner;
       networking.firewall.allowedUDPPorts = lib.mkIf config.hardware.sane.openFirewall [ 8612 ];

From 7e9020dab454f86939243279de9a9a3192b59d18 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Sat, 21 Dec 2024 13:30:39 +0100
Subject: [PATCH 040/340] docker_24: drop

---
 .../manual/release-notes/rl-2505.section.md   |  2 ++
 .../virtualization/docker/default.nix         | 31 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index fcbb79618dcfc..184fde174b449 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -160,6 +160,8 @@
 
 - `matomo` now defaults to version 5 (previously available as `matomo_5`). Version 4 has been removed as it reached EOL on December 19, 2024.
 
+- `docker_24` has been removed, as it was EOL with vulnerabilites since June 08, 2024.
+
 - `containerd` has been updated to v2, which contains breaking changes. See the [containerd
   2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more
   details.
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 2e3f16108309c..5f9b0d4a2871d 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -127,17 +127,6 @@ rec {
           url = "https://github.com/moby/moby/pull/43136.patch";
           hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8=";
         })
-      ] ++ lib.optionals (lib.versions.major version == "24") [
-        # docker_24 has LimitNOFILE set to "infinity", which causes a wide variety of issues in containers.
-        # Issues range from higher-than-usual ressource usage, to containers not starting at all.
-        # This patch (part of the release candidates for docker_25) simply removes this unit option
-        # making systemd use its default "1024:524288", which is sane. See commit message and/or the PR for
-        # more details: https://github.com/moby/moby/pull/45534
-        (fetchpatch {
-          name = "LimitNOFILE-systemd-default.patch";
-          url = "https://github.com/moby/moby/pull/45534/commits/c8930105bc9fc3c1a8a90886c23535cc6c41e130.patch";
-          hash = "sha256-nyGLxFrJaD0TrDqsAwOD6Iph0aHcFH9sABj1Fy74sec=";
-        })
       ];
 
       postPatch = ''
@@ -298,26 +287,6 @@ rec {
 
   # Get revisions from
   # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
-  docker_24 = callPackage dockerGen rec {
-    version = "24.0.9";
-    cliRev = "v${version}";
-    cliHash = "sha256-nXIZtE0X1OoQT908IGuRhVHb0tiLbqQLP0Md3YWt0/Q=";
-    mobyRev = "v${version}";
-    mobyHash = "sha256-KRS99heyMAPBnjjr7If8TOlJf6v6866S7J3YGkOhFiA=";
-    runcRev = "v1.1.12";
-    runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0=";
-    containerdRev = "v1.7.13";
-    containerdHash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk=";
-    tiniRev = "v0.19.0";
-    tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
-    knownVulnerabilities = [
-      "CVE-2024-23651"
-      "CVE-2024-23652"
-      "CVE-2024-23653"
-      "CVE-2024-41110"
-    ];
-  };
-
   docker_25 = callPackage dockerGen rec {
     version = "25.0.6";
     cliRev = "v${version}";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index df876854663d0..1d8c8605f94ec 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -294,6 +294,7 @@ mapAliases {
   dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17
   dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14
   docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02
+  docker_24 = throw "'docker_24' has been removed because it has been unmaintained since June 2024. Use docker_25 or newer instead."; # Added 2024-12-21
   docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29
   docker-distribution = distribution; # Added 2023-12-26
   dolphin-emu-beta = dolphin-emu; # Added 2023-02-11
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 136e2e6d2dcb6..f280eec7739ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13488,7 +13488,7 @@ with pkgs;
   };
 
   inherit (callPackage ../applications/virtualization/docker {})
-    docker_24 docker_25 docker_26 docker_27;
+    docker_25 docker_26 docker_27;
 
   docker = docker_27;
   docker-client = docker.override { clientOnly = true; };

From ba84d7fb52e515e2293574a7ac8bc8a9978d3340 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Sat, 21 Dec 2024 13:31:57 +0100
Subject: [PATCH 041/340] docker: cleanup derivation of old versionOlder

---
 .../virtualization/docker/default.nix         | 26 ++-----------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 5f9b0d4a2871d..cbfeea6c75521 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -119,16 +119,6 @@ rec {
 
       extraUserPath = lib.optionals (stdenv.hostPlatform.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]);
 
-      patches = lib.optionals (lib.versionOlder version "23") [
-        # This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver.
-        # It could be removed when a version incorporating this patch is released.
-        (fetchpatch {
-          name = "buildkit-zfs.patch";
-          url = "https://github.com/moby/moby/pull/43136.patch";
-          hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8=";
-        })
-      ];
-
       postPatch = ''
         patchShebangs hack/make.sh hack/make/ hack/with-go-mod.sh
       '';
@@ -203,7 +193,7 @@ rec {
       makeWrapper pkg-config go-md2man go libtool installShellFiles
     ];
 
-    buildInputs = plugins ++ lib.optionals (lib.versionAtLeast version "23" && stdenv.hostPlatform.isLinux) [
+    buildInputs = plugins ++ lib.optionals (stdenv.hostPlatform.isLinux) [
       glibc
       glibc.static
     ];
@@ -231,7 +221,7 @@ rec {
 
     '';
 
-    outputs = ["out"] ++ lib.optional (lib.versionOlder version "23") "man";
+    outputs = ["out"];
 
     installPhase = ''
       install -Dm755 ./build/docker $out/libexec/docker/docker
@@ -252,18 +242,6 @@ rec {
       installShellCompletion --bash ./contrib/completion/bash/docker
       installShellCompletion --fish ./contrib/completion/fish/docker.fish
       installShellCompletion --zsh  ./contrib/completion/zsh/_docker
-    '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform && lib.versionOlder version "23") ''
-      # Generate man pages from cobra commands
-      echo "Generate man pages from cobra"
-      mkdir -p ./man/man1
-      go build -o ./gen-manpages github.com/docker/cli/man
-      ./gen-manpages --root . --target ./man/man1
-    '' + lib.optionalString (lib.versionOlder version "23") ''
-      # Generate legacy pages from markdown
-      echo "Generate legacy manpages"
-      ./man/md2man-all.sh -q
-
-      installManPage man/*/*.[1-9]
     '';
 
     passthru = {

From 18a8d8b4d8fcdb980070db5990963db95025e609 Mon Sep 17 00:00:00 2001
From: r17x <ri7nz@evilfactory.id>
Date: Sat, 21 Dec 2024 05:48:02 +0700
Subject: [PATCH 042/340] ocamlPackages.httpun-ws-lwt: init at 0.2.0

---
 .../ocaml-modules/httpun-ws/lwt.nix           | 27 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/httpun-ws/lwt.nix

diff --git a/pkgs/development/ocaml-modules/httpun-ws/lwt.nix b/pkgs/development/ocaml-modules/httpun-ws/lwt.nix
new file mode 100644
index 0000000000000..e1f604d633cdf
--- /dev/null
+++ b/pkgs/development/ocaml-modules/httpun-ws/lwt.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  buildDunePackage,
+  lwt,
+  digestif,
+  httpun-ws,
+  gluten-lwt,
+}:
+
+buildDunePackage {
+  pname = "httpun-ws-lwt";
+
+  inherit (httpun-ws) src version;
+
+  propagatedBuildInputs = [
+    httpun-ws
+    lwt
+    digestif
+    gluten-lwt
+  ];
+
+  doCheck = true;
+
+  meta = httpun-ws.meta // {
+    description = "Lwt support for httpun-ws";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 1eb7e48874fd4..38a06ba1011e7 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -705,6 +705,7 @@ let
 
     httpun-ws = callPackage ../development/ocaml-modules/httpun-ws { };
 
+    httpun-ws-lwt = callPackage ../development/ocaml-modules/httpun-ws/lwt.nix { };
     hxd = callPackage ../development/ocaml-modules/hxd { };
 
     ### I ###

From e8b1bb78c5abcc8737ee3f3a4ee449a9eca8ee9a Mon Sep 17 00:00:00 2001
From: Joshua Campbell <me@joshuadcampbell.com>
Date: Thu, 5 Dec 2024 17:05:32 -0800
Subject: [PATCH 043/340] davinci-resolve: migrate to by-name

---
 .../default.nix => by-name/da/davinci-resolve/package.nix}    | 2 +-
 pkgs/top-level/all-packages.nix                               | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename pkgs/{applications/video/davinci-resolve/default.nix => by-name/da/davinci-resolve/package.nix} (99%)

diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/by-name/da/davinci-resolve/package.nix
similarity index 99%
rename from pkgs/applications/video/davinci-resolve/default.nix
rename to pkgs/by-name/da/davinci-resolve/package.nix
index d98b2c8cd3224..3be3e518ed118 100644
--- a/pkgs/applications/video/davinci-resolve/default.nix
+++ b/pkgs/by-name/da/davinci-resolve/package.nix
@@ -278,7 +278,7 @@ buildFHSEnv {
       ];
       text = ''
         set -o errexit
-        drv=pkgs/applications/video/davinci-resolve/default.nix
+        drv=pkgs/by-name/da/davinci-resolve/package.nix
         currentVersion=${lib.escapeShellArg davinci.version}
         downloadsJSON="$(curl --fail --silent https://www.blackmagicdesign.com/api/support/us/downloads.json)"
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27d706ce16a6f..b91e7c9127dc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -972,9 +972,7 @@ with pkgs;
 
   bikeshed = python3Packages.callPackage ../applications/misc/bikeshed { };
 
-  davinci-resolve = callPackage ../applications/video/davinci-resolve { };
-
-  davinci-resolve-studio = callPackage ../applications/video/davinci-resolve { studioVariant = true; };
+  davinci-resolve-studio = callPackage ../by-name/da/davinci-resolve/package.nix { studioVariant = true; };
 
   dehinter = with python3Packages; toPythonApplication dehinter;
 

From 7e90bfdbcbcfeb0c98c7d4ee59ac6d316a79e029 Mon Sep 17 00:00:00 2001
From: Joshua Campbell <me@joshuadcampbell.com>
Date: Thu, 5 Dec 2024 17:25:25 -0800
Subject: [PATCH 044/340] davinci-resolve: 19.1 -> 19.1.1

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

diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix
index 3be3e518ed118..15e7d60255866 100644
--- a/pkgs/by-name/da/davinci-resolve/package.nix
+++ b/pkgs/by-name/da/davinci-resolve/package.nix
@@ -35,7 +35,7 @@ let
   davinci = (
     stdenv.mkDerivation rec {
       pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
-      version = "19.1";
+      version = "19.1.1";
 
       nativeBuildInputs = [
         (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; })
@@ -57,9 +57,9 @@ let
             outputHashAlgo = "sha256";
             outputHash =
               if studioVariant then
-                "sha256-uEUZt0TQ4XrAag6NoCPUtYSnkwpwh3BNlol1z/EmP9E="
+                "sha256-yDkw7L9iTzE5g2XAw910nqtTyXcgcb6u+kP2sKtNcJ8="
               else
-                "sha256-3VVyfXT/mZFuf2GGkNS47ErSdAGpdUUwwwKY19zBBZo=";
+                "sha256-8oq5Nj8GrdHAmbM6Z5q98a0Lazjymk3dOCITkKiTJvQ=";
 
             impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 

From 9dce2858ed6baa3d7f329623a486b3c4f896c2ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 21:11:29 +0000
Subject: [PATCH 045/340] chirp: 0.4.0-unstable-2024-12-16 ->
 0.4.0-unstable-2024-12-17

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

diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix
index d73b0b1ad0004..984d459ec3f0a 100644
--- a/pkgs/by-name/ch/chirp/package.nix
+++ b/pkgs/by-name/ch/chirp/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "chirp";
-  version = "0.4.0-unstable-2024-12-16";
+  version = "0.4.0-unstable-2024-12-17";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "48c33155d141e0444dd4a73e069422c8a25d51b4";
-    hash = "sha256-6FKzdf4GS0XpA5HUIAqdrBaeslOrNhaZqpHMRIagkpI=";
+    rev = "605037deb68994bbb3114c2a35db7a7a7e4755a6";
+    hash = "sha256-5AwoXX5Qa4ROjt5wSdcElLJ7ZVguKK3urn0ygVDJiGQ=";
   };
 
   nativeBuildInputs = [

From 473665a52fc0b976dd5138491aa8d9915d6a856d Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 23 Dec 2024 01:51:48 +0400
Subject: [PATCH 046/340] =?UTF-8?q?python312Packages.aiogram:=203.15.0=20?=
 =?UTF-8?q?=E2=86=92=203.16.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../development/python-modules/aiogram/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix
index c7de615170bb7..e8ce9d17b34fa 100644
--- a/pkgs/development/python-modules/aiogram/default.nix
+++ b/pkgs/development/python-modules/aiogram/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "aiogram";
-  version = "3.15.0";
+  version = "3.16.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -36,8 +36,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "aiogram";
     repo = "aiogram";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-heCebvYP1rrExuD7tAMwSsBsds0cbsPvzHLUtBjNwW0=";
+    tag = "v${version}";
+    hash = "sha256-0kvGEispsDpeTM1NXYb9HylskDONHP48NBn+JyBhSJ4=";
   };
 
   build-system = [ hatchling ];
@@ -89,11 +89,11 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Modern and fully asynchronous framework for Telegram Bot API";
     homepage = "https://github.com/aiogram/aiogram";
-    changelog = "https://github.com/aiogram/aiogram/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ sikmir ];
+    changelog = "https://github.com/aiogram/aiogram/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sikmir ];
   };
 }

From 29fbedfaad3988141bccdbb7f85e47c9c7857e1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Dec 2024 22:46:59 +0000
Subject: [PATCH 047/340] gittuf: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix
index a88cb30de222b..7db3db7a5ec1f 100644
--- a/pkgs/by-name/gi/gittuf/package.nix
+++ b/pkgs/by-name/gi/gittuf/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "gittuf";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "gittuf";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-CvN4FaHpVsSPYzoJ9WsQ0uAm5aMHZoI5YpSgPbbmybA=";
+    hash = "sha256-0HxjCHwYhJkDfMt+8kzOAfZVhlprXcKpJSpWIQreTK4=";
   };
 
-  vendorHash = "sha256-GYcNvMN/ZPjkZj1pR71jMC5KD7/3D1d/wDQbk0DwRUU=";
+  vendorHash = "sha256-fXDbXyMKTiw2PugW3WPzyMupfXCgObm9MkJfix0mKaM=";
 
   ldflags = [ "-X github.com/gittuf/gittuf/internal/version.gitVersion=${version}" ];
 

From 40cd3e0ddca0a58a9e2a2acbd3dc6049881e5750 Mon Sep 17 00:00:00 2001
From: tropf <tropf@users.noreply.github.com>
Date: Fri, 20 Dec 2024 12:42:33 +0100
Subject: [PATCH 048/340] inkscape-extensions.inkstitch: add tropf as
 maintainer

---
 .../graphics/inkscape/extensions/inkstitch/default.nix       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
index f3141c689d3b9..c6e2b023480c6 100644
--- a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
@@ -83,6 +83,9 @@ python3.pkgs.buildPythonApplication rec {
     description = "Inkscape extension for machine embroidery design";
     homepage = "https://inkstitch.org/";
     license = with lib.licenses; [ gpl3Plus ];
-    maintainers = with lib.maintainers; [ pluiedev ];
+    maintainers = with lib.maintainers; [
+      tropf
+      pluiedev
+    ];
   };
 }

From 3773a1f21685f4abbda3b886149dd76a95896591 Mon Sep 17 00:00:00 2001
From: tropf <tropf@users.noreply.github.com>
Date: Fri, 20 Dec 2024 11:00:35 +0100
Subject: [PATCH 049/340] inkscape-extensions.inkstitch: add implicit
 dependencies in build

Inkstitch assumes its runtime python environment to be present during
build, so provide it.
---
 .../inkscape/extensions/inkstitch/default.nix | 53 +++++++++----------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
index c6e2b023480c6..5b55b6f76f3ea 100644
--- a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
@@ -6,23 +6,6 @@
 }:
 let
   version = "3.1.0";
-in
-python3.pkgs.buildPythonApplication rec {
-  pname = "inkstitch";
-  inherit version;
-  pyproject = false; # Uses a Makefile (yikes)
-
-  src = fetchFromGitHub {
-    owner = "inkstitch";
-    repo = "inkstitch";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-CGhJsDRhElgemNv2BXqZr6Vi5EyBArFak7Duz545ivY=";
-  };
-
-  nativeBuildInputs = [
-    gettext
-  ];
-
   dependencies =
     with python3.pkgs;
     [
@@ -47,6 +30,26 @@ python3.pkgs.buildPythonApplication rec {
     ]
     # Inkstitch uses the builtin tomllib instead when Python >=3.11
     ++ lib.optional (pythonOlder "3.11") tomli;
+  pyEnv = python3.withPackages (_: dependencies);
+in
+python3.pkgs.buildPythonApplication {
+  pname = "inkstitch";
+  inherit version;
+  pyproject = false; # Uses a Makefile (yikes)
+
+  src = fetchFromGitHub {
+    owner = "inkstitch";
+    repo = "inkstitch";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-CGhJsDRhElgemNv2BXqZr6Vi5EyBArFak7Duz545ivY=";
+  };
+
+  nativeBuildInputs = [
+    gettext
+    pyEnv
+  ];
+
+  inherit dependencies;
 
   makeFlags = [ "manual" ];
 
@@ -64,16 +67,12 @@ python3.pkgs.buildPythonApplication rec {
     ./0002-plugin-invocation-use-python-script-as-entrypoint.patch
   ];
 
-  postPatch =
-    let
-      pyEnv = python3.withPackages (_: dependencies);
-    in
-    ''
-      # Add shebang with python dependencies
-      substituteInPlace lib/inx/utils.py --replace-fail ' interpreter="python"' ""
-      sed -i -e '1i#!${pyEnv.interpreter}' inkstitch.py
-      chmod a+x inkstitch.py
-    '';
+  postPatch = ''
+    # Add shebang with python dependencies
+    substituteInPlace lib/inx/utils.py --replace-fail ' interpreter="python"' ""
+    sed -i -e '1i#!${pyEnv.interpreter}' inkstitch.py
+    chmod a+x inkstitch.py
+  '';
 
   nativeCheckInputs = with python3.pkgs; [
     pytestCheckHook

From e74bd37a8c15f1c96e8f9c8e5728438dafcce4c2 Mon Sep 17 00:00:00 2001
From: tropf <tropf@users.noreply.github.com>
Date: Fri, 20 Dec 2024 11:03:02 +0100
Subject: [PATCH 050/340] inkscape-extensions.inkstitch: provide version number

Overwrite the version number shown in inkstitch's about dialog. Without
this option, only 'manual' (without a version number) is shown.
---
 .../graphics/inkscape/extensions/inkstitch/default.nix       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
index 5b55b6f76f3ea..298be459e3f6a 100644
--- a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
@@ -51,6 +51,11 @@ python3.pkgs.buildPythonApplication {
 
   inherit dependencies;
 
+  env = {
+    # to overwrite version string
+    GITHUB_REF = version;
+    BUILD = "nixpkgs";
+  };
   makeFlags = [ "manual" ];
 
   installPhase = ''

From cd87669d6f040611e6e28bfd56c5d5772c40c560 Mon Sep 17 00:00:00 2001
From: tropf <tropf@users.noreply.github.com>
Date: Mon, 23 Dec 2024 05:06:54 +0100
Subject: [PATCH 051/340] inkscape-extensions.inkstitch: simplify
 fetchFromGitHub

---
 .../graphics/inkscape/extensions/inkstitch/default.nix          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
index 298be459e3f6a..ae6862d9bfd37 100644
--- a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
+++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix
@@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication {
   src = fetchFromGitHub {
     owner = "inkstitch";
     repo = "inkstitch";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-CGhJsDRhElgemNv2BXqZr6Vi5EyBArFak7Duz545ivY=";
   };
 

From fae960f1545199b2302033fa0856d96b158058de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 11:23:04 +0000
Subject: [PATCH 052/340] kodiPackages.keymap: 1.2.1 -> 1.3.0

---
 pkgs/applications/video/kodi/addons/keymap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/keymap/default.nix b/pkgs/applications/video/kodi/addons/keymap/default.nix
index abc3cd7c8095f..c5866e993749d 100644
--- a/pkgs/applications/video/kodi/addons/keymap/default.nix
+++ b/pkgs/applications/video/kodi/addons/keymap/default.nix
@@ -11,11 +11,11 @@
 buildKodiAddon rec {
   pname = "keymap";
   namespace = "script.keymap";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchzip {
     url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip";
-    sha256 = "sha256-AtIufZbOi3MW7aSOAlON8csJheJqAbuBtKIX0sX6zIw=";
+    sha256 = "sha256-931iJv9wsY20pXckvTlEhxGCDFSBHonpGO2c2OYiqrI=";
   };
 
   propagatedBuildInputs = [

From 0e08612568a02e810d7ed2c6ecf36f4085e67c07 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 23 Dec 2024 12:50:00 +0100
Subject: [PATCH 053/340] miracle-wm: 0.3.7 -> 0.4.0

---
 pkgs/by-name/mi/miracle-wm/package.nix | 32 +++++++-------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix
index bbe9444f04895..750f0ef699922 100644
--- a/pkgs/by-name/mi/miracle-wm/package.nix
+++ b/pkgs/by-name/mi/miracle-wm/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   gitUpdater,
   nixosTests,
   boost,
@@ -27,31 +26,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "miracle-wm";
-  version = "0.3.7";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "miracle-wm-org";
     repo = "miracle-wm";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-31S7Mfz3LIOAmDUl6jbr3kSP2BdLaM0M4xMZ8FHhLH0=";
+    hash = "sha256-IuYRgQm3DM6ZgsfRt37GCXC3hb1vGIrqw7WxYN+Bets=";
   };
 
-  patches = [
-    # Remove when version > 0.3.7
-    (fetchpatch {
-      name = "0001-miracle-wm-Dont-override-PKG_CONFIG_PATH.patch";
-      url = "https://github.com/miracle-wm-org/miracle-wm/commit/0a8809d4362e1d3abbea6e29fd1234c8fa981bfb.patch";
-      hash = "sha256-Fy/fDmV1uXRt4omxccpFkZb0vE8iHYSS9A7E+PEFBOM=";
-    })
-
-    # Remove when version > 0.3.7
-    (fetchpatch {
-      name = "0002-miracle-wm-Fix-mir-2.19-support.patch";
-      url = "https://github.com/miracle-wm-org/miracle-wm/commit/a9db8b539a5396e9df6f6f009cbabcbb053f2b05.patch";
-      hash = "sha256-VxUVpwBSHuLzs0yEQ7gStpMnHRJJtZ/Shmjb2un3qI0=";
-    })
-  ];
-
   postPatch =
     ''
       substituteInPlace session/usr/local/share/wayland-sessions/miracle-wm.desktop.in \
@@ -108,19 +91,20 @@ stdenv.mkDerivation (finalAttrs: {
     tests.vm = nixosTests.miracle-wm;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tiling Wayland compositor based on Mir";
     longDescription = ''
       miracle-wm is a Wayland compositor based on Mir. It features a tiling window manager at its core, very much in
       the style of i3 and sway. The intention is to build a compositor that is flashier and more feature-rich than
       either of those compositors, like swayfx.
 
-      See the user guide for info on how to use miracle-wm: https://github.com/mattkae/miracle-wm/blob/v${finalAttrs.version}/USERGUIDE.md
+      See the user guide for info on how to use miracle-wm: https://wiki.miracle-wm.org/v${finalAttrs.version}/
     '';
     homepage = "https://github.com/mattkae/miracle-wm";
-    license = licenses.gpl3Only;
+    changelog = "https://github.com/miracle-wm-org/miracle-wm/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl3Only;
     mainProgram = "miracle-wm";
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.linux;
   };
 })

From 1e6869fb0608cbef7ab4c32b2f849193f6898011 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 12:04:58 +0000
Subject: [PATCH 054/340] factoriolab: 3.8.5 -> 3.8.9

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

diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix
index efbd7c7060bf1..c096519a05383 100644
--- a/pkgs/by-name/fa/factoriolab/package.nix
+++ b/pkgs/by-name/fa/factoriolab/package.nix
@@ -10,13 +10,13 @@
 }:
 buildNpmPackage rec {
   pname = "factoriolab";
-  version = "3.8.5";
+  version = "3.8.9";
 
   src = fetchFromGitHub {
     owner = "factoriolab";
     repo = "factoriolab";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Ft3WTAqbygVrs+3WRHXMKsDp5B9xe3me3/FYCmyZCfk=";
+    hash = "sha256-H+l/eDdTc/IMqE85Xh4IAo2ZWZRYKKUnH3rXkON2L1s=";
   };
   buildInputs = [ vips ];
   nativeBuildInputs = [

From aa044ad5001365935af95a79ff241a740b9fc1f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 12:38:07 +0000
Subject: [PATCH 055/340] kdePackages.drumstick: 2.9.1 -> 2.10.0

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

diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix
index 3f2b1ba026abc..bb23d12104047 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/pkgs/development/libraries/drumstick/default.nix
@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "drumstick";
-  version = "2.9.1";
+  version = "2.10.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2";
-    hash = "sha256-U5Cm9pTDxC8NzyQfjaC/eBBDUWELV4jq4ov4QGefM9g=";
+    hash = "sha256-rFoH1daXHiT3LZWQRP+buzMRQSWLJfGMgRtJ9XFy/L0=";
   };
 
   patches = [ ./drumstick-plugins.patch ];

From 16850c4ac5d95618042382cf7884420abc827e56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 13:06:59 +0000
Subject: [PATCH 056/340] bacon: 3.5.0 -> 3.6.0

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

diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix
index ef764ec2e982b..9de29879ee74b 100644
--- a/pkgs/by-name/ba/bacon/package.nix
+++ b/pkgs/by-name/ba/bacon/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bacon";
-  version = "3.5.0";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "bacon";
     rev = "refs/tags/v${version}";
-    hash = "sha256-gfISv1a/6XBl5L/ywHqG0285tDOasucp8YbJeXrv6OA=";
+    hash = "sha256-L+LVD7ceKUQ+nVyepusrv9Zz4BSGjXucnimsf+abM2k=";
   };
 
-  cargoHash = "sha256-xjiHXhtikqXMKMzCyxfGXfj1S7YCx4UbPS2jjgpY25A=";
+  cargoHash = "sha256-NUCy3DZ1uV1iPanHGbK/TSY6oS3zSQxVpmnw7Aon+pw=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = [ "--version" ];

From 3c1d71c5b880265c1cfb61dcf94afc9f09620a1a Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 22 Dec 2024 12:19:07 +0800
Subject: [PATCH 057/340] python311Packages.jenkins-job-builder: 6.4.1 -> 6.4.2

---
 .../python-modules/jenkins-job-builder/default.nix   | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix
index 479abaffd66f8..a7b5e70272676 100644
--- a/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -11,29 +11,21 @@
   stevedore,
   pytestCheckHook,
   setuptools,
-  fetchpatch,
   testtools,
   pytest-mock,
 }:
 
 buildPythonPackage rec {
   pname = "jenkins-job-builder";
-  version = "6.4.1";
+  version = "6.4.2";
 
   build-system = [ setuptools ];
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Re7rNAcm0cpSx1tmSzTjfDlW7y236lzFKFjVw0uUTmw=";
+    hash = "sha256-G+DVRd6o3GwTdFNnJkotIidrxexJZSdgCGXTA4KnJJA=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://opendev.org/jjb/jenkins-job-builder/commit/7bf0dacd80d6da7b8562db05f9187140e42947c8.patch";
-      hash = "sha256-2z7axGgVV5Z7A11JiQhlrjjXDKYe+X6NrJEuXd986Do=";
-    })
-  ];
-
   postPatch = ''
     export HOME=$(mktemp -d)
   '';

From 3f74154fa125e6edc5a45f843771e04feafe4d84 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 22 Dec 2024 12:10:43 +0800
Subject: [PATCH 058/340] duplicati: 2.0.8.1 -> 2.1.0.2

---
 pkgs/by-name/du/duplicati/package.nix | 34 ++++++++++++++-------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/du/duplicati/package.nix b/pkgs/by-name/du/duplicati/package.nix
index 83b32d450dd64..aaef3d602b0d0 100644
--- a/pkgs/by-name/du/duplicati/package.nix
+++ b/pkgs/by-name/du/duplicati/package.nix
@@ -7,14 +7,16 @@
   makeWrapper,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "duplicati";
-  version = "2.0.8.1";
+  version = "2.1.0.2";
   channel = "beta";
-  build_date = "2024-05-07";
+  build_date = "2024-11-29";
 
   src = fetchzip {
-    url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip";
+    url =
+      with finalAttrs;
+      "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip";
     hash = "sha256-LmW6yGutxP33ghFqyOLKrGDNCQdr8DDFn/IHigsLpzA=";
     stripRoot = false;
   };
@@ -22,17 +24,17 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
-    mkdir -p $out/{bin,share/${pname}-${version}}
-    cp -r * $out/share/${pname}-${version}
-    makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \
-      --add-flags "$out/share/${pname}-${version}/Duplicati.CommandLine.exe" \
+    mkdir -p $out/{bin,share/duplicati-${finalAttrs.version}}
+    cp -r * $out/share/duplicati-${finalAttrs.version}
+    makeWrapper "${lib.getExe mono}" $out/bin/duplicati-cli \
+      --add-flags "$out/share/duplicati-${finalAttrs.version}/Duplicati.CommandLine.exe" \
       --prefix LD_LIBRARY_PATH : ${
         lib.makeLibraryPath [
           sqlite
         ]
       }
-    makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \
-      --add-flags "$out/share/${pname}-${version}/Duplicati.Server.exe" \
+    makeWrapper "${lib.getExe mono}" $out/bin/duplicati-server \
+      --add-flags "$out/share/duplicati-${finalAttrs.version}/Duplicati.Server.exe" \
       --prefix LD_LIBRARY_PATH : ${
         lib.makeLibraryPath [
           sqlite
@@ -40,15 +42,15 @@ stdenv.mkDerivation rec {
       }
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers";
     homepage = "https://www.duplicati.com/";
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [
       nyanloutre
       bot-wxt1221
     ];
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    platforms = platforms.all;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    platforms = lib.platforms.all;
   };
-}
+})

From e09f075b080bbf96d3d411a19ca7ef5896afe953 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Mon, 23 Dec 2024 10:09:24 -0500
Subject: [PATCH 059/340] linuxPackages.xpadneo: 0.9.6 -> 0.9.7

---
 pkgs/os-specific/linux/xpadneo/default.nix    |  8 +++-----
 .../xpadneo/xpadneo-0.9.6-kernel-6.12.patch   | 20 -------------------
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/xpadneo/xpadneo-0.9.6-kernel-6.12.patch

diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix
index f0e5f443c9726..39ce3e1c71a3c 100644
--- a/pkgs/os-specific/linux/xpadneo/default.nix
+++ b/pkgs/os-specific/linux/xpadneo/default.nix
@@ -10,21 +10,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xpadneo";
-  version = "0.9.6";
+  version = "0.9.7";
 
   src = fetchFromGitHub {
     owner = "atar-axis";
     repo = "xpadneo";
-    rev = "refs/tags/v${finalAttrs.version}";
-    sha256 = "sha256-pX9zpAGnhDLKUAKOQ5iqtK8cKEkjCqDa5v3MwYViWX4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-evmjQrQPHe8F+6w12bnUv6P4QKGkm63cmP1HEv6equw=";
   };
 
   setSourceRoot = ''
     export sourceRoot=$(pwd)/${finalAttrs.src.name}/hid-xpadneo/src
   '';
 
-  patches = [ ./xpadneo-0.9.6-kernel-6.12.patch ];
-
   nativeBuildInputs = kernel.moduleBuildDependencies;
   buildInputs = [ bluez ];
 
diff --git a/pkgs/os-specific/linux/xpadneo/xpadneo-0.9.6-kernel-6.12.patch b/pkgs/os-specific/linux/xpadneo/xpadneo-0.9.6-kernel-6.12.patch
deleted file mode 100644
index 3e0c8c605db99..0000000000000
--- a/pkgs/os-specific/linux/xpadneo/xpadneo-0.9.6-kernel-6.12.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/hid-xpadneo.c
-+++ b/hid-xpadneo.c
-@@ -713,5 +713,9 @@
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,12,0)
- static u8 *xpadneo_report_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *rsize)
-+#else
-+static const u8 *xpadneo_report_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *rsize)
-+#endif
- {
- 	struct xpadneo_devdata *xdata = hid_get_drvdata(hdev);
---- a/xpadneo.h
-+++ b/xpadneo.h
-@@ -13,4 +13,5 @@
- 
- #include <linux/hid.h>
-+#include <linux/version.h>
- 
- #include "hid-ids.h"

From dd15820cc1de15a9dfa7d8264c43a3b551e63108 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Mon, 23 Dec 2024 15:25:24 +0000
Subject: [PATCH 060/340] magic-wormhole: fix test for twisted 24.10.0

---
 .../python-modules/magic-wormhole/default.nix          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index d48fce2d2d973..0f01a6d2fd9a9 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   setuptools,
@@ -45,6 +46,15 @@ buildPythonPackage rec {
     hash = "sha256-BxPF4iQ91wLBagdvQ/Y89VIZBkMxFiEHnK+BU55Bwr4=";
   };
 
+  patches = [
+    # TODO: drop patch for magic-wormhole > 0.17.0
+    # fix test for twisted 24.10.0 (https://github.com/magic-wormhole/magic-wormhole/pull/554)
+    (fetchpatch {
+      name = "fix-twisted-24.10.0.patch";
+      url = "https://github.com/magic-wormhole/magic-wormhole/commit/d7353cad6fe9d43620a0de33a634f395757d2e5c.patch";
+      hash = "sha256-mvgVFW3Fa2I8/39ron0bYYsJNm2r97jnLFCfhtHSIP0=";
+    })
+  ];
   postPatch =
     # enable tests by fixing the location of the wormhole binary
     ''

From e56d7c29ffbd6e9ab4fe7a36263359a9ee5fcd61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 16:00:30 +0000
Subject: [PATCH 061/340] apko: 0.21.0 -> 0.22.4

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

diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix
index 549c59a4b282c..3e7b0eea55a0c 100644
--- a/pkgs/development/tools/apko/default.nix
+++ b/pkgs/development/tools/apko/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "apko";
-  version = "0.21.0";
+  version = "0.22.4";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ppWEMQs14GnnZr1wxe6YBQ9DtsN/EPiUSgYFOBdFbQU=";
+    hash = "sha256-cl9jx6+BzjB7x30HcsYGJLqNrF9Gxdh7TSuOV9HyWYw=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -25,7 +25,7 @@ buildGoModule rec {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-8DsCLc1SovY8hupYc3AjOlp4JbeVeg1mbcVdLpvHUhI=";
+  vendorHash = "sha256-vF+jzR23Fq2OXDeszOeJPNHCsajT60U1jY3ovoe3ALs=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From c015257a4499c330d4cd2f9436210506e30057b0 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Mon, 23 Dec 2024 18:35:29 +0100
Subject: [PATCH 062/340] SDL_sound: fix cross build

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

diff --git a/pkgs/by-name/sd/SDL_sound/package.nix b/pkgs/by-name/sd/SDL_sound/package.nix
index 2c32e32960da6..189a2ac4f67f1 100644
--- a/pkgs/by-name/sd/SDL_sound/package.nix
+++ b/pkgs/by-name/sd/SDL_sound/package.nix
@@ -19,10 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-OZn9C7tIUomlK+FLL2i1ccuE44DMQzh+rfd49kx55t8=";
   };
 
-  nativeBuildInputs = [
-    SDL
-  ];
-
   buildInputs = [
     SDL
     flac
@@ -34,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.enableFeature enableSdltest "sdltest")
   ];
 
+  env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config";
+
   strictDeps = true;
 
   meta = {

From 75e16a4607079ee2ec38b8cf3a38b34917977860 Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Mon, 23 Dec 2024 19:51:33 +0200
Subject: [PATCH 063/340] 3proxy: fixup build with gcc14

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

diff --git a/pkgs/by-name/_3/_3proxy/package.nix b/pkgs/by-name/_3/_3proxy/package.nix
index 819c6a13a3c23..ad9c639ea45a3 100644
--- a/pkgs/by-name/_3/_3proxy/package.nix
+++ b/pkgs/by-name/_3/_3proxy/package.nix
@@ -35,6 +35,9 @@ stdenv.mkDerivation rec {
     rm -fr $out/var
   '';
 
+  # common.c:208:9: error: initialization of 'int (*)(struct pollfd *, unsigned int,  int)' from incompatible pointer type 'int (*)(struct pollfd *, nfds_t,  int)' {aka 'int (*)(struct pollfd *, long unsigned int,  int)'}
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
   passthru.tests = {
     smoke-test = nixosTests._3proxy;
   };

From 5453e433bb89baede5bc0f1ee8eb2bfe0ca84507 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 18:46:42 +0000
Subject: [PATCH 064/340] nushellPlugins.units: 0.1.3 -> 0.1.4

---
 pkgs/shells/nushell/plugins/units.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/shells/nushell/plugins/units.nix
index bf1211e56128b..d929d02860717 100644
--- a/pkgs/shells/nushell/plugins/units.nix
+++ b/pkgs/shells/nushell/plugins/units.nix
@@ -11,15 +11,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_units";
-  version = "0.1.3";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     repo = "nu_plugin_units";
     owner = "JosephTLyons";
     rev = "v${version}";
-    hash = "sha256-zPN18ECzh2/l0kxp+Vyp3d9kCq3at/7SqMYbV3WDV3I=";
+    hash = "sha256-iDRrA8bvufV92ADeG+eF3xu7I/4IinJcSxEkwuhkHlg=";
   };
-  cargoHash = "sha256-6NWyuErdxj7//wW4L7ijW4RiWqdwbeTrelIjpisAGkg=";
+  cargoHash = "sha256-if8uvDRwr6p5VENdls9mIfECiu/zDybcpkphZLHRHe8=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

From eea887fd23d6a9b7240d079d9238cd52ef9cb072 Mon Sep 17 00:00:00 2001
From: Pouya Abbassi <abbassi.pouya@gmail.com>
Date: Sun, 1 Dec 2024 20:27:22 +0330
Subject: [PATCH 065/340] maintainers: add pouya

---
 maintainers/maintainer-list.nix                         | 7 +++++++
 pkgs/applications/terminal-emulators/st/siduck76-st.nix | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e55b7c07349f8..2696ff51b9799 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18078,6 +18078,13 @@
     github = "potb";
     githubId = 10779093;
   };
+  pouya = {
+    email = "me@pouyacode.net";
+    github = "pouya-abbassi";
+    githubId = 8519318;
+    name = "Pouya Abbasi";
+    keys = [ { fingerprint = "8CC7 EB15 3563 4205 E9C2  AAD9 AF5A 5A4A D4FD 8797"; } ];
+  };
   poweredbypie = {
     name = "poweredbypie";
     github = "poweredbypie";
diff --git a/pkgs/applications/terminal-emulators/st/siduck76-st.nix b/pkgs/applications/terminal-emulators/st/siduck76-st.nix
index d981ba481e59f..478c9b1ea7d58 100644
--- a/pkgs/applications/terminal-emulators/st/siduck76-st.nix
+++ b/pkgs/applications/terminal-emulators/st/siduck76-st.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/siduck76/st";
     description = "Fork of st with many add-ons";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ pouya ];
     platforms = platforms.linux;
   };
 }

From dbe6cd859a9ef0c7f01a11b875bda257ea4f6634 Mon Sep 17 00:00:00 2001
From: Pouya Abbassi <abbassi.pouya@gmail.com>
Date: Sun, 1 Dec 2024 20:30:12 +0330
Subject: [PATCH 066/340] st-snazzy: rename from siduck76-st

---
 .../manual/release-notes/rl-2505.section.md   |  3 ++
 .../terminal-emulators/st/siduck76-st.nix     | 52 -------------------
 pkgs/by-name/st/st-snazzy/package.nix         | 47 +++++++++++++++++
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  1 -
 5 files changed, 51 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/applications/terminal-emulators/st/siduck76-st.nix
 create mode 100644 pkgs/by-name/st/st-snazzy/package.nix

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index db753bbdf4ae4..3f1e22e8c2971 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -233,6 +233,9 @@
 
 - `programs.clash-verge.tunMode` was deprecated and removed because now service mode is neccessary to start program. Without `programs.clash-verge.enable`, clash-verge-rev will refuse to start.
 
+- `siduck76-st` has been renamed to `st-snazzy`, like the project's [flake](https://github.com/siduck/st/blob/main/flake.nix).
+
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
 ## Other Notable Changes {#sec-release-25.05-notable-changes}
diff --git a/pkgs/applications/terminal-emulators/st/siduck76-st.nix b/pkgs/applications/terminal-emulators/st/siduck76-st.nix
deleted file mode 100644
index 478c9b1ea7d58..0000000000000
--- a/pkgs/applications/terminal-emulators/st/siduck76-st.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fontconfig,
-  harfbuzz,
-  libX11,
-  libXext,
-  libXft,
-  ncurses,
-  pkg-config,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "siduck76-st";
-  version = "0.pre+unstable=2021-08-20";
-
-  src = fetchFromGitHub {
-    owner = "siduck76";
-    repo = "st";
-    rev = "c9bda1de1f3f94ba507fa0eacc96d6a4f338637f";
-    hash = "sha256-5n+QkSlVhhku7adtl7TuWhDl3zdwFaXc7Ot1RaIN54A=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-  buildInputs = [
-    fontconfig
-    harfbuzz
-    libX11
-    libXext
-    libXft
-    ncurses
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    TERMINFO=$out/share/terminfo make install PREFIX=$out
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/siduck76/st";
-    description = "Fork of st with many add-ons";
-    license = licenses.mit;
-    maintainers = with maintainers; [ pouya ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/st/st-snazzy/package.nix b/pkgs/by-name/st/st-snazzy/package.nix
new file mode 100644
index 0000000000000..2a947e1a81cd4
--- /dev/null
+++ b/pkgs/by-name/st/st-snazzy/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fontconfig,
+  harfbuzz,
+  libX11,
+  libXft,
+  ncurses,
+  gd,
+  glib,
+  pkg-config,
+}:
+
+stdenv.mkDerivation {
+  pname = "st-snazzy";
+  version = "0.8.5-unstable-2024-09-06";
+
+  src = fetchFromGitHub {
+    owner = "siduck";
+    repo = "st";
+    rev = "a7582f96afdee6bf0793cd0d8f84b755fd6aabf6";
+    hash = "sha256-wohkmDsm26kqFGQKuY6NuBQsifT7nZNgrLqLFsU+Vog=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    fontconfig
+    harfbuzz
+    libX11
+    libXft
+    ncurses
+    gd
+    glib
+  ];
+
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
+  env.TERMINFO = "${placeholder "out"}/share/terminfo";
+
+  meta = {
+    homepage = "https://github.com/siduck/st";
+    description = "snazzy terminal (suckless + beautiful)";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pouya ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2b5d5afbf31f3..4e017dd8154fa 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1183,6 +1183,7 @@ mapAliases {
   sexp = sexpp; # Added 2023-07-03
   inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17
   shipyard = jumppad; # Added 2023-06-06
+  siduck76-st = st-snazzy; # Added 2024-12-24
   signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain";
   shout = nodePackages.shout; # Added unknown; moved 2024-10-19
   sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7057e25505318..ed3751d5ef7d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1572,7 +1572,6 @@ with pkgs;
   };
   xst = callPackage ../applications/terminal-emulators/st/xst.nix { };
   mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { };
-  siduck76-st = callPackage ../applications/terminal-emulators/st/siduck76-st.nix { };
 
   stupidterm = callPackage ../applications/terminal-emulators/stupidterm {
     gtk = gtk3;

From 8ab80f48c7402639a82d991b82baf7970983770f Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Tue, 24 Dec 2024 00:42:36 +0000
Subject: [PATCH 067/340] linux/common-config: Make backlight device support
 built-in

---
 pkgs/os-specific/linux/kernel/common-config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 08b8456bf6e63..7e02ea2d540c2 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -461,6 +461,9 @@ let
 
         DRM_LEGACY = whenOlder "6.8" no;
 
+        # Must be the same as CONFIG_DRM
+        BACKLIGHT_CLASS_DEVICE = yes;
+
         NOUVEAU_LEGACY_CTX_SUPPORT = whenOlder "6.3" no;
 
         # Enable simpledrm and use it for generic framebuffer

From af22e6717b7e8c4a789f2b497a371f971e934d2e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 23 Dec 2024 22:46:38 -0600
Subject: [PATCH 068/340] neovim-require-check-hook: include check inputs

Currently only including the nativeCheckInputs, but it would be more
ergonomical to allow people to define checkInputs so they don't
accidentally disable the check phase.
---
 .../editors/vim/plugins/neovim-require-check-hook.sh        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh
index d5bd1c515451b..242db546e7664 100644
--- a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh
+++ b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh
@@ -51,7 +51,8 @@ run_require_checks() {
 
     export HOME="$TMPDIR"
     local deps="${dependencies[*]}"
-    local checks="${nativeBuildInputs[*]}"
+    local nativeCheckInputs="${nativeBuildInputs[*]}"
+    local checkInputs="${buildInputs[*]}"
     set +e
     for name in "${nvimRequireCheck[@]}"; do
         local skip=false
@@ -67,7 +68,8 @@ run_require_checks() {
             echo "Attempting to require module: $name"
             if @nvimBinary@ -es --headless -n -u NONE -i NONE --clean -V1 \
                 --cmd "set rtp+=$out,${deps// /,}" \
-                --cmd "set rtp+=$out,${checks// /,}" \
+                --cmd "set rtp+=$out,${nativeCheckInputs// /,}" \
+                --cmd "set rtp+=$out,${checkInputs// /,}" \
                 --cmd "lua require('$name')"; then
                 check_passed=true
                 successful_modules+=("$name")

From 93fb566bef1d73bc314d05886eadcfb8677ec896 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 23 Dec 2024 22:53:05 -0600
Subject: [PATCH 069/340] vimPlugins: nativeCheckInputs -> checkInputs

---
 .../editors/vim/plugins/overrides.nix         | 228 +++++++++---------
 1 file changed, 114 insertions(+), 114 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 8997249a61fbf..e062c2adef7f6 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -347,55 +347,55 @@ in
     nvimRequireCheck = "cmd-parser";
   };
 
-  cmp-ai = super.cmp-ai.overrideAttrs (oa: {
+  cmp-ai = super.cmp-ai.overrideAttrs {
     # We dont want to bundle nvim-cmp anymore since blink.nvim can use these sources.
     # Add to check inputs though to validate plugin
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+    checkInputs = [ self.nvim-cmp ];
     dependencies = with self; [
       plenary-nvim
     ];
-  });
+  };
 
-  cmp-async-path = super.cmp-async-path.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-async-path = super.cmp-async-path.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-beancount = super.cmp-beancount.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-beancount = super.cmp-beancount.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-clippy = super.cmp-clippy.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-clippy = super.cmp-clippy.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = with self; [
       plenary-nvim
     ];
-  });
+  };
 
-  cmp-cmdline = super.cmp-cmdline.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-cmdline = super.cmp-cmdline.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-conjure = super.cmp-conjure.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-conjure = super.cmp-conjure.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = [ self.conjure ];
-  });
+  };
 
-  cmp-copilot = super.cmp-copilot.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-copilot = super.cmp-copilot.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = [ self.copilot-vim ];
-  });
+  };
 
-  cmp-ctags = super.cmp-ctags.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-ctags = super.cmp-ctags.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-dap = super.cmp-dap.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-dap = super.cmp-dap.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = [ self.nvim-dap ];
-  });
+  };
 
-  cmp-dictionary = super.cmp-dictionary.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-dictionary = super.cmp-dictionary.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     nvimSkipModule = [
       # Test files
       "cmp_dictionary.dict.external_spec"
@@ -403,137 +403,137 @@ in
       "cmp_dictionary.lib.trie_spec"
       "cmp_dictionary.lib.unknown_spec"
     ];
-  });
+  };
 
-  cmp-digraphs = super.cmp-digraphs.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-digraphs = super.cmp-digraphs.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-fish = super.cmp-fish.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-fish = super.cmp-fish.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-fuzzy-buffer = super.cmp-fuzzy-buffer.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-fuzzy-buffer = super.cmp-fuzzy-buffer.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = [ self.fuzzy-nvim ];
-  });
+  };
 
-  cmp-fuzzy-path = super.cmp-fuzzy-path.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-fuzzy-path = super.cmp-fuzzy-path.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = [ self.fuzzy-nvim ];
-  });
+  };
 
-  cmp-git = super.cmp-git.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-git = super.cmp-git.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = with self; [ plenary-nvim ];
-  });
+  };
 
-  cmp-greek = super.cmp-greek.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-greek = super.cmp-greek.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-look = super.cmp-look.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-look = super.cmp-look.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp_luasnip = super.cmp_luasnip.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp_luasnip = super.cmp_luasnip.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = [ self.luasnip ];
-  });
+  };
 
-  cmp-neosnippet = super.cmp-neosnippet.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-neosnippet = super.cmp-neosnippet.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = [ self.neosnippet-vim ];
-  });
+  };
 
-  cmp-nixpkgs-maintainers = super.cmp-nixpkgs-maintainers.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-nixpkgs-maintainers = super.cmp-nixpkgs-maintainers.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-npm = super.cmp-npm.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-npm = super.cmp-npm.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = [ self.plenary-nvim ];
-  });
+  };
 
-  cmp-nvim-lsp-signature-help = super.cmp-nvim-lsp-signature-help.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-nvim-lsp-signature-help = super.cmp-nvim-lsp-signature-help.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-nvim-lua = super.cmp-nvim-lua.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-nvim-lua = super.cmp-nvim-lua.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-nvim-ultisnips = super.cmp-nvim-ultisnips.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-nvim-ultisnips = super.cmp-nvim-ultisnips.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = [ self.plenary-nvim ];
-  });
+  };
 
-  cmp-pandoc-references = super.cmp-pandoc-references.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-pandoc-references = super.cmp-pandoc-references.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-path = super.cmp-path.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-path = super.cmp-path.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-rg = super.cmp-rg.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-rg = super.cmp-rg.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-snippy = super.cmp-snippy.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-snippy = super.cmp-snippy.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = [ self.nvim-snippy ];
-  });
+  };
 
-  cmp-tabby = super.cmp-tabby.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-tabby = super.cmp-tabby.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-tabnine = super.cmp-tabnine.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-tabnine = super.cmp-tabnine.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     buildInputs = [ tabnine ];
 
     postFixup = ''
       mkdir -p $target/binaries/${tabnine.version}
       ln -s ${tabnine}/bin/ $target/binaries/${tabnine.version}/${tabnine.passthru.platform}
     '';
-  });
+  };
 
-  cmp-tmux = super.cmp-tmux.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-tmux = super.cmp-tmux.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = [ tmux ];
-  });
+  };
 
-  cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = [ self.vim-lsp ];
-  });
+  };
 
-  cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = [ self.vimwiki ];
-  });
+  };
 
-  cmp-vsnip = super.cmp-vsnip.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-vsnip = super.cmp-vsnip.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-vimtex = super.cmp-vimtex.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
-  });
+  cmp-vimtex = super.cmp-vimtex.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
 
-  cmp-zsh = super.cmp-zsh.overrideAttrs (oa: {
-    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.nvim-cmp ];
+  cmp-zsh = super.cmp-zsh.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
     dependencies = [ zsh ];
-  });
+  };
 
   cobalt2-nvim = super.cobalt2-nvim.overrideAttrs {
     dependencies = with self; [ colorbuddy-nvim ];

From 52d9872b0114dda4d163302c1d6a743f6ec92813 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 09:41:15 +0000
Subject: [PATCH 070/340] youtrack: 2024.3.53776 -> 2024.3.55417

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

diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix
index 8e7c8694c58a3..8cfc4c27347d4 100644
--- a/pkgs/by-name/yo/youtrack/package.nix
+++ b/pkgs/by-name/yo/youtrack/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "youtrack";
-  version = "2024.3.53776";
+  version = "2024.3.55417";
 
   src = fetchzip {
     url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip";
-    hash = "sha256-hTezfXdOvNsUiw60lnxLJLk39w39EdqnMzVQIjLCu3g=";
+    hash = "sha256-5ktWQZxrgoduQR9GOYnPK9kNGExpUDebKgBbhc+ImM8=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

From ac7f80ce0132a03d4b9042fe65173f1a14cc9e31 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 24 Dec 2024 12:17:11 +0100
Subject: [PATCH 071/340] gmp4: drop

No more usages in nixpkgs.
---
 pkgs/development/libraries/gmp/4.3.2.nix      | 95 -------------------
 .../libraries/gmp/need-size-t.patch           | 18 ----
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  1 -
 4 files changed, 1 insertion(+), 114 deletions(-)
 delete mode 100644 pkgs/development/libraries/gmp/4.3.2.nix
 delete mode 100644 pkgs/development/libraries/gmp/need-size-t.patch

diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix
deleted file mode 100644
index 00dbd620e3f22..0000000000000
--- a/pkgs/development/libraries/gmp/4.3.2.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  m4,
-  cxx ? true,
-}:
-
-let
-  self = stdenv.mkDerivation rec {
-    pname = "gmp";
-    version = "4.3.2";
-
-    src = fetchurl {
-      url = "mirror://gnu/gmp/gmp-${version}.tar.bz2";
-      sha256 = "0x8prpqi9amfcmi7r4zrza609ai9529pjaq0h4aw51i867064qck";
-    };
-
-    #outputs TODO: split $cxx due to libstdc++ dependency
-    # maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added
-    # - see #5855 for related discussion
-    outputs = [
-      "out"
-      "dev"
-      "info"
-    ];
-    passthru.static = self.out;
-
-    nativeBuildInputs = [ m4 ];
-
-    # Prevent the build system from using sub-architecture-specific
-    # instructions (e.g., SSE2 on i686).
-    #
-    # This is not a problem for Apple machines, which are all alike.  In
-    # addition, `configfsf.guess' would return `i386-apple-darwin10.2.0' on
-    # `x86_64-darwin', leading to a 32-bit ABI build, which is undesirable.
-    preConfigure =
-      if !stdenv.hostPlatform.isDarwin then
-        "ln -sf configfsf.guess config.guess"
-      else
-        ''echo "Darwin host is `./config.guess`."'';
-
-    configureFlags =
-      [
-        (lib.enableFeature cxx "cxx")
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        "ac_cv_build=x86_64-apple-darwin13.4.0"
-        "ac_cv_host=x86_64-apple-darwin13.4.0"
-      ];
-
-    # The test t-lucnum_ui fails (on Linux/x86_64) when built with GCC 4.8.
-    # Newer versions of GMP don't have that issue anymore.
-    doCheck = false;
-
-    meta = {
-      branch = "4";
-      description = "GNU multiple precision arithmetic library";
-
-      longDescription = ''
-        GMP is a free library for arbitrary precision arithmetic, operating
-        on signed integers, rational numbers, and floating point numbers.
-        There is no practical limit to the precision except the ones implied
-        by the available memory in the machine GMP runs on.  GMP has a rich
-        set of functions, and the functions have a regular interface.
-
-        The main target applications for GMP are cryptography applications
-        and research, Internet security applications, algebra systems,
-        computational algebra research, etc.
-
-        GMP is carefully designed to be as fast as possible, both for small
-        operands and for huge operands.  The speed is achieved by using
-        fullwords as the basic arithmetic type, by using fast algorithms,
-        with highly optimised assembly code for the most common inner loops
-        for a lot of CPUs, and by a general emphasis on speed.
-
-        GMP is faster than any other bignum library.  The advantage for GMP
-        increases with the operand sizes for many operations, since GMP uses
-        asymptotically faster algorithms.
-      '';
-
-      homepage = "https://gmplib.org/";
-      license = lib.licenses.lgpl3Plus;
-
-      maintainers = [ ];
-      platforms = lib.platforms.all;
-      badPlatforms = [ "x86_64-darwin" ];
-      # never built on aarch64-darwin, aarch64-linux since first introduction in nixpkgs
-      broken =
-        (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
-        || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
-    };
-  };
-in
-self
diff --git a/pkgs/development/libraries/gmp/need-size-t.patch b/pkgs/development/libraries/gmp/need-size-t.patch
deleted file mode 100644
index c4ba086182a90..0000000000000
--- a/pkgs/development/libraries/gmp/need-size-t.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/gmp-h.in b/gmp-h.in
-index 7deb67a..240d663 100644
---- a/gmp-h.in
-+++ b/gmp-h.in
-@@ -46,13 +46,11 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
- #ifndef __GNU_MP__
- #define __GNU_MP__ 5
- 
--#define __need_size_t  /* tell gcc stddef.h we only want size_t */
- #if defined (__cplusplus)
- #include <cstddef>     /* for size_t */
- #else
- #include <stddef.h>    /* for size_t */
- #endif
--#undef __need_size_t
- 
- /* Instantiated by configure. */
- #if ! defined (__GMP_WITHIN_CONFIGURE)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 05c5d2924793b..74f5e65ce3cb3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -472,6 +472,7 @@ mapAliases {
   glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08
   glxinfo = mesa-demos; # Added 2024-07-04
   gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2024-10-17
+  gmp4 = throw "'gmp4' is end-of-life, consider using 'gmp' instead"; # Added 2024-12-24
   gnatboot11 = gnat-bootstrap11;
   gnatboot12 = gnat-bootstrap12;
   gnatboot = gnat-bootstrap;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 854752910dd75..725a1a5dc8e3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9221,7 +9221,6 @@ with pkgs;
   gmime3 = callPackage ../development/libraries/gmime/3.nix { };
   gmime = gmime2;
 
-  gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions
   gmp6 = callPackage ../development/libraries/gmp/6.x.nix { };
   gmp = gmp6;
   gmpxx = gmp.override { cxx = true; };

From dfa982d67c8365ca5f9e7efc09443452f7d72b03 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Tue, 24 Dec 2024 09:50:35 -0500
Subject: [PATCH 072/340] lrzsz: fix build on gcc14

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

diff --git a/pkgs/by-name/lr/lrzsz/package.nix b/pkgs/by-name/lr/lrzsz/package.nix
index 375c485b9e75a..4b0d5c79cd760 100644
--- a/pkgs/by-name/lr/lrzsz/package.nix
+++ b/pkgs/by-name/lr/lrzsz/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--program-transform-name=s/^l//" ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration -Wno-error=implicit-int";
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=incompatible-pointer-types";
 
   meta = with lib; {
     homepage = "https://ohse.de/uwe/software/lrzsz.html";

From 7b7d8a3ecf1e2d6f21e8292b6bea3bd569bd7f6d Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Tue, 24 Dec 2024 12:42:53 -0500
Subject: [PATCH 073/340] awscli2: relax flit_core version pin

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

diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix
index d5b0118bf66b6..6a4df356ef15e 100644
--- a/pkgs/by-name/aw/awscli2/package.nix
+++ b/pkgs/by-name/aw/awscli2/package.nix
@@ -74,6 +74,7 @@ py.pkgs.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
+      --replace-fail 'flit_core>=3.7.1,<3.9.1' 'flit_core>=3.7.1' \
       --replace-fail 'awscrt>=0.19.18,<=0.22.0' 'awscrt>=0.22.0' \
       --replace-fail 'cryptography>=40.0.0,<43.0.2' 'cryptography>=43.0.0' \
       --replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \

From 8f8ffca8adb9cac9bf27a8f0ac58ca307d96f7b5 Mon Sep 17 00:00:00 2001
From: MilesCranmer <miles.cranmer@gmail.com>
Date: Tue, 24 Dec 2024 14:36:32 -0500
Subject: [PATCH 074/340] rip2: set up updateScript

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

diff --git a/pkgs/by-name/ri/rip2/package.nix b/pkgs/by-name/ri/rip2/package.nix
index c14b829c510b5..fcce093a2b230 100644
--- a/pkgs/by-name/ri/rip2/package.nix
+++ b/pkgs/by-name/ri/rip2/package.nix
@@ -5,6 +5,7 @@
   versionCheckHook,
   installShellFiles,
   stdenv,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -36,6 +37,8 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/rip completions zsh)
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Safe and ergonomic alternative to rm";
     homepage = "https://github.com/MilesCranmer/rip2";

From 4468ece95ce6e30c377cc663aaab008437390e0b Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 24 Dec 2024 22:52:02 +0100
Subject: [PATCH 075/340] ofono: Fix patch to work under GCC 14

---
 .../ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/of/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch b/pkgs/by-name/of/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch
index c1174e1093a80..8756816c3fc7e 100644
--- a/pkgs/by-name/of/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch
+++ b/pkgs/by-name/of/ofono/0001-Search-connectors-in-OFONO_PLUGIN_PATH.patch
@@ -26,7 +26,7 @@ index 924a45ec..f05055c3 100644
 -	gchar **excludes = NULL;
 -	GSList *list;
 -	GDir *dir;
-+static handle_dir(const gchar *plugin_path, const gchar **patterns, const gchar **excludes) {
++static void handle_dir(gchar *plugin_path, gchar **patterns, gchar **excludes) {
  	const gchar *file;
  	gchar *filename;
 -	unsigned int i;
@@ -105,7 +105,7 @@ index 924a45ec..f05055c3 100644
 +		plugin_path_list = g_strsplit (plugin_path, G_SEARCHPATH_SEPARATOR_S, 0);
 +
 +		for (i = 0; plugin_path_list[i]; i++) {
-+			handle_dir(plugin_path_list, patterns, excludes);
++			handle_dir(plugin_path_list[i], patterns, excludes);
 +		}
 +
 +		g_strfreev(plugin_path_list);

From d2d7c7e3e36eeeb3fd0756009533113c26d06c04 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 22 Nov 2024 00:04:52 +0000
Subject: [PATCH 076/340] ruff: Build as a standalone without Python

Using `buildPythonPackage` make `ruff` propagate the Python used for the build, which might not be the same Python as you want in your development shell.

https://github.com/NixOS/nixpkgs/pull/350654 changed the ruff top-level attribute to be built with Python modules.
This doesn't actually make much sense, we have versioned Python sets, and including just the one Python in the top-level package isn't helpful, and causes issues downstream related to PATH & PYTHONPATH.

See my related [uv PR](https://github.com/NixOS/nixpkgs/pull/357113#issue-2670270577).
---
 pkgs/by-name/ru/ruff-lsp/package.nix          |  2 +-
 pkgs/by-name/ru/ruff/package.nix              | 57 ++++++-------------
 .../python-modules/ruff/default.nix           | 35 ++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +-
 4 files changed, 54 insertions(+), 44 deletions(-)
 create mode 100644 pkgs/development/python-modules/ruff/default.nix

diff --git a/pkgs/by-name/ru/ruff-lsp/package.nix b/pkgs/by-name/ru/ruff-lsp/package.nix
index 97b905e340c3c..6214bb2d9332d 100644
--- a/pkgs/by-name/ru/ruff-lsp/package.nix
+++ b/pkgs/by-name/ru/ruff-lsp/package.nix
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec {
     pytestCheckHook
     pytest-asyncio
     python-lsp-jsonrpc
-    ruff.bin
+    ruff
     versionCheckHook
   ];
   versionCheckProgramArg = [ "--version" ];
diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index c9e2e78427f2c..662b7409ec8ec 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -1,11 +1,12 @@
 {
   lib,
   stdenv,
-  python3Packages,
-  fetchFromGitHub,
   rustPlatform,
+  fetchFromGitHub,
   installShellFiles,
+
   rust-jemalloc-sys,
+  buildPackages,
   versionCheckHook,
 
   # passthru
@@ -14,15 +15,9 @@
   nix-update-script,
 }:
 
-python3Packages.buildPythonPackage rec {
+rustPlatform.buildRustPackage rec {
   pname = "ruff";
   version = "0.8.4";
-  pyproject = true;
-
-  outputs = [
-    "bin"
-    "out"
-  ];
 
   src = fetchFromGitHub {
     owner = "astral-sh";
@@ -31,46 +26,29 @@ python3Packages.buildPythonPackage rec {
     hash = "sha256-c5d2XaoEjCHWMdjTLD6CnwP8rpSXTUrmKSs0QWQ6UG0=";
   };
 
-  # Do not rely on path lookup at runtime to find the ruff binary
-  postPatch = ''
-    substituteInPlace python/ruff/__main__.py \
-      --replace-fail \
-        'ruff_exe = "ruff" + sysconfig.get_config_var("EXE")' \
-        'return "${placeholder "bin"}/bin/ruff"'
-  '';
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-jbUjsIJRpkKYc+qHN8tkcZrcjPTFJfdCsatezzdX4Ss=";
 
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    hash = "sha256-jbUjsIJRpkKYc+qHN8tkcZrcjPTFJfdCsatezzdX4Ss=";
-  };
-
-  nativeBuildInputs =
-    [ installShellFiles ]
-    ++ (with rustPlatform; [
-      cargoSetupHook
-      maturinBuildHook
-      cargoCheckHook
-    ]);
+  nativeBuildInputs = [ installShellFiles ];
 
   buildInputs = [
     rust-jemalloc-sys
   ];
 
   postInstall =
+    let
+      emulator = stdenv.hostPlatform.emulator buildPackages;
+    in
     ''
-      mkdir -p $bin/bin
-      mv $out/bin/ruff $bin/bin/
-      rmdir $out/bin
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
       installShellCompletion --cmd ruff \
-        --bash <($bin/bin/ruff generate-shell-completion bash) \
-        --fish <($bin/bin/ruff generate-shell-completion fish) \
-        --zsh <($bin/bin/ruff generate-shell-completion zsh)
+        --bash <(${emulator} $out/bin/ruff generate-shell-completion bash) \
+        --fish <(${emulator} $out/bin/ruff generate-shell-completion fish) \
+        --zsh <(${emulator} $out/bin/ruff generate-shell-completion zsh)
     '';
 
   # Run cargo tests
-  cargoCheckType = "debug";
+  checkType = "debug";
+
   # tests do not appear to respect linker options on doctests
   # Upstream issue: https://github.com/rust-lang/cargo/issues/14189
   # This causes errors like "error: linker `cc` not found" on static builds
@@ -106,12 +84,11 @@ python3Packages.buildPythonPackage rec {
     "--skip=unix::symlink_inside_workspace"
   ];
 
-  nativeCheckInputs = [
+  nativeInstallCheckInputs = [
     versionCheckHook
   ];
   versionCheckProgramArg = [ "--version" ];
-
-  pythonImportsCheck = [ "ruff" ];
+  doInstallCheck = true;
 
   passthru = {
     tests =
diff --git a/pkgs/development/python-modules/ruff/default.nix b/pkgs/development/python-modules/ruff/default.nix
new file mode 100644
index 0000000000000..8f5efa9a240ba
--- /dev/null
+++ b/pkgs/development/python-modules/ruff/default.nix
@@ -0,0 +1,35 @@
+{
+  buildPythonPackage,
+  pkgs,
+  rustPlatform,
+  installShellFiles,
+}:
+
+buildPythonPackage {
+  inherit (pkgs.ruff)
+    pname
+    version
+    src
+    cargoDeps
+    postInstall
+    meta
+    ;
+
+  # Do not rely on path lookup at runtime to find the ruff binary
+  postPatch = ''
+    substituteInPlace python/ruff/__main__.py \
+      --replace-fail \
+        'ruff_exe = "ruff" + sysconfig.get_config_var("EXE")' \
+        'return "${placeholder "out"}/bin/ruff"'
+  '';
+
+  pyproject = true;
+
+  nativeBuildInputs = [
+    installShellFiles
+    rustPlatform.cargoSetupHook
+    rustPlatform.maturinBuildHook
+  ];
+
+  pythonImportsCheck = [ "ruff" ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1a026f7d4d414..87b860855f5d9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14282,9 +14282,7 @@ self: super: with self; {
 
   rubymarshal = callPackage ../development/python-modules/rubymarshal { };
 
-  ruff = toPythonModule (pkgs.ruff.override {
-    python3Packages = self;
-  });
+  ruff = callPackage ../development/python-modules/ruff { };
 
   ruff-api = callPackage ../development/python-modules/ruff-api { };
 

From 0a7c2ad53745bb281097dac77301ac66d1d26ce4 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss+git@proton.me>
Date: Wed, 25 Dec 2024 03:34:30 +0300
Subject: [PATCH 077/340] nak: 0.7.6 -> 0.9.1

---
 pkgs/by-name/na/nak/package.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/na/nak/package.nix b/pkgs/by-name/na/nak/package.nix
index 829f7f403b9b8..3fc481977f0d1 100644
--- a/pkgs/by-name/na/nak/package.nix
+++ b/pkgs/by-name/na/nak/package.nix
@@ -2,19 +2,21 @@
   lib,
   buildGo123Module,
   fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
 }:
 buildGo123Module rec {
   pname = "nak";
-  version = "0.7.6";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "fiatjaf";
     repo = "nak";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-VUSBCvDW53Z+mdAx0bUQIgcsiEwxOnm/FnnMcSC0iks=";
+    tag = "v${version}";
+    hash = "sha256-qfTqzsjRQXrLsL6+qXu2AacDmWbEMH6M1kgSPV3Eodg=";
   };
 
-  vendorHash = "sha256-alex1YEkviR5O0KLGZlOsf1i7s6m1C4LxHdJCogDCng=";
+  vendorHash = "sha256-zM9VFLD1CNI9UPvB+ow8KBUDCyoARUqLjumhvWfJvVA=";
 
   ldflags = [
     "-s"
@@ -25,10 +27,16 @@ buildGo123Module rec {
   # Integration tests fail (requires connection to relays)
   doCheck = false;
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = [ "--version" ];
+
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Command-line tool for Nostr things";
     homepage = "https://github.com/fiatjaf/nak";
-    changelog = "https://github.com/fiatjaf/nak/releases/tag/${version}";
+    changelog = "https://github.com/fiatjaf/nak/releases/tag/${src.tag}";
     license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ nartsiss ];
     mainProgram = "nak";

From 175a31ec1e6c199ecf7662e2746ef339e22c7e21 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 03:51:25 +0000
Subject: [PATCH 078/340] ryujinx-greemdev: 1.2.76 -> 1.2.78

---
 pkgs/by-name/ry/ryujinx-greemdev/deps.json   | 4 ++--
 pkgs/by-name/ry/ryujinx-greemdev/package.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ry/ryujinx-greemdev/deps.json b/pkgs/by-name/ry/ryujinx-greemdev/deps.json
index 47a26ba8453bb..3bf67f0e5549f 100644
--- a/pkgs/by-name/ry/ryujinx-greemdev/deps.json
+++ b/pkgs/by-name/ry/ryujinx-greemdev/deps.json
@@ -146,8 +146,8 @@
   },
   {
     "pname": "Gommon",
-    "version": "2.6.5",
-    "hash": "sha256-JpQs3FLEt3MThpmKmCkyCc/pXPwRPPGei92ONsOhzHo="
+    "version": "2.6.8",
+    "hash": "sha256-teKaZOJVjH2bJFQoD+hkCo/w62j6A7FM0ESkpT10rdI="
   },
   {
     "pname": "HarfBuzzSharp",
diff --git a/pkgs/by-name/ry/ryujinx-greemdev/package.nix b/pkgs/by-name/ry/ryujinx-greemdev/package.nix
index c24709132784b..1c69a3d92262d 100644
--- a/pkgs/by-name/ry/ryujinx-greemdev/package.nix
+++ b/pkgs/by-name/ry/ryujinx-greemdev/package.nix
@@ -30,13 +30,13 @@
 
 buildDotnetModule rec {
   pname = "ryujinx-greemdev";
-  version = "1.2.76";
+  version = "1.2.78";
 
   src = fetchFromGitHub {
     owner = "GreemDev";
     repo = "Ryujinx";
     rev = version;
-    hash = "sha256-RQbFN+XMEZtouUB7cvO3OdanUm6Is9V2L6q7dqzGQY4=";
+    hash = "sha256-kAF5Klve4132wSlFdkRqlpISpozRpZfCizEX1KvHc4I=";
   };
 
   nativeBuildInputs = lib.optional stdenv.isDarwin [

From ee6a81c0b1c87c67bc1aa7d215624ea34e070b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Wed, 25 Dec 2024 10:06:15 +0100
Subject: [PATCH 079/340] vm.debClosureGenerator: Add nixfmt

---
 pkgs/build-support/vm/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 0ea3e157c7e71..24617ec15fbf4 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -726,7 +726,7 @@ rec {
     {name, packagesLists, urlPrefix, packages}:
 
     runCommand "${name}.nix"
-      { nativeBuildInputs = [ buildPackages.perl buildPackages.dpkg ]; } ''
+      { nativeBuildInputs = [ buildPackages.perl buildPackages.dpkg pkgs.nixfmt-rfc-style ]; } ''
       for i in ${toString packagesLists}; do
         echo "adding $i..."
         case $i in
@@ -744,6 +744,7 @@ rec {
 
       perl -w ${deb/deb-closure.pl} \
         ./Packages ${urlPrefix} ${toString packages} > $out
+      nixfmt $out
     '';
 
 

From d0ac072de9dc4856c5f2208282a9c9c55b1bb6c2 Mon Sep 17 00:00:00 2001
From: Julius Michaelis <gitter@liftm.de>
Date: Wed, 25 Dec 2024 14:51:59 +0900
Subject: [PATCH 080/340] wol: fix build with GCC 14

---
 pkgs/by-name/wo/wol/gcc-14.patch | 68 ++++++++++++++++++++++++++++++++
 pkgs/by-name/wo/wol/package.nix  |  9 ++++-
 2 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/wo/wol/gcc-14.patch

diff --git a/pkgs/by-name/wo/wol/gcc-14.patch b/pkgs/by-name/wo/wol/gcc-14.patch
new file mode 100644
index 0000000000000..4c5ec895b3040
--- /dev/null
+++ b/pkgs/by-name/wo/wol/gcc-14.patch
@@ -0,0 +1,68 @@
+diff -Naur wol-0.7.1-orig/configure.ac wol-0.7.1/configure.ac
+--- wol-0.7.1-orig/configure.ac	2024-12-25 13:52:38.209314369 +0900
++++ wol-0.7.1/configure.ac	2024-12-25 14:49:28.351829162 +0900
+@@ -60,6 +60,14 @@
+ dnl check data types
+ AC_CHECK_SIZEOF(unsigned char, 1)
+ 
++
++dnl config.h.in defines defaults
++AC_DEFINE([HAVE_STRUCT_ETHER_ADDR], 0, [struct ether_addr])
++AC_DEFINE([HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET], 0, [struct ether_addr.ether_addr_octet])
++AC_DEFINE([HAVE_STRUCT_ETHER_ADDR_OCTET], 0, [struct ether_addr.octet])
++AC_DEFINE([HAVE_ETHER_HOSTTON], 0, [ether_hostton])
++
++
+ ether_includes=""
+ AC_CHECK_TYPE([struct ether_addr], , , [#include <netinet/ether.h>]) dnl Linux
+ if test "$ac_cv_type_struct_ether_addr" = "yes"; then
+@@ -241,13 +249,6 @@
+ dnl fi
+ 
+ 
+-dnl config.h.in defines
+-AC_DEFINE([HAVE_STRUCT_ETHER_ADDR], 0, [struct ether_addr])
+-AC_DEFINE([HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET], 0, [struct ether_addr.ether_addr_octet])
+-AC_DEFINE([HAVE_STRUCT_ETHER_ADDR_OCTET], 0, [struct ether_addr.octet])
+-AC_DEFINE([HAVE_ETHER_HOSTTON], 0, [ether_hostton])
+-
+-
+ dnl full featured warnings
+ CFLAGS="$CFLAGS -W -Wall -Wpointer-arith -Wimplicit-function-declaration"
+ 
+diff -Naur wol-0.7.1-orig/m4/getline.m4 wol-0.7.1/m4/getline.m4
+--- wol-0.7.1-orig/m4/getline.m4	2024-12-25 17:22:11.442627544 +0900
++++ wol-0.7.1/m4/getline.m4	2024-12-25 19:50:39.282552640 +0900
+@@ -27,7 +27,7 @@
+       if (!in)
+ 	return 1;
+       len = getline (&line, &siz, in);
+-      exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
++      return (len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1;
+     }
+     ], am_cv_func_working_getline=yes dnl The library version works.
+     , am_cv_func_working_getline=no dnl The library version does NOT work.
+diff -Naur wol-0.7.1-orig/m4/malloc.m4 wol-0.7.1/m4/malloc.m4
+--- wol-0.7.1-orig/m4/malloc.m4	2024-12-25 13:52:38.182314099 +0900
++++ wol-0.7.1/m4/malloc.m4	2024-12-25 14:31:34.627556193 +0900
+@@ -14,7 +14,7 @@
+ 
+  AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc,
+   [AC_TRY_RUN([
+-    char *malloc ();
++    #include <stdlib.h>
+     int
+     main ()
+     {
+diff -Naur wol-0.7.1-orig/m4/realloc.m4 wol-0.7.1/m4/realloc.m4
+--- wol-0.7.1-orig/m4/realloc.m4	2024-12-25 13:52:38.185314129 +0900
++++ wol-0.7.1/m4/realloc.m4	2024-12-25 14:36:55.421560103 +0900
+@@ -14,7 +14,7 @@
+ 
+  AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc,
+   [AC_TRY_RUN([
+-    char *realloc ();
++    #include <stdlib.h>
+     int
+     main ()
+     {
diff --git a/pkgs/by-name/wo/wol/package.nix b/pkgs/by-name/wo/wol/package.nix
index 31d64c88f06ba..ffc0ff554326c 100644
--- a/pkgs/by-name/wo/wol/package.nix
+++ b/pkgs/by-name/wo/wol/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  autoreconfHook,
   perl,
 }:
 
@@ -14,8 +15,12 @@ stdenv.mkDerivation rec {
     sha256 = "08i6l5lr14mh4n3qbmx6kyx7vjqvzdnh3j9yfvgjppqik2dnq270";
   };
 
-  # for pod2man in order to get a manpage
-  nativeBuildInputs = [ perl ];
+  patches = [ ./gcc-14.patch ];
+
+  nativeBuildInputs = [
+    perl # for pod2man in order to get a manpage
+    autoreconfHook # for the patch
+  ];
 
   enableParallelBuilding = true;
 

From 65e618753ce2d0cfde15e7aa5396e0fd01c3732b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 12:40:48 +0000
Subject: [PATCH 081/340] dep-tree: 0.23.0 -> 0.23.1

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

diff --git a/pkgs/by-name/de/dep-tree/package.nix b/pkgs/by-name/de/dep-tree/package.nix
index 5c276b5686ffa..57848ec9d392f 100644
--- a/pkgs/by-name/de/dep-tree/package.nix
+++ b/pkgs/by-name/de/dep-tree/package.nix
@@ -32,7 +32,7 @@ let
     };
   };
   pname = "dep-tree";
-  version = "0.23.0";
+  version = "0.23.1";
 in
 buildGoModule {
   inherit pname version;
@@ -41,7 +41,7 @@ buildGoModule {
     owner = "gabotechs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Vd6g9UE3XEFGjCK8tFfOphYcNx+zeBS9rBVz0MDLe1I=";
+    hash = "sha256-Y+zNx+p8xmM0L4C5IELtepm7TQDhpxOVzgc1HxdFa0w=";
   };
 
   vendorHash = "sha256-KoVOjZq+RrJ2gzLnANHPPtbEY1ztC0rIXWD9AXAxqMg=";

From 6fd8542b7662a6ee60d31219969bae8700b64a95 Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Wed, 25 Dec 2024 13:03:23 +0000
Subject: [PATCH 082/340] carl: init at 0.3.1

---
 pkgs/by-name/ca/carl/package.nix | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/ca/carl/package.nix

diff --git a/pkgs/by-name/ca/carl/package.nix b/pkgs/by-name/ca/carl/package.nix
new file mode 100644
index 0000000000000..2edda72c79514
--- /dev/null
+++ b/pkgs/by-name/ca/carl/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "carl";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "b1rger";
+    repo = "carl";
+    rev = "v${version}";
+    hash = "sha256-+l11eP+1qKrWbZhyUJgQ8FgQ+2rncx778F5RPzCfvV4=";
+  };
+
+  doCheck = false;
+
+  cargoHash = "sha256-nBl34szwEQX26MibfT10E55czYXN3/9W3y2z936KqTc=";
+
+  meta = {
+    description = "cal(1) with more features and written in rust";
+    longDescription = ''
+      Carl is a calendar for the commandline. It tries to mimic the various cal(1)
+      implementations out there, but also adds enhanced features like colors and ical
+      support
+    '';
+    homepage = "https://github.com/b1rger/carl";
+    changelog = "https://github.com/b1rger/carl/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ matthewcroughan ];
+    mainProgram = "carl";
+  };
+}

From e3efe0d4e3bd759df81e399433804036cec7d72e Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Wed, 25 Dec 2024 13:40:09 +0100
Subject: [PATCH 083/340] influxdb2: fix libflux compile with Rust 1.83

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/servers/nosql/influxdb2/default.nix      | 12 +++++++--
 .../nosql/influxdb2/rust_lifetime.patch       | 26 +++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/servers/nosql/influxdb2/rust_lifetime.patch

diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix
index 56277135f041d..61d4b8ec260b3 100644
--- a/pkgs/servers/nosql/influxdb2/default.nix
+++ b/pkgs/servers/nosql/influxdb2/default.nix
@@ -50,7 +50,14 @@ let
         hash = "sha256-6LOTgbOCfETNTmshyXgtDZf9y4t/2iqRuVPkz9dYPHc=";
       })
       ./fix-unsigned-char.patch
+      # https://github.com/influxdata/flux/pull/5516
+      ./rust_lifetime.patch
     ];
+    # Don't fail on missing code documentation
+    postPatch = ''
+      substituteInPlace flux-core/src/lib.rs \
+        --replace-fail "deny(warnings, missing_docs))]" "deny(warnings))]"
+    '';
     sourceRoot = "${src.name}/libflux";
     cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA=";
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
@@ -74,7 +81,6 @@ let
         install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
       '';
   };
-
 in
 buildGoModule {
   pname = "influxdb";
@@ -132,7 +138,9 @@ buildGoModule {
     "-X main.version=${version}"
   ];
 
-  passthru.tests = { inherit (nixosTests) influxdb2; };
+  passthru.tests = {
+    inherit (nixosTests) influxdb2;
+  };
 
   meta = with lib; {
     description = "Open-source distributed time series database";
diff --git a/pkgs/servers/nosql/influxdb2/rust_lifetime.patch b/pkgs/servers/nosql/influxdb2/rust_lifetime.patch
new file mode 100644
index 0000000000000..7680f287e217d
--- /dev/null
+++ b/pkgs/servers/nosql/influxdb2/rust_lifetime.patch
@@ -0,0 +1,26 @@
+diff --git a/flux-core/src/ast/walk/mod.rs b/flux-core/src/ast/walk/mod.rs
+index 90f70ba6f7..a6966827e8 100644
+--- a/flux-core/src/ast/walk/mod.rs
++++ b/flux-core/src/ast/walk/mod.rs
+@@ -180,7 +180,7 @@ impl<'a> Node<'a> {
+ 
+ impl<'a> Node<'a> {
+     #[allow(missing_docs)]
+-    pub fn from_expr(expr: &'a Expression) -> Node {
++    pub fn from_expr(expr: &'a Expression) -> Node<'a> {
+         match expr {
+             Expression::Identifier(e) => Node::Identifier(e),
+             Expression::Array(e) => Node::ArrayExpr(e),
+diff --git a/flux-core/src/parser/mod.rs b/flux-core/src/parser/mod.rs
+index ac7d4b9a72..561c3a0ff6 100644
+--- a/flux-core/src/parser/mod.rs
++++ b/flux-core/src/parser/mod.rs
+@@ -41,7 +41,7 @@ pub struct Parser<'input> {
+ 
+ impl<'input> Parser<'input> {
+     /// Instantiates a new parser with the given string as input.
+-    pub fn new(src: &'input str) -> Parser {
++    pub fn new(src: &'input str) -> Parser<'input> {
+         let s = Scanner::new(src);
+         Parser {
+             s,

From fc4e2d36f29655238a470e43c909ead69bc11931 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Wed, 25 Dec 2024 14:00:32 +0100
Subject: [PATCH 084/340] influxdb: fix build with Rust 1.83

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/servers/nosql/influxdb/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix
index 030590dabe0c8..efd6a31d3baa8 100644
--- a/pkgs/servers/nosql/influxdb/default.nix
+++ b/pkgs/servers/nosql/influxdb/default.nix
@@ -34,7 +34,14 @@ let
         hash = "sha256-6LOTgbOCfETNTmshyXgtDZf9y4t/2iqRuVPkz9dYPHc=";
       })
       ../influxdb2/fix-unsigned-char.patch
+      # https://github.com/influxdata/flux/pull/5516
+      ../influxdb2/rust_lifetime.patch
     ];
+    # Don't fail on missing code documentation
+    postPatch = ''
+      substituteInPlace flux-core/src/lib.rs \
+        --replace-fail "deny(warnings, missing_docs))]" "deny(warnings))]"
+    '';
     sourceRoot = "${src.name}/libflux";
     cargoHash = "sha256-O+t4f4P5291BuyARH6Xf3LejMFEQEBv+qKtyjHRhclA=";
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
@@ -95,7 +102,9 @@ buildGoModule rec {
 
   excludedPackages = "test";
 
-  passthru.tests = { inherit (nixosTests) influxdb; };
+  passthru.tests = {
+    inherit (nixosTests) influxdb;
+  };
 
   meta = with lib; {
     description = "Open-source distributed time series database";

From 220d9afc41800c297dbc5e8887a0b42e73ebb761 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 25 Dec 2024 15:31:27 +0100
Subject: [PATCH 085/340] libvdwxc: fix build with gcc-14

---
 pkgs/by-name/li/libvdwxc/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libvdwxc/package.nix b/pkgs/by-name/li/libvdwxc/package.nix
index 63c47dc481a52..8b4d9b17b2d43 100644
--- a/pkgs/by-name/li/libvdwxc/package.nix
+++ b/pkgs/by-name/li/libvdwxc/package.nix
@@ -30,10 +30,12 @@ stdenv.mkDerivation rec {
     fftwMpi
   ];
 
+  # Required for compilation with gcc-14
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
   preConfigure = ''
     mkdir build && cd build
 
-    export PATH=$PATH:${mpi}/bin
     configureFlagsArray+=(
       --with-mpi=${lib.getDev mpi}
       CC=mpicc

From f96f1bc474e0d15c86b16c5923bc6e68e567ad07 Mon Sep 17 00:00:00 2001
From: lilly <li@lly.sh>
Date: Sun, 22 Dec 2024 17:31:33 +0100
Subject: [PATCH 086/340] ietf-cli: init at v1.27

Command-line interface for accessing IETF documents and other information
via a local offline copy.
---
 pkgs/by-name/ie/ietf-cli/package.nix | 39 ++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/ie/ietf-cli/package.nix

diff --git a/pkgs/by-name/ie/ietf-cli/package.nix b/pkgs/by-name/ie/ietf-cli/package.nix
new file mode 100644
index 0000000000000..672550b6baff4
--- /dev/null
+++ b/pkgs/by-name/ie/ietf-cli/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3,
+  rsync,
+  nix-update-script,
+}:
+python3.pkgs.buildPythonApplication rec {
+  name = "ietf-cli";
+  version = "1.27";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "paulehoffman";
+    repo = "ietf-cli";
+    tag = version;
+    hash = "sha256-D62E0aHVwB2e+3ZNNMOB2E93Q2WKhbWrYtnH76ZOepM=";
+  };
+  buildInputs = [ rsync ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 ./ietf -t $out/bin
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Command-line interface for accessing IETF documents and other information";
+    mainProgram = "ietf";
+    homepage = "https://github.com/paulehoffman/ietf-cli";
+    license = lib.licenses.wtfpl;
+    maintainers = with lib.maintainers; [ lilioid ];
+    platforms = lib.lists.intersectLists python3.meta.platforms rsync.meta.platforms;
+  };
+}

From 7054001387eebc73f2232ae35b92288e58ddd2dc Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Wed, 25 Dec 2024 16:24:28 +0100
Subject: [PATCH 087/340] spice-gtk: fix darwin build

fixes the error clang: error: unknown argument: '-export-symbols'
and also unknown argument --version-script=[...]

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/by-name/sp/spice-gtk/package.nix | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/sp/spice-gtk/package.nix b/pkgs/by-name/sp/spice-gtk/package.nix
index 182946d721bf1..5dc9fa557a6b2 100644
--- a/pkgs/by-name/sp/spice-gtk/package.nix
+++ b/pkgs/by-name/sp/spice-gtk/package.nix
@@ -155,17 +155,24 @@ stdenv.mkDerivation rec {
       "-Dcoroutine=gthread" # Fixes "Function missing:makecontext"
     ];
 
-  postPatch = ''
-    # get rid of absolute path to helper in store so we can use a setuid wrapper
-    substituteInPlace src/usb-acl-helper.c \
-      --replace 'ACL_HELPER_PATH"/' '"'
-    # don't try to setcap/suid in a nix builder
-    substituteInPlace src/meson.build \
-      --replace "meson.add_install_script('../build-aux/setcap-or-suid'," \
-      "# meson.add_install_script('../build-aux/setcap-or-suid',"
+  postPatch =
+    ''
+      # get rid of absolute path to helper in store so we can use a setuid wrapper
+      substituteInPlace src/usb-acl-helper.c \
+        --replace-fail 'ACL_HELPER_PATH"/' '"'
+      # don't try to setcap/suid in a nix builder
+      substituteInPlace src/meson.build \
+        --replace-fail "meson.add_install_script('../build-aux/setcap-or-suid'," \
+        "# meson.add_install_script('../build-aux/setcap-or-suid',"
 
-    patchShebangs subprojects/keycodemapdb/tools/keymap-gen
-  '';
+      patchShebangs subprojects/keycodemapdb/tools/keymap-gen
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # don't use version script and don't export symbols
+      substituteInPlace src/meson.build \
+        --replace-fail "spice_gtk_version_script = [" "# spice_gtk_version_script = [" \
+        --replace-fail ",--version-script=@0@'.format(spice_client_glib_syms_path)" "'"
+    '';
 
   meta = with lib; {
     description = "GTK 3 SPICE widget";

From 79364694794f80f7cbd25a36e513c8b8bc4d0cfe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 16:39:46 +0000
Subject: [PATCH 088/340] enzyme: 0.0.168 -> 0.0.170

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

diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix
index a6922d67037b2..5deaeefbf88ad 100644
--- a/pkgs/by-name/en/enzyme/package.nix
+++ b/pkgs/by-name/en/enzyme/package.nix
@@ -7,13 +7,13 @@
 }:
 llvmPackages.stdenv.mkDerivation rec {
   pname = "enzyme";
-  version = "0.0.168";
+  version = "0.0.170";
 
   src = fetchFromGitHub {
     owner = "EnzymeAD";
     repo = "Enzyme";
     rev = "v${version}";
-    hash = "sha256-Pnx+eC2JSs0BSN6cXD44hjY9LM9EmUf7bZNfiJOIRJU=";
+    hash = "sha256-8ljzf/opZnZMOcXi5IBMiS2KYlvIjrtSq/Aee2/IUdU=";
   };
 
   postPatch = ''

From ddb93698c9806b5f7f4724aecdbcc406dfeed7cf Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 25 Dec 2024 18:44:41 +0100
Subject: [PATCH 089/340] nwchem: fix build with gcc-14

---
 pkgs/applications/science/chemistry/nwchem/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix
index cc80ad3c67ec0..282a53996e6b1 100644
--- a/pkgs/applications/science/chemistry/nwchem/default.nix
+++ b/pkgs/applications/science/chemistry/nwchem/default.nix
@@ -147,6 +147,9 @@ stdenv.mkDerivation rec {
     runHook postConfigure
   '';
 
+  # Required for build with gcc-14
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int";
+
   enableParallelBuilding = true;
 
   preBuild = ''

From b33f01b7cc533fb71fead70fd6ea05789a01053d Mon Sep 17 00:00:00 2001
From: Yuri Albuquerque <yuridenommus@gmail.com>
Date: Sat, 21 Dec 2024 19:10:45 -0300
Subject: [PATCH 090/340] ocamlPackages.ocamlformat-mlx-lib: init at 0.26.2.0

---
 .../ocaml-modules/ocamlformat-mlx/lib.nix     | 70 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  4 ++
 2 files changed, 74 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocamlformat-mlx/lib.nix

diff --git a/pkgs/development/ocaml-modules/ocamlformat-mlx/lib.nix b/pkgs/development/ocaml-modules/ocamlformat-mlx/lib.nix
new file mode 100644
index 0000000000000..7b2f4626b18e3
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocamlformat-mlx/lib.nix
@@ -0,0 +1,70 @@
+{
+  lib,
+  buildDunePackage,
+  fetchFromGitHub,
+  menhir,
+  alcotest,
+  base,
+  dune-build-info,
+  either,
+  fix,
+  fpath,
+  menhirLib,
+  menhirSdk,
+  ocaml-version,
+  ocamlformat-rpc-lib,
+  ocp-indent,
+  stdio,
+  uuseg,
+  csexp,
+  astring,
+  result,
+  camlp-streams,
+  odoc,
+}:
+buildDunePackage rec {
+  pname = "ocamlformat-mlx-lib";
+  version = "0.26.2.0";
+  minimalOcamlVersion = "4.08";
+
+  src = fetchFromGitHub {
+    owner = "ocaml-mlx";
+    repo = "ocamlformat-mlx";
+    rev = version;
+    hash = "sha256-I9ZP8Ory/CRFbHUCe5NkZKKYMwtL1gl8xw965k5R718=";
+  };
+
+  propagatedBuildInputs = [
+    alcotest
+    base
+    dune-build-info
+    either
+    fix
+    fpath
+    menhirLib
+    menhirSdk
+    ocaml-version
+    ocamlformat-rpc-lib
+    ocp-indent
+    stdio
+    uuseg
+    csexp
+    astring
+    result
+    camlp-streams
+    odoc
+  ];
+
+  nativeBuildInputs = [
+    menhir
+  ];
+
+  meta = {
+    homepage = "https://github.com/ocaml-mlx/ocamlformat-mlx";
+    description = "OCaml .mlx Code Formatter";
+    maintainers = with lib.maintainers; [
+      Denommus
+    ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 1eb7e48874fd4..990fb8888e777 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1349,6 +1349,10 @@ let
 
     ocamlformat-lib = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-lib.nix { };
 
+    ocamlformat-mlx = callPackage ../development/ocaml-modules/ocamlformat-mlx/ocamlformat-mlx.nix { };
+
+    ocamlformat-mlx-lib = callPackage ../development/ocaml-modules/ocamlformat-mlx/lib.nix { };
+
     ocamlformat-rpc-lib = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix { };
 
     ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { };

From 66353ae21cf168861f90e3f53654bc9c24632ee6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Dec 2024 20:30:32 +0000
Subject: [PATCH 091/340] linuxPackages.corefreq: 1.98.7 -> 2.0.0

---
 pkgs/os-specific/linux/corefreq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/corefreq/default.nix b/pkgs/os-specific/linux/corefreq/default.nix
index 0f716e1456305..406da48fc8060 100644
--- a/pkgs/os-specific/linux/corefreq/default.nix
+++ b/pkgs/os-specific/linux/corefreq/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "corefreq";
-  version = "1.98.7";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "cyring";
     repo = "CoreFreq";
     rev = version;
-    hash = "sha256-/kvDwIEUbcO80keG3w3x3IfLaXbrbaptUAJxvDh5rlY=";
+    hash = "sha256-onpr9SsoYifomdSijZ2M5cSShfs8s2q9cbVYN4g3bBo=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

From dcb06064e0b27d00b436545d6b21cc24155f6c2e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 25 Dec 2024 21:54:57 +0100
Subject: [PATCH 092/340] pcmsolver: fix build with gcc-14

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

diff --git a/pkgs/by-name/pc/pcmsolver/package.nix b/pkgs/by-name/pc/pcmsolver/package.nix
index 7572e14c3dfd2..3f4ffd2bd9a97 100644
--- a/pkgs/by-name/pc/pcmsolver/package.nix
+++ b/pkgs/by-name/pc/pcmsolver/package.nix
@@ -42,6 +42,9 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
+  # Required for build with gcc-14
+  env.NIX_CFLAGS_COMPILE = "-std=c++14";
+
   cmakeFlags = [ "-DENABLE_OPENMP=ON" ];
 
   hardeningDisable = [ "format" ];

From 3ffc71f08dd5c469d465936404c43f8bb4e2ed35 Mon Sep 17 00:00:00 2001
From: GGG <gggkiller2@gmail.com>
Date: Tue, 24 Dec 2024 03:03:25 -0300
Subject: [PATCH 093/340] dotnetCorePackages.dotnet_{8,9}.vmr: switch CDN URL

As it was announced in dotnet/announcements#336, the CDN for .NET assets is changing, so change those ahead of time.
---
 pkgs/development/compilers/dotnet/8/release-info.json | 2 +-
 pkgs/development/compilers/dotnet/9/release-info.json | 2 +-
 pkgs/development/compilers/dotnet/update.nix          | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/dotnet/8/release-info.json b/pkgs/development/compilers/dotnet/8/release-info.json
index 23c2cf157a1e7..abdf026372813 100644
--- a/pkgs/development/compilers/dotnet/8/release-info.json
+++ b/pkgs/development/compilers/dotnet/8/release-info.json
@@ -1,5 +1,5 @@
 {
   "tarballHash": "sha256-18s4O7+iD4bghWFas9y3aeXJr3Mw2Qg0zjSImFe9kuU=",
-  "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.110-servicing.24474.1.centos.9-x64.tar.gz",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.110-servicing.24474.1.centos.9-x64.tar.gz",
   "artifactsHash": "sha256-I2Kwk7j8Moc5SoDtaBFY7+vCO9IgaSFejVFeUdwEhrA="
 }
diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json
index 16f6e69ac23b0..875d7d5284a55 100644
--- a/pkgs/development/compilers/dotnet/9/release-info.json
+++ b/pkgs/development/compilers/dotnet/9/release-info.json
@@ -1,5 +1,5 @@
 {
   "tarballHash": "sha256-LhnsYVr+I+MY0Vu3y86rsAs8j7jNyo06SguY6uZkEcc=",
-  "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-rc.2.24474.1.centos.9-x64.tar.gz",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.100-rc.2.24474.1.centos.9-x64.tar.gz",
   "artifactsHash": "sha256-Cxjdi7vISz2wMT22o4ZOEd9RdmKHI8PO/JgH1YJWsVo="
 }
diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix
index 2a91d1fcfddc7..38b08b85879ec 100644
--- a/pkgs/development/compilers/dotnet/update.nix
+++ b/pkgs/development/compilers/dotnet/update.nix
@@ -123,12 +123,13 @@ writeScript "update-dotnet-vmr.sh" ''
           | .[] | .PrivateSourceBuiltArtifactsVersion' eng/Versions.props)
 
       if [[ "$artifactsVersion" != "" ]]; then
-          artifactsUrl=https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.$artifactsVersion.centos.9-x64.tar.gz
+          artifactsUrl=https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.$artifactsVersion.centos.9-x64.tar.gz
       else
           artifactsUrl=$(xq -r '.Project.PropertyGroup |
               map(select(.PrivateSourceBuiltArtifactsUrl))
               | .[] | .PrivateSourceBuiltArtifactsUrl' eng/Versions.props)
       fi
+      artifactsUrl="''${artifactsUrl/dotnetcli.azureedge.net/builds.dotnet.microsoft.com}"
 
       artifactsHash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$artifactsUrl")")
 

From 5d704b31b508e7c208e365a36493b9dd7a0d0964 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 05:02:50 +0000
Subject: [PATCH 094/340] vscode-extensions.chenglou92.rescript-vscode: 1.58.0
 -> 1.60.0

---
 .../vscode/extensions/chenglou92.rescript-vscode/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix
index 508d2ce2c5a4c..e630b5c674d04 100644
--- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix
@@ -5,7 +5,7 @@
   callPackage,
 }:
 let
-  version = "1.58.0";
+  version = "1.60.0";
   rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; };
   arch =
     if stdenv.hostPlatform.isLinux then
@@ -21,7 +21,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
     name = "rescript-vscode";
     publisher = "chenglou92";
     inherit version;
-    hash = "sha256-EuEBbtdCaS4l8ykkxyLLMjEnUMs0IsXoc994a8Pw1Ws=";
+    hash = "sha256-1jdjSxho7TRADAxs4ccLw7Ea430f+L5aBlLDlUwvXHk=";
   };
   postPatch = ''
     rm -r ${analysisDir}

From 352c0b9cd97d6d705f213fab3cdb363e5bcfdd3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christina=20S=C3=B8rensen?= <ces@fem.gg>
Date: Thu, 26 Dec 2024 10:18:10 +0100
Subject: [PATCH 095/340] eza: 0.20.13 -> 0.20.14

changelog: https://github.com/eza-community/eza/releases/tag/v0.20.14
---
 pkgs/by-name/ez/eza/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix
index f6fa8b85e868d..db32be221bc0b 100644
--- a/pkgs/by-name/ez/eza/package.nix
+++ b/pkgs/by-name/ez/eza/package.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "eza";
-  version = "0.20.13";
+  version = "0.20.14";
 
   src = fetchFromGitHub {
     owner = "eza-community";
     repo = "eza";
     rev = "v${version}";
-    hash = "sha256-5+L0YSh/FLixCMlb8CpXCMBHIL1wIOo9WOpcRemTpCg=";
+    hash = "sha256-5sZlpJ7xzQsjvECN4pjPndM39qonbgNy4zew6AE06D0=";
   };
 
-  cargoHash = "sha256-kkn2NuPYdXdIoK4mrM1aPzDVN8ByeMBMW+ewnyj96j4=";
+  cargoHash = "sha256-A8vE2Q/HEMgX6HC+nwR63Kr84gy2iZ5BzYDzaZz/h9Q=";
 
   nativeBuildInputs = [
     cmake

From b8f8d83d5c1e014f22c775d832347c367571fcf4 Mon Sep 17 00:00:00 2001
From: Philip Abernethy <gitlab.rddlf@slmails.com>
Date: Wed, 25 Dec 2024 22:57:08 +0100
Subject: [PATCH 096/340] goverlay: sort arguments alphabetically

---
 pkgs/tools/graphics/goverlay/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix
index b7521527c3732..ae0beb65cc65f 100644
--- a/pkgs/tools/graphics/goverlay/default.nix
+++ b/pkgs/tools/graphics/goverlay/default.nix
@@ -1,28 +1,28 @@
 {
   lib,
-  writeScriptBin,
-  bash,
   stdenv,
   fetchFromGitHub,
+  bash,
+  breeze-qt5,
+  coreutils,
   fpc,
+  git,
+  gnugrep,
   lazarus-qt5,
-  wrapQtAppsHook,
-  breeze-qt5,
   libGL,
   libGLU,
+  libnotify,
   libqtpas,
   libX11,
-  coreutils,
-  git,
-  gnugrep,
-  libnotify,
+  nix-update-script,
   polkit,
   procps,
   systemd,
   util-linux,
   vulkan-tools,
   which,
-  nix-update-script,
+  wrapQtAppsHook,
+  writeScriptBin,
 }:
 
 let

From b6b5cedf0f500b4125f50839091c9c8b03ff600b Mon Sep 17 00:00:00 2001
From: Yuri Albuquerque <yuridenommus@gmail.com>
Date: Sat, 21 Dec 2024 19:27:04 -0300
Subject: [PATCH 097/340] ocamlPackages.ocamlformat-mlx: init at 0.26.2.0

---
 .../ocaml-modules/ocamlformat-mlx/default.nix | 22 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/ocamlformat-mlx/default.nix

diff --git a/pkgs/development/ocaml-modules/ocamlformat-mlx/default.nix b/pkgs/development/ocaml-modules/ocamlformat-mlx/default.nix
new file mode 100644
index 0000000000000..a198a7a36f6b4
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocamlformat-mlx/default.nix
@@ -0,0 +1,22 @@
+{
+  lib,
+  buildDunePackage,
+  fetchFromGitHub,
+  cmdliner,
+  odoc,
+  ocamlformat-mlx-lib,
+  re,
+}:
+buildDunePackage rec {
+  pname = "ocamlformat-mlx";
+  minimalOcamlVersion = "4.08";
+
+  inherit (ocamlformat-mlx-lib) version src meta;
+
+  buildInputs = [
+    cmdliner
+    re
+    odoc
+    ocamlformat-mlx-lib
+  ];
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 990fb8888e777..bdb87c70e090b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1349,7 +1349,7 @@ let
 
     ocamlformat-lib = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-lib.nix { };
 
-    ocamlformat-mlx = callPackage ../development/ocaml-modules/ocamlformat-mlx/ocamlformat-mlx.nix { };
+    ocamlformat-mlx = callPackage ../development/ocaml-modules/ocamlformat-mlx { };
 
     ocamlformat-mlx-lib = callPackage ../development/ocaml-modules/ocamlformat-mlx/lib.nix { };
 

From be157625b60a2b98adf893a4dfb3d560d201b0e9 Mon Sep 17 00:00:00 2001
From: Yuri Albuquerque <yuridenommus@gmail.com>
Date: Wed, 25 Dec 2024 16:53:17 -0300
Subject: [PATCH 098/340] ocamlPackages.odds: init at 1.2

---
 .../ocaml-modules/odds/default.nix            | 35 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/odds/default.nix

diff --git a/pkgs/development/ocaml-modules/odds/default.nix b/pkgs/development/ocaml-modules/odds/default.nix
new file mode 100644
index 0000000000000..2c2d58978090f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/odds/default.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildDunePackage,
+  menhir,
+  cmdliner,
+}:
+buildDunePackage rec {
+  pname = "odds";
+  version = "1.2";
+
+  minimalOcamlVersion = "5.0.0";
+
+  src = fetchFromGitHub {
+    owner = "raphael-proust";
+    repo = pname;
+    tag = version;
+    hash = "sha256-tPDowkpsJQKCoeuXOb9zPORoudUvkRBZ3OzkH2QE2zg=";
+  };
+
+  propagatedBuildInputs = [
+    cmdliner
+  ];
+
+  nativeBuildInputs = [
+    menhir
+  ];
+
+  meta = {
+    description = "Dice roller";
+    homepage = "https://github.com/raphael-proust/odds";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.Denommus ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 1eb7e48874fd4..b9e08714dce32 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1408,6 +1408,8 @@ let
 
     odate = callPackage ../development/ocaml-modules/odate { };
 
+    odds = callPackage ../development/ocaml-modules/odds { };
+
     odig = callPackage ../development/ocaml-modules/odig { };
 
     odoc = callPackage ../development/ocaml-modules/odoc { };

From 276c474e0a0d70df946e63127100192f49ad3a28 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 24 Dec 2024 13:22:11 +0000
Subject: [PATCH 099/340] xfce.xfce4-battery-plugin: 1.1.5 -> 1.1.6

https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin/-/compare/xfce4-battery-plugin-1.1.5...xfce4-battery-plugin-1.1.6
---
 .../xfce/panel-plugins/xfce4-battery-plugin/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix
index 24b1d3e81e5cf..65a1d5a0963d7 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix
@@ -12,10 +12,10 @@
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-battery-plugin";
-  version = "1.1.5";
+  version = "1.1.6";
   rev-prefix = "xfce4-battery-plugin-";
   odd-unstable = false;
-  sha256 = "sha256-X5EGDZaPZdTxiLXyeLwnMx97P6wPy+H09hi9+OFYyY0=";
+  sha256 = "sha256-tbI4zg6BFsPzREbh/tdFiEbZVXkAsblxzcZdIaQIqa0=";
 
   buildInputs = [
     glib

From dfa87c4df956938810f9c6d2eb22086f3b626eaa Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 24 Dec 2024 13:23:48 +0000
Subject: [PATCH 100/340] xfce.xfce4-clipman-plugin: 1.6.6 -> 1.6.7

https://gitlab.xfce.org/panel-plugins/xfce4-clipman-plugin/-/compare/xfce4-clipman-plugin-1.6.6...xfce4-clipman-plugin-1.6.7
---
 .../xfce/panel-plugins/xfce4-clipman-plugin/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
index 6f64560ac3702..f146ad78a6b94 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
@@ -18,8 +18,8 @@
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-clipman-plugin";
-  version = "1.6.6";
-  sha256 = "sha256-wdEoM4etco+s0+dULkBvWJZ3WBCW3Ph2bdY0E/l5VRc=";
+  version = "1.6.7";
+  sha256 = "sha256-kbcA1X5LBnk1FcrhVqpCENp5bleJga2jnCh1RltN72o=";
 
   nativeBuildInputs = [
     wayland-scanner

From 2dd850d871b0668b8cd6737d97d89b66f7558163 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 26 Dec 2024 14:13:52 +0000
Subject: [PATCH 101/340] xfce.xfce4-cpufreq-plugin: 1.2.8 -> 1.2.9

https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/compare/xfce4-cpufreq-plugin-1.2.8...xfce4-cpufreq-plugin-1.2.9
---
 .../xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
index b65538b57b5c2..659e8bb3060c1 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
@@ -11,8 +11,8 @@
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-cpufreq-plugin";
-  version = "1.2.8";
-  sha256 = "sha256-wEVv3zBS9PRLOMusFPzTnffVDvTaBnTCyGjstJRQRCo=";
+  version = "1.2.9";
+  sha256 = "sha256-WC419ZRQAnV+yNbdWH5lMt4RGvQb7zv2dqQdTE2kIFU=";
 
   buildInputs = [
     gtk3

From 010d604662824056bd446f8dd11ac10e5a7ef307 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 26 Dec 2024 14:14:18 +0000
Subject: [PATCH 102/340] xfce.xfce4-cpugraph-plugin: 1.2.10 -> 1.2.11

https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/compare/xfce4-cpugraph-plugin-1.2.10...xfce4-cpugraph-plugin-1.2.11
---
 .../xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix
index 080a287997fe2..261b770a57c0b 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix
@@ -15,10 +15,10 @@
 mkXfceDerivation rec {
   category = "panel-plugins";
   pname = "xfce4-cpugraph-plugin";
-  version = "1.2.10";
+  version = "1.2.11";
   rev-prefix = "xfce4-cpugraph-plugin-";
   odd-unstable = false;
-  sha256 = "sha256-VPelWTtFHmU4ZgWLTzZKbtmQ4LOtVwJvpLG9rHtGoNs=";
+  sha256 = "sha256-Q+H6riGF5sEcyrVFoDfudwVw4QORa2atE6NTb+xde/w=";
 
   buildInputs = [
     exo

From d5e1bd780c3c2545b117fdcad680ad1ec315d42b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 26 Dec 2024 22:23:44 +0800
Subject: [PATCH 103/340] xfce.xfce4-docklike-plugin: 0.4.2-unstable-2024-11-04
 -> 0.4.3

https://gitlab.xfce.org/panel-plugins/xfce4-docklike-plugin/-/compare/1154bf1c9f291d5699663910d5aac71bb3ab2227...xfce4-docklike-plugin-0.4.3
---
 .../xfce/panel-plugins/xfce4-docklike-plugin/default.nix     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix
index b4f6121033d06..3edcaf2396263 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix
@@ -14,9 +14,8 @@
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-docklike-plugin";
-  version = "0.4.2-unstable-2024-11-04";
-  rev = "1154bf1c9f291d5699663910d5aac71bb3ab2227";
-  sha256 = "sha256-uno3qNyuesK/hJMdAxHZS6XMysr7ySOgJ5ACXGcIWFs=";
+  version = "0.4.3";
+  sha256 = "sha256-cQ9B/sIzp1sq3GXPMtbb8xrfFhWiBS+FDe7/qlWVPdA=";
 
   buildInputs = [
     cairo

From a94800f573e3d85927b681f5b96fc7679d871d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 13 Dec 2024 18:17:35 +0100
Subject: [PATCH 104/340] bruno: 1.34.2 -> 1.37.0

---
 pkgs/by-name/br/bruno/package.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 2e3591d8e8ef5..7d1290f92f813 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -18,20 +18,20 @@
 
 buildNpmPackage rec {
   pname = "bruno";
-  version = "1.34.2";
+  version = "1.37.0";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
-    rev = "v${version}";
-    hash = "sha256-ydb80+FP2IsobvCZiIKzbErAJNakVoSoYrhddmPmYkc=";
+    tag = "v${version}";
+    hash = "sha256-+CLop9fU0fk5n5jNkLbTXZfXyfOXyigukRhTHnML4t0=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
     '';
   };
 
-  npmDepsHash = "sha256-ODE8GLIgdUEOiniki8jzkHfU5TKHWoIIbjGJjNzMZCI=";
+  npmDepsHash = "sha256-K7M4eZQpI79TUI2rf0UP2hEipqaOVjhjMRjIVlcy7c8=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   nativeBuildInputs =
@@ -81,9 +81,12 @@ buildNpmPackage rec {
   # remove giflib dependency
   npmRebuildFlags = [ "--ignore-scripts" ];
   preBuild = ''
-    substituteInPlace node_modules/canvas/binding.gyp \
-      --replace-fail "'with_gif%': '<!(node ./util/has_lib.js gif)'" "'with_gif%': 'false'"
-    npm rebuild
+    # upstream keeps removing and adding back canvas, only patch it when it is present
+    if [[ -e node_modules/canvas/binding.gyp ]]; then
+      substituteInPlace node_modules/canvas/binding.gyp \
+        --replace-fail "'with_gif%': '<!(node ./util/has_lib.js gif)'" "'with_gif%': 'false'"
+      npm rebuild
+    fi
   '';
 
   buildPhase = ''
@@ -137,7 +140,6 @@ buildNpmPackage rec {
   installPhase = ''
     runHook preInstall
 
-
     ${
       if stdenv.hostPlatform.isDarwin then
         ''

From 5a24afb63774e13c26cc6ad817a4482445d40c2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 18:01:30 +0000
Subject: [PATCH 105/340] python312Packages.coinmetrics-api-client:
 2024.12.11.19 -> 2024.12.23.19

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

diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
index 2d1acee4e2d4a..f8ddd79717098 100644
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "coinmetrics-api-client";
-  version = "2024.12.11.19";
+  version = "2024.12.23.19";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "coinmetrics_api_client";
-    hash = "sha256-ETEKQ3PC+wKD92QYKqly4EGge9tJgome0N3Vv7qf214=";
+    hash = "sha256-AX+UFQ+Usq9MzbnlZjZQXw9cP6fhO78iFsh0KsbZfw4=";
   };
 
   pythonRelaxDeps = [ "typer" ];

From 8e5cb29914a3ff31dba24a34245855708b52c0f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 19:31:41 +0000
Subject: [PATCH 106/340] python312Packages.model-checker: 0.6.2 -> 0.6.6

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

diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix
index 56bd8fa933976..1bf4398eb4207 100644
--- a/pkgs/development/python-modules/model-checker/default.nix
+++ b/pkgs/development/python-modules/model-checker/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "model-checker";
-  version = "0.6.2";
+  version = "0.6.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "model_checker";
     inherit version;
-    hash = "sha256-x8lnODvpjfIO8SqHQD90VnNuHZBZl1oNdf4EfM8A4ys=";
+    hash = "sha256-8DXy/7BHWYDBriE7YO4JNw5Wl/7sNYowAKOF6p14pIw=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail

From 7df87075837278a8050a6ecc96b3036b0bc87056 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 26 Dec 2024 20:25:29 +0000
Subject: [PATCH 107/340] python312Packages.deal: disable failing test

test fails due to a bad string match as the single quotes disappeared:
"invalid choice: 'unknown' (choose from 'fake')" ->
"invalid choice: 'unknown' (choose from fake)"

upstream doesn't support reporting issues so disable the test
---
 pkgs/development/python-modules/deal/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix
index 99c962e5e814f..ee77c8ff77c7e 100644
--- a/pkgs/development/python-modules/deal/default.nix
+++ b/pkgs/development/python-modules/deal/default.nix
@@ -71,6 +71,8 @@ buildPythonPackage rec {
     "test_doctest"
     "test_no_violations"
     "test_source_get_lambda_multiline_splitted_dec"
+    # assert basically correct but fails in string match due to '' removed
+    "test_unknown_command"
   ];
 
   disabledTestPaths = [

From 7473e3acec0cae5bdb828ff90f7408c77f96716e Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 26 Dec 2024 20:38:29 +0000
Subject: [PATCH 108/340] python313Packages.deal: disable failing test

---
 .../python-modules/deal/default.nix           | 51 +++++++++++--------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix
index ee77c8ff77c7e..f37377526fdfd 100644
--- a/pkgs/development/python-modules/deal/default.nix
+++ b/pkgs/development/python-modules/deal/default.nix
@@ -12,6 +12,7 @@
   pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
+  pythonAtLeast,
   sphinx,
   typeguard,
   urllib3,
@@ -52,28 +53,34 @@ buildPythonPackage rec {
     vaa
   ];
 
-  disabledTests = [
-    # Tests need internet access
-    "test_smoke_has"
-    "test_pure_offline"
-    "test_raises_doesnt_override_another_contract"
-    "test_raises_doesnt_override_another_contract_async"
-    "test_raises_generator"
-    # AttributeError: module 'vaa' has no attribute 'Error'
-    "test_source_vaa_scheme"
-    "test_vaa_scheme_and_custom_exception"
-    "test_scheme_string_validation_args_correct"
-    "test_method_chain_decorator_with_scheme_is_fulfilled"
-    "test_scheme_contract_is_satisfied_when_setting_arg"
-    "test_scheme_contract_is_satisfied_within_chain"
-    "test_scheme_errors_rewrite_message"
-    # assert errors
-    "test_doctest"
-    "test_no_violations"
-    "test_source_get_lambda_multiline_splitted_dec"
-    # assert basically correct but fails in string match due to '' removed
-    "test_unknown_command"
-  ];
+  disabledTests =
+    [
+      # Tests need internet access
+      "test_smoke_has"
+      "test_pure_offline"
+      "test_raises_doesnt_override_another_contract"
+      "test_raises_doesnt_override_another_contract_async"
+      "test_raises_generator"
+      # AttributeError: module 'vaa' has no attribute 'Error'
+      "test_source_vaa_scheme"
+      "test_vaa_scheme_and_custom_exception"
+      "test_scheme_string_validation_args_correct"
+      "test_method_chain_decorator_with_scheme_is_fulfilled"
+      "test_scheme_contract_is_satisfied_when_setting_arg"
+      "test_scheme_contract_is_satisfied_within_chain"
+      "test_scheme_errors_rewrite_message"
+      # assert errors
+      "test_doctest"
+      "test_no_violations"
+      "test_source_get_lambda_multiline_splitted_dec"
+      # assert basically correct but fails in string match due to '' removed
+      "test_unknown_command"
+    ]
+    ++ lib.optional (pythonAtLeast "3.13") [
+      # assert basically correct but string match fails in due to
+      # ('pathlib._local', 'Path.write_text') != ('pathlib', 'Path.write_text')
+      "test_infer"
+    ];
 
   disabledTestPaths = [
     # Test needs internet access

From cd4b45cc8c880a001ea3abdbd598cd4bb469165c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 21:27:47 +0000
Subject: [PATCH 109/340] python312Packages.resend: 2.4.0 -> 2.5.1

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

diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix
index acb8871f01f38..517f380fd6a1d 100644
--- a/pkgs/development/python-modules/resend/default.nix
+++ b/pkgs/development/python-modules/resend/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "resend";
-  version = "2.4.0";
+  version = "2.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "resend";
     repo = "resend-python";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-pxHDR9hJWhNHwSYJbakOCEkJbHU/RDhvTy5AGyfr33w=";
+    tag = "v${version}";
+    hash = "sha256-KOZJiJYqUdQYJPyxoNJ8sMUR1gIZF8+i9m+cAQokByI=";
   };
 
   build-system = [ setuptools ];

From 9f6bddf441b383f7639abb61b4881282dd7f9cfa Mon Sep 17 00:00:00 2001
From: Philip Abernethy <gitlab.rddlf@slmails.com>
Date: Wed, 25 Dec 2024 23:00:00 +0100
Subject: [PATCH 110/340] goverlay: 0.7.1 -> 1.2

---
 pkgs/tools/graphics/goverlay/default.nix | 41 +++++++-----------------
 pkgs/top-level/all-packages.nix          |  5 ++-
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix
index ae0beb65cc65f..b59d5de8ac3c0 100644
--- a/pkgs/tools/graphics/goverlay/default.nix
+++ b/pkgs/tools/graphics/goverlay/default.nix
@@ -3,12 +3,12 @@
   stdenv,
   fetchFromGitHub,
   bash,
-  breeze-qt5,
   coreutils,
   fpc,
   git,
   gnugrep,
-  lazarus-qt5,
+  iproute2,
+  lazarus-qt6,
   libGL,
   libGLU,
   libnotify,
@@ -17,36 +17,23 @@
   nix-update-script,
   polkit,
   procps,
+  qt6,
   systemd,
   util-linux,
   vulkan-tools,
   which,
   wrapQtAppsHook,
-  writeScriptBin,
 }:
 
-let
-  # Finds data files using the XDG Base Directory Specification
-  # See https://specifications.freedesktop.org/basedir-spec/latest
-  find-xdg-data-files = writeScriptBin "find-xdg-data-files" ''
-    #!${bash}/bin/sh
-    IFS=:
-    for xdg_data_dir in ''${XDG_DATA_HOME:-$HOME/.local/share}:''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}; do
-      if [ -f "$xdg_data_dir/$1" ]; then
-        echo "$xdg_data_dir/$1"
-      fi
-    done
-  '';
-in
 stdenv.mkDerivation rec {
   pname = "goverlay";
-  version = "0.7.1";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "benjamimgois";
     repo = pname;
     rev = version;
-    sha256 = "sha256-oXkGrMHjs8uui0pzGYW8jnttet/5IX0r8eat0n5saFk=";
+    sha256 = "sha256-tSpM+XLlFQLfL750LTNWbWFg1O+0fSfsPRXuRCm/KlY=";
   };
 
   outputs = [
@@ -54,38 +41,35 @@ stdenv.mkDerivation rec {
     "man"
   ];
 
-  patches = [
-    # Find MangoHud & vkBasalt Vulkan layers using the XDG Base Directory Specification
-    ./find-xdg-data-files.patch
-  ];
-
   postPatch = ''
     substituteInPlace Makefile \
-      --replace 'prefix = /usr/local' "prefix = $out"
+      --replace-fail 'prefix = /usr/local' "prefix = $out"
 
     substituteInPlace overlayunit.pas \
-      --replace '/usr/share/icons/hicolor/128x128/apps/goverlay.png' "$out/share/icons/hicolor/128x128/apps/goverlay.png"
+      --replace-fail '/usr/share/icons/hicolor/128x128/apps/goverlay.png' "$out/share/icons/hicolor/128x128/apps/goverlay.png" \
+      --replace-fail '/sbin/ip' "${lib.getExe' iproute2 "ip"}" \
+      --replace-fail '/bin/bash' "${lib.getExe' bash "bash"}"
   '';
 
   nativeBuildInputs = [
     fpc
-    lazarus-qt5
+    lazarus-qt6
     wrapQtAppsHook
   ];
 
   buildInputs = [
-    breeze-qt5
     libGL
     libGLU
     libqtpas
     libX11
+    qt6.qtbase
   ];
 
   NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}";
 
   buildPhase = ''
     runHook preBuild
-    HOME=$(mktemp -d) lazbuild --lazarusdir=${lazarus-qt5}/share/lazarus -B goverlay.lpi
+    HOME=$(mktemp -d) lazbuild --lazarusdir=${lazarus-qt6}/share/lazarus -B goverlay.lpi
     runHook postBuild
   '';
 
@@ -94,7 +78,6 @@ stdenv.mkDerivation rec {
       lib.makeBinPath [
         bash
         coreutils
-        find-xdg-data-files
         git
         gnugrep
         libnotify
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27cedbcd5f8d8..498d0003f6c86 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3581,9 +3581,8 @@ with pkgs;
 
   gdown = with python3Packages; toPythonApplication gdown;
 
-  goverlay = callPackage ../tools/graphics/goverlay {
-    inherit (libsForQt5) libqtpas wrapQtAppsHook;
-    inherit (plasma5Packages) breeze-qt5;
+  goverlay = qt6Packages.callPackage ../tools/graphics/goverlay {
+    inherit (qt6Packages) libqtpas wrapQtAppsHook;
   };
 
   gpt4all-cuda = gpt4all.override {

From f6fa10a460ff9f4454ef660336c7166a3401fa3a Mon Sep 17 00:00:00 2001
From: Philip Abernethy <gitlab.rddlf@slmails.com>
Date: Wed, 25 Dec 2024 23:00:28 +0100
Subject: [PATCH 111/340] goverlay: delete find-xdg-data-dirs.patch

---
 .../goverlay/find-xdg-data-files.patch        | 40 -------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 pkgs/tools/graphics/goverlay/find-xdg-data-files.patch

diff --git a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch
deleted file mode 100644
index 17ba9ed1140ed..0000000000000
--- a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/overlayunit.pas b/overlayunit.pas
-index 97a088d..4c42414 100644
---- a/overlayunit.pas
-+++ b/overlayunit.pas
-@@ -5007,7 +5007,7 @@ begin
-    //Determine Mangohud dependency status
- 
-           //locate MangoHud and store result in tmp folder
--          RunCommand('bash -c ''find /usr/share/vulkan/implicit_layer.d/MangoHud.json >> /tmp/goverlay/dependency_mangohud''', s);
-+          RunCommand('bash -c ''find-xdg-data-files vulkan/implicit_layer.d/MangoHud.json >> /tmp/goverlay/dependency_mangohud''', s);
- 
-           // Assign Text file dependency_mangohud to variable mangohudVAR
-           AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud');
-@@ -5016,7 +5016,7 @@ begin
-           CloseFile(mangohudVAR);
- 
-           // Read String and store value on mangohuddependencyVALUE based on result
--          if mangohudSTR = '/usr/share/vulkan/implicit_layer.d/MangoHud.json' then
-+          if mangohudSTR <> '' then
-           mangohuddependencyVALUE := 1
-           else
-           mangohuddependencyVALUE := 0;
-@@ -5025,7 +5025,7 @@ begin
-    //Determine vkBasalt dependency staus
- 
-            //locate vkBasalt and store result in tmp folder
--           RunCommand('bash -c ''find /usr/share/vulkan/implicit_layer.d/vkBasalt.json >> /tmp/goverlay/dependency_vkbasalt''', s);
-+           RunCommand('bash -c ''find-xdg-data-files vulkan/implicit_layer.d/vkBasalt.json >> /tmp/goverlay/dependency_vkbasalt''', s);
- 
-            // Assign Text file dependency_mangohud to variable mangohudVAR
-            AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt');
-@@ -5034,7 +5034,7 @@ begin
-            CloseFile(vkbasaltVAR);
- 
-            // Read String and store value on vkbasaltdependencyVALUE based on result
--           if vkbasaltSTR = '/usr/share/vulkan/implicit_layer.d/vkBasalt.json' then
-+           if vkbasaltSTR <> '' then
-            vkbasaltdependencyVALUE := 1
-            else
-            vkbasaltdependencyVALUE := 0;

From 34e62a308f64cdc23ea81c2fa29a20e970c7ab61 Mon Sep 17 00:00:00 2001
From: Philip Abernethy <gitlab.rddlf@slmails.com>
Date: Wed, 25 Dec 2024 22:40:18 +0100
Subject: [PATCH 112/340] goverlay: add 25.05 release notes entry

---
 nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index d55c94795ea6f..70bbeb8887e50 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -261,6 +261,8 @@
   - Overriding Wayland compositor is possible using `enableWaylandSession` option, but you might need to take care [`xfce4-session`](https://gitlab.xfce.org/xfce/xfce4-session/-/merge_requests/49), [`dbus-update-activation-environment`](https://github.com/labwc/labwc/blob/eaf11face68ee1f1bcc7ce1498304ca8c108c8ba/src/config/session.c#L234) and [`systemctl --user import-environment`](https://github.com/labwc/labwc/blob/eaf11face68ee1f1bcc7ce1498304ca8c108c8ba/src/config/session.c#L239) on startup.
   - For new Xfce installations, default panel layout has [changed](https://gitlab.xfce.org/xfce/xfce4-panel/-/merge_requests/158/diffs) to not include external panel plugins by default. You can still add them yourself using the "Panel Preferences" dialog.
 
+- GOverlay has been updated to 1.2, please check the [upstream changelog](https://github.com/benjamimgois/goverlay/releases) for more details.
+
 - `networking.wireguard` now has an optional networkd backend. It is enabled by default when `networking.useNetworkd` is enabled, and it can be enabled alongside scripted networking with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option.
 
 - `services.avahi.ipv6` now defaults to true.

From 90563c331946e9c3802c77a9a459c87a27356721 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Dec 2024 23:21:35 +0000
Subject: [PATCH 113/340] python312Packages.weconnect: 0.60.6 -> 0.60.7

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

diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix
index 8494688eaefe4..64114dbf17a72 100644
--- a/pkgs/development/python-modules/weconnect/default.nix
+++ b/pkgs/development/python-modules/weconnect/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "weconnect";
-  version = "0.60.6";
+  version = "0.60.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "tillsteinbach";
     repo = "WeConnect-python";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-sSO+e6pZj7pkkfWF2z5THaD6MrPBX7f1M3nRIoqRC2s=";
+    tag = "v${version}";
+    hash = "sha256-5mn1FDhaRoPEBEqumzu8fIHB8uKSG9aVO/shigBs4ag=";
   };
 
   postPatch = ''

From d9759af0da8b88d717014a96d0bab61e4b7f1f58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 00:03:26 +0000
Subject: [PATCH 114/340] python312Packages.lib4sbom: 0.7.5 -> 0.8.1

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

diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix
index e7e581174b613..be76325f2375c 100644
--- a/pkgs/development/python-modules/lib4sbom/default.nix
+++ b/pkgs/development/python-modules/lib4sbom/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "lib4sbom";
-  version = "0.7.5";
+  version = "0.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "anthonyharrison";
     repo = "lib4sbom";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-NWrHz4G5Ps5GoZUcx0LiSQzbTZlU4eGYgli6znG+NSs=";
+    tag = "v${version}";
+    hash = "sha256-OxYYHiV7TuPiLyd/rdrGfY3agv0vBcATaod37XYb7DY=";
   };
 
   build-system = [ setuptools ];

From 4b9af1a3684e0bde4f6c4ecc9017187bab821045 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Fri, 27 Dec 2024 09:04:10 +0900
Subject: [PATCH 115/340] glance: 0.6.3 -> 0.6.4

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/gl/glance/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix
index a8602bc7d6aaa..2f9f14fbc1172 100644
--- a/pkgs/by-name/gl/glance/package.nix
+++ b/pkgs/by-name/gl/glance/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "glance";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "glanceapp";
     repo = "glance";
     rev = "v${version}";
-    hash = "sha256-yLcRdgxp4g4H6pxsv342ub3P4Hmg3+mtFALuVMh7/j0=";
+    hash = "sha256-L3IBCh4pDeaErxl89s/1yMHoU8dYtRcmqcIgFiyGq2U=";
   };
 
-  vendorHash = "sha256-BLWaYiWcLX+/DW7Zzp6/Mtw5uVxIVtfubB895hrZ+08=";
+  vendorHash = "sha256-6PDcUb2Rv+Shqb+wtsit8Yt9RSgN5tz+MeXrujZXDCo=";
 
   excludedPackages = [ "scripts/build-and-ship" ];
 

From 3663b329f1d0641f487bdfec2e76da47dfe106ad Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Fri, 27 Dec 2024 09:13:24 +0900
Subject: [PATCH 116/340] uv: 0.5.11 -> 0.5.12

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 800df5d9e4da9..0b73c101ce79d 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -17,17 +17,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "uv";
-  version = "0.5.11";
+  version = "0.5.12";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = version;
-    hash = "sha256-0HdMjul925TkJGYQHsmQBYQoEkDYyXFSTEgZ/jg5V0o=";
+    hash = "sha256-opTZzNi9cguceD3qdWsIxAYbymu25wFFKOIGhWu958Q=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-T1Yk8JNPdkxpLegeFuL2J7mbFOX4yyCPfvHyFfu6YsM=";
+  cargoHash = "sha256-hplzzsbS81GRS8L0Goh7vvzyv6xCAe0CN6KRvJ0GUdc=";
 
   nativeBuildInputs = [
     cmake

From 22ccb29c574615e2f3b631ed90610bae0e1be9c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 00:31:17 +0000
Subject: [PATCH 117/340] mainsail: 2.13.1 -> 2.13.2

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

diff --git a/pkgs/by-name/ma/mainsail/package.nix b/pkgs/by-name/ma/mainsail/package.nix
index d82882831da8f..3f0c7578f18d5 100644
--- a/pkgs/by-name/ma/mainsail/package.nix
+++ b/pkgs/by-name/ma/mainsail/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "mainsail";
-  version = "2.13.1";
+  version = "2.13.2";
 
   src = fetchFromGitHub {
     owner = "mainsail-crew";
     repo = "mainsail";
     rev = "v${version}";
-    hash = "sha256-Ugxy6bbLD0XJwKLW3YOM32GWrK9q8JsrcKGipZNZOsE=";
+    hash = "sha256-rXavUkoFRw5fWCisdz/eD+wL1Sc+vExyjskVEIN4QNQ=";
   };
 
-  npmDepsHash = "sha256-mlF8p9s5aGjZz1nfBOOECsW/BhaP2ToQ4f6gUU9sgSI=";
+  npmDepsHash = "sha256-MzPXDy9sX7Y5dUm3qp3OORdEz8QyL5j4M4eXl0gtopo=";
 
   # Prevent Cypress binary download.
   CYPRESS_INSTALL_BINARY = 0;

From f263006d20c05f52ee458c226402a3ba7a48d37e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 00:33:24 +0000
Subject: [PATCH 118/340] python312Packages.python-overseerr: 0.1.0 -> 0.1.1

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

diff --git a/pkgs/development/python-modules/python-overseerr/default.nix b/pkgs/development/python-modules/python-overseerr/default.nix
index b9f1c7c585ab1..d36f65feb3a8d 100644
--- a/pkgs/development/python-modules/python-overseerr/default.nix
+++ b/pkgs/development/python-modules/python-overseerr/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "python-overseerr";
-  version = "0.1.0";
+  version = "0.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,8 +25,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-overseerr";
-    rev = "ref/tags/v${version}";
-    hash = "sha256-jBz2mTJx7nb5+di89i1U2maYvYetDGqHC4Nz29iLGNA=";
+    tag = "v${version}";
+    hash = "sha256-kHpNXZ+A4kG37XJ8V4dFEql/VoPwu/G/eQ38k2unDF0=";
   };
 
   build-system = [ poetry-core ];

From 21615559ece58cad4164a5cc74694a8fc3322926 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 00:41:19 +0000
Subject: [PATCH 119/340] broot: 1.44.2 -> 1.44.3

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

diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix
index f42b934c69090..df98fa3575683 100644
--- a/pkgs/by-name/br/broot/package.nix
+++ b/pkgs/by-name/br/broot/package.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "1.44.2";
+  version = "1.44.3";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-rMAGnC1CcHYPLh199a+aKgVdm/xheUQIRSvF+HqeZQE=";
+    hash = "sha256-45QNcnx9sEjm02woIpxxLuir4Kep8SPlSZDdiifZNL8=";
   };
 
-  cargoHash = "sha256-DVH7dKJEkyBnjNtLK/xfO+Hlw+rr3wTKqyooj5JM2is=";
+  cargoHash = "sha256-2hqpltfKE8fIFlvXMQfXVT41jPILL/INXQRUHfi1EhY=";
 
   nativeBuildInputs = [
     installShellFiles

From 9c8a87d88f7beb338907c012a2f1956a73a53c72 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 00:42:03 +0000
Subject: [PATCH 120/340] sfeed: 2.0 -> 2.1

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

diff --git a/pkgs/by-name/sf/sfeed/package.nix b/pkgs/by-name/sf/sfeed/package.nix
index a3d3349b504fa..fe66ee679b6f0 100644
--- a/pkgs/by-name/sf/sfeed/package.nix
+++ b/pkgs/by-name/sf/sfeed/package.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   pname = "sfeed";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchgit {
     url = "git://git.codemadness.org/sfeed";
     rev = version;
-    sha256 = "sha256-DbzJWi9wAc7w2Z0bQt5PEFOuu9L3xzNrJvCocvCer34=";
+    sha256 = "sha256-KVZsVCTkwyOVr37vIXbiPjQLnb9lbuIlNxpZNvHxbEo=";
   };
 
   buildInputs = [ ncurses ];

From 247b3399c0e56904117de0681b732f88030e58e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 00:55:40 +0000
Subject: [PATCH 121/340] signal-cli: 0.13.10 -> 0.13.11

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

diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix
index 015e232c16c36..ab4d4da3232d4 100644
--- a/pkgs/by-name/si/signal-cli/package.nix
+++ b/pkgs/by-name/si/signal-cli/package.nix
@@ -11,12 +11,12 @@
 
 stdenv.mkDerivation rec {
   pname = "signal-cli";
-  version = "0.13.10";
+  version = "0.13.11";
 
   # Building from source would be preferred, but is much more involved.
   src = fetchurl {
     url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
-    hash = "sha256-libAHGRdOinL48riMwKtacI5YlRw8JGoqOynVUCGyeA=";
+    hash = "sha256-biK03oiGCNXxWQpYVloE2SDLMrOMWIV+1RGqps1kTvk=";
   };
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [

From b6de37b531048e419391ebf057b2e4acd1bbf11b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 01:29:51 +0000
Subject: [PATCH 122/340] python312Packages.pypck: 0.8.1 -> 0.8.2

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

diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix
index e5c27dd9a1edf..8ed3ea4861e2b 100644
--- a/pkgs/development/python-modules/pypck/default.nix
+++ b/pkgs/development/python-modules/pypck/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pypck";
-  version = "0.8.1";
+  version = "0.8.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -20,8 +20,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "alengwenus";
     repo = "pypck";
-    rev = "refs/tags/${version}";
-    hash = "sha256-O0hRfSUJwn/xW+xJ2zD/Z8bb1G42n8UGIKHzLkl9n5M=";
+    tag = version;
+    hash = "sha256-u3vk8yLP35ZQFajp3ngadNM3KY40zShPMYm9iN5U86Y=";
   };
 
   postPatch = ''

From f298cd74e67a841289fd0f10ef4ee85cfbbc4133 Mon Sep 17 00:00:00 2001
From: totaltaxamount <shieldscoen@gmail.com>
Date: Thu, 26 Dec 2024 19:04:05 -0700
Subject: [PATCH 123/340] dmraid: patch dmevent_tool.c to compile on modern gcc
 versions

---
 pkgs/os-specific/linux/dmraid/default.nix     |  5 ++++-
 .../linux/dmraid/fix-dmevent_tool.patch       | 20 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/dmraid/fix-dmevent_tool.patch

diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix
index ab366ad88ad55..78ccf00831e49 100644
--- a/pkgs/os-specific/linux/dmraid/default.nix
+++ b/pkgs/os-specific/linux/dmraid/default.nix
@@ -16,7 +16,10 @@ stdenv.mkDerivation rec {
   };
 
   patches =
-    [ ./hardening-format.patch ]
+    [
+      ./hardening-format.patch
+      ./fix-dmevent_tool.patch
+    ]
     ++ lib.optionals stdenv.hostPlatform.isMusl [
       (fetchpatch {
         url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/006-musl-libc.patch";
diff --git a/pkgs/os-specific/linux/dmraid/fix-dmevent_tool.patch b/pkgs/os-specific/linux/dmraid/fix-dmevent_tool.patch
new file mode 100644
index 0000000000000..b7ef83cfa9b3c
--- /dev/null
+++ b/pkgs/os-specific/linux/dmraid/fix-dmevent_tool.patch
@@ -0,0 +1,20 @@
+--- a/1.0.0.rc16/tools/dmevent_tool.c.old	2024-12-26 18:39:04.294039876 -0700
++++ a/1.0.0.rc16/tools/dmevent_tool.c	2024-12-26 18:45:59.416784807 -0700
+@@ -123,7 +123,7 @@
+ }
+ 
+ /* Increment option counters. */
+-static _process_opt(int opt, const char *cmd)
++static int _process_opt(int opt, const char *cmd)
+ {
+ 	struct opt_def_struct {
+ 		const char opt;		/* Option character. */
+@@ -148,7 +148,7 @@
+ 
+ 			optc[o->type]++;
+ 			optc[OPT_SUM]++;
+-			return;
++			return 0;
+ 		}
+ 	}
+ 

From 2fefb81c40b8873972712347dfa21d2111fee8eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 02:44:40 +0000
Subject: [PATCH 124/340] python312Packages.manifestoo-core: 1.8.1 -> 1.8.2

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

diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix
index ceaef4f91f144..f427fb1ff56aa 100644
--- a/pkgs/development/python-modules/manifestoo-core/default.nix
+++ b/pkgs/development/python-modules/manifestoo-core/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "manifestoo-core";
-  version = "1.8.1";
+  version = "1.8.2";
   format = "pyproject";
 
   src = fetchPypi {
     inherit version;
     pname = "manifestoo_core";
-    hash = "sha256-aULT5xxkWEndzEBVcpwvWlIXQYxwfF0VxoI6EHC3JAs=";
+    hash = "sha256-e/kpgGaaQqPI+4WeHXYpVc01t5vexHlmsDuAoGFShEM=";
   };
 
   nativeBuildInputs = [ hatch-vcs ];

From 8cf119c7a199ebe85e4466920a2788f3d494f613 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 27 Dec 2024 05:02:32 +0200
Subject: [PATCH 125/340] nixos/stalwart-mail: Fix creation of `dataDir` if not
 default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without these I got

`mkdir: cannot create directory ‘/data/stalwart’: Read-only file system`
---
 nixos/modules/services/mail/stalwart-mail.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix
index d4e650de07db6..849661646977b 100644
--- a/nixos/modules/services/mail/stalwart-mail.nix
+++ b/nixos/modules/services/mail/stalwart-mail.nix
@@ -119,6 +119,10 @@ in
       };
     };
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.dataDir}' - stalwart-mail stalwart-mail - -"
+    ];
+
     systemd = {
       packages = [ cfg.package ];
       services.stalwart-mail = {
@@ -147,6 +151,9 @@ in
           StandardOutput = "journal";
           StandardError = "journal";
 
+          ReadWritePaths = [
+            cfg.dataDir
+          ];
           CacheDirectory = "stalwart-mail";
           StateDirectory = "stalwart-mail";
 

From a9ba06bec7bbf5073291bd19bc86ab5e8599b7bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 03:30:32 +0000
Subject: [PATCH 126/340] python312Packages.lcn-frontend: 0.2.2 -> 0.2.3

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

diff --git a/pkgs/development/python-modules/lcn-frontend/default.nix b/pkgs/development/python-modules/lcn-frontend/default.nix
index a29c8dc712c56..14710ebdde96d 100644
--- a/pkgs/development/python-modules/lcn-frontend/default.nix
+++ b/pkgs/development/python-modules/lcn-frontend/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "lcn-frontend";
-  version = "0.2.2";
+  version = "0.2.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "lcn_frontend";
     inherit version;
-    hash = "sha256-D6rwFLThOCEbKYhUpuA8K+0iLYt3pqU4GHzJcr3LaAM=";
+    hash = "sha256-j5NE/AFGHC5z44I2afMCGUDY9gqjPZPJ5nDBHf52tJY=";
   };
 
   postPatch = ''

From d73c8f2790fbadf7bd070026a730cf90759f343f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 04:46:09 +0000
Subject: [PATCH 127/340] python312Packages.tesla-fleet-api: 0.9.0 -> 0.9.2

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

diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix
index edc9784c9068b..2d0c6dd98b6ea 100644
--- a/pkgs/development/python-modules/tesla-fleet-api/default.nix
+++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "tesla-fleet-api";
-  version = "0.9.0";
+  version = "0.9.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "Teslemetry";
     repo = "python-tesla-fleet-api";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-+P3LwO7F9o5h0L7/7GK0ic6p86ay3kWt6F9Pks2rWRY=";
+    tag = "v${version}";
+    hash = "sha256-pNW9eiJ8wIdzKOlq6nNUgBwUT898qsKvc5evePYWOOQ=";
   };
 
   build-system = [ setuptools ];

From 48dd482bcc076b35adcaddafe1082a54bc7946b4 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 27 Dec 2024 08:29:57 +0100
Subject: [PATCH 128/340] lexical: 0.7.1 -> 0.7.2

Diff: https://github.com/lexical-lsp/lexical/compare/refs/tags/v0.7.1...v0.7.2

Changelog: https://github.com/lexical-lsp/lexical/releases/tag/v0.7.2
---
 pkgs/by-name/le/lexical/package.nix | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/le/lexical/package.nix b/pkgs/by-name/le/lexical/package.nix
index 3edf7e224b73b..e89199f6e4168 100644
--- a/pkgs/by-name/le/lexical/package.nix
+++ b/pkgs/by-name/le/lexical/package.nix
@@ -4,25 +4,24 @@
   fetchFromGitHub,
   elixir,
   nix-update-script,
-  testers,
-  lexical,
+  versionCheckHook,
 }:
 
 beamPackages.mixRelease rec {
   pname = "lexical";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "lexical-lsp";
     repo = "lexical";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-YKp1IOBIt6StYpVZyTj3BMZM/+6Bp+galbFpuBKYeOM=";
+    tag = "v${version}";
+    hash = "sha256-mgchXc46sMN1UcgyO8uWusl2bEJr/5PqfwJ2c6j6SoI=";
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {
     inherit pname version src;
 
-    hash = "sha256-myxmQM46TELDu9wpr82qxqH4s/YR9t0gdAfGOm0Dw1k=";
+    hash = "sha256-Ee8RbLkb7jkdK91G4TAUIlPthBP5OyeynHJGg87UvBI=";
   };
 
   installPhase = ''
@@ -34,14 +33,24 @@ beamPackages.mixRelease rec {
   '';
 
   postInstall = ''
-    substituteInPlace "$out/bin/start_lexical.sh" --replace 'elixir_command=' 'elixir_command="${elixir}/bin/"'
+    substituteInPlace "$out/bin/start_lexical.sh" \
+      --replace-fail 'elixir_command=' 'elixir_command="${elixir}/bin/"'
+
     mv "$out/bin" "$out/libexec"
-    makeWrapper "$out/libexec/start_lexical.sh" "$out/bin/lexical" --set RELEASE_COOKIE lexical
+    makeWrapper "$out/libexec/start_lexical.sh" "$out/bin/lexical" \
+      --set RELEASE_COOKIE lexical
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  __darwinAllowLocalNetworking = true;
+
   passthru = {
     updateScript = nix-update-script { };
-    tests.version = testers.testVersion { package = lexical; };
   };
 
   meta = {

From 0f25d2b50670ca57c5eaa92203324cfe92bc7bdd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 08:31:37 +0000
Subject: [PATCH 129/340] intel-gmmlib: 22.5.5 -> 22.6.0

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

diff --git a/pkgs/by-name/in/intel-gmmlib/package.nix b/pkgs/by-name/in/intel-gmmlib/package.nix
index 240f641bc9080..d0db954fe51d7 100644
--- a/pkgs/by-name/in/intel-gmmlib/package.nix
+++ b/pkgs/by-name/in/intel-gmmlib/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-gmmlib";
-  version = "22.5.5";
+  version = "22.6.0";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "gmmlib";
     rev = "intel-gmmlib-${version}";
-    hash = "sha256-F8e9FzEn6A7U8lyso5YDhWaB+S5M45HRvj95AyteovQ=";
+    hash = "sha256-3A5bTrRIm7ZOz2Si8u2GSDr5vIOr9NOaMRu0PbqZAIs=";
   };
 
   nativeBuildInputs = [ cmake ];

From dc0ca57d461c31622d82e8c1e03a56635461140b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 09:09:21 +0000
Subject: [PATCH 130/340] monetdb: 11.51.3 -> 11.51.7

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

diff --git a/pkgs/by-name/mo/monetdb/package.nix b/pkgs/by-name/mo/monetdb/package.nix
index deb1f13f48c41..7fa26067a80af 100644
--- a/pkgs/by-name/mo/monetdb/package.nix
+++ b/pkgs/by-name/mo/monetdb/package.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "monetdb";
-  version = "11.51.3";
+  version = "11.51.7";
 
   src = fetchurl {
     url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-ql6J4e62sL/g6s6cr2xMoxmlsLyovapaGtpcQIZ9tOU=";
+    hash = "sha256-lWURVG+5NSWBTxXC5slYSedMZC1Z/HGfzZ43tR7z4dE=";
   };
 
   nativeBuildInputs = [ bison cmake python3 ];

From 56083f00e49b62e1bbb31eb21424669e41759a92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 09:19:51 +0000
Subject: [PATCH 131/340] pv: 1.9.15 -> 1.9.25

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

diff --git a/pkgs/by-name/pv/pv/package.nix b/pkgs/by-name/pv/pv/package.nix
index a1968b65a2126..189089dfd1c7d 100644
--- a/pkgs/by-name/pv/pv/package.nix
+++ b/pkgs/by-name/pv/pv/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pv";
-  version = "1.9.15";
+  version = "1.9.25";
 
   src = fetchurl {
     url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz";
-    hash = "sha256-4rF1ZKueuh7Cyq4oWWDL82O0QB3/2hkaYKC+/mjhfaw=";
+    hash = "sha256-FiSVqrscuEIYbLIkmV49X2Cp9SeknMvYISODzHK3w2w=";
   };
 
   meta = {

From 2a80a745f373401f63a71d6c282a7a0dc55f8f21 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Fri, 27 Dec 2024 17:02:00 +0800
Subject: [PATCH 132/340] hplip: fix build

---
 pkgs/by-name/hp/hplip/package.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/hp/hplip/package.nix b/pkgs/by-name/hp/hplip/package.nix
index e1b96e2f233bd..024369818c488 100644
--- a/pkgs/by-name/hp/hplip/package.nix
+++ b/pkgs/by-name/hp/hplip/package.nix
@@ -142,7 +142,7 @@ python311Packages.buildPythonApplication {
     # Remove all ImageProcessor functionality since that is closed source
     (fetchurl {
       url = "https://web.archive.org/web/20230226174550/https://sources.debian.org/data/main/h/hplip/3.22.10+dfsg0-1/debian/patches/0028-Remove-ImageProcessor-binary-installs.patch";
-      sha256 = "sha256:18njrq5wrf3fi4lnpd1jqmaqr7ph5d7jxm7f15b1wwrbxir1rmml";
+      hash = "sha256-tNYccuwrcx5WCe7ULk8r8J6MVcUytGspiW64zAvO0qI=";
     })
   ];
 
@@ -224,6 +224,16 @@ python311Packages.buildPythonApplication {
   enableParallelBuilding = true;
   enableParallelInstalling = false;
 
+  env = {
+    NIX_CFLAGS_COMPILE = toString [
+      "-Wno-error=implicit-int"
+      "-Wno-error=implicit-function-declaration"
+      "-Wno-error=return-mismatch"
+      "-Wno-error=int-conversion"
+      "-Wno-error=incompatible-pointer-types"
+    ];
+  };
+
   #
   # Running `hp-diagnose_plugin -g` can be used to diagnose
   # issues with plugins.

From bf513d5b2c2d77c9bfbd0ac0189ad7d428d2c9eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 09:30:48 +0000
Subject: [PATCH 133/340] mirrord: 3.127.0 -> 3.128.0

---
 pkgs/by-name/mi/mirrord/manifest.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index e6610412c6f2f..b73a3d93af477 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,13 +1,13 @@
 {
-  "version": "3.127.0",
+  "version": "3.128.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.127.0/mirrord_linux_x86_64",
-      "hash": "sha256-CM0huCmv/jFwc4KBCIekfV4oFzCipg49F1VR4259/rg="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.128.0/mirrord_linux_x86_64",
+      "hash": "sha256-GP7n7oTuecRwstUOguaOhHx9HiwNoFO0BSWX2/AB6LI="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.127.0/mirrord_linux_aarch64",
-      "hash": "sha256-tTuzhRqACpMIs3WlTZoVVMmqy8SgfXymjGMI6un2zvc="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.128.0/mirrord_linux_aarch64",
+      "hash": "sha256-WExPypRI9eDpUXoCNkAeO5rsDHULZbpBWLYQxRdvN7I="
     }
   }
 }

From b5d22b3c2a96ef72892868a7f6d5e6fd070ed18f Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 27 Dec 2024 14:01:33 +0400
Subject: [PATCH 134/340] =?UTF-8?q?devcontainer:=200.71.0=20=E2=86=92=200.?=
 =?UTF-8?q?72.0,=20fix=20build?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix
index c21b758b9af92..d852ff4e50c8e 100644
--- a/pkgs/by-name/de/devcontainer/package.nix
+++ b/pkgs/by-name/de/devcontainer/package.nix
@@ -4,7 +4,7 @@
   fetchYarnDeps,
   fetchFromGitHub,
   fixup-yarn-lock,
-  nodejs,
+  nodejs_20,
   python3,
   makeBinaryWrapper,
   git,
@@ -12,15 +12,19 @@
   yarn,
   docker-compose,
 }:
+
+let
+  nodejs = nodejs_20; # does not build with 22
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "devcontainer";
-  version = "0.71.0";
+  version = "0.72.0";
 
   src = fetchFromGitHub {
     owner = "devcontainers";
     repo = "cli";
-    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-plIDK5nOvLKFlRVlPHgpjHPhIh0NAWHmbaKsnYCU/7k=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-3rSWD6uxwcMQdHBSmmAQ0aevqevVXINigCj06jjEcRc=";
   };
 
   yarnOfflineCache = fetchYarnDeps {

From 62daff4d21e757990a4cc2adc175d2a56c566e05 Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Wed, 18 Dec 2024 17:34:07 +0100
Subject: [PATCH 135/340] distribution: 3.0.0-rc.1 -> 3.0.0-rc.2

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/di/distribution/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/di/distribution/package.nix b/pkgs/by-name/di/distribution/package.nix
index 1db56b79cbde8..15e7ec085d515 100644
--- a/pkgs/by-name/di/distribution/package.nix
+++ b/pkgs/by-name/di/distribution/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "distribution";
-  version = "3.0.0-rc.1";
+  version = "3.0.0-rc.2";
 
   src = fetchFromGitHub {
     owner = "distribution";
     repo = "distribution";
-    rev = "v${version}";
-    hash = "sha256-dfy3P8zAFlni2heQcz61+sjivHE97Syh/ICreTgxUAM=";
+    tag = "v${version}";
+    hash = "sha256-OIym8qenQl/50qUNGKlROyLnbaxfzcVaQhHyIRpEjpA=";
   };
 
   vendorHash = null;
@@ -25,6 +25,7 @@ buildGoModule rec {
     # TestInMemoryDriverSuite: timeout after 10 minutes, looks like a deadlock.
     "-skip=^TestHTTPChecker$|^TestInMemoryDriverSuite$"
   ];
+  __darwinAllowLocalNetworking = true;
 
   passthru = {
     tests.version = testers.testVersion {

From 9f988fa3a23d92851ef036fc6f4060374b73e895 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Mon, 23 Dec 2024 10:43:07 +0100
Subject: [PATCH 136/340] ente-auth: 4.1.6 -> 4.2.1

---
 pkgs/by-name/en/ente-auth/package.nix       |  4 +--
 pkgs/by-name/en/ente-auth/pubspec.lock.json | 32 ++++++++++++++-------
 pkgs/by-name/en/ente-auth/simple-icons.json |  4 +--
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index c3265538a2099..e4888eacd8f61 100644
--- a/pkgs/by-name/en/ente-auth/package.nix
+++ b/pkgs/by-name/en/ente-auth/package.nix
@@ -17,14 +17,14 @@ let
 in
 flutter324.buildFlutterApplication rec {
   pname = "ente-auth";
-  version = "4.1.6";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "auth" ];
     tag = "auth-v${version}";
-    hash = "sha256-6LsHKK+IvMgxgih0u04dbpzesyQgwLvkGK0a1NcgpTg=";
+    hash = "sha256-G0CqVZr3aJ1XFaM2bkfeXB1ok6m7kRTamMwWdLm61G8=";
   };
 
   sourceRoot = "${src.name}/auth";
diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json
index 1d5a93a07d7ae..d042822971048 100644
--- a/pkgs/by-name/en/ente-auth/pubspec.lock.json
+++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json
@@ -50,11 +50,11 @@
       "dependency": "direct main",
       "description": {
         "name": "app_links",
-        "sha256": "ad1a6d598e7e39b46a34f746f9a8b011ee147e4c275d407fa457e7a62f84dd99",
+        "sha256": "433df2e61b10519407475d7f69e470789d23d593f28224c38ba1068597be7950",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.2"
+      "version": "6.3.3"
     },
     "app_links_linux": {
       "dependency": "transitive",
@@ -537,6 +537,16 @@
       "source": "hosted",
       "version": "2.1.3"
     },
+    "figma_squircle": {
+      "dependency": "direct main",
+      "description": {
+        "name": "figma_squircle",
+        "sha256": "790b91a9505e90d246f6efe2fa065ff7fffe658c7b44fe9b5b20c7b0ad3818c0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.3"
+    },
     "file": {
       "dependency": "transitive",
       "description": {
@@ -647,11 +657,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_inappwebview",
-        "sha256": "93cfcca02bdda4b26cd700cf70d9ddba09d8348e3e8f2857638c23ed23a4fcb4",
+        "sha256": "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.4"
+      "version": "6.1.5"
     },
     "flutter_inappwebview_android": {
       "dependency": "transitive",
@@ -717,11 +727,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_inappwebview_windows",
-        "sha256": "95ebc65aecfa63b2084c822aec6ba0545f0a0afaa3899f2c752ec96c09108db5",
+        "sha256": "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.0+2"
+      "version": "0.6.0"
     },
     "flutter_launcher_icons": {
       "dependency": "direct main",
@@ -1217,11 +1227,11 @@
       "dependency": "direct main",
       "description": {
         "name": "logging",
-        "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
+        "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.3.0"
     },
     "macros": {
       "dependency": "transitive",
@@ -2044,11 +2054,11 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3",
+        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.0"
+      "version": "6.3.1"
     },
     "url_launcher_android": {
       "dependency": "transitive",
@@ -2061,7 +2071,7 @@
       "version": "6.3.11"
     },
     "url_launcher_ios": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "url_launcher_ios",
         "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
diff --git a/pkgs/by-name/en/ente-auth/simple-icons.json b/pkgs/by-name/en/ente-auth/simple-icons.json
index 6033b1ef2db6a..ce83c91d5f5ae 100644
--- a/pkgs/by-name/en/ente-auth/simple-icons.json
+++ b/pkgs/by-name/en/ente-auth/simple-icons.json
@@ -1,6 +1,6 @@
 {
     "owner": "simple-icons",
     "repo": "simple-icons",
-    "rev": "954790ce652942533e9e59bfb9c8cc7e99962f88",
-    "hash": "sha256-mNqiWA/wvJxAMwzzeWXb/77JAFvJL707ktEdRHJctO4="
+    "rev": "6dcfdc2f58f6150d7b097b5cab158d27413f6366",
+    "hash": "sha256-U8IiqIux89K7NagWddz4Rq+OGCjWVhuR33rhjyqY6nM="
 }

From b4e9af00229df4d29a4ce6819f88cfb256437b92 Mon Sep 17 00:00:00 2001
From: Jennifer Graul <jgraul@relaix.net>
Date: Fri, 27 Dec 2024 11:56:41 +0100
Subject: [PATCH 137/340] nixos/librenms: fix optimizations and view cache on
 new installations

The optimizations and view-cache require an initialized database to
work, so the current state breaks new installations. This commit fixes
that by performing the optimizations and view caching after the database
migrations.
---
 nixos/modules/services/monitoring/librenms.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix
index 6e7b5b3de4c87..e3f0d486ae697 100644
--- a/nixos/modules/services/monitoring/librenms.nix
+++ b/nixos/modules/services/monitoring/librenms.nix
@@ -603,15 +603,10 @@ in
         ''
       )
       + ''
-        # clear cache after update and regenerate optimizations
+        # clear cache after update (before migrations)
         OLD_VERSION=$(cat ${cfg.dataDir}/version)
         if [[ $OLD_VERSION != "${package.version}" ]]; then
           rm -r ${cfg.dataDir}/cache/*
-          ${artisanWrapper}/bin/librenms-artisan view:clear
-          ${artisanWrapper}/bin/librenms-artisan optimize:clear
-          ${artisanWrapper}/bin/librenms-artisan view:cache
-          ${artisanWrapper}/bin/librenms-artisan optimize
-          echo "${package.version}" > ${cfg.dataDir}/version
         fi
 
         # convert rrd files when the oneMinutePolling option is changed
@@ -623,6 +618,15 @@ in
 
         # migrate db
         ${artisanWrapper}/bin/librenms-artisan migrate --force --no-interaction
+
+        # regenerate cache after migrations after update
+        if [[ $OLD_VERSION != "${package.version}" ]]; then
+          ${artisanWrapper}/bin/librenms-artisan view:clear
+          ${artisanWrapper}/bin/librenms-artisan optimize:clear
+          ${artisanWrapper}/bin/librenms-artisan view:cache
+          ${artisanWrapper}/bin/librenms-artisan optimize
+          echo "${package.version}" > ${cfg.dataDir}/version
+        fi
       '';
     };
 

From 5d35353424f0eac994bc7320f0da2d4d7cf0b2c8 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Fri, 27 Dec 2024 08:23:24 -0300
Subject: [PATCH 138/340] taskwarrior3: use the correct tag for version 3.3.0

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/ta/taskwarrior3/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix
index e9b1c4959185b..5690226ff8942 100644
--- a/pkgs/by-name/ta/taskwarrior3/package.nix
+++ b/pkgs/by-name/ta/taskwarrior3/package.nix
@@ -26,8 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "GothenburgBitFactory";
     repo = "taskwarrior";
-    rev = "dcbe916286792e6f5d2d3af3baab79918ebc5f71";
-    hash = "sha256-jma1BYZugMH+JiX5Xu6VI8ZFn4FBr1NxbNrOHX0bFk0=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-aKDwRCJ1yopRdsPxnHhgOpSho1i8/dcAurI+XhpSbn4=";
     fetchSubmodules = true;
   };
   cargoDeps = rustPlatform.fetchCargoTarball {

From c7cadfffda24853b99d5c1056a51cdf75d7978bc Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Fri, 27 Dec 2024 08:23:24 -0300
Subject: [PATCH 139/340] taskwarrior3: use versionCheckHook to prevent future
 commit/version mismatches.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/ta/taskwarrior3/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix
index 5690226ff8942..4aa1d000bd5a4 100644
--- a/pkgs/by-name/ta/taskwarrior3/package.nix
+++ b/pkgs/by-name/ta/taskwarrior3/package.nix
@@ -19,6 +19,9 @@
 
   # nativeCheckInputs
   python3,
+
+  # nativeInstallCheckInputs
+  versionCheckHook,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "taskwarrior";
@@ -90,6 +93,14 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
+
   postInstall = ''
     # ZSH is installed automatically from some reason, only bash and fish need
     # manual installation

From 97662590992832475a7a3b8ec00ced23ff008abb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 11:43:03 +0000
Subject: [PATCH 140/340] python312Packages.botocore-stubs: 1.35.87 -> 1.35.88

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

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 2ad15278f2398..16c3f4f769f2f 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.35.87";
+  version = "1.35.88";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-CeKiwHV/uVoMpZXHJOtaFR8cTCZLUcQ8vbVYU6eWxMQ=";
+    hash = "sha256-0kYZ5reA087sjwKlxDb3SIar+d0pXWENhLOMUjQKp3o=";
   };
 
   nativeBuildInputs = [ setuptools ];

From d7864a4b37c6e89db00fdfd2f95c57e3d48d6b7b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 11:43:03 +0000
Subject: [PATCH 141/340] python312Packages.boto3-stubs: 1.35.87 -> 1.35.88

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 51797bc22c093..3464743e20c2a 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.35.87";
+  version = "1.35.88";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-hcGlTzDjO1qzlGEzJ1vvP84feuj9l1JVMjEPVzvQ444=";
+    hash = "sha256-EWAlHIz8xYHO0/kNkAvmOVpZb5fG8UPGZepO33XNoYw=";
   };
 
   build-system = [ setuptools ];

From c5f91fe86cc1e73f72e25b740b24ae53ed279741 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Fri, 27 Dec 2024 08:34:24 -0300
Subject: [PATCH 142/340] taskwarrior3: use GitHub releases as changelogs

Upstream links to the releases instead of the changelog file: https://taskwarrior.org/news/news.20241219/

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/ta/taskwarrior3/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix
index 4aa1d000bd5a4..277c540256811 100644
--- a/pkgs/by-name/ta/taskwarrior3/package.nix
+++ b/pkgs/by-name/ta/taskwarrior3/package.nix
@@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.tests.nixos = nixosTests.taskchampion-sync-server;
 
   meta = {
-    changelog = "https://github.com/GothenburgBitFactory/taskwarrior/blob/${finalAttrs.src.rev}/ChangeLog";
+    changelog = "https://github.com/GothenburgBitFactory/taskwarrior/releases/tag/v${finalAttrs.src.rev}";
     description = "Highly flexible command-line tool to manage TODO lists";
     homepage = "https://taskwarrior.org";
     license = lib.licenses.mit;

From 765b524bac96fb369931d64b38f5fdf2b3e6ef36 Mon Sep 17 00:00:00 2001
From: arminius-smh <armin@sprejz.de>
Date: Fri, 27 Dec 2024 12:21:23 +0100
Subject: [PATCH 143/340] {hyprgui, hyprlauncher, hyprwall}: remove package

---
 pkgs/by-name/hy/hyprgui/package.nix      | 59 ------------------------
 pkgs/by-name/hy/hyprlauncher/package.nix | 47 -------------------
 pkgs/by-name/hy/hyprwall/package.nix     | 54 ----------------------
 pkgs/top-level/aliases.nix               |  3 ++
 4 files changed, 3 insertions(+), 160 deletions(-)
 delete mode 100644 pkgs/by-name/hy/hyprgui/package.nix
 delete mode 100644 pkgs/by-name/hy/hyprlauncher/package.nix
 delete mode 100644 pkgs/by-name/hy/hyprwall/package.nix

diff --git a/pkgs/by-name/hy/hyprgui/package.nix b/pkgs/by-name/hy/hyprgui/package.nix
deleted file mode 100644
index 5e95b6cd19251..0000000000000
--- a/pkgs/by-name/hy/hyprgui/package.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-  pkg-config,
-  glib,
-  pango,
-  cairo,
-  gtk4,
-  wrapGAppsHook4,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "hyprgui";
-  version = "0.2.0";
-
-  src = fetchFromGitHub {
-    owner = "hyprutils";
-    repo = "hyprgui";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-akV83bvPuSJUleP0mDcnAR1KFegOXyoKSD0CVyNDJmc=";
-  };
-
-  cargoHash = "sha256-SBI2Gk4FImGw8169xIV8L0fbfcKzn6PqvLg6XxbpurI=";
-
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    pkg-config
-    wrapGAppsHook4
-  ];
-
-  buildInputs = [
-    glib
-    cairo
-    pango
-    gtk4
-  ];
-
-  prePatch = ''
-    substituteInPlace hyprgui.desktop \
-    --replace-fail "/usr/bin/" ""
-  '';
-
-  postInstall = ''
-    install -Dm644 -t $out/usr/share/icons hyprgui.png
-    install -Dm644 -t $out/usr/share/applications hyprgui.desktop
-    install -Dm644 -t $out/usr/share/licenses/${pname} LICENSE
-  '';
-
-  meta = {
-    description = "GUI for configuring Hyprland written in Rust";
-    homepage = "https://github.com/hyprutils/hyprgui";
-    license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ fccapria ];
-    badPlatforms = lib.platforms.darwin;
-    mainProgram = "hyprgui";
-  };
-}
diff --git a/pkgs/by-name/hy/hyprlauncher/package.nix b/pkgs/by-name/hy/hyprlauncher/package.nix
deleted file mode 100644
index 343a7b5da8763..0000000000000
--- a/pkgs/by-name/hy/hyprlauncher/package.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-  pkg-config,
-  glib,
-  pango,
-  gtk4,
-  gtk4-layer-shell,
-  wrapGAppsHook4,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "hyprlauncher";
-  version = "0.2.8";
-
-  src = fetchFromGitHub {
-    owner = "hyprutils";
-    repo = "hyprlauncher";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-+CFMGWK7W8BWIY2Xg4P7VLYQ7wQmmmjGSM5Rzq8yMSY=";
-  };
-
-  cargoHash = "sha256-epvUpsWkkJqWuUjsbHQaHMcBkDc06ke56I/5/QEag/g=";
-
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    pkg-config
-    wrapGAppsHook4
-  ];
-  buildInputs = [
-    glib
-    pango
-    gtk4
-    gtk4-layer-shell
-  ];
-
-  meta = {
-    description = "GUI for launching applications, written in Rust";
-    homepage = "https://github.com/hyprutils/hyprlauncher";
-    license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ arminius-smh ];
-    platforms = lib.platforms.linux;
-    mainProgram = "hyprlauncher";
-  };
-}
diff --git a/pkgs/by-name/hy/hyprwall/package.nix b/pkgs/by-name/hy/hyprwall/package.nix
deleted file mode 100644
index 712f727a59718..0000000000000
--- a/pkgs/by-name/hy/hyprwall/package.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-
-  pkg-config,
-  glib,
-  pango,
-  gtk3,
-  wrapGAppsHook4,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "hyprwall";
-  version = "0.1.9";
-
-  src = fetchFromGitHub {
-    owner = "hyprutils";
-    repo = "hyprwall";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-A4lOEO7xKdKCUGv0scrGlwgkM8ekAWErzaN1DdgMMlA=";
-  };
-
-  cargoHash = "sha256-ZyVHkQGv+THb2cAHH3V8nb3x9ZmpoSdR8CV7AiWQ8as=";
-
-  nativeBuildInputs = [
-    pkg-config
-    glib
-    pango
-    wrapGAppsHook4
-  ];
-
-  # Required in build process, prevents gdk-sys build error.
-  buildInputs = [
-    gtk3
-  ];
-
-  postInstall = ''
-    install -Dm644 hyprwall.desktop -t $out/share/applications
-    install -Dm644 hyprwall.png -t $out/share/pixmaps
-    substituteInPlace "$out/share/applications/hyprwall.desktop" \
-      --replace-fail 'Exec=/usr/bin/hyprwall' "Exec=hyprwall"
-  '';
-
-  meta = {
-    description = "GUI for setting wallpapers with hyprpaper";
-    homepage = "https://github.com/hyprutils/hyprwall";
-    changelog = "https://github.com/hyprutils/hyprwall/releases/tag/v${version}";
-    license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ genga898 ];
-    mainProgram = "hyprwall";
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8bcab1c543e93..9780c04cbc4ab 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -550,6 +550,9 @@ mapAliases {
   ht-rust = throw "'ht-rust' has been renamed to/replaced by 'xh'"; # Converted to throw 2024-10-17
   hydra_unstable = hydra; # Added 2024-08-22
   hydron = throw "hydron has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability";
+  hyprgui = throw "hyprgui has been removed as the repository is deleted"; # Added 2024-12-27
+  hyprlauncher = throw "hyprlauncher has been removed as the repository is deleted"; # Added 2024-12-27
+  hyprwall = throw "hyprwall has been removed as the repository is deleted"; # Added 2024-12-27
 
 
   ### I ###

From 7332711cef59c81020a83c855fa764883175bb82 Mon Sep 17 00:00:00 2001
From: pcboy <david.hagege@gmail.com>
Date: Tue, 24 Dec 2024 13:22:40 +0900
Subject: [PATCH 144/340] oscar: 1.5.3 -> 1.6.0

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

diff --git a/pkgs/by-name/os/oscar/package.nix b/pkgs/by-name/os/oscar/package.nix
index b32e7e33db8f1..566a14cce6bb7 100644
--- a/pkgs/by-name/os/oscar/package.nix
+++ b/pkgs/by-name/os/oscar/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "oscar";
-  version = "1.5.3";
+  version = "1.6.0";
 
   src = fetchFromGitLab {
-    owner = "pholy";
+    owner = "CrimsonNape";
     repo = "OSCAR-code";
-    rev = "${version}";
-    hash = "sha256-ukd2pni4qEwWxG4lr8KUliZO/R2eziTTuSvDo8uigxQ=";
+    rev = "v${version}";
+    hash = "sha256-1rHgajjs+Vt9lcqkqKy92pWQLjvAHE10fPUTy8hurw4=";
   };
 
   buildInputs = [

From b33d1ab9591a8a84d48f650df714b48ada31b746 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 27 Dec 2024 13:11:47 +0100
Subject: [PATCH 145/340] python312Packages.tencentcloud-sdk-python: 3.0.1289
 -> 3.0.1290

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1289...3.0.1290

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1290/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index eb69e65c1e538..30c83cb86004b 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1289";
+  version = "3.0.1290";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-8i7E9WTHJf4C/1JoS34BObtD/tc60CqYwgyNBKZjAhc=";
+    hash = "sha256-sGIJKU3q+TGDMW6LWtbyiGq1wv1iFRQJ2MBtjK+zqqY=";
   };
 
   build-system = [ setuptools ];

From fc1bc8d90bc987b55433c6355c42c01ddaebbd09 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 12:12:00 +0000
Subject: [PATCH 146/340] cargo-deb: 2.9.3 -> 2.9.4

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

diff --git a/pkgs/by-name/ca/cargo-deb/package.nix b/pkgs/by-name/ca/cargo-deb/package.nix
index c62e12e1e5cfb..63fa78ef0cd8e 100644
--- a/pkgs/by-name/ca/cargo-deb/package.nix
+++ b/pkgs/by-name/ca/cargo-deb/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-deb";
-  version = "2.9.3";
+  version = "2.9.4";
 
   src = fetchFromGitHub {
     owner = "kornelski";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-cGt+oAWpBHTBDrKS3EC0UsjVlUOaApArSnTvC9gQdIM=";
+    hash = "sha256-jTmETLENCUaGIJIN2smSS+QKNco0mFJWrOkQgiMBcz8=";
   };
 
-  cargoHash = "sha256-qIiVBLP+eKaVj0J4CaWG0KcCjC5cbaY7r4ugFsIVJGQ=";
+  cargoHash = "sha256-QruSmVER4WE0++b5MHKCtVduQkyF2Dkszw6gmhdZEKs=";
 
   nativeBuildInputs = [
     makeWrapper

From 0dad33af8beb1a19b2b3ea77f9450bae11ddb870 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 12:12:50 +0000
Subject: [PATCH 147/340] proton-pass: 1.26.0 -> 1.27.0

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

diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix
index 9540150734a7d..e79fb1340f552 100644
--- a/pkgs/by-name/pr/proton-pass/package.nix
+++ b/pkgs/by-name/pr/proton-pass/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-pass";
-  version = "1.26.0";
+  version = "1.27.0";
 
   src = fetchurl {
     url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb";
-    hash = "sha256:1qmc2yj9vyccl0s0i5fvq1pgg0aba87pzfrp1hbs9hvx0nwx9n5m";
+    hash = "sha256-OLnBmKmx4necZHXbyUfB3Nl2UFSz1Ff/yBuHmNwTGjU=";
   };
 
   dontConfigure = true;

From 0dc79dda75c0cfb314daabd288f8385788665138 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 27 Dec 2024 13:23:49 +0100
Subject: [PATCH 148/340] python312Packages.pynordpool: 0.2.3 -> 0.2.4

Diff: https://github.com/gjohansson-ST/pynordpool/compare/refs/tags/v0.2.3...v0.2.4

Changelog: https://github.com/gjohansson-ST/pynordpool/releases/tag/v0.2.4
---
 pkgs/development/python-modules/pynordpool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pynordpool/default.nix b/pkgs/development/python-modules/pynordpool/default.nix
index 3b2f0d6b51a04..38246ac140725 100644
--- a/pkgs/development/python-modules/pynordpool/default.nix
+++ b/pkgs/development/python-modules/pynordpool/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pynordpool";
-  version = "0.2.3";
+  version = "0.2.4";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "gjohansson-ST";
     repo = "pynordpool";
     rev = "refs/tags/v${version}";
-    hash = "sha256-QNPq2KKUDgxf2VQ/O+/dywLY6RcHfU2RaC2sohjVmaI=";
+    hash = "sha256-OGCVNVFbJfhjNKKpLRUvZIj7ZIYz/IVlt9xEPJb5W8E=";
   };
 
   build-system = [ poetry-core ];

From 7cbf57cb44a7074ab1d446ad437c683c9222ada6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 27 Dec 2024 13:25:18 +0100
Subject: [PATCH 149/340] python312Packages.bloodyad: 2.1.5 -> 2.1.7

Diff: https://github.com/CravateRouge/bloodyAD/compare/refs/tags/v2.1.5...v2.1.7

Changelog: https://github.com/CravateRouge/bloodyAD/releases/tag/v2.1.7
---
 pkgs/development/python-modules/bloodyad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix
index 34a601035813d..5a37bd80e879e 100644
--- a/pkgs/development/python-modules/bloodyad/default.nix
+++ b/pkgs/development/python-modules/bloodyad/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "bloodyad";
-  version = "2.1.5";
+  version = "2.1.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "CravateRouge";
     repo = "bloodyAD";
     rev = "refs/tags/v${version}";
-    hash = "sha256-98Fm5c2BWRTuazVMM3v7s2ad5M0nOFQ+H+60whYhnDE=";
+    hash = "sha256-0BzVZ1aIjcq6D95hBjO+ahHaA48bmyaPAYHTAwQHaQg=";
   };
 
   build-system = [ hatchling ];

From cc38f61d50a27b8e57122fb89fd0b3e51a1912c3 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 27 Dec 2024 13:35:10 +0100
Subject: [PATCH 150/340] wlcs: Fix GCC 14 compat

---
 pkgs/by-name/wl/wlcs/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/wl/wlcs/package.nix b/pkgs/by-name/wl/wlcs/package.nix
index 260f312ac2815..6a81ca9b25e21 100644
--- a/pkgs/by-name/wl/wlcs/package.nix
+++ b/pkgs/by-name/wl/wlcs/package.nix
@@ -3,6 +3,7 @@
   lib,
   gitUpdater,
   fetchFromGitHub,
+  fetchpatch,
   testers,
   cmake,
   pkg-config,
@@ -23,6 +24,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-BQPRymkbGu4YvTYXTaTMuyP5fHpqMWI4xPwjDRHZNEQ=";
   };
 
+  patches = [
+    # Remove when version > 1.7.0
+    (fetchpatch {
+      name = "0001-wlcs-Fix-GCC14-compat.patch";
+      url = "https://github.com/canonical/wlcs/commit/5c812e560052e2cbff4c6d26439935020ddee52f.patch";
+      hash = "sha256-8YrVKhgpTYZi8n4dZ4pRWJoAcZtr9eaFMv0NNV7/kWU=";
+    })
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs = [
@@ -38,6 +48,9 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner # needed by cmake
   ];
 
+  # GCC14-exclusive maybe-uninitialized error at higher optimisation levels that looks weird
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=maybe-uninitialized";
+
   passthru = {
     tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
     updateScript = gitUpdater {

From 0e5a17a6933cc441cf240af6f5fd5db5e5f7dd89 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 26 Dec 2024 23:38:52 +0100
Subject: [PATCH 151/340] mir_2_15: Fix GCC 14 compat

---
 ...nored-return-value-of-std-lock_guard.patch | 40 ++++++++++
 ...5-Add-missing-includes-for-algorithm.patch | 77 +++++++++++++++++++
 ...-mir-2_15-calloc-args-in-right-order.patch | 35 +++++++++
 pkgs/servers/mir/default.nix                  | 16 ++++
 4 files changed, 168 insertions(+)
 create mode 100644 pkgs/servers/mir/1001-mir-2_15-Fix-ignored-return-value-of-std-lock_guard.patch
 create mode 100644 pkgs/servers/mir/1002-mir-2_15-Add-missing-includes-for-algorithm.patch
 create mode 100644 pkgs/servers/mir/1003-mir-2_15-calloc-args-in-right-order.patch

diff --git a/pkgs/servers/mir/1001-mir-2_15-Fix-ignored-return-value-of-std-lock_guard.patch b/pkgs/servers/mir/1001-mir-2_15-Fix-ignored-return-value-of-std-lock_guard.patch
new file mode 100644
index 0000000000000..36aac368e4a29
--- /dev/null
+++ b/pkgs/servers/mir/1001-mir-2_15-Fix-ignored-return-value-of-std-lock_guard.patch
@@ -0,0 +1,40 @@
+From d31d3abb36163b0f0a892898349d6a99aaf50e10 Mon Sep 17 00:00:00 2001
+From: OPNA2608 <opna2608@protonmail.com>
+Date: Thu, 26 Dec 2024 23:12:39 +0100
+Subject: [PATCH] Fix ignored return value of std::lock_guard
+
+Upstream this seems to have been resolved as part of the big platform API change, so manually rewrote this change into a patch.
+---
+ src/platforms/wayland/displayclient.cpp         | 2 +-
+ src/server/frontend_xwayland/xcb_connection.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/platforms/wayland/displayclient.cpp b/src/platforms/wayland/displayclient.cpp
+index 27bdfe5..987be52 100644
+--- a/src/platforms/wayland/displayclient.cpp
++++ b/src/platforms/wayland/displayclient.cpp
+@@ -563,7 +563,7 @@ void mgw::DisplayClient::on_display_config_changed()
+ 
+ void mgw::DisplayClient::delete_outputs_to_be_deleted()
+ {
+-    std::lock_guard{outputs_mutex};
++    std::lock_guard lock{outputs_mutex};
+     outputs_to_be_deleted.clear();
+ }
+ 
+diff --git a/src/server/frontend_xwayland/xcb_connection.cpp b/src/server/frontend_xwayland/xcb_connection.cpp
+index 4f72b98..0be74b0 100644
+--- a/src/server/frontend_xwayland/xcb_connection.cpp
++++ b/src/server/frontend_xwayland/xcb_connection.cpp
+@@ -207,7 +207,7 @@ void mf::XCBConnection::verify_not_in_error_state() const
+ 
+ auto mf::XCBConnection::query_name(xcb_atom_t atom) const -> std::string
+ {
+-    std::lock_guard{atom_name_cache_mutex};
++    std::lock_guard lock{atom_name_cache_mutex};
+     auto const iter = atom_name_cache.find(atom);
+ 
+     if (iter == atom_name_cache.end())
+-- 
+2.47.0
+
diff --git a/pkgs/servers/mir/1002-mir-2_15-Add-missing-includes-for-algorithm.patch b/pkgs/servers/mir/1002-mir-2_15-Add-missing-includes-for-algorithm.patch
new file mode 100644
index 0000000000000..6dbae628326ba
--- /dev/null
+++ b/pkgs/servers/mir/1002-mir-2_15-Add-missing-includes-for-algorithm.patch
@@ -0,0 +1,77 @@
+From ab00b6d09303c17ecc7a2131a95591716e9ad7a1 Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely@fedoraproject.org>
+Date: Thu, 26 Dec 2024 23:00:23 +0100
+Subject: [PATCH] Add missing includes for <algorithm>
+
+Co-authored-by: OPNA2608 <opna2608@protonmail.com>
+---
+ src/miral/external_client.cpp                                  | 1 +
+ src/miral/keymap.cpp                                           | 1 +
+ src/platform/graphics/linux_dmabuf.cpp                         | 1 +
+ src/server/scene/rendering_tracker.cpp                         | 1 +
+ tests/unit-tests/graphics/test_overlapping_output_grouping.cpp | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/src/miral/external_client.cpp b/src/miral/external_client.cpp
+index 0c3d176..792b962 100644
+--- a/src/miral/external_client.cpp
++++ b/src/miral/external_client.cpp
+@@ -22,6 +22,7 @@
+ #include <mir/options/option.h>
+ #include <mir/server.h>
+ 
++#include <algorithm>
+ #include <stdexcept>
+ 
+ namespace mo = mir::options;
+diff --git a/src/miral/keymap.cpp b/src/miral/keymap.cpp
+index e494a10..010cb75 100644
+--- a/src/miral/keymap.cpp
++++ b/src/miral/keymap.cpp
+@@ -30,6 +30,7 @@
+ #define MIR_LOG_COMPONENT "miral::Keymap"
+ #include <mir/log.h>
+ 
++#include <algorithm>
+ #include <mutex>
+ #include <string>
+ #include <vector>
+diff --git a/src/platform/graphics/linux_dmabuf.cpp b/src/platform/graphics/linux_dmabuf.cpp
+index f5a750f..840c3d0 100644
+--- a/src/platform/graphics/linux_dmabuf.cpp
++++ b/src/platform/graphics/linux_dmabuf.cpp
+@@ -41,6 +41,7 @@
+ #include <mutex>
+ #include <vector>
+ #include <optional>
++#include <algorithm>
+ #include <drm_fourcc.h>
+ #include <wayland-server.h>
+ 
+diff --git a/src/server/scene/rendering_tracker.cpp b/src/server/scene/rendering_tracker.cpp
+index fe4e05e..24393a3 100644
+--- a/src/server/scene/rendering_tracker.cpp
++++ b/src/server/scene/rendering_tracker.cpp
+@@ -17,6 +17,7 @@
+ #include "rendering_tracker.h"
+ #include "mir/scene/surface.h"
+ 
++#include <algorithm>
+ #include <stdexcept>
+ #include <boost/throw_exception.hpp>
+ 
+diff --git a/tests/unit-tests/graphics/test_overlapping_output_grouping.cpp b/tests/unit-tests/graphics/test_overlapping_output_grouping.cpp
+index 4478578..7167ad1 100644
+--- a/tests/unit-tests/graphics/test_overlapping_output_grouping.cpp
++++ b/tests/unit-tests/graphics/test_overlapping_output_grouping.cpp
+@@ -22,6 +22,7 @@
+ #include <gtest/gtest.h>
+ 
+ #include <vector>
++#include <algorithm>
+ 
+ namespace mg = mir::graphics;
+ namespace geom = mir::geometry;
+-- 
+2.47.0
+
diff --git a/pkgs/servers/mir/1003-mir-2_15-calloc-args-in-right-order.patch b/pkgs/servers/mir/1003-mir-2_15-calloc-args-in-right-order.patch
new file mode 100644
index 0000000000000..9376fc7d196f4
--- /dev/null
+++ b/pkgs/servers/mir/1003-mir-2_15-calloc-args-in-right-order.patch
@@ -0,0 +1,35 @@
+From 2b3fa53f0115d73d1d515f8c839fc481ba5db46d Mon Sep 17 00:00:00 2001
+From: Alan Griffiths <alan@octopull.co.uk>
+Date: Thu, 26 Dec 2024 23:21:12 +0100
+Subject: [PATCH] calloc args in right order
+
+Co-authored-by: OPNA2608 <opna2608@protonmail.com>
+---
+ examples/client/wayland_client.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/examples/client/wayland_client.c b/examples/client/wayland_client.c
+index a52b04c..e644a44 100644
+--- a/examples/client/wayland_client.c
++++ b/examples/client/wayland_client.c
+@@ -375,7 +375,7 @@ int main(int argc, char** argv)
+ 
+     struct wl_display* display = wl_display_connect(NULL);
+     struct globals* globals;
+-    globals = calloc(sizeof *globals, 1);
++    globals = calloc(1, sizeof *globals);
+ 
+     struct wl_registry* registry = wl_display_get_registry(display);
+ 
+@@ -389,7 +389,7 @@ int main(int argc, char** argv)
+     void* pool_data = NULL;
+     struct wl_shm_pool* shm_pool = make_shm_pool(globals->shm, 400 * 400 * 4, &pool_data);
+ 
+-    struct draw_context* ctx = calloc(sizeof *ctx, 1);
++    struct draw_context* ctx = calloc(1, sizeof *ctx);
+ 
+     for (int i = 0; i < 4; ++i)
+     {
+-- 
+2.47.0
+
diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix
index 8fcc689ddd66b..a5e066e81225d 100644
--- a/pkgs/servers/mir/default.nix
+++ b/pkgs/servers/mir/default.nix
@@ -28,6 +28,22 @@ in
         url = "https://github.com/canonical/mir/commit/0704026bd06372ea8286a46d8c939286dd8a8c68.patch";
         hash = "sha256-k+51piPQandbHdm+ioqpBrb+C7Aqi2kugchAehZ1aiU=";
       })
+
+      # Fix ignored return value of std::lock_guard
+      # Remove when version > 2.15.0
+      # Was changed as part of the big platform API change, no individual upstream commit with this fix
+      ./1001-mir-2_15-Fix-ignored-return-value-of-std-lock_guard.patch
+
+      # Fix missing includes for methods from algorithm
+      # Remove when version > 2.16.4
+      # https://github.com/canonical/mir/pull/3191 backported to 2.15
+      ./1002-mir-2_15-Add-missing-includes-for-algorithm.patch
+
+      # Fix order of calloc arguments
+      # Remove when version > 2.16.4
+      # Partially done in https://github.com/canonical/mir/pull/3192, though one of the calloc was fixed earlier
+      # when some code was moved into that file
+      ./1003-mir-2_15-calloc-args-in-right-order.patch
     ];
   };
 }

From 1eb2afe80af9bfe1816219c715960c28cdb28a63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 12:40:11 +0000
Subject: [PATCH 152/340] homebank: 5.8.5 -> 5.8.6

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

diff --git a/pkgs/by-name/ho/homebank/package.nix b/pkgs/by-name/ho/homebank/package.nix
index 3ea15a1d5d13d..e9215b14d785a 100644
--- a/pkgs/by-name/ho/homebank/package.nix
+++ b/pkgs/by-name/ho/homebank/package.nix
@@ -13,10 +13,10 @@
 
 stdenv.mkDerivation rec {
   pname = "homebank";
-  version = "5.8.5";
+  version = "5.8.6";
   src = fetchurl {
     url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz";
-    hash = "sha256-TrRFHleEA5VGjC1qP+TQFq2gun1Hyn8c7AQYwKEznpc=";
+    hash = "sha256-rxOKe/LNeVwTOMXj2emZCe5rM9kgxhjcNcZHf9gm3fU=";
   };
 
   nativeBuildInputs = [

From df50ecffeab09f8da2c750649f098ca8dac2fd7a Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Thu, 26 Dec 2024 19:10:45 -0800
Subject: [PATCH 153/340] openscad: fix build

---
 pkgs/applications/graphics/openscad/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index 9299811de9cea..a3f11641ed4d0 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -64,6 +64,11 @@ mkDerivation rec {
     })
   ];
 
+  postPatch = ''
+    substituteInPlace src/FileModule.cc \
+      --replace-fail 'fs::is_regular' 'fs::is_regular_file'
+  '';
+
   nativeBuildInputs = [
     bison
     flex

From 71deedcabc3c411d049d6cd39cc674ddbba3886a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 12:49:00 +0000
Subject: [PATCH 154/340] xemu: 0.7.134 -> 0.7.135

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

diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix
index 6ac359aa818db..955ecbf94266b 100644
--- a/pkgs/by-name/xe/xemu/package.nix
+++ b/pkgs/by-name/xe/xemu/package.nix
@@ -27,14 +27,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xemu";
-  version = "0.7.134";
+  version = "0.7.135";
 
   src = fetchFromGitHub {
     owner = "xemu-project";
     repo = "xemu";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-HnTNd1+VDfzetstrsQs/CpyD9XzHQGj0O912I+ejJCE=";
+    hash = "sha256-lTZ5j5ULh4GFW4zlQy4l7e4zr8TEIvenGNC59O6G0Wg=";
   };
 
   nativeBuildInputs =

From 0efb6fabcdab02708a2c9ec0cd4046f2c6fab345 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 27 Dec 2024 13:58:47 +0100
Subject: [PATCH 155/340] mpb: fix build with gcc-14

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

diff --git a/pkgs/by-name/mp/mpb/package.nix b/pkgs/by-name/mp/mpb/package.nix
index e6eaedf90bcdb..4f57896e6ec93 100644
--- a/pkgs/by-name/mp/mpb/package.nix
+++ b/pkgs/by-name/mp/mpb/package.nix
@@ -44,6 +44,9 @@ stdenv.mkDerivation rec {
     perl
   ];
 
+  # Required for build with gcc-14
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion";
+
   enableParallelBuilding = true;
 
   configureFlags = [

From 5d80ea604d19f289134fe3fe2987468035447005 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 26 Dec 2024 14:14:11 +0000
Subject: [PATCH 156/340] xfce.xfce4-eyes-plugin: 4.6.0 -> 4.6.2

https://gitlab.xfce.org/panel-plugins/xfce4-eyes-plugin/-/compare/xfce4-eyes-plugin-4.6.0...xfce4-eyes-plugin-4.6.2
---
 .../xfce/panel-plugins/xfce4-eyes-plugin/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix
index 646027ad2bb30..d5b94ff30c452 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
+  gettext,
   pkg-config,
-  intltool,
   libxfce4util,
   xfce4-panel,
   libxfce4ui,
@@ -17,16 +17,16 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "xfce4-eyes-plugin";
-  version = "4.6.0";
+  version = "4.6.2";
 
   src = fetchurl {
     url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-rQ/wXYi6OTt8iSL4Iz7dM/wKTosAC2HeH486EMWuUyQ=";
+    sha256 = "sha256-ArSsY3YEoLkmJhbLlhPg/meX+2sPH8KImnfh4K1KAaU=";
   };
 
   nativeBuildInputs = [
+    gettext
     pkg-config
-    intltool
   ];
 
   buildInputs = [

From 0bc097d59be9e768fa8cd8de8a3dba0b0a1265f4 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 26 Dec 2024 14:14:26 +0000
Subject: [PATCH 157/340] xfce.xfce4-fsguard-plugin: 1.1.3 -> 1.1.4

https://gitlab.xfce.org/panel-plugins/xfce4-fsguard-plugin/-/compare/xfce4-fsguard-plugin-1.1.3...xfce4-fsguard-plugin-1.1.4
---
 .../xfce/panel-plugins/xfce4-fsguard-plugin/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix
index 7b0b5efd4a5dc..63c4ee9754aa8 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
+  gettext,
   pkg-config,
-  intltool,
   libxfce4util,
   xfce4-panel,
   libxfce4ui,
@@ -18,16 +18,16 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "xfce4-fsguard-plugin";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchurl {
     url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-hO+LtHUiktZMDvEBut97FESHkL+gqF3mRNv6Iphuwlg=";
+    sha256 = "sha256-JLN4m+bekmeOcDZnhTDE2ks4OKo82kKEOaqNFAcEpKY=";
   };
 
   nativeBuildInputs = [
+    gettext
     pkg-config
-    intltool
   ];
 
   buildInputs = [

From f588a43eff6def5a50ae618cd871b70dab75205b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 26 Dec 2024 14:14:38 +0000
Subject: [PATCH 158/340] xfce.xfce4-genmon-plugin: 4.2.0 -> 4.2.1

https://gitlab.xfce.org/panel-plugins/xfce4-genmon-plugin/-/compare/xfce4-genmon-plugin-4.2.0...xfce4-genmon-plugin-4.2.1
---
 .../xfce/panel-plugins/xfce4-genmon-plugin/default.nix    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix
index 09d07cfef3140..db753c33998e5 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
+  gettext,
   pkg-config,
-  intltool,
   libxfce4util,
   xfce4-panel,
   xfconf,
@@ -17,16 +17,16 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "xfce4-genmon-plugin";
-  version = "4.2.0";
+  version = "4.2.1";
 
   src = fetchurl {
     url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-lI0I7l8hQIR/EJtTG8HUzGJoSWkT6nYA08WtiQJaA2I=";
+    sha256 = "sha256-3lQFYuHqWPNanIFeIHNtJq9UGgqTcgERSMt1tfC2WVE=";
   };
 
   nativeBuildInputs = [
+    gettext
     pkg-config
-    intltool
   ];
 
   buildInputs = [

From 97c2bae1b9a37d42e1d57f12773f566ea1b35dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 28 Oct 2024 12:11:44 +0100
Subject: [PATCH 159/340] curl: choose automatically quictl when building with
 http3

---
 pkgs/by-name/cu/curlMinimal/package.nix | 13 +++++++++----
 pkgs/top-level/all-packages.nix         |  1 -
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix
index 43962736bb852..22aa1e4d64f3d 100644
--- a/pkgs/by-name/cu/curlMinimal/package.nix
+++ b/pkgs/by-name/cu/curlMinimal/package.nix
@@ -14,7 +14,7 @@
     !(isDarwin && (stdenv.buildPlatform != stdenv.hostPlatform))
   ), libkrb5
 , http2Support ? true, nghttp2
-, http3Support ? false, nghttp3, ngtcp2
+, http3Support ? false, nghttp3, ngtcp2, quictls
 , websocketSupport ? false
 , idnSupport ? false, libidn2
 , ldapSupport ? false, openldap
@@ -47,6 +47,10 @@
 
 assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsSupport ]) > 1);
 
+let
+  openssl' = if http3Support then quictls else openssl;
+in
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "curl";
   version = "8.11.0";
@@ -106,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionals http3Support [ nghttp3 ngtcp2 ] ++
     lib.optional idnSupport libidn2 ++
     lib.optional ldapSupport openldap ++
-    lib.optional opensslSupport openssl ++
+    lib.optional opensslSupport openssl' ++
     lib.optional pslSupport libpsl ++
     lib.optional rtmpSupport rtmpdump ++
     lib.optional scpSupport libssh2 ++
@@ -150,7 +154,7 @@ stdenv.mkDerivation (finalAttrs: {
       (lib.withFeatureAs brotliSupport "brotli" (lib.getDev brotli))
       (lib.withFeatureAs gnutlsSupport "gnutls" (lib.getDev gnutls))
       (lib.withFeatureAs idnSupport "libidn2" (lib.getDev libidn2))
-      (lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl))
+      (lib.withFeatureAs opensslSupport "openssl" (lib.getDev openssl'))
       (lib.withFeatureAs scpSupport "libssh2" (lib.getDev libssh2))
       (lib.withFeatureAs wolfsslSupport "wolfssl" (lib.getDev wolfssl))
     ]
@@ -205,7 +209,8 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = let
     useThisCurl = attr: attr.override { curl = finalAttrs.finalPackage; };
   in {
-    inherit opensslSupport openssl;
+    inherit opensslSupport;
+    openssl = openssl';
     tests = {
       withCheck = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; });
       fetchpatch = tests.fetchpatch.simple.override { fetchpatch = (fetchpatch.override { fetchurl = useThisCurl fetchurl; }) // { version = 1; }; };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c83fa3e94c33..c2db8608ac59b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3055,7 +3055,6 @@ with pkgs;
   };
 
   curlHTTP3 = curl.override {
-    openssl = quictls;
     http3Support = true;
   };
 

From c93f306fb2a4a69ce69ffa3ab4648059dc95d71b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 13:30:43 +0000
Subject: [PATCH 160/340] air: 1.61.4 -> 1.61.5

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

diff --git a/pkgs/by-name/ai/air/package.nix b/pkgs/by-name/ai/air/package.nix
index e690b06273b89..2a1dba853365d 100644
--- a/pkgs/by-name/ai/air/package.nix
+++ b/pkgs/by-name/ai/air/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "air";
-  version = "1.61.4";
+  version = "1.61.5";
 
   src = fetchFromGitHub {
     owner = "air-verse";
     repo = "air";
     rev = "v${version}";
-    hash = "sha256-ML+rdjD20gR8ajyZSs8HEgy1kOFh/MnpnZetQUuZRo0=";
+    hash = "sha256-QKNXEIMsw3MCfPg3Er9r3ncN6dxI2UsD7G/FcBIrP+Y=";
   };
 
   vendorHash = "sha256-tct0bWTvZhHslqPAe8uOwBx4z6gLAq57igcbV1tg9OU=";

From f6ffc98b5f49248e2bcaa211e268dce707434d0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 13:35:05 +0000
Subject: [PATCH 161/340] descent3-unwrapped: 1.5.0-beta-unstable-2024-12-14 ->
 1.5.0-beta-unstable-2024-12-20

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

diff --git a/pkgs/by-name/de/descent3-unwrapped/package.nix b/pkgs/by-name/de/descent3-unwrapped/package.nix
index bca14d4d8a02c..07eb4a2872bd5 100644
--- a/pkgs/by-name/de/descent3-unwrapped/package.nix
+++ b/pkgs/by-name/de/descent3-unwrapped/package.nix
@@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
   # the wrapped version of Descent 3. Once there’s a stable version of Descent
   # 3 that supports the -additionaldir command-line option, we can stop using
   # an unstable version of Descent 3.
-  version = "1.5.0-beta-unstable-2024-12-14";
+  version = "1.5.0-beta-unstable-2024-12-20";
   src = fetchFromGitHub {
     owner = "DescentDevelopers";
     repo = "Descent3";
-    rev = "6583bfe575e57effd877415c9d03b83c8e9e271e";
+    rev = "4ff0665dc4779c262f6dec4c50fdd4763acdfad3";
     fetchSubmodules = true;
     leaveDotGit = true;
     # Descent 3 is supposed to display its Git commit hash in the bottom right
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
       git rev-parse --verify HEAD | tr --delete '\n' > git-hash.txt
       rm -r .git
     '';
-    hash = "sha256-GQaYgmwAmAxdMq+7RQcElkX74xBAKbjYkx5W3MNWUvs=";
+    hash = "sha256-8pK+lniWBlsGQvWXwEpBnpDz2CMcCOmdSc4Q9Hedo3U=";
   };
 
   hardeningDisable = [ "format" ];

From 1dfb9803458d08e3c202a5818f416b3c09d69220 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 13:54:27 +0000
Subject: [PATCH 162/340] txr: 297 -> 298

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

diff --git a/pkgs/by-name/tx/txr/package.nix b/pkgs/by-name/tx/txr/package.nix
index 6d01c352a10de..9944600d61645 100644
--- a/pkgs/by-name/tx/txr/package.nix
+++ b/pkgs/by-name/tx/txr/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "txr";
-  version = "297";
+  version = "298";
 
   src = fetchurl {
     url = "https://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-S+0EryX+6AhQ6WjaSHYtLACkWk+pr9t9EqDkTPYlE4k=";
+    hash = "sha256-ScDxAfPuVJFZw72Q7gxDTOHFc+T+I+12T4LnMHWjECM=";
   };
 
   buildInputs = [ libffi ];

From f88a620c3b428540b7e28fd0ed9facaa4e8ecaa9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 13:56:07 +0000
Subject: [PATCH 163/340] rain: 1.19.0 -> 1.20.2

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

diff --git a/pkgs/by-name/ra/rain/package.nix b/pkgs/by-name/ra/rain/package.nix
index 5df5e7c559a28..60d4f83ca8753 100644
--- a/pkgs/by-name/ra/rain/package.nix
+++ b/pkgs/by-name/ra/rain/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "rain";
-  version = "1.19.0";
+  version = "1.20.2";
 
   src = fetchFromGitHub {
     owner = "aws-cloudformation";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-I5h09XbBDrMXQczpNoUENkOp3b4NxBR5Hr58nNVh1JM=";
+    sha256 = "sha256-T/J01oxiCaZ8vBzSvB3j+dacehHCFs5+46MIoc2DKLU=";
   };
 
-  vendorHash = "sha256-6xSWaLnE9pD2d49OVjg2IIbhgdJ5R2I0fuRZ4wFudoI=";
+  vendorHash = "sha256-ML65zg8TVblNcFVmvsiIwxRIfL+jxgUpLx2lVUFHXxI=";
 
   subPackages = [ "cmd/rain" ];
 

From 3fee6e7334d90ea8ab195f409ae4ac7af8df9157 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 26 Dec 2024 14:14:31 +0000
Subject: [PATCH 164/340] xfce.xfce4-mailwatch-plugin: 1.3.1 -> 1.3.2

https://gitlab.xfce.org/panel-plugins/xfce4-mailwatch-plugin/-/compare/xfce4-mailwatch-plugin-1.3.1...xfce4-mailwatch-plugin-1.3.2
---
 .../xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix
index 56c1a1ed732fc..7bea96464437d 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
+  gettext,
   pkg-config,
-  intltool,
   xfce4-panel,
   libxfce4ui,
   libxfce4util,
@@ -21,15 +21,15 @@ in
 
 stdenv.mkDerivation rec {
   pname = "xfce4-mailwatch-plugin";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchurl {
     url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-BUlk6f5MpmhIZACZHOHqAdB6rHuiNfSxTUqPfZgABGo=";
+    sha256 = "sha256-xHg/FTOJHNLgw0Bm2oWYZNzkWiPKpgFbWMufqdZafkQ=";
   };
 
   nativeBuildInputs = [
-    intltool
+    gettext
     pkg-config
   ];
 

From e70b676dbe62b383e7f428b1d8cc8aa063be80f0 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 26 Dec 2024 14:14:46 +0000
Subject: [PATCH 165/340] xfce.xfce4-netload-plugin: 1.4.1 -> 1.4.2

https://gitlab.xfce.org/panel-plugins/xfce4-netload-plugin/-/compare/xfce4-netload-plugin-1.4.1...xfce4-netload-plugin-1.4.2
---
 .../xfce/panel-plugins/xfce4-netload-plugin/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
index d27bb2517f1d2..dbd2bb31f2858 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
@@ -11,10 +11,10 @@
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-netload-plugin";
-  version = "1.4.1";
+  version = "1.4.2";
   rev-prefix = "xfce4-netload-plugin-";
   odd-unstable = false;
-  sha256 = "sha256-PwbyYi9EeSTKilVXlbseY2zkabcL7o2CGnk2DFFVI94=";
+  sha256 = "sha256-g4pkNzggVjC0AuUnJeleR3RQCrneetjDyv8eCXmrYzI=";
 
   buildInputs = [
     glib

From 365d9b9b0900f68d405962d96ab719665b831659 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 26 Dec 2024 14:14:52 +0000
Subject: [PATCH 166/340] xfce.xfce4-mpc-plugin: 0.5.3 -> 0.5.5

https://gitlab.xfce.org/panel-plugins/xfce4-mpc-plugin/-/compare/xfce4-mpc-plugin-0.5.3...xfce4-mpc-plugin-0.5.5
---
 .../xfce/panel-plugins/xfce4-mpc-plugin/default.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix
index e46b06be6ac42..163aa063a8506 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
+  gettext,
   pkg-config,
-  intltool,
   libxfce4util,
   xfce4-panel,
   libxfce4ui,
@@ -18,16 +18,16 @@ in
 
 stdenv.mkDerivation rec {
   pname = "xfce4-mpc-plugin";
-  version = "0.5.3";
+  version = "0.5.5";
 
   src = fetchurl {
     url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-BGf7TRrNmC08PguJy0EBmUaFBST/Ge0PZYqNVse3Zk0=";
+    sha256 = "sha256-TOfXdmeiY+6ZFsDKsqczsX471lcFzU7VzsPL3m5ymM8=";
   };
 
   nativeBuildInputs = [
+    gettext
     pkg-config
-    intltool
   ];
 
   buildInputs = [

From ca5b09239c164dc1b56a7e2bdcd6fd359b419550 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 26 Dec 2024 14:15:16 +0000
Subject: [PATCH 167/340] xfce.xfce4-sensors-plugin: 1.4.4 -> 1.4.5

https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/compare/xfce4-sensors-plugin-1.4.4...xfce4-sensors-plugin-1.4.5
---
 .../xfce/panel-plugins/xfce4-sensors-plugin/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
index dbc96665344f8..fa90acacee196 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
@@ -2,8 +2,8 @@
   stdenv,
   lib,
   fetchurl,
+  gettext,
   pkg-config,
-  intltool,
   gtk3,
   libxfce4ui,
   libxfce4util,
@@ -23,16 +23,16 @@ in
 
 stdenv.mkDerivation rec {
   pname = "xfce4-sensors-plugin";
-  version = "1.4.4";
+  version = "1.4.5";
 
   src = fetchurl {
     url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-bBYFpzjl30DghNCKyT+WLNRFCTOW3h6b+tx6tFiMNrY=";
+    sha256 = "sha256-9p/febf3bSqBckgoEkpvznaAOpEipMgt6PPfo++7F5o=";
   };
 
   nativeBuildInputs = [
+    gettext
     pkg-config
-    intltool
   ];
 
   buildInputs = [

From eed88db6e753b9cef6a568cfa3da334855b28775 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 26 Dec 2024 14:15:28 +0000
Subject: [PATCH 168/340] xfce.xfce4-systemload-plugin: 1.3.2 -> 1.3.3

https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/-/compare/xfce4-systemload-plugin-1.3.2...xfce4-systemload-plugin-1.3.3
---
 .../panel-plugins/xfce4-systemload-plugin/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix
index 245391eb4f578..2dacc464dca05 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
+  gettext,
   pkg-config,
-  intltool,
   xfce4-panel,
   libxfce4ui,
   xfconf,
@@ -15,16 +15,16 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "xfce4-systemload-plugin";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchurl {
     url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-uzA/wwIOBTrR+guPy/DXaBxVY7uPZJNX1qlaV3gCsHI=";
+    sha256 = "sha256-aFLV2cmnTQ4NtYLG9f5zkOvkii61aSF3rhLhxMzG78k=";
   };
 
   nativeBuildInputs = [
+    gettext
     pkg-config
-    intltool
   ];
 
   buildInputs = [

From f11a5f835f53aad671ff441e3626d38bc3b7e08f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 26 Dec 2024 14:15:40 +0000
Subject: [PATCH 169/340] xfce.xfce4-time-out-plugin: 1.1.3 -> 1.1.4

https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/compare/xfce4-time-out-plugin-1.1.3...xfce4-time-out-plugin-1.1.4
---
 .../xfce/panel-plugins/xfce4-time-out-plugin/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-time-out-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-time-out-plugin/default.nix
index 9b3c6b0c558fd..09d6d6fa6fe9b 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-time-out-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-time-out-plugin/default.nix
@@ -12,10 +12,10 @@
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-time-out-plugin";
-  version = "1.1.3";
+  version = "1.1.4";
   rev-prefix = "xfce4-time-out-plugin-";
   odd-unstable = false;
-  sha256 = "sha256-sm6y3t4nngZDg4Q8S3SVkNR++XkCKysQePN6Qei1OY8=";
+  sha256 = "sha256-FYcmeOBSBxcPSm/4j294DSi8XZBTKHvAwTBdj0yCY7o=";
 
   buildInputs = [
     glib

From e5301d972781f50bddb55873d64351ee93712181 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 26 Dec 2024 14:15:54 +0000
Subject: [PATCH 170/340] xfce.xfce4-timer-plugin: 1.7.2 -> 1.7.3

https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin/-/compare/xfce4-timer-plugin-1.7.2...xfce4-timer-plugin-1.7.3
---
 .../xfce/panel-plugins/xfce4-timer-plugin/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix
index e7cec4e64ccbe..7dc26f11bcf3f 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
+  gettext,
   pkg-config,
-  intltool,
   libxfce4util,
   xfce4-panel,
   libxfce4ui,
@@ -19,16 +19,16 @@ in
 
 stdenv.mkDerivation rec {
   pname = "xfce4-timer-plugin";
-  version = "1.7.2";
+  version = "1.7.3";
 
   src = fetchurl {
     url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-/rO4wtOVBegWaDVAoyJr172ocMy8tMfQ9qv+7/XFi30=";
+    sha256 = "sha256-rPTIYa+IYIuegCp2pLBYRr0wGJ4AhegmaAzBebbfTNM=";
   };
 
   nativeBuildInputs = [
+    gettext
     pkg-config
-    intltool
   ];
 
   buildInputs = [

From d882126ddd158c89ae1f9d2dd956408de59759c2 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 26 Dec 2024 14:15:48 +0000
Subject: [PATCH 171/340] xfce.xfce4-verve-plugin: 2.0.3 -> 2.0.4

https://gitlab.xfce.org/panel-plugins/xfce4-verve-plugin/-/compare/xfce4-verve-plugin-2.0.3...xfce4-verve-plugin-2.0.4
---
 .../xfce/panel-plugins/xfce4-verve-plugin/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix
index 4fd508b900099..1f4c876640215 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix
@@ -12,8 +12,8 @@
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-verve-plugin";
-  version = "2.0.3";
-  sha256 = "sha256-K335cs1vWKTNQjZlSUuhK8OmgTsKSzN87IZwS4RtvB8=";
+  version = "2.0.4";
+  sha256 = "sha256-j0uKYj9PeLEVaocHRw87Dz+YFqDr1BImejEpDPYObQg=";
 
   buildInputs = [
     glib

From be2656a520fb1251d7c4ae65258648cc28145a4c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 27 Dec 2024 22:08:32 +0800
Subject: [PATCH 172/340] xfce.xfce4-weather-plugin: Remove unused intltool

https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/commit/7af93709a44917a4a4b0a72244a4e5c7126cb1cf
---
 .../xfce/panel-plugins/xfce4-weather-plugin/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
index 7a56ed84fc61b..420fd62b68d69 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchurl,
+  gettext,
   pkg-config,
-  intltool,
   glib,
   gtk3,
   json_c,
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
+    gettext
     pkg-config
-    intltool
   ];
 
   buildInputs = [

From a50d1a95982bbf2ace768105126fa712e107d4f4 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 27 Dec 2024 22:19:03 +0800
Subject: [PATCH 173/340] xplayer: Remove

The upstream project was archived.
---
 pkgs/by-name/xp/xplayer/package.nix | 109 ----------------------------
 pkgs/top-level/aliases.nix          |   1 +
 2 files changed, 1 insertion(+), 109 deletions(-)
 delete mode 100644 pkgs/by-name/xp/xplayer/package.nix

diff --git a/pkgs/by-name/xp/xplayer/package.nix b/pkgs/by-name/xp/xplayer/package.nix
deleted file mode 100644
index d17b1f05b197b..0000000000000
--- a/pkgs/by-name/xp/xplayer/package.nix
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  autoreconfHook,
-  autoconf-archive,
-  clutter-gst,
-  clutter-gtk,
-  gettext,
-  glib,
-  gobject-introspection,
-  gst_all_1,
-  gtk-doc,
-  gtk3,
-  intltool,
-  itstool,
-  libpeas,
-  libxml2,
-  libxplayer-plparser,
-  pkg-config,
-  python3,
-  wrapGAppsHook3,
-  xapp,
-  yelp-tools,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "xplayer";
-  version = "2.4.4";
-
-  src = fetchFromGitHub {
-    owner = "linuxmint";
-    repo = pname;
-    rev = version;
-    hash = "sha256-o2vLNIELd1EYWG26t5gOpnamJrBJeg4P6fcLirkcmfM=";
-  };
-
-  # configure wants to find gst-inspect-1.0 via pkgconfig but
-  # the gstreamer toolsdir points to the wrong derivation output
-  postPatch = ''
-    substituteInPlace configure.ac \
-                      --replace '$gst10_toolsdir/gst-inspect-1.0' '${gst_all_1.gstreamer}/bin/gst-inspect-1.0' \
-  '';
-
-  preBuild = ''
-    makeFlagsArray+=(
-      "INCLUDES=-I${glib.dev}/include/gio-unix-2.0"
-      "CFLAGS=-Wno-error" # Otherwise a lot of deprecated warnings are treated as error
-    )
-  '';
-
-  nativeBuildInputs = [
-    autoreconfHook
-    wrapGAppsHook3
-    autoconf-archive
-    gettext
-    gtk-doc
-    intltool
-    itstool
-    pkg-config
-    python3.pkgs.wrapPython
-    yelp-tools
-    gobject-introspection
-  ];
-
-  buildInputs = [
-    clutter-gst
-    clutter-gtk
-    glib
-    gst_all_1.gst-plugins-bad
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good
-    gst_all_1.gstreamer
-    gtk3
-    libpeas
-    libxml2
-    libxplayer-plparser
-    python3
-    xapp
-    # to satisfy configure script
-    python3.pkgs.pygobject3
-  ];
-
-  postFixup = ''
-    buildPythonPath ${python3.pkgs.dbus-python}
-    patchPythonScript $out/lib/xplayer/plugins/dbus/dbusservice.py
-  '';
-
-  env = lib.optionalAttrs stdenv.cc.isGNU {
-    NIX_CFLAGS_COMPILE = toString [
-      "-Wno-error=incompatible-pointer-types"
-      "-Wno-error=return-mismatch"
-    ];
-  };
-
-  meta = with lib; {
-    description = "Generic media player from Linux Mint";
-    license = with licenses; [
-      gpl2Plus
-      lgpl21Plus
-    ];
-    homepage = "https://github.com/linuxmint/xplayer";
-    maintainers = with maintainers; [
-      tu-maurice
-      bobby285271
-    ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d7a6b1472926d..45f8ef708531c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1441,6 +1441,7 @@ mapAliases {
   xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10
   xournal = throw "'xournal' has been removed due to lack of activity upstream and depending on gnome2. Consider using 'xournalpp' instead."; # Added 2024-12-06
   xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18
+  xplayer = throw "xplayer has been removed as the upstream project was archived"; # Added 2024-12-27
   xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14
   xulrunner = firefox-unwrapped; # Added 2023-11-03
   xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17

From f5428fcd0a01be5dbcdcfcb881ecb50593600e35 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 27 Dec 2024 22:20:54 +0800
Subject: [PATCH 174/340] libxplayer-plparser: Remove

The upstream project was archived.
---
 .../li/libxplayer-plparser/package.nix        | 48 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 2 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 pkgs/by-name/li/libxplayer-plparser/package.nix

diff --git a/pkgs/by-name/li/libxplayer-plparser/package.nix b/pkgs/by-name/li/libxplayer-plparser/package.nix
deleted file mode 100644
index e6c64a78d06d5..0000000000000
--- a/pkgs/by-name/li/libxplayer-plparser/package.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  meson,
-  ninja,
-  gobject-introspection,
-  gmime3,
-  libxml2,
-  libsoup_2_4,
-  pkg-config,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "xplayer-plparser";
-  version = "1.0.3";
-
-  src = fetchFromGitHub {
-    owner = "linuxmint";
-    repo = pname;
-    rev = version;
-    hash = "sha256-6GMKsIpyQdiyHPxrjWHAHvuCouJxrAcYPIo9u6TLOA4=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    gobject-introspection
-  ];
-
-  buildInputs = [
-    gmime3
-    libxml2
-    libsoup_2_4
-  ];
-
-  meta = with lib; {
-    description = "Playlist parsing library for xplayer";
-    homepage = "https://github.com/linuxmint/xplayer-plparser";
-    maintainers = with maintainers; [
-      tu-maurice
-      bobby285271
-    ];
-    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 45f8ef708531c..11efd373151c5 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -684,6 +684,7 @@ mapAliases {
   libusb = throw "'libusb' has been renamed to/replaced by 'libusb1'"; # Converted to throw 2024-10-17
   libvpx_1_8 = throw "libvpx_1_8 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libvpx'"; # Added 2024-07-26
   libwnck3 = libwnck;
+  libxplayer-plparser = throw "libxplayer-plparser has been removed as the upstream project was archived"; # Added 2024-12-27
   libyamlcpp = yaml-cpp; # Added 2023-01-29
   libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29
   lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01

From 5fd9539a406858aea19756e0aab708f7e83773d1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 27 Dec 2024 14:20:40 +0000
Subject: [PATCH 175/340] folly: disable tests on Clang for now

Closes: #368501
---
 pkgs/by-name/fo/folly/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix
index f7fa09d254db1..ca393d884a13e 100644
--- a/pkgs/by-name/fo/folly/package.nix
+++ b/pkgs/by-name/fo/folly/package.nix
@@ -122,7 +122,8 @@ stdenv.mkDerivation (finalAttrs: {
     ]
   );
 
-  doCheck = true;
+  # Temporary fix until next `staging` cycle.
+  doCheck = !stdenv.cc.isClang;
 
   # https://github.com/NixOS/nixpkgs/issues/144170
   postPatch = ''

From 411a5e2f26c63d93b1607ca4c0a8ba06fc6962a1 Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen <hi@pluie.me>
Date: Tue, 17 Dec 2024 16:19:09 +0100
Subject: [PATCH 176/340] electronplayer: drop

ElectronPlayer had been unmaintained and its repository archived since October 28, 2024.

It evidently had already been struggling to function for years, judging by [the section titled
"The Pain of Widevine"](https://github.com/oscartbeaumont/ElectronPlayer/blob/master/README.md#the-pain-of-widevine)
in its README file, and the last commit dates from October 9, 2021, over three years before the
repository was archived.

All in all, it is a dead project that had been broken for years, and we shouldn't continue to
support it in 25.05.
---
 .../video/electronplayer/electronplayer.nix   | 36 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 pkgs/applications/video/electronplayer/electronplayer.nix

diff --git a/pkgs/applications/video/electronplayer/electronplayer.nix b/pkgs/applications/video/electronplayer/electronplayer.nix
deleted file mode 100644
index a11c8555e76cf..0000000000000
--- a/pkgs/applications/video/electronplayer/electronplayer.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  appimageTools,
-  lib,
-  fetchurl,
-}:
-let
-  pname = "electronplayer";
-  version = "2.0.8";
-
-  #TODO: remove the -rc4 from the tag in the url when possible
-  src = fetchurl {
-    url = "https://github.com/oscartbeaumont/ElectronPlayer/releases/download/v${version}-rc4/${pname}-${version}.AppImage";
-    sha256 = "wAsmSFdbRPnYnDyWQSbtyj+GLJLN7ibksUE7cegfkhI=";
-  };
-
-  appimageContents = appimageTools.extractType2 { inherit pname version src; };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
-
-  extraInstallCommands = ''
-    install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
-    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace 'Exec=AppRun' 'Exec=ElectronPlayer'
-    cp -r ${appimageContents}/usr/share/icons $out/share
-  '';
-
-  meta = with lib; {
-    description = "Electron based web video services player";
-    mainProgram = "electronplayer";
-    homepage = "https://github.com/oscartbeaumont/ElectronPlayer";
-    license = licenses.mit;
-    maintainers = with maintainers; [ extends ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8bcab1c543e93..ede470dc69624 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -327,6 +327,7 @@ mapAliases {
 
   edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01
   elasticsearch7Plugins = elasticsearchPlugins;
+  electronplayer = throw "'electronplayer' has been removed as it had been discontinued upstream since October 2024"; # Added 2024-12-17
 
   element-desktop-wayland = throw "element-desktop-wayland has been removed. Consider setting NIXOS_OZONE_WL=1 via 'environment.sessionVariables' instead"; # Added 2024-12-17
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c83fa3e94c33..deefeb06c4cf7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2277,8 +2277,6 @@ with pkgs;
 
   eddy = libsForQt5.callPackage ../applications/graphics/eddy { };
 
-  electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { };
-
   element-web = callPackage ../by-name/el/element-web/package.nix {
     conf = config.element-web.conf or { };
   };

From f2ae28cdd433c40a760e906eec228962e3ac9085 Mon Sep 17 00:00:00 2001
From: sund3RRR <evenquantity@gmail.com>
Date: Tue, 24 Dec 2024 23:33:11 +0300
Subject: [PATCH 177/340] tijolo: drop

---
 pkgs/by-name/ti/tijolo/package.nix | 72 ------------------------------
 pkgs/by-name/ti/tijolo/shards.nix  | 42 -----------------
 pkgs/top-level/aliases.nix         |  1 +
 3 files changed, 1 insertion(+), 114 deletions(-)
 delete mode 100644 pkgs/by-name/ti/tijolo/package.nix
 delete mode 100644 pkgs/by-name/ti/tijolo/shards.nix

diff --git a/pkgs/by-name/ti/tijolo/package.nix b/pkgs/by-name/ti/tijolo/package.nix
deleted file mode 100644
index 0666c2bed2092..0000000000000
--- a/pkgs/by-name/ti/tijolo/package.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  crystal,
-  vte-gtk4,
-  libgit2,
-  gtk4,
-  libadwaita,
-  editorconfig-core-c,
-  gtksourceview5,
-  wrapGAppsHook4,
-  gobject-introspection,
-  desktopToDarwinBundle,
-}:
-
-crystal.buildCrystalPackage rec {
-  pname = "tijolo";
-  version = "0.9.0";
-
-  src = fetchFromGitHub {
-    owner = "hugopl";
-    repo = "tijolo";
-    rev = "v${version}";
-    hash = "sha256-RVdZce9csnhJx5p+jBANDCsz2eB/l3EHExwKMbKL9y0=";
-  };
-
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace-fail "shards install" "true"
-  '';
-
-  shardsFile = ./shards.nix;
-  copyShardDeps = true;
-
-  preBuild = ''
-    cd lib/gi-crystal && shards build -Dpreview_mt --release --no-debug
-    cd ../.. && mkdir bin/ && cp lib/gi-crystal/bin/gi-crystal bin/
-  '';
-
-  nativeBuildInputs = [
-    wrapGAppsHook4
-    gobject-introspection
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ];
-  buildInputs = [
-    gtk4
-    libadwaita
-    vte-gtk4
-    libgit2
-    gtksourceview5
-    editorconfig-core-c
-  ];
-
-  buildTargets = [ "all" ];
-  doCheck = false;
-
-  installTargets = [
-    "install"
-    "post-install"
-    "install-fonts"
-  ];
-  doInstallCheck = false;
-
-  meta = with lib; {
-    description = "Lightweight, keyboard-oriented IDE for the masses";
-    homepage = "https://github.com/hugopl/tijolo";
-    license = licenses.mit;
-    mainProgram = "tijolo";
-    maintainers = with maintainers; [ sund3RRR ];
-    broken = true;
-  };
-}
diff --git a/pkgs/by-name/ti/tijolo/shards.nix b/pkgs/by-name/ti/tijolo/shards.nix
deleted file mode 100644
index 360778119e285..0000000000000
--- a/pkgs/by-name/ti/tijolo/shards.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  fzy = {
-    url = "https://github.com/hugopl/fzy.git";
-    rev = "v0.5.5";
-    sha256 = "1zk95m43ymx9ilwr6iw9l44nkmp4sas28ib0dkr07hkhgrkw68sv";
-  };
-  gi-crystal = {
-    url = "https://github.com/hugopl/gi-crystal.git";
-    rev = "v0.22.2";
-    sha256 = "0bpa1f8iaf97z2kbgjc7nc8km7nd7bppiwna319lm2hvm8m5pw15";
-  };
-  gtk4 = {
-    url = "https://github.com/hugopl/gtk4.cr.git";
-    rev = "v0.16.1";
-    sha256 = "1cqkbh072y70l8g0p040vf50k920p32ry1larnwn9mqabd74jwaj";
-  };
-  harfbuzz = {
-    url = "https://github.com/hugopl/harfbuzz.cr.git";
-    rev = "v0.2.0";
-    sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694";
-  };
-  libadwaita = {
-    url = "https://github.com/geopjr/libadwaita.cr.git";
-    rev = "cffabb56e911d2a90c53c2fd14d6bd08bf5ac446";
-    sha256 = "0gcq04vgxg0vff9fcalgzq9phq0y76diihkzhlfn91bdxwkx7rl3";
-  };
-  pango = {
-    url = "https://github.com/hugopl/pango.cr.git";
-    rev = "v0.3.1";
-    sha256 = "0xlf127flimnll875mcq92q7xsi975rrgdpcpmnrwllhdhfx9qmv";
-  };
-  toml = {
-    url = "https://github.com/crystal-community/toml.cr.git";
-    rev = "v0.7.0";
-    sha256 = "0vznx2irvx6m8w6chdf9ms72n2w0cf2m5cwh0cjmp1jz9y3xwv7z";
-  };
-  vte = {
-    url = "https://github.com/hugopl/vte.cr.git";
-    rev = "v0.1.0";
-    sha256 = "18x2l9cm8czhwpdfng3rz00kn07c49y0555kf2j5l2wb0g05snh3";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 05c5d2924793b..a2ef13e41f6c8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1298,6 +1298,7 @@ mapAliases {
   testVersion = testers.testVersion; # Added 2022-04-20
   tfplugindocs = terraform-plugin-docs; # Added 2023-11-01
   invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05
+  tijolo = throw "'tijolo' has been removed due to being unmaintained"; # Added 2024-12-27
   timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17
   tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22
   tix = tclPackages.tix; # Added 2024-10-02

From 643f56d9605617c6cdd9c3d20ddb79c0261f3c1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 15:23:41 +0000
Subject: [PATCH 178/340] oxlint: 0.15.2 -> 0.15.3

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

diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix
index b264c0d484296..60746d6122372 100644
--- a/pkgs/by-name/ox/oxlint/package.nix
+++ b/pkgs/by-name/ox/oxlint/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "oxlint";
-  version = "0.15.2";
+  version = "0.15.3";
 
   src = fetchFromGitHub {
     owner = "web-infra-dev";
     repo = "oxc";
     rev = "oxlint_v${version}";
-    hash = "sha256-ENtrK19j9wIp1NpuMwn+YlGxAav5ah6aExNsXckFc7E=";
+    hash = "sha256-cH3Sosfmx0eOWWOjglcB3puiK0XKbO0wua45/YMZe+0=";
   };
 
-  cargoHash = "sha256-xAgvz+0i1wKblefhDWh0d1HSboMRDZG8VX/csn64FpI=";
+  cargoHash = "sha256-Yfk5DGOo3GLHzqJYCFrlLB7soHFI+zBRR93daVOgrmk=";
 
   buildInputs = [
     rust-jemalloc-sys

From 9143f62a0047fdd941aedb9ac17e67dbcae49ebd Mon Sep 17 00:00:00 2001
From: Andrew Bruce <me@andrewbruce.net>
Date: Fri, 27 Dec 2024 16:27:12 +0000
Subject: [PATCH 179/340] kitty: 0.38.0 -> 0.38.1

---
 pkgs/applications/terminal-emulators/kitty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix
index 2bde298a7faf8..dee1115cb4042 100644
--- a/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/pkgs/applications/terminal-emulators/kitty/default.nix
@@ -35,14 +35,14 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.38.0";
+  version = "0.38.1";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XURoUYo0Nejcfi49s9AlyoG5fpE0/mjMke2UWG8lUiA=";
+    hash = "sha256-0M4Bvhh3j9vPedE/d+8zaiZdET4mXcrSNUgLllhaPJw=";
   };
 
   goModules = (buildGo123Module {

From 174ae1b581ddd6d5a6c55684da392e0baf500b1e Mon Sep 17 00:00:00 2001
From: Ivan Jager <aij+git@mrph.org>
Date: Fri, 27 Dec 2024 10:36:05 -0600
Subject: [PATCH 180/340] ipmiutil: 3.1.6 -> 3.2.0

My main motivation for this is to fix the build.
---
 pkgs/by-name/ip/ipmiutil/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ip/ipmiutil/package.nix b/pkgs/by-name/ip/ipmiutil/package.nix
index 8d1aaec06331a..7e4674feb37d8 100644
--- a/pkgs/by-name/ip/ipmiutil/package.nix
+++ b/pkgs/by-name/ip/ipmiutil/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ipmiutil";
-  version = "3.1.6";
+  version = "3.2.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/ipmiutil/pmiutil-${version}.tar.gz";
-    sha256 = "0jlfb4firph3hc0854n7cw7yjwlax3wdxn37r2jl0l94dj684548";
+    url = "mirror://sourceforge/project/ipmiutil/ipmiutil-${version}.tar.gz";
+    sha256 = "0xhanz27qnd92qvmjyb72314pf06a113nnwnirnsxrhy7inxnb9y";
   };
 
   buildInputs = [ openssl ];

From 54dab203604e8a705ac6f9dc9a15241f9c99fc71 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Fri, 27 Dec 2024 11:28:53 -0500
Subject: [PATCH 181/340] libfm: fix build

taken from https://github.com/ravenports/ravensource/tree/ad0d95339e569e69acfdd3e80cbe0bf4b9de1982/bucket_09/libfm/patches

closes #368573
---
 pkgs/by-name/li/libfm/0001-fm-load-all-actions.patch  | 11 +++++++++++
 .../li/libfm/0002-exo-icon-view-key-press-event.patch | 11 +++++++++++
 pkgs/by-name/li/libfm/0003-ask-action-on-drop.patch   | 11 +++++++++++
 pkgs/by-name/li/libfm/0004-create-icon-view.patch     | 11 +++++++++++
 pkgs/by-name/li/libfm/package.nix                     |  7 +++++++
 5 files changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/li/libfm/0001-fm-load-all-actions.patch
 create mode 100644 pkgs/by-name/li/libfm/0002-exo-icon-view-key-press-event.patch
 create mode 100644 pkgs/by-name/li/libfm/0003-ask-action-on-drop.patch
 create mode 100644 pkgs/by-name/li/libfm/0004-create-icon-view.patch

diff --git a/pkgs/by-name/li/libfm/0001-fm-load-all-actions.patch b/pkgs/by-name/li/libfm/0001-fm-load-all-actions.patch
new file mode 100644
index 0000000000000..997300c07e3f8
--- /dev/null
+++ b/pkgs/by-name/li/libfm/0001-fm-load-all-actions.patch
@@ -0,0 +1,11 @@
+--- a/src/actions/action.c
++++ b/src/actions/action.c
+@@ -2047,7 +2047,7 @@
+ 	gchar* _tmp9_ = NULL;
+ 	_tmp0_ = fm_all_actions;
+ 	g_hash_table_remove_all (_tmp0_);
+-	_tmp2_ = _tmp1_ = g_get_system_data_dirs ();
++	_tmp2_ = _tmp1_ = (gchar **)g_get_system_data_dirs ();
+ 	dirs = _tmp2_;
+ 	dirs_length1 = _vala_array_length (_tmp1_);
+ 	_dirs_size_ = dirs_length1;
diff --git a/pkgs/by-name/li/libfm/0002-exo-icon-view-key-press-event.patch b/pkgs/by-name/li/libfm/0002-exo-icon-view-key-press-event.patch
new file mode 100644
index 0000000000000..6f0965430112a
--- /dev/null
+++ b/pkgs/by-name/li/libfm/0002-exo-icon-view-key-press-event.patch
@@ -0,0 +1,11 @@
+--- a/src/gtk/exo/exo-icon-view.c
++++ b/src/gtk/exo/exo-icon-view.c
+@@ -2819,7 +2819,7 @@
+   /* allocate a new event to forward */
+   new_event = gdk_event_copy ((GdkEvent *) event);
+   g_object_unref (G_OBJECT (new_event->key.window));
+-  new_event->key.window = g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry)));
++  new_event->key.window = (GdkWindow *)g_object_ref (G_OBJECT (gtk_widget_get_window (icon_view->priv->search_entry)));
+ 
+   /* send the event to the search entry. If the "preedit-changed" signal is
+    * emitted during this event, priv->search_imcontext_changed will be set.
diff --git a/pkgs/by-name/li/libfm/0003-ask-action-on-drop.patch b/pkgs/by-name/li/libfm/0003-ask-action-on-drop.patch
new file mode 100644
index 0000000000000..6106ec9280f52
--- /dev/null
+++ b/pkgs/by-name/li/libfm/0003-ask-action-on-drop.patch
@@ -0,0 +1,11 @@
+--- a/src/gtk/fm-dnd-dest.c
++++ b/src/gtk/fm-dnd-dest.c
+@@ -458,7 +458,7 @@
+             gtk_action_set_sensitive(act, FALSE);
+         }
+     }
+-    ri.menu = g_object_ref(gtk_ui_manager_get_widget(ui, "/popup"));
++    ri.menu = (GtkMenu *)g_object_ref(gtk_ui_manager_get_widget(ui, "/popup"));
+     g_signal_connect(ri.menu, "selection-done", G_CALLBACK(gtk_widget_destroy), NULL);
+     unmap_handler = g_signal_connect(ri.menu, "unmap",
+                                      G_CALLBACK(run_unmap_handler), &ri);
diff --git a/pkgs/by-name/li/libfm/0004-create-icon-view.patch b/pkgs/by-name/li/libfm/0004-create-icon-view.patch
new file mode 100644
index 0000000000000..6a16b6446c896
--- /dev/null
+++ b/pkgs/by-name/li/libfm/0004-create-icon-view.patch
@@ -0,0 +1,11 @@
+--- a/src/gtk/fm-standard-view.c
++++ b/src/gtk/fm-standard-view.c
+@@ -637,7 +637,7 @@
+                                 "text", FM_FOLDER_MODEL_COL_NAME );
+     if(fv->renderer_text)
+         g_object_unref(fv->renderer_text);
+-    fv->renderer_text = g_object_ref_sink(render);
++    fv->renderer_text = (FmCellRendererText *)g_object_ref_sink(render);
+     exo_icon_view_set_search_column((ExoIconView*)fv->view, FM_FOLDER_MODEL_COL_NAME);
+     g_signal_connect(fv->view, "item-activated", G_CALLBACK(on_icon_view_item_activated), fv);
+     g_signal_connect(fv->view, "selection-changed", G_CALLBACK(on_sel_changed), fv);
diff --git a/pkgs/by-name/li/libfm/package.nix b/pkgs/by-name/li/libfm/package.nix
index 8ce1a0b2ccfeb..d762036a22d07 100644
--- a/pkgs/by-name/li/libfm/package.nix
+++ b/pkgs/by-name/li/libfm/package.nix
@@ -27,6 +27,13 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-pQQmMDBM+OXYz/nVZca9VG8ii0jJYBU+02ajTofK0eU=";
   };
 
+  patches = [
+    ./0001-fm-load-all-actions.patch
+    ./0002-exo-icon-view-key-press-event.patch
+    ./0003-ask-action-on-drop.patch
+    ./0004-create-icon-view.patch
+  ];
+
   nativeBuildInputs = [
     vala
     pkg-config

From 51a9200c0d8670525ad8df3a7bf321325b10325d Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 27 Dec 2024 17:36:51 +0000
Subject: [PATCH 182/340] nixos-rebuild-ng: remote-build{,-flake} ->
 build-remote{,-flake}

---
 .../ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py     | 4 ++--
 pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 4 ++--
 pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py    | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index f2adccb9ed9e7..c3138a9c50420 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -395,7 +395,7 @@ def execute(argv: list[str]) -> None:
                 case (_, True, _, _):
                     raise NRError(f"--rollback is incompatible with '{action}'")
                 case (_, False, Remote(_), Flake(_)):
-                    path_to_config = nix.remote_build_flake(
+                    path_to_config = nix.build_remote_flake(
                         attr,
                         flake,
                         build_host,
@@ -412,7 +412,7 @@ def execute(argv: list[str]) -> None:
                         **flake_build_flags,
                     )
                 case (_, False, Remote(_), None):
-                    path_to_config = nix.remote_build(
+                    path_to_config = nix.build_remote(
                         attr,
                         build_attr,
                         build_host,
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index c26a771c26f83..99b02b497aee7 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -70,7 +70,7 @@ def build_flake(
     return Path(r.stdout.strip())
 
 
-def remote_build(
+def build_remote(
     attr: str,
     build_attr: BuildAttr,
     build_host: Remote | None,
@@ -124,7 +124,7 @@ def remote_build(
         run_wrapper(["rm", "-rf", remote_tmpdir], remote=build_host, check=False)
 
 
-def remote_build_flake(
+def build_remote_flake(
     attr: str,
     flake: Flake,
     build_host: Remote,
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index c2bef1fffe97b..d589b23ea4d02 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -76,7 +76,7 @@ def test_build_flake(mock_run: Any) -> None:
 
 @patch(get_qualified_name(n.run_wrapper, n), autospec=True)
 @patch(get_qualified_name(n.uuid4, n), autospec=True)
-def test_remote_build(mock_uuid4: Any, mock_run: Any, monkeypatch: Any) -> None:
+def test_build_remote(mock_uuid4: Any, mock_run: Any, monkeypatch: Any) -> None:
     build_host = m.Remote("user@host", [], None)
     monkeypatch.setenv("NIX_SSHOPTS", "--ssh opts")
 
@@ -97,7 +97,7 @@ def run_wrapper_side_effect(
     mock_run.side_effect = run_wrapper_side_effect
     mock_uuid4.side_effect = [uuid.UUID(int=1), uuid.UUID(int=2)]
 
-    assert n.remote_build(
+    assert n.build_remote(
         "config.system.build.toplevel",
         m.BuildAttr("<nixpkgs/nixos>", "preAttr"),
         build_host,
@@ -164,12 +164,12 @@ def run_wrapper_side_effect(
     autospec=True,
     return_value=CompletedProcess([], 0, stdout=" \n/path/to/file\n "),
 )
-def test_remote_build_flake(mock_run: Any, monkeypatch: Any) -> None:
+def test_build_remote_flake(mock_run: Any, monkeypatch: Any) -> None:
     flake = m.Flake.parse(".#hostname")
     build_host = m.Remote("user@host", [], None)
     monkeypatch.setenv("NIX_SSHOPTS", "--ssh opts")
 
-    assert n.remote_build_flake(
+    assert n.build_remote_flake(
         "config.system.build.toplevel",
         flake,
         build_host,

From 255c9b06272135ac3fc9b100098f947cbab69b2f Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 27 Dec 2024 17:41:13 +0000
Subject: [PATCH 183/340] nixos-rebuild-ng: TypeAlias -> type

---
 pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py
index 11a0d91882943..4af16b62485bb 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py
@@ -1,8 +1,8 @@
 import logging
 from collections.abc import Mapping, Sequence
-from typing import Any, TypeAlias, assert_never, override
+from typing import Any, assert_never, override
 
-Args: TypeAlias = bool | str | list[str] | int | None
+type Args = bool | str | list[str] | int | None
 
 
 class LogFormatter(logging.Formatter):

From 1b42e7d011ef0ae412ff153567a67cf3b9385dac Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 27 Dec 2024 21:45:35 +0400
Subject: [PATCH 184/340] oxlint: set version

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

diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix
index 60746d6122372..a4a9daa5d8f75 100644
--- a/pkgs/by-name/ox/oxlint/package.nix
+++ b/pkgs/by-name/ox/oxlint/package.nix
@@ -25,6 +25,8 @@ rustPlatform.buildRustPackage rec {
     darwin.apple_sdk.frameworks.Security
   ];
 
+  env.OXC_VERSION = version;
+
   cargoBuildFlags = [ "--bin=oxlint" ];
   cargoTestFlags = cargoBuildFlags;
 

From 58e948dccc833978897748595de8db82b722c644 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 27 Dec 2024 18:03:02 +0000
Subject: [PATCH 185/340] nixos-rebuild-ng: add missing copy_flags for `nix
 copy`

---
 pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py | 1 +
 pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py    | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index 99b02b497aee7..b776585d1b43d 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -192,6 +192,7 @@ def nix_copy(to_host: Remote, from_host: Remote) -> None:
             [
                 "nix",
                 "copy",
+                *dict_to_flags(copy_flags),
                 "--from",
                 f"ssh://{from_host.host}",
                 "--to",
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index d589b23ea4d02..d8bd5464aa768 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -237,9 +237,9 @@ def test_copy_closure(monkeypatch: Any) -> None:
 
     monkeypatch.setenv("NIX_SSHOPTS", "--ssh build-opt")
     with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run:
-        n.copy_closure(closure, None, build_host)
+        n.copy_closure(closure, None, build_host, copy_flag=True)
         mock_run.assert_called_with(
-            ["nix-copy-closure", "--from", "user@build.host", closure],
+            ["nix-copy-closure", "--copy-flag", "--from", "user@build.host", closure],
             extra_env={
                 "NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS + ["--ssh build-opt"])
             },
@@ -251,11 +251,12 @@ def test_copy_closure(monkeypatch: Any) -> None:
         "NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS + ["--ssh build-target-opt"])
     }
     with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run:
-        n.copy_closure(closure, target_host, build_host)
+        n.copy_closure(closure, target_host, build_host, copy_flag=True)
         mock_run.assert_called_with(
             [
                 "nix",
                 "copy",
+                "--copy-flag",
                 "--from",
                 "ssh://user@build.host",
                 "--to",

From b915f84168c3c6a782d8b2e338862820724261cf Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 27 Dec 2024 22:11:31 +0400
Subject: [PATCH 186/340] sfeed: modernize

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

diff --git a/pkgs/by-name/sf/sfeed/package.nix b/pkgs/by-name/sf/sfeed/package.nix
index fe66ee679b6f0..87a1dd0ba2f75 100644
--- a/pkgs/by-name/sf/sfeed/package.nix
+++ b/pkgs/by-name/sf/sfeed/package.nix
@@ -5,14 +5,14 @@
   ncurses,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sfeed";
   version = "2.1";
 
   src = fetchgit {
     url = "git://git.codemadness.org/sfeed";
-    rev = version;
-    sha256 = "sha256-KVZsVCTkwyOVr37vIXbiPjQLnb9lbuIlNxpZNvHxbEo=";
+    tag = finalAttrs.version;
+    hash = "sha256-KVZsVCTkwyOVr37vIXbiPjQLnb9lbuIlNxpZNvHxbEo=";
   };
 
   buildInputs = [ ncurses ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   # otherwise does not find SIGWINCH
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://codemadness.org/sfeed-simple-feed-parser.html";
     description = "RSS and Atom parser (and some format programs)";
     longDescription = ''
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
       to import and export OPML and to fetch, filter, merge and order feed
       items.
     '';
-    license = licenses.isc;
-    maintainers = [ maintainers.matthiasbeyer ];
-    platforms = platforms.all;
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.matthiasbeyer ];
+    platforms = lib.platforms.all;
   };
-}
+})

From 019465ec51a0c4d0f1763f6d6e8062d0b92fcd4c Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Fri, 27 Dec 2024 13:24:32 -0500
Subject: [PATCH 187/340] aider-chat: 0.69.0 -> 0.70.0

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

diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix
index 5e1f7f4490a59..c570b8c663119 100644
--- a/pkgs/by-name/ai/aider-chat/package.nix
+++ b/pkgs/by-name/ai/aider-chat/package.nix
@@ -12,7 +12,7 @@ let
     self = python3;
     packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; };
   };
-  version = "0.69.0";
+  version = "0.70.0";
   aider-chat = python3.pkgs.buildPythonApplication {
     pname = "aider-chat";
     inherit version;
@@ -22,7 +22,7 @@ let
       owner = "Aider-AI";
       repo = "aider";
       rev = "refs/tags/v${version}";
-      hash = "sha256-fJLLWL31BLEpgBrYDq0E8t7GN9TyOA5pwt42H/Hqh58=";
+      hash = "sha256-wGm6JV9ISRi/p1lA3JyzOdHQKFHFxEhfr+NdShUxm0M=";
     };
 
     pythonRelaxDeps = true;

From 1d713d772f6858d1fb620fd25a3bb0f4a8fd7596 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 23 Dec 2024 15:17:37 +0100
Subject: [PATCH 188/340] gnome2.gtksourceview: fix build with gcc-14

---
 pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 95455d76db79a..30a33349e5a2d 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -45,6 +45,9 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  # Fix build with gcc 14
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
   nativeBuildInputs = [
     pkg-config
     intltool

From 5c6e2c0a905d7a2fa483fdee625c44f034e3f8d6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 23 Dec 2024 15:18:08 +0100
Subject: [PATCH 189/340] ocamlPackages.ctypes-foreign: fix build with gcc-14

---
 pkgs/development/ocaml-modules/ctypes/foreign.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/ocaml-modules/ctypes/foreign.nix b/pkgs/development/ocaml-modules/ctypes/foreign.nix
index 1e082bff94dcd..cb8f454e0e0cb 100644
--- a/pkgs/development/ocaml-modules/ctypes/foreign.nix
+++ b/pkgs/development/ocaml-modules/ctypes/foreign.nix
@@ -24,6 +24,9 @@ buildDunePackage rec {
     lwt
   ];
 
+  # Fix build with gcc 14
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
   meta = ctypes.meta // {
     description = "Dynamic access to foreign C libraries using Ctypes";
   };

From f6d6becd5765eed64f338f33cc79b37480402085 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Fri, 27 Dec 2024 20:44:20 +0200
Subject: [PATCH 190/340] grandperspective: 3.4.2 -> 3.5.1

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

diff --git a/pkgs/by-name/gr/grandperspective/package.nix b/pkgs/by-name/gr/grandperspective/package.nix
index 3c56cfb8bb291..b444e18b4ef68 100644
--- a/pkgs/by-name/gr/grandperspective/package.nix
+++ b/pkgs/by-name/gr/grandperspective/package.nix
@@ -7,7 +7,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "3.4.2";
+  version = "3.5.1";
   pname = "grandperspective";
 
   src = fetchurl {
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
     url = "mirror://sourceforge/grandperspectiv/GrandPerspective-${
       lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version
     }.dmg";
-    hash = "sha256-ZgyBeQCoixLGCFS8+UFoMilvtswplEC8MzK3BE4ocDg=";
+    hash = "sha256-ZD6XUtsbwxHe3MYdCH9I/pYBCGgilPhhbYQChr0wCj4=";
   };
 
   sourceRoot = "GrandPerspective.app";

From c9ac7e44aafbc42dbbf2f888e79884d0c1d82d2c Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Fri, 27 Dec 2024 20:44:20 +0200
Subject: [PATCH 191/340] grandperspective: add update script

---
 pkgs/by-name/gr/grandperspective/package.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/by-name/gr/grandperspective/package.nix b/pkgs/by-name/gr/grandperspective/package.nix
index b444e18b4ef68..4c2e2c098926f 100644
--- a/pkgs/by-name/gr/grandperspective/package.nix
+++ b/pkgs/by-name/gr/grandperspective/package.nix
@@ -4,6 +4,11 @@
   fetchurl,
   undmg,
   makeWrapper,
+  writeShellApplication,
+  curl,
+  cacert,
+  gnugrep,
+  common-updater-scripts,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -29,6 +34,21 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper "$out/Applications/GrandPerspective.app/Contents/MacOS/GrandPerspective" "$out/bin/grandperspective"
   '';
 
+  passthru.updateScript = lib.getExe (writeShellApplication {
+    name = "grandperspective-update-script";
+    runtimeInputs = [
+      curl
+      cacert
+      gnugrep
+      common-updater-scripts
+    ];
+    text = ''
+      url="https://sourceforge.net/p/grandperspectiv/documentation/ci/master/tree/CHANGES.txt?format=raw"
+      version=$(curl -s "$url" | grep -oP 'Version \K[0-9.]+(?=,)' | head -n 1)
+      update-source-version grandperspective "$version"
+    '';
+  });
+
   meta = with lib; {
     description = "Open-source macOS application to analyze disk usage";
     longDescription = ''

From 0bc3a8936d4433b16fae50f04a908aa5d107b748 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Fri, 27 Dec 2024 20:44:20 +0200
Subject: [PATCH 192/340] grandperspective: add DimitarNestorov to maintainers

---
 pkgs/by-name/gr/grandperspective/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gr/grandperspective/package.nix b/pkgs/by-name/gr/grandperspective/package.nix
index 4c2e2c098926f..d33d9b1a56d9f 100644
--- a/pkgs/by-name/gr/grandperspective/package.nix
+++ b/pkgs/by-name/gr/grandperspective/package.nix
@@ -61,7 +61,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://grandperspectiv.sourceforge.net";
     license = licenses.gpl2Only;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ eliandoran ];
+    maintainers = with maintainers; [
+      eliandoran
+      DimitarNestorov
+    ];
     platforms = platforms.darwin;
   };
 

From 96eef3faf780294e3f9949460940665e80820ff7 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 27 Dec 2024 18:39:34 +0100
Subject: [PATCH 193/340] roboto: patch `RobotoCondensed` font to fix
 `usWidthClass`

See https://github.com/googlefonts/roboto-3-classic/issues/130
Upstream patch: https://github.com/googlefonts/roboto-3-classic/pull/131
---
 pkgs/by-name/ro/roboto/package.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/by-name/ro/roboto/package.nix b/pkgs/by-name/ro/roboto/package.nix
index b22a68fde9459..b2b7880f9726a 100644
--- a/pkgs/by-name/ro/roboto/package.nix
+++ b/pkgs/by-name/ro/roboto/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchzip,
+  python3Packages,
 }:
 
 stdenvNoCC.mkDerivation rec {
@@ -14,9 +15,24 @@ stdenvNoCC.mkDerivation rec {
     hash = "sha256-ue3PUZinBpcYgSho1Zrw1KHl7gc/GlN1GhWFk6g5QXE=";
   };
 
+  nativeBuildInputs = [
+    python3Packages.fonttools
+  ];
+
   installPhase = ''
     runHook preInstall
 
+    # The RobotoCondensed fonts have a usWidthClass value of 5, which is
+    # incorrect. It should be 3.
+    # See the corresponding issue at https://github.com/googlefonts/roboto-3-classic/issues/130
+    for file in RobotoCondensed*; do
+      fontname=$(echo $file | sed 's/\.ttf//')
+      ttx -v -o $fontname.xml $file
+      substituteInPlace $fontname.xml \
+        --replace-fail "<usWidthClass value=\"5\"/>" "<usWidthClass value=\"3\"/>"
+      ttx $fontname.xml -o $fontname.ttf
+    done
+
     install -Dm644 *.ttf -t $out/share/fonts/truetype
 
     runHook postInstall

From a376797b7bc66e627f19d29b60f8e60d199dceaf Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 27 Dec 2024 18:59:47 +0000
Subject: [PATCH 194/340] nixos-rebuild-ng: replace usage of kwargs

---
 .../src/nixos_rebuild/__init__.py             | 37 ++++++++++--------
 .../nixos-rebuild-ng/src/nixos_rebuild/nix.py | 38 +++++++++----------
 .../src/nixos_rebuild/utils.py                |  8 +++-
 .../nixos-rebuild-ng/src/tests/test_main.py   |  6 ++-
 .../ni/nixos-rebuild-ng/src/tests/test_nix.py | 17 +++++----
 .../nixos-rebuild-ng/src/tests/test_utils.py  |  1 +
 6 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index c3138a9c50420..8204c499fe654 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -262,8 +262,8 @@ def parser_warn(msg: str) -> None:
 def reexec(
     argv: list[str],
     args: argparse.Namespace,
-    build_flags: dict[str, Args],
-    flake_build_flags: dict[str, Args],
+    build_flags: Args,
+    flake_build_flags: Args,
 ) -> None:
     drv = None
     attr = "config.system.build.nixos-rebuild"
@@ -271,10 +271,18 @@ def reexec(
         # Parsing the args here but ignore ask_sudo_password since it is not
         # needed and we would end up asking sudo password twice
         if flake := Flake.from_arg(args.flake, Remote.from_arg(args.target_host, None)):
-            drv = nix.build_flake(attr, flake, **flake_build_flags, no_link=True)
+            drv = nix.build_flake(
+                attr,
+                flake,
+                flake_build_flags | {"no_link": True},
+            )
         else:
             build_attr = BuildAttr.from_arg(args.attr, args.file)
-            drv = nix.build(attr, build_attr, **build_flags, no_out_link=True)
+            drv = nix.build(
+                attr,
+                build_attr,
+                build_flags | {"no_out_link": True},
+            )
     except CalledProcessError:
         logger.warning(
             "could not build a newer version of nixos-rebuild, "
@@ -350,7 +358,7 @@ def execute(argv: list[str]) -> None:
     flake = Flake.from_arg(args.flake, target_host)
 
     if can_run and not flake:
-        nixpkgs_path = nix.find_file("nixpkgs", **build_flags)
+        nixpkgs_path = nix.find_file("nixpkgs", build_flags)
         rev = nix.get_nixpkgs_rev(nixpkgs_path)
         if nixpkgs_path and rev:
             (nixpkgs_path / ".version-suffix").write_text(rev)
@@ -370,7 +378,10 @@ def execute(argv: list[str]) -> None:
 
             dry_run = action == Action.DRY_BUILD
             no_link = action in (Action.SWITCH, Action.BOOT)
+            build_flags |= {"no_out_link": no_link, "dry_run": dry_run}
+            flake_build_flags |= {"no_link": no_link, "dry_run": dry_run}
             rollback = bool(args.rollback)
+
             match action:
                 case Action.BUILD_VM:
                     attr = "config.system.build.vm"
@@ -407,9 +418,7 @@ def execute(argv: list[str]) -> None:
                     path_to_config = nix.build_flake(
                         attr,
                         flake,
-                        no_link=no_link,
-                        dry_run=dry_run,
-                        **flake_build_flags,
+                        flake_build_flags=flake_build_flags,
                     )
                 case (_, False, Remote(_), None):
                     path_to_config = nix.build_remote(
@@ -424,9 +433,7 @@ def execute(argv: list[str]) -> None:
                     path_to_config = nix.build(
                         attr,
                         build_attr,
-                        no_out_link=no_link,
-                        dry_run=dry_run,
-                        **build_flags,
+                        build_flags=build_flags,
                     )
                 case never:
                     # should never happen, but mypy is not smart enough to
@@ -442,7 +449,7 @@ def execute(argv: list[str]) -> None:
                     path_to_config,
                     to_host=target_host,
                     from_host=build_host,
-                    **copy_flags,
+                    copy_flags=copy_flags,
                 )
                 if action in (Action.SWITCH, Action.BOOT):
                     nix.set_profile(
@@ -468,7 +475,7 @@ def execute(argv: list[str]) -> None:
                     f"Done. The virtual machine can be started by running '{vm_path}'"
                 )
         case Action.EDIT:
-            nix.edit(flake, **flake_build_flags)
+            nix.edit(flake, flake_build_flags)
         case Action.DRY_RUN:
             assert False, "DRY_RUN should be a DRY_BUILD alias"
         case Action.LIST_GENERATIONS:
@@ -488,9 +495,9 @@ def execute(argv: list[str]) -> None:
                 print(tabulate(generations, headers=headers))
         case Action.REPL:
             if flake:
-                nix.repl_flake("toplevel", flake, **flake_build_flags)
+                nix.repl_flake("toplevel", flake, flake_build_flags)
             else:
-                nix.repl("system", build_attr, **build_flags)
+                nix.repl("system", build_attr, build_flags)
         case _:
             assert_never(action)
 
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index b776585d1b43d..d0435504a019d 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -32,7 +32,7 @@
 def build(
     attr: str,
     build_attr: BuildAttr,
-    **build_flags: Args,
+    build_flags: Args | None = None,
 ) -> Path:
     """Build NixOS attribute using classic Nix.
 
@@ -52,7 +52,7 @@ def build(
 def build_flake(
     attr: str,
     flake: Flake,
-    **flake_build_flags: Args,
+    flake_build_flags: Args | None = None,
 ) -> Path:
     """Build NixOS attribute using Flakes.
 
@@ -74,9 +74,9 @@ def build_remote(
     attr: str,
     build_attr: BuildAttr,
     build_host: Remote | None,
-    build_flags: dict[str, Args] | None = None,
-    instantiate_flags: dict[str, Args] | None = None,
-    copy_flags: dict[str, Args] | None = None,
+    build_flags: Args | None = None,
+    instantiate_flags: Args | None = None,
+    copy_flags: Args | None = None,
 ) -> Path:
     # We need to use `--add-root` otherwise Nix will print this warning:
     # > warning: you did not specify '--add-root'; the result might be removed
@@ -89,12 +89,12 @@ def build_remote(
             build_attr.to_attr(attr),
             "--add-root",
             tmpdir.TMPDIR_PATH / uuid4().hex,
-            *dict_to_flags(instantiate_flags or {}),
+            *dict_to_flags(instantiate_flags),
         ],
         stdout=PIPE,
     )
     drv = Path(r.stdout.strip()).resolve()
-    copy_closure(drv, to_host=build_host, from_host=None, **(copy_flags or {}))
+    copy_closure(drv, to_host=build_host, from_host=None, copy_flags=copy_flags)
 
     # Need a temporary directory in remote to use in `nix-store --add-root`
     r = run_wrapper(
@@ -109,7 +109,7 @@ def build_remote(
                 drv,
                 "--add-root",
                 remote_tmpdir / uuid4().hex,
-                *dict_to_flags(build_flags or {}),
+                *dict_to_flags(build_flags),
             ],
             remote=build_host,
             stdout=PIPE,
@@ -128,9 +128,9 @@ def build_remote_flake(
     attr: str,
     flake: Flake,
     build_host: Remote,
-    flake_build_flags: dict[str, Args] | None = None,
-    copy_flags: dict[str, Args] | None = None,
-    build_flags: dict[str, Args] | None = None,
+    flake_build_flags: Args | None = None,
+    copy_flags: Args | None = None,
+    build_flags: Args | None = None,
 ) -> Path:
     r = run_wrapper(
         [
@@ -139,12 +139,12 @@ def build_remote_flake(
             "eval",
             "--raw",
             flake.to_attr(attr, "drvPath"),
-            *dict_to_flags(flake_build_flags or {}),
+            *dict_to_flags(flake_build_flags),
         ],
         stdout=PIPE,
     )
     drv = Path(r.stdout.strip())
-    copy_closure(drv, to_host=build_host, from_host=None, **(copy_flags or {}))
+    copy_closure(drv, to_host=build_host, from_host=None, copy_flags=copy_flags)
     r = run_wrapper(
         [
             "nix",
@@ -152,7 +152,7 @@ def build_remote_flake(
             "build",
             f"{drv}^*",
             "--print-out-paths",
-            *dict_to_flags(build_flags or {}),
+            *dict_to_flags(build_flags),
         ],
         remote=build_host,
         stdout=PIPE,
@@ -164,7 +164,7 @@ def copy_closure(
     closure: Path,
     to_host: Remote | None,
     from_host: Remote | None = None,
-    **copy_flags: Args,
+    copy_flags: Args | None = None,
 ) -> None:
     """Copy a nix closure to or from host to localhost.
 
@@ -222,7 +222,7 @@ def nix_copy(to_host: Remote, from_host: Remote) -> None:
                 nix_copy_closure(to_host, to=True)
 
 
-def edit(flake: Flake | None, **flake_flags: Args) -> None:
+def edit(flake: Flake | None, flake_flags: Args | None = None) -> None:
     "Try to find and open NixOS configuration file in editor."
     if flake:
         run_wrapper(
@@ -251,7 +251,7 @@ def edit(flake: Flake | None, **flake_flags: Args) -> None:
             raise NRError("cannot find NixOS config file")
 
 
-def find_file(file: str, **nix_flags: Args) -> Path | None:
+def find_file(file: str, nix_flags: Args | None = None) -> Path | None:
     "Find classic Nix file location."
     r = run_wrapper(
         ["nix-instantiate", "--find-file", file, *dict_to_flags(nix_flags)],
@@ -421,14 +421,14 @@ def get_generation_info(generation: Generation) -> GenerationJson:
         )
 
 
-def repl(attr: str, build_attr: BuildAttr, **nix_flags: Args) -> None:
+def repl(attr: str, build_attr: BuildAttr, nix_flags: Args | None = None) -> None:
     run_args = ["nix", "repl", "--file", build_attr.path]
     if build_attr.attr:
         run_args.append(build_attr.attr)
     run_wrapper([*run_args, *dict_to_flags(nix_flags)])
 
 
-def repl_flake(attr: str, flake: Flake, **flake_flags: Args) -> None:
+def repl_flake(attr: str, flake: Flake, flake_flags: Args | None = None) -> None:
     expr = Template(
         files(__package__).joinpath(FLAKE_REPL_TEMPLATE).read_text()
     ).substitute(
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py
index 4af16b62485bb..edf4d8ccdaa3c 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py
@@ -2,7 +2,8 @@
 from collections.abc import Mapping, Sequence
 from typing import Any, assert_never, override
 
-type Args = bool | str | list[str] | int | None
+type Arg = bool | str | list[str] | int | None
+type Args = dict[str, Arg]
 
 
 class LogFormatter(logging.Formatter):
@@ -19,7 +20,10 @@ def format(self, record: logging.LogRecord) -> str:
         return formatter.format(record)
 
 
-def dict_to_flags(d: Mapping[str, Args]) -> list[str]:
+def dict_to_flags(d: Args | None) -> list[str]:
+    if not d:
+        return []
+
     flags = []
     for key, value in d.items():
         flag = f"--{'-'.join(key.split('_'))}"
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
index 23fd55283fce2..79c02b395d373 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
@@ -123,8 +123,8 @@ def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]:
                     "<nixpkgs/nixos>",
                     "--attr",
                     "config.system.build.toplevel",
-                    "--no-out-link",
                     "-vvv",
+                    "--no-out-link",
                 ],
                 check=True,
                 stdout=PIPE,
@@ -188,8 +188,8 @@ def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]:
                     "build",
                     "--print-out-paths",
                     "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel",
-                    "--no-link",
                     "-v",
+                    "--no-link",
                 ],
                 check=True,
                 stdout=PIPE,
@@ -349,6 +349,7 @@ def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]:
                     "eval",
                     "--raw",
                     "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel.drvPath",
+                    "--no-link",
                 ],
                 check=True,
                 stdout=PIPE,
@@ -371,6 +372,7 @@ def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]:
                     "build",
                     f"'{config_path}^*'",
                     "--print-out-paths",
+                    "--no-out-link",
                 ],
                 check=True,
                 stdout=PIPE,
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index d8bd5464aa768..0afb8471f1c78 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -21,7 +21,9 @@
 )
 def test_build(mock_run: Any, monkeypatch: Any) -> None:
     assert n.build(
-        "config.system.build.attr", m.BuildAttr("<nixpkgs/nixos>", None), nix_flag="foo"
+        "config.system.build.attr",
+        m.BuildAttr("<nixpkgs/nixos>", None),
+        {"nix_flag": "foo"},
     ) == Path("/path/to/file")
     mock_run.assert_called_with(
         [
@@ -55,8 +57,7 @@ def test_build_flake(mock_run: Any) -> None:
     assert n.build_flake(
         "config.system.build.toplevel",
         flake,
-        no_link=True,
-        nix_flag="foo",
+        {"no_link": True, "nix_flag": "foo"},
     ) == Path("/path/to/file")
     mock_run.assert_called_with(
         [
@@ -237,7 +238,7 @@ def test_copy_closure(monkeypatch: Any) -> None:
 
     monkeypatch.setenv("NIX_SSHOPTS", "--ssh build-opt")
     with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run:
-        n.copy_closure(closure, None, build_host, copy_flag=True)
+        n.copy_closure(closure, None, build_host, {"copy_flag": True})
         mock_run.assert_called_with(
             ["nix-copy-closure", "--copy-flag", "--from", "user@build.host", closure],
             extra_env={
@@ -251,7 +252,7 @@ def test_copy_closure(monkeypatch: Any) -> None:
         "NIX_SSHOPTS": " ".join(p.SSH_DEFAULT_OPTS + ["--ssh build-target-opt"])
     }
     with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run:
-        n.copy_closure(closure, target_host, build_host, copy_flag=True)
+        n.copy_closure(closure, target_host, build_host, {"copy_flag": True})
         mock_run.assert_called_with(
             [
                 "nix",
@@ -287,7 +288,7 @@ def test_copy_closure(monkeypatch: Any) -> None:
 def test_edit(mock_run: Any, monkeypatch: Any, tmpdir: Any) -> None:
     # Flake
     flake = m.Flake.parse(".#attr")
-    n.edit(flake, commit_lock_file=True)
+    n.edit(flake, {"commit_lock_file": True})
     mock_run.assert_called_with(
         [
             "nix",
@@ -472,7 +473,7 @@ def test_list_generations(mock_get_generations: Any, tmp_path: Path) -> None:
 
 @patch(get_qualified_name(n.run_wrapper, n), autospec=True)
 def test_repl(mock_run: Any) -> None:
-    n.repl("attr", m.BuildAttr("<nixpkgs/nixos>", None), nix_flag=True)
+    n.repl("attr", m.BuildAttr("<nixpkgs/nixos>", None), {"nix_flag": True})
     mock_run.assert_called_with(
         ["nix", "repl", "--file", "<nixpkgs/nixos>", "--nix-flag"]
     )
@@ -483,7 +484,7 @@ def test_repl(mock_run: Any) -> None:
 
 @patch(get_qualified_name(n.run_wrapper, n), autospec=True)
 def test_repl_flake(mock_run: Any) -> None:
-    n.repl_flake("attr", m.Flake(Path("flake.nix"), "myAttr"), nix_flag=True)
+    n.repl_flake("attr", m.Flake(Path("flake.nix"), "myAttr"), {"nix_flag": True})
     # See nixos-rebuild-ng.tests.repl for a better test,
     # this is mostly for sanity check
     assert mock_run.call_count == 1
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py
index b1cd52e0b121c..de573a2b55a23 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_utils.py
@@ -4,6 +4,7 @@
 
 
 def test_dict_to_flags() -> None:
+    assert u.dict_to_flags(None) == []
     r1 = u.dict_to_flags(
         {
             "test_flag_1": True,

From a60c2319f95600aa0e8c3deb8b6d380c3056053c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 27 Dec 2024 22:24:51 +0300
Subject: [PATCH 195/340] linux_testing: 6.13-rc3 -> 6.13-rc4

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index bf5743e91f441..e2b5a8a29444a 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,7 +1,7 @@
 {
     "testing": {
-        "version": "6.13-rc3",
-        "hash": "sha256:1jls6qnzzjmxr2svva3vky5a4p7jslxkjdgrh9v3ivhk3sb6n9kw"
+        "version": "6.13-rc4",
+        "hash": "sha256:0ca986ycx3k69j1km1j4fyjh0d1wvxnyx1fzlb52g930r1jymp39"
     },
     "6.1": {
         "version": "6.1.121",

From 15d17d906602c5ffe27da4d81a0fbe5df3bd7623 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 27 Dec 2024 22:24:57 +0300
Subject: [PATCH 196/340] linux_6_12: 6.12.6 -> 6.12.7

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index e2b5a8a29444a..8bc7dbfb9ef28 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -28,7 +28,7 @@
         "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532"
     },
     "6.12": {
-        "version": "6.12.6",
-        "hash": "sha256:17lwn89903ffyi2b29j59c1gsczsc1kj3x70hnxziqg4blhsnl6l"
+        "version": "6.12.7",
+        "hash": "sha256:1kx0kmc8xlx5kpvfplawk05wjqpdnsj2hcmv8flnc2qfi9jgp1gp"
     }
 }

From 3cc672a90ca8c5435fb7599e5c74f28ec9b40052 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 27 Dec 2024 22:25:02 +0300
Subject: [PATCH 197/340] linux_6_6: 6.6.67 -> 6.6.68

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 8bc7dbfb9ef28..3e7d3932982de 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:1zhsb6gwhb6cvijzh7s8rnm4b06klyhb2mxb06gcyfvj0givlvw7"
     },
     "6.6": {
-        "version": "6.6.67",
-        "hash": "sha256:06iy243l7c2nldamq0nzbkwxrqr7sg0p89gdp3ib18s2xj1a87g4"
+        "version": "6.6.68",
+        "hash": "sha256:1qj0b2n4ck9qrgpqcgmhkl2jc4rh4000rqqs2vnwwlpkwc8g8gr8"
     },
     "6.11": {
         "version": "6.11.11",

From 30a99d46e872611a84745ecd52bc67ab970e58f9 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 27 Dec 2024 22:25:12 +0300
Subject: [PATCH 198/340] linux_6_1: 6.1.121 -> 6.1.122

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 3e7d3932982de..3b5c5feea1b5b 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -4,8 +4,8 @@
         "hash": "sha256:0ca986ycx3k69j1km1j4fyjh0d1wvxnyx1fzlb52g930r1jymp39"
     },
     "6.1": {
-        "version": "6.1.121",
-        "hash": "sha256:0hrv9l2m4yqhh6cwr8xj9jvx8y3sfwmd394g0f2iawrgc3d1dg6x"
+        "version": "6.1.122",
+        "hash": "sha256:0l3frvlzpl23f9j1vjm2y29d1ppv0ynq40h695i7w2qhh2rw14p8"
     },
     "5.15": {
         "version": "5.15.175",

From 5774cb7a540ef851ed4289ed9ca4bddd20ef2ced Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 Dec 2024 19:26:37 +0000
Subject: [PATCH 199/340] phpPackages.phpstan: 2.0.3 -> 2.0.4

---
 pkgs/development/php-packages/phpstan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix
index 1a7b4e3ff7900..fbabd5d5151ce 100644
--- a/pkgs/development/php-packages/phpstan/default.nix
+++ b/pkgs/development/php-packages/phpstan/default.nix
@@ -6,16 +6,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpstan";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "phpstan";
     repo = "phpstan-src";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-jTyKR1sgRdGTEIhQWlAH1/0gbq5dObxXmLiEcp7+I7c=";
+    hash = "sha256-hKNwAZCK7dS/iBTrigEHSBXnCJQ2btSUDMUrfetiL0s=";
   };
 
-  vendorHash = "sha256-U4J/uHZjCH8S33RdnStzfWW3RrbOPpX5jMC6FTkBYHE=";
+  vendorHash = "sha256-m5Ih/3a3p5BgifpK+vu2Z04glIc0vhz1/ikA4Hl0L7U=";
   composerStrictValidation = false;
 
   meta = {

From 6793dcabd2326619465ce7abd740a46aafa4e2bd Mon Sep 17 00:00:00 2001
From: "\"nulladmin1\"" <"shrey.deogade@protonmail.com">
Date: Fri, 27 Dec 2024 15:29:35 -0500
Subject: [PATCH 200/340] vimPlugins.smear-cursor-nvim: init at 2024-12-26

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

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index cf293c6570022..7cfa3a23edb91 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -11447,6 +11447,18 @@ final: prev:
     meta.homepage = "https://github.com/ibhagwan/smartyank.nvim/";
   };
 
+  smear-cursor-nvim = buildVimPlugin {
+    pname = "smear-cursor.nvim";
+    version = "2024-12-26";
+    src = fetchFromGitHub {
+      owner = "sphamba";
+      repo = "smear-cursor.nvim";
+      rev = "e6de22fc4efbf7b2703317115e9c288d00e02f60";
+      sha256 = "05j8yb7whr6fa8lsar9nc6bc0gkzqr6829ypa1xb5y7wk7wlc160";
+    };
+    meta.homepage = "https://github.com/sphamba/smear-cursor.nvim/";
+  };
+
   snacks-nvim = buildVimPlugin {
     pname = "snacks.nvim";
     version = "2024-12-19";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 06a8a887d4d20..145348013620d 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -950,6 +950,7 @@ https://github.com/mrjones2014/smart-splits.nvim/,,
 https://github.com/m4xshen/smartcolumn.nvim/,,
 https://github.com/gorkunov/smartpairs.vim/,,
 https://github.com/ibhagwan/smartyank.nvim/,,
+https://github.com/sphamba/smear-cursor.nvim/,HEAD,
 https://github.com/folke/snacks.nvim/,HEAD,
 https://github.com/camspiers/snap/,,
 https://github.com/leath-dub/snipe.nvim/,HEAD,

From 84145f7bda3cd9d8f1f4b9bf75700801b6b44703 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Fri, 27 Dec 2024 04:58:27 -0800
Subject: [PATCH 201/340] qemu: set min version to 13 on darwin

the warnings went unnoticed when the sdk was bumped. updating the min
version to 13 fixes them

```
./target/arm/hvf/hvf.c:974:29: warning: 'hv_vm_config_create' is only available on macOS 13.0 or newer [-Wunguarded-availability-new]
  974 |     hv_vm_config_t config = hv_vm_config_create();
      |                             ^~~~~~~~~~~~~~~~~~~
```

add the sdk and version hook in depsBuildBuild
---
 pkgs/applications/virtualization/qemu/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 025a295d5e9aa..9aa0c637d2b6b 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -4,7 +4,7 @@
 , sigtool
 , makeWrapper, removeReferencesTo
 , attr, libcap, libcap_ng, socat, libslirp
-, apple-sdk_13, rez, setfile
+, apple-sdk_13, darwinMinVersionHook, rez, setfile
 , guestAgentSupport ? (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal
 , numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal, numactl
 , seccompSupport ? stdenv.hostPlatform.isLinux && !minimal, libseccomp
@@ -56,6 +56,11 @@ assert lib.assertMsg (xenSupport -> hostCpuTargets == [ "i386-softmmu" ]) "Xen s
 
 let
   hexagonSupport = hostCpuTargets == null || lib.elem "hexagon" hostCpuTargets;
+
+  # needed in buildInputs and depsBuildBuild
+  # check log for warnings eg: `warning: 'hv_vm_config_get_max_ipa_size' is only available on macOS 13.0`
+  # to indicate if min version needs to get bumped.
+  darwinSDK = [ apple-sdk_13 (darwinMinVersionHook "13") ];
 in
 
 stdenv.mkDerivation (finalAttrs: {
@@ -73,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ]
+    ++ lib.optionals stdenv.buildPlatform.isDarwin darwinSDK
     ++ lib.optionals hexagonSupport [ pkg-config ];
 
   nativeBuildInputs = [
@@ -92,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals (!minimal) [ dtc pixman vde2 lzo snappy libtasn1 gnutls nettle libslirp ]
     ++ lib.optionals (!userOnly) [ curl ]
     ++ lib.optionals ncursesSupport [ ncurses ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_13 ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin darwinSDK
     ++ lib.optionals seccompSupport [ libseccomp ]
     ++ lib.optionals numaSupport [ numactl ]
     ++ lib.optionals alsaSupport [ alsa-lib ]

From 4aeb02faa2577ac88832e2f9026543485f771353 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Fri, 27 Dec 2024 15:35:52 -0500
Subject: [PATCH 202/340] aider-chat: use python 3.12

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

diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix
index c570b8c663119..e073d569ea2f3 100644
--- a/pkgs/by-name/ai/aider-chat/package.nix
+++ b/pkgs/by-name/ai/aider-chat/package.nix
@@ -1,14 +1,14 @@
 {
   lib,
   stdenv,
-  python311,
+  python312,
   fetchFromGitHub,
   gitMinimal,
   portaudio,
 }:
 
 let
-  python3 = python311.override {
+  python3 = python312.override {
     self = python3;
     packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; };
   };

From c6b562095ca548d5c4b718ed5c53efa8e12025cd Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 26 Dec 2024 11:49:33 -0800
Subject: [PATCH 203/340] nextpnr: apply patch for boost >= 1.85

https://github.com/YosysHQ/nextpnr/commit/f085950383155a745cf2e3c0f28c468d01ff5fd7
---
 pkgs/by-name/ne/nextpnr/package.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix
index 7f49f10a54270..86117c35fa38a 100644
--- a/pkgs/by-name/ne/nextpnr/package.nix
+++ b/pkgs/by-name/ne/nextpnr/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   boost,
   python3,
@@ -53,6 +54,14 @@ stdenv.mkDerivation rec {
 
   sourceRoot = main_src.name;
 
+  patches = [
+    (fetchpatch {
+      name = "boost-1_85-fixes.patch";
+      url = "https://github.com/YosysHQ/nextpnr/commit/f085950383155a745cf2e3c0f28c468d01ff5fd7.patch";
+      hash = "sha256-ihN3S4eeBQSrKbHrGinE/SlIY3QDytYCaO9Mtu36n6c=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     python3
@@ -91,7 +100,7 @@ stdenv.mkDerivation rec {
       enableGui && stdenv.hostPlatform.isDarwin
     ) "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks");
 
-  patchPhase = with builtins; ''
+  postPatch = ''
     # use PyPy for icestorm if enabled
     substituteInPlace ./ice40/CMakeLists.txt \
       --replace ''\'''${PYTHON_EXECUTABLE}' '${icestorm.pythonInterp}'

From 94af3fd60e4111d782fcaeca3844b30c424f8295 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Fri, 27 Dec 2024 15:57:56 -0500
Subject: [PATCH 204/340] python312Packages.debugpy: fix hash due to
 .gitattributes

---
 pkgs/development/python-modules/debugpy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index d3d212926c559..e907a0daa7da1 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "debugpy";
     tag = "v${version}";
-    hash = "sha256-jq/0Z6Oo/9gjJlziYJIjIC5i9YMayUdPYSGTjnDL8yU=";
+    hash = "sha256-C/cLUMQNmiLn3z93LOg++3WeDUihMR9O3XKouL4uPqw=";
   };
 
   patches =

From b2fc6f1ac86b9be6a1b506ae5f6a9ef3f9b93c5f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 27 Nov 2024 00:01:11 +0000
Subject: [PATCH 205/340] hdf4: use Ninja

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

diff --git a/pkgs/by-name/hd/hdf4/package.nix b/pkgs/by-name/hd/hdf4/package.nix
index a61bcc3a0ea77..8a058c9222449 100644
--- a/pkgs/by-name/hd/hdf4/package.nix
+++ b/pkgs/by-name/hd/hdf4/package.nix
@@ -5,6 +5,7 @@
   fetchurl,
   fixDarwinDylibNames,
   cmake,
+  ninja,
   libjpeg,
   uselibtirpc ? stdenv.hostPlatform.isLinux,
   libtirpc,
@@ -30,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs =
     [
       cmake
+      ninja
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       fixDarwinDylibNames

From 5fd3ed8496024ec62ca1fce2e9d4b475ad45387b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 27 Nov 2024 00:01:11 +0000
Subject: [PATCH 206/340] hdf4: 4.2.15 -> 4.3.0

Includes fixes for GCC 14.
---
 pkgs/by-name/hd/hdf4/package.nix | 68 ++++++--------------------------
 1 file changed, 13 insertions(+), 55 deletions(-)

diff --git a/pkgs/by-name/hd/hdf4/package.nix b/pkgs/by-name/hd/hdf4/package.nix
index 8a058c9222449..0d7f0cac0385b 100644
--- a/pkgs/by-name/hd/hdf4/package.nix
+++ b/pkgs/by-name/hd/hdf4/package.nix
@@ -1,9 +1,7 @@
 {
   lib,
   stdenv,
-  fetchpatch,
-  fetchurl,
-  fixDarwinDylibNames,
+  fetchFromGitHub,
   cmake,
   ninja,
   libjpeg,
@@ -21,22 +19,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hdf";
-  version = "4.2.16-2";
+  version = "4.3.0";
 
-  src = fetchurl {
-    url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${finalAttrs.version}/src/hdf-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-xcMjS1ASJYrvLkQy9kmzHCGyYBWvuhhXrYNkDD8raSw=";
+  src = fetchFromGitHub {
+    owner = "HDFGroup";
+    repo = "hdf4";
+    rev = "refs/tags/hdf${finalAttrs.version}";
+    hash = "sha256-Q2VKwkp/iroStrOnwHI8d/dtMWkMoJesBVBVChwNa30=";
   };
 
-  nativeBuildInputs =
-    [
-      cmake
-      ninja
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      fixDarwinDylibNames
-    ]
-    ++ lib.optional fortranSupport gfortran;
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ] ++ lib.optional fortranSupport gfortran;
 
   buildInputs =
     [
@@ -47,23 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional szipSupport szip
     ++ lib.optional uselibtirpc libtirpc;
 
-  preConfigure =
-    lib.optionalString uselibtirpc ''
-      # Make tirpc discovery work with CMAKE_PREFIX_PATH
-      substituteInPlace config/cmake/FindXDR.cmake \
-        --replace-fail 'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATHS "/usr/include" "/usr/include/tirpc")' \
-                       'find_path(XDR_INCLUDE_DIR NAMES rpc/types.h PATH_SUFFIXES include/tirpc)'
-    ''
-    + lib.optionalString szipSupport ''
-      export SZIP_INSTALL=${szip}
-    '';
-
   cmakeFlags =
     [
       (lib.cmakeBool "BUILD_SHARED_LIBS" true)
       (lib.cmakeBool "HDF4_BUILD_TOOLS" true)
       (lib.cmakeBool "HDF4_BUILD_UTILS" true)
-      (lib.cmakeBool "HDF4_BUILD_WITH_INSTALL_NAME" false)
+      (lib.cmakeBool "HDF4_BUILD_WITH_INSTALL_NAME" true)
       (lib.cmakeBool "HDF4_ENABLE_JPEG_LIB_SUPPORT" true)
       (lib.cmakeBool "HDF4_ENABLE_Z_LIB_SUPPORT" true)
       (lib.cmakeBool "HDF4_ENABLE_NETCDF" netcdfSupport)
@@ -87,33 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
       (lib.cmakeFeature "H4_PRINTF_LL_TEST_RUN__TRYRUN_OUTPUT" "")
     ];
 
-  env = lib.optionalAttrs stdenv.cc.isClang {
-    NIX_CFLAGS_COMPILE = toString [
-      "-Wno-error=implicit-function-declaration"
-      "-Wno-error=implicit-int"
-    ];
-  };
-
-  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
-
-  excludedTests = lib.optionals stdenv.hostPlatform.isDarwin [
-    "MFHDF_TEST-hdftest"
-    "MFHDF_TEST-hdftest-shared"
-    "HDP-dumpsds-18"
-    "NC_TEST-nctest"
-  ];
-
-  checkPhase =
-    let
-      excludedTestsRegex = lib.optionalString (
-        finalAttrs.excludedTests != [ ]
-      ) "(${lib.concatStringsSep "|" finalAttrs.excludedTests})";
-    in
-    ''
-      runHook preCheck
-      ctest -E "${excludedTestsRegex}" --output-on-failure
-      runHook postCheck
-    '';
+  doCheck = true;
 
   outputs = [
     "bin"

From 8c23517cc6c65bd65b947d68988cbebdfb148f5d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 27 Dec 2024 22:15:44 +0100
Subject: [PATCH 207/340] python312Packages.tencentcloud-sdk-python: 3.0.1290
 -> 3.0.1291

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1290...3.0.1291

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1291/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 30c83cb86004b..b3d177f36e9e8 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1290";
+  version = "3.0.1291";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-sGIJKU3q+TGDMW6LWtbyiGq1wv1iFRQJ2MBtjK+zqqY=";
+    hash = "sha256-Kc+gnY1swnN2Rle/JHPJlopziYbCIFijRKVZx5Phs8w=";
   };
 
   build-system = [ setuptools ];

From 777cd4573c774ed7b04c26852f450a1006e95a28 Mon Sep 17 00:00:00 2001
From: Mathieu Rene <mathieu.rene@gmail.com>
Date: Fri, 27 Dec 2024 13:22:02 -0500
Subject: [PATCH 208/340] pam_ssh_agent_auth: fix build with gcc14

---
 .../by-name/pa/pam_ssh_agent_auth/package.nix | 46 ++++++++++++++++---
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix b/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix
index 178deb281d4d5..6ba71b483e24b 100644
--- a/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix
+++ b/pkgs/by-name/pa/pam_ssh_agent_auth/package.nix
@@ -3,9 +3,11 @@
   stdenv,
   nixosTests,
   fetchFromGitHub,
+  fetchDebianPatch,
   pam,
   openssl,
   perl,
+  autoreconfHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -26,18 +28,50 @@ stdenv.mkDerivation rec {
     sha256 = "ETFpIaWQnlYG8ZuDG2dNjUJddlvibB4ukHquTFn3NZM=";
   };
 
+  # Required because of fix-configure.patch
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
   buildInputs = [
     pam
     openssl
     perl
   ];
 
-  patches = [
-    # Allow multiple colon-separated authorized keys files to be
-    # specified in the file= option.
-    ./multiple-key-files.patch
-    ./edcsa-crash-fix.patch
-  ];
+  patches =
+    let
+      fetchDebianPatch' =
+        args:
+        fetchDebianPatch (
+          {
+            pname = "pam-ssh-agent-auth";
+            version = "0.10.3";
+            debianRevision = "11";
+          }
+          // args
+        );
+    in
+    [
+      # Allow multiple colon-separated authorized keys files to be
+      # specified in the file= option.
+      ./multiple-key-files.patch
+      ./edcsa-crash-fix.patch
+
+      # Patch configure to remove implicit function declaration errors under gcc14
+      # Requires autoreconfHook
+      (fetchDebianPatch' {
+        patch = "fix-configure.patch";
+        hash = "sha256-ymXv2o/NpFeVQ6r0hvJEeMpvs5Ht9jq4RSw8ssv43FY=";
+      })
+
+      # Avoided incompatible pointer passing to fix GCC 14 build errors. Add missing 'const', cast to expected pointer type (DSA_SIG) and avoid
+      # pointer to pointer when pointer is required.
+      (fetchDebianPatch' {
+        patch = "1000-gcc-14.patch";
+        hash = "sha256-EvdaIhrfKZ1mB7qvNiGx/hYdthStgnhK7xvJEhhAFDQ=";
+      })
+    ];
 
   configureFlags = [
     # It's not clear to me why this is necessary, but without it, you see:

From 86ca4769834b06bcceade194e0304b9c46b8df54 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Fri, 27 Dec 2024 22:28:24 +0100
Subject: [PATCH 209/340] zed-editor: 0.166.1 -> 0.166.2

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

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 315842a3a3c6b..e9287c4e977ff 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -93,13 +93,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "zed-editor";
-  version = "0.166.1";
+  version = "0.166.2";
 
   src = fetchFromGitHub {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${version}";
-    hash = "sha256-ss4dz9qPAP6eIYbG3S5QJaSR5zEyEqLBjfacj/eb7AE=";
+    hash = "sha256-Z3WdJRn6JpZpZlHq2vjIq1EX1vW4+Gv/XAz2H4WH0Fw=";
   };
 
   patches = [
@@ -128,7 +128,7 @@ rustPlatform.buildRustPackage rec {
     '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-HbOdY+6FKGTK5gW2BkWSdciBvTx+oKhCchFvwKEoGNE=";
+  cargoHash = "sha256-J5vJ/KV94a+9AqGbNZx6sCzWflOZsyUj3NcqnfaexGE=";
 
   nativeBuildInputs =
     [

From 6b2ddb02efbf765eea27e8e84f328f66743a793f Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 3 Nov 2024 09:01:22 -0500
Subject: [PATCH 210/340] msgpack-cxx: 6.1.1 -> 7.0.0

Diff: https://github.com/msgpack/msgpack-c/compare/refs/tags/cpp-6.1.1...cpp-7.0.0

Changelog: https://github.com/msgpack/msgpack-c/blob/refs/tags/cpp-7.0.0/CHANGELOG.md
---
 pkgs/by-name/ms/msgpack-cxx/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ms/msgpack-cxx/package.nix b/pkgs/by-name/ms/msgpack-cxx/package.nix
index 73664813612d4..850b6a26a4aa6 100644
--- a/pkgs/by-name/ms/msgpack-cxx/package.nix
+++ b/pkgs/by-name/ms/msgpack-cxx/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "msgpack-cxx";
-  version = "6.1.1";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "msgpack";
     repo = "msgpack-c";
     rev = "refs/tags/cpp-${finalAttrs.version}";
-    hash = "sha256-m0Ki+9/nZo2b4BUT+gUtdxok5I7xQtcfnMkbG+OHsKs=";
+    hash = "sha256-kg4mpNiigfZ59ZeL8LXEHwtkLU8Po+vgRcUcgTJd+h4=";
   };
 
   strictDeps = true;

From 29402375e38e07f1dcee5f98da90f4e1515e3a6b Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Sun, 3 Nov 2024 09:10:38 -0500
Subject: [PATCH 211/340] foundationdb: allow using any msgpack-cxx version

---
 pkgs/servers/foundationdb/cmake.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index 287809a451d79..015177d558c0f 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -86,6 +86,12 @@ let
 
         inherit patches;
 
+        # allow using any msgpack-cxx version
+        postPatch = ''
+          substituteInPlace cmake/GetMsgpack.cmake \
+            --replace-warn 'find_package(msgpack-cxx 6 QUIET CONFIG)' 'find_package(msgpack-cxx QUIET CONFIG)'
+        '';
+
         # the install phase for cmake is pretty wonky right now since it's not designed to
         # coherently install packages as most linux distros expect -- it's designed to build
         # packaged artifacts that are shipped in RPMs, etc. we need to add some extra code to

From aa1cc643da0c64b387f9277b3298c00628bc083d Mon Sep 17 00:00:00 2001
From: thtrf <r3769.tv@gmail.com>
Date: Fri, 27 Dec 2024 22:38:57 +0100
Subject: [PATCH 212/340] basilk: init at 0.2.0

---
 pkgs/by-name/ba/basilk/package.nix | 41 ++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/ba/basilk/package.nix

diff --git a/pkgs/by-name/ba/basilk/package.nix b/pkgs/by-name/ba/basilk/package.nix
new file mode 100644
index 0000000000000..449a089e32948
--- /dev/null
+++ b/pkgs/by-name/ba/basilk/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "basilk";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "gabalpha";
+    repo = "basilk";
+    tag = version;
+    hash = "sha256-b77vVf+WbDNzKwGaMJvgMEMCC41h5TXmg45OM9g4v+4=";
+  };
+
+  cargoHash = "sha256-ZYyRUqWbwAoNaGuCXJvqWTgUm5jNpihqvPe5SsfjEq4=";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Terminal User Interface (TUI) to manage your tasks with minimal kanban logic";
+    homepage = "https://github.com/gabalpha/basilk";
+    changelog = "https://github.com/GabAlpha/basilk/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ thtrf ];
+    mainProgram = "basilk";
+  };
+}

From 28b02ff6b0792f0de51f6e502abb42ff28a1d0ca Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Fri, 27 Dec 2024 22:59:17 +0100
Subject: [PATCH 213/340] zed-editor: use version instead of tag for changelog
 link

---
 pkgs/by-name/ze/zed-editor/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index e9287c4e977ff..414f93c9e45a3 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -309,7 +309,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "High-performance, multiplayer code editor from the creators of Atom and Tree-sitter";
     homepage = "https://zed.dev";
-    changelog = "https://github.com/zed-industries/zed/releases/tag/${src.tag}";
+    changelog = "https://github.com/zed-industries/zed/releases/tag/v${version}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       GaetanLepage

From 5ea8221772c87e1779b4f19ccd023c20dc4be64e Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Fri, 27 Dec 2024 23:09:57 +0100
Subject: [PATCH 214/340] nixos/tests/wireguard: fix broken
 network-online.target checks

This patch fixes the networkd and dynamic-refresh-networkd
tests not working since 2370696dff55228ca605ee74074b00715573e2b7.
---
 nixos/tests/wireguard/dynamic-refresh.nix | 3 +++
 nixos/tests/wireguard/networkd.nix        | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/wireguard/dynamic-refresh.nix b/nixos/tests/wireguard/dynamic-refresh.nix
index e0af6bc025aa9..2a8fb0598833a 100644
--- a/nixos/tests/wireguard/dynamic-refresh.nix
+++ b/nixos/tests/wireguard/dynamic-refresh.nix
@@ -84,7 +84,10 @@ import ../make-test-python.nix (
       ''
         start_all()
 
+        server.systemctl("start network-online.target")
         server.wait_for_unit("network-online.target")
+
+        client.systemctl("start network-online.target")
         client.wait_for_unit("network-online.target")
 
         client.succeed("ping -n -w 1 -c 1 10.23.42.1")
diff --git a/nixos/tests/wireguard/networkd.nix b/nixos/tests/wireguard/networkd.nix
index beaba5a4343a0..17d164ff77f28 100644
--- a/nixos/tests/wireguard/networkd.nix
+++ b/nixos/tests/wireguard/networkd.nix
@@ -79,8 +79,11 @@ import ../make-test-python.nix (
     testScript = ''
       start_all()
 
-      peer0.wait_for_unit("systemd-networkd-wait-online.service")
-      peer1.wait_for_unit("systemd-networkd-wait-online.service")
+      peer0.systemctl("start network-online.target")
+      peer0.wait_for_unit("network-online.target")
+
+      peer1.systemctl("start network-online.target")
+      peer1.wait_for_unit("network-online.target")
 
       peer1.succeed("ping -c5 fc00::1")
       peer1.succeed("ping -c5 10.23.42.1")

From e7e42de5a7f03e272b677f754f7a75ac968d8266 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Fri, 27 Dec 2024 23:11:40 +0100
Subject: [PATCH 215/340] nixos/wireguard-networkd: only set PresharedKey
 credential when given a file

This patch fixes an oversight in the initial implementation
of using systemd credentials in 6bc8dcc6308d33a0034b3d5afdfa9c9b23a1de80
that would cause a warning to be logged about a missing credential
when presharedKeyFile wasn't set.
---
 nixos/modules/services/networking/wireguard-networkd.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/wireguard-networkd.nix b/nixos/modules/services/networking/wireguard-networkd.nix
index ad7de97f1e5a9..bcd2e9cf5b525 100644
--- a/nixos/modules/services/networking/wireguard-networkd.nix
+++ b/nixos/modules/services/networking/wireguard-networkd.nix
@@ -61,7 +61,8 @@ let
     interfaceName: peer:
     removeNulls {
       PublicKey = peer.publicKey;
-      PresharedKey = "@${presharedKeyCredential interfaceName peer}";
+      PresharedKey =
+        if peer.presharedKeyFile == null then null else "@${presharedKeyCredential interfaceName peer}";
       AllowedIPs = peer.allowedIPs;
       Endpoint = peer.endpoint;
       PersistentKeepalive = peer.persistentKeepalive;

From 51d476389a8324917ba1026df5253eea74959d7d Mon Sep 17 00:00:00 2001
From: Sopy <doimpt@sopy.one>
Date: Sat, 28 Dec 2024 00:15:53 +0200
Subject: [PATCH 216/340] top-level/aliases: fix buildFHSUserEnv deprecation
 message typo

---
 pkgs/top-level/aliases.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8213b6880f8f0..92b25cec6ee03 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -176,7 +176,7 @@ mapAliases {
   butler = throw "butler was removed because it was broken and abandoned upstream"; # added 2024-06-18
   bwidget = tclPackages.bwidget; # Added 2024-10-02
   # Shorter names; keep the longer name for back-compat. Added 2023-04-11. Warning added on 2024-12-16
-  buildFHSUserEnv = lib.warnOnInstantiate "'buildFHSUserEnv' as been renamed to 'buildFHSEnv' and will be removed in 25.11" buildFHSEnv;
+  buildFHSUserEnv = lib.warnOnInstantiate "'buildFHSUserEnv' has been renamed to 'buildFHSEnv' and will be removed in 25.11" buildFHSEnv;
   buildFHSUserEnvChroot = lib.warnOnInstantiate "'buildFHSUserEnvChroot' has been renamed to 'buildFHSEnvChroot' and will be removed in 25.11" buildFHSEnvChroot;
   buildFHSUserEnvBubblewrap = lib.warnOnInstantiate "'buildFHSUserEnvBubblewrap' has been renamed to 'buildFHSEnvBubblewrap' and will be removed in 25.11" buildFHSEnvBubblewrap;
 

From 3dc1c99320480040f1abbe9a425986fcca9834ae Mon Sep 17 00:00:00 2001
From: Valentin Bruch <software@vbruch.eu>
Date: Fri, 27 Dec 2024 23:40:33 +0100
Subject: [PATCH 217/340] beamerpresenter: 0.2.5 -> 0.2.6

https://github.com/stiglers-eponym/BeamerPresenter/blob/main/CHANGELOG.md
---
 pkgs/applications/office/beamerpresenter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix
index 5bfb8a260b0b6..887ded4779183 100644
--- a/pkgs/applications/office/beamerpresenter/default.nix
+++ b/pkgs/applications/office/beamerpresenter/default.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "beamerpresenter";
-  version = "0.2.5";
+  version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "stiglers-eponym";
     repo = "BeamerPresenter";
     rev = "v${version}";
-    hash = "sha256-ofS0KMsn0KG8squIvMPxSCgE/qNK+Kd47psNziLBBoo=";
+    hash = "sha256-sPeWlPkWOPfLAoAC/+T7nyhPqvoaZg6aMOIVLjMqd2k=";
   };
 
   nativeBuildInputs = [

From f25fb0d388092d5ba828b467d25a7cbd1c2e6367 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 27 Dec 2024 23:21:27 +0000
Subject: [PATCH 218/340] nixos-rebuild-ng: fix eval flags for
 nix.build_remote_flake

---
 .../src/nixos_rebuild/__init__.py             | 33 ++++++++++---------
 .../nixos-rebuild-ng/src/nixos_rebuild/nix.py |  8 ++---
 .../nixos-rebuild-ng/src/tests/test_main.py   |  3 +-
 .../ni/nixos-rebuild-ng/src/tests/test_nix.py |  4 +--
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
index 8204c499fe654..73788bb8ccfe8 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py
@@ -43,19 +43,19 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa
     common_build_flags.add_argument("--print-build-logs", "-L", action="store_true")
     common_build_flags.add_argument("--show-trace", action="store_true")
 
-    flake_build_flags = argparse.ArgumentParser(add_help=False)
-    flake_build_flags.add_argument("--accept-flake-config", action="store_true")
-    flake_build_flags.add_argument("--refresh", action="store_true")
-    flake_build_flags.add_argument("--impure", action="store_true")
-    flake_build_flags.add_argument("--offline", action="store_true")
-    flake_build_flags.add_argument("--no-net", action="store_true")
-    flake_build_flags.add_argument("--recreate-lock-file", action="store_true")
-    flake_build_flags.add_argument("--no-update-lock-file", action="store_true")
-    flake_build_flags.add_argument("--no-write-lock-file", action="store_true")
-    flake_build_flags.add_argument("--no-registries", action="store_true")
-    flake_build_flags.add_argument("--commit-lock-file", action="store_true")
-    flake_build_flags.add_argument("--update-input")
-    flake_build_flags.add_argument("--override-input", nargs=2)
+    flake_common_flags = argparse.ArgumentParser(add_help=False)
+    flake_common_flags.add_argument("--accept-flake-config", action="store_true")
+    flake_common_flags.add_argument("--refresh", action="store_true")
+    flake_common_flags.add_argument("--impure", action="store_true")
+    flake_common_flags.add_argument("--offline", action="store_true")
+    flake_common_flags.add_argument("--no-net", action="store_true")
+    flake_common_flags.add_argument("--recreate-lock-file", action="store_true")
+    flake_common_flags.add_argument("--no-update-lock-file", action="store_true")
+    flake_common_flags.add_argument("--no-write-lock-file", action="store_true")
+    flake_common_flags.add_argument("--no-registries", action="store_true")
+    flake_common_flags.add_argument("--commit-lock-file", action="store_true")
+    flake_common_flags.add_argument("--update-input")
+    flake_common_flags.add_argument("--override-input", nargs=2)
 
     classic_build_flags = argparse.ArgumentParser(add_help=False)
     classic_build_flags.add_argument("--no-build-output", "-Q", action="store_true")
@@ -74,7 +74,7 @@ def get_parser() -> tuple[argparse.ArgumentParser, dict[str, argparse.ArgumentPa
     sub_parsers = {
         "common_flags": common_flags,
         "common_build_flags": common_build_flags,
-        "flake_build_flags": flake_build_flags,
+        "flake_common_flags": flake_common_flags,
         "classic_build_flags": classic_build_flags,
         "copy_flags": copy_flags,
     }
@@ -327,7 +327,8 @@ def execute(argv: list[str]) -> None:
     common_flags = vars(args_groups["common_flags"])
     common_build_flags = common_flags | vars(args_groups["common_build_flags"])
     build_flags = common_build_flags | vars(args_groups["classic_build_flags"])
-    flake_build_flags = common_build_flags | vars(args_groups["flake_build_flags"])
+    flake_common_flags = common_flags | vars(args_groups["flake_common_flags"])
+    flake_build_flags = common_build_flags | flake_common_flags
     copy_flags = common_flags | vars(args_groups["copy_flags"])
 
     if args.upgrade or args.upgrade_all:
@@ -410,9 +411,9 @@ def execute(argv: list[str]) -> None:
                         attr,
                         flake,
                         build_host,
+                        eval_flags=flake_common_flags,
                         flake_build_flags=flake_build_flags,
                         copy_flags=copy_flags,
-                        build_flags=build_flags,
                     )
                 case (_, False, None, Flake(_)):
                     path_to_config = nix.build_flake(
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
index d0435504a019d..876a9a06c9c7c 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/nix.py
@@ -128,9 +128,9 @@ def build_remote_flake(
     attr: str,
     flake: Flake,
     build_host: Remote,
-    flake_build_flags: Args | None = None,
+    eval_flags: Args | None = None,
     copy_flags: Args | None = None,
-    build_flags: Args | None = None,
+    flake_build_flags: Args | None = None,
 ) -> Path:
     r = run_wrapper(
         [
@@ -139,7 +139,7 @@ def build_remote_flake(
             "eval",
             "--raw",
             flake.to_attr(attr, "drvPath"),
-            *dict_to_flags(flake_build_flags),
+            *dict_to_flags(eval_flags),
         ],
         stdout=PIPE,
     )
@@ -152,7 +152,7 @@ def build_remote_flake(
             "build",
             f"{drv}^*",
             "--print-out-paths",
-            *dict_to_flags(build_flags),
+            *dict_to_flags(flake_build_flags),
         ],
         remote=build_host,
         stdout=PIPE,
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
index 79c02b395d373..63ae241479290 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py
@@ -349,7 +349,6 @@ def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]:
                     "eval",
                     "--raw",
                     "/path/to/config#nixosConfigurations.hostname.config.system.build.toplevel.drvPath",
-                    "--no-link",
                 ],
                 check=True,
                 stdout=PIPE,
@@ -372,7 +371,7 @@ def run_side_effect(args: list[str], **kwargs: Any) -> CompletedProcess[str]:
                     "build",
                     f"'{config_path}^*'",
                     "--print-out-paths",
-                    "--no-out-link",
+                    "--no-link",
                 ],
                 check=True,
                 stdout=PIPE,
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
index 0afb8471f1c78..a040d60e6368d 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_nix.py
@@ -174,9 +174,9 @@ def test_build_remote_flake(mock_run: Any, monkeypatch: Any) -> None:
         "config.system.build.toplevel",
         flake,
         build_host,
-        flake_build_flags={"flake": True},
+        eval_flags={"flake": True},
         copy_flags={"copy": True},
-        build_flags={"build": True},
+        flake_build_flags={"build": True},
     ) == Path("/path/to/file")
     mock_run.assert_has_calls(
         [

From 94df207c4309580a9cdfba0666d8f057ddaf01ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 00:31:55 +0000
Subject: [PATCH 219/340] aliae: 0.23.0 -> 0.24.1

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

diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix
index ca59c4de28282..c6f762de988e8 100644
--- a/pkgs/by-name/al/aliae/package.nix
+++ b/pkgs/by-name/al/aliae/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "aliae";
-  version = "0.23.0";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = "aliae";
     rev = "refs/tags/v${version}";
-    hash = "sha256-eJvtO5VL8miafrLQELSQB6/G2wUzTSdmeYW3j/AB3PU=";
+    hash = "sha256-HccUA4+es9M7PZUTqWvIb3xNxmOeyI2iw5bG316RgLE=";
   };
 
-  vendorHash = "sha256-bZG73TKU1vB0Ll/n+VndGZq+cpZRLvGdSAuJNiQwZ94=";
+  vendorHash = "sha256-wNcn7ATUumuki8IQIrs7f8cf3uD7sMFlaS6BhgpEMVM=";
 
   sourceRoot = "${src.name}/src";
 

From c1eb3b68f8fdbc5e5f17fe9ef069206d4d5ad422 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Sat, 28 Dec 2024 01:34:11 +0100
Subject: [PATCH 220/340] nixos/wireguard-networkd: escape backslashes in
 systemd credential names

This patch fixes loading issues for pre shared keys for
peers without custom names. In this case the peer's public
key would be used in the name for the corresponding pre
shared key credential, causing a loading error.

The networking.wireguard base module already escapes some
base64 characters of the public key with escape sequences
starting with a backslash. This backslash is now replaced
with an underscore for use in the credential names.
---
 nixos/modules/services/networking/wireguard-networkd.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/wireguard-networkd.nix b/nixos/modules/services/networking/wireguard-networkd.nix
index bcd2e9cf5b525..60d86ee43befb 100644
--- a/nixos/modules/services/networking/wireguard-networkd.nix
+++ b/nixos/modules/services/networking/wireguard-networkd.nix
@@ -22,14 +22,16 @@ let
     ;
   inherit (lib.modules) mkIf;
   inherit (lib.options) literalExpression mkOption;
-  inherit (lib.strings) hasInfix;
+  inherit (lib.strings) hasInfix replaceStrings;
   inherit (lib.trivial) flip pipe;
 
   removeNulls = filterAttrs (_: v: v != null);
 
-  privateKeyCredential = interfaceName: "wireguard-${interfaceName}-private-key";
+  escapeCredentialName = input: replaceStrings [ "\\" ] [ "_" ] input;
+
+  privateKeyCredential = interfaceName: escapeCredentialName "wireguard-${interfaceName}-private-key";
   presharedKeyCredential =
-    interfaceName: peer: "wireguard-${interfaceName}-${peer.name}-preshared-key";
+    interfaceName: peer: escapeCredentialName "wireguard-${interfaceName}-${peer.name}-preshared-key";
 
   interfaceCredentials =
     interfaceName: interface:

From 61d11b7ea4e6f0dbc237a1d5e5a7e1957ae774aa Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Sat, 28 Dec 2024 01:41:03 +0100
Subject: [PATCH 221/340] nixos/tests/wireguard: test for pre shared keys
 working with networkd

---
 nixos/tests/wireguard/networkd.nix      | 10 ++++++++++
 nixos/tests/wireguard/snakeoil-keys.nix |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/nixos/tests/wireguard/networkd.nix b/nixos/tests/wireguard/networkd.nix
index 17d164ff77f28..20305bc2ab125 100644
--- a/nixos/tests/wireguard/networkd.nix
+++ b/nixos/tests/wireguard/networkd.nix
@@ -39,6 +39,9 @@ import ../make-test-python.nix (
                 "fc00::2/128"
               ];
 
+              # !!! Don't do this with real keys. The /nix store is world-readable!
+              presharedKeyFile = toString (pkgs.writeText "presharedKey" wg-snakeoil-keys.presharedKey);
+
               inherit (wg-snakeoil-keys.peer1) publicKey;
             };
           };
@@ -69,6 +72,9 @@ import ../make-test-python.nix (
               endpoint = "192.168.0.1:23542";
               persistentKeepalive = 25;
 
+              # !!! Don't do this with real keys. The /nix store is world-readable!
+              presharedKeyFile = toString (pkgs.writeText "presharedKey" wg-snakeoil-keys.presharedKey);
+
               inherit (wg-snakeoil-keys.peer0) publicKey;
             };
           };
@@ -87,6 +93,10 @@ import ../make-test-python.nix (
 
       peer1.succeed("ping -c5 fc00::1")
       peer1.succeed("ping -c5 10.23.42.1")
+
+      with subtest("Has PSK set"):
+        peer0.succeed("wg | grep 'preshared key'")
+        peer1.succeed("wg | grep 'preshared key'")
     '';
   }
 )
diff --git a/nixos/tests/wireguard/snakeoil-keys.nix b/nixos/tests/wireguard/snakeoil-keys.nix
index c979f0e0c8a96..2b51abe53f1e4 100644
--- a/nixos/tests/wireguard/snakeoil-keys.nix
+++ b/nixos/tests/wireguard/snakeoil-keys.nix
@@ -1,4 +1,6 @@
 {
+  presharedKey = "7myEJlGAWLTg83y7Py29pp7REQBVmZfI4xcawjcZpjg=";
+
   peer0 = {
     privateKey = "OPuVRS2T0/AtHDp3PXkNuLQYDiqJaBEEnYe42BSnJnQ=";
     publicKey = "IujkG119YPr2cVQzJkSLYCdjpHIDjvr/qH1w1tdKswY=";

From 33de8dc7bf6e415074103433b61a3283c477000f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 00:55:04 +0000
Subject: [PATCH 222/340] taschenrechner: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/by-name/ta/taschenrechner/package.nix b/pkgs/by-name/ta/taschenrechner/package.nix
index fa8d7170dd6ff..48e8c181afaf8 100644
--- a/pkgs/by-name/ta/taschenrechner/package.nix
+++ b/pkgs/by-name/ta/taschenrechner/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "taschenrechner";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.fem-net.de";
     owner = "mabl";
     repo = "taschenrechner";
     rev = version;
-    hash = "sha256-5Vml6UeiWz7fNA+vEQ/Ita2YI8dGgDclqkzQ848AwVk=";
+    hash = "sha256-ZZVghL0R3p5sE8V9Z0MsmTiCacuE2RXohQQEYJYgp/o=";
   };
 
-  cargoHash = "sha256-BZGkdHR66O3GjKl9yM/bKxdGdvWFB/YO2Egg6V/wuB8=";
+  cargoHash = "sha256-xZ3Ki1HLzF7A1+83GQNTBgRjn802Z9ZAKENKB5CykCc=";
 
   meta = with lib; {
     description = "Cli-calculator written in Rust";

From ff9b99d7719c5ff6f96444179c8045711df80261 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 01:16:52 +0000
Subject: [PATCH 223/340] myks: 4.2.5 -> 4.2.6

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

diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix
index e1c7a55bd2acd..614ef27d70c14 100644
--- a/pkgs/by-name/my/myks/package.nix
+++ b/pkgs/by-name/my/myks/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "myks";
-  version = "4.2.5";
+  version = "4.2.6";
 
   src = fetchFromGitHub {
     owner = "mykso";
     repo = "myks";
     rev = "refs/tags/v${version}";
-    hash = "sha256-TKD/WqK6FXJQYUrrjTrisTOgNyBNah9nPij+voguFp4=";
+    hash = "sha256-0kR1lluTRhDwpXhdUn4HJr5bYzJqnY1p77j/tiWyV68=";
   };
 
-  vendorHash = "sha256-Rlf1H/Jvt4JYCc5kttdi51qU+Yu5gZ87/L5bz8hbGsc=";
+  vendorHash = "sha256-LmWuztR6X3x0aOYCqRv3aLiFEZQkaSnh3LT7IOu2Xa0=";
 
   subPackages = ".";
 

From f96d4559af25a461330b92277a29fb9e009cdd1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 01:31:09 +0000
Subject: [PATCH 224/340] cinnamon-settings-daemon: 6.4.2 -> 6.4.3

---
 pkgs/by-name/ci/cinnamon-settings-daemon/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
index 5d7046b657e5c..f74b0f8f40865 100644
--- a/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
+++ b/pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
@@ -33,13 +33,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-settings-daemon";
-  version = "6.4.2";
+  version = "6.4.3";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-VnplZ9HDmrBuDybV5YJBbqaETdUQHdUfgsTZ+Zj1/4c=";
+    hash = "sha256-L7+OgymYoYBdprw66RW8tiGA7XGWjTBpDpXhli8Fjoo=";
   };
 
   patches = [

From 8fd65e57f1d1fdbe5151d23a972b00c632d33162 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Fri, 27 Dec 2024 21:02:42 -0300
Subject: [PATCH 225/340] vimPlugins.blink-cmp: fix runtime version detection
 error

The plugin fails to load in neovim because it cannot detect the git tag
used during build time. Add patch to force using src.tag instead of
runtime detection, preventing the error:
"Detected an out of date or missing fuzzy matching library. Can't
download from github due to not being on a git tag..."
---
 .../vim/plugins/non-generated/blink-cmp/default.nix   |  5 +++++
 .../non-generated/blink-cmp/force-version.patch       | 11 +++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/force-version.patch

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
index 7980b3e788381..fe4243cef6a35 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix
@@ -6,6 +6,7 @@
   vimUtils,
   nix-update-script,
   git,
+  replaceVars,
 }:
 let
   version = "0.8.2";
@@ -39,6 +40,10 @@ vimUtils.buildVimPlugin {
     ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.${libExt} target/release/libblink_cmp_fuzzy.${libExt}
   '';
 
+  patches = [
+    (replaceVars ./force-version.patch { inherit (src) tag; })
+  ];
+
   passthru = {
     updateScript = nix-update-script {
       attrPath = "vimPlugins.blink-cmp.blink-fuzzy-lib";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/force-version.patch b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/force-version.patch
new file mode 100644
index 0000000000000..3a32ac09ef305
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/force-version.patch
@@ -0,0 +1,11 @@
+--- a/lua/blink/cmp/fuzzy/download/init.lua
++++ b/lua/blink/cmp/fuzzy/download/init.lua
+@@ -21,7 +21,7 @@ function download.ensure_downloaded(callback)
+       }
+     end)
+     :map(function(version)
+-      local target_git_tag = download_config.force_version or version.git.tag
++      local target_git_tag = download_config.force_version or '@tag@'
+
+       -- not built locally, not on a git tag, error
+       assert(

From 4ed258f195b9eb8f31bc921655ba15f2edf6de68 Mon Sep 17 00:00:00 2001
From: "The Artifex (4r7if3x)" <the.artifex@proton.me>
Date: Sat, 28 Dec 2024 02:51:49 +0100
Subject: [PATCH 226/340] maintainers: add 4r7if3x

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 73c6ad194cb55..d75c33d5cb92c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -254,6 +254,14 @@
     githubId = 3417013;
     name = "Eske Nielsen";
   };
+  _4r7if3x = {
+    email = "the.artifex@proton.me";
+    matrix = "@4r7if3x:matrix.org";
+    github = "4r7if3x";
+    githubId = 8606282;
+    name = "4r7if3x";
+    keys = [ { fingerprint = "013C ED4B E769 745A CFC3  0F3C F23C 2613 2266 7A12"; } ];
+  };
   _6543 = {
     email = "6543@obermui.de";
     github = "6543";

From d92f62ac06b7562afd198491991da269e64a9e1b Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 28 Dec 2024 04:11:09 +0200
Subject: [PATCH 227/340] koboldcpp: revert e62a47c0 `add (darwinMinVersionHook
 "10.15")`

This reverts commit e62a47c0c8c1f340066165e1d35dab63f519ce6a.

Refs: https://github.com/NixOS/nixpkgs/pull/366837#discussion_r1897446732
---
 pkgs/by-name/ko/koboldcpp/package.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 1c5b60219bdea..c51e2f010408f 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -8,7 +8,6 @@
   addDriverRunpath,
 
   apple-sdk_12,
-  darwinMinVersionHook,
 
   koboldLiteSupport ? true,
 
@@ -62,10 +61,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   buildInputs =
     [ tk ]
     ++ finalAttrs.pythonInputs
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_12
-      (darwinMinVersionHook "10.15")
-    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ]
     ++ lib.optionals cublasSupport [
       cudaPackages.libcublas
       cudaPackages.cuda_nvcc

From b814f3f6c3d558a647c12248d88f55951e882cab Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 28 Dec 2024 02:29:57 +0000
Subject: [PATCH 228/340] koboldcpp: 1.80.1 -> 1.80.3

Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.80.3
Diff: https://github.com/LostRuins/koboldcpp/compare/v1.80.1...v1.80.3
---
 pkgs/by-name/ko/koboldcpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index c51e2f010408f..9175c4aadb783 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -40,13 +40,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.80.1";
+  version = "1.80.3";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-CgJzYF8FnHk0zKdysGJWLnNo/MND24AbQdjRbDtv0II=";
+    hash = "sha256-uxqn4t2dDaVSkVilJOflNbG2Q3fH3Yid8qdEaDGfIcw=";
   };
 
   enableParallelBuilding = true;

From f247420536307207d0c577d80d76b19ddf104bfc Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 28 Dec 2024 10:59:50 +0800
Subject: [PATCH 229/340] xfce.xfce4-systemload-plugin: Enable optional
 features

https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/-/blob/xfce4-systemload-plugin-1.3.3/configure.ac#L57-L61
---
 .../xfce/panel-plugins/xfce4-systemload-plugin/default.nix    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix
index 2dacc464dca05..2128d9e99497e 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix
@@ -5,7 +5,9 @@
   gettext,
   pkg-config,
   xfce4-panel,
+  libgtop,
   libxfce4ui,
+  upower,
   xfconf,
   gitUpdater,
 }:
@@ -28,7 +30,9 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    libgtop
     libxfce4ui
+    upower
     xfce4-panel
     xfconf
   ];

From 3c6c6920b38e2f5a6d082f670a203ad9ec9ed855 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Fri, 27 Dec 2024 21:04:47 -0600
Subject: [PATCH 230/340] ghostty: init at 1.0.0 (#368404)

* maintainers: add jcollie

* ghostty: init at 1.0.0
---
 maintainers/maintainer-list.nix     |   8 +
 nixos/modules/config/terminfo.nix   |   1 +
 pkgs/by-name/gh/ghostty/deps.nix    | 347 ++++++++++++++++++++++++++++
 pkgs/by-name/gh/ghostty/package.nix | 153 ++++++++++++
 4 files changed, 509 insertions(+)
 create mode 100644 pkgs/by-name/gh/ghostty/deps.nix
 create mode 100644 pkgs/by-name/gh/ghostty/package.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 73c6ad194cb55..15af233ea29a5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10335,6 +10335,14 @@
     githubId = 938744;
     name = "John Chadwick";
   };
+  jcollie = {
+    email = "jeff@ocjtech.us";
+    github = "jcollie";
+    githubId = 740022;
+    matrix = "@jeff:ocjtech.us";
+    name = "Jeffrey C. Ollie";
+    keys = [ { fingerprint = "A8CF 5B72 ABC3 9A17 3FEA  620E 6F86 035A 6D97 044E"; } ];
+  };
   jcouyang = {
     email = "oyanglulu@gmail.com";
     github = "jcouyang";
diff --git a/nixos/modules/config/terminfo.nix b/nixos/modules/config/terminfo.nix
index e61f10d4ec215..c81d9fe0d8e39 100644
--- a/nixos/modules/config/terminfo.nix
+++ b/nixos/modules/config/terminfo.nix
@@ -43,6 +43,7 @@
           alacritty
           contour
           foot
+          ghostty
           kitty
           mtm
           rio
diff --git a/pkgs/by-name/gh/ghostty/deps.nix b/pkgs/by-name/gh/ghostty/deps.nix
new file mode 100644
index 0000000000000..81a99677a7032
--- /dev/null
+++ b/pkgs/by-name/gh/ghostty/deps.nix
@@ -0,0 +1,347 @@
+# generated by zon2nix (https://github.com/Cloudef/zig2nix)
+{
+  lib,
+  linkFarm,
+  fetchurl,
+  fetchgit,
+  runCommandLocal,
+  zig,
+  name ? "zig-packages",
+}:
+with builtins;
+with lib;
+let
+  unpackZigArtifact =
+    {
+      name,
+      artifact,
+    }:
+    runCommandLocal name
+      {
+        nativeBuildInputs = [ zig ];
+      }
+      ''
+        hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
+        mv "$TMPDIR/p/$hash" "$out"
+        chmod 755 "$out"
+      '';
+
+  fetchZig =
+    {
+      name,
+      url,
+      hash,
+    }:
+    let
+      artifact = fetchurl { inherit url hash; };
+    in
+    unpackZigArtifact { inherit name artifact; };
+
+  fetchGitZig =
+    {
+      name,
+      url,
+      hash,
+    }:
+    let
+      parts = splitString "#" url;
+      url_base = elemAt parts 0;
+      url_without_query = elemAt (splitString "?" url_base) 0;
+      rev_base = elemAt parts 1;
+      rev = if match "^[a-fA-F0-9]{40}$" rev_base != null then rev_base else "refs/heads/${rev_base}";
+    in
+    fetchgit {
+      inherit name rev hash;
+      url = url_without_query;
+      deepClone = false;
+    };
+
+  fetchZigArtifact =
+    {
+      name,
+      url,
+      hash,
+    }:
+    let
+      parts = splitString "://" url;
+      proto = elemAt parts 0;
+      path = elemAt parts 1;
+      fetcher = {
+        "git+http" = fetchGitZig {
+          inherit name hash;
+          url = "http://${path}";
+        };
+        "git+https" = fetchGitZig {
+          inherit name hash;
+          url = "https://${path}";
+        };
+        http = fetchZig {
+          inherit name hash;
+          url = "http://${path}";
+        };
+        https = fetchZig {
+          inherit name hash;
+          url = "https://${path}";
+        };
+      };
+    in
+    fetcher.${proto};
+in
+linkFarm name [
+  {
+    name = "12206029de146b685739f69b10a6f08baee86b3d0a5f9a659fa2b2b66c9602078bbf";
+    path = fetchZigArtifact {
+      name = "libxev";
+      url = "https://github.com/mitchellh/libxev/archive/db6a52bafadf00360e675fefa7926e8e6c0e9931.tar.gz";
+      hash = "sha256-4GT5wkfkZnIjNv20yDiWEzHAhbIiwHHJfS7A4u/LoNQ=";
+    };
+  }
+  {
+    name = "12206ed982e709e565d536ce930701a8c07edfd2cfdce428683f3f2a601d37696a62";
+    path = fetchZigArtifact {
+      name = "mach_glfw";
+      url = "https://github.com/mitchellh/mach-glfw/archive/37c2995f31abcf7e8378fba68ddcf4a3faa02de0.tar.gz";
+      hash = "sha256-HhXIvWUS8/CHWY4VXPG2ZEo+we8XOn3o5rYJCQ1n8Nk=";
+    };
+  }
+  {
+    name = "1220736fa4ba211162c7a0e46cc8fe04d95921927688bff64ab5da7420d098a7272d";
+    path = fetchZigArtifact {
+      name = "glfw";
+      url = "https://github.com/mitchellh/glfw/archive/b552c6ec47326b94015feddb36058ea567b87159.tar.gz";
+      hash = "sha256-IeBVAOQmtyFqVxzuXPek1onuPwIamcOyYtxqKpPEQjU=";
+    };
+  }
+  {
+    name = "12202adbfecdad671d585c9a5bfcbd5cdf821726779430047742ce1bf94ad67d19cb";
+    path = fetchZigArtifact {
+      name = "xcode_frameworks";
+      url = "https://github.com/mitchellh/xcode-frameworks/archive/69801c154c39d7ae6129ea1ba8fe1afe00585fc8.tar.gz";
+      hash = "sha256-mP/I2coL57UJm/3+4Q8sPAgQwk8V4zM+S4VBBTrX2To=";
+    };
+  }
+  {
+    name = "122004bfd4c519dadfb8e6281a42fc34fd1aa15aea654ea8a492839046f9894fa2cf";
+    path = fetchZigArtifact {
+      name = "vulkan_headers";
+      url = "https://github.com/mitchellh/vulkan-headers/archive/04c8a0389d5a0236a96312988017cd4ce27d8041.tar.gz";
+      hash = "sha256-K+zrRudgHFukOM6En1StRYRMNYkeRk+qHTXvrXaG+FU=";
+    };
+  }
+  {
+    name = "1220b3164434d2ec9db146a40bf3a30f490590d68fa8529776a3138074f0da2c11ca";
+    path = fetchZigArtifact {
+      name = "wayland_headers";
+      url = "https://github.com/mitchellh/wayland-headers/archive/5f991515a29f994d87b908115a2ab0b899474bd1.tar.gz";
+      hash = "sha256-uFilLZinKkZt6RdVTV3lUmJpzpswDdFva22FvwU/XQI=";
+    };
+  }
+  {
+    name = "122089c326186c84aa2fd034b16abc38f3ebf4862d9ae106dc1847ac44f557b36465";
+    path = fetchZigArtifact {
+      name = "x11_headers";
+      url = "https://github.com/mitchellh/x11-headers/archive/2ffbd62d82ff73ec929dd8de802bc95effa0ef88.tar.gz";
+      hash = "sha256-EhV2bmTY/OMYN1wEul35gD0hQgS/Al262jO3pVr0O+c=";
+    };
+  }
+  {
+    name = "1220e17e64ef0ef561b3e4b9f3a96a2494285f2ec31c097721bf8c8677ec4415c634";
+    path = fetchZigArtifact {
+      name = "zig_objc";
+      url = "https://github.com/mitchellh/zig-objc/archive/9b8ba849b0f58fe207ecd6ab7c147af55b17556e.tar.gz";
+      hash = "sha256-H+HIbh2T23uzrsg9/1/vl9Ir1HCAa2pzeTx6zktJH9Q=";
+    };
+  }
+  {
+    name = "12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc";
+    path = fetchZigArtifact {
+      name = "zig_js";
+      url = "https://github.com/mitchellh/zig-js/archive/d0b8b0a57c52fbc89f9d9fecba75ca29da7dd7d1.tar.gz";
+      hash = "sha256-fyNeCVbC9UAaKJY6JhAZlT0A479M/AKYMPIWEZbDWD0=";
+    };
+  }
+  {
+    name = "12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25";
+    path = fetchZigArtifact {
+      name = "ziglyph";
+      url = "https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz";
+      hash = "sha256-cse98+Ft8QUjX+P88yyYfaxJOJGQ9M7Ymw7jFxDz89k=";
+    };
+  }
+  {
+    name = "12204358b2848ffd993d3425055bff0a5ba9b1b60bead763a6dea0517965d7290a6c";
+    path = fetchZigArtifact {
+      name = "iterm2_themes";
+      url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/d6c42066b3045292e0b1154ad84ff22d6863ebf7.tar.gz";
+      hash = "sha256-s6us3PkOPmQCtLS9QNPM7BDLt7x+37KbmYF9d4NMD/c=";
+    };
+  }
+  {
+    name = "12200df4ebeaed45de26cb2c9f3b6f3746d8013b604e035dae658f86f586c8c91d2f";
+    path = fetchZigArtifact {
+      name = "vaxis";
+      url = "git+https://github.com/rockorager/libvaxis/?ref=main#6d729a2dc3b934818dffe06d2ba3ce02841ed74b";
+      hash = "sha256-fFf79fCy4QQFVNcN722tSMjB6FyVEzCB36oH1olk9JQ=";
+    };
+  }
+  {
+    name = "1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5";
+    path = fetchZigArtifact {
+      name = "zigimg";
+      url = "git+https://github.com/zigimg/zigimg#3a667bdb3d7f0955a5a51c8468eac83210c1439e";
+      hash = "sha256-oLf3YH3yeg4ikVO/GahMCDRMTU31AHkfSnF4rt7xTKo=";
+    };
+  }
+  {
+    name = "122055beff332830a391e9895c044d33b15ea21063779557024b46169fb1984c6e40";
+    path = fetchZigArtifact {
+      name = "zg";
+      url = "https://codeberg.org/atman/zg/archive/v0.13.2.tar.gz";
+      hash = "sha256-2x9hT7bYq9KJYWLVOf21a+QvTG/F7HWT+YK15IMRzNY=";
+    };
+  }
+  {
+    name = "1220edc3b8d8bedbb50555947987e5e8e2f93871ca3c8e8d4cc8f1377c15b5dd35e8";
+    path = fetchZigArtifact {
+      name = "zf";
+      url = "git+https://github.com/natecraddock/zf/?ref=main#ed99ca18b02dda052e20ba467e90b623c04690dd";
+      hash = "sha256-t6QNrEJZ4GZZsYixjYvpdrYoCmNbG8TTUmGs2MFa4sU=";
+    };
+  }
+  {
+    name = "1220c72c1697dd9008461ead702997a15d8a1c5810247f02e7983b9f74c6c6e4c087";
+    path = fetchZigArtifact {
+      name = "vaxis";
+      url = "git+https://github.com/rockorager/libvaxis/?ref=main#dc0a228a5544988d4a920cfb40be9cd28db41423";
+      hash = "sha256-QWN4jOrA91KlbqmeEHHJ4HTnCC9nmfxt8DHUXJpAzLI=";
+    };
+  }
+  {
+    name = "12201f0d542e7541cf492a001d4d0d0155c92f58212fbcb0d224e95edeba06b5416a";
+    path = fetchZigArtifact {
+      name = "z2d";
+      url = "git+https://github.com/vancluever/z2d?ref=v0.4.0#4638bb02a9dc41cc2fb811f092811f6a951c752a";
+      hash = "sha256-YpWXn1J3JKQSCrWB25mAfzd1/T56QstEZnhPzBwxgoM=";
+    };
+  }
+  {
+    name = "1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402";
+    path = fetchZigArtifact {
+      name = "imgui";
+      url = "https://github.com/ocornut/imgui/archive/e391fe2e66eb1c96b1624ae8444dc64c23146ef4.tar.gz";
+      hash = "sha256-oF/QHgTPEat4Hig4fGIdLkIPHmBEyOJ6JeYD6pnveGA=";
+    };
+  }
+  {
+    name = "1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d";
+    path = fetchZigArtifact {
+      name = "freetype";
+      url = "https://github.com/freetype/freetype/archive/refs/tags/VER-2-13-2.tar.gz";
+      hash = "sha256-QnIB9dUVFnDQXB9bRb713aHy592XHvVPD+qqf/0quQw=";
+    };
+  }
+  {
+    name = "1220aa013f0c83da3fb64ea6d327f9173fa008d10e28bc9349eac3463457723b1c66";
+    path = fetchZigArtifact {
+      name = "libpng";
+      url = "https://github.com/glennrp/libpng/archive/refs/tags/v1.6.43.tar.gz";
+      hash = "sha256-/syVtGzwXo4/yKQUdQ4LparQDYnp/fF16U/wQcrxoDo=";
+    };
+  }
+  {
+    name = "1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb";
+    path = fetchZigArtifact {
+      name = "zlib";
+      url = "https://github.com/madler/zlib/archive/refs/tags/v1.3.1.tar.gz";
+      hash = "sha256-F+iIY/NgBnKrSRgvIXKBtvxNPHYr3jYZNeQ2qVIU0Fw=";
+    };
+  }
+  {
+    name = "12201149afb3326c56c05bb0a577f54f76ac20deece63aa2f5cd6ff31a4fa4fcb3b7";
+    path = fetchZigArtifact {
+      name = "fontconfig";
+      url = "https://deps.files.ghostty.org/fontconfig-2.14.2.tar.gz";
+      hash = "sha256-O6LdkhWHGKzsXKrxpxYEO1qgVcJ7CB2RSvPMtA3OilU=";
+    };
+  }
+  {
+    name = "122032442d95c3b428ae8e526017fad881e7dc78eab4d558e9a58a80bfbd65a64f7d";
+    path = fetchZigArtifact {
+      name = "libxml2";
+      url = "https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.5.tar.gz";
+      hash = "sha256-bCgFni4+60K1tLFkieORamNGwQladP7jvGXNxdiaYhU=";
+    };
+  }
+  {
+    name = "1220b8588f106c996af10249bfa092c6fb2f35fbacb1505ef477a0b04a7dd1063122";
+    path = fetchZigArtifact {
+      name = "harfbuzz";
+      url = "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/8.4.0.tar.gz";
+      hash = "sha256-nxygiYE7BZRK0c6MfgGCEwJtNdybq0gKIeuHaDg5ZVY=";
+    };
+  }
+  {
+    name = "12205c83b8311a24b1d5ae6d21640df04f4b0726e314337c043cde1432758cbe165b";
+    path = fetchZigArtifact {
+      name = "highway";
+      url = "https://github.com/google/highway/archive/refs/tags/1.1.0.tar.gz";
+      hash = "sha256-NUqLRTm1iOcLmOxwhEJz4/J0EwLEw3e8xOgbPRhm98k=";
+    };
+  }
+  {
+    name = "1220c15e72eadd0d9085a8af134904d9a0f5dfcbed5f606ad60edc60ebeccd9706bb";
+    path = fetchZigArtifact {
+      name = "oniguruma";
+      url = "https://github.com/kkos/oniguruma/archive/refs/tags/v6.9.9.tar.gz";
+      hash = "sha256-ABqhIC54RI9MC/GkjHblVodrNvFtks4yB+zP1h2Z8qA=";
+    };
+  }
+  {
+    name = "1220446be831adcca918167647c06c7b825849fa3fba5f22da394667974537a9c77e";
+    path = fetchZigArtifact {
+      name = "sentry";
+      url = "https://github.com/getsentry/sentry-native/archive/refs/tags/0.7.8.tar.gz";
+      hash = "sha256-KsZJfMjWGo0xCT5HrduMmyxFsWsHBbszSoNbZCPDGN8=";
+    };
+  }
+  {
+    name = "12207fd37bb8251919c112dcdd8f616a491857b34a451f7e4486490077206dc2a1ea";
+    path = fetchZigArtifact {
+      name = "breakpad";
+      url = "https://github.com/getsentry/breakpad/archive/b99f444ba5f6b98cac261cbb391d8766b34a5918.tar.gz";
+      hash = "sha256-bMqYlD0amQdmzvYQd8Ca/1k4Bj/heh7+EijlQSttatk=";
+    };
+  }
+  {
+    name = "1220d4d18426ca72fc2b7e56ce47273149815501d0d2395c2a98c726b31ba931e641";
+    path = fetchZigArtifact {
+      name = "utfcpp";
+      url = "https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.5.tar.gz";
+      hash = "sha256-/8ZooxDndgfTk/PBizJxXyI9oerExNbgV5oR345rWc8=";
+    };
+  }
+  {
+    name = "12200984439edc817fbcbbaff564020e5104a0d04a2d0f53080700827052de700462";
+    path = fetchZigArtifact {
+      name = "wuffs";
+      url = "https://github.com/google/wuffs/archive/refs/tags/v0.4.0-alpha.8.tar.gz";
+      hash = "sha256-P3fpKYaiOpZffe2uNDkC43MFntV38Cl2XpHFF50r80Q=";
+    };
+  }
+  {
+    name = "12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1";
+    path = fetchZigArtifact {
+      name = "glslang";
+      url = "https://github.com/KhronosGroup/glslang/archive/refs/tags/14.2.0.tar.gz";
+      hash = "sha256-FKLtu1Ccs+UamlPj9eQ12/WXFgS0uDPmPmB26MCpl7U=";
+    };
+  }
+  {
+    name = "1220fb3b5586e8be67bc3feb34cbe749cf42a60d628d2953632c2f8141302748c8da";
+    path = fetchZigArtifact {
+      name = "spirv_cross";
+      url = "https://github.com/KhronosGroup/SPIRV-Cross/archive/476f384eb7d9e48613c45179e502a15ab95b6b49.tar.gz";
+      hash = "sha256-tStvz8Ref6abHwahNiwVVHNETizAmZVVaxVsU7pmV+M=";
+    };
+  }
+]
diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix
new file mode 100644
index 0000000000000..cbafd16ba3623
--- /dev/null
+++ b/pkgs/by-name/gh/ghostty/package.nix
@@ -0,0 +1,153 @@
+{
+  bzip2,
+  callPackage,
+  expat,
+  fetchFromGitHub,
+  fontconfig,
+  freetype,
+  glib,
+  glslang,
+  harfbuzz,
+  lib,
+  libadwaita,
+  libGL,
+  libpng,
+  libX11,
+  libXcursor,
+  libXi,
+  libXrandr,
+  ncurses,
+  nixosTests,
+  oniguruma,
+  pandoc,
+  pkg-config,
+  removeReferencesTo,
+  stdenv,
+  versionCheckHook,
+  wrapGAppsHook4,
+  zig_0_13,
+  zlib,
+}:
+let
+  # Ghostty needs to be built with --release=fast, --release=debug and
+  # --release=safe enable too many runtime safety checks.
+  zig_hook = zig_0_13.hook.overrideAttrs {
+    zig_default_flags = "-Dcpu=baseline -Doptimize=ReleaseFast --color off";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ghostty";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "ghostty-org";
+    repo = "ghostty";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-AHI1Z4mfgXkNwQA8xYq4tS0/BARbHL7gQUT41vCxQTM=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    glib # Required for `glib-compile-schemas`
+    ncurses
+    pandoc
+    pkg-config
+    removeReferencesTo
+    wrapGAppsHook4
+    zig_hook
+  ];
+
+  buildInputs = [
+    bzip2
+    expat
+    fontconfig
+    freetype
+    glslang
+    harfbuzz
+    libadwaita
+    libGL
+    libpng
+    libX11
+    libXcursor
+    libXi
+    libXrandr
+    oniguruma
+    zlib
+  ];
+
+  dontConfigure = true;
+  # doCheck is set to false because unit tests currently fail inside the Nix sandbox.
+  doCheck = false;
+  doInstallCheck = true;
+
+  deps = callPackage ./deps.nix {
+    name = "${finalAttrs.pname}-cache-${finalAttrs.version}";
+  };
+
+  zigBuildFlags =
+    [
+      "--system"
+      "${finalAttrs.deps}"
+      "-Dversion-string=${finalAttrs.version}"
+    ]
+    ++ lib.mapAttrsToList (name: package: "-fsys=${name} --search-prefix ${lib.getLib package}") {
+      inherit glslang;
+    };
+
+  zigCheckFlags = finalAttrs.zigBuildFlags;
+
+  outputs = [
+    "out"
+    "terminfo"
+    "shell_integration"
+    "vim"
+  ];
+
+  postInstall = ''
+    mkdir -p "$terminfo/share"
+    mv "$out/share/terminfo" "$terminfo/share/terminfo"
+    ln -sf "$terminfo/share/terminfo" "$out/share/terminfo"
+
+    mkdir -p "$shell_integration"
+    mv "$out/share/ghostty/shell-integration" "$shell_integration/shell-integration"
+    ln -sf "$shell_integration/shell-integration" "$out/share/ghostty/shell-integration"
+
+    mv "$out/share/vim/vimfiles" "$vim"
+    ln -sf "$vim" "$out/share/vim/vimfiles"
+  '';
+
+  preFixup = ''
+    remove-references-to -t ${finalAttrs.deps} $out/bin/ghostty
+  '';
+
+  NIX_LDFLAGS = [ "-lX11" ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = {
+    homepage = "https://ghostty.org/";
+    description = "Fast, native, feature-rich terminal emulator pushing modern features";
+    longDescription = ''
+      Ghostty is a terminal emulator that differentiates itself by being
+      fast, feature-rich, and native. While there are many excellent terminal
+      emulators available, they all force you to choose between speed,
+      features, or native UIs. Ghostty provides all three.
+    '';
+    downloadPage = "https://ghostty.org/download";
+
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    mainProgram = "ghostty";
+    outputsToInstall = finalAttrs.outputs;
+    maintainers = with lib.maintainers; [
+      jcollie
+      pluiedev
+      getchoo
+    ];
+  };
+})

From 3e37ab3c16141c8744d964e6f826a90740272890 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 03:35:19 +0000
Subject: [PATCH 231/340] python312Packages.ha-mqtt-discoverable: 0.16.2 ->
 0.16.4

---
 .../python-modules/ha-mqtt-discoverable/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
index f53a08e405554..911a852655ae0 100644
--- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
+++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "ha-mqtt-discoverable";
-  version = "0.16.2";
+  version = "0.16.4";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "ha-mqtt-discoverable";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-2Ti03c9eyiBBJy5vTUMQddL2SE3Vyjc7gt/0LkgMkbE=";
+    tag = "v${version}";
+    hash = "sha256-9JRgg2A/tcZyAkuddQ/v3Dhxe60O47Y4VZY3Yb6/49g=";
   };
 
   pythonRelaxDeps = [ "pyaml" ];

From 58c6135aa8095b8c474dd631af939e9426166826 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Fri, 27 Dec 2024 22:01:49 -0500
Subject: [PATCH 232/340] lxsession: fix build with gcc 14

---
 pkgs/desktops/lxde/core/lxsession/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/lxde/core/lxsession/default.nix b/pkgs/desktops/lxde/core/lxsession/default.nix
index 74e49b6bb273a..ab6b77429d9a5 100644
--- a/pkgs/desktops/lxde/core/lxsession/default.nix
+++ b/pkgs/desktops/lxde/core/lxsession/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchFromGitHub,
   autoconf,
   automake,
@@ -28,7 +29,17 @@ stdenv.mkDerivation rec {
     sha256 = "17sqsx57ymrimm5jfmcyrp7b0nzi41bcvpxsqckmwbhl19g6c17d";
   };
 
-  patches = [ ./xmlcatalog_patch.patch ];
+  patches = [
+    ./xmlcatalog_patch.patch
+
+    # lxsession compilation is broken upstream as of GCC 14
+    # https://sourceforge.net/p/lxde/bugs/973/
+    (fetchpatch {
+      name = "0001-Fix-build-on-GCC-14.patch";
+      url = "https://sourceforge.net/p/lxde/bugs/973/attachment/0001-Fix-build-on-GCC-14.patch";
+      hash = "sha256-lxF3HZy5uLK7Cfu8W1A03syZf7OWXpHiU2Fk+xBl39g=";
+    })
+  ];
 
   nativeBuildInputs = [
     autoconf

From da20c6cb48c2fd6302fa8721c27cc6fca10d548d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 03:39:29 +0000
Subject: [PATCH 233/340] python312Packages.python-roborock: 2.8.3 -> 2.8.4

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

diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix
index e59c4d98c69dd..ae019e8dbe2be 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "python-roborock";
-  version = "2.8.3";
+  version = "2.8.4";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "humbertogontijo";
     repo = "python-roborock";
     tag = "v${version}";
-    hash = "sha256-auKqv9fD8ensL3k5RbaCNzwrCO7Sd210CFUJROSdEjc=";
+    hash = "sha256-/VDDonWJ/BdWjOzIFSddh9dZEZxIP2XwODsOpnPKbHs=";
   };
 
   postPatch = ''

From 97791d6ec3413c6a63c084757f4d47aef1a1940f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 03:41:05 +0000
Subject: [PATCH 234/340] dprint: 0.47.6 -> 0.48.0

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

diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix
index 05543ec1217cd..9df8d207aff29 100644
--- a/pkgs/by-name/dp/dprint/package.nix
+++ b/pkgs/by-name/dp/dprint/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dprint";
-  version = "0.47.6";
+  version = "0.48.0";
 
   # Prefer repository rather than crate here
   #   - They have Cargo.lock in the repository
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage rec {
     owner = "dprint";
     repo = "dprint";
     rev = "refs/tags/${version}";
-    hash = "sha256-zyiBFZbetKx0H47MAU4JGauAmthcuEdJMl93M6MobD8=";
+    hash = "sha256-Zem37oHku90c7PDV8ep/7FN128eGRUvfIvRsaXa7X9g=";
   };
 
-  cargoHash = "sha256-XuzxoJgJJl4Blw1lDnCG3faEqL9U40MhZEb9LYjiaSs=";
+  cargoHash = "sha256-vlG+0cQMUev8iEgut9l1bCDpS85bRWsNWZyJJXcgSlw=";
 
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     installShellFiles

From 68526a61402e31d4764fbe3a3f38c09bb3fc2ef8 Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Sat, 28 Dec 2024 12:31:36 +0800
Subject: [PATCH 235/340] cargo-cache: fix compilation on darwin

---
 pkgs/development/tools/rust/cargo-cache/default.nix | 6 ++----
 pkgs/top-level/all-packages.nix                     | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix
index 7b8b60ad4125f..2021101430d85 100644
--- a/pkgs/development/tools/rust/cargo-cache/default.nix
+++ b/pkgs/development/tools/rust/cargo-cache/default.nix
@@ -3,8 +3,7 @@
   stdenv,
   fetchFromGitHub,
   rustPlatform,
-  libiconv,
-  Security,
+  zlib,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -21,8 +20,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-275QREIcncgBk4ah/CivSz5N2m6s/XPCfp6JGChpr38=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    libiconv
-    Security
+    zlib
   ];
 
   checkFlags = [ "offline_tests" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 040035177ea0a..be8f29cb7d806 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6822,9 +6822,7 @@ with pkgs;
   cargo-bazel = callPackage ../development/tools/rust/cargo-bazel {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  cargo-cache = callPackage ../development/tools/rust/cargo-cache {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  cargo-cache = callPackage ../development/tools/rust/cargo-cache { };
   cargo-crev = callPackage ../development/tools/rust/cargo-crev {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation;
   };

From 99833b11834cf65ff9f50b576bd95dc41e668163 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sat, 28 Dec 2024 13:46:04 +0800
Subject: [PATCH 236/340] jamesdsp: fix build

---
 pkgs/applications/audio/jamesdsp/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix
index 6dd5c4bba8ba7..823d11b55caa2 100644
--- a/pkgs/applications/audio/jamesdsp/default.nix
+++ b/pkgs/applications/audio/jamesdsp/default.nix
@@ -66,6 +66,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   qmakeFlags = lib.optionals usePulseaudio [ "CONFIG+=USE_PULSEAUDIO" ];
 
+  # https://github.com/Audio4Linux/JDSP4Linux/issues/228
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-Wno-error=incompatible-pointer-types"
+    "-Wno-error=implicit-int"
+    "-Wno-error=implicit-function-declaration"
+  ];
+
   desktopItems = [
     (makeDesktopItem {
       name = "jamesdsp";

From 6c914603814752832fc198d44432aa6bbe3a1090 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 06:25:14 +0000
Subject: [PATCH 237/340] rockcraft: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix
index 4b544879a6119..6b1d272edaa26 100644
--- a/pkgs/by-name/ro/rockcraft/package.nix
+++ b/pkgs/by-name/ro/rockcraft/package.nix
@@ -8,7 +8,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "rockcraft";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "canonical";

From 3f2cbac631e1b14b07b3bf553d866a46dbaa6bd8 Mon Sep 17 00:00:00 2001
From: diredocks <26994007+diredocks@users.noreply.github.com>
Date: Sat, 28 Dec 2024 14:26:29 +0800
Subject: [PATCH 238/340] fzf-tab-zsh: fix for gcc14

---
 maintainers/maintainer-list.nix         | 6 ++++++
 pkgs/by-name/zs/zsh-fzf-tab/package.nix | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 15af233ea29a5..ae6bd3c21adc6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5762,6 +5762,12 @@
     githubId = 11946442;
     name = "Dipin Hora";
   };
+  diredocks = {
+    email = "chensudago@gmail.com";
+    github = "diredocks";
+    githubId = 26994007;
+    name = "Chen Xin";
+  };
   dirkx = {
     email = "dirkx@webweaving.org";
     github = "dirkx";
diff --git a/pkgs/by-name/zs/zsh-fzf-tab/package.nix b/pkgs/by-name/zs/zsh-fzf-tab/package.nix
index 41c9dacef43a1..324b74e80063a 100644
--- a/pkgs/by-name/zs/zsh-fzf-tab/package.nix
+++ b/pkgs/by-name/zs/zsh-fzf-tab/package.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   };
 
   strictDeps = true;
+  nativeBuildInputs = [ autoconf ];
   buildInputs = [ ncurses ];
 
   # https://github.com/Aloxaf/fzf-tab/issues/337
@@ -44,6 +45,8 @@ stdenv.mkDerivation rec {
 
     pushd zsh-${zsh.version}
 
+    # Apply patches from zsh
+    ${lib.concatStringsSep "\n" (map (patch: "patch -p1 -i ${patch}") zsh.patches)}
 
     if [[ ! -f ./configure ]]; then
       ./Util/preconfig
@@ -93,7 +96,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Aloxaf/fzf-tab";
     description = "Replace zsh's default completion selection menu with fzf!";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ vonfry ];
+    maintainers = with lib.maintainers; [ diredocks ];
     platforms = lib.platforms.unix;
   };
 }

From ea75d7fbb144536e2c7ff4d35a5b97a786749d1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 06:36:13 +0000
Subject: [PATCH 239/340] opnborg: 0.1.49 -> 0.1.51

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

diff --git a/pkgs/by-name/op/opnborg/package.nix b/pkgs/by-name/op/opnborg/package.nix
index f531ea44bd8b8..3adf8953bc385 100644
--- a/pkgs/by-name/op/opnborg/package.nix
+++ b/pkgs/by-name/op/opnborg/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
   pname = "opnborg";
-  version = "0.1.49";
+  version = "0.1.51";
 
   src = fetchFromGitHub {
     owner = "paepckehh";
     repo = "opnborg";
     rev = "v${version}";
-    hash = "sha256-q6TwYTVDDNLc9iRFQT9oFtT6SyF1zlJbQ9JH+SRfiSc=";
+    hash = "sha256-HcQl5R+xzk5HUVBUecI7KsrCfz/WK80hZ4oCOSHOGs8=";
   };
 
   vendorHash = "sha256-REXJryUcu+/AdVx1aK0nJ98Wq/EdhrZqL24kC1wK6mc=";

From ea15e6b9170860e312dbacd05bd257ec7b4c51f8 Mon Sep 17 00:00:00 2001
From: diredocks <26994007+diredocks@users.noreply.github.com>
Date: Sat, 28 Dec 2024 14:36:43 +0800
Subject: [PATCH 240/340] fzf-tab-zsh: add autoconf

---
 pkgs/by-name/zs/zsh-fzf-tab/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/zs/zsh-fzf-tab/package.nix b/pkgs/by-name/zs/zsh-fzf-tab/package.nix
index 324b74e80063a..5822953a30a2e 100644
--- a/pkgs/by-name/zs/zsh-fzf-tab/package.nix
+++ b/pkgs/by-name/zs/zsh-fzf-tab/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   zsh,
   ncurses,
+  autoconf,
   nix-update-script,
 }:
 

From 25a914c8c068af09b27b0340d3e3b7f5d44af234 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sat, 28 Dec 2024 14:41:12 +0800
Subject: [PATCH 241/340] qtcreator: pin llvmPackages 18

---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 040035177ea0a..a0e201815de26 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8365,7 +8365,8 @@ with pkgs;
 
   qtcreator = qt6Packages.callPackage ../development/tools/qtcreator {
     inherit (linuxPackages) perf;
-    stdenv = llvmPackages.stdenv;
+    llvmPackages = llvmPackages_18;
+    stdenv = llvmPackages_18.stdenv;
   };
 
   qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ;

From bf655929352a55e4d443eb10667b84740bd6e708 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sat, 28 Dec 2024 15:00:12 +0800
Subject: [PATCH 242/340] deepin.deepin-system-monitor: fix build with gcc 14

---
 pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
index 80415ec8640d7..97ee4c8ba8f1d 100644
--- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
@@ -80,6 +80,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DVERSION=${version}" ];
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+
   strictDeps = true;
 
   meta = with lib; {

From 1e6e7d9ff66ce5b4781178e7bd8fa44434716e47 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sat, 28 Dec 2024 15:11:13 +0800
Subject: [PATCH 243/340] lucenepp: fix build with boost 1.85.0

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

diff --git a/pkgs/by-name/lu/lucenepp/package.nix b/pkgs/by-name/lu/lucenepp/package.nix
index 59e8a2828c352..5e9688571ce74 100644
--- a/pkgs/by-name/lu/lucenepp/package.nix
+++ b/pkgs/by-name/lu/lucenepp/package.nix
@@ -40,6 +40,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/bc436842227aea561b68c6ae89fbd1fdefcac7b3.patch";
       sha256 = "sha256-/S7tFZ4ht5p0cv036xF2NKZQwExbPaGINyWZiUg/lS4=";
     })
+    (fetchpatch {
+      name = "fix-build-with-boost-1_85_0.patch";
+      url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/76dc90f2b65d81be018c499714ff11e121ba5585.patch";
+      sha256 = "sha256-SNAngHwy7yxvly8d6u1LcPsM6NYVx3FrFiSHLmkqY6Q=";
+    })
   ];
 
   # Don't use the built in gtest - but the nixpkgs one requires C++14.

From 23e527abc79891199df8a5c7695c53cfb7a7b94d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 28 Dec 2024 08:18:09 +0000
Subject: [PATCH 244/340] vcmi: 1.6.0 -> 1.6.1

Changes: https://github.com/vcmi/vcmi/releases/tag/1.6.1
---
 pkgs/games/vcmi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix
index daab6f152dd97..18a81c7ece2b3 100644
--- a/pkgs/games/vcmi/default.nix
+++ b/pkgs/games/vcmi/default.nix
@@ -29,14 +29,14 @@
 
 stdenv.mkDerivation rec {
   pname = "vcmi";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "vcmi";
     repo = "vcmi";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-Av6gVCLvRuOh2A6emZQbbMHDNQnEyvN4UMZjqzvNRw8=";
+    hash = "sha256-+fgtAjjDlR6CeV0kO1sgvZc09gTYHVaisLKnqQlyRFI=";
   };
 
   nativeBuildInputs = [

From 3f4d0743199e0b31dbf65ee840377e9fc7428399 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 28 Dec 2024 02:04:27 +0100
Subject: [PATCH 245/340] =?UTF-8?q?gegl:=200.4.50=20=E2=86=92=200.4.52?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gegl/-/compare/GEGL_0_4_50...GEGL_0_4_52
---
 pkgs/development/libraries/gegl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index dc061e0da1ef4..b81cbf65263aa 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -38,7 +38,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gegl";
-  version = "0.4.50";
+  version = "0.4.52";
 
   outputs = [
     "out"
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor finalAttrs.version}/gegl-${finalAttrs.version}.tar.xz";
-    hash = "sha256-YISWmwbuhspxFCEzdz8n4T8C5aaiLCz85FLsqt23kME=";
+    hash = "sha256-yiEqD8PgRIxQWMUcpqDTD9+wKXHyHyiCDaK0kBOWAAo=";
   };
 
   nativeBuildInputs = [

From 8dadf0616b00a78245fb62761f98a44698be8a27 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 08:42:58 +0000
Subject: [PATCH 246/340] ananicy-rules-cachyos: 0-unstable-2024-12-17 ->
 0-unstable-2024-12-27

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

diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index 6b6d43f5233bf..8479675f0be11 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2024-12-17";
+  version = "0-unstable-2024-12-27";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "c942e9a4a606a27fda4aff5754dd2e397ea5d310";
-    hash = "sha256-4qbvXaGh6zcTwn2dKbVZSfbroBQ9xh02FCq/0t/8sjY=";
+    rev = "8e8452c210f005e409f6b1eddbb2907e8db0a6d3";
+    hash = "sha256-73MltJrKlTvj+ijjhbNQsxGl05KGx+jioSrFGA6IdxE=";
   };
 
   dontConfigure = true;

From c2aecc842cdb3d5deb3444dd2f31e9573ac79435 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 08:57:39 +0000
Subject: [PATCH 247/340] zapret: 69.8 -> 69.9

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

diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix
index faa83fd667127..15e48676997ff 100644
--- a/pkgs/by-name/za/zapret/package.nix
+++ b/pkgs/by-name/za/zapret/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zapret";
-  version = "69.8";
+  version = "69.9";
 
   src = fetchFromGitHub {
     owner = "bol-van";
     repo = "zapret";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-5wylVEE1kqZdUxntRvXdLdnRMoZ1QhmdSJaLm5IVHLU=";
+    hash = "sha256-rpm9v/7twsrImeipz3I7fHUrk98qzkLQ2b4Kz3Rc+GI=";
   };
 
   buildInputs = [

From e09a0a829e195c3e81bad8b3443fd211b87fbabe Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Sat, 28 Dec 2024 17:06:24 +0800
Subject: [PATCH 248/340] msgpack-cxx: fix build

---
 pkgs/by-name/ms/msgpack-cxx/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ms/msgpack-cxx/package.nix b/pkgs/by-name/ms/msgpack-cxx/package.nix
index 73664813612d4..2a10fd5de1505 100644
--- a/pkgs/by-name/ms/msgpack-cxx/package.nix
+++ b/pkgs/by-name/ms/msgpack-cxx/package.nix
@@ -1,9 +1,10 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, boost
-, zlib
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  boost,
+  zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -29,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     "-DMSGPACK_BUILD_DOCS=OFF" # docs are not installed even if built
+    "-DMSGPACK_CXX20=ON"
   ] ++ lib.optional finalAttrs.finalPackage.doCheck "-DMSGPACK_BUILD_TESTS=ON";
 
   checkInputs = [

From d113675363d5225edc27289aec70f73627a57721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Sat, 28 Dec 2024 10:18:30 +0100
Subject: [PATCH 249/340] oneko: fix build by disabling some compiler warnings

This is old code, that will not change any time soon.
---
 pkgs/by-name/on/oneko/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/on/oneko/package.nix b/pkgs/by-name/on/oneko/package.nix
index 74eb7231fc8de..0f71603ef342b 100644
--- a/pkgs/by-name/on/oneko/package.nix
+++ b/pkgs/by-name/on/oneko/package.nix
@@ -31,6 +31,13 @@ stdenv.mkDerivation rec {
     "BINDIR=$(out)/bin"
     "MANPATH=$(out)/share/man"
   ];
+
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-Wno-implicit-function-declaration"
+    "-Wno-endif-labels"
+    "-Wno-implicit-int"
+  ];
+
   installTargets = [
     "install"
     "install.man"

From 1f3bead4878556157fab1481f6ca2736390d920c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 28 Dec 2024 10:19:23 +0100
Subject: [PATCH 250/340] uv: 0.5.12 -> 0.5.13

Diff: https://github.com/astral-sh/uv/compare/None...0.5.13

Changelog: https://github.com/astral-sh/uv/blob/0.5.13/CHANGELOG.md
---
 pkgs/by-name/uv/uv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 0b73c101ce79d..ad6684023ca2d 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -17,17 +17,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "uv";
-  version = "0.5.12";
+  version = "0.5.13";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = version;
-    hash = "sha256-opTZzNi9cguceD3qdWsIxAYbymu25wFFKOIGhWu958Q=";
+    hash = "sha256-W24bw+fQk7DoHPGFtUiIPybxuCa03o1ngAXqVwU/Z7E=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-hplzzsbS81GRS8L0Goh7vvzyv6xCAe0CN6KRvJ0GUdc=";
+  cargoHash = "sha256-CN4ZqYeZktcQT0Pro8rfnzri6i0xranmYdroKzwkK6A=";
 
   nativeBuildInputs = [
     cmake

From 4b5bbe915e35867f863637ece936e5823851fc9e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 28 Dec 2024 10:44:41 +0100
Subject: [PATCH 251/340] nixos/zfs-replication: fix typo

---
 nixos/modules/services/backup/zfs-replication.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/zfs-replication.nix b/nixos/modules/services/backup/zfs-replication.nix
index f6dc40171d1b0..ed635a35617be 100644
--- a/nixos/modules/services/backup/zfs-replication.nix
+++ b/nixos/modules/services/backup/zfs-replication.nix
@@ -92,7 +92,7 @@ in
             ++ (lib.optional cfg.followDelete "--follow-delete")
           );
         in
-        "${lib.getExe cfg.package} ${lib.concatStringSep " " args}";
+        "${lib.getExe cfg.package} ${lib.concatStringsSep " " args}";
       wantedBy = [
         "zfs-snapshot-daily.service"
         "zfs-snapshot-frequent.service"

From de2f15759fe59b6583ac20c18ed61d06a11b4c8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 09:48:04 +0000
Subject: [PATCH 252/340] code-cursor: 0.44.5 -> 0.44.9

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

diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index 339f8ac909ef5..9b6aa59187858 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -8,11 +8,11 @@
 }:
 let
   pname = "cursor";
-  version = "0.44.5";
+  version = "0.44.9";
   appKey = "230313mzl4w4u92";
   src = fetchurl {
-    url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.44.5-build-241220s3ux0e1tv-x86_64.AppImage";
-    hash = "sha256-5IbIsOyJdIzDpxOd+CLe8UdxaocJFJckiZvNSuGXtys=";
+    url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.44.9-build-2412268nc6pfzgo-x86_64.AppImage";
+    hash = "sha256-DV4Om5eAt7hDDPsyCwhALGhH36YAfvDk5u8Mnlhalsw=";
   };
   appimageContents = appimageTools.extractType2 { inherit version pname src; };
 in

From 8b4146d9857ec9b9e92d7f39643c651aefc86eb1 Mon Sep 17 00:00:00 2001
From: "The Artifex (4r7if3x)" <the.artifex@proton.me>
Date: Sat, 28 Dec 2024 04:40:06 +0100
Subject: [PATCH 253/340] treegen: init at 1.1.0

---
 pkgs/by-name/tr/treegen/package.nix | 49 +++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/tr/treegen/package.nix

diff --git a/pkgs/by-name/tr/treegen/package.nix b/pkgs/by-name/tr/treegen/package.nix
new file mode 100644
index 0000000000000..040fa27fec160
--- /dev/null
+++ b/pkgs/by-name/tr/treegen/package.nix
@@ -0,0 +1,49 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  testers,
+  treegen,
+}:
+
+buildGoModule rec {
+  pname = "treegen";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "bilbilak";
+    repo = "treegen";
+    tag = "v${version}";
+    hash = "sha256-PPWUEfX7OXKZnghiVXU+eCjveA1VszA3uS8C3uI3pFM=";
+  };
+
+  vendorHash = "sha256-hocnLCzWN8srQcO3BMNkd2lt0m54Qe7sqAhUxVZlz1k=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/bilbilak/treegen/config.Version=${version}"
+  ];
+
+  passthru = {
+    tests = {
+      version = testers.testVersion {
+        package = treegen;
+        command = "treegen --version";
+      };
+    };
+
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    changelog = "https://github.com/bilbilak/treegen/blob/main/CHANGELOG.md";
+    description = "ASCII Tree Directory and File Structure Generator";
+    homepage = "https://github.com/bilbilak/treegen";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "treegen";
+    maintainers = with lib.maintainers; [ _4r7if3x ];
+    platforms = with lib.platforms; unix ++ windows;
+  };
+}

From e2ff22d3d71b21ccf5bf4d24d9b6ac0f9dc87eab Mon Sep 17 00:00:00 2001
From: "The Artifex (4r7if3x)" <the.artifex@proton.me>
Date: Sat, 28 Dec 2024 11:44:29 +0100
Subject: [PATCH 254/340] godini: init at 1.0.0

---
 pkgs/by-name/go/godini/package.nix | 49 ++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/go/godini/package.nix

diff --git a/pkgs/by-name/go/godini/package.nix b/pkgs/by-name/go/godini/package.nix
new file mode 100644
index 0000000000000..5c09478a26b30
--- /dev/null
+++ b/pkgs/by-name/go/godini/package.nix
@@ -0,0 +1,49 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  godini,
+  lib,
+  nix-update-script,
+  testers,
+}:
+
+buildGoModule rec {
+  pname = "godini";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "bilbilak";
+    repo = "godini";
+    tag = "v${version}";
+    hash = "sha256-83OAddIoJzAUXPZKGnAx8XPKrdSmtc1EIJUDmRHTU/U=";
+  };
+
+  vendorHash = "sha256-hocnLCzWN8srQcO3BMNkd2lt0m54Qe7sqAhUxVZlz1k=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/bilbilak/godini/config.Version=${version}"
+  ];
+
+  passthru = {
+    tests = {
+      version = testers.testVersion {
+        package = godini;
+        command = "godini --version";
+      };
+    };
+
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    changelog = "https://github.com/bilbilak/godini/blob/main/CHANGELOG.md";
+    description = "INI Configuration Management Tool";
+    homepage = "https://github.com/bilbilak/godini";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "godini";
+    maintainers = with lib.maintainers; [ _4r7if3x ];
+    platforms = with lib.platforms; unix ++ windows;
+  };
+}

From 7ddc93760db96b435279060b253ba45932257c57 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Sat, 28 Dec 2024 11:49:43 +0100
Subject: [PATCH 255/340] proton-ge-bin: GE-Proton9-21 -> GE-Proton9-22

---
 pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix
index b00826741426b..9dbfbcb81b18b 100644
--- a/pkgs/by-name/pr/proton-ge-bin/package.nix
+++ b/pkgs/by-name/pr/proton-ge-bin/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-ge-bin";
-  version = "GE-Proton9-21";
+  version = "GE-Proton9-22";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-WNOl0pu3xcEObxSK054u4e3hTWtA/51mH25uQih0+a0=";
+    hash = "sha256-mPoKv3mvazqiVCLEKS3LXAl2s4EYy7FPoSPexCvMawQ=";
   };
 
   outputs = [

From 37ec46ac40ac9016921d69fb3673473fd7a20c95 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 28 Dec 2024 11:06:38 +0000
Subject: [PATCH 256/340] pamtester: add autoreconfHook

Fix build with GCC 14.
---
 pkgs/by-name/pa/pamtester/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/pa/pamtester/package.nix b/pkgs/by-name/pa/pamtester/package.nix
index aa8eba4c6f5cb..42a7165249252 100644
--- a/pkgs/by-name/pa/pamtester/package.nix
+++ b/pkgs/by-name/pa/pamtester/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  autoreconfHook,
   fetchurl,
   pam,
 }:
@@ -14,6 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "1mdj1wj0adcnx354fs17928yn2xfr1hj5mfraq282dagi873sqw3";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   buildInputs = [ pam ];
 
   meta = with lib; {

From 69b630d89352730abb90be82d448af1cb5cac190 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 28 Dec 2024 11:26:28 +0100
Subject: [PATCH 257/340] nixos/networkmanager: match upstream units Install
 sections

The upstream NetworkManager.service unit[1] has this Install section:

  [Install]
  WantedBy=multi-user.target
  Also=NetworkManager-dispatcher.service
  Also=NetworkManager-wait-online.service

Let's just match that in NixOS and don't try to mess with
network.target. The latter should only be used to order units at
shutdown, not when booting.

[1]: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/data/NetworkManager.service.in?ref_type=heads
---
 nixos/modules/services/networking/networkmanager.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index caa7b0fffffd1..d2d49ee2eeb91 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -598,7 +598,7 @@ in
     ];
 
     systemd.services.NetworkManager = {
-      wantedBy = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
       restartTriggers = [ configFile ];
 
       aliases = [ "dbus-org.freedesktop.NetworkManager.service" ];
@@ -614,7 +614,7 @@ in
     };
 
     systemd.services.NetworkManager-dispatcher = {
-      wantedBy = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
       restartTriggers = [
         configFile
         overrideNameserversScript

From a00e8271102e33bb7993a727544c02a568f2441d Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 28 Dec 2024 11:47:29 +0100
Subject: [PATCH 258/340] nixos/tests/networkmanager: test NM is started at
 boot

---
 nixos/tests/networking/networkmanager.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/tests/networking/networkmanager.nix b/nixos/tests/networking/networkmanager.nix
index bd989408df8a1..23517a6cc47ec 100644
--- a/nixos/tests/networking/networkmanager.nix
+++ b/nixos/tests/networking/networkmanager.nix
@@ -33,6 +33,17 @@ let
     };
   } extraConfig;
   testCases = {
+    startup = {
+      name = "startup";
+      nodes.client = {
+        networking.useDHCP = false;
+        networking.networkmanager.enable = true;
+      };
+      testScript = ''
+        with subtest("NetworkManager is started automatically at boot"):
+          client.wait_for_unit("NetworkManager.service")
+      '';
+    };
     static = {
       name = "static";
       nodes = {

From a49023bcb550bcd84e1fa8afcbe7aa8bc0850bf4 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sat, 28 Dec 2024 12:41:38 +0100
Subject: [PATCH 259/340] perlPackages.NetIDNEncode: fix use of function
 removed in Perl 5.38.0

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/top-level/perl-packages.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 10a30c672c2c5..12ead6da77efe 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -18875,6 +18875,15 @@ with self; {
       url = "mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.500.tar.gz";
       hash = "sha256-VUU2M+P/JM4yWzS8LIFXuYWZYqMatc8ov3zMHJs6Pqo=";
     };
+    patches = [
+      # Fix use of function removed in Perl 5.38.0
+      # https://github.com/cfaerber/Net-IDN-Encode/pull/11
+      (fetchpatch2 {
+        name = "Net-IDN-Encode-use-uvchr_to_utf8_flags.patch";
+        url = "https://github.com/cfaerber/Net-IDN-Encode/commit/3ebe6f2e239b470efcb64a044edc8202798188af.diff";
+        hash = "sha256-t/BulZoyRvpi+TKNxKFxUS1y3X7bGi1sG7mG75nW/Gc=";
+      })
+    ];
     buildInputs = [ TestNoWarnings ];
     perlPreHook = "export LD=$CC";
     meta = {

From 8df5fbacc7f896d01767107da6638abf15352c6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 12:06:33 +0000
Subject: [PATCH 260/340] vdrPlugins.markad: 4.2.7 -> 4.2.8

---
 pkgs/applications/video/vdr/markad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix
index 7fc3d573eb004..77c5e81749e61 100644
--- a/pkgs/applications/video/vdr/markad/default.nix
+++ b/pkgs/applications/video/vdr/markad/default.nix
@@ -7,12 +7,12 @@
 }:
 stdenv.mkDerivation rec {
   pname = "vdr-markad";
-  version = "4.2.7";
+  version = "4.2.8";
 
   src = fetchFromGitHub {
     repo = "vdr-plugin-markad";
     owner = "kfb77";
-    hash = "sha256-52gGzY2bnK6kTge04JgVVAqdtb+VmR6SOyEDuX+s6ho=";
+    hash = "sha256-yv44hC1p56jRg3DRaeFWjnUHeooHhnZVXJPhVNy1mwQ=";
     rev = "V${version}";
   };
 

From c4c87945084042cbf9a6adccfe4f52183c1487fe Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 28 Dec 2024 11:41:02 +0000
Subject: [PATCH 261/340] libretro.mupen64plus: add patches for GCC14

---
 .../emulators/libretro/cores/mupen64plus.nix  | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix b/pkgs/applications/emulators/libretro/cores/mupen64plus.nix
index bf455e034deb8..ef1bef0337834 100644
--- a/pkgs/applications/emulators/libretro/cores/mupen64plus.nix
+++ b/pkgs/applications/emulators/libretro/cores/mupen64plus.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   libGL,
   libGLU,
   libpng,
@@ -20,6 +21,26 @@ mkLibretroCore {
     hash = "sha256-nII/PMYo2xLznmAcKs6jDWGRS1DC3tiDeT6KJKRnaCI=";
   };
 
+  # Fix for GCC 14
+  # https://github.com/libretro/mupen64plus-libretro-nx/pull/526
+  patches = [
+    (fetchpatch2 {
+      name = "minizip-avoid_trying_to_compile_problematic_code.patch";
+      url = "https://github.com/libretro/mupen64plus-libretro-nx/commit/2b05477dd9cd99e7f9425f58cb544f454fc0d813.patch?full_index=1";
+      hash = "sha256-Q0yymeS6taeFRt6BH6IX5q1SDUMh2Zn3mFpdJguyk9M=";
+    })
+    (fetchpatch2 {
+      name = "EmuThread-align_with_co_create()_and_pthread_create().patch";
+      url = "https://github.com/libretro/mupen64plus-libretro-nx/commit/26dfd670ffdd5ed6a03e6704dc73f82c13d81dd9.patch?full_index=1";
+      hash = "sha256-BraCR/b8DTmVAWrUxiXp9nxBYvTpTW9OQAt8TP1eusI=";
+    })
+    (fetchpatch2 {
+      name = "Fix_compilation_of_bundled_libzlib.patch";
+      url = "https://github.com/libretro/mupen64plus-libretro-nx/commit/3c3e7fbc70b8f533c09c964cf468ba5e8d61351c.patch?full_index=1";
+      hash = "sha256-PCJLNYhhccnWLcnPaHL6tz+5qdjogJRYfzZIh3r+Vlk=";
+    })
+  ];
+
   extraBuildInputs = [
     libGLU
     libGL

From 69c42fccc0f388effc7f7e3483b51ea4e6302f93 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 28 Dec 2024 12:21:53 +0000
Subject: [PATCH 262/340] uasm: switch to gcc13Stdenv

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

diff --git a/pkgs/by-name/ua/uasm/package.nix b/pkgs/by-name/ua/uasm/package.nix
index 3dc47e5ccbc0f..2477abf981cc7 100644
--- a/pkgs/by-name/ua/uasm/package.nix
+++ b/pkgs/by-name/ua/uasm/package.nix
@@ -1,13 +1,13 @@
 {
   lib,
-  stdenv,
+  gcc13Stdenv,
   fetchFromGitHub,
   fetchpatch,
   testers,
   uasm,
 }:
 
-stdenv.mkDerivation rec {
+gcc13Stdenv.mkDerivation rec {
   pname = "uasm";
   version = "2.56.2";
 
@@ -31,9 +31,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  makefile = if stdenv.hostPlatform.isDarwin then "ClangOSX64.mak" else "gccLinux64.mak";
+  makefile = if gcc13Stdenv.hostPlatform.isDarwin then "ClangOSX64.mak" else "gccLinux64.mak";
 
-  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
+  makeFlags = [ "CC=${gcc13Stdenv.cc.targetPrefix}cc" ];
 
   installPhase = ''
     runHook preInstall

From 7ce186c2bd89982034264e343c1da614a9ee92d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 09:27:30 +0000
Subject: [PATCH 263/340] inspircd: 3.17.1 -> 3.18.0

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

diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix
index dd821ce119591..d66197ca4abdc 100644
--- a/pkgs/by-name/in/inspircd/package.nix
+++ b/pkgs/by-name/in/inspircd/package.nix
@@ -145,13 +145,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "inspircd";
-  version = "3.17.1";
+  version = "3.18.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-4jtIh6wpZ/rexnwhqicU1gUk6DerGLXM9OY+GkmiEnI=";
+    sha256 = "sha256-Aulhg2CbtcpsxkH5kXkp4EoZF5/F9pOXJc1S08S5P08=";
   };
 
   outputs = [ "bin" "lib" "man" "doc" "out" ];

From 64543f6931c72d967bff3de3596d76992fc35e3f Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 28 Dec 2024 12:29:30 +0000
Subject: [PATCH 264/340] uasm: 2.56.2 -> 2.57

---
 pkgs/by-name/ua/uasm/package.nix | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/ua/uasm/package.nix b/pkgs/by-name/ua/uasm/package.nix
index 2477abf981cc7..70fff1e01afb9 100644
--- a/pkgs/by-name/ua/uasm/package.nix
+++ b/pkgs/by-name/ua/uasm/package.nix
@@ -2,36 +2,28 @@
   lib,
   gcc13Stdenv,
   fetchFromGitHub,
-  fetchpatch,
   testers,
   uasm,
 }:
 
 gcc13Stdenv.mkDerivation rec {
   pname = "uasm";
-  version = "2.56.2";
+  version = "2.57";
 
   src = fetchFromGitHub {
     owner = "Terraspace";
-    repo = pname;
-    # Specifying only the tag results in the following error during download:
-    # the given path has multiple possibilities: #<Git::Ref:0x00007f618689c378>, #<Git::Ref:0x00007f618689c1e8>
-    # Probably because upstream has both a tag and a branch with the same name
-    rev = "refs/tags/v${version}";
-    hash = "sha256-QiRBscY6zefeLDDVhS/+j9yIJ+5QhgkDQh1CLl/CslM=";
+    repo = "uasm";
+    tag = "v${version}r";
+    hash = "sha256-HaiK2ogE71zwgfhWL7fesMrNZYnh8TV/kE3ZIS0l85w=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-v2_55-compilation-on-macos.patch";
-      url = "https://github.com/Terraspace/UASM/commit/b50c430cc3083c7f32e288a9f64fe1cafb03091d.patch";
-      sha256 = "sha256-FGFB282LSEKtGD1cIRH+Qi5bye5Gx4xb0Ty4J03xjCU";
-    })
-  ];
-
   enableParallelBuilding = true;
 
-  makefile = if gcc13Stdenv.hostPlatform.isDarwin then "ClangOSX64.mak" else "gccLinux64.mak";
+  makefile =
+    if gcc13Stdenv.hostPlatform.isDarwin then
+      "Makefile-OSX-Clang-64.mak"
+    else
+      "Makefile-Linux-GCC-64.mak";
 
   makeFlags = [ "CC=${gcc13Stdenv.cc.targetPrefix}cc" ];
 

From a4cfa02a403129dca848684c7f087bf128efe068 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Tue, 26 Nov 2024 23:30:41 +0100
Subject: [PATCH 265/340] ledger: fix build with boost 1.86

---
 pkgs/by-name/le/ledger/package.nix | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/le/ledger/package.nix b/pkgs/by-name/le/ledger/package.nix
index ab98965cae80c..447aa17509f3e 100644
--- a/pkgs/by-name/le/ledger/package.nix
+++ b/pkgs/by-name/le/ledger/package.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python3, gpgme
+{ stdenv, lib, fetchFromGitHub, fetchpatch2, cmake, boost, gmp, mpfr, libedit, python3, gpgme
 , installShellFiles, texinfo, gnused, usePython ? false, gpgmeSupport ? false }:
 
 stdenv.mkDerivation rec {
@@ -12,6 +12,29 @@ stdenv.mkDerivation rec {
     hash   = "sha256-Uym4s8EyzXHlISZqThcb6P1H5bdgD9vmdIOLkk5ikG0=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "ledger-boost-1.85-compat.patch";
+      url = "https://github.com/ledger/ledger/commit/46207852174feb5c76c7ab894bc13b4f388bf501.patch";
+      hash = "sha256-X0NSN60sEFLvcfMmtVoxC7fidcr5tJUlFVQ/E8qfLss=";
+    })
+    (fetchpatch2 {
+      name = "ledger-boost-1.86-compat-1.patch";
+      url = "https://github.com/ledger/ledger/commit/f6750ed89b46926d1f0859f3b25d18ed62ac219e.patch";
+      hash = "sha256-pktwotuMbZcR2DpZccMqV13524avKvazDX/+Ki6h69g=";
+    })
+    (fetchpatch2 {
+      name = "ledger-boost-1.86-compat-2.patch";
+      url = "https://github.com/ledger/ledger/commit/62f626fa73bd6832028f43c204c43cf15bd5f409.patch";
+      hash = "sha256-cazhSxadNpiA6ofZxS8JALOPy88cNPM/jKHaUYk8pBw=";
+    })
+    (fetchpatch2 {
+      name = "ledger-boost-1.86-compat-3.patch";
+      url = "https://github.com/ledger/ledger/commit/124398c35be573324cf2384c08b99b4476f29e2b.patch";
+      hash = "sha256-N3dUrqNsOiVgedoYmyfYllK+4lvKdMxc8iq0+DgEbxc=";
+    })
+  ];
+
   outputs = [ "out" "dev" ] ++ lib.optionals usePython [ "py" ];
 
   buildInputs = [

From ca006099ca0616a22ccd34df694aece580f39d44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 12:46:01 +0000
Subject: [PATCH 266/340] buildpack: 0.36.1 -> 0.36.2

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

diff --git a/pkgs/by-name/bu/buildpack/package.nix b/pkgs/by-name/bu/buildpack/package.nix
index 90e597b4fcd2d..d90f88b6e69be 100644
--- a/pkgs/by-name/bu/buildpack/package.nix
+++ b/pkgs/by-name/bu/buildpack/package.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "pack";
-  version = "0.36.1";
+  version = "0.36.2";
 in
 buildGoModule {
   inherit pname version;
@@ -16,10 +16,10 @@ buildGoModule {
     owner = "buildpacks";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-pszPntjdEU6zUwA+NawGI3EWjk0fMOFoBr9NPTOSwig=";
+    hash = "sha256-pITQAGt0aMhEfoauPWxAqnr8JxGi4DcqcmgqtooLkd4=";
   };
 
-  vendorHash = "sha256-4c7tWZ+7L0C0zPjOg/9gJlTXuGacV3uxzxs/TF+7vOo=";
+  vendorHash = "sha256-51Qqq2Jpd1XxUoMN+6j4/VZ4fLCm4I9JwBeTcdSHgQw=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 0cfcd3e1c411c968b901604ded674d8ad42e0a05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 13:27:18 +0000
Subject: [PATCH 267/340] clusternet: 0.17.2 -> 0.17.3

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

diff --git a/pkgs/by-name/cl/clusternet/package.nix b/pkgs/by-name/cl/clusternet/package.nix
index 9f4c57527ebd1..8c2dd22c241d0 100644
--- a/pkgs/by-name/cl/clusternet/package.nix
+++ b/pkgs/by-name/cl/clusternet/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "clusternet";
-  version = "0.17.2";
+  version = "0.17.3";
 
   src = fetchFromGitHub {
     owner = "clusternet";
     repo = "clusternet";
     rev = "refs/tags/v${version}";
-    hash = "sha256-6JZdFHMbdFm2uTlMbbi0y4rcVkbUZ6gSeK57v6MiL7M=";
+    hash = "sha256-uhRnJyUR7lbJvVxd3YNVxmTSTDksQsVcM5G8ZKO7Xbk=";
   };
 
   vendorHash = "sha256-hY4bgQXwKjL4UT3omDYuxy9xN9XOr00mMvGssKOSsG4=";

From bd0c705c62c3df2091ff8d229446570099939ad1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 13:29:13 +0000
Subject: [PATCH 268/340] orbiton: 2.68.5 -> 2.68.6

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

diff --git a/pkgs/by-name/or/orbiton/package.nix b/pkgs/by-name/or/orbiton/package.nix
index 727cc67f51184..e4db790576631 100644
--- a/pkgs/by-name/or/orbiton/package.nix
+++ b/pkgs/by-name/or/orbiton/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "orbiton";
-  version = "2.68.5";
+  version = "2.68.6";
 
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "orbiton";
     rev = "v${version}";
-    hash = "sha256-d3+EsyIl1pa2itEPhEqJqBKBWaov8ZkSvCYZnBVfSSg=";
+    hash = "sha256-7h8U6Ye5Jyf0UmV/+6yHv9QBEtxYHlDBq+T09tmywnM=";
   };
 
   vendorHash = null;

From db5ca039e6feb69490e01e7e651edf83a6884b60 Mon Sep 17 00:00:00 2001
From: Adrian <agierakowski@gmail.com>
Date: Fri, 27 Dec 2024 21:18:38 +0000
Subject: [PATCH 269/340] maintainers: add adrian-gierakowski

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 15af233ea29a5..7b94234aa0fcd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -604,6 +604,12 @@
     githubId = 25236206;
     name = "Adrian Dole";
   };
+  adrian-gierakowski = {
+    email = "adrian.gierakowski@gmail.com";
+    github = "adrian-gierakowski";
+    githubId = 330177;
+    name = "Adrian Gierakowski";
+  };
   adriangl = {
     email = "adrian@lauterer.it";
     matrix = "@adriangl:pvv.ntnu.no";

From 0bfb93d2c17a9fea260c1360c497543d5435f623 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 13:34:39 +0000
Subject: [PATCH 270/340] 
 home-assistant-custom-lovelace-modules.hourly-weather: 6.4.0 -> 6.5.0

---
 .../custom-lovelace-modules/hourly-weather/package.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix
index 0595fa25ed88f..6fa7612fa6b06 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "hourly-weather";
-  version = "6.4.0";
+  version = "6.5.0";
 
   src = fetchFromGitHub {
     owner = "decompil3d";
     repo = "lovelace-hourly-weather";
     rev = version;
-    hash = "sha256-Aaeo3dL7N2vRTQU6bEj+jfxUAclI+8ROAUuF0PeOdw8=";
+    hash = "sha256-cXAZ+cSTZd7NbnL7FKbkbRvrCStvzsurCOo8YvGwyDo=";
   };
 
-  npmDepsHash = "sha256-unTZvllmfEBXWgEbObJWMPpEJzgrihKKK1eMREWpbVE=";
+  npmDepsHash = "sha256-sChIXVP9yWUJjd2dzvw4GCvYJ2P+VAJGpydzT5mHqfI=";
 
   env.CYPRESS_INSTALL_BINARY = "0";
 

From 8d16a352a956e34427c41e7e53ec9effae353244 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 13:45:45 +0000
Subject: [PATCH 271/340] nchat: 5.3.5 -> 5.4.2

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

diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix
index 1938dab1fd301..68cb1525ca7b7 100644
--- a/pkgs/by-name/nc/nchat/package.nix
+++ b/pkgs/by-name/nc/nchat/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nchat";
-  version = "5.3.5";
+  version = "5.4.2";
 
   src = fetchFromGitHub {
     owner = "d99kris";
     repo = "nchat";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Nnu2Bk11Crk2vhvQqlDFo42duDqkNRCwDq4xCKIXwLQ=";
+    hash = "sha256-NrAU47GA7ZASJ7vCo1S8nyGBpfsZn4EBBqx2c4HKx7k=";
   };
 
   postPatch = ''

From 13f1e8df945ea243e972cd95779271dc27ee5778 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 13:55:52 +0000
Subject: [PATCH 272/340] pik: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/by-name/pi/pik/package.nix b/pkgs/by-name/pi/pik/package.nix
index 96ddb50ce4324..ee88376d6a3c8 100644
--- a/pkgs/by-name/pi/pik/package.nix
+++ b/pkgs/by-name/pi/pik/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pik";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "jacek-kurlit";
     repo = "pik";
     rev = version;
-    hash = "sha256-h+mkO4LSsbo/wKY/TUt1yH06ZeeLBiI7C1eN07Y+LfI=";
+    hash = "sha256-u9zgwjzEfUwPqZDipke+MB2kbNR/PEkGKCdtEYBYQeE=";
   };
 
-  cargoHash = "sha256-iCEjVz5hM4N+6w4qwW/c15fQtXRr8Hqu7taebuBmfH8=";
+  cargoHash = "sha256-Slxk6netGiw3vNGoJMf9i1tO0z/njgpxX7s7S1ydFsw=";
 
   passthru.tests.version = testers.testVersion { package = pik; };
 

From 4557afb6895fd97e56be14f79ba25cc070ddfd12 Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Sat, 28 Dec 2024 16:29:12 +0200
Subject: [PATCH 273/340] pcmanfm: fixup build with gcc14

---
 pkgs/by-name/pc/pcmanfm/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/pc/pcmanfm/package.nix b/pkgs/by-name/pc/pcmanfm/package.nix
index 9761a38678106..b8e8dcda4fc21 100644
--- a/pkgs/by-name/pc/pcmanfm/package.nix
+++ b/pkgs/by-name/pc/pcmanfm/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   glib,
   intltool,
   libfm,
@@ -29,6 +30,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc=";
   };
 
+  patches = [
+    # Fix build with gcc14 -Werror=incompatible-pointer-types
+    (fetchpatch {
+      url = "https://github.com/lxde/pcmanfm/commit/12abd7e179adb9e31d999824048a5f40f90218fd.patch";
+      hash = "sha256-iuNejg211VOiaIVSNkIV64VIrs6oOp+qwjqz3JFxOTI=";
+    })
+  ];
+
   buildInputs = [
     glib
     gtk

From 37302163ed7384d444053e30cfd2650b9bc1e07f Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sat, 28 Dec 2024 22:59:45 +0800
Subject: [PATCH 274/340] rl-2411: add an entry for the new kmonad module

---
 nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 209655cc9925a..295d3f100b03b 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -87,6 +87,8 @@
 
 ## New Modules {#sec-release-24.11-new-modules}
 
+- [KMonad](https://github.com/kmonad/kmonad), an advanced keyboard remapping utility. Available as [services.kmonad](#opt-services.kmonad.enable).
+
 - [Coral](https://coral.ai/), hardware support for Coral.ai Edge TPU devices. Available as [hardware.coral.usb.enable](#opt-hardware.coral.usb.enable) and [hardware.coral.pcie.enable](#opt-hardware.coral.pcie.enable).
 
 - [Cyrus IMAP](https://github.com/cyrusimap/cyrus-imapd), an email, contacts and calendar server. Available as [services.cyrus-imap](#opt-services.cyrus-imap.enable) service.

From d1437e561b30d6679e76ba23221e523872592c12 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 15:02:15 +0000
Subject: [PATCH 275/340] cargo-show-asm: 0.2.43 -> 0.2.45

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

diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix
index e2b48a286d7e0..ffd9d59faa068 100644
--- a/pkgs/by-name/ca/cargo-show-asm/package.nix
+++ b/pkgs/by-name/ca/cargo-show-asm/package.nix
@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-show-asm";
-  version = "0.2.43";
+  version = "0.2.45";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-qjAoD4vPZPjl1MuasHDZpQEYFkHk6jI3ftV2O1DQXlQ=";
+    hash = "sha256-0EH5/ENDKtRK7a3Vq3W6Z/X5ZvrLQWRBxsDv4lABWZI=";
   };
 
-  cargoHash = "sha256-/jPkZJC4dGBaOLFARFq567dWznYVl0yvwF/mbZrRIMQ=";
+  cargoHash = "sha256-q+ipoYtoIWKw11gIS7pV2TYSbyOTZ95YrV53tXqzT5A=";
 
   nativeBuildInputs = [
     installShellFiles

From 7f6c88d5ad777bbcd501e9283f0e6711382dc7bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 15:08:27 +0000
Subject: [PATCH 276/340] phpunit: 11.5.1 -> 11.5.2

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

diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix
index e5c39f2a05a21..46853a0a73bb5 100644
--- a/pkgs/by-name/ph/phpunit/package.nix
+++ b/pkgs/by-name/ph/phpunit/package.nix
@@ -9,16 +9,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpunit";
-  version = "11.5.1";
+  version = "11.5.2";
 
   src = fetchFromGitHub {
     owner = "sebastianbergmann";
     repo = "phpunit";
     rev = finalAttrs.version;
-    hash = "sha256-2qcW1MFV23Hp5uKZ+0oKyVPf4Bd0EDeSxpUsVUNO9sI=";
+    hash = "sha256-0NVoaUFmmV4EtaErhaqLxJzCbD2WuMaVZC2OHG9+gSA=";
   };
 
-  vendorHash = "sha256-bv0XuwIvb/gbVECImIb4U0zidv9c/jxMv7PXezjlF4A=";
+  vendorHash = "sha256-EkTERk8jJWxCZCJnSHfg3Tnn//Ny2985qXJNX/gad58=";
 
   passthru = {
     updateScript = nix-update-script { };

From 64674918d88d19783d820674681c03f8ad846daf Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 28 Dec 2024 15:41:12 +0100
Subject: [PATCH 277/340] cargo-semver-checks: 0.34.0 -> 0.38.0

---
 .../ca/cargo-semver-checks/package.nix        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix
index b01afc4e4bd36..5b6c36a5ec8b0 100644
--- a/pkgs/by-name/ca/cargo-semver-checks/package.nix
+++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-semver-checks";
-  version = "0.34.0";
+  version = "0.38.0";
 
   src = fetchFromGitHub {
     owner = "obi1kenobi";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-U7ykTLEuREe2GTVswcAw3R3h4zbkWxuI2dt/2689xSA=";
+    hash = "sha256-IcKjiKFvkFvu8+LFCAmm39AGUaUdK8zhtNzzSb8VPE0=";
   };
 
-  cargoHash = "sha256-NoxYHwY5XpRiqrOjQsaSWQCXFalNAS9SchaKwHbB2uU=";
+  cargoHash = "sha256-QfJ7QnGKmbrGDwYtVyAJNNGoAukD97/tmCwAROvWBIg=";
 
   nativeBuildInputs = [
     cmake
@@ -37,15 +37,20 @@ rustPlatform.buildRustPackage rec {
   checkFlags = [
     # requires internet access
     "--skip=detects_target_dependencies"
+    "--skip=query::tests_lints::feature_missing"
   ];
 
   preCheck = ''
+    # requires internet access
+    rm -r test_crates/feature_missing
+
     patchShebangs scripts/regenerate_test_rustdocs.sh
-    substituteInPlace scripts/regenerate_test_rustdocs.sh \
-      --replace-fail \
-        'TOPLEVEL="$(git rev-parse --show-toplevel)"' \
-        "TOPLEVEL=$PWD"
     scripts/regenerate_test_rustdocs.sh
+
+    substituteInPlace test_outputs/integration_snapshots__bugreport.snap \
+      --replace-fail \
+        'cargo-semver-checks [VERSION] ([HASH])' \
+        'cargo-semver-checks ${version}'
   '';
 
   meta = with lib; {

From ce0e60c0ae841437bba1a2119e6dd9c32fd6ead0 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sat, 28 Dec 2024 15:47:25 +0100
Subject: [PATCH 278/340] cargo-semver-checks: refactor

---
 pkgs/by-name/ca/cargo-semver-checks/package.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix
index 5b6c36a5ec8b0..f9bf755ec48c9 100644
--- a/pkgs/by-name/ca/cargo-semver-checks/package.nix
+++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix
@@ -6,7 +6,9 @@
   zlib,
   stdenv,
   darwin,
-  git,
+  testers,
+  cargo-semver-checks,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -16,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "obi1kenobi";
     repo = pname;
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-IcKjiKFvkFvu8+LFCAmm39AGUaUdK8zhtNzzSb8VPE0=";
   };
 
@@ -53,16 +55,21 @@ rustPlatform.buildRustPackage rec {
         'cargo-semver-checks ${version}'
   '';
 
-  meta = with lib; {
+  passthru = {
+    tests.version = testers.testVersion { package = cargo-semver-checks; };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "Tool to scan your Rust crate for semver violations";
     mainProgram = "cargo-semver-checks";
     homepage = "https://github.com/obi1kenobi/cargo-semver-checks";
     changelog = "https://github.com/obi1kenobi/cargo-semver-checks/releases/tag/v${version}";
-    license = with licenses; [
+    license = with lib.licenses; [
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       matthiasbeyer
     ];

From 75a7c8507ad53484a1dfff8582a7b72f56a8ce0c Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 28 Dec 2024 19:28:13 +0400
Subject: [PATCH 279/340] orbiton: modernize

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

diff --git a/pkgs/by-name/or/orbiton/package.nix b/pkgs/by-name/or/orbiton/package.nix
index e4db790576631..cf7e217980000 100644
--- a/pkgs/by-name/or/orbiton/package.nix
+++ b/pkgs/by-name/or/orbiton/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "orbiton";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-7h8U6Ye5Jyf0UmV/+6yHv9QBEtxYHlDBq+T09tmywnM=";
   };
 
@@ -48,11 +48,11 @@ buildGoModule rec {
       wrapProgram $out/bin/og --prefix PATH : $out/bin
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Config-free text editor and IDE limited to VT100";
     homepage = "https://orbiton.zip";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ sikmir ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ sikmir ];
     mainProgram = "o";
   };
 }

From 7da04665e33539636320081cc0ad2c15e8567e63 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 23 Dec 2024 18:15:25 -0600
Subject: [PATCH 280/340] luaPackages: update on 2024-12-24

---
 .../lua-modules/generated-packages.nix        | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 047e005bc84c9..2e930be3a8222 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -579,14 +579,14 @@ buildLuarocksPackage {
 fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
   pname = "fzf-lua";
-  version = "0.0.1569-1";
+  version = "0.0.1582-1";
   knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/fzf-lua-0.0.1569-1.rockspec";
-    sha256 = "00p1pqx0yjhjn2dv9297167yy50a30iinv46g2n9p05c1a6ban12";
+    url    = "mirror://luarocks/fzf-lua-0.0.1582-1.rockspec";
+    sha256 = "1bk23f6dgs3y6n7am7zg30zk56ipxsgdljqgfgw5xb2ki63kaxcx";
   }).outPath;
   src = fetchzip {
-    url    = "https://github.com/ibhagwan/fzf-lua/archive/cd9ab4ed3f44d062e511aa9de41ccf815f0ec962.zip";
-    sha256 = "0x6hkbwxqv5j99623gfv92bwz1kxlifwm6fj05ic8x92r96c58f1";
+    url    = "https://github.com/ibhagwan/fzf-lua/archive/c3cfa2b59ad1903f79a5a431ce3133300dd6e072.zip";
+    sha256 = "1mvzhns06i8sic1iqlw7m8xqwnh7jls1kk8gfq5dy74yyv50k9fp";
   };
 
   disabled = luaOlder "5.1";
@@ -973,20 +973,20 @@ buildLuarocksPackage {
 lpeg = callPackage({ buildLuarocksPackage, fetchurl, luaOlder }:
 buildLuarocksPackage {
   pname = "lpeg";
-  version = "1.1.0-1";
+  version = "1.1.0-2";
   knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/lpeg-1.1.0-1.rockspec";
-    sha256 = "03af1p00madfhfxjzrsxb0jm0n49ixwadnkdp0vbgs77d2v985jn";
+    url    = "mirror://luarocks/lpeg-1.1.0-2.rockspec";
+    sha256 = "0g8bnsx1qkl8s1fglbdai9mznzyzf9mv5lcxjab47069b3d8caa4";
   }).outPath;
   src = fetchurl {
-    url    = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.1.0.tar.gz";
+    url    = "https://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.1.0.tar.gz";
     sha256 = "0aimsjpcpkh3kk65f0pg1z2bp6d83rn4dg6pgbx1yv14s9kms5ab";
   };
 
   disabled = luaOlder "5.1";
 
   meta = {
-    homepage = "http://www.inf.puc-rio.br/~roberto/lpeg.html";
+    homepage = "https://www.inf.puc-rio.br/~roberto/lpeg.html";
     description = "Parsing Expression Grammars For Lua";
     maintainers = with lib.maintainers; [ vyp ];
     license.fullName = "MIT/X11";
@@ -2871,8 +2871,8 @@ buildLuarocksPackage {
   src = fetchFromGitHub {
     owner = "hrsh7th";
     repo = "nvim-cmp";
-    rev = "98e8b9d593a5547c126a39212d6f5e954a2d85dd";
-    hash = "sha256-63RBd3/t0lv7pVI4wyjU1l8C1oCnP1VFiIv5E2xSYP0=";
+    rev = "b555203ce4bd7ff6192e759af3362f9d217e8c89";
+    hash = "sha256-Z/Qy2ErbCa7dbjZVuJUkMmb4d24amNunNgRcbCGPfOg=";
   };
 
   disabled = luaOlder "5.1" || luaAtLeast "5.4";
@@ -3122,14 +3122,14 @@ buildLuarocksPackage {
 rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, luarocks, nvim-nio, rtp-nvim, toml-edit }:
 buildLuarocksPackage {
   pname = "rocks.nvim";
-  version = "2.42.4-1";
+  version = "2.43.0-1";
   knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/rocks.nvim-2.42.4-1.rockspec";
-    sha256 = "09adajlwj358c7alw9pa3wm013wp40ihcsawbq42diq3n8375s6w";
+    url    = "mirror://luarocks/rocks.nvim-2.43.0-1.rockspec";
+    sha256 = "1kzvf6pbda8jhl6xv8mha75va87fb0l59r452mm98mx5kd7kydn0";
   }).outPath;
   src = fetchzip {
-    url    = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.42.4.zip";
-    sha256 = "0r4lx432b71j0xrbi7axh2aqfpjyp313v5rw6vg1a3hbv02v0w82";
+    url    = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.43.0.zip";
+    sha256 = "0yi82b6y4p1vkq9gx5nsk1gyjclwrxn64gnf1398mj9zb81ccyf2";
   };
 
   disabled = luaOlder "5.1";

From f28f3f5fde375ac63bb63ce5ebc140080093e395 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 23 Dec 2024 18:32:27 -0600
Subject: [PATCH 281/340] vimPlugins: update on 2024-12-24

---
 .../editors/vim/plugins/generated.nix         | 496 +++++++++---------
 1 file changed, 248 insertions(+), 248 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 7cfa3a23edb91..e3646940ac970 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -173,12 +173,12 @@ final: prev:
 
   LazyVim = buildVimPlugin {
     pname = "LazyVim";
-    version = "2024-12-19";
+    version = "2024-12-20";
     src = fetchFromGitHub {
       owner = "LazyVim";
       repo = "LazyVim";
-      rev = "a3a28bf8e43f7239316942c2f2bac6e74b28586b";
-      sha256 = "0djv5hgrrsklyzkgjqnwr5sm3z05hxfcsp2jyzn1bwxgnyn6gilp";
+      rev = "d0c366e4d861b848bdc710696d5311dca2c6d540";
+      sha256 = "1s8whjxwgvsqdghvfydr7mch588z8rq5ik719xwh25555ld6grfa";
     };
     meta.homepage = "https://github.com/LazyVim/LazyVim/";
   };
@@ -329,12 +329,12 @@ final: prev:
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "2024-12-16";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "bb03860b59f17dfada46d6d9563c48b7b12fecaf";
-      sha256 = "1p8s6rpl5wgsb94c8sy7qjqfwi573imbkkb09qm03s6xxn9ix6p4";
+      rev = "545d8814f624fb5239c4691fa0914549540e6f53";
+      sha256 = "0b25wc37c3biji0mvwwh1s0mlk1i09ajjfhr2f9sjs0l04v6mcyc";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
   };
@@ -546,12 +546,12 @@ final: prev:
 
   aerial-nvim = buildVimPlugin {
     pname = "aerial.nvim";
-    version = "2024-12-03";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "aerial.nvim";
-      rev = "fd7fbe36772d7a955815c90ff9b58523bfdb410d";
-      sha256 = "1dvv9mmwvr06hh4wl50nk1bdd07b45ll2lrmj39inbxgf7gcd790";
+      rev = "1160fb7a15a34b03b7381d95d45560712b5f19d0";
+      sha256 = "1iy0s2x0cicbms93bv000vkbrw63qwcg94ykcbf9b2xqlsn0xf30";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@@ -775,12 +775,12 @@ final: prev:
 
   astrotheme = buildVimPlugin {
     pname = "astrotheme";
-    version = "2024-12-10";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astrotheme";
-      rev = "e612ee356bbf42dc28f181cb966730ed3befb1ab";
-      sha256 = "0znpm60hrgmfzrpv4lfnmp6hnqi67hwvjh4zwd8nw2ln6r292gzn";
+      rev = "40a07b2d257705be2020feb66f14fe519d1e7dbe";
+      sha256 = "0nc01ir0abyjrk1ssiw4bqd33ygiwrakb7zmym05x6yg70nxsgc4";
     };
     meta.homepage = "https://github.com/AstroNvim/astrotheme/";
   };
@@ -1268,24 +1268,24 @@ final: prev:
 
   blink-cmp-copilot = buildVimPlugin {
     pname = "blink-cmp-copilot";
-    version = "2024-12-17";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "giuxtaposition";
       repo = "blink-cmp-copilot";
-      rev = "c38d3e4201b135ab290c7ad126a9720cf76c788c";
-      sha256 = "1nr5r01f9c38zg4hz6h51ilh7fz388hj3a4ym4lkh0cj2bszk23p";
+      rev = "c5c5cbce5748d21073f1d5348a92ebe6ce63f387";
+      sha256 = "1g2f7di9xx2h53pc9bbwzq2cwpjbwp9vjx2s1k1m0h1v1i36w4rw";
     };
     meta.homepage = "https://github.com/giuxtaposition/blink-cmp-copilot/";
   };
 
   blink-compat = buildVimPlugin {
     pname = "blink.compat";
-    version = "2024-12-03";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "Saghen";
       repo = "blink.compat";
-      rev = "73249d35c8737b614bed64c2f33277387035f8ec";
-      sha256 = "151lqk78g3zwbwr7d0yvlxc3zbwyh9776nl779r7fx7ap4dm0vj1";
+      rev = "74b251a1e9478c4fa6d7c6bc2921d7124e6f6cbb";
+      sha256 = "0rmhkrz94i1ax8ll8jlyggwlgy69j3xw11vh0bd1jv65xpwf3fj6";
     };
     meta.homepage = "https://github.com/Saghen/blink.compat/";
   };
@@ -1316,12 +1316,12 @@ final: prev:
 
   bluloco-nvim = buildVimPlugin {
     pname = "bluloco.nvim";
-    version = "2024-12-05";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "uloco";
       repo = "bluloco.nvim";
-      rev = "e3ce113d8bdc9372abcda1d317fbab41809e6a53";
-      sha256 = "0dm39nnw6jxwksskaj6305f7r0n21kxnfm72qxvl16hbipm9jzi5";
+      rev = "f3e84601884629d9ca46b9c98aff306a10d2ae71";
+      sha256 = "0zay0bqvn5502x7373zrqzlbzqcapl9968a09q5ccd1wm12zq8if";
     };
     meta.homepage = "https://github.com/uloco/bluloco.nvim/";
   };
@@ -1532,12 +1532,12 @@ final: prev:
 
   chadtree = buildVimPlugin {
     pname = "chadtree";
-    version = "2024-12-09";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "30cbcf8dcf60d2944e5f3249d6a550715e50bf7c";
-      sha256 = "1g8cci7n79506p5fh78hqhzjxvd275ss5a1x3cz9qahwy3w7bmdc";
+      rev = "47da8973a4225de59ac1bb344ee1a541f0874ff1";
+      sha256 = "142jzajxcgbmjcnam228dgqnvkl9v0hbmy8k4vrdkp6dqbzszq6n";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };
@@ -1700,12 +1700,12 @@ final: prev:
 
   cmake-tools-nvim = buildVimPlugin {
     pname = "cmake-tools.nvim";
-    version = "2024-11-12";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "Civitasv";
       repo = "cmake-tools.nvim";
-      rev = "53bc5261e1e0b0d28be465d2b2b07a6f0646e1eb";
-      sha256 = "15z0zla1af3sp1hafhjhn82pglsdlaqd1iawif2mk9b2ij5r2z82";
+      rev = "4e134ed5532e5fc3c0331d1b38b7acaa4bb31894";
+      sha256 = "0yrgxpjl7qw2rphksaqhkq6c4y62qcnqdc1kjryr6kxk64hiz5rz";
     };
     meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/";
   };
@@ -2455,12 +2455,12 @@ final: prev:
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "2024-12-19";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      rev = "f20ebfbaf64a1c6d2a3268a80431df697a4d2bbe";
-      sha256 = "0czp5424f5vb03waax4qryb78xwgvmg0qrl76sjk3f0xrr7mapa3";
+      rev = "d20ca206e7092318ffd2d430d98a21aded7c3b4f";
+      sha256 = "1kpvmgim2x89hyrxnkcvhw6bc1sq3gq2w4kmql5m9xmg9ik11ydc";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
   };
@@ -2707,12 +2707,12 @@ final: prev:
 
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "2024-12-10";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "f4e8837878fc5712d053ba3091a73d27d96a09e2";
-      sha256 = "0xhiqgcpyxin8mgg7s03lxp0bscgj3f5ln87fa9539fd9kwwlgc5";
+      rev = "339b3e4519ec49312d34fcfa275aa15bfaa67025";
+      sha256 = "10mm48z39kcwnnq2plm9is5v42ss9dsrg2d95k7fkmsip0jgizvv";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/conform.nvim/";
@@ -2720,12 +2720,12 @@ final: prev:
 
   conjure = buildVimPlugin {
     pname = "conjure";
-    version = "2024-12-15";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "conjure";
-      rev = "b4b9b909814ef7a8f69be7636a2e3b3acb1d66ae";
-      sha256 = "0hk8bky2amqdvl88z154ys488pd0as9qyy1fmnbzqbhrp8rwivaw";
+      rev = "320862224f7bc6b1ed6d084bae969166dd71f051";
+      sha256 = "0sj5sblc13wir6dswmghfbz71mm94alalhr99df7glf5rmhcqar3";
     };
     meta.homepage = "https://github.com/Olical/conjure/";
   };
@@ -2744,12 +2744,12 @@ final: prev:
 
   context_filetype-vim = buildVimPlugin {
     pname = "context_filetype.vim";
-    version = "2023-07-23";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "context_filetype.vim";
-      rev = "7ff5b43fc8d5b274aa19ade5af11e9fa57577ed6";
-      sha256 = "01pa0aaxyfpq86ff2v38z4fh2ppbglp5h76r9js4vrby0b4yjhks";
+      rev = "5c95048793865365a409143d13987f5aac7e98f9";
+      sha256 = "13j7qrv2fx07km27ygswc9sif7p3whzp65sjg79vdyivyyq75cxf";
     };
     meta.homepage = "https://github.com/Shougo/context_filetype.vim/";
   };
@@ -2768,12 +2768,12 @@ final: prev:
 
   copilot-lua = buildVimPlugin {
     pname = "copilot.lua";
-    version = "2024-12-11";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      rev = "d3783b9283a7c35940ed8d71549030d5f5f9f980";
-      sha256 = "1ccgvy4s003w39zcyij1yxrw5961j9vhpg6kpm06rraqjhwy15jw";
+      rev = "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9";
+      sha256 = "15d1m1lq1f4snkgvnr3cvz0gxh3yycszlq6cph68ddn1sb8h8rbk";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
   };
@@ -2996,12 +2996,12 @@ final: prev:
 
   cyberdream-nvim = buildVimPlugin {
     pname = "cyberdream.nvim";
-    version = "2024-11-25";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "scottmckendry";
       repo = "cyberdream.nvim";
-      rev = "731290012f435e06e4d5d64ed7c09cec49df2663";
-      sha256 = "0m0ws996g9vq1p5spzd4yjhs23k5gf5s6d3hyadx7n3cbnrn7zzc";
+      rev = "c872aca1268b68a8de98d78bd64951db6d679640";
+      sha256 = "131zijl4faamxmdjs0g0i84lsnjb7wn2dw4qlk2zw3kwxa0nidd3";
     };
     meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/";
   };
@@ -3658,24 +3658,24 @@ final: prev:
 
   dressing-nvim = buildVimPlugin {
     pname = "dressing.nvim";
-    version = "2024-11-13";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "dressing.nvim";
-      rev = "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b";
-      sha256 = "0zvjnzj3y3q6c67mjah97g34rac2d7q23fbhkqjpfhlr9z2isjrv";
+      rev = "3a45525bb182730fe462325c99395529308f431e";
+      sha256 = "0wd9zgqh9i9f77ny7avgsnsl6rxamcqcr7qlbzmsb8p003kl321p";
     };
     meta.homepage = "https://github.com/stevearc/dressing.nvim/";
   };
 
   dropbar-nvim = buildVimPlugin {
     pname = "dropbar.nvim";
-    version = "2024-12-19";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "Bekaboo";
       repo = "dropbar.nvim";
-      rev = "b3b085e936ba1578ee2ae02de44274f96fbb5e07";
-      sha256 = "0jwkp4ykz2w67p5p1qh8xylivj7f3mnhhn3wxgxsaf2g4zyz2f11";
+      rev = "1af54fc328f5c32ff40f5d1370fea3381bf69566";
+      sha256 = "0c7dsj56vxcd6zp0d94yw9l09d5ydlac6pnaryy6r1gmpkbwfl3m";
     };
     meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
   };
@@ -4093,12 +4093,12 @@ final: prev:
 
   flatten-nvim = buildVimPlugin {
     pname = "flatten.nvim";
-    version = "2024-04-03";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "willothy";
       repo = "flatten.nvim";
-      rev = "e420e531d2ab24aebcf7b3c9fca28e6c5c34964d";
-      sha256 = "0cakkw66sw6g5s0cj5smdbfbd022rs2xgkfc56krkbyqh0midawr";
+      rev = "e049574786a3aa249cec8fd6d9613b06cca123e6";
+      sha256 = "0f6qcz376sggc359b9w9x11cz19rs3ylnsi83zwv79fnaaavw9br";
     };
     meta.homepage = "https://github.com/willothy/flatten.nvim/";
   };
@@ -4165,12 +4165,12 @@ final: prev:
 
   flutter-tools-nvim = buildVimPlugin {
     pname = "flutter-tools.nvim";
-    version = "2024-12-14";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "nvim-flutter";
       repo = "flutter-tools.nvim";
-      rev = "85492bee069af1155bb10bfbee90ac7d4168eced";
-      sha256 = "1mfp32azhvnmfnr5kv98vyq207llgyi2k9gnbdwnbvl18580v69k";
+      rev = "cb09e56b0a2fce36a260c933b766609eb0ed49a4";
+      sha256 = "1fngz613h4v8v0wgldkd6xlpnkazkp2v6398qhmhl8q1icxjn2fx";
     };
     meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/";
   };
@@ -4585,12 +4585,12 @@ final: prev:
 
   glance-nvim = buildVimPlugin {
     pname = "glance.nvim";
-    version = "2024-12-07";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "DNLHC";
       repo = "glance.nvim";
-      rev = "04f7325d46eb3b450f2e2ba96d13dbf0b00aba0b";
-      sha256 = "1jcgkycygnibwnh1b2jqv237bxm4wdcigvi3jhiac1v4qsj1n8vs";
+      rev = "cf91734f28fcd35bd60a5a87b6d768faafb73268";
+      sha256 = "0vjfj7kng1pfk6r6rk5x46mxzafcmn4wpinwdvvfnaxlb6ww0czh";
     };
     meta.homepage = "https://github.com/DNLHC/glance.nvim/";
   };
@@ -4741,12 +4741,12 @@ final: prev:
 
   grug-far-nvim = buildVimPlugin {
     pname = "grug-far.nvim";
-    version = "2024-12-14";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "MagicDuck";
       repo = "grug-far.nvim";
-      rev = "11d0fbd6fff6f4e394af95319deeaab4ef88ce97";
-      sha256 = "1hmbi19biy4ypp8y8sx07idch2q1ha7anip46kjxkzy33aim2i8f";
+      rev = "c88435b825a35bfa468b47159709b3221976ecd1";
+      sha256 = "1j7f4cgacbr4kvgz9xl11ii5faai58q59pm6i8ad4c23srsmn0vk";
     };
     meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/";
   };
@@ -4849,12 +4849,12 @@ final: prev:
 
   guard-nvim = buildVimPlugin {
     pname = "guard.nvim";
-    version = "2024-12-13";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "guard.nvim";
-      rev = "0a6d015d542a923feedfffaaeabaad2becb87ebb";
-      sha256 = "0vlk392bzg9cl1lf1f80gwf5sk64m8jszncyf013va13rw07qxdq";
+      rev = "ba37cdcc808385eec55ee5cecc24c8d046b61eb8";
+      sha256 = "14gf33viy30w9r2a1h24mhd2rq9wfg0kmj3rx0lb0ffbzasrcig9";
     };
     meta.homepage = "https://github.com/nvimdev/guard.nvim/";
   };
@@ -4909,12 +4909,12 @@ final: prev:
 
   hardtime-nvim = buildVimPlugin {
     pname = "hardtime.nvim";
-    version = "2024-12-19";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "m4xshen";
       repo = "hardtime.nvim";
-      rev = "511e98c3e8c782b2b4e4795568a878d813547d06";
-      sha256 = "1lp1dvxgv298jxs8dpk1iqxmdyy4bqbs8p2pdcfvrgh1yn4chhs7";
+      rev = "5d9adcbe2f12741de79e435c8b85dca69a3b22e4";
+      sha256 = "11h8gbxf6fqfi7qav9w0s5ld5a6v9j52gal47svd90qn53xjncsq";
     };
     meta.homepage = "https://github.com/m4xshen/hardtime.nvim/";
   };
@@ -5644,12 +5644,12 @@ final: prev:
 
   kanagawa-nvim = buildVimPlugin {
     pname = "kanagawa.nvim";
-    version = "2024-11-07";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "rebelot";
       repo = "kanagawa.nvim";
-      rev = "ad3dddecd606746374ba4807324a08331dfca23c";
-      sha256 = "1lfa6ib45xpfvqkd97n2kf6cizgmilvi3pqv1i8iq3cj3499wvr0";
+      rev = "2d54b56242a6f03c74864d118d61afa1acb5918e";
+      sha256 = "0kb4szw2h8qabv6f4n1ky7lshrhq1833f8137n15ifnna998di90";
     };
     meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
   };
@@ -5812,12 +5812,12 @@ final: prev:
 
   lazydev-nvim = buildVimPlugin {
     pname = "lazydev.nvim";
-    version = "2024-11-24";
+    version = "2024-12-20";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazydev.nvim";
-      rev = "f59bd14a852ca43db38e3662395354cb2a9b13e0";
-      sha256 = "102sxfdq6ajvfs95r4084xvbcjv2qiv5cmyrqbwijmc05isg9d8j";
+      rev = "8620f82ee3f59ff2187647167b6b47387a13a018";
+      sha256 = "1z822ylm2zfg6ydwxwxfyg2k16rchpr20wm4rfiq61h47hcj9835";
     };
     meta.homepage = "https://github.com/folke/lazydev.nvim/";
   };
@@ -5836,12 +5836,12 @@ final: prev:
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2024-12-19";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "e5b541dba61d628f247bedef0ef39548f9f17e79";
-      sha256 = "0faw8fkl7hgw0c9l46ss61j6aas8nzbgmlhw20kga4v1bjfnzq6m";
+      rev = "bda928a682b53c904ce89b80fd9b1437eb61344b";
+      sha256 = "1fkqvr69arycldsy3d2nm1581rdp8jsni5c40i3s9kgp3014gxdi";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
   };
@@ -5896,12 +5896,12 @@ final: prev:
 
   legendary-nvim = buildVimPlugin {
     pname = "legendary.nvim";
-    version = "2024-12-14";
+    version = "2024-12-20";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "legendary.nvim";
-      rev = "58dc0e3a99b76d6f1386d8da2cd985d7e2804dd4";
-      sha256 = "0vql1x6llcf4jqr9zn42wrkxji913b1qpk6gvf1rhsj383kbschq";
+      rev = "77e25ce772756909bcc49620f6dede1f30971fb5";
+      sha256 = "1jlmh66783l3cfr63m5871gwp3birx51iyc3zclpq9chphmr957y";
     };
     meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
   };
@@ -6268,11 +6268,11 @@ final: prev:
 
   lsp_lines-nvim = buildVimPlugin {
     pname = "lsp_lines.nvim";
-    version = "2024-12-09";
+    version = "2024-12-21";
     src = fetchgit {
       url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim";
-      rev = "f7f18b85360b8e85cd6a5418c9fbccb6a2ff4b1b";
-      sha256 = "1c2fjv5gqi8ydal78imq9abmj10xk3kams180agvypaxrva09avk";
+      rev = "a92c755f182b89ea91bd8a6a2227208026f27b4d";
+      sha256 = "14ym4d8vgvw2vhsaxik8612wyvszd895q69n9h100yd7x5jqhy4c";
     };
     meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim";
   };
@@ -6327,12 +6327,12 @@ final: prev:
 
   lspsaga-nvim = buildVimPlugin {
     pname = "lspsaga.nvim";
-    version = "2024-12-10";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "lspsaga.nvim";
-      rev = "2710a0ad97b5aaff404cd4756c296df454b3f726";
-      sha256 = "09jn5h90zn7vn32w5hsh035r9ngscqbvwzz14ss6yca3ry1xgakr";
+      rev = "5fce15331ac6c3a3ec3ac91ab0e85ed82f5cbba0";
+      sha256 = "00h72r838bya40bwmwn48xz1rbxwa1sz4fnv7rvbmkzwgm0klvv2";
     };
     meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
   };
@@ -6533,12 +6533,12 @@ final: prev:
 
   mason-lspconfig-nvim = buildVimPlugin {
     pname = "mason-lspconfig.nvim";
-    version = "2024-11-28";
+    version = "2024-12-20";
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason-lspconfig.nvim";
-      rev = "8e46de9241d3997927af12196bd8faa0ed08c29a";
-      sha256 = "0161gf3lmc1pp8dw9m20c9f4kc382yimk5143n6c2wbqnhlm6jq3";
+      rev = "2daa8921b7afdcfa47419a21ea343c3df6d74fa0";
+      sha256 = "18b29kfy3va8lfnqw7hvkb8whfpxabvy0jldls34aq8gixm4nwwx";
     };
     meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
   };
@@ -6761,12 +6761,12 @@ final: prev:
 
   mini-base16 = buildVimPlugin {
     pname = "mini.base16";
-    version = "2024-12-08";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.base16";
-      rev = "6bc6bb3d76174bad4089590df36375bb5d0660ac";
-      sha256 = "1k5jznxrf2s45pv42mvrd8f3qrykwig0aqwclqhn82zgdw7ab6yr";
+      rev = "23453dacc1606e5d42238d82f0b42a2985386b62";
+      sha256 = "0cxwc4bpkc362q00vkm75bbazd69ghyyavs30gf37fj3zj9khssl";
     };
     meta.homepage = "https://github.com/echasnovski/mini.base16/";
   };
@@ -6965,12 +6965,12 @@ final: prev:
 
   mini-hues = buildVimPlugin {
     pname = "mini.hues";
-    version = "2024-12-08";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.hues";
-      rev = "7321e27534aa7c5f76db06181835667c86f750e1";
-      sha256 = "0yw61p77b2six68ldg2sz8rrh78z2z7z6lpqya8940syg7q6qjym";
+      rev = "ae6ad4c666ff42c1102344fe1eba18bb486f2e46";
+      sha256 = "1bfyhs79l8v2zbzc2kp7ss089bp05lpqqy1ndbgvyi546dxgsbp3";
     };
     meta.homepage = "https://github.com/echasnovski/mini.hues/";
   };
@@ -7073,12 +7073,12 @@ final: prev:
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2024-12-13";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "7ebfab26d77a4b9b05aaae565907e7fa4b2ee154";
-      sha256 = "068hc5sbpdrp3daq0ls9zbyj1vinpa9r4ghz0mz46xmrsfybchfh";
+      rev = "2011aff270bcd3e1f3ad088253ace2d574967bed";
+      sha256 = "0q7yiqgalflfkla3q4gddrs762mqsp3msqkzfb3qxhaf35280sck";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
   };
@@ -7109,12 +7109,12 @@ final: prev:
 
   mini-pick = buildVimPlugin {
     pname = "mini.pick";
-    version = "2024-11-26";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.pick";
-      rev = "75e9a0a7808aa772ca5e31d479ffd0280ab6bf74";
-      sha256 = "1789gska07084rr2m7ila6vqyyx8fzlza48n29y7d4iz2l25ns3g";
+      rev = "42dc6e1c90eacf80b34ea80be267ec8ac93aaf89";
+      sha256 = "029cchl4fy1pilqvrq0mrwx6xx0p9rridykn478vbilyigcsnbbv";
     };
     meta.homepage = "https://github.com/echasnovski/mini.pick/";
   };
@@ -7289,12 +7289,12 @@ final: prev:
 
   modus-themes-nvim = buildVimPlugin {
     pname = "modus-themes.nvim";
-    version = "2024-11-25";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "miikanissi";
       repo = "modus-themes.nvim";
-      rev = "35980f19daef4745c96f1cb292d484fb1f33f822";
-      sha256 = "1l04r63bs5l87wrcccknlczbdn21w532hqcq34kyzwprwnr3z46y";
+      rev = "9f0343bcb3be4dd5545624db135f2b1c369e7ce4";
+      sha256 = "0pswimi14m2srr1njvyg0wbmzsr3g039xvwwwsm5v77zvq71nmyl";
     };
     meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/";
   };
@@ -7637,12 +7637,12 @@ final: prev:
 
   neo-tree-nvim = buildVimPlugin {
     pname = "neo-tree.nvim";
-    version = "2024-12-16";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      rev = "d7266e467de1adbaf775cbd4bff9b68842e27386";
-      sha256 = "091wvn42a9dllkdgwjjc3prg63h2aq5f0yvckpvaaisg14kq9hhr";
+      rev = "45c75e5f31e3581fb4b4883a81c7d7c4f3578b70";
+      sha256 = "1sn2s0ylp307f18l6faj3j0058mh1qhlvjnwm3yv54jadz9gz1v0";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
   };
@@ -7661,12 +7661,12 @@ final: prev:
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "2024-12-20";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "a9562ad062a1611a10cc81815b220a4450fb2cad";
-      sha256 = "1dpy4bxcq9swakdggr15kh2b95zjvz7vv26jv6vj4pqqc8mjbwlf";
+      rev = "17a88b82bed71b3e40476ffe61be247e4af15825";
+      sha256 = "0v658vg07mv7y48f5l6q4ip43nhlfmy9srbqj4mpgv98d3y0l7av";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
   };
@@ -7733,12 +7733,12 @@ final: prev:
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "2024-12-19";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "0820552997dd4dda4faa147228f0e61ea88290a3";
-      sha256 = "1bz8nh1cqz8hjyfvf2xsrxxj82rihj2pia28ycz14qzlmlv2b6kf";
+      rev = "5ec2bf32bc3622f882cd0fcd70ef1b729db32fbd";
+      sha256 = "18vwr3jy1pz9835lzjvl2dqzs8hpn1nc35clh0xjsf49y2q0b58w";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
   };
@@ -8000,12 +8000,12 @@ final: prev:
 
   neotest-haskell = buildVimPlugin {
     pname = "neotest-haskell";
-    version = "2024-12-15";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "cbc00ce8aa15fa0e1147472953a099599643dde2";
-      sha256 = "0dbcmbh74f21ixq1ihdmp7a70q3ax3f0p93kpn5307akp7wryr3v";
+      rev = "06d6b8b359069665be53adce509f5460e3ebecee";
+      sha256 = "0lkj5824xn95np41n1ggnipbmfx84n0ygbz7xws4ng0w353nij4c";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
   };
@@ -8408,12 +8408,12 @@ final: prev:
 
   nlsp-settings-nvim = buildVimPlugin {
     pname = "nlsp-settings.nvim";
-    version = "2024-12-19";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "bc0d6575a2e51bc8055c3930b48bd600cf45ee54";
-      sha256 = "1pg47w2jq5f3bxgf5i53aj6qg1hrgl1imlknd44hgdlzrsxhns4r";
+      rev = "3de292aa54844a3fadfa269c37a647855dabf8ae";
+      sha256 = "1wlawa3li3mn4n3wv1qacllkrlsb7c18qh6izd3prvvg3p7cy948";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
   };
@@ -8600,12 +8600,12 @@ final: prev:
 
   nvchad-ui = buildVimPlugin {
     pname = "nvchad-ui";
-    version = "2024-12-19";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "ui";
-      rev = "9a4ecb0bbaecd7208471c678e7dbacdeba517648";
-      sha256 = "1kir0k6kiz22ii1i6p8gjfnqcd0sdhs1c23qi0j95j1g1hnlv14v";
+      rev = "d42290b6961c2c96af6bbccbaad375cc3e8fd96e";
+      sha256 = "0d3zj2zmgdawv8w40qh442j18wvkdwrzzr47aj9039d1jh7hpicf";
     };
     meta.homepage = "https://github.com/nvchad/ui/";
   };
@@ -8684,12 +8684,12 @@ final: prev:
 
   nvim-bqf = buildVimPlugin {
     pname = "nvim-bqf";
-    version = "2024-06-04";
+    version = "2024-12-20";
     src = fetchFromGitHub {
       owner = "kevinhwang91";
       repo = "nvim-bqf";
-      rev = "1b24dc6050c34e8cd377b6b4cd6abe40509e0187";
-      sha256 = "0y7hmx2am89lphx9bnszrbxm2s7y12vv3ksnr6i03nvhbx1xzgwk";
+      rev = "68d3c20f6bee49105dcfde3df1f7ec972529f2a3";
+      sha256 = "0nfaw2kdlk7209h8hrk2v46qa4d9q5q81118sq5pm45rdj6bgwli";
     };
     meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
   };
@@ -8720,12 +8720,12 @@ final: prev:
 
   nvim-cmp = buildNeovimPlugin {
     pname = "nvim-cmp";
-    version = "2024-12-18";
+    version = "2024-12-20";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "nvim-cmp";
-      rev = "98e8b9d593a5547c126a39212d6f5e954a2d85dd";
-      sha256 = "1zb0a9n17ycbi12magx7h3b04pynshlc6f2jlpxmplpdgxvl2x7b";
+      rev = "b555203ce4bd7ff6192e759af3362f9d217e8c89";
+      sha256 = "1s3wiwhnqp046skxp60sdrvzhrij4javhm9ndvfsw2fv9bc35x37";
     };
     meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
   };
@@ -8756,12 +8756,12 @@ final: prev:
 
   nvim-colorizer-lua = buildVimPlugin {
     pname = "nvim-colorizer.lua";
-    version = "2024-11-23";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "catgoose";
       repo = "nvim-colorizer.lua";
-      rev = "4acf88d31b3a7a1a7f31e9c30bf2b23c6313abdb";
-      sha256 = "0xg1p3bvnmi2px55kc2zkyn5iqp9536v6lnd2bkbdmq26sb9w1cl";
+      rev = "b8ed35bf2c5c350ee84699adb2f797a453d60c5f";
+      sha256 = "1c1lshqhvxmkzwr1rm22dzhbgcv61j6bbrwiwf52sw32ww62ry3l";
     };
     meta.homepage = "https://github.com/catgoose/nvim-colorizer.lua/";
   };
@@ -8828,12 +8828,12 @@ final: prev:
 
   nvim-dap = buildVimPlugin {
     pname = "nvim-dap";
-    version = "2024-12-19";
+    version = "2024-12-20";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "7e48a80551e0b8fd7e34436d74243de7ae1ec397";
-      sha256 = "189zw4n5gl20806nph4xmc5d0j25hbkn7sj7anhw6nliw2n4ryai";
+      rev = "a6070b4e9e9a8ff1bc513c3748eff27080b0f44a";
+      sha256 = "17v4n51lda3zy0lbmviy4a5srj05xx5v92hab26748db4cpkj6yn";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
   };
@@ -9032,12 +9032,12 @@ final: prev:
 
   nvim-highlight-colors = buildVimPlugin {
     pname = "nvim-highlight-colors";
-    version = "2024-11-07";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "brenoprata10";
       repo = "nvim-highlight-colors";
-      rev = "e967e2ba13fd4ca731b41d0e5cc1ac2edcd6e25e";
-      sha256 = "0k9m3v8q25myi2bkscbf9pzv4v9nihix9lrch4sh9575qlhjl2gc";
+      rev = "68a4df620cf58e2c7336e53738e8cf3a522ad694";
+      sha256 = "1hhih2cbns3lcbpjvy18r3fvllvrl26srd7f9j0fpxr6xiayb5gc";
     };
     meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/";
   };
@@ -9139,12 +9139,12 @@ final: prev:
 
   nvim-lightbulb = buildVimPlugin {
     pname = "nvim-lightbulb";
-    version = "2024-10-17";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "kosayoda";
       repo = "nvim-lightbulb";
-      rev = "33d4c95e0e853956bc9468b70b3064c87d5abaca";
-      sha256 = "1njf3f3jw1ynpac20rf688g1gais7ca71wzwzh3iijvhw2wd5x95";
+      rev = "3ac0791be37ba9cc7939f1ad90ebc5e75abf4eea";
+      sha256 = "0qc1rl45ykh9552dx5fmhdg0ncfsk2vpcmj5i7hrmdzgkd2f0avg";
     };
     meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
   };
@@ -9223,12 +9223,12 @@ final: prev:
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2024-12-19";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "040001d85e9190a904d0e35ef5774633e14d8475";
-      sha256 = "16380yk3q4w6w9xs0lmjaf03p7jplaqa7mn9dgqld00536mv1qwr";
+      rev = "c580f34bc5fdca8aaf737a9ab8a5d775cb940e57";
+      sha256 = "12mgb4kxwagcbdmjfw6vpwz0h5wq0lhkci88i9k1d06ax7dbfiai";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -9331,12 +9331,12 @@ final: prev:
 
   nvim-neoclip-lua = buildVimPlugin {
     pname = "nvim-neoclip.lua";
-    version = "2024-09-10";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "AckslD";
       repo = "nvim-neoclip.lua";
-      rev = "32e05f2d23dc5b6a284a688c0535a83d1bfc633f";
-      sha256 = "0z6rfbl02ddazfrmczb34hspgshqvxpi3ga4q7srhpz0cch16y8q";
+      rev = "5e5e010251281f4aea69cfc1d4976ffe6065cf0f";
+      sha256 = "1fdm1k6gdhgi8vz4kfi2v40fjp4c1rnc6fb4bmmr3x6ca25ij8s4";
     };
     meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/";
   };
@@ -9487,12 +9487,12 @@ final: prev:
 
   nvim-scissors = buildVimPlugin {
     pname = "nvim-scissors";
-    version = "2024-12-17";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-scissors";
-      rev = "01f78a23885b168251aba2e74d94739ea6b7545c";
-      sha256 = "0cdd0n90wkhfihnhsskn2vykm15n4zblnjlw0w7ksm8656x6nhwl";
+      rev = "52e92bfc15f1572b8e9cc6e5dad68891bb5732c7";
+      sha256 = "0yja2drr88kli17r9nx5nkbkr7hza0hr67jcrcpd2dzvqg6j663c";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/";
   };
@@ -9547,12 +9547,12 @@ final: prev:
 
   nvim-snippy = buildVimPlugin {
     pname = "nvim-snippy";
-    version = "2024-11-14";
+    version = "2024-12-20";
     src = fetchFromGitHub {
       owner = "dcampos";
       repo = "nvim-snippy";
-      rev = "86a0b645551ca83153a594097ee0267498abaae2";
-      sha256 = "07pfh60idaqpwdymnlac0r918pgpqq6c74i8p74ndw6jrhdrhplq";
+      rev = "becb4b94929207e61ae897417f0e957cd2ea3f1f";
+      sha256 = "0gzqnpjawjpbplgbsjik8vkd1mqrqxjw0g5q0c1mlsg3alc071ha";
     };
     meta.homepage = "https://github.com/dcampos/nvim-snippy/";
   };
@@ -9643,36 +9643,36 @@ final: prev:
 
   nvim-tree-lua = buildVimPlugin {
     pname = "nvim-tree.lua";
-    version = "2024-12-13";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "f7b76cd1a75615c8d6254fc58bedd2a7304eb7d8";
-      sha256 = "1v1naz9vplwa2h7hwrlj23i6iw084rlvrsfvc9jp9qhmbmbnr537";
+      rev = "68fc4c20f5803444277022c681785c5edd11916d";
+      sha256 = "08024p6w208ygn7qd74kj6yxras8qfd5f8w0qdqpyg6qbggqzyg0";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
   };
 
   nvim-treesitter = buildVimPlugin {
     pname = "nvim-treesitter";
-    version = "2024-12-19";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "fa915a30c5cdf1d18129e9ef6ac2ee0fa799904f";
-      sha256 = "1cskvl5pp1w29hsinbcdpjjdhlj92xaqqr3cy0vcqvdywv5mhq22";
+      rev = "b4897f5a8453e7efeafb21ff5b2bbdc2e3faf1bd";
+      sha256 = "1qcwqc103qly78gsymz6qj1g1y3kdxf6gafhdpr2rp7bmdjd73yc";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
 
   nvim-treesitter-context = buildVimPlugin {
     pname = "nvim-treesitter-context";
-    version = "2024-12-11";
+    version = "2024-12-20";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-context";
-      rev = "8fd989b6b457a448606b4a2e51f9161700f609a7";
-      sha256 = "18zlwxm1321kzr307jnxwkq58k4zd5jz112pj2vb2aib5vhsprqp";
+      rev = "2bcf700b59bc92850ca83a1c02e86ba832e0fae0";
+      sha256 = "0xs3ha4zd96rzy5w9hyjzyyq88nnv1bnkgg2splfmnf3mhy4r0ac";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
   };
@@ -9823,12 +9823,12 @@ final: prev:
 
   nvim-web-devicons = buildVimPlugin {
     pname = "nvim-web-devicons";
-    version = "2024-12-16";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-web-devicons";
-      rev = "0eb18da56e2ba6ba24de7130a12bcc4e31ad11cb";
-      sha256 = "0xhd4wyr0g6r0hpjlsplclx36yndgj4b7q6shfjfdp68sbqw6hir";
+      rev = "15c7d0f616ebf88960ce5c4221828f62789d36d9";
+      sha256 = "1av74m2jyp23vj17s8lhwcwcsfdjmi9nh728hknsv7zgw5yjz11a";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
   };
@@ -9871,12 +9871,12 @@ final: prev:
 
   nvim_context_vt = buildVimPlugin {
     pname = "nvim_context_vt";
-    version = "2024-07-16";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "andersevenrud";
       repo = "nvim_context_vt";
-      rev = "03fb506bbd5fdbb2b21ac6b0fe38ed40e339b143";
-      sha256 = "1l0zi3pkhss3y5jpa7vgg4p0s0a15h4wdmkxz29mmljrpql2zhzs";
+      rev = "c0e5f64000c5c16bab31bb1771d89a4fcaeeb6c6";
+      sha256 = "0gzd0vv6np3hvikb7hxzz97klgyaipbaihpfvvwf90v6jcqz04fp";
     };
     meta.homepage = "https://github.com/andersevenrud/nvim_context_vt/";
   };
@@ -9991,12 +9991,12 @@ final: prev:
 
   oil-nvim = buildVimPlugin {
     pname = "oil.nvim";
-    version = "2024-12-10";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "oil.nvim";
-      rev = "dba037598843973b8c54bc5ce0318db4a0da439d";
-      sha256 = "0zhxcwh40pqxgkv45hv47paz2635bkcj7vpdi1p2bkbpp1dd3krc";
+      rev = "ba858b662599eab8ef1cba9ab745afded99cb180";
+      sha256 = "1pk6863f79278mrw1zdshbalsih245ynkp4z54znza238a57x87n";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/oil.nvim/";
@@ -10052,12 +10052,12 @@ final: prev:
 
   one-small-step-for-vimkind = buildVimPlugin {
     pname = "one-small-step-for-vimkind";
-    version = "2024-12-04";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "jbyuki";
       repo = "one-small-step-for-vimkind";
-      rev = "7f47c3297eeed1364be3c6ad915b1df2beb2b2f4";
-      sha256 = "09vfkv3sqb56giqg1gdjjavq3nj6q850468an9pjz6dpcmdaybi8";
+      rev = "5d2edc8937978585881d97a8fec4c2903fa4d72c";
+      sha256 = "1hn8m9kz0zzyxv6zkyz5x35yj24ya85cw92nzs3mnz7rdz5hqpsc";
     };
     meta.homepage = "https://github.com/jbyuki/one-small-step-for-vimkind/";
   };
@@ -10124,12 +10124,12 @@ final: prev:
 
   onenord-nvim = buildVimPlugin {
     pname = "onenord.nvim";
-    version = "2024-12-19";
+    version = "2024-12-20";
     src = fetchFromGitHub {
       owner = "rmehri01";
       repo = "onenord.nvim";
-      rev = "97f28a6005249476a090d97ccd44a82520dcdfe4";
-      sha256 = "05zv81rfg2k8zicwbvnaji3143vbyxb9j5kcdz8vwwwyb6s40j1g";
+      rev = "3bb6d3a9593ebe5390bbb1fe14ee8c751d9e81c2";
+      sha256 = "14n0yi3i38wzv4rl21p14h795386f7xsdialjdjjdgcps1yw92fk";
     };
     meta.homepage = "https://github.com/rmehri01/onenord.nvim/";
   };
@@ -10172,24 +10172,24 @@ final: prev:
 
   openscad-nvim = buildVimPlugin {
     pname = "openscad.nvim";
-    version = "2024-04-13";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "salkin-mada";
       repo = "openscad.nvim";
-      rev = "bf99a48bff318ceb28646d27f29f925ba0b10af0";
-      sha256 = "1b90bfwwnz9iwwr89whpqn939m5bvw8cpiysc8yaq3yy46gzvkw7";
+      rev = "58baf76fd2f9e2fe2ca83ea120d56084edb8871e";
+      sha256 = "1rd2ppv5qwfp6ndk0mgizpmh3lhldmvwliifadykrz5vh2a7ix0p";
     };
     meta.homepage = "https://github.com/salkin-mada/openscad.nvim/";
   };
 
   orgmode = buildVimPlugin {
     pname = "orgmode";
-    version = "2024-12-18";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "nvim-orgmode";
       repo = "orgmode";
-      rev = "07c479c993d7e3d40166b2cfa0e27b8b7a3604d1";
-      sha256 = "1mpn9ivn6wi8d9ywlkrrr6b5rhla1hrf6lllihqd5979l8i3lcim";
+      rev = "bf657742f7cb56211f99946ff64f5f87d7d7f0d0";
+      sha256 = "074493jfhgihp5zyyl86f9hfa2j6qdgw35q87vvdbmmj6rwhjmhk";
     };
     meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
   };
@@ -10365,12 +10365,12 @@ final: prev:
 
   persisted-nvim = buildVimPlugin {
     pname = "persisted.nvim";
-    version = "2024-12-15";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "persisted.nvim";
-      rev = "1473f182c36b6de0bf04d5eaac5c049e604f9d7b";
-      sha256 = "0s04p909rf9d0v45z99kipd76hgrdnfnx3rzipnajfb2zcglc5wf";
+      rev = "8a25e7028d44645616a503b07b84be62da2fee86";
+      sha256 = "07imijf0wpip32xi8alj3shk6k4rlh1f90myv2qrf3r1xka9xr0f";
     };
     meta.homepage = "https://github.com/olimorris/persisted.nvim/";
   };
@@ -10646,8 +10646,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "pum.vim";
-      rev = "97f431fc75d20d824b963e1fe751df55e423e05a";
-      sha256 = "0qz8gn3yrf3wzn9jzizfrbrcvfl8dffdssnphjrnglshmsqddd11";
+      rev = "7ec17b76478efdfb712c2cff26c1b2c9f825e1cd";
+      sha256 = "1qxlg2rk6drm7zf9pf8b8x4hw8amymc8c8kslhz8szza43hkkwdc";
     };
     meta.homepage = "https://github.com/Shougo/pum.vim/";
   };
@@ -10727,12 +10727,12 @@ final: prev:
 
   quarto-nvim = buildVimPlugin {
     pname = "quarto-nvim";
-    version = "2024-12-04";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "quarto-dev";
       repo = "quarto-nvim";
-      rev = "5512a5704c55074a4f1cd38815b3b09ce9c5345d";
-      sha256 = "15v5x70za7giiwkbfzgja9rbf97ams0myk1y43723q6nfqzx4mbk";
+      rev = "1cb2d24d7793241bd43f38e3a6f99a6d11f84458";
+      sha256 = "1vk77qzijz3sxl4yc14zxxdvgnv1j88kibv6wdyl6qsfnw7x4yjk";
     };
     meta.homepage = "https://github.com/quarto-dev/quarto-nvim/";
   };
@@ -11088,12 +11088,12 @@ final: prev:
 
   roslyn-nvim = buildVimPlugin {
     pname = "roslyn.nvim";
-    version = "2024-12-18";
+    version = "2024-12-24";
     src = fetchFromGitHub {
       owner = "seblj";
       repo = "roslyn.nvim";
-      rev = "1bc4553c3484480f08ea2ced3cebb6bd98e169e7";
-      sha256 = "1nxr5zp4l52f7c35wx5gw5bg8wghpzp1q29alprqkbhzdddw6ah4";
+      rev = "47d97e0a3f81b778409e742877b8b03fdf6c762d";
+      sha256 = "1iqv11y9x705j29v58n43kmpp5hbqs855qxn63v4gyfhcb94c18k";
     };
     meta.homepage = "https://github.com/seblj/roslyn.nvim/";
   };
@@ -11208,12 +11208,12 @@ final: prev:
 
   scope-nvim = buildVimPlugin {
     pname = "scope.nvim";
-    version = "2024-09-17";
+    version = "2024-12-20";
     src = fetchFromGitHub {
       owner = "tiagovla";
       repo = "scope.nvim";
-      rev = "932102696ead2b7ab9ff65017767b57e2722fdde";
-      sha256 = "1ma6rrh8dhbm8wwky6pybczy19ziy98wsy55flfamsq5gclkxqyr";
+      rev = "e1799fa37178382fc228245c41af5547e3f95182";
+      sha256 = "1cbgnlrbwsf2jfn5jg3qkjpgiq0k3ls93qpcdd1c8x3lvw6q9sxc";
     };
     meta.homepage = "https://github.com/tiagovla/scope.nvim/";
   };
@@ -11401,24 +11401,24 @@ final: prev:
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2024-12-14";
+    version = "2024-12-20";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "1e8fa136f1be004c75b4f794f86a7103e077b6ca";
-      sha256 = "0mzzsjndqf2hwsaq6gl51jyal436hqwr0b0iy8552cz672s0w95h";
+      rev = "49c397120944ebb89fbb11126b7edce36be8bdad";
+      sha256 = "0ladrlp2xnz54kcazk2vvax6rs3dxf2j1zjw24n7zl6dnghbn0lb";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
   };
 
   smartcolumn-nvim = buildVimPlugin {
     pname = "smartcolumn.nvim";
-    version = "2024-03-10";
+    version = "2024-12-20";
     src = fetchFromGitHub {
       owner = "m4xshen";
       repo = "smartcolumn.nvim";
-      rev = "cefb17be095ad5526030a21bb2a80553cae09127";
-      sha256 = "1lddpzrqcvq4vqjqcc89zi851kn1r247m5c1sxn7zxh5sl61wwhc";
+      rev = "f14fbea6f86cd29df5042897ca9e3ba10ba4d27f";
+      sha256 = "1d0p906dr4wzc73zsm1pyc3fl9a6ns8i6hkl0ynvx72hj01is6p9";
     };
     meta.homepage = "https://github.com/m4xshen/smartcolumn.nvim/";
   };
@@ -11461,12 +11461,12 @@ final: prev:
 
   snacks-nvim = buildVimPlugin {
     pname = "snacks.nvim";
-    version = "2024-12-19";
+    version = "2024-12-20";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "snacks.nvim";
-      rev = "9563bb1ffc890abf35341561ea2362b9ac51da04";
-      sha256 = "0wy1bwv9amdr5l23m7yzx95c3jxwdcdlanqljq9iz2dxyzwvqlhr";
+      rev = "98df370703b3c47a297988f3e55ce99628639590";
+      sha256 = "0xbh54vwzaqiy0drayax0ldw66ix1sqd8y7n4rqr9bi0y10pdxqs";
     };
     meta.homepage = "https://github.com/folke/snacks.nvim/";
   };
@@ -11485,12 +11485,12 @@ final: prev:
 
   snipe-nvim = buildVimPlugin {
     pname = "snipe.nvim";
-    version = "2024-12-19";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "leath-dub";
       repo = "snipe.nvim";
-      rev = "9dc03ff9abf5c3939e1cc3f601b8285b6175b145";
-      sha256 = "1n131lbxgfl6c0k5kjqpvp6mijspzq8ig7jn5165g6azzqk282pn";
+      rev = "2550012916d4fb21d6d1c7a88a9bddde651bb1f0";
+      sha256 = "0n6l8a9mka34wz2k155gv5pfkws45wlhw2iiqph547riwwy7dswy";
     };
     meta.homepage = "https://github.com/leath-dub/snipe.nvim/";
   };
@@ -11569,12 +11569,12 @@ final: prev:
 
   spaceman-nvim = buildVimPlugin {
     pname = "spaceman.nvim";
-    version = "2024-11-30";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "FireIsGood";
       repo = "spaceman.nvim";
-      rev = "b7ba2ea591ec95bda259a32b8201aaa11cc0f0f6";
-      sha256 = "0j5n772wir3si26pac4qv5glxlnly1npcxaa8baaksv9877jbxs8";
+      rev = "317f16e67aeb7440e7a6a8a30dd4b58dfec973c0";
+      sha256 = "1a3467q4wx7j2v60vvs9p5mzbra9dyq2p583y0bsf0rr33zvmi2x";
     };
     meta.homepage = "https://github.com/FireIsGood/spaceman.nvim/";
   };
@@ -11653,12 +11653,12 @@ final: prev:
 
   splitjoin-vim = buildVimPlugin {
     pname = "splitjoin.vim";
-    version = "2024-08-19";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "AndrewRadev";
       repo = "splitjoin.vim";
-      rev = "f72d59c9f5d4c8b865e0abfeee98f85b47fe5a3a";
-      sha256 = "1vi88nbchsrgwjkmc2a8lra8j0fs3w4g47fs82v5qra7rxikwqcl";
+      rev = "13856c6bd77b1eeefd9ceb733501fed75393dd78";
+      sha256 = "1ilfqm2zir02100c4ik25gd6yg3my08w7irw2550nqchy6wv6qkv";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -11979,12 +11979,12 @@ final: prev:
 
   tabby-nvim = buildVimPlugin {
     pname = "tabby.nvim";
-    version = "2024-12-16";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "nanozuki";
       repo = "tabby.nvim";
-      rev = "7b0b785491ce40cea0f7b99a428636d6a8fe920c";
-      sha256 = "1738flbra74hcirn5v0zv5zbzs6z4gxfkf7n4c19ndrg4d2fk5xq";
+      rev = "a7936cc8ad00b17e2a1e7e260125df4a02632dc3";
+      sha256 = "118q2gpq4ypazcpyd0yphk47dd94jwsnw8dk2n9vq22j89kazz3d";
     };
     meta.homepage = "https://github.com/nanozuki/tabby.nvim/";
   };
@@ -12245,12 +12245,12 @@ final: prev:
 
   telescope-frecency-nvim = buildVimPlugin {
     pname = "telescope-frecency.nvim";
-    version = "2024-12-09";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-frecency.nvim";
-      rev = "a358728043a429d69ecfb317937df66f7cec40d5";
-      sha256 = "062fqd3yhhi7vsy1b07z2m0rc53qxncvpkxxwmh29bdkwyabzzp2";
+      rev = "77829eda3451ef81200b9c61696af0d64372ea85";
+      sha256 = "1hcbndw58l02bw21xccnl12ql7gi2wa8zm85sxiv678k8w1mmmcw";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
   };
@@ -12342,12 +12342,12 @@ final: prev:
 
   telescope-manix = buildNeovimPlugin {
     pname = "telescope-manix";
-    version = "2024-12-15";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "telescope-manix";
-      rev = "a95629196f44794391539bbf0ed7051235f500e3";
-      sha256 = "0c4bf93dqgsl7vm6bvjrqvrrllw0ccfn7mygyw2d64vvhy029rb0";
+      rev = "5ad71aa225eddabb604d87b341d6cd0cf6854a4f";
+      sha256 = "03p5v2a4kdyki911k975pw9k7p1q91v7spk3lrgjgls62hfai7s3";
     };
     meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
   };
@@ -12715,12 +12715,12 @@ final: prev:
 
   tiny-inline-diagnostic-nvim = buildVimPlugin {
     pname = "tiny-inline-diagnostic.nvim";
-    version = "2024-12-18";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-inline-diagnostic.nvim";
-      rev = "66d9166520a0cb3392a5ef68946fd3980d57383f";
-      sha256 = "09d7fdvdj8r4yg10288fkj2749qmhkvppvf9l05jcq9psv57k938";
+      rev = "90610e55f438d833c052867d022ff11f27647210";
+      sha256 = "063nxmd8hza1mgp5bw8wkrphhfn9fzyslw9qnd23rwaqzmy1y2ld";
     };
     meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
   };
@@ -13077,12 +13077,12 @@ final: prev:
 
   typst-preview-nvim = buildVimPlugin {
     pname = "typst-preview.nvim";
-    version = "2024-12-16";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "chomosuke";
       repo = "typst-preview.nvim";
-      rev = "23db1bd5a32ff0b346817ed72e615c6419b11f48";
-      sha256 = "1jljmbza7gdmskizg9b58isy7m755kxalrwvcb0d0xq0m3j48ddr";
+      rev = "c1100e8788baabe8ca8f8cd7fd63d3d479e49e36";
+      sha256 = "1xjdfk20k0rjg8z76n57iadr7nkvfvx960gh1lc1d0ji2vpyz93p";
     };
     meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/";
   };
@@ -13161,12 +13161,12 @@ final: prev:
 
   unison = buildVimPlugin {
     pname = "unison";
-    version = "2024-12-19";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "a2d3c2ca1f5e17af45feaf463ee986181ecda390";
-      sha256 = "02z6yfa31kvl8q9apkjwvxyfapn3r19gbfv9rimckciga2gvi4zf";
+      rev = "aad1fdd12955aa56946bc1671eb4781b1fbd6b6b";
+      sha256 = "1ggjv2wzvjdk55gg9jjvv4np59qcliqw4wk5045pfcir2pp8yspv";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
   };
@@ -15141,12 +15141,12 @@ final: prev:
 
   vim-graphql = buildVimPlugin {
     pname = "vim-graphql";
-    version = "2024-10-23";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "jparise";
       repo = "vim-graphql";
-      rev = "f2e77545b4ed1f8104a0014e9b75cff257c3cc27";
-      sha256 = "13974aikzkdiji8z8hr2dzjmfjxbh9kfsxss9nbbcczz7a1yq005";
+      rev = "cd2667f56f96b9dd376d8e56fe80eb32924971b9";
+      sha256 = "0cpcdsymvxq9aklqpsrrjdww1s22ky2wxlk5nwfglzlmbmscpa12";
     };
     meta.homepage = "https://github.com/jparise/vim-graphql/";
   };
@@ -16859,12 +16859,12 @@ final: prev:
 
   vim-projectionist = buildVimPlugin {
     pname = "vim-projectionist";
-    version = "2024-10-13";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-projectionist";
-      rev = "104394c31ead4b09fbf0e16f9d367e3e179ee50a";
-      sha256 = "0g5xwzp5wixk2f6a4325jpz1hg7m0jv3klkdglv1qz23ffgdznbh";
+      rev = "5ff7bf79a6ef741036d2038a226bcb5f8b1cd296";
+      sha256 = "0cg4wlsv1xaak9svvi5a2mb4xcyjpxc43014d4jqrd5a2gkvyhr4";
     };
     meta.homepage = "https://github.com/tpope/vim-projectionist/";
   };
@@ -17099,12 +17099,12 @@ final: prev:
 
   vim-ruby = buildVimPlugin {
     pname = "vim-ruby";
-    version = "2024-12-12";
+    version = "2024-12-21";
     src = fetchFromGitHub {
       owner = "vim-ruby";
       repo = "vim-ruby";
-      rev = "dcf0d9f0f0ab385f313d8cea58dc6d03f22cf072";
-      sha256 = "00jhjyzs1m79s9y7azgrpahy678m5wzjwrfrnrslgxjd1spa9ar1";
+      rev = "9139741a9d786144aae66755df030f8e5fab36df";
+      sha256 = "1mabq9a6w0pxm84acmhxk6i4x4dny8c5sw63fwjzwkw0sdxiv2fc";
     };
     meta.homepage = "https://github.com/vim-ruby/vim-ruby/";
   };
@@ -18372,12 +18372,12 @@ final: prev:
 
   vimade = buildVimPlugin {
     pname = "vimade";
-    version = "2024-12-18";
+    version = "2024-12-23";
     src = fetchFromGitHub {
       owner = "TaDaa";
       repo = "vimade";
-      rev = "b258553e04212cb692a10894b220588daff21222";
-      sha256 = "07k61j54vazvw9087zx9a6zx0scvk4283rfwz2msjfqchqp2mgik";
+      rev = "961b86612977ae70ef19ac7c9c95ff245f6ff666";
+      sha256 = "0y1jmpz91a03q74irianzxqnpajfqv02vwjqlpw7nlmvybdmphxk";
     };
     meta.homepage = "https://github.com/TaDaa/vimade/";
   };
@@ -18878,12 +18878,12 @@ final: prev:
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "2024-12-17";
+    version = "2024-12-22";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "2d6e9b9e2bda2294a978f60367598b75ea5b59d0";
-      sha256 = "10ry4r7w6xfr8f6b8z6x05gas04d4b7v51i1gd9js0bd6vny3kx8";
+      rev = "28ebf7eceb08ae47dbc988f0e93593c4c9f15a05";
+      sha256 = "0l69xc9h4wa2nzw4pm6j1c4f51h4iz1zlmida4dnpgkqcy26agmw";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
   };

From f6fd5e95e1018a4947e6ff0325adb8999055e6c6 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 23 Dec 2024 18:32:28 -0600
Subject: [PATCH 282/340] vimPlugins.nvim-treesitter: update grammars

---
 .../vim/plugins/nvim-treesitter/generated.nix | 84 +++++++++----------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 1532cc4a66efb..a810043f545cc 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -149,12 +149,12 @@
   };
   bicep = buildGrammar {
     language = "bicep";
-    version = "0.0.0+rev=0092c7d";
+    version = "0.0.0+rev=bff5988";
     src = fetchFromGitHub {
       owner = "amaanq";
       repo = "tree-sitter-bicep";
-      rev = "0092c7d1bd6bb22ce0a6f78497d50ea2b87f19c0";
-      hash = "sha256-jj1ccJQOX8oBx1XVKzI53B1sveq5kNADc2DB8bJhsf4=";
+      rev = "bff59884307c0ab009bd5e81afd9324b46a6c0f9";
+      hash = "sha256-+qvhJgYqs8aj/Kmojr7lmjbXmskwVvbYBn4ia9wOv3k=";
     };
     meta.homepage = "https://github.com/amaanq/tree-sitter-bicep";
   };
@@ -1353,12 +1353,12 @@
   };
   java = buildGrammar {
     language = "java";
-    version = "0.0.0+rev=a1bbe92";
+    version = "0.0.0+rev=94703d5";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-java";
-      rev = "a1bbe92a6370bb4c15386735fbda12f2b812a923";
-      hash = "sha256-AmGyKe7/zxzQTLSIQwiSuAJsYEcZVgW3RzfsRqyFNgE=";
+      rev = "94703d5a6bed02b98e438d7cad1136c01a60ba2c";
+      hash = "sha256-OvEO1BLZLjP3jt4gar18kiXderksFKO0WFXDQqGLRIY=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
   };
@@ -1463,12 +1463,12 @@
   };
   kconfig = buildGrammar {
     language = "kconfig";
-    version = "0.0.0+rev=486fea7";
+    version = "0.0.0+rev=9ac99fe";
     src = fetchFromGitHub {
       owner = "amaanq";
       repo = "tree-sitter-kconfig";
-      rev = "486fea71f61ad9f3fd4072a118402e97fe88d26c";
-      hash = "sha256-a3uTjtA4KQ8KxEmpva2oHcqp8EwbI5+h9U+qoPSgDd4=";
+      rev = "9ac99fe4c0c27a35dc6f757cef534c646e944881";
+      hash = "sha256-8gZZLGL7giVHQIirjUIfsx3scP1L1VTFIZX7QOyjWvk=";
     };
     meta.homepage = "https://github.com/amaanq/tree-sitter-kconfig";
   };
@@ -1496,12 +1496,12 @@
   };
   koto = buildGrammar {
     language = "koto";
-    version = "0.0.0+rev=0017388";
+    version = "0.0.0+rev=b420f79";
     src = fetchFromGitHub {
       owner = "koto-lang";
       repo = "tree-sitter-koto";
-      rev = "0017388765b8b9d89febfe08b5f82805b4e173a5";
-      hash = "sha256-L8IK4dvejZ1yfEkPGufkNArxm3hTStpk15HFNkSQdv0=";
+      rev = "b420f7922d0d74905fd0d771e5b83be9ee8a8a9a";
+      hash = "sha256-X1YnhmOpVJ+ENHXSK7jZxl1SXxa0UM07nkXdejlQDOA=";
     };
     meta.homepage = "https://github.com/koto-lang/tree-sitter-koto";
   };
@@ -1640,12 +1640,12 @@
   };
   luau = buildGrammar {
     language = "luau";
-    version = "0.0.0+rev=fbadc96";
+    version = "0.0.0+rev=a8914d6";
     src = fetchFromGitHub {
       owner = "amaanq";
       repo = "tree-sitter-luau";
-      rev = "fbadc96272f718dba267628ba7b0e694c368cef3";
-      hash = "sha256-qoKLG9hPyvcpDEssSrsUnr+w6B8qvXXIXLdvoCZhjic=";
+      rev = "a8914d6c1fc5131f8e1c13f769fa704c9f5eb02f";
+      hash = "sha256-5qbZA2mxTvrsfUrpgD+4y3oeJsifA91c/hfcVwQBRgI=";
     };
     meta.homepage = "https://github.com/amaanq/tree-sitter-luau";
   };
@@ -1863,12 +1863,12 @@
   };
   nu = buildGrammar {
     language = "nu";
-    version = "0.0.0+rev=dc22e25";
+    version = "0.0.0+rev=755efd5";
     src = fetchFromGitHub {
       owner = "nushell";
       repo = "tree-sitter-nu";
-      rev = "dc22e2577eb09d1d0de50802c59da2eca98a0e7b";
-      hash = "sha256-9/8UnbbjI/65+CnIzJGfEl1Scltz3KUHh3/6Gb5kbwY=";
+      rev = "755efd545d39e23418ce6f96f2a8600ff1a7e74d";
+      hash = "sha256-7lfSO/2GyWYicgmLRvwCfM4pqvFeUSD5urA4XE1uKew=";
     };
     meta.homepage = "https://github.com/nushell/tree-sitter-nu";
   };
@@ -1932,12 +1932,12 @@
   };
   odin = buildGrammar {
     language = "odin";
-    version = "0.0.0+rev=3fee796";
+    version = "0.0.0+rev=e8adc73";
     src = fetchFromGitHub {
       owner = "amaanq";
       repo = "tree-sitter-odin";
-      rev = "3fee7964bbfb2554deef12c224344f3870d15375";
-      hash = "sha256-skMbtAjulJXGpaAfi1Q/WgeiimWE/qlwsWmq6lWXaU8=";
+      rev = "e8adc739b78409a99f8c31313f0bb54cc538cf73";
+      hash = "sha256-vlw5XaHTdsgO9H4y8z0u0faYzs+L3UZPhqhD/IJ6khY=";
     };
     meta.homepage = "https://github.com/amaanq/tree-sitter-odin";
   };
@@ -2088,12 +2088,12 @@
   };
   powershell = buildGrammar {
     language = "powershell";
-    version = "0.0.0+rev=ff0ac42";
+    version = "0.0.0+rev=32fe49c";
     src = fetchFromGitHub {
       owner = "airbus-cert";
       repo = "tree-sitter-powershell";
-      rev = "ff0ac42e742f3c4be3b55fd14f910d5dc204e323";
-      hash = "sha256-GgPpMK/Gs3a4pVH61nlCtV2zKlPlgB7vNsUwPWkoCMk=";
+      rev = "32fe49cc5d4a2d5a976dacafc0da16d98787866b";
+      hash = "sha256-KweKsz/9X9HHvqZDhXb5qVVRMjwUSKNkiTYg5OcIiS0=";
     };
     meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell";
   };
@@ -2212,12 +2212,12 @@
   };
   puppet = buildGrammar {
     language = "puppet";
-    version = "0.0.0+rev=584522f";
+    version = "0.0.0+rev=15f1929";
     src = fetchFromGitHub {
       owner = "amaanq";
       repo = "tree-sitter-puppet";
-      rev = "584522f32495d648b18a53ccb52d988e60de127d";
-      hash = "sha256-+zMgzyuGerJ8l+i5ZtWnmGr3i4fFiSLD5FssyKESsmI=";
+      rev = "15f192929b7d317f5914de2b4accd37b349182a6";
+      hash = "sha256-bO5g5AdhzpB13yHklpAndUHIX7Rvd7OMjH0Ds2ATA6Q=";
     };
     meta.homepage = "https://github.com/amaanq/tree-sitter-puppet";
   };
@@ -2245,12 +2245,12 @@
   };
   python = buildGrammar {
     language = "python";
-    version = "0.0.0+rev=1ee3e77";
+    version = "0.0.0+rev=bffb65a";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-python";
-      rev = "1ee3e775477f913ae3a46cde7a6a512deb06052c";
-      hash = "sha256-DojFqb5YJsqF95Hb2fjjeyNpwaexyJ8KkdxJWSYx7aY=";
+      rev = "bffb65a8cfe4e46290331dfef0dbf0ef3679de11";
+      hash = "sha256-71Od4sUsxGEvTwmXX8hBvzqD55hnXkVJublrhp1GICg=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-python";
   };
@@ -2377,12 +2377,12 @@
   };
   regex = buildGrammar {
     language = "regex";
-    version = "0.0.0+rev=4470c59";
+    version = "0.0.0+rev=d329907";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-regex";
-      rev = "4470c59041416e8a2a9fa343595ca28ed91f38b8";
-      hash = "sha256-GNWntm8sgqVt6a+yFVncjkoMOe7CnXX9Qmpwy6KcFyU=";
+      rev = "d329907611abe46d26ab5908e5922e7400212cb9";
+      hash = "sha256-XNoklzboR0NzFu2Ke7HT6TitROFhEM6S993INA1atfM=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex";
   };
@@ -3148,12 +3148,12 @@
   };
   v = buildGrammar {
     language = "v";
-    version = "0.0.0+rev=bc2aa29";
+    version = "0.0.0+rev=b9644a2";
     src = fetchFromGitHub {
       owner = "vlang";
       repo = "v-analyzer";
-      rev = "bc2aa2993851ed5ad10caf4571aa2aaee3c80a7f";
-      hash = "sha256-SW48kJShPJFgsw8tfI9CwDQvbXj6L09aHl1g+Sl5+mU=";
+      rev = "b9644a24bf0be5bf41de61bda681b28492dd3112";
+      hash = "sha256-XURrUjpp7tytq5eO4BY0fmaMssE4B46P3gybbcfVzr4=";
     };
     location = "tree_sitter_v";
     meta.homepage = "https://github.com/vlang/v-analyzer";
@@ -3182,12 +3182,12 @@
   };
   verilog = buildGrammar {
     language = "verilog";
-    version = "0.0.0+rev=0dacb91";
+    version = "0.0.0+rev=4344f7e";
     src = fetchFromGitHub {
       owner = "gmlarumbe";
       repo = "tree-sitter-systemverilog";
-      rev = "0dacb911daa9614a7c7e79a594d4cb9f478e6554";
-      hash = "sha256-WATrVeP3c//tWLG8VibXZrYrChBs7d4V6LCcEGcofdg=";
+      rev = "4344f7e6c7fd8a9ccaf4cb93da17a37a544b492c";
+      hash = "sha256-jZ9ibkoNPl3bM6U5rhSlE808fFmySSjeEJkjcKD5ZW4=";
     };
     meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog";
   };
@@ -3381,12 +3381,12 @@
   };
   zig = buildGrammar {
     language = "zig";
-    version = "0.0.0+rev=eb7d58c";
+    version = "0.0.0+rev=b670c8d";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-zig";
-      rev = "eb7d58c2dc4fbeea4745019dee8df013034ae66b";
-      hash = "sha256-iyb79SiMsV94RrWH/1Oi2aKBiX5io0Dp+zZf8qWZHwg=";
+      rev = "b670c8df85a1568f498aa5c8cae42f51a90473c0";
+      hash = "sha256-lDMmnmeGr2ti9W692ZqySWObzSUa9vY7f+oHZiE8N+U=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-zig";
   };

From 8324b900910ff9a991bfc62269a5e8406dc76dca Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 28 Dec 2024 09:28:20 -0600
Subject: [PATCH 283/340] luaPackages: update on 2024-12-28

---
 .../lua-modules/generated-packages.nix        | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 2e930be3a8222..d826d1fb83b67 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -579,14 +579,14 @@ buildLuarocksPackage {
 fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
   pname = "fzf-lua";
-  version = "0.0.1582-1";
+  version = "0.0.1594-1";
   knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/fzf-lua-0.0.1582-1.rockspec";
-    sha256 = "1bk23f6dgs3y6n7am7zg30zk56ipxsgdljqgfgw5xb2ki63kaxcx";
+    url    = "mirror://luarocks/fzf-lua-0.0.1594-1.rockspec";
+    sha256 = "1hc23a5kf3343jzcqwlz51af5a3yfxhbspsfy4p1lzvw596hlq38";
   }).outPath;
   src = fetchzip {
-    url    = "https://github.com/ibhagwan/fzf-lua/archive/c3cfa2b59ad1903f79a5a431ce3133300dd6e072.zip";
-    sha256 = "1mvzhns06i8sic1iqlw7m8xqwnh7jls1kk8gfq5dy74yyv50k9fp";
+    url    = "https://github.com/ibhagwan/fzf-lua/archive/dbc5bd14e72ba680df44906e957b0a821121726b.zip";
+    sha256 = "1qcgacgrn6jmqi623rqav45rz83r9m3xv4k5bm5f8lnqdyi3r0av";
   };
 
   disabled = luaOlder "5.1";
@@ -2795,14 +2795,14 @@ buildLuarocksPackage {
 neotest = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, plenary-nvim }:
 buildLuarocksPackage {
   pname = "neotest";
-  version = "5.6.1-1";
+  version = "5.7.0-1";
   knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/neotest-5.6.1-1.rockspec";
-    sha256 = "08r740v4yxhjxrh3xcbi9974d28h786lkbzff6x0bixdsvnysdwy";
+    url    = "mirror://luarocks/neotest-5.7.0-1.rockspec";
+    sha256 = "1fzvcz54vrcjashjpq6bd10yy0kvzsfz2kk2b7imfqnjgwq44d15";
   }).outPath;
   src = fetchzip {
-    url    = "https://github.com/nvim-neotest/neotest/archive/6d3d22cdad49999ef774ebe1bc250a4994038964.zip";
-    sha256 = "10zac93v1i9iqbwwy4hb1q4wmwxg1nf9dmlywx6qmlkq0scnqg80";
+    url    = "https://github.com/nvim-neotest/neotest/archive/0dccb5ebcf00de245e2060fa17822a9464f5c41a.zip";
+    sha256 = "15zkhdbkgla3ycxzbl6l2wspcx5ig9q58wsp3cnh1biffk4zn102";
   };
 
   disabled = luaOlder "5.1";
@@ -3169,14 +3169,14 @@ buildLuarocksPackage {
 rustaceanvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
   pname = "rustaceanvim";
-  version = "5.19.2-1";
+  version = "5.20.1-1";
   knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/rustaceanvim-5.19.2-1.rockspec";
-    sha256 = "0cza1rp8d5sg4av87s859aa1ncni1i8i2b6lalklwy6q3f6cvf9l";
+    url    = "mirror://luarocks/rustaceanvim-5.20.1-1.rockspec";
+    sha256 = "0g1s35k1wysi59mhnfbzhxhgqd4jm2n250q8cqizpazslhis8gvf";
   }).outPath;
   src = fetchzip {
-    url    = "https://github.com/mrcjkb/rustaceanvim/archive/v5.19.2.zip";
-    sha256 = "1kxapy0vidvgrnrvsdrpwaqq6aa4gb91f5i8wxzwxnl6ag4parxa";
+    url    = "https://github.com/mrcjkb/rustaceanvim/archive/v5.20.1.zip";
+    sha256 = "1zq7p087cg9c9fl7lpcb7pg6kndiywp9cp2ja6jml3q6smb84i4d";
   };
 
   disabled = luaOlder "5.1";

From c5ef1d68ae1e611e50efddf6cedb4fde703efa25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Wed, 25 Dec 2024 09:23:00 +0100
Subject: [PATCH 284/340] x32edit,m32edit: 4.1 -> 4.3

---
 pkgs/applications/audio/midas/deps.nix    | 496 ++++++++++++++++++++++
 pkgs/applications/audio/midas/gen-deps    |   4 +
 pkgs/applications/audio/midas/generic.nix |  70 ++-
 pkgs/applications/audio/midas/m32edit.nix |   4 +-
 pkgs/applications/audio/midas/x32edit.nix |   4 +-
 5 files changed, 551 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/applications/audio/midas/deps.nix
 create mode 100755 pkgs/applications/audio/midas/gen-deps

diff --git a/pkgs/applications/audio/midas/deps.nix b/pkgs/applications/audio/midas/deps.nix
new file mode 100644
index 0000000000000..fc11cf475b059
--- /dev/null
+++ b/pkgs/applications/audio/midas/deps.nix
@@ -0,0 +1,496 @@
+# This is a generated file.  Do not modify!
+# Following are the Debian packages constituting the closure of: libstdc++6 libcurl3-gnutls libfreetype6 libasound2 libx11-6 libxext6
+
+{ fetchurl }:
+
+[
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/g/gcc-10/gcc-10-base_10.2.1-6_amd64.deb";
+      sha256 = "be65535e94f95fbf04b104e8ab36790476f063374430f7dfc6c516cbe2d2cd1e";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/g/gcc-10/libgcc-s1_10.2.1-6_amd64.deb";
+      sha256 = "e478f2709d8474165bb664de42e16950c391f30eaa55bc9b3573281d83a29daf";
+    })
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libx/libxcrypt/libcrypt1_4.4.18-4_amd64.deb";
+      sha256 = "f617952df0c57b4ee039448e3941bccd3f97bfff71e9b0f87ca6dae15cb3f5ef";
+    })
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/g/glibc/libc6_2.31-13+deb11u6_amd64.deb";
+      sha256 = "cb8771d39b068834197b2b75c6b06433685b6e6a23a315064fb7cb5ab80cc235";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/g/gcc-10/libstdc++6_10.2.1-6_amd64.deb";
+      sha256 = "5c155c58935870bf3b4bfe769116841c0d286a74f59eccfd5645693ac23f06b1";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/b/brotli/libbrotli1_1.0.9-2+b2_amd64.deb";
+      sha256 = "65ca7d8b03e9dac09c5d544a89dd52d1aeb74f6a19583d32e4ff5f0c77624c24";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/g/gmp/libgmp10_6.2.1+dfsg-1+deb11u1_amd64.deb";
+      sha256 = "fc117ccb084a98d25021f7e01e4dfedd414fa2118fdd1e27d2d801d7248aebbc";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/n/nettle/libnettle8_3.7.3-1_amd64.deb";
+      sha256 = "e4f8ec31ed14518b241eb7b423ad5ed3f4a4e8ac50aae72c9fd475c569582764";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/n/nettle/libhogweed6_3.7.3-1_amd64.deb";
+      sha256 = "6aab2e892cdb2dfba45707601bc6c3b19aa228f70ae5841017f14c3b0ca3d22f";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libu/libunistring/libunistring2_0.9.10-4_amd64.deb";
+      sha256 = "654433ad02d3a8b05c1683c6c29a224500bf343039c34dcec4e5e9515345e3d4";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libi/libidn2/libidn2-0_2.3.0-5_amd64.deb";
+      sha256 = "cb80cd769171537bafbb4a16c12ec427065795946b3415781bc9792e92d60b59";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libf/libffi/libffi7_3.3-6_amd64.deb";
+      sha256 = "30ca89bfddae5fa6e0a2a044f22b6e50cd17c4bc6bc850c579819aeab7101f0f";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/p/p11-kit/libp11-kit0_0.23.22-1_amd64.deb";
+      sha256 = "bfef5f31ee1c730e56e16bb62cc5ff8372185106c75bf1ed1756c96703019457";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libt/libtasn1-6/libtasn1-6_4.16.0-2+deb11u1_amd64.deb";
+      sha256 = "6ebb579337cdc9d6201237a66578425a7a221db622524354e27c0c1bcb6dd7ca";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/g/gnutls28/libgnutls30_3.7.1-5+deb11u3_amd64.deb";
+      sha256 = "d7d504ff9d45a292a4af549014c9471b526a0dbc898ff9a606fe24e0319a2d8e";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/e/e2fsprogs/libcom-err2_1.46.2-2_amd64.deb";
+      sha256 = "d478f132871f4ab8352d39becf936d0ad74db905398bf98465d8fe3da6fb1126";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/k/krb5/libkrb5support0_1.18.3-6+deb11u4_amd64.deb";
+      sha256 = "da8d022e3dd7f4a72ea32e328b3ac382dbe6bdb91606c5738fe17a29f8ea8080";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/k/krb5/libk5crypto3_1.18.3-6+deb11u4_amd64.deb";
+      sha256 = "f635062bcbfe2eef5a83fcba7d1a8ae343fc7c779cae88b11cae90fd6845a744";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/k/keyutils/libkeyutils1_1.6.1-2_amd64.deb";
+      sha256 = "f01060b434d8cad3c58d5811d2082389f11b3db8152657d6c22c1d298953f2a5";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/a/acl/libacl1_2.2.53-10_amd64.deb";
+      sha256 = "aa18d721be8aea50fbdb32cd9a319cb18a3f111ea6ad17399aa4ba9324c8e26a";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/p/pcre2/libpcre2-8-0_10.36-2+deb11u1_amd64.deb";
+      sha256 = "ee192c8d22624eb9d0a2ae95056bad7fb371e5abc17e23e16b1de3ddb17a1064";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libs/libselinux/libselinux1_3.1-3_amd64.deb";
+      sha256 = "339f5ede10500c16dd7192d73169c31c4b27ab12130347275f23044ec8c7d897";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/t/tar/tar_1.34+dfsg-1_amd64.deb";
+      sha256 = "bd8e963c6edcf1c806df97cd73560794c347aa94b9aaaf3b88eea585bb2d2f3c";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/b/bzip2/libbz2-1.0_1.0.8-4_amd64.deb";
+      sha256 = "16e27c3ebd97981e70db3733f899963362748f178a62644df69d1f247e741379";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/x/xz-utils/liblzma5_5.2.5-2.1~deb11u1_amd64.deb";
+      sha256 = "1c79a02415ca5ee7234ac60502fb33ee94fa70b02d1c329a6a14178f8329c435";
+      name = "liblzma5_5.2.5-2.1deb11u1_amd64.deb";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/z/zlib/zlib1g_1.2.11.dfsg-2+deb11u2_amd64.deb";
+      sha256 = "03d2ab2174af76df6f517b854b77460fbdafc3dac0dca979317da67538159a3e";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/d/dpkg/dpkg_1.20.13_amd64.deb";
+      sha256 = "eb2b7ba3a3c4e905a380045a2d1cd219d2d45755aba5966d6c804b79400beb05";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/p/perl/perl-base_5.32.1-4+deb11u2_amd64.deb";
+      sha256 = "018a3e48e58cbc478d3a4365090fb1daa151769f90f9b45984ec9d056ef96adc";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/d/debconf/debconf_1.5.77_all.deb";
+      sha256 = "d9ee4dff77aaad12674eed3ccefdcccd332424c9e2ac2ac00a37a1e06c84ab70";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/o/openssl/libssl1.1_1.1.1w-0+deb11u1_amd64.deb";
+      sha256 = "aadf8b4b197335645b230c2839b4517aa444fd2e8f434e5438c48a18857988f7";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/k/krb5/libkrb5-3_1.18.3-6+deb11u4_amd64.deb";
+      sha256 = "b785fa324cf27e6bf7f97fc0279470e6ce8a8cc54f8ccc6c9b24c8111ba5c952";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/k/krb5/libgssapi-krb5-2_1.18.3-6+deb11u4_amd64.deb";
+      sha256 = "037cc4bb34a6cd0d7a6e83bdcae6d68e0d0f9218eb7dedafc8099c8c0be491a2";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/d/db5.3/libdb5.3_5.3.28+dfsg1-0.8_amd64.deb";
+      sha256 = "00b9e63e287f45300d4a4f59b6b88e25918443c932ae3e5845d5761ae193c530";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/c/cyrus-sasl2/libsasl2-modules-db_2.1.27+dfsg-2.1+deb11u1_amd64.deb";
+      sha256 = "122bf3de4ca0ec873bc35bdde1f21ec9d91ace4f5245c3b1240e077f866e1ae9";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.27+dfsg-2.1+deb11u1_amd64.deb";
+      sha256 = "2e86ab7a3329aad4b7350a9b067fe8f80b680302f2f82d94f73f9bf075404460";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/o/openldap/libldap-2.4-2_2.4.57+dfsg-3+deb11u1_amd64.deb";
+      sha256 = "3d79ee84c42c1d1b58a6e0d7debc7e3c8444147b84412b8248a7789809bc3163";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/n/nghttp2/libnghttp2-14_1.43.0-1_amd64.deb";
+      sha256 = "a1a8aae24ced43025c94a9cb0c0eabfb3fc070785de9ee51c9a3a4fe86f0d11e";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libp/libpsl/libpsl5_0.21.0-1.2_amd64.deb";
+      sha256 = "d716f5b4346ec85bb728f4530abeb1da4a79f696c72d7f774c59ba127c202fa7";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/r/rtmpdump/librtmp1_2.4+20151223.gitfa8646d.1-2+b2_amd64.deb";
+      sha256 = "e1f69020dc2c466e421ec6a58406b643be8b5c382abf0f8989011c1d3df91c87";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libg/libgpg-error/libgpg-error0_1.38-2_amd64.deb";
+      sha256 = "16a507fb20cc58b5a524a0dc254a9cb1df02e1ce758a2d8abde0bc4a3c9b7c26";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libg/libgcrypt20/libgcrypt20_1.8.7-6_amd64.deb";
+      sha256 = "7a2e0eef8e0c37f03f3a5fcf7102a2e3dc70ba987f696ab71949f9abf36f35ef";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libs/libssh2/libssh2-1_1.9.0-2_amd64.deb";
+      sha256 = "f730fe45716a206003597819ececeeffe0fff754bdbbd0105425a177aa20a2de";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/c/curl/libcurl3-gnutls_7.74.0-1.3+deb11u9_amd64.deb";
+      sha256 = "bfaffacec95713a1486b20f24219952a0d56db041d43ece1768b732d859be885";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libp/libpng1.6/libpng16-16_1.6.37-3_amd64.deb";
+      sha256 = "7d5336af395d1f658d0e66d74d0e1f4c632028750e7e04314d1a650e0317f3d6";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/f/freetype/libfreetype6_2.10.4+dfsg-1+deb11u1_amd64.deb";
+      sha256 = "b21cfdd12adf6cac4af320c2485fb62a8a5edc6f9768bc2288fd686f4fa6dfdf";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/a/alsa-lib/libasound2-data_1.2.4-1.1_all.deb";
+      sha256 = "76211f5f201ad1069b95d047863e0c1b51d8400c874b59e00f24f31f972b4036";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/a/alsa-lib/libasound2_1.2.4-1.1_amd64.deb";
+      sha256 = "d8c9b5182768db2a7c5c73f1eed0b1be1431ae4f41084d502b325d06d5b0f648";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libx/libxau/libxau6_1.0.9-1_amd64.deb";
+      sha256 = "679db1c4579ec7c61079adeaae8528adeb2e4bf5465baa6c56233b995d714750";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libm/libmd/libmd0_1.0.3-3_amd64.deb";
+      sha256 = "9e425b3c128b69126d95e61998e1b5ef74e862dd1fc953d91eebcc315aea62ea";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libb/libbsd/libbsd0_0.11.3-1+deb11u1_amd64.deb";
+      sha256 = "6ec5a08a4bb32c0dc316617f4bbefa8654c472d1cd4412ab8995f3955491f4a8";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libx/libxdmcp/libxdmcp6_1.1.2-3_amd64.deb";
+      sha256 = "ecb8536f5fb34543b55bb9dc5f5b14c9dbb4150a7bddb3f2287b7cab6e9d25ef";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libx/libxcb/libxcb1_1.14-3_amd64.deb";
+      sha256 = "d5e0f047ed766f45eb7473947b70f9e8fddbe45ef22ecfd92ab712c0671a93ac";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libx/libx11/libx11-data_1.7.2-1+deb11u1_all.deb";
+      sha256 = "457db358e1d77cfe4f8af5e6efa7a1b262848b65192589932c38a589a4b6976b";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libx/libx11/libx11-6_1.7.2-1+deb11u1_amd64.deb";
+      sha256 = "23385ffd6d2e3e507a7532fb24dc48176dada9c861e5d43853e18179a08bf861";
+    })
+
+  ]
+
+  [
+
+    (fetchurl {
+      url = "https://snapshot.debian.org/archive/debian/20231124T031419Z/pool/main/libx/libxext/libxext6_1.3.3-1.1_amd64.deb";
+      sha256 = "dc1ff8a2b60c7dd3c8917ffb9aa65ee6cda52648d9150608683c47319d1c0c8c";
+    })
+
+  ]
+
+]
diff --git a/pkgs/applications/audio/midas/gen-deps b/pkgs/applications/audio/midas/gen-deps
new file mode 100755
index 0000000000000..f3432e1b930b1
--- /dev/null
+++ b/pkgs/applications/audio/midas/gen-deps
@@ -0,0 +1,4 @@
+#!/bin/sh -eu
+cd "$(dirname "$0")"
+deps=$(nix-build --no-link -A x32edit.deps ../../../..)
+cat "$deps" > deps.nix
diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix
index 1f0847881b6fa..a17b978362366 100644
--- a/pkgs/applications/audio/midas/generic.nix
+++ b/pkgs/applications/audio/midas/generic.nix
@@ -2,25 +2,36 @@
   stdenv,
   fetchurl,
   lib,
-  libX11,
-  libXext,
-  alsa-lib,
-  freetype,
   brand,
   type,
   version,
   homepage,
   url,
-  sha256,
+  hash,
+  runCommand,
+  dpkg,
+  vmTools,
+  runtimeShell,
+  bubblewrap,
   ...
 }:
+let
+  debian =
+    let
+      debs = lib.flatten (import ./deps.nix { inherit fetchurl; });
+    in
+    runCommand "x32edit-debian" { nativeBuildInputs = [ dpkg ]; } (
+      lib.concatMapStringsSep "\n" (deb: ''
+        dpkg-deb -x ${deb} $out
+      '') debs
+    );
+in
 stdenv.mkDerivation rec {
   pname = "${lib.toLower type}-edit";
   inherit version;
 
   src = fetchurl {
-    inherit url;
-    inherit sha256;
+    inherit url hash;
   };
 
   sourceRoot = ".";
@@ -29,25 +40,38 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp ${type}-Edit $out/bin/${pname}
+    cp ${type}-Edit $out/bin/.${pname}
+
+    cat >$out/bin/${pname} <<EOF
+    #!${runtimeShell} -eu
+    exec ${lib.getExe bubblewrap} \
+      --dev-bind / / \
+      --ro-bind "${debian}/lib" /lib \
+      --ro-bind "${debian}/lib64" /lib64 \
+      --tmpfs /usr \
+      --ro-bind "${debian}/usr/lib" /usr/lib \
+      $out/bin/.${pname}
+    EOF
+    chmod 755 $out/bin/${pname}
   '';
-  preFixup =
+
+  passthru.deps =
     let
-      # we prepare our library path in the let clause to avoid it become part of the input of mkDerivation
-      libPath = lib.makeLibraryPath [
-        libX11 # libX11.so.6
-        libXext # libXext.so.6
-        alsa-lib # libasound.so.2
-        freetype # libfreetype.so.6
-        (lib.getLib stdenv.cc.cc) # libstdc++.so.6
-      ];
+      distro = vmTools.debDistros.debian11x86_64;
     in
-    ''
-      patchelf \
-        --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "${libPath}" \
-        $out/bin/${pname}
-    '';
+    vmTools.debClosureGenerator {
+      name = "x32edit-dependencies";
+      inherit (distro) urlPrefix;
+      packagesLists = [ distro.packagesList ];
+      packages = [
+        "libstdc++6"
+        "libcurl3-gnutls"
+        "libfreetype6"
+        "libasound2"
+        "libx11-6"
+        "libxext6"
+      ];
+    };
 
   meta = with lib; {
     inherit homepage;
diff --git a/pkgs/applications/audio/midas/m32edit.nix b/pkgs/applications/audio/midas/m32edit.nix
index 41f30235f68e8..a2f06f492504a 100644
--- a/pkgs/applications/audio/midas/m32edit.nix
+++ b/pkgs/applications/audio/midas/m32edit.nix
@@ -5,9 +5,9 @@ callPackage ./generic.nix (
   // rec {
     brand = "Midas";
     type = "M32";
-    version = "4.1";
+    version = "4.3";
     url = "https://mediadl.musictribe.com/download/software/midas_${type}/${type}-Edit_LINUX_${version}.tar.gz";
-    sha256 = "0aqhdrxqa49liyvbbw5x32kwk0h1spzvmizmdxklrfs64vvr9bvh";
+    hash = "sha256-1+7xGmSqIPn5NGOnk2VvPJxkI2y1em/kjeldXU0M35w=";
     homepage = "https://midasconsoles.com/midas/product?modelCode=P0B3I";
   }
 )
diff --git a/pkgs/applications/audio/midas/x32edit.nix b/pkgs/applications/audio/midas/x32edit.nix
index c425665df7a0f..3ea20c0ec788e 100644
--- a/pkgs/applications/audio/midas/x32edit.nix
+++ b/pkgs/applications/audio/midas/x32edit.nix
@@ -5,9 +5,9 @@ callPackage ./generic.nix (
   // rec {
     brand = "Behringer";
     type = "X32";
-    version = "4.1";
+    version = "4.3";
     url = "https://mediadl.musictribe.com/download/software/behringer/${type}/${type}-Edit_LINUX_${version}.tar.gz";
-    sha256 = "0zsw7qfmcci87skkpq8vx5zxk35phn8y4byispvki9ascifnnb33";
+    hash = "sha256-iVBBW6qVtEGlNXqKRZxObB9WfbOEjXMA1Nsp1CTFOH4=";
     homepage = "https://www.behringer.com/behringer/product?modelCode=P0ASF";
   }
 )

From 5059dc64cc8ab4a93e3d5cc9aa3af2b5f0d239c3 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 28 Dec 2024 09:28:22 -0600
Subject: [PATCH 285/340] vimPlugins: update on 2024-12-28

---
 .../editors/vim/plugins/generated.nix         | 522 +++++++++---------
 .../editors/vim/plugins/overrides.nix         |   9 +-
 2 files changed, 266 insertions(+), 265 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index e3646940ac970..62f789bf55c13 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -329,12 +329,12 @@ final: prev:
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "2024-12-23";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "545d8814f624fb5239c4691fa0914549540e6f53";
-      sha256 = "0b25wc37c3biji0mvwwh1s0mlk1i09ajjfhr2f9sjs0l04v6mcyc";
+      rev = "562681847dd904485caddd42395db2bb9d6e694a";
+      sha256 = "13yg7zm010hckjhsnja74m6ys1lnrampl52yzzysnhs4v462z2lk";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
   };
@@ -775,12 +775,12 @@ final: prev:
 
   astrotheme = buildVimPlugin {
     pname = "astrotheme";
-    version = "2024-12-23";
+    version = "2024-12-24";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astrotheme";
-      rev = "40a07b2d257705be2020feb66f14fe519d1e7dbe";
-      sha256 = "0nc01ir0abyjrk1ssiw4bqd33ygiwrakb7zmym05x6yg70nxsgc4";
+      rev = "7aa05c0ada35ff127f151f70b0ba2d042953eeb4";
+      sha256 = "1d44wsvplrb5n8llpdjrsb777r8anhmzmkmiyqxjxzpx9ajc1qbc";
     };
     meta.homepage = "https://github.com/AstroNvim/astrotheme/";
   };
@@ -1280,12 +1280,12 @@ final: prev:
 
   blink-compat = buildVimPlugin {
     pname = "blink.compat";
-    version = "2024-12-22";
+    version = "2024-12-25";
     src = fetchFromGitHub {
       owner = "Saghen";
       repo = "blink.compat";
-      rev = "74b251a1e9478c4fa6d7c6bc2921d7124e6f6cbb";
-      sha256 = "0rmhkrz94i1ax8ll8jlyggwlgy69j3xw11vh0bd1jv65xpwf3fj6";
+      rev = "5ca8848c8cc32abdc980e5db4f0eb7bb8fbf84dc";
+      sha256 = "0g53dkcsl2y77yvsnhsdw523i4jfl495n9ynlsppk8wx58miwm5l";
     };
     meta.homepage = "https://github.com/Saghen/blink.compat/";
   };
@@ -1472,12 +1472,12 @@ final: prev:
 
   catppuccin-nvim = buildVimPlugin {
     pname = "catppuccin-nvim";
-    version = "2024-11-24";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "nvim";
-      rev = "faf15ab0201b564b6368ffa47b56feefc92ce3f4";
-      sha256 = "0b5bygd3zx1pazq6mxq2kg5xrp9azbx16ky9n3riz4wq17kk121s";
+      rev = "f67b886d65a029f12ffa298701fb8f1efd89295d";
+      sha256 = "0fwgsvlxvzz5r8jfmj1fp97cqv9b9h2f37fn4nhmim5lm6d0n14p";
     };
     meta.homepage = "https://github.com/catppuccin/nvim/";
   };
@@ -1724,12 +1724,12 @@ final: prev:
 
   cmp-ai = buildVimPlugin {
     pname = "cmp-ai";
-    version = "2024-12-09";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "tzachar";
       repo = "cmp-ai";
-      rev = "8e4ac92c83d773519bb5570fe2a5f47d8dc9c994";
-      sha256 = "0yfbbyibga08f1bj223bjf49g4gzr4ynmnf8jpzapwrjvvdd4qw6";
+      rev = "fd464ecd7d8113e7e8e25275b29a46b14205a708";
+      sha256 = "16bw27rqnp6h5z8y7ilbsqzh7bb83bg6ccsmp9fzbrc4rbyjp6l9";
     };
     meta.homepage = "https://github.com/tzachar/cmp-ai/";
   };
@@ -2407,12 +2407,12 @@ final: prev:
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "2024-11-25";
+    version = "2024-12-24";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "ebe7a08ece39a7ea867cb43497ce83ad722b6f07";
-      sha256 = "1axpvvrnyxg671nirp9q08qd3qpc4p188fjvysq43lr9blzjpb5j";
+      rev = "4cc169449fa6fd69e5f5f0a67bda8fd74837f924";
+      sha256 = "0dwag116y4dykfz3zzgqh8d59s7gc9k9xwvs5ailxi30ws8ii7qz";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
   };
@@ -2455,12 +2455,12 @@ final: prev:
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "2024-12-23";
+    version = "2024-12-24";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      rev = "d20ca206e7092318ffd2d430d98a21aded7c3b4f";
-      sha256 = "1kpvmgim2x89hyrxnkcvhw6bc1sq3gq2w4kmql5m9xmg9ik11ydc";
+      rev = "8529f7a7be99a1cc1ed53edf5d86fdf617036a50";
+      sha256 = "03r69rg7za0dq1gd2igfz9jr8lgknl6y740di7ifsmvnfjg420gy";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
   };
@@ -2707,12 +2707,12 @@ final: prev:
 
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "2024-12-21";
+    version = "2024-12-25";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "339b3e4519ec49312d34fcfa275aa15bfaa67025";
-      sha256 = "10mm48z39kcwnnq2plm9is5v42ss9dsrg2d95k7fkmsip0jgizvv";
+      rev = "9180320205d250429f0f80e073326c674e2a7149";
+      sha256 = "128dby40rlzm6sy9ga0xbb9534rla1nc8k4apjsb8kyir40bgbi7";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/conform.nvim/";
@@ -2996,12 +2996,12 @@ final: prev:
 
   cyberdream-nvim = buildVimPlugin {
     pname = "cyberdream.nvim";
-    version = "2024-12-22";
+    version = "2024-12-28";
     src = fetchFromGitHub {
       owner = "scottmckendry";
       repo = "cyberdream.nvim";
-      rev = "c872aca1268b68a8de98d78bd64951db6d679640";
-      sha256 = "131zijl4faamxmdjs0g0i84lsnjb7wn2dw4qlk2zw3kwxa0nidd3";
+      rev = "e510399867656973bbedcededf6d32f52fa82b57";
+      sha256 = "1vc3h4hmdhsnyv3q3f4pvmf32zkp845k22s2hdyc4ffll5753ih6";
     };
     meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/";
   };
@@ -3128,12 +3128,12 @@ final: prev:
 
   debugprint-nvim = buildVimPlugin {
     pname = "debugprint.nvim";
-    version = "2024-12-17";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "andrewferrier";
       repo = "debugprint.nvim";
-      rev = "29a802d4f2009a825471a9d16571c20b6a2f2944";
-      sha256 = "0kdxfxxn46hpzws0lwhwnnxb3ymy2aj7s01qzp3zlg0n4rnj4x4f";
+      rev = "69c13fc3e6975a4967c870304167b2db0b0cab2a";
+      sha256 = "1hfdy1r16kjd9fxgcgkrgawlsdgj8lrbqgr8y62nqc5pyl6gn1xi";
     };
     meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/";
   };
@@ -3670,12 +3670,12 @@ final: prev:
 
   dropbar-nvim = buildVimPlugin {
     pname = "dropbar.nvim";
-    version = "2024-12-22";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "Bekaboo";
       repo = "dropbar.nvim";
-      rev = "1af54fc328f5c32ff40f5d1370fea3381bf69566";
-      sha256 = "0c7dsj56vxcd6zp0d94yw9l09d5ydlac6pnaryy6r1gmpkbwfl3m";
+      rev = "178658790f100066f17b03efd7e348c019bf3aff";
+      sha256 = "0v4qgb1gr6fxaad65mqbzx0g9bw9641wrnv1pnxpl8f2qgiahxyz";
     };
     meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
   };
@@ -3706,12 +3706,12 @@ final: prev:
 
   edge = buildVimPlugin {
     pname = "edge";
-    version = "2024-11-25";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "edge";
-      rev = "5b5a0683be0d9d8023a874ebf7e230095f4e1bae";
-      sha256 = "074s903avxqn6hl8wch0f1m34jxrdwpnymll4h1zczdaick5x5l9";
+      rev = "12ff979b43e3660053e14cd65101d5928e56f422";
+      sha256 = "13dz3m62xwgk1hl29gl4sslmc8kq55r60iiansp74wpx27y2d66r";
     };
     meta.homepage = "https://github.com/sainnhe/edge/";
   };
@@ -3779,12 +3779,12 @@ final: prev:
 
   elixir-tools-nvim = buildVimPlugin {
     pname = "elixir-tools.nvim";
-    version = "2024-10-02";
+    version = "2024-12-24";
     src = fetchFromGitHub {
       owner = "elixir-tools";
       repo = "elixir-tools.nvim";
-      rev = "b465f6aff50257fa466de3886fc3e7de2dcff0de";
-      sha256 = "0rqdy58fka1x6jg4fa3467ab3y1ln9xq9j5rikjadjm6bshjy0pf";
+      rev = "803fa69dbb457305cff98e3997bed2c4b51aea7c";
+      sha256 = "09fnpj27rynw55hvs8dc860di10m3yj628aghsn3lzm249ar708a";
     };
     meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/";
   };
@@ -3876,12 +3876,12 @@ final: prev:
 
   everforest = buildVimPlugin {
     pname = "everforest";
-    version = "2024-11-25";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "everforest";
-      rev = "44c2659ffb6d26a994346974b4d12e988f43e5e5";
-      sha256 = "00rixmj4vrxv3n8b1bq6ihjcx4rkqd6whw0lp1zj32b35qk1v5bq";
+      rev = "730f9dd8ee698ad166d7abfca5dc06e90d4acf5b";
+      sha256 = "1p1l6cgbj0573ic1xin1rbz3iax74z1v06k1xdiqv3q53q45zs9l";
     };
     meta.homepage = "https://github.com/sainnhe/everforest/";
   };
@@ -4093,12 +4093,12 @@ final: prev:
 
   flatten-nvim = buildVimPlugin {
     pname = "flatten.nvim";
-    version = "2024-12-23";
+    version = "2024-12-25";
     src = fetchFromGitHub {
       owner = "willothy";
       repo = "flatten.nvim";
-      rev = "e049574786a3aa249cec8fd6d9613b06cca123e6";
-      sha256 = "0f6qcz376sggc359b9w9x11cz19rs3ylnsi83zwv79fnaaavw9br";
+      rev = "ab2e1085c731dd296a56e9670218083726337df6";
+      sha256 = "1d3bjh735jlzkzxh13zddz2r7gb76hz0kg9gg0fdf9yvgn2dkpnb";
     };
     meta.homepage = "https://github.com/willothy/flatten.nvim/";
   };
@@ -4165,12 +4165,12 @@ final: prev:
 
   flutter-tools-nvim = buildVimPlugin {
     pname = "flutter-tools.nvim";
-    version = "2024-12-23";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "nvim-flutter";
       repo = "flutter-tools.nvim";
-      rev = "cb09e56b0a2fce36a260c933b766609eb0ed49a4";
-      sha256 = "1fngz613h4v8v0wgldkd6xlpnkazkp2v6398qhmhl8q1icxjn2fx";
+      rev = "54314bcb6856dfd31a500226587c95402122e29f";
+      sha256 = "0yrlm7p55xxv9dm4s999qc6xbpswhk5s0482cgc3ykn78y4z00wn";
     };
     meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/";
   };
@@ -4466,12 +4466,12 @@ final: prev:
 
   git-conflict-nvim = buildVimPlugin {
     pname = "git-conflict.nvim";
-    version = "2024-11-09";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "git-conflict.nvim";
-      rev = "4dc906855751096aaeba2edde7c2cdc7bb881c98";
-      sha256 = "17j8aaf0m8rc93zcnxd34y1g5k0aylhy7s5zgkk39a0sjkafsf3a";
+      rev = "a1badcd070d176172940eb55d9d59029dad1c5a6";
+      sha256 = "05rnwhm1fmg3yb7j2xc9nmw262jc687qxhwabn97qarrk2da0r0a";
     };
     meta.homepage = "https://github.com/akinsho/git-conflict.nvim/";
   };
@@ -4801,12 +4801,12 @@ final: prev:
 
   gruvbox-material = buildVimPlugin {
     pname = "gruvbox-material";
-    version = "2024-12-18";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "gruvbox-material";
-      rev = "b95c102f683d6402f84c8e492d3b0641c2d273e4";
-      sha256 = "13cl2njp5n3ml7qn5v5hhy2cz0a612j78srgg22s0nda1a7fyjm8";
+      rev = "3eb4a739a80f68b8386d13359a005ef45bf9a9eb";
+      sha256 = "0bbv60rkspv60bf4kgdbi7fwxwpwdsi9ka3326l54v32ib88mhkd";
     };
     meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
   };
@@ -5209,12 +5209,12 @@ final: prev:
 
   hydra-nvim = buildVimPlugin {
     pname = "hydra.nvim";
-    version = "2024-09-05";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "nvimtools";
       repo = "hydra.nvim";
-      rev = "7f5341643107d05a8d7d4fdea00b29af28517380";
-      sha256 = "0f9vxv0lxzd4qpikdjinh62vfxg55dm0drcm2ms17igsfjn4myd0";
+      rev = "983852960cd4e4e9a1b272df0bd1447495aae755";
+      sha256 = "1igym59zjdgg0kzrbc1xdykw5k9kfqn34p4gz1sgh9fww72j834j";
     };
     meta.homepage = "https://github.com/nvimtools/hydra.nvim/";
   };
@@ -5281,12 +5281,12 @@ final: prev:
 
   image-nvim = buildNeovimPlugin {
     pname = "image.nvim";
-    version = "2024-12-05";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "3rd";
       repo = "image.nvim";
-      rev = "b3e1af829a56bb038e5f81bf97798a2950064b62";
-      sha256 = "1nd5x8mnxj3d7q7l8khrfcj7mv50sd3h6515slyp4r4sy9k5bna2";
+      rev = "b991fc7f845bc6ab40c6ec00b39750dcd5190010";
+      sha256 = "1jbbm4l71w0cas0aj5d0jsy65chbvf4bdxxllb04i3k6h1zycdja";
     };
     meta.homepage = "https://github.com/3rd/image.nvim/";
   };
@@ -5533,12 +5533,12 @@ final: prev:
 
   jedi-vim = buildVimPlugin {
     pname = "jedi-vim";
-    version = "2024-07-06";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "130ce7fb7910b99b494b0d7ed665e40bfb6663bd";
-      sha256 = "09x0pg9i509p68by29xbfw6ral59vdj7b4dz910zcwxqdnn0kjqz";
+      rev = "344814c214391368674813e3a11143448e73e749";
+      sha256 = "149sm7hshnckap1bwngvy9lypxh8lhsg17ihqwhdrp3k7p8vrgs6";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/davidhalter/jedi-vim/";
@@ -5644,12 +5644,12 @@ final: prev:
 
   kanagawa-nvim = buildVimPlugin {
     pname = "kanagawa.nvim";
-    version = "2024-12-23";
+    version = "2024-12-28";
     src = fetchFromGitHub {
       owner = "rebelot";
       repo = "kanagawa.nvim";
-      rev = "2d54b56242a6f03c74864d118d61afa1acb5918e";
-      sha256 = "0kb4szw2h8qabv6f4n1ky7lshrhq1833f8137n15ifnna998di90";
+      rev = "18ae5771b22d8f913ef541c827a8180b4cb12c8a";
+      sha256 = "0crl8cdlcx8y3fw6q2cmrm2ycr1cp1ly81942q483g2d0iyla5i0";
     };
     meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
   };
@@ -5836,12 +5836,12 @@ final: prev:
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2024-12-21";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "bda928a682b53c904ce89b80fd9b1437eb61344b";
-      sha256 = "1fkqvr69arycldsy3d2nm1581rdp8jsni5c40i3s9kgp3014gxdi";
+      rev = "25530cf7308cac519f424859fea227ce666a5485";
+      sha256 = "0631xrfxdspzjs4bd5qq9909rz3m2dr05s2ygnnhpcd8k02gnf1r";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
   };
@@ -6533,12 +6533,12 @@ final: prev:
 
   mason-lspconfig-nvim = buildVimPlugin {
     pname = "mason-lspconfig.nvim";
-    version = "2024-12-20";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason-lspconfig.nvim";
-      rev = "2daa8921b7afdcfa47419a21ea343c3df6d74fa0";
-      sha256 = "18b29kfy3va8lfnqw7hvkb8whfpxabvy0jldls34aq8gixm4nwwx";
+      rev = "c6c686781f9841d855bf1b926e10aa5e19430a38";
+      sha256 = "0hw9bwgy0xjw685y76msp9zqga1jh2x8zz8vg4rvcmc4ls5q50py";
     };
     meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
   };
@@ -6665,12 +6665,12 @@ final: prev:
 
   melange-nvim = buildVimPlugin {
     pname = "melange-nvim";
-    version = "2024-11-29";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "savq";
       repo = "melange-nvim";
-      rev = "9252c78c7bffd3126b0c9e47e51e0b5211acffb1";
-      sha256 = "1lzp2kx3d55i3ndlv4islqprs4yh7f4i7hrr5z5pikk8wkj5pv95";
+      rev = "2015bfddd43f96d09c4d99a810b61c3c0087f0f5";
+      sha256 = "01g4yyyyziwmvdlir15fw2lbr5scdkckcgmf6p9czxh5ssn7lhmf";
     };
     meta.homepage = "https://github.com/savq/melange-nvim/";
   };
@@ -6689,12 +6689,12 @@ final: prev:
 
   miasma-nvim = buildVimPlugin {
     pname = "miasma.nvim";
-    version = "2024-08-23";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "xero";
       repo = "miasma.nvim";
-      rev = "37818b190e291c75a2d78118dc7dd8d69d311a8c";
-      sha256 = "12ng6y9c9a35gr2ak3fhwgxial53ryhkaspvby30kz31vr6p0a9m";
+      rev = "b50e9ab4f29cbc5d064f75b64acb8383551ad794";
+      sha256 = "0viqbr7azhbw9gs3nszafkafg2nq26ib5wl7a1bnqn0l8k4dvphj";
     };
     meta.homepage = "https://github.com/xero/miasma.nvim/";
   };
@@ -6737,12 +6737,12 @@ final: prev:
 
   mini-align = buildVimPlugin {
     pname = "mini.align";
-    version = "2024-12-08";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.align";
-      rev = "acf1ad6031e49553ed887a2a5e3603211346f1de";
-      sha256 = "07k0f91d1fzy0b7ajf6n3rv8vczkc9l5isqpppd7ch1fyfqcw3cy";
+      rev = "24266345930f2c5bdac0b0fad9cfaba8da96a1d9";
+      sha256 = "17f9xdzm9mjqy3q8k67d271wrpm3bwziipsi7dfapmqz9bkwnka4";
     };
     meta.homepage = "https://github.com/echasnovski/mini.align/";
   };
@@ -6881,12 +6881,12 @@ final: prev:
 
   mini-diff = buildVimPlugin {
     pname = "mini.diff";
-    version = "2024-12-03";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.diff";
-      rev = "5947342c95a9c2e24c659b54bb8ef083da4495ad";
-      sha256 = "0vib7s42zdl4irn9kaznl488l3cvv89vydvq51i2y0i98xpngkii";
+      rev = "00f072250061ef498f91ed226918c9ec31a416a4";
+      sha256 = "1n3rjajwnx5n5iamn49l4h7p23p601jd4m343ri2hmazb7zxc6vm";
     };
     meta.homepage = "https://github.com/echasnovski/mini.diff/";
   };
@@ -6905,12 +6905,12 @@ final: prev:
 
   mini-extra = buildVimPlugin {
     pname = "mini.extra";
-    version = "2024-11-08";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.extra";
-      rev = "098a9dc55b2bdf05a7d6ed018884e0faf94edcbb";
-      sha256 = "0xfxmz59lq03xpf4493nz12km0nbqqg4bnj3nvmq9g9rc0lar85m";
+      rev = "8767dad1fdb2fab20c8f2ffa558024a29bcf95aa";
+      sha256 = "19njfj7286rjdkmqr1mmryyajiqyxy19z88gk4hdxh02hv73r6ib";
     };
     meta.homepage = "https://github.com/echasnovski/mini.extra/";
   };
@@ -7073,12 +7073,12 @@ final: prev:
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2024-12-23";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "2011aff270bcd3e1f3ad088253ace2d574967bed";
-      sha256 = "0q7yiqgalflfkla3q4gddrs762mqsp3msqkzfb3qxhaf35280sck";
+      rev = "2faada1cffce5609d78ac5e81eaf3754e0476758";
+      sha256 = "10sf6adrh47wanq9hjczcb68mylrhs99fbd21mz6b7v63zw0gg2d";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
   };
@@ -7109,12 +7109,12 @@ final: prev:
 
   mini-pick = buildVimPlugin {
     pname = "mini.pick";
-    version = "2024-12-22";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.pick";
-      rev = "42dc6e1c90eacf80b34ea80be267ec8ac93aaf89";
-      sha256 = "029cchl4fy1pilqvrq0mrwx6xx0p9rridykn478vbilyigcsnbbv";
+      rev = "eb8fad053935dd6e4861c7b65b0d3f70785d8f42";
+      sha256 = "07gc7qmsqdps4jzf35785k95avfsf27lja7l8par72lnz57h852a";
     };
     meta.homepage = "https://github.com/echasnovski/mini.pick/";
   };
@@ -7313,12 +7313,12 @@ final: prev:
 
   molten-nvim = buildVimPlugin {
     pname = "molten-nvim";
-    version = "2024-11-14";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "benlubas";
       repo = "molten-nvim";
-      rev = "2f549c823b5564c87edb645bfc039a406c650e40";
-      sha256 = "1gp6y58br1bnp8hvp7kpb7i9kxmhgcr8501fanj0dr66gz69yzj0";
+      rev = "c621baf53459a6c45dfd98dcc11cbba7a7ae9470";
+      sha256 = "170ks2rcd7sv22inf3adbxk7ylr2ap04yg2xnjscx7ndg6m7i1lp";
     };
     meta.homepage = "https://github.com/benlubas/molten-nvim/";
   };
@@ -7637,12 +7637,12 @@ final: prev:
 
   neo-tree-nvim = buildVimPlugin {
     pname = "neo-tree.nvim";
-    version = "2024-12-23";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      rev = "45c75e5f31e3581fb4b4883a81c7d7c4f3578b70";
-      sha256 = "1sn2s0ylp307f18l6faj3j0058mh1qhlvjnwm3yv54jadz9gz1v0";
+      rev = "a9f8943b4c31f8460d25c71e0f463d65e9775f1c";
+      sha256 = "1zhjd322jqmp8cs7z7nwgc3vkbf0as3an64qh5diwv04kdwjg4xm";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
   };
@@ -7661,12 +7661,12 @@ final: prev:
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "2024-12-23";
+    version = "2024-12-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "17a88b82bed71b3e40476ffe61be247e4af15825";
-      sha256 = "0v658vg07mv7y48f5l6q4ip43nhlfmy9srbqj4mpgv98d3y0l7av";
+      rev = "c06c1c42ed37e840a220a661147e177e7227e8f6";
+      sha256 = "0m1ss3wwmwayvfjfzrz2mkkp5fjq9nn38y8iihybiv2xvn7ddj3z";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
   };
@@ -7721,24 +7721,24 @@ final: prev:
 
   neogen = buildVimPlugin {
     pname = "neogen";
-    version = "2024-12-04";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "danymat";
       repo = "neogen";
-      rev = "37dd095892e3f846418c465852f7b21f81d0f46c";
-      sha256 = "14gxckpjb0kibp2flc91kpgpx97s1fdwjq861lm5x4772nl7g3ch";
+      rev = "dd0301bfba1f83a3bc009b5430fce7aa3cee6941";
+      sha256 = "0vh4gf7aalkwgzibz9m5hhd62sygqmfbmkd8wli3i7q3vaginc0k";
     };
     meta.homepage = "https://github.com/danymat/neogen/";
   };
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "2024-12-23";
+    version = "2024-12-24";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "5ec2bf32bc3622f882cd0fcd70ef1b729db32fbd";
-      sha256 = "18vwr3jy1pz9835lzjvl2dqzs8hpn1nc35clh0xjsf49y2q0b58w";
+      rev = "9ea60f79e370d8f4847efc145e53afe4b0613fc1";
+      sha256 = "11rk1mjb8sx5b43qrbpy3qmmxsdk1rs2agxzrpidvnxvrqwjzmh4";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
   };
@@ -7865,12 +7865,12 @@ final: prev:
 
   neotest = buildNeovimPlugin {
     pname = "neotest";
-    version = "2024-10-02";
+    version = "2024-12-28";
     src = fetchFromGitHub {
       owner = "nvim-neotest";
       repo = "neotest";
-      rev = "6d3d22cdad49999ef774ebe1bc250a4994038964";
-      sha256 = "10zac93v1i9iqbwwy4hb1q4wmwxg1nf9dmlywx6qmlkq0scnqg80";
+      rev = "0dccb5ebcf00de245e2060fa17822a9464f5c41a";
+      sha256 = "15zkhdbkgla3ycxzbl6l2wspcx5ig9q58wsp3cnh1biffk4zn102";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest/";
   };
@@ -7914,12 +7914,12 @@ final: prev:
 
   neotest-dotnet = buildVimPlugin {
     pname = "neotest-dotnet";
-    version = "2024-12-03";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "Issafalcon";
       repo = "neotest-dotnet";
-      rev = "14087e68ff208b4fe7ff577f317ec5013148ea85";
-      sha256 = "00bisybd53bfqqh0lifw5v6nciwgkjlhd6l8nyrwpk5adhd30sw7";
+      rev = "5a2fa35c3c6a72cfd3fc6a28b3d1af6e68e6c3a8";
+      sha256 = "0nypib3cpbwvjm1qbl4aclqwns0c0p6lrcbppj0ajii0bsiym0yv";
     };
     meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/";
   };
@@ -7963,12 +7963,12 @@ final: prev:
 
   neotest-golang = buildVimPlugin {
     pname = "neotest-golang";
-    version = "2024-12-19";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "fredrikaverpil";
       repo = "neotest-golang";
-      rev = "722b6116b4c9201a97edb06565ebed797f88441d";
-      sha256 = "0z9wj5gan2503s46x3q89zbbx3rk9p2bvx98ghrc8yz9p1990y8x";
+      rev = "c7ac9ec930329823fb3522bdc0200ebd19ed0aed";
+      sha256 = "0wxaq59fk93x2n7dq6nyfk5frsz1f7yz1q4zbvpam25y6yygicgf";
     };
     meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/";
   };
@@ -8168,12 +8168,12 @@ final: prev:
 
   neotest-zig = buildVimPlugin {
     pname = "neotest-zig";
-    version = "2024-10-24";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "lawrence-laz";
       repo = "neotest-zig";
-      rev = "b0e72626135b703fe186a062f38a47ac739f1cdd";
-      sha256 = "0sjphd6rc99ahlbs5hik905r18casyzfh164d9xj162yq2rchxfl";
+      rev = "c7a1a39626fa90e639fb640b6322739060a2acf3";
+      sha256 = "095jv4m81qpgnak4rzp2y8kd4cwgfx2aw31am9m0nsv8mmp1i5w3";
     };
     meta.homepage = "https://github.com/lawrence-laz/neotest-zig/";
   };
@@ -8348,12 +8348,12 @@ final: prev:
 
   nightfly = buildVimPlugin {
     pname = "nightfly";
-    version = "2024-12-18";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "bluz71";
       repo = "vim-nightfly-colors";
-      rev = "f1176605eb01b38d84e0e9e221c9599bd022dfd4";
-      sha256 = "1z2b5v3015kl46k3cian719p5hz5qf0ga6p7n3s3fwcygy9n50f9";
+      rev = "3fe724c616f5285bafbc762dd1e9830ae1815a1e";
+      sha256 = "0c74xcdpbd5jjzn7wxmrvlwm64mq2b4z4xb8mgdngp55qj1npx90";
     };
     meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/";
   };
@@ -8408,12 +8408,12 @@ final: prev:
 
   nlsp-settings-nvim = buildVimPlugin {
     pname = "nlsp-settings.nvim";
-    version = "2024-12-23";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "3de292aa54844a3fadfa269c37a647855dabf8ae";
-      sha256 = "1wlawa3li3mn4n3wv1qacllkrlsb7c18qh6izd3prvvg3p7cy948";
+      rev = "87bfac8676a2a31fe1fad71b2d20a0a72d79b770";
+      sha256 = "1dppqwwsa2zbr8ngcd5l96lrvsjwygcwj77sy0zlkqi7nvf0adr8";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
   };
@@ -8432,12 +8432,12 @@ final: prev:
 
   no-clown-fiesta-nvim = buildVimPlugin {
     pname = "no-clown-fiesta.nvim";
-    version = "2024-10-29";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "aktersnurra";
       repo = "no-clown-fiesta.nvim";
-      rev = "e8f3c10720d633633fb766b370582eebae8d20f5";
-      sha256 = "0jfg5icmzxsj2alblpnqyg04vhhzxpkvia3lsjmmzjca1d1575a1";
+      rev = "6453c0ca2f31607829457694b4208c1f612fdd61";
+      sha256 = "1hvps3xrgws4mvkkbjkap75wf9knq12p7nic0zba3pkfgr3klwg7";
     };
     meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/";
   };
@@ -8480,12 +8480,12 @@ final: prev:
 
   none-ls-nvim = buildVimPlugin {
     pname = "none-ls.nvim";
-    version = "2024-12-18";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "nvimtools";
       repo = "none-ls.nvim";
-      rev = "40dc2e983560acaea29d6312b33fafba37b0c272";
-      sha256 = "0v69nj7jhfq3an1xbb71i756nznd601f5drjaj9wn9qg4p3s4d67";
+      rev = "6f5473ae9e7feb0b40ca95b8ed92e85b42a3c71b";
+      sha256 = "07w42m520nz891p4wm4ylry32npsf6zya6050wcqpp9ga5lsp3w1";
     };
     meta.homepage = "https://github.com/nvimtools/none-ls.nvim/";
   };
@@ -8600,12 +8600,12 @@ final: prev:
 
   nvchad-ui = buildVimPlugin {
     pname = "nvchad-ui";
-    version = "2024-12-21";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "ui";
-      rev = "d42290b6961c2c96af6bbccbaad375cc3e8fd96e";
-      sha256 = "0d3zj2zmgdawv8w40qh442j18wvkdwrzzr47aj9039d1jh7hpicf";
+      rev = "912f4064e4fab183f860204e385a21c022f1c886";
+      sha256 = "1jvg1qvdlicc444rv4c6yjhxfklkn7pcg36w8w097647pad6sgax";
     };
     meta.homepage = "https://github.com/nvchad/ui/";
   };
@@ -8756,12 +8756,12 @@ final: prev:
 
   nvim-colorizer-lua = buildVimPlugin {
     pname = "nvim-colorizer.lua";
-    version = "2024-12-22";
+    version = "2024-12-28";
     src = fetchFromGitHub {
       owner = "catgoose";
       repo = "nvim-colorizer.lua";
-      rev = "b8ed35bf2c5c350ee84699adb2f797a453d60c5f";
-      sha256 = "1c1lshqhvxmkzwr1rm22dzhbgcv61j6bbrwiwf52sw32ww62ry3l";
+      rev = "8a65c448122fc8fac9c67b2e857b6e830a4afd0b";
+      sha256 = "011i0jrx74siilym2lclbv2wcz04g7v7776qw8zhggdsmvgsrsma";
     };
     meta.homepage = "https://github.com/catgoose/nvim-colorizer.lua/";
   };
@@ -8828,12 +8828,12 @@ final: prev:
 
   nvim-dap = buildVimPlugin {
     pname = "nvim-dap";
-    version = "2024-12-20";
+    version = "2024-12-24";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "a6070b4e9e9a8ff1bc513c3748eff27080b0f44a";
-      sha256 = "17v4n51lda3zy0lbmviy4a5srj05xx5v92hab26748db4cpkj6yn";
+      rev = "665d3569a86395fe0dab85efbdb26d7d2ee57e49";
+      sha256 = "1qssjhppkpknsvikjqyzv67i6gbjzg622scq1ycz4z8ckld73vl1";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
   };
@@ -8900,24 +8900,24 @@ final: prev:
 
   nvim-dap-ui = buildVimPlugin {
     pname = "nvim-dap-ui";
-    version = "2024-10-02";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "rcarriga";
       repo = "nvim-dap-ui";
-      rev = "ffa89839f97bad360e78428d5c740fdad9a0ff02";
-      sha256 = "1zmmmkv1ghjbvjhp3mhzk2xd12d285xbgvsw167imf2ya34ya3lj";
+      rev = "e94d98649dccb6a3884b66aabc2e07beb279e535";
+      sha256 = "06vk5h3z3sp048fnwpy0fdf5q0q41wrnaqbfbaa5vdbpki103hm6";
     };
     meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
   };
 
   nvim-dap-virtual-text = buildVimPlugin {
     pname = "nvim-dap-virtual-text";
-    version = "2024-10-31";
+    version = "2024-12-25";
     src = fetchFromGitHub {
       owner = "theHamsta";
       repo = "nvim-dap-virtual-text";
-      rev = "76d80c3d171224315b61c006502a1e30c213a9ab";
-      sha256 = "0in9x0l2qq4kmcigbh77szihsn4cyz7k7gg5rmrcjpifxm2xwsk1";
+      rev = "df66808cd78b5a97576bbaeee95ed5ca385a9750";
+      sha256 = "0hmkm4d735j9w06g7qpp5w2j6d8hmk696kndylchrvh4wan4kz2s";
     };
     meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
   };
@@ -8996,12 +8996,12 @@ final: prev:
 
   nvim-genghis = buildVimPlugin {
     pname = "nvim-genghis";
-    version = "2024-12-18";
+    version = "2024-12-25";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-genghis";
-      rev = "f0062e8bde0e04c555ca36f515047938c92cd11e";
-      sha256 = "0v1958n1cv5jk015njgw8z52ksi0hhhcl8mfqw7c6zcshl299jsj";
+      rev = "e4df4cf67175b9675e6555ab4e0d549cdd0ccc51";
+      sha256 = "1nlvj54isb9vlwaxb0z87hivqmliv9kskdd28431n9flvhqbzx89";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/";
   };
@@ -9223,12 +9223,12 @@ final: prev:
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2024-12-23";
+    version = "2024-12-28";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "c580f34bc5fdca8aaf737a9ab8a5d775cb940e57";
-      sha256 = "12mgb4kxwagcbdmjfw6vpwz0h5wq0lhkci88i9k1d06ax7dbfiai";
+      rev = "57154fd9a24e76907e3b0bdba4677ef42c88d91c";
+      sha256 = "0nj174fry5yaixh1qpcabx7q62mqcfif6l6s83s3bqnrpv5hxylq";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -9283,12 +9283,12 @@ final: prev:
 
   nvim-metals = buildVimPlugin {
     pname = "nvim-metals";
-    version = "2024-12-16";
+    version = "2024-12-28";
     src = fetchFromGitHub {
       owner = "scalameta";
       repo = "nvim-metals";
-      rev = "abf4a2b7ccdb2fa21ef59b66e50d9b69a746e3ef";
-      sha256 = "0rv34hvl5q1625qpid9wlacila4gpc6w039iksjq7cp8czkds22k";
+      rev = "e6b02c99161b43c67cfe1d6e5f9a9b9a0bb4701c";
+      sha256 = "10zyg59klx9ynqjnkmn9hhp27l9f4vzqibj8xqrnxfdrgryppm8v";
     };
     meta.homepage = "https://github.com/scalameta/nvim-metals/";
   };
@@ -9367,12 +9367,12 @@ final: prev:
 
   nvim-notify = buildVimPlugin {
     pname = "nvim-notify";
-    version = "2024-09-22";
+    version = "2024-12-28";
     src = fetchFromGitHub {
       owner = "rcarriga";
       repo = "nvim-notify";
-      rev = "fbef5d32be8466dd76544a257d3f3dce20082a07";
-      sha256 = "0wbsib27kgrk632c094ivjbc8rw51kbalq9c8j576p78k93wipj9";
+      rev = "1e99f4f9534ecf3b84eb7ef54a8d460230e78442";
+      sha256 = "1l9bjhah4lznm4l0hy8cxip86yxiyzn39i3lnpvjw7z05vigihvh";
     };
     meta.homepage = "https://github.com/rcarriga/nvim-notify/";
   };
@@ -9403,12 +9403,12 @@ final: prev:
 
   nvim-paredit = buildVimPlugin {
     pname = "nvim-paredit";
-    version = "2024-10-24";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "julienvincent";
       repo = "nvim-paredit";
-      rev = "0fadfa5cb14c4a2a8fc3e8fbd3cb72c7d5e16eda";
-      sha256 = "1b2g16j7ijmddhx910m8azdvf9hqirffz09mslh911jqfrrqi8na";
+      rev = "6286b010975703a04c51715ff1a16e4fab5278b1";
+      sha256 = "1qr4gcj7ypyh2665bwmn20smv856sihzs30miz4s45nhkvhnl8xs";
     };
     meta.homepage = "https://github.com/julienvincent/nvim-paredit/";
   };
@@ -9475,24 +9475,24 @@ final: prev:
 
   nvim-rip-substitute = buildVimPlugin {
     pname = "nvim-rip-substitute";
-    version = "2024-12-17";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-rip-substitute";
-      rev = "a037e1a81817ad79494e0ced307325f98ad37c06";
-      sha256 = "1gai0jhscw2xblx39jprwgdhp5d728nbja7j4qx8mrmrfk1fmb7f";
+      rev = "95cc63c78657f3871292a133af6fd673ed0aa854";
+      sha256 = "0hyn6wjqxjsnbfnqr5xxc9k4a4f61l7aih6vd2kx1cdzq3aaycan";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/";
   };
 
   nvim-scissors = buildVimPlugin {
     pname = "nvim-scissors";
-    version = "2024-12-21";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-scissors";
-      rev = "52e92bfc15f1572b8e9cc6e5dad68891bb5732c7";
-      sha256 = "0yja2drr88kli17r9nx5nkbkr7hza0hr67jcrcpd2dzvqg6j663c";
+      rev = "682f8c9ace596377dbedb3c0cb38a844ea4bd526";
+      sha256 = "16533gyklajqbclx43b065km6d6cy3ndl6v69nzwwx8zw01gi5w6";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/";
   };
@@ -9547,12 +9547,12 @@ final: prev:
 
   nvim-snippy = buildVimPlugin {
     pname = "nvim-snippy";
-    version = "2024-12-20";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "dcampos";
       repo = "nvim-snippy";
-      rev = "becb4b94929207e61ae897417f0e957cd2ea3f1f";
-      sha256 = "0gzqnpjawjpbplgbsjik8vkd1mqrqxjw0g5q0c1mlsg3alc071ha";
+      rev = "3bb2d09e8246e1da2d2ee90962ab9b4f69327dbd";
+      sha256 = "1zgvcvjwvxc92w47yslv68isb2zxgmala17z61bl83fx5khyg24b";
     };
     meta.homepage = "https://github.com/dcampos/nvim-snippy/";
   };
@@ -9583,12 +9583,12 @@ final: prev:
 
   nvim-spider = buildVimPlugin {
     pname = "nvim-spider";
-    version = "2024-12-17";
+    version = "2024-12-25";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-spider";
-      rev = "c61aca1d9541e1d14083e1e23e20c01c53c98668";
-      sha256 = "0vnccv7zvh96nbn01l33nhdsl1fcwxjl21kp1r0fnz7idwd0yrl9";
+      rev = "4055f3c82ec3e712b83d8149cbc5489e442b826e";
+      sha256 = "134nq8wn92pjkl4syqlszk691sf34p7bn541wki5vqycbnblw2gw";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
   };
@@ -9655,12 +9655,12 @@ final: prev:
 
   nvim-treesitter = buildVimPlugin {
     pname = "nvim-treesitter";
-    version = "2024-12-23";
+    version = "2024-12-28";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "b4897f5a8453e7efeafb21ff5b2bbdc2e3faf1bd";
-      sha256 = "1qcwqc103qly78gsymz6qj1g1y3kdxf6gafhdpr2rp7bmdjd73yc";
+      rev = "5d18ef22dc63624e90aa7b6dbc17f2c3856ae716";
+      sha256 = "1cf672phpy24743xg553na6pkfvyl0ngi1ww862x4gzgzyzlgqh7";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -9787,12 +9787,12 @@ final: prev:
 
   nvim-ufo = buildVimPlugin {
     pname = "nvim-ufo";
-    version = "2024-12-18";
+    version = "2024-12-25";
     src = fetchFromGitHub {
       owner = "kevinhwang91";
       repo = "nvim-ufo";
-      rev = "270ca542dae992ffe40274718c63645217ebc8bf";
-      sha256 = "1rw5mj9yfmmyfhdn2ac1zq5vys027sbj8dfwlq42y9z250gh30nc";
+      rev = "32cb247b893a384f1888b9cd737264159ecf183c";
+      sha256 = "0p2f5p1nky56m666lbl8g111pf6h4piv8a29z86kdhm9hadrzp3s";
     };
     meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/";
   };
@@ -9811,24 +9811,24 @@ final: prev:
 
   nvim-various-textobjs = buildVimPlugin {
     pname = "nvim-various-textobjs";
-    version = "2024-12-17";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-various-textobjs";
-      rev = "157b5d7f0eeba38be01d940bfb1449eb90b4eac9";
-      sha256 = "1amw6mq95x4d8aiycw5xg4cqfd5ixj31xg9fxmxny7dhfl8rd4zc";
+      rev = "d122145ae2b71aa7d7e1402ae5bd4a234a9e2f92";
+      sha256 = "1lv5r8y4aixyxgc2080wsl51037fal7409bndwqwgnhlkqzqsf9n";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/";
   };
 
   nvim-web-devicons = buildVimPlugin {
     pname = "nvim-web-devicons";
-    version = "2024-12-22";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-web-devicons";
-      rev = "15c7d0f616ebf88960ce5c4221828f62789d36d9";
-      sha256 = "1av74m2jyp23vj17s8lhwcwcsfdjmi9nh728hknsv7zgw5yjz11a";
+      rev = "63f552a7f59badc6e6b6d22e603150f0d5abebb7";
+      sha256 = "04yr85zz9b04lgxl9gfda52l0p82a1lc891s921mll3bx48i1xb2";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
   };
@@ -9931,12 +9931,12 @@ final: prev:
 
   nvzone-volt = buildVimPlugin {
     pname = "nvzone-volt";
-    version = "2024-12-14";
+    version = "2024-12-25";
     src = fetchFromGitHub {
       owner = "nvzone";
       repo = "volt";
-      rev = "0cdfa1dfbbfc8fda340054915991fda188db8d8e";
-      sha256 = "0rfagy7mqf2hvcic8zs80na437swhm3fdw8if56iaym4gbm0xipy";
+      rev = "3f9abc92d7eda77c16ef540a86764d8a499137eb";
+      sha256 = "0zrfi86j5p1zvmjzpmf0b9hnzwhxm2v3iwq3gvcsdqgb15886g8k";
     };
     meta.homepage = "https://github.com/nvzone/volt/";
   };
@@ -9979,12 +9979,12 @@ final: prev:
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "2024-12-19";
+    version = "2024-12-28";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "cb6a548f0ce181992f045ca50a71e634e37da024";
-      sha256 = "0ypanqmalndqhgi0zrrfrf7vransvap88lc8ap050lqf7c3a9azq";
+      rev = "b099b0ade680d6bba14828319627276a8334d8de";
+      sha256 = "1r77h3kda80v9q4zlbh3gbjpdjhpfaij1q363llb12dqbpf5pcbd";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
   };
@@ -10100,12 +10100,12 @@ final: prev:
 
   onedarkpro-nvim = buildVimPlugin {
     pname = "onedarkpro.nvim";
-    version = "2024-12-11";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "onedarkpro.nvim";
-      rev = "e9b44b946bb7760f8125e3bfc648deebb9328e52";
-      sha256 = "08lcj8v3zim3qmak0llxni2pwkc65bnisvvwp5p7mixlyqmi2gga";
+      rev = "3c25f33c6440ffae2329ed6f473f41c73752d038";
+      sha256 = "0q292bhbvciwxp1fr76sfgi83g76zjq127lys52p884qzfrd8y8v";
     };
     meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
   };
@@ -10208,24 +10208,24 @@ final: prev:
 
   otter-nvim = buildVimPlugin {
     pname = "otter.nvim";
-    version = "2024-12-17";
+    version = "2024-12-25";
     src = fetchFromGitHub {
       owner = "jmbuhr";
       repo = "otter.nvim";
-      rev = "7edd39c920f7a28ac711a7c658a7cfdfb804bc82";
-      sha256 = "0njc4q1b9xkj7il01j2j2gfjjl3rgnn9ax4dkixj15yh160zs1li";
+      rev = "e8c662e1aefa8b483cfba6e00729a39a363dcecc";
+      sha256 = "0csl3ddm8782fw836adj4fp4h3fg2ygv7ik632llk55mp1q4dw1l";
     };
     meta.homepage = "https://github.com/jmbuhr/otter.nvim/";
   };
 
   outline-nvim = buildVimPlugin {
     pname = "outline.nvim";
-    version = "2024-09-21";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "hedyhli";
       repo = "outline.nvim";
-      rev = "6c44527837ff7ac1cd054dc365a721e881020a2e";
-      sha256 = "1nxcmdq04qqs57dy6wfjl81hkwcylvkpiqfx2k1176a86p8lldn3";
+      rev = "f656ef12a590287cce57f6ee3d46a0604dfb3c14";
+      sha256 = "1jlnsk5p1hk6wjsgfjwx94kk3g2hrmb3i5pwn8larfcmzn124q9v";
     };
     meta.homepage = "https://github.com/hedyhli/outline.nvim/";
   };
@@ -10751,12 +10751,12 @@ final: prev:
 
   quicker-nvim = buildVimPlugin {
     pname = "quicker.nvim";
-    version = "2024-11-14";
+    version = "2024-12-25";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "quicker.nvim";
-      rev = "049d66534d3de5920663ee1b8dd0096d70f55a67";
-      sha256 = "052bsqgjk3gh80vqpisv972d3snlf4hgmxag3hkhca5mp7zcpp2x";
+      rev = "87dae0f25733b7bd79b600a70ca38040db68ec0b";
+      sha256 = "10fkkp6ih3pkf95cwyr8xjzd6v8548dwgpp80hnhsylqfczd8san";
     };
     meta.homepage = "https://github.com/stevearc/quicker.nvim/";
   };
@@ -10966,12 +10966,12 @@ final: prev:
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "2024-12-13";
+    version = "2024-12-24";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "0022a579ac7355966be5ade77699b88c76b6a549";
-      sha256 = "1yz61sbldqrnfj5wd2q77vz0hybl8x1h2zs9krkhp7p963d4a22f";
+      rev = "ba6253d9673daf0cf394b87b2c2ecb7630944c7d";
+      sha256 = "0nq0gv9s5kldhpgmg03kzkwmvxr8ql72qrbbzkzggiy9s1zya3ag";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
   };
@@ -10990,12 +10990,12 @@ final: prev:
 
   resession-nvim = buildVimPlugin {
     pname = "resession.nvim";
-    version = "2024-12-08";
+    version = "2024-12-24";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "resession.nvim";
-      rev = "18f507c42e213918ec28bf6ed9a5ec33990c0e95";
-      sha256 = "0a7jqcyqf8jvrzx3ldp8zyx96wnsrw60c53cmfsbvh57l2vw75cn";
+      rev = "271a6fd7afa90142be59fca3a5c3b9865e40e6b9";
+      sha256 = "0l2zbfpsb62f4q3k8sxwiyj6sqwglpafjx3mzb48ncc0xbx0lhhg";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/resession.nvim/";
@@ -11521,12 +11521,12 @@ final: prev:
 
   sonokai = buildVimPlugin {
     pname = "sonokai";
-    version = "2024-11-25";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "sonokai";
-      rev = "fd42b20963c34dfc1744ac31f6a6efe78f4edad2";
-      sha256 = "0yrw2fzyqijmpsdxbg9w2x8apjmc0x87agr3zfzzd0qn56sz2g86";
+      rev = "1d7ca954792dfddd9e73c53563d85adaeb8c8437";
+      sha256 = "1m2iwil6vi2b5qbrhrhm68vqki1q7wlrm7gj5ah344hx7w05w22s";
     };
     meta.homepage = "https://github.com/sainnhe/sonokai/";
   };
@@ -11653,12 +11653,12 @@ final: prev:
 
   splitjoin-vim = buildVimPlugin {
     pname = "splitjoin.vim";
-    version = "2024-12-23";
+    version = "2024-12-24";
     src = fetchFromGitHub {
       owner = "AndrewRadev";
       repo = "splitjoin.vim";
-      rev = "13856c6bd77b1eeefd9ceb733501fed75393dd78";
-      sha256 = "1ilfqm2zir02100c4ik25gd6yg3my08w7irw2550nqchy6wv6qkv";
+      rev = "f7a688c6b444dd159919da38c53e9fa64f109f18";
+      sha256 = "0ck4prk9bq8amkjqczhff6nrfhy01mlvajv8kn5q2c8x759pny3y";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -11786,12 +11786,12 @@ final: prev:
 
   statuscol-nvim = buildVimPlugin {
     pname = "statuscol.nvim";
-    version = "2024-11-07";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "luukvbaal";
       repo = "statuscol.nvim";
-      rev = "8822f76e105549620ef9c0d96e7b95aedf14c490";
-      sha256 = "00rnxgmlj23fvrc2jwm9p2bwychhqmfl6bsab49c1y9l3z7kbp4w";
+      rev = "81d1cfb47e91780f72a8d9a3529f146731864313";
+      sha256 = "1z3nc06cdx4mdxl85d8ka7mahnll3w87ysnjqmc4xmghiy185fmp";
     };
     meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/";
   };
@@ -11979,12 +11979,12 @@ final: prev:
 
   tabby-nvim = buildVimPlugin {
     pname = "tabby.nvim";
-    version = "2024-12-23";
+    version = "2024-12-24";
     src = fetchFromGitHub {
       owner = "nanozuki";
       repo = "tabby.nvim";
-      rev = "a7936cc8ad00b17e2a1e7e260125df4a02632dc3";
-      sha256 = "118q2gpq4ypazcpyd0yphk47dd94jwsnw8dk2n9vq22j89kazz3d";
+      rev = "c119c91f3ada1a7c62ca2d10685ac8a3e2928fb8";
+      sha256 = "1wa17r6j9jfadvqny6yr1p11sw0gsx64xdhgsiaz4dzsvbkj94gj";
     };
     meta.homepage = "https://github.com/nanozuki/tabby.nvim/";
   };
@@ -12088,12 +12088,12 @@ final: prev:
 
   tagbar = buildVimPlugin {
     pname = "tagbar";
-    version = "2024-11-11";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "tagbar";
-      rev = "5e090da54bf999c657608b6c8ec841ef968d923d";
-      sha256 = "15r15lpf7nf1axha4fzssffigc561k35i4kfgk63s7zv6p385z0k";
+      rev = "8de7694c0aeda253073098bbc9fb890b2902ddb8";
+      sha256 = "1s3x0p0j7fx4xzalfq4fjnmf5vdhh398pfd08j8j5qc1f0p09fmq";
     };
     meta.homepage = "https://github.com/preservim/tagbar/";
   };
@@ -12619,12 +12619,12 @@ final: prev:
 
   texpresso-vim = buildVimPlugin {
     pname = "texpresso.vim";
-    version = "2024-04-30";
+    version = "2024-12-25";
     src = fetchFromGitHub {
       owner = "let-def";
       repo = "texpresso.vim";
-      rev = "1cc949fde8ed3220968039b6b1b6ccdd9f475087";
-      sha256 = "15il903x1li60ys6ni77qs4xfsqkwrkwkxijda5j166xb2gq89wr";
+      rev = "907838c08bbf99ad6bed3c908f1d0551a92ab4e0";
+      sha256 = "1s971w5794cf3maa0rqdbkz7j4ndnm4haabvj6fhrd0d827x21ky";
     };
     meta.homepage = "https://github.com/let-def/texpresso.vim/";
   };
@@ -12812,12 +12812,12 @@ final: prev:
 
   toggleterm-nvim = buildVimPlugin {
     pname = "toggleterm.nvim";
-    version = "2024-11-09";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "toggleterm.nvim";
-      rev = "87b2d6a3cab8e2bd9a0255427074285f0365398d";
-      sha256 = "0iiwh2baldc9nkss26c0xki3h8pr202d4ns3jddc2srp4y070lc3";
+      rev = "344fc1810292785b3d962ddac2de57669e1a7ff9";
+      sha256 = "0awj2kj3lam2j48bgld5wyb4m1v09gpxmzww35rgysq7wipliqx1";
     };
     meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
   };
@@ -12896,12 +12896,12 @@ final: prev:
 
   trim-nvim = buildVimPlugin {
     pname = "trim.nvim";
-    version = "2024-11-21";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "cappyzawa";
       repo = "trim.nvim";
-      rev = "84a1016c7484943e9fbb961f807c3745342b2462";
-      sha256 = "08w5rkjvqppnhr0xj20bbwc7zw62sbzfng14y85d8y7p0fvfscj7";
+      rev = "d0760a840ca2fe4958353dee567a90c2994e70a7";
+      sha256 = "0xy21z4yxpdi1g9yl744582fkmz8q1pap9czknzp8w4ws5mhi709";
     };
     meta.homepage = "https://github.com/cappyzawa/trim.nvim/";
   };
@@ -14361,12 +14361,12 @@ final: prev:
 
   vim-dadbod-completion = buildVimPlugin {
     pname = "vim-dadbod-completion";
-    version = "2024-12-19";
+    version = "2024-12-28";
     src = fetchFromGitHub {
       owner = "kristijanhusak";
       repo = "vim-dadbod-completion";
-      rev = "9e354e86fcc67a5ec2c104f312e374ea2f89c799";
-      sha256 = "0samdn88rlnhcza7sab3nh9pjlcgw6mq0iv3w8whn0l7fsrg3y77";
+      rev = "71eb73d1f7399be6a56cc43b928276cd5ca27ffd";
+      sha256 = "0yv4sasrqdx10vb68jg07qnr5sqias0iy1x0amav7rv5d5aicids";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/";
   };
@@ -14889,12 +14889,12 @@ final: prev:
 
   vim-flog = buildVimPlugin {
     pname = "vim-flog";
-    version = "2024-11-19";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "rbong";
       repo = "vim-flog";
-      rev = "be061536ed9a426b220562dbaaaf8ce7b990a7bf";
-      sha256 = "1fs2vi8g2hk3pxdjncddd7r8gkylx12yj6dalss5dcgq1n28kc5i";
+      rev = "74e52ba4de25eb5f03824d65087750636d795641";
+      sha256 = "15r94qslgjv0hzv5aymdnz77p3n2mbm6jfwvhwdrjivwlzy66gi8";
     };
     meta.homepage = "https://github.com/rbong/vim-flog/";
   };
@@ -15105,12 +15105,12 @@ final: prev:
 
   vim-go = buildVimPlugin {
     pname = "vim-go";
-    version = "2024-11-12";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "ec7a59ef10d417c0cc1cd571a165c7c9dec30d27";
-      sha256 = "1ykzn94cw298xw1dri60qayjsxkly5wg8gy9im81f8vna2vdd150";
+      rev = "6adc82bfef7f9a4b0db78065ae51b8ebb145c355";
+      sha256 = "1jdalz0f9bm0vvi1f5bvr909ai1x7pjrwm25178s7dxnshfvmmq1";
     };
     meta.homepage = "https://github.com/fatih/vim-go/";
   };
@@ -17880,12 +17880,12 @@ final: prev:
 
   vim-tmux-navigator = buildVimPlugin {
     pname = "vim-tmux-navigator";
-    version = "2024-11-04";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "christoomey";
       repo = "vim-tmux-navigator";
-      rev = "424b5caa154bff34dc258ee53cec5a8e36cf7ea8";
-      sha256 = "02rgmzpgrmnq15916cvqilb1mh37g1hpjiz5ys84gnqgdl26w0k7";
+      rev = "d847ea942a5bb4d4fab6efebc9f30d787fd96e65";
+      sha256 = "1zfvy2qwrrl370p4j9hmn6pav8l6mqf2mlad8smnqjnimsa80jqj";
     };
     meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/";
   };
@@ -18372,12 +18372,12 @@ final: prev:
 
   vimade = buildVimPlugin {
     pname = "vimade";
-    version = "2024-12-23";
+    version = "2024-12-28";
     src = fetchFromGitHub {
       owner = "TaDaa";
       repo = "vimade";
-      rev = "961b86612977ae70ef19ac7c9c95ff245f6ff666";
-      sha256 = "0y1jmpz91a03q74irianzxqnpajfqv02vwjqlpw7nlmvybdmphxk";
+      rev = "f751502b61e2c1ed0183a897993b00d0d4d3e556";
+      sha256 = "1n690lijsfqdpkqg9ing1v9z7a7q9hlai7mxcbzkwapjrxgxsdrz";
     };
     meta.homepage = "https://github.com/TaDaa/vimade/";
   };
@@ -18685,12 +18685,12 @@ final: prev:
 
   wiki-vim = buildVimPlugin {
     pname = "wiki.vim";
-    version = "2024-12-18";
+    version = "2024-12-24";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "wiki.vim";
-      rev = "8cc3f584cc20424f776fb60932c6ac265f526e6a";
-      sha256 = "0a7669dx8fq1nccgw8vrk5q8i9qzhk5g9by6zsvl16gr1jg8lza5";
+      rev = "80bb6dd1684a6cf13025733e4d810e36ad0ae9f3";
+      sha256 = "0nq5yncyq758q7ls3dlk0lr10m4ixwvflk1asl4ik6367vxkxg8q";
     };
     meta.homepage = "https://github.com/lervag/wiki.vim/";
   };
@@ -18878,12 +18878,12 @@ final: prev:
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "2024-12-22";
+    version = "2024-12-27";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "28ebf7eceb08ae47dbc988f0e93593c4c9f15a05";
-      sha256 = "0l69xc9h4wa2nzw4pm6j1c4f51h4iz1zlmida4dnpgkqcy26agmw";
+      rev = "1361375d2d4e6943c5085fc5ed425ebe13781ce2";
+      sha256 = "1rgwwphhr0ixd6y0kplhahh1by5773rl8sw6rz9v05y7mrq1xw3n";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
   };
@@ -18938,12 +18938,12 @@ final: prev:
 
   zellij-nav-nvim = buildVimPlugin {
     pname = "zellij-nav.nvim";
-    version = "2024-11-15";
+    version = "2024-12-24";
     src = fetchFromGitHub {
       owner = "swaits";
       repo = "zellij-nav.nvim";
-      rev = "346cd5e1ab09b3ab7c0b5792f9d536b055bf6815";
-      sha256 = "0ap004l6mlmb0lhp4sn1h8134wdysb5ipxgvi32r8vrya7fw2ksl";
+      rev = "366935eeb527889ab51771233b687589135d7891";
+      sha256 = "0lj0g8nhmn5pikbzszyach6nsw55ddxq4yrdx9miw48qi6nz51sz";
     };
     meta.homepage = "https://github.com/swaits/zellij-nav.nvim/";
   };
@@ -19022,12 +19022,12 @@ final: prev:
 
   zk-nvim = buildVimPlugin {
     pname = "zk-nvim";
-    version = "2024-11-20";
+    version = "2024-12-26";
     src = fetchFromGitHub {
       owner = "zk-org";
       repo = "zk-nvim";
-      rev = "42dc341d897ac4da3d4a9c5c506a36153473f021";
-      sha256 = "1yrw8841khd4bapmcz5i99kw4xwpvz2kzda1i1n71fnhidjr1fhx";
+      rev = "6beea6fafe2c781cb10e80878e68d5e32937692a";
+      sha256 = "1x44ncdi5jy0r9iv1k837l8v7iaxg7xykq510arqnz4a2ddk5iv0";
     };
     meta.homepage = "https://github.com/zk-org/zk-nvim/";
   };
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 8b658ea75c478..e742a51f8bbf0 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1161,10 +1161,6 @@ in
     dependencies = [ self.guard-nvim ];
   };
 
-  guard-nvim = super.guard-nvim.overrideAttrs {
-    nvimRequireCheck = "guard";
-  };
-
   hardhat-nvim = super.hardhat-nvim.overrideAttrs {
     dependencies = with self; [
       overseer-nvim
@@ -2221,6 +2217,11 @@ in
     nvimRequireCheck = "nvim-navic";
   };
 
+  nvim-notify = super.nvim-notify.overrideAttrs {
+    # Optional fzf integration
+    nvimSkipModule = "notify.integrations.fzf";
+  };
+
   nvim-paredit = super.nvim-paredit.overrideAttrs {
     dependencies = with self; [ nvim-treesitter ];
   };

From 0a2c38464e87cf085b23df27340f145d7d9a2b3c Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 28 Dec 2024 09:28:23 -0600
Subject: [PATCH 286/340] vimPlugins.nvim-treesitter: update grammars

---
 .../vim/plugins/nvim-treesitter/generated.nix | 78 +++++++++----------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index a810043f545cc..c83cf9435b5cf 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -72,12 +72,12 @@
   };
   astro = buildGrammar {
     language = "astro";
-    version = "0.0.0+rev=6e3bad3";
+    version = "0.0.0+rev=0ad33e3";
     src = fetchFromGitHub {
       owner = "virchau13";
       repo = "tree-sitter-astro";
-      rev = "6e3bad36a8c12d579e73ed4f05676141a4ccf68d";
-      hash = "sha256-ZsItSpYeSPnHn4avpHS54P4J069X9cW8VCRTM9Gfefg=";
+      rev = "0ad33e32ae9726e151d16ca20ba3e507ff65e01f";
+      hash = "sha256-LhehKOhCDPExEgEiOj3TiuFk8/DohzYhy/9GmUSxaIg=";
     };
     meta.homepage = "https://github.com/virchau13/tree-sitter-astro";
   };
@@ -182,12 +182,12 @@
   };
   bp = buildGrammar {
     language = "bp";
-    version = "0.0.0+rev=4e60cf3";
+    version = "0.0.0+rev=16c4306";
     src = fetchFromGitHub {
       owner = "ambroisie";
       repo = "tree-sitter-bp";
-      rev = "4e60cf3c2e613625c06f6f85540b3631e2d06cd3";
-      hash = "sha256-E8xL93rZx5I1RWXduBZdfVnogmha6TFQz4KerNWrpTI=";
+      rev = "16c43068ec30828c5aed11e87262c56f36782595";
+      hash = "sha256-hltHcGll7+pPSIfJdCwvNEBrRaFKqfnXD/qKSIdbM6U=";
     };
     meta.homepage = "https://github.com/ambroisie/tree-sitter-bp";
   };
@@ -802,23 +802,23 @@
   };
   gap = buildGrammar {
     language = "gap";
-    version = "0.0.0+rev=141b063";
+    version = "0.0.0+rev=ea70c22";
     src = fetchFromGitHub {
       owner = "gap-system";
       repo = "tree-sitter-gap";
-      rev = "141b063335e85299bde3f61b4888d02d674a1abc";
-      hash = "sha256-vl0bqJXTxpAfaMOIgQpX60I4dfPOJF6wpt10GiftuR0=";
+      rev = "ea70c228dd1d3875aeb264bf99903dc9a696894f";
+      hash = "sha256-uEcKZ2gisxYON2GsiYOnfgEdbe6OwQDQIzX2l8Tlics=";
     };
     meta.homepage = "https://github.com/gap-system/tree-sitter-gap";
   };
   gaptst = buildGrammar {
     language = "gaptst";
-    version = "0.0.0+rev=e0723dc";
+    version = "0.0.0+rev=69086d7";
     src = fetchFromGitHub {
       owner = "gap-system";
       repo = "tree-sitter-gaptst";
-      rev = "e0723dc6136309b3d5904dad2c73ef71267428c1";
-      hash = "sha256-m8lxSM/c99KLnu5hbxaTol645DFqFwjTSzdaRUtHDAI=";
+      rev = "69086d7627c03e1f4baf766bcef14c60d9e92331";
+      hash = "sha256-U0P9QoOZST1h6XI83CI0/6/CDTvqkv1Yiq62h6YdHpI=";
     };
     meta.homepage = "https://github.com/gap-system/tree-sitter-gaptst";
   };
@@ -967,12 +967,12 @@
   };
   gnuplot = buildGrammar {
     language = "gnuplot";
-    version = "0.0.0+rev=3c895f5";
+    version = "0.0.0+rev=8923c1e";
     src = fetchFromGitHub {
       owner = "dpezto";
       repo = "tree-sitter-gnuplot";
-      rev = "3c895f5d9c0b3a3c7e02383766b462c21913c000";
-      hash = "sha256-szpXAHOcQjdk9mN87V69Jjdgj0aP/q7uRVza0yaK/uw=";
+      rev = "8923c1e38b9634a688a6c0dce7c18c8ffb823e79";
+      hash = "sha256-fR3lIscfrBqpBH1jZ4RB1Qa8r+hxy6I0OzzoQqAe2aw=";
     };
     meta.homepage = "https://github.com/dpezto/tree-sitter-gnuplot";
   };
@@ -1165,12 +1165,12 @@
   };
   heex = buildGrammar {
     language = "heex";
-    version = "0.0.0+rev=9359017";
+    version = "0.0.0+rev=f6b83f3";
     src = fetchFromGitHub {
       owner = "connorlay";
       repo = "tree-sitter-heex";
-      rev = "9359017bd0dc6b023044713aa215544885663637";
-      hash = "sha256-4DEfL/RxZk7cvP5qUHNohJlfAIW+ks34rdMd/uCvsvA=";
+      rev = "f6b83f305a755cd49cf5f6a66b2b789be93dc7b9";
+      hash = "sha256-B9kNSHH/FhBdeAnXPUxiZAZK9efJpqo0MnuR9nfLlLU=";
     };
     meta.homepage = "https://github.com/connorlay/tree-sitter-heex";
   };
@@ -1320,12 +1320,12 @@
   };
   inko = buildGrammar {
     language = "inko";
-    version = "0.0.0+rev=1419efb";
+    version = "0.0.0+rev=0b08a8f";
     src = fetchFromGitHub {
       owner = "inko-lang";
       repo = "tree-sitter-inko";
-      rev = "1419efb8e7e140c30632cb0a2bef84e0d48a6fc5";
-      hash = "sha256-wmQUAk+kmjSEzVKmG9EGq85sOM/Xafgqe6NQO+s6fSI=";
+      rev = "0b08a8f976456a9271f70d4682143328d7224115";
+      hash = "sha256-mQkPg7bYadj/RToIo79y8TT9oh4UVEmZZCCYm6kAkwE=";
     };
     meta.homepage = "https://github.com/inko-lang/tree-sitter-inko";
   };
@@ -1452,12 +1452,12 @@
   };
   just = buildGrammar {
     language = "just";
-    version = "0.0.0+rev=f6d2930";
+    version = "0.0.0+rev=4f4e566";
     src = fetchFromGitHub {
       owner = "IndianBoy42";
       repo = "tree-sitter-just";
-      rev = "f6d29300f9fee15dcd8c2b25ab762001d38da731";
-      hash = "sha256-b42Dt9X0gaHjywb+tahNomGfDx9ZP+roudNuGAhKYPg=";
+      rev = "4f4e566fe47c30b14cfe388a28f70b79009609e5";
+      hash = "sha256-WBUNS+XFXi/h5AUM7Q8j8zAE2oqZeBHdpC5Au2QwqP8=";
     };
     meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just";
   };
@@ -2520,12 +2520,12 @@
   };
   scala = buildGrammar {
     language = "scala";
-    version = "0.0.0+rev=fb999c7";
+    version = "0.0.0+rev=d3b9553";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-scala";
-      rev = "fb999c77139f6bd972f014b728e2f0bd32b4d602";
-      hash = "sha256-GHx8tB36EypFqLk2qaFp9pTj/48SKZSRfCb8A5JodqM=";
+      rev = "d3b9553b47d7ab413a146c4b6498e527265b966e";
+      hash = "sha256-xoscL/Z1GZbwDaTSUfXEgdA5s+q+fx9G9K/WIlWOXAk=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
   };
@@ -3013,12 +3013,12 @@
   };
   tsx = buildGrammar {
     language = "tsx";
-    version = "0.0.0+rev=45af495";
+    version = "0.0.0+rev=8e13e1d";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-typescript";
-      rev = "45af49560396d67a710b21a3ce315fcaa09006ff";
-      hash = "sha256-15TAkZeoHTQvPqswlP8dFMyt8F/ztozaJtZys49rzeM=";
+      rev = "8e13e1db35b941fc57f2bd2dd4628180448c17d5";
+      hash = "sha256-Z68ERsfHxDubDJb7nQKSH0YoBmIReUGXNF0LJAQTXEs=";
     };
     location = "tsx";
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@@ -3047,12 +3047,12 @@
   };
   typescript = buildGrammar {
     language = "typescript";
-    version = "0.0.0+rev=45af495";
+    version = "0.0.0+rev=8e13e1d";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-typescript";
-      rev = "45af49560396d67a710b21a3ce315fcaa09006ff";
-      hash = "sha256-15TAkZeoHTQvPqswlP8dFMyt8F/ztozaJtZys49rzeM=";
+      rev = "8e13e1db35b941fc57f2bd2dd4628180448c17d5";
+      hash = "sha256-Z68ERsfHxDubDJb7nQKSH0YoBmIReUGXNF0LJAQTXEs=";
     };
     location = "typescript";
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@@ -3182,12 +3182,12 @@
   };
   verilog = buildGrammar {
     language = "verilog";
-    version = "0.0.0+rev=4344f7e";
+    version = "0.0.0+rev=15fbf73";
     src = fetchFromGitHub {
       owner = "gmlarumbe";
       repo = "tree-sitter-systemverilog";
-      rev = "4344f7e6c7fd8a9ccaf4cb93da17a37a544b492c";
-      hash = "sha256-jZ9ibkoNPl3bM6U5rhSlE808fFmySSjeEJkjcKD5ZW4=";
+      rev = "15fbf73dafaffc89050d247857beb27500ea30e8";
+      hash = "sha256-cCnFq2cL2lnTBXSVTVbHiGW/MDJARgqgGUjKmaTpOJI=";
     };
     meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog";
   };
@@ -3326,12 +3326,12 @@
   };
   xresources = buildGrammar {
     language = "xresources";
-    version = "0.0.0+rev=3b9f6a8";
+    version = "0.0.0+rev=5fd347f";
     src = fetchFromGitHub {
       owner = "ValdezFOmar";
       repo = "tree-sitter-xresources";
-      rev = "3b9f6a8ecaeae71f4419f31d4975234242eaf867";
-      hash = "sha256-Pbap9gmsv2LhhRveYCqvLeZJAzpkr8NAHwtVVkdw7Yw=";
+      rev = "5fd347f0b950b2d2563d41176373c610a0a5468c";
+      hash = "sha256-M0oDcCiAlybi0kXXor1g1Kxj3ulZEJkBiMNA0OcxNao=";
     };
     meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
   };

From 0cb7e95fcf0762aaf68cd41fb6ce52d9cde5f691 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sat, 28 Dec 2024 18:11:37 +0200
Subject: [PATCH 287/340] grandperspective: remove `with lib;`

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

diff --git a/pkgs/by-name/gr/grandperspective/package.nix b/pkgs/by-name/gr/grandperspective/package.nix
index d33d9b1a56d9f..6a9f812a12feb 100644
--- a/pkgs/by-name/gr/grandperspective/package.nix
+++ b/pkgs/by-name/gr/grandperspective/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
   });
 
-  meta = with lib; {
+  meta = {
     description = "Open-source macOS application to analyze disk usage";
     longDescription = ''
       GrandPerspective is a small utility application for macOS that graphically shows the disk usage within a file
@@ -59,13 +59,13 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     mainProgram = "grandperspective";
     homepage = "https://grandperspectiv.sourceforge.net";
-    license = licenses.gpl2Only;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Only;
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    maintainers = with lib.maintainers; [
       eliandoran
       DimitarNestorov
     ];
-    platforms = platforms.darwin;
+    platforms = lib.platforms.darwin;
   };
 
 })

From 35b51fd1a0505270874c7412c77edb3654ba8526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 28 Dec 2024 17:29:00 +0100
Subject: [PATCH 288/340] bruno: disable telemetry

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

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 7d1290f92f813..e6ffdea18a352 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -69,6 +69,10 @@ buildNpmPackage rec {
   postPatch = ''
     substituteInPlace scripts/build-electron.sh \
       --replace-fail 'if [ "$1" == "snap" ]; then' 'exit 0; if [ "$1" == "snap" ]; then'
+
+    # disable telemetry
+    substituteInPlace packages/bruno-app/src/providers/App/index.js \
+      --replace-fail "useTelemetry();" ""
   '';
 
   postConfigure = ''

From 33952e2d6587a06fc5afe4244414a322e7354310 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Sat, 28 Dec 2024 11:42:33 -0500
Subject: [PATCH 289/340] wivrn: remove unused libdwg dependency

---
 pkgs/by-name/wi/wivrn/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index 452d14a3082a7..a4cb0a83fe9ac 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -36,7 +36,6 @@
   libXrandr,
   libbsd,
   libdrm,
-  libdwg,
   libjpeg,
   libmd,
   libnotify,
@@ -153,7 +152,6 @@ stdenv.mkDerivation (finalAttrs: {
       hidapi
       libbsd
       libdrm
-      libdwg
       libGL
       libjpeg
       libmd

From b0cfb8abd8cb59704439255f4c1d127f2d511e0f Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Sat, 28 Dec 2024 11:42:00 -0500
Subject: [PATCH 290/340] libdwg: remove

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

diff --git a/pkgs/by-name/li/libdwg/package.nix b/pkgs/by-name/li/libdwg/package.nix
deleted file mode 100644
index 38b4492a8867a..0000000000000
--- a/pkgs/by-name/li/libdwg/package.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  indent,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libdwg";
-  version = "0.6";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/libdwg/libdwg-${version}.tar.bz2";
-    sha256 = "0l8ks1x70mkna1q7mzy1fxplinz141bd24qhrm1zkdil74mcsryc";
-  };
-
-  nativeBuildInputs = [ indent ];
-
-  hardeningDisable = [ "format" ];
-
-  # remove forbidden references to $TMPDIR
-  preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
-    for f in "$out"/bin/*; do
-      if isELF "$f"; then
-        patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$f"
-      fi
-    done
-  '';
-
-  meta = {
-    description = "Library reading dwg files";
-    homepage = "http://libdwg.sourceforge.net/en/";
-    license = lib.licenses.gpl3;
-    maintainers = [ lib.maintainers.marcweber ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 39f79cb6efe03..9c4e4a2f95693 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -663,6 +663,7 @@ mapAliases {
   libbitcoin-explorer = throw "libbitcoin-explorer has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
   libbitcoin-network = throw "libbitcoin-network has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
   libbitcoin-protocol = throw "libbitcoin-protocol has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
+  libdwg = throw "libdwg has been removed as upstream is unmaintained, the code doesn't build without significant patches, and the package had no reverse dependencies"; # Added 2024-12-28
   libgme = game-music-emu; # Added 2022-07-20
   libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22
   libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17

From 0a07e8cbd40250152d47bb57365f10c7b8f679b4 Mon Sep 17 00:00:00 2001
From: Iliyan Kostov <59366790+IliyanKostov9@users.noreply.github.com>
Date: Sat, 28 Dec 2024 19:01:13 +0200
Subject: [PATCH 291/340] Update package.nix

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

diff --git a/pkgs/by-name/vi/viber/package.nix b/pkgs/by-name/vi/viber/package.nix
index dc12285fcf3ae..fb039938c8c98 100644
--- a/pkgs/by-name/vi/viber/package.nix
+++ b/pkgs/by-name/vi/viber/package.nix
@@ -38,6 +38,7 @@
   xorg,
   zlib,
   zstd,
+  ffmpeg,
   ...
 }:
 

From 3d3b0cfb5549ff66c4c27677c80cde92c3d81e1f Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 28 Dec 2024 18:07:08 +0100
Subject: [PATCH 292/340] cuneiform: add patch for gcc 14

---
 pkgs/by-name/cu/cuneiform/gcc14-fix.patch | 170 ++++++++++++++++++++++
 pkgs/by-name/cu/cuneiform/package.nix     |   1 +
 2 files changed, 171 insertions(+)
 create mode 100644 pkgs/by-name/cu/cuneiform/gcc14-fix.patch

diff --git a/pkgs/by-name/cu/cuneiform/gcc14-fix.patch b/pkgs/by-name/cu/cuneiform/gcc14-fix.patch
new file mode 100644
index 0000000000000..027d028f36bc3
--- /dev/null
+++ b/pkgs/by-name/cu/cuneiform/gcc14-fix.patch
@@ -0,0 +1,170 @@
+diff --git a/cuneiform_src/Kern/ctb/src/ctb_oper.c b/cuneiform_src/Kern/ctb/src/ctb_oper.c
+index 2aedd58..3d7ec65 100644
+--- a/cuneiform_src/Kern/ctb/src/ctb_oper.c
++++ b/cuneiform_src/Kern/ctb/src/ctb_oper.c
+@@ -61,6 +61,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #define MAXPATH 256
+ #include<string.h>
+ #include<sys/stat.h>
++#include<ctype.h>
+ #include "ctb.h"
+ 
+ /// extern fuxntions and data
+diff --git a/cuneiform_src/Kern/dif/src/diffr.c b/cuneiform_src/Kern/dif/src/diffr.c
+index f0d89db..7d0d898 100644
+--- a/cuneiform_src/Kern/dif/src/diffr.c
++++ b/cuneiform_src/Kern/dif/src/diffr.c
+@@ -105,7 +105,7 @@ extern uchar BUFFER[256];        /* 
+ extern uchar LOCAL[50];          /* ���न����     ���             */
+ extern uchar LOCAL_W[50];        /* �ਭ�         ���             */
+ extern uchar end1,beg2;          /* ����� 1 � ��砫� 2-�� ��� ���  */
+-extern broken_ii;		/* 䫠� ���� �����			*/
++extern uchar broken_ii;		/* 䫠� ���� �����			*/
+ extern int16_t dnri_hook; // bottom right hook in small russian italic II,III
+ extern int16_t uple_hook; // bottom left  hook in small russian italic II,III
+ extern int16_t up_jack  ; // upper jack
+diff --git a/cuneiform_src/Kern/hdebug/__snp.c b/cuneiform_src/Kern/hdebug/__snp.c
+index cbf3353..8682cb1 100644
+--- a/cuneiform_src/Kern/hdebug/__snp.c
++++ b/cuneiform_src/Kern/hdebug/__snp.c
+@@ -986,11 +986,11 @@ extern "C" {
+ 	void SnpDrawLine(Point16* start, Point16* end, int32_t skew,
+ 			uint32_t rgb_color, int16_t pen_width, Handle key )
+ 	{
+-		LDPUMA_DrawLine(NULL,start,end,skew,rgb_color,pen_width,key );
++		LDPUMA_DrawLine(NULL,start,end,skew,rgb_color,pen_width,(long int)key );
+ 	};
+ 	void SnpHideLines(Handle key)
+ 	{
+-		LDPUMA_DeleteLines(NULL,key);
++		LDPUMA_DeleteLines(NULL,(long int)key);
+ 	};
+ 	void SnpUpdateViews(void)
+ 	{
+diff --git a/cuneiform_src/Kern/leo/src/leo_dll.c b/cuneiform_src/Kern/leo/src/leo_dll.c
+index da09092..25bc167 100644
+--- a/cuneiform_src/Kern/leo/src/leo_dll.c
++++ b/cuneiform_src/Kern/leo/src/leo_dll.c
+@@ -60,6 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include <ctype.h>
+ /*#include <io.h>*/
+ 
++#include "cfcompat.h"
+ #include "leo_tune.h"
+ #include "cpu.h"
+ #define PC_TYPE 0
+diff --git a/cuneiform_src/Kern/loc/src/loc.c b/cuneiform_src/Kern/loc/src/loc.c
+index e416b33..4b817ad 100644
+--- a/cuneiform_src/Kern/loc/src/loc.c
++++ b/cuneiform_src/Kern/loc/src/loc.c
+@@ -63,6 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include <unistd.h>
+ #endif
+ #include "loc.h"
++#include "cfcompat.h"
+ #include "struct.h"
+ #include <sys/stat.h>
+ 
+diff --git a/cuneiform_src/Kern/rbal/src/linbam.c b/cuneiform_src/Kern/rbal/src/linbam.c
+index cd34fab..a0a93d6 100644
+--- a/cuneiform_src/Kern/rbal/src/linbam.c
++++ b/cuneiform_src/Kern/rbal/src/linbam.c
+@@ -65,7 +65,7 @@
+ #include "lang_def.h"	// 08.09.2000 E.P.
+ #include "minmax.h"
+ 
+-extern line_BL;
++extern Bool line_BL;
+ extern CSTR_line lin_str;
+ 
+ static void set_basint(void);
+diff --git a/cuneiform_src/Kern/rblock/sources/c/ltmain.c b/cuneiform_src/Kern/rblock/sources/c/ltmain.c
+index 0653b6b..1c99b28 100644
+--- a/cuneiform_src/Kern/rblock/sources/c/ltmain.c
++++ b/cuneiform_src/Kern/rblock/sources/c/ltmain.c
+@@ -583,7 +583,7 @@ void PageStrings2 (void)
+ 
+ void LayoutPart1 (void)
+ {
+-extern SheetsCorrectRoots();
++// extern SheetsCorrectRoots();
+ # ifdef LT_DEBUG
+     switch (layout)
+     {
+diff --git a/cuneiform_src/Kern/rblock/sources/c/ltroots.c b/cuneiform_src/Kern/rblock/sources/c/ltroots.c
+index e68abd5..7efee82 100644
+--- a/cuneiform_src/Kern/rblock/sources/c/ltroots.c
++++ b/cuneiform_src/Kern/rblock/sources/c/ltroots.c
+@@ -69,6 +69,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ # include <fcntl.h>
+ # include <stdio.h>
++# include <unistd.h>
+ /*# include <crtdbg.h>*/
+ #include <assert.h>
+ 
+@@ -126,7 +127,7 @@ Bool RootsLoadFile (char * pFilename)
+         return (FALSE);
+     }
+ 
+-    while (read (hFile, &RootRecord, sizeof (ROOT)) == sizeof (ROOT))
++    while (read ((int)hFile, &RootRecord, sizeof (ROOT)) == sizeof (ROOT))
+     {
+         RootRecord.bReached   = FALSE;
+ 
+@@ -143,14 +144,14 @@ Bool RootsLoadFile (char * pFilename)
+         {
+             ErrorNoEnoughMemory ("in LTROOTS.C,RootsLoadFile,part 1");
+             nRoots = 0;
+-            close (hFile);
++            close ((int)hFile);
+             return (FALSE);
+         }
+ 
+         pRoots [nRoots - 1] = RootRecord;
+     }
+ 
+-    close (hFile);
++    close ((int)hFile);
+     return (TRUE);
+ }
+ # endif
+diff --git a/cuneiform_src/Kern/rstr/src/diffr.c b/cuneiform_src/Kern/rstr/src/diffr.c
+index 3427806..c4ad6aa 100644
+--- a/cuneiform_src/Kern/rstr/src/diffr.c
++++ b/cuneiform_src/Kern/rstr/src/diffr.c
+@@ -168,7 +168,7 @@ extern uchar BUFFER[256];        /* 
+ extern uchar LOCAL[50];        	/* ���न����     ���          		*/
+ extern uchar LOCAL_W[50];      	/* �ਭ�         ���          		*/
+ extern uchar end1,beg2;        	/* ����� 1 � ��砫� 2-�� ��� ���	*/
+-extern broken_ii;		/* 䫠� ���� �����			*/
++extern uchar broken_ii;		/* 䫠� ���� �����			*/
+ extern int16_t dnri_hook; // bottom right hook in small russian italic II,III
+ extern int16_t uple_hook; // bottom left  hook in small russian italic II,III
+ extern int16_t up_jack  ; // upper jack
+diff --git a/cuneiform_src/Kern/rstr/src/match_wd.c b/cuneiform_src/Kern/rstr/src/match_wd.c
+index 7a8c7f5..ca5f933 100644
+--- a/cuneiform_src/Kern/rstr/src/match_wd.c
++++ b/cuneiform_src/Kern/rstr/src/match_wd.c
+@@ -341,7 +341,7 @@ param.monitors=*((uint32_t*)points);
+ param.p2_active=1;  //call while p2 pass
+ param.language=3;	// LANG_RUSSIAN
+ 
+-if((rc=setjmp(Control_Point())) != 0)
++if((rc=setjmp(*Control_Point())) != 0)
+   return FALSE;
+ 
+ w=match_string(ln, word, &param);
+diff --git a/cuneiform_src/Kern/rstr/src/rcm.c b/cuneiform_src/Kern/rstr/src/rcm.c
+index 0659b69..45cf362 100644
+--- a/cuneiform_src/Kern/rstr/src/rcm.c
++++ b/cuneiform_src/Kern/rstr/src/rcm.c
+@@ -2648,7 +2648,7 @@ int16_t text_findstat_agressive(char * w) {
+ }
+ 
+ jmp_buf * Control_Point() {
+-	return jumper;
++	return &jumper;
+ }
+ 
+ /////////////
diff --git a/pkgs/by-name/cu/cuneiform/package.nix b/pkgs/by-name/cu/cuneiform/package.nix
index f6d977297f901..2a677a51923bf 100644
--- a/pkgs/by-name/cu/cuneiform/package.nix
+++ b/pkgs/by-name/cu/cuneiform/package.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch?id=fd8e596c6a5eab634656e265c3da5241f5ceee8c";
       sha256 = "14bp2f4dvlgxnpdza1rgszhkbxhp6p7lhgnb1s7c1x7vwdrx0ri7";
     })
+    ./gcc14-fix.patch
   ];
 
   # Workaround build failure on -fno-common toolchains like upstream

From 39b7652cf1b08cd012e7735d48c0cae95525f898 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sat, 28 Dec 2024 17:16:32 +0000
Subject: [PATCH 293/340] uasm: mark as broken in darwin

---
 pkgs/by-name/ua/uasm/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ua/uasm/package.nix b/pkgs/by-name/ua/uasm/package.nix
index 70fff1e01afb9..24450ee9ccd24 100644
--- a/pkgs/by-name/ua/uasm/package.nix
+++ b/pkgs/by-name/ua/uasm/package.nix
@@ -6,7 +6,10 @@
   uasm,
 }:
 
-gcc13Stdenv.mkDerivation rec {
+let
+  stdenv = gcc13Stdenv;
+in
+stdenv.mkDerivation rec {
   pname = "uasm";
   version = "2.57";
 
@@ -25,7 +28,7 @@ gcc13Stdenv.mkDerivation rec {
     else
       "Makefile-Linux-GCC-64.mak";
 
-  makeFlags = [ "CC=${gcc13Stdenv.cc.targetPrefix}cc" ];
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
 
   installPhase = ''
     runHook preInstall
@@ -49,5 +52,6 @@ gcc13Stdenv.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = with maintainers; [ thiagokokada ];
     license = licenses.watcom;
+    broken = stdenv.isDarwin;
   };
 }

From 87f28863841c9b7145c22846e5247b3085d797b7 Mon Sep 17 00:00:00 2001
From: r17x <ri7nz@evilfactory.id>
Date: Sun, 29 Dec 2024 00:06:49 +0700
Subject: [PATCH 294/340] ocamlPackages.h2: init h2-lwt, h2-lwt-unix at 0.13.0

---
 .../development/ocaml-modules/h2/lwt-unix.nix | 23 +++++++++++++++++++
 pkgs/development/ocaml-modules/h2/lwt.nix     | 22 ++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  4 ++++
 3 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/h2/lwt-unix.nix
 create mode 100644 pkgs/development/ocaml-modules/h2/lwt.nix

diff --git a/pkgs/development/ocaml-modules/h2/lwt-unix.nix b/pkgs/development/ocaml-modules/h2/lwt-unix.nix
new file mode 100644
index 0000000000000..fa335e71e1e6f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/h2/lwt-unix.nix
@@ -0,0 +1,23 @@
+{
+  buildDunePackage,
+  h2,
+  h2-lwt,
+  gluten-lwt-unix,
+  faraday-lwt-unix,
+}:
+
+buildDunePackage {
+  pname = "h2-lwt-unix";
+
+  inherit (h2) src version;
+
+  propagatedBuildInputs = [
+    gluten-lwt-unix
+    faraday-lwt-unix
+    h2-lwt
+  ];
+
+  meta = h2.meta // {
+    description = "Lwt Unix support for h2";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/h2/lwt.nix b/pkgs/development/ocaml-modules/h2/lwt.nix
new file mode 100644
index 0000000000000..ea755bae592b5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/h2/lwt.nix
@@ -0,0 +1,22 @@
+{
+  buildDunePackage,
+  h2,
+  lwt,
+  gluten-lwt,
+}:
+
+buildDunePackage {
+  pname = "h2-lwt";
+
+  inherit (h2) src version;
+
+  propagatedBuildInputs = [
+    lwt
+    gluten-lwt
+    h2
+  ];
+
+  meta = h2.meta // {
+    description = "Lwt support for h2";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index f4a2e36d36685..b48159bcc67de 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -668,6 +668,10 @@ let
 
     h2-eio = callPackage ../development/ocaml-modules/h2/eio.nix { };
 
+    h2-lwt = callPackage ../development/ocaml-modules/h2/lwt.nix { };
+
+    h2-lwt-unix = callPackage ../development/ocaml-modules/h2/lwt-unix.nix { };
+
     hack_parallel = callPackage ../development/ocaml-modules/hack_parallel { };
 
     hacl-star = callPackage ../development/ocaml-modules/hacl-star { };

From a0d07c62c4726506bb36b939b8a993c3d1d1b092 Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Sat, 21 Dec 2024 11:34:14 -0800
Subject: [PATCH 295/340] xcodegen: init

---
 .../xc/xcodegen/0001-spectre-xct-record.patch |  34 ++++
 pkgs/by-name/xc/xcodegen/nix/default.nix      |  16 ++
 .../xc/xcodegen/nix/workspace-state.json      | 178 ++++++++++++++++++
 pkgs/by-name/xc/xcodegen/package.nix          |  76 ++++++++
 4 files changed, 304 insertions(+)
 create mode 100644 pkgs/by-name/xc/xcodegen/0001-spectre-xct-record.patch
 create mode 100644 pkgs/by-name/xc/xcodegen/nix/default.nix
 create mode 100644 pkgs/by-name/xc/xcodegen/nix/workspace-state.json
 create mode 100644 pkgs/by-name/xc/xcodegen/package.nix

diff --git a/pkgs/by-name/xc/xcodegen/0001-spectre-xct-record.patch b/pkgs/by-name/xc/xcodegen/0001-spectre-xct-record.patch
new file mode 100644
index 0000000000000..4aef3141061e8
--- /dev/null
+++ b/pkgs/by-name/xc/xcodegen/0001-spectre-xct-record.patch
@@ -0,0 +1,34 @@
+diff --git a/Sources/Spectre/XCTest.swift b/Sources/Spectre/XCTest.swift
+index 3704436..e759f14 100644
+--- a/Sources/Spectre/XCTest.swift
++++ b/Sources/Spectre/XCTest.swift
+@@ -31,28 +31,6 @@ class XcodeReporter: ContextReporter {
+   func addDisabled(_ name: String) {}
+ 
+   func addFailure(_ name: String, failure: FailureType) {
+-    // Xcode 12 removed `recordFailure` and replaced with `record(_:)`
+-    #if swift(>=4.2)
+-    // The `compiler` statement was added in swift 4.2, so it needs to be in a separate statement to retain
+-    // compatibility with 4.x.
+-    #if compiler(>=5.3) && os(macOS)
+-    let location = XCTSourceCodeLocation(filePath: failure.file, lineNumber: failure.line)
+-    #if Xcode
+-    // As of Xcode 12.0.1, XCTIssue is unavailable even though it is documented:
+-    //   https://developer.apple.com/documentation/xctest/xctissue
+-    // When building with `swift build`, it is available. Perhaps the xctest overlay behaves differently between the two.
+-    let issue = XCTIssueReference(type: .assertionFailure, compactDescription: "\(name): \(failure.reason)", detailedDescription: nil, sourceCodeContext: .init(location: location), associatedError: nil, attachments: [])
+-    #else
+-    let issue = XCTIssue(type: .assertionFailure, compactDescription: "\(name): \(failure.reason)", detailedDescription: nil, sourceCodeContext: .init(location: location), associatedError: nil, attachments: [])
+-    #endif
+-    #if compiler(>=5.4)
+-    testCase.record(issue as XCTIssue)
+-    #else
+-    testCase.record(issue)
+-    #endif
+-    #else
+     testCase.recordFailure(withDescription: "\(name): \(failure.reason)", inFile: failure.file, atLine: failure.line, expected: false)
+-    #endif
+-    #endif
+   }
+ }
+\ No newline at end of file
diff --git a/pkgs/by-name/xc/xcodegen/nix/default.nix b/pkgs/by-name/xc/xcodegen/nix/default.nix
new file mode 100644
index 0000000000000..e9d58741591f1
--- /dev/null
+++ b/pkgs/by-name/xc/xcodegen/nix/default.nix
@@ -0,0 +1,16 @@
+# This file was generated by swiftpm2nix.
+{
+  workspaceStateFile = ./workspace-state.json;
+  hashes = {
+    "AEXML" = "sha256-bQcXq1aS76sOjW8yYCOlGVZ2tStDvzRQSyj9VrAj6nI=";
+    "ArtifactBundleGen" = "sha256-mSXJiRGFIm2RtzBG8l6s4RJ2BzSbPZKUZIqWM4vDIhc=";
+    "JSONUtilities" = "sha256-jl8XfgoB5IX0qwwDtzcWgK0u3SNG2HfrPoEb2a6/mlA=";
+    "PathKit" = "sha256-ewxTC1kpu6PXhwamCxYfI50ooYO1SIU0+IXH2tc/uv4=";
+    "Rainbow" = "sha256-zmd/wGFX0AYRvwecqQerlxDETMuBqQM+Whuf3JezAGM=";
+    "Spectre" = "sha256-fipGRIgw+jV7Wrxa+xivRk7YMyxDhGFB6SHIHscrmV8=";
+    "SwiftCLI" = "sha256-PmjzLss0D12iy6YKsudFa8i63NQAssyCBqqq8VjRiH4=";
+    "Version" = "sha256-4IwQlexWtIH9M0sSai1a+ITTAKkD2zJtbYoV4Cg+Snw=";
+    "XcodeProj" = "sha256-ycHDzay37YtT/3QqUpG6XPjRh32P5iU/I5GpfjrXs/I=";
+    "Yams" = "sha256-5qxuCkmopm3uFcoYJKQA8ofW98f53H1gZaPiOh2DS4U=";
+  };
+}
diff --git a/pkgs/by-name/xc/xcodegen/nix/workspace-state.json b/pkgs/by-name/xc/xcodegen/nix/workspace-state.json
new file mode 100644
index 0000000000000..0f95461da6e00
--- /dev/null
+++ b/pkgs/by-name/xc/xcodegen/nix/workspace-state.json
@@ -0,0 +1,178 @@
+{
+  "object": {
+    "artifacts": [],
+    "dependencies": [
+      {
+        "basedOn": null,
+        "packageRef": {
+          "identity": "aexml",
+          "kind": "remoteSourceControl",
+          "location": "https://github.com/tadija/AEXML.git",
+          "name": "AEXML"
+        },
+        "state": {
+          "checkoutState": {
+            "revision": "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3",
+            "version": "4.6.1"
+          },
+          "name": "sourceControlCheckout"
+        },
+        "subpath": "AEXML"
+      },
+      {
+        "basedOn": null,
+        "packageRef": {
+          "identity": "artifactbundlegen",
+          "kind": "remoteSourceControl",
+          "location": "https://github.com/freddi-kit/ArtifactBundleGen",
+          "name": "ArtifactBundleGen"
+        },
+        "state": {
+          "checkoutState": {
+            "revision": "707e4ccc4b1c7e48e881cd5ea91e493a95df24bf",
+            "version": "0.0.6"
+          },
+          "name": "sourceControlCheckout"
+        },
+        "subpath": "ArtifactBundleGen"
+      },
+      {
+        "basedOn": null,
+        "packageRef": {
+          "identity": "jsonutilities",
+          "kind": "remoteSourceControl",
+          "location": "https://github.com/yonaskolb/JSONUtilities.git",
+          "name": "JSONUtilities"
+        },
+        "state": {
+          "checkoutState": {
+            "revision": "128d2ffc22467f69569ef8ff971683e2393191a0",
+            "version": "4.2.0"
+          },
+          "name": "sourceControlCheckout"
+        },
+        "subpath": "JSONUtilities"
+      },
+      {
+        "basedOn": null,
+        "packageRef": {
+          "identity": "pathkit",
+          "kind": "remoteSourceControl",
+          "location": "https://github.com/kylef/PathKit.git",
+          "name": "PathKit"
+        },
+        "state": {
+          "checkoutState": {
+            "revision": "3bfd2737b700b9a36565a8c94f4ad2b050a5e574",
+            "version": "1.0.1"
+          },
+          "name": "sourceControlCheckout"
+        },
+        "subpath": "PathKit"
+      },
+      {
+        "basedOn": null,
+        "packageRef": {
+          "identity": "rainbow",
+          "kind": "remoteSourceControl",
+          "location": "https://github.com/onevcat/Rainbow.git",
+          "name": "Rainbow"
+        },
+        "state": {
+          "checkoutState": {
+            "revision": "e0dada9cd44e3fa7ec3b867e49a8ddbf543e3df3",
+            "version": "4.0.1"
+          },
+          "name": "sourceControlCheckout"
+        },
+        "subpath": "Rainbow"
+      },
+      {
+        "basedOn": null,
+        "packageRef": {
+          "identity": "spectre",
+          "kind": "remoteSourceControl",
+          "location": "https://github.com/kylef/Spectre.git",
+          "name": "Spectre"
+        },
+        "state": {
+          "checkoutState": {
+            "revision": "26cc5e9ae0947092c7139ef7ba612e34646086c7",
+            "version": "0.10.1"
+          },
+          "name": "sourceControlCheckout"
+        },
+        "subpath": "Spectre"
+      },
+      {
+        "basedOn": null,
+        "packageRef": {
+          "identity": "swiftcli",
+          "kind": "remoteSourceControl",
+          "location": "https://github.com/jakeheis/SwiftCLI.git",
+          "name": "SwiftCLI"
+        },
+        "state": {
+          "checkoutState": {
+            "revision": "2e949055d9797c1a6bddcda0e58dada16cc8e970",
+            "version": "6.0.3"
+          },
+          "name": "sourceControlCheckout"
+        },
+        "subpath": "SwiftCLI"
+      },
+      {
+        "basedOn": null,
+        "packageRef": {
+          "identity": "version",
+          "kind": "remoteSourceControl",
+          "location": "https://github.com/mxcl/Version",
+          "name": "Version"
+        },
+        "state": {
+          "checkoutState": {
+            "revision": "a94b48f36763c05629fc102837398505032dead9",
+            "version": "2.0.0"
+          },
+          "name": "sourceControlCheckout"
+        },
+        "subpath": "Version"
+      },
+      {
+        "basedOn": null,
+        "packageRef": {
+          "identity": "xcodeproj",
+          "kind": "remoteSourceControl",
+          "location": "https://github.com/tuist/XcodeProj.git",
+          "name": "XcodeProj"
+        },
+        "state": {
+          "checkoutState": {
+            "revision": "447c159b0c5fb047a024fd8d942d4a76cf47dde0",
+            "version": "8.16.0"
+          },
+          "name": "sourceControlCheckout"
+        },
+        "subpath": "XcodeProj"
+      },
+      {
+        "basedOn": null,
+        "packageRef": {
+          "identity": "yams",
+          "kind": "remoteSourceControl",
+          "location": "https://github.com/jpsim/Yams.git",
+          "name": "Yams"
+        },
+        "state": {
+          "checkoutState": {
+            "revision": "01835dc202670b5bb90d07f3eae41867e9ed29f6",
+            "version": "5.0.1"
+          },
+          "name": "sourceControlCheckout"
+        },
+        "subpath": "Yams"
+      }
+    ]
+  },
+  "version": 6
+}
diff --git a/pkgs/by-name/xc/xcodegen/package.nix b/pkgs/by-name/xc/xcodegen/package.nix
new file mode 100644
index 0000000000000..d302092be93c6
--- /dev/null
+++ b/pkgs/by-name/xc/xcodegen/package.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  swiftPackages,
+  swift,
+  swiftpm,
+  swiftpm2nix,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+  ...
+}:
+
+let
+  # Pass the generated files to the helper.
+  generated = swiftpm2nix.helpers ./nix;
+in
+
+swiftPackages.stdenv.mkDerivation (finalAttrs: {
+  pname = "xcodegen";
+  version = "2.42.0";
+
+  src = fetchFromGitHub {
+    owner = "yonaskolb";
+    repo = "XcodeGen";
+    tag = finalAttrs.version;
+    hash = "sha256-wcjmADG+XnS2kR8BHe6ijApomucS9Tx7ZRjWZmTCUiI=";
+  };
+
+  # Including SwiftPM as a nativeBuildInput provides a buildPhase for you.
+  # This by default performs a release build using SwiftPM, essentially:
+  #   swift build -c release
+  nativeBuildInputs = [
+    swift
+    swiftpm
+  ];
+
+  buildInputs = [
+    swiftPackages.XCTest
+  ];
+
+  # The helper provides a configure snippet that will prepare all dependencies
+  # in the correct place, where SwiftPM expects them.
+  configurePhase =
+    generated.configure
+    + ''
+      # Replace the dependency symlink with a writable copy
+      swiftpmMakeMutable Spectre
+      # Now apply a patch
+      patch -p1 -d .build/checkouts/Spectre -i ${./0001-spectre-xct-record.patch}
+    '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp "$(swiftpmBinPath)/${finalAttrs.pname}" $out/bin/
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Swift command line tool for generating your Xcode project";
+    homepage = "https://github.com/yonaskolb/XcodeGen";
+    changelog = "https://github.com/XcodeGen/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.darwin;
+    maintainers = [ lib.maintainers.samasaur ];
+    mainProgram = "xcodegen";
+  };
+})

From 0887d1a0fecb8b601ca25312bae59a4f09225c95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 18:51:17 +0000
Subject: [PATCH 296/340] openapi-python-client: 0.22.0 -> 0.23.0

---
 pkgs/by-name/op/openapi-python-client/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix
index 54bdb088ae57d..4a7011ab90864 100644
--- a/pkgs/by-name/op/openapi-python-client/package.nix
+++ b/pkgs/by-name/op/openapi-python-client/package.nix
@@ -11,7 +11,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "openapi-python-client";
-  version = "0.22.0";
+  version = "0.23.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
     owner = "openapi-generators";
     repo = "openapi-python-client";
     tag = "v${version}";
-    hash = "sha256-Z6gYSonnr2HrWieWFp20U1px8clC1yBCezn/pk428WI=";
+    hash = "sha256-jMRnzrQ5ZySaxrCloE9DLXt2O78d04+XHq4XlFUohjs=";
   };
 
   nativeBuildInputs =

From da08b71a8ba2e57657f6040d24771497d24641f2 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Sun, 29 Dec 2024 02:51:37 +0800
Subject: [PATCH 297/340] fdroidserver: 2.3.1 -> 2.3.4

---
 pkgs/by-name/fd/fdroidserver/package.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/fd/fdroidserver/package.nix b/pkgs/by-name/fd/fdroidserver/package.nix
index 473a1dd4cf321..d5216d9d01389 100644
--- a/pkgs/by-name/fd/fdroidserver/package.nix
+++ b/pkgs/by-name/fd/fdroidserver/package.nix
@@ -8,20 +8,17 @@
   installShellFiles,
 }:
 
-let
-  version = "2.3.1";
-in
-python3Packages.buildPythonApplication {
+python3Packages.buildPythonApplication rec {
   pname = "fdroidserver";
-  inherit version;
+  version = "2.3.4";
 
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "fdroid";
     repo = "fdroidserver";
-    rev = version;
-    hash = "sha256-1jJwKvxm33Hge35dhqy5HgXzyokj8a2XhWvCmScj5bA=";
+    tag = version;
+    hash = "sha256-NsILbFirIFz2zZxTSRFV1D2WeMN2lsvAwsZy7ie5ZJE=";
   };
 
   pythonRelaxDeps = [

From 6d7746e3f0e04adfdbdd5d8788ec475236d88af7 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Sat, 28 Dec 2024 18:52:51 +0000
Subject: [PATCH 298/340] vscode: 1.96.0 -> 1.96.2

---
 pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index f8a5269271869..704039d7769b6 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -36,22 +36,22 @@ let
 
   sha256 =
     {
-      x86_64-linux = "07bnp0ywrpcpfqmr6h3adsv1gwng4fiyf2dqpj8g4dbwkgakalzk";
-      x86_64-darwin = "1k5wmhnr8dr3f76f65agkn2igzbi40qqz3df7fai1gk1ichsw0s2";
-      aarch64-linux = "0s8s5x3vhs3rv4kj86irprzp1pprx1npyv0sbgvd821h3bh6s6k9";
-      aarch64-darwin = "1li4s74lqj5qr4w2biz29r88dx741a85v5s3mfxxqvnlhi7rkmx5";
-      armv7l-linux = "028g7f7fhvni7kn2kvpn7q1n66r03jr8maxkxihwsxr0xh6srca0";
+      x86_64-linux = "12606f4b6drp9gnb2y6q8b9zd1q7pjqg4ikjsfz47wgsi4009096";
+      x86_64-darwin = "18hj3n81ja0kj4l4l1v2s3ahgagl9p7bv0zzmj710vqpr3k3h2p8";
+      aarch64-linux = "03k92827lvb7rnavpii1kx0z3rpxsmbv21rdi06w5agpk4l3xs9k";
+      aarch64-darwin = "08x5gv338yf1by04djvykjwnlifffb1bfbqr6vnxshcy9r30n925";
+      armv7l-linux = "05cchap0r3vxfa32i3di838kj6wyrsm2qcga0gcl2aa27c86cn3c";
     }
     .${system} or throwSystem;
 in
 callPackage ./generic.nix rec {
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.96.0";
+  version = "1.96.2";
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
   # This is used for VS Code - Remote SSH test
-  rev = "138f619c86f1199955d53b4166bef66ef252935c";
+  rev = "fabdb6a30b49f79a7aba0f2ad9df9b399473380f";
 
   executableName = "code" + lib.optionalString isInsiders "-insiders";
   longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -75,7 +75,7 @@ callPackage ./generic.nix rec {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      sha256 = "1kjivqnc0abrnqjn9dw2l612z7qra7y2fvxxrallsrqmqiibzcdk";
+      sha256 = "1gbjxmmi800mdslr7yys04fw160crjg0v8bjhcshk6w6fdz39wp1";
     };
     stdenv = stdenvNoCC;
   };

From 34d48c3e804feae4c451770f5d7b507b9df68b6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 18:56:53 +0000
Subject: [PATCH 299/340] victoriametrics: 1.108.0 -> 1.108.1

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

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index ecd71df407617..8ecaeba74b66b 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -14,13 +14,13 @@
 
 buildGoModule rec {
   pname = "VictoriaMetrics";
-  version = "1.108.0";
+  version = "1.108.1";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     rev = "v${version}";
-    hash = "sha256-c7I+H4KimGDAaDWT1vGyfdjfp/6Ci/kHVQELLsl3Ih4=";
+    hash = "sha256-UaWTBOlMf7SR3tBjeaNnokdSqtRrYm5rPQPi3UGxTvQ=";
   };
 
   vendorHash = null;

From ce305adae501a27be8c2d28a4c588b57b5643f8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 19:08:16 +0000
Subject: [PATCH 300/340] trufflehog: 3.87.0 -> 3.88.0

---
 pkgs/tools/security/trufflehog/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
index 9f92da1b2755b..0a9f52ae6ef29 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "trufflehog";
-  version = "3.87.0";
+  version = "3.88.0";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     rev = "refs/tags/v${version}";
-    hash = "sha256-xdRd2k8yZUVnAoQ2MjrbeP5RqLIu27+A0bXOIR6zZtQ=";
+    hash = "sha256-IAvVdq59epg/zQ8lLHlewIDBxZD5FmAYCt1xrJlghzM=";
   };
 
-  vendorHash = "sha256-M8qasSqn0NdQOk7/Sq0NhK/YFMjJSrPRF61h5k3MPB0=";
+  vendorHash = "sha256-/wuv72PZGdEiTFuurBQJ+K4lunnkR51CrkyHaVb+/kY=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 1a571dc10404d24517731d8905036745d6a30a43 Mon Sep 17 00:00:00 2001
From: Stephane <stephane@frozenkiwi.net>
Date: Sat, 28 Dec 2024 15:18:57 +0100
Subject: [PATCH 301/340] quartus-prime-lite: 23.1std.0.991 -> 23.1std.1.993

---
 .../by-name/qu/quartus-prime-lite/quartus.nix | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/qu/quartus-prime-lite/quartus.nix b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
index 0b301ad87d542..b85466eac5483 100644
--- a/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
+++ b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
@@ -40,21 +40,21 @@ let
   ) deviceIds;
 
   componentHashes = {
-    "arria_lite" = "0fg9mmncbb8vmmbc3hxgmrgvgfphn3k4glv7w2yjq66vz6nd8zql";
-    "cyclone" = "1min1hjaw8ll0c1gvl6ihp7hczw36ag8l2yzgl6avcapcw53hgyp";
-    "cyclone10lp" = "1kjjm11hjg0h6i7kilxvhmkay3v416bhwp0frg2bnwggpk29drxj";
-    "cyclonev" = "10v928qhyfqw3lszhhcdishh1875k1bki9i0czx9252jprgd1g7g";
-    "max" = "04sszzz3qnjziirisshhdqs7ks8mcvy15lc1mpp9sgm09pwlhgbb";
-    "max10" = "0dqlq477zdx4pf5hlbkl1ycxiav19vx4sk6277cpxm8y1xz70972";
+    "arria_lite" = "sha256-PNoc15Y5h+2bxhYFIxkg1qVAsXIX3IMfEQSdPLVNUp4=";
+    "cyclone" = "sha256-2huDuTkXt6jszwih0wzusoxRvECi6+tupvRcUvn6eIA=";
+    "cyclone10lp" = "sha256-i8VJKqlIfQmK2GWhm0W0FujHcup4RjeXughL2VG5gkY=";
+    "cyclonev" = "sha256-HoNJkcD96rPQEZtjbtmiRpoKh8oni7gOLVi80c1a3TM=";
+    "max" = "sha256-qh920mvu0H+fUuSJBH7fDPywzll6sGdmEtfx32ApCSA=";
+    "max10" = "sha256-XOyreAG3lYEV7Mnyh/UnFTuOwPQsd/t23Q8/P2p6U+0=";
   };
 
-  version = "23.1std.0.991";
+  version = "23.1std.1.993";
 
   download =
     { name, sha256 }:
     fetchurl {
       inherit name sha256;
-      # e.g. "23.1std.0.991" -> "23.1std/921"
+      # e.g. "23.1std.1.993" -> "23.1std/993"
       url = "https://downloads.intel.com/akdlm/software/acdsinst/${lib.versions.majorMinor version}std/${lib.elemAt (lib.splitVersion version) 4}/ib_installers/${name}";
     };
 
@@ -62,12 +62,12 @@ let
     [
       {
         name = "QuartusLiteSetup-${version}-linux.run";
-        sha256 = "1mg4db56rg407kdsvpzys96z59bls8djyddfzxi6bdikcklxz98h";
+        sha256 = "sha256-OCp2hZrfrfp1nASuVNWgg8/ODRrl67SJ+c6IWq5eWvY=";
       }
     ]
     ++ lib.optional withQuesta {
       name = "QuestaSetup-${version}-linux.run";
-      sha256 = "0f9lyphk4vf4ijif3kb4iqf18jl357z9h8g16kwnzaqwfngh2ixk";
+      sha256 = "sha256-Dne4MLFSGXUVLMd+JgiS/d5RX9t5gs6PEvexTssLdF4=";
     }
   );
   components = map (

From 98afe02bd1a33e6e56a668f152c73e776d9a2275 Mon Sep 17 00:00:00 2001
From: Jan Philipp Tebernum <jan.tebernum@pm.me>
Date: Sat, 28 Dec 2024 02:10:54 +0100
Subject: [PATCH 302/340] stlink: patch incorrect calloc argument order

With the update to GCC 14, stlink v1.8.0 is broken, as GCC 14 enforces
the correct argument order of calloc. This commit adds a little patch to
resolve that issue for now. This patch should be removed and stlink
updated to v1.8.1 as soon as that version gets released.
---
 pkgs/development/tools/misc/stlink/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix
index 27e5437d9517f..b88b06393fed5 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/pkgs/development/tools/misc/stlink/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   libusb1,
   gtk3,
@@ -30,6 +31,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-hlFI2xpZ4ldMcxZbg/T5/4JuFFdO9THLcU0DQKSFqrw=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "calloc-argument-order.patch";
+      url = "https://github.com/stlink-org/stlink/commit/6a6718b3342b6c5e282a4e33325b9f97908a0692.patch";
+      includes = [ "src/stlink-lib/chipid.c" ];
+      sha256 = "sha256-sAfcrDdoKy5Gl1o/PHEUr8uL9OBq0g1nfRe7Y0ijWAM=";
+    })
+  ];
+
   buildInputs =
     [
       libusb1'

From 4bb7bc77c98e4ddd355785b4875e4ac484383e62 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sat, 21 Dec 2024 13:37:45 +0200
Subject: [PATCH 303/340] swiftformat: 0.47.10 -> 0.55.4

---
 pkgs/by-name/sw/swiftformat/package.nix | 55 +++++++++++++------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/sw/swiftformat/package.nix b/pkgs/by-name/sw/swiftformat/package.nix
index 3ff1ce98ffc84..fa4c303ae66ac 100644
--- a/pkgs/by-name/sw/swiftformat/package.nix
+++ b/pkgs/by-name/sw/swiftformat/package.nix
@@ -2,48 +2,51 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  swift,
+  swiftformat,
+  swiftpm,
+  testers,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-# This derivation is impure: it relies on an Xcode toolchain being installed
-# and available in the expected place. The values of sandboxProfile and
-# hydraPlatforms are copied pretty directly from the MacVim derivation, which
-# is also impure.
-
-stdenv.mkDerivation rec {
+swift.stdenv.mkDerivation rec {
   pname = "swiftformat";
-  version = "0.47.10";
+  version = "0.55.4";
 
   src = fetchFromGitHub {
     owner = "nicklockwood";
     repo = "SwiftFormat";
     rev = version;
-    sha256 = "1gqxpymbhpmap0i2blg9akarlql4mkzv45l4i212gsxcs991b939";
+    sha256 = "sha256-0Dk2SgfPozgbdhyQa74NZkd/kA6JleSfpHDn4NuQdEo=";
   };
 
-  preConfigure = "LD=$CC";
-
-  buildPhase = ''
-    /usr/bin/xcodebuild -project SwiftFormat.xcodeproj \
-      -scheme "SwiftFormat (Command Line Tool)" \
-      CODE_SIGN_IDENTITY= SYMROOT=build OBJROOT=build
-  '';
+  nativeBuildInputs = [
+    swift
+    swiftpm
+  ];
 
   installPhase = ''
-    install -D -m 0555 build/Release/swiftformat $out/bin/swiftformat
+    install -D "$(swiftpmBinPath)/swiftformat" $out/bin/swiftformat
   '';
 
-  sandboxProfile = ''
-    (allow file-read* file-write* process-exec mach-lookup)
-    ; block homebrew dependencies
-    (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log))
-  '';
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
 
-  meta = with lib; {
+  meta = {
     description = "Code formatting and linting tool for Swift";
     homepage = "https://github.com/nicklockwood/SwiftFormat";
-    license = licenses.mit;
-    maintainers = [ maintainers.bdesham ];
-    platforms = platforms.darwin;
-    hydraPlatforms = [ ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      bdesham
+      DimitarNestorov
+    ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

From 4650173a18cdaf55abb02bcab9d96cba734f4b75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 19:47:13 +0000
Subject: [PATCH 304/340] srtrelay: 1.1.0 -> 1.3.0

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

diff --git a/pkgs/by-name/sr/srtrelay/package.nix b/pkgs/by-name/sr/srtrelay/package.nix
index da9c9e83c527e..975a38408c37a 100644
--- a/pkgs/by-name/sr/srtrelay/package.nix
+++ b/pkgs/by-name/sr/srtrelay/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "srtrelay";
-  version = "1.1.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "voc";
     repo = "srtrelay";
     rev = "v${version}";
-    sha256 = "sha256-CA+UuFOWjZjSBDWM62rda3IKO1fwC3X52mP4tg1uoO4=";
+    sha256 = "sha256-llBPlfvW9Bvm9nL8w4BTOgccsQNAAb3omRBXBISNBcc=";
   };
 
-  vendorHash = "sha256-xTYlfdijSo99ei+ZMX6N9gl+yw0DrPQ2wOhn6SS9S/E=";
+  vendorHash = "sha256-z9sBrSGEHPLdC79hsNKZiI9+w8t0JrVQ8pRdBykaI5Q=";
 
   buildInputs = [ srt ];
   nativeCheckInputs = [ ffmpeg ];

From eec3624d22b3add7daea87c44e064109104292e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 19:49:42 +0000
Subject: [PATCH 305/340] home-assistant-custom-components.xiaomi_gateway3:
 4.0.7 -> 4.0.8

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

diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
index 2cf3336030019..081590df249be 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
   owner = "AlexxIT";
   domain = "xiaomi_gateway3";
-  version = "4.0.7";
+  version = "4.0.8";
 
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "XiaomiGateway3";
     rev = "v${version}";
-    hash = "sha256-0tLyRQ5KIL3NDAKK8nr8ZrgN/uh8YdGA7iSNJwEIxis=";
+    hash = "sha256-VvuvOUldhmROTs1+YbCT7++VJ71GgGKRbHjqZxQQY0w=";
   };
 
   dependencies = [ zigpy ];

From 472ebeea015262497e9613edf80133f24ef5c24d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 19:51:12 +0000
Subject: [PATCH 306/340] home-assistant-custom-components.xiaomi_miot: 1.0.2
 -> 1.0.7

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

diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
index 2231c998d28ad..3c52433861352 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "al-one";
   domain = "xiaomi_miot";
-  version = "1.0.2";
+  version = "1.0.7";
 
   src = fetchFromGitHub {
     owner = "al-one";
     repo = "hass-xiaomi-miot";
     rev = "v${version}";
-    hash = "sha256-WoPzWCraTj0VNzwZT9IpK7Loc1OuoQf/2B++SwP7f0Y=";
+    hash = "sha256-V7GPxyRPeyHXJErW/q9o7a+kbhrE46nDjYiSKvEMKnw=";
   };
 
   dependencies = [

From 41d966187675330d0d768d4da08a46dfc6dd7763 Mon Sep 17 00:00:00 2001
From: kleifgch <81602214+kleifgch@users.noreply.github.com>
Date: Sat, 28 Dec 2024 18:08:01 +0100
Subject: [PATCH 307/340] nextcloud-client: remove unneeded patch

The removed patch was intended to install the dbus service in the proper
location, but due to a typo (`service` vs. `services`) never did. In the
meantime, upstream introduced commit [1] making the patch unnecessary.

To check that everything is in order, one can build nextcloud-client and
verify that the service file is located at $out/share/dbus-1/services/.

[1] https://github.com/nextcloud/desktop/commit/6e1e8a8bdc1a8a1b9894792cc3e3664065dfda39
---
 ...y-copy-dbus-files-into-the-store-dir.patch | 21 -------------------
 .../networking/nextcloud-client/default.nix   |  2 --
 2 files changed, 23 deletions(-)
 delete mode 100644 pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch

diff --git a/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch b/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch
deleted file mode 100644
index 56cc005733a77..0000000000000
--- a/pkgs/applications/networking/nextcloud-client/0001-Explicitly-copy-dbus-files-into-the-store-dir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From bbd366348d1f0e334d4604d04e293a046070e666 Mon Sep 17 00:00:00 2001
-From: Maximilian Bosch <maximilian@mbosch.me>
-Date: Fri, 23 Aug 2019 00:19:20 +0200
-Subject: [PATCH] Explicitly copy dbus files into the store dir
-
----
- shell_integration/libcloudproviders/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt
-index b4434d0..b57e033 100644
---- a/shell_integration/libcloudproviders/CMakeLists.txt
-+++ b/shell_integration/libcloudproviders/CMakeLists.txt
-@@ -4,6 +4,7 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.28.0")
- else()
-     pkg_get_variable(_install_dir dbus-1 session_bus_services_dir)
- endif()
-+    set(_install_dir "${CMAKE_INSTALL_DATADIR}/dbus-1/service")
-     foreach (_i ${_sources})
-         get_filename_component(_service_file ${_i} ABSOLUTE)
-         string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index d2ed2c084015a..376dbae748363 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -39,8 +39,6 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    # Explicitly move dbus configuration files to the store path rather than `/etc/dbus-1/services`.
-    ./0001-Explicitly-copy-dbus-files-into-the-store-dir.patch
     ./0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch
   ];
 

From 9f95a717f998f8019ecc79fba81c28edc04be126 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 20:59:52 +0000
Subject: [PATCH 308/340] changedetection-io: 0.48.01 -> 0.48.05

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

diff --git a/pkgs/by-name/ch/changedetection-io/package.nix b/pkgs/by-name/ch/changedetection-io/package.nix
index 797c6096e2d04..390f4079216b7 100644
--- a/pkgs/by-name/ch/changedetection-io/package.nix
+++ b/pkgs/by-name/ch/changedetection-io/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "changedetection-io";
-  version = "0.48.01";
+  version = "0.48.05";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "dgtlmoon";
     repo = "changedetection.io";
     tag = version;
-    hash = "sha256-iUg6AzI92t8tZGX9LXkU1n8Q94qm/F7xWwsCMkClBnw=";
+    hash = "sha256-oOuHPOvs3qcQcibKyChe2AK1OB3JK/xRKUp1cj5p5PU=";
   };
 
   pythonRelaxDeps = true;

From 4cdcd2ba31f816844a9555d1149b85e17f4ffb12 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Thu, 26 Dec 2024 15:16:42 -0800
Subject: [PATCH 309/340] teams: create Android team

We have needed this for a while, especially as it relates to
coordinating Android repo updates.

Create it with the people who expressed interest in:
https://github.com/NixOS/nixpkgs/issues/359918
---
 maintainers/team-list.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 97f9848492650..66c2440b0bdcb 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -44,6 +44,19 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  android = {
+    members = [
+      numinit
+      hadilq
+      RossComputerGuy
+      adrian-gierakowski
+    ];
+    scope = "Maintain Android-related tooling in nixpkgs.";
+    githubTeams = [ "android" ];
+    shortName = "Android";
+    enableFeatureFreezePing = true;
+  };
+
   bazel = {
     members = [
       mboes

From 4a77d7b4a1cc73fdb0046cd3601fccb67ab920e0 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Sun, 29 Dec 2024 00:25:01 +0300
Subject: [PATCH 310/340] rockcraft: actually use sources for 1.7.0

---
 pkgs/by-name/ro/rockcraft/package.nix | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix
index 6b1d272edaa26..a326d4baac3fe 100644
--- a/pkgs/by-name/ro/rockcraft/package.nix
+++ b/pkgs/by-name/ro/rockcraft/package.nix
@@ -13,18 +13,11 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "rockcraft";
-    rev = "1d87e33cf207b3a2f16eb125743ec11546fa0cb1";
-    hash = "sha256-QnW3BMu4Tuvj8PCt5eYJbNMiojXpyJ1uza6hpMxxSOE=";
+    rev = version;
+    hash = "sha256-2Bo3qtpSSfNvqszlt9cCc9/rurDNDMySAaqLbvRmjjw=";
   };
 
-  postPatch = ''
-    substituteInPlace rockcraft/__init__.py \
-      --replace-fail "dev" "${version}"
-
-    substituteInPlace rockcraft/utils.py \
-      --replace-fail "distutils.util" "setuptools.dist"
-  '';
-
+  pyproject = true;
   build-system = with python3Packages; [ setuptools-scm ];
 
   dependencies = with python3Packages; [
@@ -32,6 +25,7 @@ python3Packages.buildPythonApplication rec {
     craft-archives
     craft-platforms
     spdx-lookup
+    tabulate
   ];
 
   nativeCheckInputs =
@@ -42,7 +36,6 @@ python3Packages.buildPythonApplication rec {
       pytest-mock
       pytest-subprocess
       pytestCheckHook
-      tabulate
     ]
     ++ [ dpkg ];
 
@@ -51,7 +44,10 @@ python3Packages.buildPythonApplication rec {
     export HOME="$(pwd)/check-phase"
   '';
 
-  disabledTests = [ "test_expand_extensions" ];
+  disabledTests = [
+    "test_run_init_flask"
+    "test_run_init_django"
+  ];
 
   passthru.updateScript = nix-update-script { };
 

From 113a737ffe638d625345c096b5a27004e76179a9 Mon Sep 17 00:00:00 2001
From: Quentin Boyer <quentin+dev@familleboyer.net>
Date: Sat, 28 Dec 2024 22:20:43 +0100
Subject: [PATCH 311/340] djlint: 1.35.2 -> 1.36.4

Diff: https://github.com/Riverside-Healthcare/djlint/compare/refs/tags/v1.35.2...v1.36.4
---
 pkgs/by-name/dj/djlint/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/dj/djlint/package.nix b/pkgs/by-name/dj/djlint/package.nix
index 1013e4be617be..9581ba9bf9aaf 100644
--- a/pkgs/by-name/dj/djlint/package.nix
+++ b/pkgs/by-name/dj/djlint/package.nix
@@ -6,18 +6,18 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "djlint";
-  version = "1.35.2";
+  version = "1.36.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Riverside-Healthcare";
     repo = "djlint";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-KdIK6SgOQiNc13Nzg6MI38BdkBdEClnMn1RcWvngP+A=";
+    tag = "v${version}";
+    hash = "sha256-1DXBDVe8Ae8joJOYwwlBZB8MVubDPVhh+TiJBpL2u2M=";
   };
 
   build-system = with python3.pkgs; [
-    poetry-core
+    hatchling
   ];
 
   pythonRelaxDeps = [
@@ -29,8 +29,6 @@ python3.pkgs.buildPythonApplication rec {
     click
     colorama
     cssbeautifier
-    html-tag-names
-    html-void-elements
     jsbeautifier
     json5
     pathspec
@@ -47,6 +45,7 @@ python3.pkgs.buildPythonApplication rec {
     mainProgram = "djlint";
     homepage = "https://github.com/Riverside-Healthcare/djlint";
     license = lib.licenses.gpl3Only;
+    changelog = "https://github.com/djlint/djLint/blob/v${version}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ traxys ];
   };
 }

From 1d22a9aa5abc2b89cfb60e00b460697673cba4bc Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Sun, 29 Dec 2024 00:43:51 +0300
Subject: [PATCH 312/340] rockcraft: add passthru.tests.version

---
 pkgs/by-name/ro/rockcraft/package.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix
index a326d4baac3fe..38bf29563dd26 100644
--- a/pkgs/by-name/ro/rockcraft/package.nix
+++ b/pkgs/by-name/ro/rockcraft/package.nix
@@ -4,6 +4,9 @@
   fetchFromGitHub,
   dpkg,
   nix-update-script,
+  testers,
+  rockcraft,
+  cacert,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -49,7 +52,14 @@ python3Packages.buildPythonApplication rec {
     "test_run_init_django"
   ];
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion {
+      package = rockcraft;
+      command = "env SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt HOME=$(mktemp -d) rockcraft --version";
+      version = "rockcraft ${version}";
+    };
+  };
 
   meta = {
     mainProgram = "rockcraft";

From 7bd3a283c0b7dc9720880f70575e6e98abe740e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Dec 2024 13:57:16 +0000
Subject: [PATCH 313/340] plexRaw: 1.41.3.9292-bc7397402 ->
 1.41.3.9314-a0bfb8370

---
 pkgs/servers/plex/raw.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 2c9de7d77c3b8..16f3fe5233598 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -14,7 +14,7 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.41.3.9292-bc7397402";
+  version = "1.41.3.9314-a0bfb8370";
   pname = "plexmediaserver";
 
   # Fetch the source
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
     if stdenv.hostPlatform.system == "aarch64-linux" then
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-        sha256 = "0xbkd8iplvzgm0jqgz6ncxwx0bhdkm0208z22cpjh1ynjqx5lvkq";
+        sha256 = "0dx39rx2n5z29c8bsdza3fpz6dxz9w2f0ay4x9j6x4aqflrcql1i";
       }
     else
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-        sha256 = "1a18xfc69yk99hw3q3nv4ibmgq6whk3ywwfq5r91v8fsb7l9cf58";
+        sha256 = "0cpwpig0wmb8p6d3l1izp06dyv5ry2qd7vjq7d6dn080099pmvcj";
       };
 
   outputs = [

From e8ef3a063cd255e1fd5bb8baefbe28c0f1785df1 Mon Sep 17 00:00:00 2001
From: Yongun Seong <nevivurn@nevi.dev>
Date: Sat, 28 Dec 2024 14:56:09 +0900
Subject: [PATCH 314/340] libdbiDrivers: fix compile errors in tests, backport
 patches

---
 ...drivers-0.9.0-470b58e15-wait-include.patch | 23 +++++++++++++
 ...-drivers-0.9.0-9f378826-compare-type.patch | 22 +++++++++++++
 .../libdbi-drivers-0.9.0-function-types.patch | 32 +++++++++++++++++++
 pkgs/by-name/li/libdbiDrivers/package.nix     |  8 ++++-
 4 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-470b58e15-wait-include.patch
 create mode 100644 pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-9f378826-compare-type.patch
 create mode 100644 pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-function-types.patch

diff --git a/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-470b58e15-wait-include.patch b/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-470b58e15-wait-include.patch
new file mode 100644
index 0000000000000..ff507774852dc
--- /dev/null
+++ b/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-470b58e15-wait-include.patch
@@ -0,0 +1,23 @@
+commit 470b58e15dc6f406899b1695aec7fc98986b8f14
+Author: Jan Engelhardt <jengelh@inai.de>
+Date:   Fri Jan 27 09:56:44 2017 +0100
+
+    build: resolve compiler warning for wait(2)
+    
+    src/unit.c: In function "wait_for_child_process":
+    src/unit.c:229:5: warning: implicit declaration of function "wait" [-Wimplicit-function-declaration]
+         wait(&status);
+
+diff --git a/tests/cgreen/src/unit.c b/tests/cgreen/src/unit.c
+index 7753ff1..bdd236f 100644
+--- a/tests/cgreen/src/unit.c
++++ b/tests/cgreen/src/unit.c
+@@ -9,6 +9,7 @@
+ #include <stdarg.h>
+ #include <unistd.h>
+ #include <signal.h>
++#include <sys/wait.h>
+ 
+ enum {test_function, test_suite};
+ 
+
diff --git a/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-9f378826-compare-type.patch b/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-9f378826-compare-type.patch
new file mode 100644
index 0000000000000..2da73adb2d2e9
--- /dev/null
+++ b/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-9f378826-compare-type.patch
@@ -0,0 +1,22 @@
+commit 9f3788269befd2e4290eef1df4b014bc2385d801
+Author: Jan Engelhardt <jengelh@inai.de>
+Date:   Sat Sep 7 22:51:05 2013 +0200
+
+    build: resolve rpmlint aborting due to bad code
+
+diff --git a/tests/cgreen/src/constraint.c b/tests/cgreen/src/constraint.c
+index c19c0dd..b0fbfb8 100644
+--- a/tests/cgreen/src/constraint.c
++++ b/tests/cgreen/src/constraint.c
+@@ -164,8 +164,8 @@ static void test_want_double(Constraint *constraint, const char *function, intpt
+ }
+ 
+ static int compare_using_matcher(Constraint *constraint, intptr_t actual) {
+-	int (*matches)(const void*) = constraint->expected;
+-    return matches(actual);
++	int (*matches)(const void*) = (void *)(intptr_t)constraint->expected;
++    return matches((void *)actual);
+ }
+ 
+ static void test_with_matcher(Constraint *constraint, const char *function, const char* matcher_name, intptr_t matcher_function, const char *test_file, int test_line, TestReporter *reporter) {
+
diff --git a/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-function-types.patch b/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-function-types.patch
new file mode 100644
index 0000000000000..7632a7f5b900a
--- /dev/null
+++ b/pkgs/by-name/li/libdbiDrivers/libdbi-drivers-0.9.0-function-types.patch
@@ -0,0 +1,32 @@
+diff --git a/tests/cgreen/src/constraint.c b/tests/cgreen/src/constraint.c
+index 56c3625..d8972bb 100644
+--- a/tests/cgreen/src/constraint.c
++++ b/tests/cgreen/src/constraint.c
+@@ -22,7 +22,7 @@ static double unbox_double(intptr_t box);
+ static double as_double(intptr_t box);
+ 
+ static int compare_using_matcher(Constraint *constraint, intptr_t actual);
+-static void test_with_matcher(Constraint *constraint, const char *function, const char* matcher_name, intptr_t actual, const char *test_file, int test_line, TestReporter *reporter);
++static void test_with_matcher(Constraint *constraint, const char *function, intptr_t actual, const char *test_file, int test_line, TestReporter *reporter);
+ 
+ 
+ void destroy_constraint(void *abstract) {
+@@ -168,15 +168,14 @@ static int compare_using_matcher(Constraint *constraint, intptr_t actual) {
+     return matches((void *)actual);
+ }
+ 
+-static void test_with_matcher(Constraint *constraint, const char *function, const char* matcher_name, intptr_t matcher_function, const char *test_file, int test_line, TestReporter *reporter) {
++static void test_with_matcher(Constraint *constraint, const char *function, intptr_t matcher_function, const char *test_file, int test_line, TestReporter *reporter) {
+     (*reporter->assert_true)(
+             reporter,
+             test_file,
+             test_line,
+             (*constraint->compare)(constraint, matcher_function),
+-            "Wanted parameter [%s] to match [%s] in function [%s]",
++            "Wanted parameter [%s] to match [nil] in function [%s]",
+             constraint->parameter,
+-            matcher_name,
+             function);
+ }
+ 
+
diff --git a/pkgs/by-name/li/libdbiDrivers/package.nix b/pkgs/by-name/li/libdbiDrivers/package.nix
index 66edca677d6c4..4334f8ba5cb00 100644
--- a/pkgs/by-name/li/libdbiDrivers/package.nix
+++ b/pkgs/by-name/li/libdbiDrivers/package.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/libdbi-drivers/libdbi-drivers-${version}.tar.gz";
-    sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
+    hash = "sha256-Q9LqzVc6T6/ylvqSXdl/vyrtvxrjXGJjR4IQxhAEyFQ=";
   };
 
   buildInputs = [
@@ -27,6 +27,12 @@ stdenv.mkDerivation rec {
   patches = [
     # https://sourceforge.net/p/libdbi-drivers/libdbi-drivers/ci/24f48b86c8988ee3aaebc5f303d71e9d789f77b6
     ./libdbi-drivers-0.9.0-buffer_overflow.patch
+    # https://sourceforge.net/p/libdbi-drivers/libdbi-drivers/ci/470b58e15dc6f406899b1695aec7fc98986b8f14
+    ./libdbi-drivers-0.9.0-470b58e15-wait-include.patch
+    # https://sourceforge.net/p/libdbi-drivers/libdbi-drivers/ci/9f3788269befd2e4290eef1df4b014bc2385d801
+    ./libdbi-drivers-0.9.0-9f378826-compare-type.patch
+    # fix function pointer type mismatches in tests
+    ./libdbi-drivers-0.9.0-function-types.patch
   ];
 
   postPatch = ''

From 1f4e626d43b2c24247450548dec1c7c0d6078f31 Mon Sep 17 00:00:00 2001
From: Quentin Boyer <quentin+dev@familleboyer.net>
Date: Sat, 28 Dec 2024 22:48:37 +0100
Subject: [PATCH 315/340] fittrackee: 0.8.10 -> 0.8.12

Diff: https://github.com/SamR1/FitTrackee/compare/refs/tags/v0.8.10...v0.8.12

Changelog: https://github.com/SamR1/FitTrackee/blob/refs/tags/v0.8.12/CHANGELOG.md
---
 pkgs/by-name/fi/fittrackee/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix
index 586464b5ad491..7cd75f7c6c990 100644
--- a/pkgs/by-name/fi/fittrackee/package.nix
+++ b/pkgs/by-name/fi/fittrackee/package.nix
@@ -28,14 +28,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "fittrackee";
-  version = "0.8.10";
+  version = "0.8.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SamR1";
     repo = "FitTrackee";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-K110H5Y8vQrRx2/O+2ezhpGp4G5sJUlzE+1cSYu7+4I=";
+    tag = "v${version}";
+    hash = "sha256-knhXFhBb11KWidw6ym8EdZJJ9CDSU4TarupegYJx94A=";
   };
 
   build-system = [
@@ -108,7 +108,7 @@ python.pkgs.buildPythonApplication rec {
   meta = {
     description = "Self-hosted outdoor activity tracker";
     homepage = "https://github.com/SamR1/FitTrackee";
-    changelog = "https://github.com/SamR1/FitTrackee/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/SamR1/FitTrackee/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.agpl3Only;
     maintainers = with lib.maintainers; [ traxys ];
   };

From 4ec084e858be97ee9f6f007dabaccecee4a78953 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 27 Dec 2024 19:19:39 +0100
Subject: [PATCH 316/340] sofia-sip: fix build with gcc-14

---
 pkgs/development/libraries/sofia-sip/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix
index 8555b4e9617af..d70bd95bef04b 100644
--- a/pkgs/development/libraries/sofia-sip/default.nix
+++ b/pkgs/development/libraries/sofia-sip/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   glib,
   openssl,
   pkg-config,
@@ -20,6 +21,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY=";
   };
 
+  patches = [
+    # Fix build with gcc 14 from https://github.com/freeswitch/sofia-sip/pull/249
+    (fetchpatch2 {
+      name = "sofia-sip-fix-incompatible-pointer-type.patch";
+      url = "https://github.com/freeswitch/sofia-sip/commit/46b02f0655af0a9594e805f09a8ee99278f84777.diff";
+      hash = "sha256-4uZVtKnXG+BPW8byjd7tu4uEZo9SYq9EzTEvMwG0Bak=";
+    })
+  ];
+
   buildInputs = [
     glib
     openssl

From a213da1d8bba75dc5b0c0677704c06d16acf1e79 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Sat, 28 Dec 2024 16:53:10 -0300
Subject: [PATCH 317/340] nextcloud-client: move to by-name, tweak

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 ...e-autostart-entry-do-not-use-an-abso.patch |  0
 .../ne/nextcloud-client/package.nix}          | 44 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 19 insertions(+), 27 deletions(-)
 rename pkgs/{applications/networking => by-name/ne}/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch (100%)
 rename pkgs/{applications/networking/nextcloud-client/default.nix => by-name/ne/nextcloud-client/package.nix} (74%)

diff --git a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch b/pkgs/by-name/ne/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch
similarity index 100%
rename from pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch
rename to pkgs/by-name/ne/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
similarity index 74%
rename from pkgs/applications/networking/nextcloud-client/default.nix
rename to pkgs/by-name/ne/nextcloud-client/package.nix
index 376dbae748363..18a63ad2e8ad5 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -1,6 +1,7 @@
 { lib
-, stdenv
+, gitUpdater
 , fetchFromGitHub
+, qt6Packages
 , cmake
 , extra-cmake-modules
 , inotify-tools
@@ -11,21 +12,12 @@
 , openssl
 , pcre
 , pkg-config
-, qt5compat
-, qtbase
-, qtkeychain
-, qtsvg
-, qttools
-, qtwebengine
-, qtwebsockets
 , sphinx
 , sqlite
 , xdg-utils
-, qtwayland
-, wrapQtAppsHook
 }:
 
-stdenv.mkDerivation rec {
+qt6Packages.stdenv.mkDerivation rec {
   pname = "nextcloud-client";
   version = "3.14.3";
 
@@ -34,7 +26,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nextcloud-releases";
     repo = "desktop";
-    rev = "refs/tags/v${version}";
+    tag = "v${version}";
     hash = "sha256-nYoBs5EnWiqYRsqc5CPxCIs0NAxSprI9PV0lO/c8khw=";
   };
 
@@ -55,7 +47,7 @@ stdenv.mkDerivation rec {
     extra-cmake-modules
     librsvg
     sphinx
-    wrapQtAppsHook
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -65,15 +57,15 @@ stdenv.mkDerivation rec {
     libsecret
     openssl
     pcre
-    qt5compat
-    qtbase
-    qtkeychain
-    qtsvg
-    qttools
-    qtwebengine
-    qtwebsockets
+    qt6Packages.qt5compat
+    qt6Packages.qtbase
+    qt6Packages.qtkeychain
+    qt6Packages.qtsvg
+    qt6Packages.qttools
+    qt6Packages.qtwebengine
+    qt6Packages.qtwebsockets
+    qt6Packages.qtwayland
     sqlite
-    qtwayland
   ];
 
   qtWrapperArgs = [
@@ -92,13 +84,15 @@ stdenv.mkDerivation rec {
     make doc-man
   '';
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
+  meta = {
     changelog = "https://github.com/nextcloud/desktop/releases/tag/v${version}";
     description = "Desktop sync client for Nextcloud";
     homepage = "https://nextcloud.com";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ kranzes SuperSandro2000 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ kranzes SuperSandro2000 ];
+    platforms = lib.platforms.linux;
     mainProgram = "nextcloud";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86ce4f1eb9a27..7baad67708f43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4445,8 +4445,6 @@ with pkgs;
   nextcloud29Packages = callPackage ../servers/nextcloud/packages { ncVersion = "29"; };
   nextcloud30Packages = callPackage ../servers/nextcloud/packages { ncVersion = "30"; };
 
-  nextcloud-client = qt6Packages.callPackage ../applications/networking/nextcloud-client { };
-
   nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };
 
   nextcloud-notify_push = callPackage ../servers/nextcloud/notify_push.nix { };

From 59156600340990e3081254cac40911d851618e19 Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Sat, 28 Dec 2024 16:54:53 -0300
Subject: [PATCH 318/340] nextcloud-client: 3.14.3 -> 3.15.2

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/ne/nextcloud-client/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
index 18a63ad2e8ad5..3e68ff0a8cd1f 100644
--- a/pkgs/by-name/ne/nextcloud-client/package.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -19,7 +19,7 @@
 
 qt6Packages.stdenv.mkDerivation rec {
   pname = "nextcloud-client";
-  version = "3.14.3";
+  version = "3.15.2";
 
   outputs = [ "out" "dev" ];
 
@@ -27,7 +27,7 @@ qt6Packages.stdenv.mkDerivation rec {
     owner = "nextcloud-releases";
     repo = "desktop";
     tag = "v${version}";
-    hash = "sha256-nYoBs5EnWiqYRsqc5CPxCIs0NAxSprI9PV0lO/c8khw=";
+    hash = "sha256-JA6ke9tBS4IiuDWJ8Efa76+5os+RT0L/zv00ncgH+IU=";
   };
 
   patches = [

From 45326182fd9ee391fc470474340b5dd1c01894cf Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Sat, 28 Dec 2024 17:08:05 -0300
Subject: [PATCH 319/340] nextcloud-client: add libsysprof-capture to
 dependencies as asked by the build system

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/by-name/ne/nextcloud-client/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
index 3e68ff0a8cd1f..58b8c585037c8 100644
--- a/pkgs/by-name/ne/nextcloud-client/package.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -15,6 +15,7 @@
 , sphinx
 , sqlite
 , xdg-utils
+, libsysprof-capture
 }:
 
 qt6Packages.stdenv.mkDerivation rec {
@@ -66,6 +67,7 @@ qt6Packages.stdenv.mkDerivation rec {
     qt6Packages.qtwebsockets
     qt6Packages.qtwayland
     sqlite
+    libsysprof-capture
   ];
 
   qtWrapperArgs = [

From 15d38c4c5fc2ea9af0228b6bd32543e786fb3dba Mon Sep 17 00:00:00 2001
From: Saturn745 <gitcommits.8lvon@passinbox.com>
Date: Sat, 28 Dec 2024 16:06:43 -0700
Subject: [PATCH 320/340] netbird: 0.34.1 -> 0.35.1

Diff: https://github.com/netbirdio/netbird/compare/v0.34.1...0.35.1

Changelog: https://github.com/netbirdio/netbird/releases/tag/v0.35.1
---
 pkgs/tools/networking/netbird/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix
index b2bb6c3960001..f414b1a3f8d9f 100644
--- a/pkgs/tools/networking/netbird/default.nix
+++ b/pkgs/tools/networking/netbird/default.nix
@@ -31,16 +31,16 @@ let
 in
 buildGoModule rec {
   pname = "netbird";
-  version = "0.34.1";
+  version = "0.35.1";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     rev = "v${version}";
-    hash = "sha256-UQ91Xjw7RTtTMCrCKyv8tk08hhgyXbjG+QKuVjNk4kM=";
+    hash = "sha256-PgJm0+HqJMdDjbX+9a86BmicArJCiegf4n7A1sHNQ0Y=";
   };
 
-  vendorHash = "sha256-8ML6s+XPhciYHhWfUOQqgN2XSSqgZ9ULZ6+arWgQjMY=";
+  vendorHash = "sha256-CgfZZOiFDLf6vCbzovpwzt7FlO9BnzNSdR8e5U+xCDQ=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
 

From e1c234e5e2996b030a0fa9bfc686f9bd624d5336 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 28 Dec 2024 18:24:45 -0500
Subject: [PATCH 321/340] treewide: add updateScript to gnome circle packages
 (#367823)

* decoder: remove gnome circle team from maintainers

This was mistakenly placed here instead of in `gnome-decoder`

* gnome-decoder: add gnome circle team to maintainers

* treewide: add updateScript to gnome circle packages
---
 pkgs/applications/graphics/gnome-decoder/default.nix  |  7 ++++++-
 .../applications/graphics/gnome-obfuscate/default.nix |  5 +++++
 pkgs/by-name/am/amberol/package.nix                   |  5 +++++
 pkgs/by-name/ap/apostrophe/package.nix                |  2 ++
 pkgs/by-name/au/authenticator/package.nix             |  5 +++++
 pkgs/by-name/bi/biblioteca/package.nix                |  5 +++++
 pkgs/by-name/bi/binary/package.nix                    |  5 +++++
 pkgs/by-name/bl/blanket/package.nix                   |  5 +++++
 pkgs/by-name/bo/boatswain/package.nix                 |  5 +++++
 pkgs/by-name/ca/cartridges/package.nix                |  5 +++++
 pkgs/by-name/ch/chess-clock/package.nix               |  5 +++++
 pkgs/by-name/ci/citations/package.nix                 | 11 ++++++++---
 pkgs/by-name/cl/clairvoyant/package.nix               |  5 +++++
 pkgs/by-name/cu/curtail/package.nix                   |  5 +++++
 pkgs/by-name/de/decoder/package.nix                   |  2 +-
 pkgs/by-name/de/deja-dup/package.nix                  |  5 +++++
 pkgs/by-name/di/diebahn/package.nix                   |  5 +++++
 pkgs/by-name/ea/eartag/package.nix                    |  5 +++++
 pkgs/by-name/el/elastic/package.nix                   |  5 +++++
 pkgs/by-name/em/emblem/package.nix                    |  5 +++++
 pkgs/by-name/er/errands/package.nix                   |  5 +++++
 pkgs/by-name/ey/eyedropper/package.nix                |  5 +++++
 pkgs/by-name/fo/forge-sparks/package.nix              |  5 +++++
 pkgs/by-name/fr/fragments/package.nix                 |  5 +++++
 pkgs/by-name/fr/fretboard/package.nix                 |  5 +++++
 pkgs/by-name/gn/gnome-graphs/package.nix              |  5 +++++
 pkgs/by-name/gn/gnome-podcasts/package.nix            |  5 +++++
 pkgs/by-name/gn/gnome-secrets/package.nix             |  5 +++++
 pkgs/by-name/gn/gnome-solanum/package.nix             |  5 +++++
 pkgs/by-name/he/health/package.nix                    |  5 +++++
 pkgs/by-name/hi/hieroglyphic/package.nix              |  5 +++++
 pkgs/by-name/im/impression/package.nix                |  5 +++++
 pkgs/by-name/ju/junction/package.nix                  |  5 +++++
 pkgs/by-name/le/letterpress/package.nix               |  5 +++++
 pkgs/by-name/lo/lorem/package.nix                     |  5 +++++
 pkgs/by-name/me/metadata-cleaner/package.nix          |  5 +++++
 pkgs/by-name/mo/mousai/package.nix                    |  5 +++++
 pkgs/by-name/pa/paper-clip/package.nix                |  5 +++++
 pkgs/by-name/pi/pika-backup/package.nix               |  5 +++++
 pkgs/by-name/ra/raider/package.nix                    |  5 +++++
 pkgs/by-name/sh/share-preview/package.nix             |  5 +++++
 pkgs/by-name/sh/shortwave/package.nix                 |  5 +++++
 pkgs/by-name/sw/switcheroo/package.nix                |  5 +++++
 pkgs/by-name/ta/tangram/package.nix                   |  5 +++++
 pkgs/by-name/te/textpieces/package.nix                |  5 +++++
 pkgs/by-name/va/valuta/package.nix                    |  5 +++++
 pkgs/by-name/vi/video-trimmer/package.nix             |  5 +++++
 pkgs/by-name/wa/warp/package.nix                      |  5 +++++
 pkgs/by-name/we/webfontkitgenerator/package.nix       |  5 +++++
 pkgs/by-name/wi/wike/package.nix                      |  2 ++
 pkgs/tools/misc/gaphor/default.nix                    |  5 +++++
 51 files changed, 249 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix
index cc4661111bb95..3114262e765f5 100644
--- a/pkgs/applications/graphics/gnome-decoder/default.nix
+++ b/pkgs/applications/graphics/gnome-decoder/default.nix
@@ -23,6 +23,7 @@
 , appstream-glib
 , desktop-file-utils
 , glycin-loaders
+, nix-update-script
 }:
 
 clangStdenv.mkDerivation rec {
@@ -80,12 +81,16 @@ clangStdenv.mkDerivation rec {
     gst-plugins-rs # for gtk4paintablesink
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Scan and Generate QR Codes";
     homepage = "https://gitlab.gnome.org/World/decoder";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     mainProgram = "decoder";
-    maintainers = with maintainers; [ zendo ];
+    maintainers = with maintainers; [ zendo ] ++ lib.teams.gnome-circle.members;
   };
 }
diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix
index d860605c12325..5c8a61a5d25cb 100644
--- a/pkgs/applications/graphics/gnome-obfuscate/default.nix
+++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix
@@ -18,6 +18,7 @@
   gdk-pixbuf,
   libadwaita,
   Foundation,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -70,6 +71,10 @@ stdenv.mkDerivation (finalAttrs: {
       Foundation
     ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Censor private information";
     homepage = "https://gitlab.gnome.org/World/obfuscate";
diff --git a/pkgs/by-name/am/amberol/package.nix b/pkgs/by-name/am/amberol/package.nix
index 6eb7ee24c0032..f19812224e0fc 100644
--- a/pkgs/by-name/am/amberol/package.nix
+++ b/pkgs/by-name/am/amberol/package.nix
@@ -18,6 +18,7 @@
   gst_all_1,
   libadwaita,
   dbus,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -72,6 +73,10 @@ stdenv.mkDerivation rec {
       gst-libav
     ]);
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     homepage = "https://gitlab.gnome.org/World/amberol";
     description = "Small and simple sound and music player";
diff --git a/pkgs/by-name/ap/apostrophe/package.nix b/pkgs/by-name/ap/apostrophe/package.nix
index c758a8f1bc65b..955113945be49 100644
--- a/pkgs/by-name/ap/apostrophe/package.nix
+++ b/pkgs/by-name/ap/apostrophe/package.nix
@@ -16,6 +16,7 @@
   webkitgtk_6_0,
   texliveMedium,
   shared-mime-info,
+  nix-update-script,
 }:
 
 let
@@ -98,6 +99,7 @@ python3Packages.buildPythonApplication {
 
   passthru = {
     inherit reveal-js;
+    updateScript = nix-update-script { };
   };
 
   meta = {
diff --git a/pkgs/by-name/au/authenticator/package.nix b/pkgs/by-name/au/authenticator/package.nix
index 6a293cfff79cd..472c604d0ec36 100644
--- a/pkgs/by-name/au/authenticator/package.nix
+++ b/pkgs/by-name/au/authenticator/package.nix
@@ -21,6 +21,7 @@
 , wayland
 , zbar
 , glycin-loaders
+, nix-update-script
 }:
 
 stdenv.mkDerivation rec {
@@ -80,6 +81,10 @@ stdenv.mkDerivation rec {
     zbar
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Two-factor authentication code generator for GNOME";
     mainProgram = "authenticator";
diff --git a/pkgs/by-name/bi/biblioteca/package.nix b/pkgs/by-name/bi/biblioteca/package.nix
index 178b31f2ddb36..f857d8f7a723e 100644
--- a/pkgs/by-name/bi/biblioteca/package.nix
+++ b/pkgs/by-name/bi/biblioteca/package.nix
@@ -18,6 +18,7 @@
   wrapGAppsHook4,
   glib-networking,
   symlinkJoin,
+  nix-update-script,
   extraDocsPackage ? [ ],
 }:
 
@@ -93,6 +94,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     homepage = "https://apps.gnome.org/Biblioteca/";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/bi/binary/package.nix b/pkgs/by-name/bi/binary/package.nix
index 0dc39f3a428cb..615408de74fe9 100644
--- a/pkgs/by-name/bi/binary/package.nix
+++ b/pkgs/by-name/bi/binary/package.nix
@@ -10,6 +10,7 @@
   libadwaita,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   python3Packages,
   wrapGAppsHook4,
@@ -56,6 +57,10 @@ python3Packages.buildPythonApplication rec {
     mesonCheckPhase
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Small and simple app to convert numbers to a different base";
     homepage = "https://github.com/fizzyizzy05/binary";
diff --git a/pkgs/by-name/bl/blanket/package.nix b/pkgs/by-name/bl/blanket/package.nix
index e2ae6ee25aad5..631bc50629216 100644
--- a/pkgs/by-name/bl/blanket/package.nix
+++ b/pkgs/by-name/bl/blanket/package.nix
@@ -13,6 +13,7 @@
   libadwaita,
   gobject-introspection,
   gst_all_1,
+  nix-update-script,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -62,6 +63,10 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Listen to different sounds";
     homepage = "https://github.com/rafaelmardojai/blanket";
diff --git a/pkgs/by-name/bo/boatswain/package.nix b/pkgs/by-name/bo/boatswain/package.nix
index 7481330831bfd..4dbdaa3e462cd 100644
--- a/pkgs/by-name/bo/boatswain/package.nix
+++ b/pkgs/by-name/bo/boatswain/package.nix
@@ -19,6 +19,7 @@
   libsecret,
   libsoup_3,
   libpeas2,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -56,6 +57,10 @@ stdenv.mkDerivation rec {
     libpeas2
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Control Elgato Stream Deck devices";
     homepage = "https://gitlab.gnome.org/World/boatswain";
diff --git a/pkgs/by-name/ca/cartridges/package.nix b/pkgs/by-name/ca/cartridges/package.nix
index 679e2e0750c75..3edfca864c120 100644
--- a/pkgs/by-name/ca/cartridges/package.nix
+++ b/pkgs/by-name/ca/cartridges/package.nix
@@ -11,6 +11,7 @@
   libadwaita,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   python3Packages,
   wrapGAppsHook4,
@@ -69,6 +70,10 @@ python3Packages.buildPythonApplication rec {
     mesonCheckPhase
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "GTK4 + Libadwaita game launcher";
     longDescription = ''
diff --git a/pkgs/by-name/ch/chess-clock/package.nix b/pkgs/by-name/ch/chess-clock/package.nix
index f4ed3ce577091..232b59c1bdba2 100644
--- a/pkgs/by-name/ch/chess-clock/package.nix
+++ b/pkgs/by-name/ch/chess-clock/package.nix
@@ -8,6 +8,7 @@
   libadwaita,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   python3,
   stdenv,
@@ -46,6 +47,10 @@ stdenv.mkDerivation rec {
     ))
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Time games of over-the-board chess";
     homepage = "https://gitlab.gnome.org/World/chess-clock";
diff --git a/pkgs/by-name/ci/citations/package.nix b/pkgs/by-name/ci/citations/package.nix
index 1168a6bab8fc6..b030947b02385 100644
--- a/pkgs/by-name/ci/citations/package.nix
+++ b/pkgs/by-name/ci/citations/package.nix
@@ -19,6 +19,7 @@
   testers,
   wrapGAppsHook4,
   clippy,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -80,9 +81,13 @@ stdenv.mkDerivation (finalAttrs: {
     sed -i -e '/PATH=/d' ../src/meson.build
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = finalAttrs.finalPackage;
-    command = "citations --help";
+  passthru = {
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      command = "citations --help";
+    };
+
+    updateScript = nix-update-script { };
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/cl/clairvoyant/package.nix b/pkgs/by-name/cl/clairvoyant/package.nix
index 854d98794cd43..b6f6ae3ddb190 100644
--- a/pkgs/by-name/cl/clairvoyant/package.nix
+++ b/pkgs/by-name/cl/clairvoyant/package.nix
@@ -10,6 +10,7 @@
   stdenv,
   vala,
   wrapGAppsHook4,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -37,6 +38,10 @@ stdenv.mkDerivation (finalAttrs: {
     libportal
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     changelog = "https://github.com/cassidyjames/clairvoyant/releases/tag/${finalAttrs.version}";
     description = "Ask questions, get psychic answers";
diff --git a/pkgs/by-name/cu/curtail/package.nix b/pkgs/by-name/cu/curtail/package.nix
index 38230841c4623..dbe74dee24eb2 100644
--- a/pkgs/by-name/cu/curtail/package.nix
+++ b/pkgs/by-name/cu/curtail/package.nix
@@ -17,6 +17,7 @@
   optipng,
   pngquant,
   oxipng,
+  nix-update-script,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -76,6 +77,10 @@ python3.pkgs.buildPythonApplication rec {
     )
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Simple & useful image compressor";
     mainProgram = "curtail";
diff --git a/pkgs/by-name/de/decoder/package.nix b/pkgs/by-name/de/decoder/package.nix
index 91f9cd8275382..92478c1ab0d32 100644
--- a/pkgs/by-name/de/decoder/package.nix
+++ b/pkgs/by-name/de/decoder/package.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
     mainProgram = "decoder";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ Luflosi ] ++ lib.teams.gnome-circle.members;
+    maintainers = with maintainers; [ Luflosi ];
   };
 }
diff --git a/pkgs/by-name/de/deja-dup/package.nix b/pkgs/by-name/de/deja-dup/package.nix
index 607b4ec144f8f..b45c605a9d925 100644
--- a/pkgs/by-name/de/deja-dup/package.nix
+++ b/pkgs/by-name/de/deja-dup/package.nix
@@ -21,6 +21,7 @@
   json-glib,
   duplicity,
   rclone,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -74,6 +75,10 @@ stdenv.mkDerivation (finalAttrs: {
     )
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Simple backup tool";
     longDescription = ''
diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix
index 305029b340225..158879695c4b6 100644
--- a/pkgs/by-name/di/diebahn/package.nix
+++ b/pkgs/by-name/di/diebahn/package.nix
@@ -19,6 +19,7 @@
   gettext,
   darwin,
   blueprint-compiler,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -76,6 +77,10 @@ stdenv.mkDerivation rec {
     GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib";
   };
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     changelog = "https://gitlab.com/schmiddi-on-mobile/railway/-/blob/${src.rev}/CHANGELOG.md";
     description = "Travel with all your train information in one place. Also known as Railway";
diff --git a/pkgs/by-name/ea/eartag/package.nix b/pkgs/by-name/ea/eartag/package.nix
index b57938796c2f9..d55be4b866e25 100644
--- a/pkgs/by-name/ea/eartag/package.nix
+++ b/pkgs/by-name/ea/eartag/package.nix
@@ -17,6 +17,7 @@
   librsvg,
   python3Packages,
   blueprint-compiler,
+  nix-update-script,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -73,6 +74,10 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     homepage = "https://gitlab.gnome.org/World/eartag";
     description = "Simple music tag editor";
diff --git a/pkgs/by-name/el/elastic/package.nix b/pkgs/by-name/el/elastic/package.nix
index fb59c6a86c32a..f8b981bf33ce4 100644
--- a/pkgs/by-name/el/elastic/package.nix
+++ b/pkgs/by-name/el/elastic/package.nix
@@ -13,6 +13,7 @@
 , wrapGAppsHook4
 , desktop-file-utils
 , template-glib
+, nix-update-script
 }:
 
 stdenv.mkDerivation rec {
@@ -45,6 +46,10 @@ stdenv.mkDerivation rec {
     template-glib
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Design spring animations";
     homepage = "https://gitlab.gnome.org/World/elastic/";
diff --git a/pkgs/by-name/em/emblem/package.nix b/pkgs/by-name/em/emblem/package.nix
index 5cf592125649b..439d8368a3c3a 100644
--- a/pkgs/by-name/em/emblem/package.nix
+++ b/pkgs/by-name/em/emblem/package.nix
@@ -14,6 +14,7 @@
   libadwaita,
   libxml2,
   darwin,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -62,6 +63,10 @@ stdenv.mkDerivation rec {
     ]
   );
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Generate project icons and avatars from a symbolic icon";
     mainProgram = "emblem";
diff --git a/pkgs/by-name/er/errands/package.nix b/pkgs/by-name/er/errands/package.nix
index 0b3c2a4439e8e..7448804c36964 100644
--- a/pkgs/by-name/er/errands/package.nix
+++ b/pkgs/by-name/er/errands/package.nix
@@ -14,6 +14,7 @@
   libportal,
   gtk4,
   gtksourceview5,
+  nix-update-script,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "errands";
@@ -59,6 +60,10 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Manage your tasks";
     changelog = "https://github.com/mrvladus/Errands/releases/tag/${version}";
diff --git a/pkgs/by-name/ey/eyedropper/package.nix b/pkgs/by-name/ey/eyedropper/package.nix
index 8f7be44128c78..5c30bd8143329 100644
--- a/pkgs/by-name/ey/eyedropper/package.nix
+++ b/pkgs/by-name/ey/eyedropper/package.nix
@@ -15,6 +15,7 @@
   wrapGAppsHook4,
   appstream-glib,
   desktop-file-utils,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -53,6 +54,10 @@ stdenv.mkDerivation rec {
     libadwaita
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Pick and format colors";
     homepage = "https://github.com/FineFindus/eyedropper";
diff --git a/pkgs/by-name/fo/forge-sparks/package.nix b/pkgs/by-name/fo/forge-sparks/package.nix
index 6d1e022e83d70..64f78c60b953f 100644
--- a/pkgs/by-name/fo/forge-sparks/package.nix
+++ b/pkgs/by-name/fo/forge-sparks/package.nix
@@ -13,6 +13,7 @@
   libsoup_3,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   stdenv,
   wrapGAppsHook4,
@@ -59,6 +60,10 @@ stdenv.mkDerivation (finalAttrs: {
     libsoup_3
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     changelog = "https://github.com/rafaelmardojai/forge-sparks/releases/tag/${finalAttrs.version}";
     description = "Get Git forges notifications";
diff --git a/pkgs/by-name/fr/fragments/package.nix b/pkgs/by-name/fr/fragments/package.nix
index 52e6914e14867..2107dd0c66314 100644
--- a/pkgs/by-name/fr/fragments/package.nix
+++ b/pkgs/by-name/fr/fragments/package.nix
@@ -12,6 +12,7 @@
   libadwaita,
   meson,
   ninja,
+  nix-update-script,
   openssl,
   pkg-config,
   rustPlatform,
@@ -67,6 +68,10 @@ stdenv.mkDerivation rec {
     )
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     homepage = "https://gitlab.gnome.org/World/Fragments";
     description = "Easy to use BitTorrent client for the GNOME desktop environment";
diff --git a/pkgs/by-name/fr/fretboard/package.nix b/pkgs/by-name/fr/fretboard/package.nix
index 5f10d06ff1129..d9debb71f9f67 100644
--- a/pkgs/by-name/fr/fretboard/package.nix
+++ b/pkgs/by-name/fr/fretboard/package.nix
@@ -10,6 +10,7 @@
   libadwaita,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   rustPlatform,
   rustc,
@@ -62,6 +63,10 @@ stdenv.mkDerivation (finalAttrs: {
     ]
   );
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     changelog = "https://github.com/bragefuglseth/fretboard/releases/tag/v${finalAttrs.version}";
     description = "Look up guitar chords";
diff --git a/pkgs/by-name/gn/gnome-graphs/package.nix b/pkgs/by-name/gn/gnome-graphs/package.nix
index 16850b5031574..522302e225243 100644
--- a/pkgs/by-name/gn/gnome-graphs/package.nix
+++ b/pkgs/by-name/gn/gnome-graphs/package.nix
@@ -14,6 +14,7 @@
   shared-mime-info,
   libadwaita,
   libgee,
+  nix-update-script,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -65,6 +66,10 @@ python3Packages.buildPythonApplication rec {
     )
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Simple, yet powerful tool that allows you to plot and manipulate your data with ease";
     homepage = "https://apps.gnome.org/Graphs";
diff --git a/pkgs/by-name/gn/gnome-podcasts/package.nix b/pkgs/by-name/gn/gnome-podcasts/package.nix
index 15c9bddf4b556..94504c6e2324e 100644
--- a/pkgs/by-name/gn/gnome-podcasts/package.nix
+++ b/pkgs/by-name/gn/gnome-podcasts/package.nix
@@ -20,6 +20,7 @@
   sqlite,
   gst_all_1,
   wrapGAppsHook4,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -69,6 +70,10 @@ stdenv.mkDerivation rec {
   # tests require network
   doCheck = false;
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Listen to your favorite podcasts";
     mainProgram = "gnome-podcasts";
diff --git a/pkgs/by-name/gn/gnome-secrets/package.nix b/pkgs/by-name/gn/gnome-secrets/package.nix
index d0bcb758b2545..5e5fe23166ec7 100644
--- a/pkgs/by-name/gn/gnome-secrets/package.nix
+++ b/pkgs/by-name/gn/gnome-secrets/package.nix
@@ -14,6 +14,7 @@
   desktop-file-utils,
   appstream-glib,
   libadwaita,
+  nix-update-script,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -65,6 +66,10 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Password manager for GNOME which makes use of the KeePass v.4 format";
     homepage = "https://gitlab.gnome.org/World/secrets";
diff --git a/pkgs/by-name/gn/gnome-solanum/package.nix b/pkgs/by-name/gn/gnome-solanum/package.nix
index ace79bc35ce1e..2b22d1bf2d437 100644
--- a/pkgs/by-name/gn/gnome-solanum/package.nix
+++ b/pkgs/by-name/gn/gnome-solanum/package.nix
@@ -18,6 +18,7 @@
   gtk4,
   gst_all_1,
   libadwaita,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -66,6 +67,10 @@ stdenv.mkDerivation rec {
     gst_all_1.gst-plugins-bad
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     homepage = "https://gitlab.gnome.org/World/Solanum";
     description = "Pomodoro timer for the GNOME desktop";
diff --git a/pkgs/by-name/he/health/package.nix b/pkgs/by-name/he/health/package.nix
index 121a81a3c383b..e87cda81e63fc 100644
--- a/pkgs/by-name/he/health/package.nix
+++ b/pkgs/by-name/he/health/package.nix
@@ -14,6 +14,7 @@
   libsecret,
   tinysparql,
   darwin,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -62,6 +63,10 @@ stdenv.mkDerivation rec {
     ]
   );
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Health tracking app for the GNOME desktop";
     homepage = "https://apps.gnome.org/app/dev.Cogitri.Health";
diff --git a/pkgs/by-name/hi/hieroglyphic/package.nix b/pkgs/by-name/hi/hieroglyphic/package.nix
index 25201e78b117b..4e276e185d63b 100644
--- a/pkgs/by-name/hi/hieroglyphic/package.nix
+++ b/pkgs/by-name/hi/hieroglyphic/package.nix
@@ -15,6 +15,7 @@
   libadwaita,
   gettext,
   appstream,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -54,6 +55,10 @@ stdenv.mkDerivation (finalAttrs: {
   # needed for darwin
   env.GETTEXT_DIR = "${gettext}";
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     changelog = "https://github.com/FineFindus/Hieroglyphic/releases/tag/v${finalAttrs.version}";
     description = "Tool based on detexify for finding LaTeX symbols from drawings";
diff --git a/pkgs/by-name/im/impression/package.nix b/pkgs/by-name/im/impression/package.nix
index d9aad2aed2c73..22b359200ff33 100644
--- a/pkgs/by-name/im/impression/package.nix
+++ b/pkgs/by-name/im/impression/package.nix
@@ -19,6 +19,7 @@
   libadwaita,
   openssl,
   pango,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -61,6 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
     pango
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Straight-forward and modern application to create bootable drives";
     homepage = "https://gitlab.com/adhami3310/Impression";
diff --git a/pkgs/by-name/ju/junction/package.nix b/pkgs/by-name/ju/junction/package.nix
index 1ac6acd796cc1..23f0887f7c238 100644
--- a/pkgs/by-name/ju/junction/package.nix
+++ b/pkgs/by-name/ju/junction/package.nix
@@ -14,6 +14,7 @@
   gtk4,
   libadwaita,
   libportal-gtk4,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -63,6 +64,10 @@ stdenv.mkDerivation rec {
     sed -i "1s|.*|#!/usr/bin/gjs -m|" $out/bin/re.sonny.Junction
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     mainProgram = "re.sonny.Junction";
     description = "Choose the application to open files and links";
diff --git a/pkgs/by-name/le/letterpress/package.nix b/pkgs/by-name/le/letterpress/package.nix
index 4f125c4abbcca..d477cf87ae0be 100644
--- a/pkgs/by-name/le/letterpress/package.nix
+++ b/pkgs/by-name/le/letterpress/package.nix
@@ -14,6 +14,7 @@
   ninja,
   pkg-config,
   python3Packages,
+  nix-update-script,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "letterpress";
@@ -68,6 +69,10 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=(''${gappsWrapperArgs[@]} --prefix PATH : ${lib.makeBinPath runtimeDeps})
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Create beautiful ASCII art";
     longDescription = ''
diff --git a/pkgs/by-name/lo/lorem/package.nix b/pkgs/by-name/lo/lorem/package.nix
index 41efde9e8980d..0ac17840129b5 100644
--- a/pkgs/by-name/lo/lorem/package.nix
+++ b/pkgs/by-name/lo/lorem/package.nix
@@ -8,6 +8,7 @@
   libadwaita,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   rustPlatform,
   rustc,
@@ -50,6 +51,10 @@ stdenv.mkDerivation (finalAttrs: {
     libadwaita
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     changelog = "https://gitlab.gnome.org/World/design/lorem/-/releases/${finalAttrs.version}";
     description = "Generate placeholder text";
diff --git a/pkgs/by-name/me/metadata-cleaner/package.nix b/pkgs/by-name/me/metadata-cleaner/package.nix
index efe4c1f05325a..1f42f6b474f3b 100644
--- a/pkgs/by-name/me/metadata-cleaner/package.nix
+++ b/pkgs/by-name/me/metadata-cleaner/package.nix
@@ -12,6 +12,7 @@
   librsvg,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   poppler_gi,
   wrapGAppsHook4,
@@ -56,6 +57,10 @@ python3.pkgs.buildPythonApplication rec {
     pygobject3
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Python GTK application to view and clean metadata in files, using mat2";
     mainProgram = "metadata-cleaner";
diff --git a/pkgs/by-name/mo/mousai/package.nix b/pkgs/by-name/mo/mousai/package.nix
index a90be468bc209..5bbee8e4ac020 100644
--- a/pkgs/by-name/mo/mousai/package.nix
+++ b/pkgs/by-name/mo/mousai/package.nix
@@ -15,6 +15,7 @@
   libsoup_3,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   rustPlatform,
   rustc,
@@ -63,6 +64,10 @@ stdenv.mkDerivation rec {
     libsoup_3
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Identify any songs in seconds";
     mainProgram = "mousai";
diff --git a/pkgs/by-name/pa/paper-clip/package.nix b/pkgs/by-name/pa/paper-clip/package.nix
index 36e6c8b9c2467..36be5f4c7bb12 100644
--- a/pkgs/by-name/pa/paper-clip/package.nix
+++ b/pkgs/by-name/pa/paper-clip/package.nix
@@ -8,6 +8,7 @@
   libadwaita,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   poppler,
   stdenv,
@@ -43,6 +44,10 @@ stdenv.mkDerivation (finalAttrs: {
     poppler
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     changelog = "https://github.com/Diego-Ivan/Paper-Clip/releases/tag/v${finalAttrs.version}";
     description = "Edit PDF document metadata";
diff --git a/pkgs/by-name/pi/pika-backup/package.nix b/pkgs/by-name/pi/pika-backup/package.nix
index c12fa42c692b7..760fdc069c24f 100644
--- a/pkgs/by-name/pi/pika-backup/package.nix
+++ b/pkgs/by-name/pi/pika-backup/package.nix
@@ -18,6 +18,7 @@
   gtk4,
   libadwaita,
   libsecret,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -68,6 +69,10 @@ stdenv.mkDerivation rec {
     libsecret
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Simple backups based on borg";
     homepage = "https://apps.gnome.org/app/org.gnome.World.PikaBackup";
diff --git a/pkgs/by-name/ra/raider/package.nix b/pkgs/by-name/ra/raider/package.nix
index 81bff79d3c094..9283c6b443ae8 100644
--- a/pkgs/by-name/ra/raider/package.nix
+++ b/pkgs/by-name/ra/raider/package.nix
@@ -9,6 +9,7 @@
   meson,
   mesonEmulatorHook,
   ninja,
+  nix-update-script,
   pkg-config,
   stdenv,
   wrapGAppsHook4,
@@ -44,6 +45,10 @@ stdenv.mkDerivation rec {
     libadwaita
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Permanently delete your files (also named File Shredder)";
     longDescription = ''
diff --git a/pkgs/by-name/sh/share-preview/package.nix b/pkgs/by-name/sh/share-preview/package.nix
index 94244a5b2ce17..2945bd6582fec 100644
--- a/pkgs/by-name/sh/share-preview/package.nix
+++ b/pkgs/by-name/sh/share-preview/package.nix
@@ -13,6 +13,7 @@
   libadwaita,
   openssl,
   darwin,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -57,6 +58,10 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionals stdenv.hostPlatform.isDarwin [ "-Wno-error=incompatible-function-pointer-types" ]
   );
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Preview and debug websites metadata tags for social media share";
     homepage = "https://apps.gnome.org/SharePreview";
diff --git a/pkgs/by-name/sh/shortwave/package.nix b/pkgs/by-name/sh/shortwave/package.nix
index 7bca94ab44dde..e4344f0934378 100644
--- a/pkgs/by-name/sh/shortwave/package.nix
+++ b/pkgs/by-name/sh/shortwave/package.nix
@@ -23,6 +23,7 @@
   libshumate,
   libseccomp,
   lcms2,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -77,6 +78,10 @@ stdenv.mkDerivation rec {
       gst-plugins-bad
     ]);
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     homepage = "https://gitlab.gnome.org/World/Shortwave";
     description = "Find and listen to internet radio stations";
diff --git a/pkgs/by-name/sw/switcheroo/package.nix b/pkgs/by-name/sw/switcheroo/package.nix
index 2f9b5f4979afe..796a84638ad55 100644
--- a/pkgs/by-name/sw/switcheroo/package.nix
+++ b/pkgs/by-name/sw/switcheroo/package.nix
@@ -11,6 +11,7 @@
   libadwaita,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   rustPlatform,
   rustc,
@@ -69,6 +70,10 @@ stdenv.mkDerivation (finalAttrs: {
     stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16"
   ) "-Wno-error=incompatible-function-pointer-types";
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     changelog = "https://gitlab.com/adhami3310/Switcheroo/-/releases/v${finalAttrs.version}";
     description = "App for converting images between different formats";
diff --git a/pkgs/by-name/ta/tangram/package.nix b/pkgs/by-name/ta/tangram/package.nix
index a6a34feacc866..28875a45c51f5 100644
--- a/pkgs/by-name/ta/tangram/package.nix
+++ b/pkgs/by-name/ta/tangram/package.nix
@@ -17,6 +17,7 @@
   hicolor-icon-theme,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   python3,
   webkitgtk_6_0,
@@ -83,6 +84,10 @@ stdenv.mkDerivation rec {
       -i $out/bin/re.sonny.Tangram
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Run web apps on your desktop";
     mainProgram = "re.sonny.Tangram";
diff --git a/pkgs/by-name/te/textpieces/package.nix b/pkgs/by-name/te/textpieces/package.nix
index 830b8fc4d44ae..2dfb547531ce8 100644
--- a/pkgs/by-name/te/textpieces/package.nix
+++ b/pkgs/by-name/te/textpieces/package.nix
@@ -15,6 +15,7 @@
   gtksourceview5,
   wrapGAppsHook4,
   desktop-file-utils,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -52,6 +53,10 @@ stdenv.mkDerivation (finalAttrs: {
     gtksourceview5
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Swiss knife of text processing";
     longDescription = ''
diff --git a/pkgs/by-name/va/valuta/package.nix b/pkgs/by-name/va/valuta/package.nix
index aeed29f268e1a..05a2a0ff7ba8a 100644
--- a/pkgs/by-name/va/valuta/package.nix
+++ b/pkgs/by-name/va/valuta/package.nix
@@ -12,6 +12,7 @@
   libsoup_3,
   libadwaita,
   wrapGAppsHook4,
+  nix-update-script,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -56,6 +57,10 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Simple application for converting currencies, with support for various APIs";
     homepage = "https://github.com/ideveCore/Valuta";
diff --git a/pkgs/by-name/vi/video-trimmer/package.nix b/pkgs/by-name/vi/video-trimmer/package.nix
index bc04fa63c924c..766d59a4f72cf 100644
--- a/pkgs/by-name/vi/video-trimmer/package.nix
+++ b/pkgs/by-name/vi/video-trimmer/package.nix
@@ -15,6 +15,7 @@
   libadwaita,
   gst_all_1,
   ffmpeg-headless,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -69,6 +70,10 @@ stdenv.mkDerivation (finalAttrs: {
     )
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     homepage = "https://gitlab.gnome.org/YaLTeR/video-trimmer";
     description = "Trim videos quickly";
diff --git a/pkgs/by-name/wa/warp/package.nix b/pkgs/by-name/wa/warp/package.nix
index d9080b08326bb..785bc44085049 100644
--- a/pkgs/by-name/wa/warp/package.nix
+++ b/pkgs/by-name/wa/warp/package.nix
@@ -19,6 +19,7 @@
   libadwaita,
   zbar,
   gst_all_1,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -70,6 +71,10 @@ stdenv.mkDerivation rec {
       gst-plugins-bad
     ]);
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Fast and secure file transfer";
     homepage = "https://apps.gnome.org/Warp/";
diff --git a/pkgs/by-name/we/webfontkitgenerator/package.nix b/pkgs/by-name/we/webfontkitgenerator/package.nix
index 3913fd85eb01a..9359c11fdcdad 100644
--- a/pkgs/by-name/we/webfontkitgenerator/package.nix
+++ b/pkgs/by-name/we/webfontkitgenerator/package.nix
@@ -13,6 +13,7 @@
   libsoup_3,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
   python3,
   python3Packages,
@@ -63,6 +64,10 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.brotli
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Webfont Kit Generator is a simple utility that allows you to generate woff, woff2 and the necessary CSS boilerplate from non-web font formats (otf & ttf)";
     mainProgram = "webfontkitgenerator";
diff --git a/pkgs/by-name/wi/wike/package.nix b/pkgs/by-name/wi/wike/package.nix
index c6738cf75c52d..45546a31ded64 100644
--- a/pkgs/by-name/wi/wike/package.nix
+++ b/pkgs/by-name/wi/wike/package.nix
@@ -16,6 +16,7 @@
   libadwaita,
   glib-networking,
   webkitgtk_6_0,
+  nix-update-script,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -64,6 +65,7 @@ python3.pkgs.buildPythonApplication rec {
 
   passthru = {
     tests.cross = pkgsCross.aarch64-multiplatform.wike;
+    updateScript = nix-update-script { };
   };
 
   meta = with lib; {
diff --git a/pkgs/tools/misc/gaphor/default.nix b/pkgs/tools/misc/gaphor/default.nix
index 09d6e4fdaa70a..c19cb78cecf7f 100644
--- a/pkgs/tools/misc/gaphor/default.nix
+++ b/pkgs/tools/misc/gaphor/default.nix
@@ -25,6 +25,7 @@
   librsvg,
   makeDesktopItem,
   python,
+  nix-update-script,
 }:
 
 buildPythonApplication rec {
@@ -93,6 +94,10 @@ buildPythonApplication rec {
     )
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = with lib; {
     description = "Simple modeling tool written in Python";
     maintainers = [ ] ++ lib.teams.gnome-circle.members;

From 4579f217834b2e5d67595f187506f3e4b4e7f3a0 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 28 Dec 2024 18:06:26 +0100
Subject: [PATCH 322/340] distant: init at 0.20.0

---
 pkgs/by-name/di/distant/package.nix | 81 +++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 pkgs/by-name/di/distant/package.nix

diff --git a/pkgs/by-name/di/distant/package.nix b/pkgs/by-name/di/distant/package.nix
new file mode 100644
index 0000000000000..f9e1f8947b034
--- /dev/null
+++ b/pkgs/by-name/di/distant/package.nix
@@ -0,0 +1,81 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  zlib,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "distant";
+  version = "0.20.0";
+
+  src = fetchFromGitHub {
+    owner = "chipsenkbeil";
+    repo = "distant";
+    tag = "v${version}";
+    hash = "sha256-DcnleJUAeYg3GSLZljC3gO9ihiFz04dzT/ddMnypr48=";
+  };
+
+  cargoHash = "sha256-7MNNdm4b9u5YNX04nBtKcrw+phUlpzIXo0tJVfcgb40=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+    zlib
+  ];
+
+  env = {
+    OPENSSL_NO_VENDOR = true;
+  };
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  checkFlags =
+    [
+      # Requires network access:
+      # failed to lookup address information: Temporary failure in name resolution
+      "--skip=options::common::address::tests::resolve_should_properly_resolve_bind_address"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # Timeout on darwin
+      # Custom { kind: TimedOut, error: "" }
+      "--skip=cli::api::watch::should_support_json_reporting_changes_using_correct_request_id"
+      "--skip=cli::api::watch::should_support_json_watching_directory_recursively"
+      "--skip=cli::api::watch::should_support_json_watching_single_file"
+      "--skip=cli::client::fs_watch::should_support_watching_a_directory_recursively"
+      "--skip=cli::client::fs_watch::should_support_watching_a_single_file"
+    ];
+
+  __darwinAllowLocalNetworking = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Library and tooling that supports remote filesystem and process operations";
+    homepage = "https://github.com/chipsenkbeil/distant";
+    changelog = "https://github.com/chipsenkbeil/distant/blob/${version}/CHANGELOG.md";
+    # From the README:
+    # "This project is licensed under either of Apache License, Version 2.0, MIT license at your option."
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+    mainProgram = "distant";
+  };
+}

From cac0e6eaf4d98efc84fad2435f8386666b286e9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 28 Dec 2024 23:39:12 +0000
Subject: [PATCH 323/340] bilibili: 1.16.1-1 -> 1.16.1-2

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

diff --git a/pkgs/by-name/bi/bilibili/sources.nix b/pkgs/by-name/bi/bilibili/sources.nix
index 476439b8c8cef..be44a584524ff 100644
--- a/pkgs/by-name/bi/bilibili/sources.nix
+++ b/pkgs/by-name/bi/bilibili/sources.nix
@@ -1,6 +1,6 @@
 # Generated by ./update.sh - do not update manually!
 {
-  version = "1.16.1-1";
-  arm64-hash = "sha256-2pdrzOkF3Ni8Cjwrkevv8QmXioGFtNIHkUF/x+NoZIo=";
-  x86_64-hash = "sha256-yAC1CZEOjip80fBbmor4bCOlEtyXMA1R3Hnxvmj56IQ=";
+  version = "1.16.1-2";
+  arm64-hash = "sha256-6TcmPJ1TxCc+YTaYSpnmFf2pEhMRHXubR241+UVoFRU=";
+  x86_64-hash = "sha256-Bwo6Pe4Z4H0Yt0IALKtMrNryemXDemybqsiwc6B+26E=";
 }

From ca90631cfb213290eb73fb14b054465d7d3b77d2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 29 Dec 2024 03:30:52 +0100
Subject: [PATCH 324/340] python312Packages.python-telegram-bot: 21.7 -> 21.9
 (#368217)

Diff: https://github.com/python-telegram-bot/python-telegram-bot/compare/refs/tags/v21.7...v21.9

Changelog: https://github.com/python-telegram-bot/python-telegram-bot/blob/v21.9/CHANGES.rst
---
 .../python-modules/python-telegram-bot/default.nix           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix
index 2cc7a7c955952..3b15ed6fd8f71 100644
--- a/pkgs/development/python-modules/python-telegram-bot/default.nix
+++ b/pkgs/development/python-modules/python-telegram-bot/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "python-telegram-bot";
-  version = "21.7";
+  version = "21.9";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "python-telegram-bot";
     repo = "python-telegram-bot";
     rev = "refs/tags/v${version}";
-    hash = "sha256-I8pSUL1nR1x+WUBYK31RlwFE/ATh2tCteYNWEg8XQjg=";
+    hash = "sha256-eJC8oH5iAMdCN546LzoRwlNq0gQqu8fZGscQlOzb/aY=";
   };
 
   build-system = [
@@ -92,6 +92,7 @@ buildPythonPackage rec {
     "TestForum"
     "TestGame"
     "TestGet"
+    "TestGiftsWithRequest"
     "TestHTTP"
     "TestInline"
     "TestInput"

From 5df295339a9d14cc52c6b5a9b532c5d79ac4ff4d Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Sat, 28 Dec 2024 19:06:49 -0800
Subject: [PATCH 325/340] jujutsu: update owner; change from rev to tag

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

diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index 9e51be4359884..750ce685575bb 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -29,9 +29,9 @@ rustPlatform.buildRustPackage {
   inherit version;
 
   src = fetchFromGitHub {
-    owner = "martinvonz";
+    owner = "jj-vcs";
     repo = "jj";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-XsD4P2UygZFcnlV2o3E/hRRgsGjwKw1r9zniEeAk758";
   };
 
@@ -110,8 +110,8 @@ rustPlatform.buildRustPackage {
 
   meta = {
     description = "Git-compatible DVCS that is both simple and powerful";
-    homepage = "https://github.com/martinvonz/jj";
-    changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md";
+    homepage = "https://github.com/jj-vcs/jj";
+    changelog = "https://github.com/jj-vcs/jj/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       _0x4A6F

From 5f3fe888943c71e9c04a862d3377c288bbbc8d69 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Sun, 15 Dec 2024 11:24:42 -0800
Subject: [PATCH 326/340] oscavmgr: add version test

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

diff --git a/pkgs/by-name/os/oscavmgr/package.nix b/pkgs/by-name/os/oscavmgr/package.nix
index 21a71ecbb42b2..b71bf53b85493 100644
--- a/pkgs/by-name/os/oscavmgr/package.nix
+++ b/pkgs/by-name/os/oscavmgr/package.nix
@@ -7,6 +7,7 @@
   openxr-loader,
   pkg-config,
   rustPlatform,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -32,6 +33,9 @@ rustPlatform.buildRustPackage rec {
     openxr-loader
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   postPatch = ''
     alvr_session=$(echo $cargoDepsCopy/alvr_session-*/)
     substituteInPlace "$alvr_session/build.rs" \

From af5356b74c2e04eceba7dec1a62a1a8b1d9a215a Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sun, 29 Dec 2024 05:04:45 +0100
Subject: [PATCH 327/340] gzdoom: 4.13.2 -> 4.14.0

---
 pkgs/by-name/gz/gzdoom/package.nix         |  6 ++++--
 pkgs/by-name/gz/gzdoom/string_format.patch | 13 +++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/gz/gzdoom/string_format.patch

diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix
index dee7b1971da19..17051d7692e6b 100644
--- a/pkgs/by-name/gz/gzdoom/package.nix
+++ b/pkgs/by-name/gz/gzdoom/package.nix
@@ -28,16 +28,18 @@
 
 stdenv.mkDerivation rec {
   pname = "gzdoom";
-  version = "4.13.2";
+  version = "4.14.0";
 
   src = fetchFromGitHub {
     owner = "ZDoom";
     repo = "gzdoom";
     rev = "g${version}";
     fetchSubmodules = true;
-    hash = "sha256-3nkdpJ3XO58YHtjVTwxdSdCL6CnMcih6mTnI7FXLm34=";
+    hash = "sha256-+gLWt1qBKl8xGK6sALnjqPuXcBexjWKbEkbRMFtLcbE=";
   };
 
+  patches = [ ./string_format.patch ];
+
   outputs = [
     "out"
     "doc"
diff --git a/pkgs/by-name/gz/gzdoom/string_format.patch b/pkgs/by-name/gz/gzdoom/string_format.patch
new file mode 100644
index 0000000000000..8aa655c7acaa6
--- /dev/null
+++ b/pkgs/by-name/gz/gzdoom/string_format.patch
@@ -0,0 +1,13 @@
+diff --git a/src/common/engine/i_net.cpp b/src/common/engine/i_net.cpp
+index ad106bbc4..0a67062a0 100644
+--- a/src/common/engine/i_net.cpp
++++ b/src/common/engine/i_net.cpp
+@@ -1072,7 +1072,7 @@ void I_NetError(const char* error)
+ {
+ 	doomcom.numnodes = 0;
+ 	StartWindow->NetClose();
+-	I_FatalError(error);
++	I_FatalError("%s", error);
+ }
+ 
+ // todo: later these must be dispatched by the main menu, not the start screen.

From 2e5268e2a5d559b03f293f96a6dce5f4b16de8fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=95=E0=B8=B1=E0=B8=A5?=
 <toastal@posteo.net>
Date: Wed, 11 Dec 2024 20:19:58 +0700
Subject: [PATCH 328/340] =?UTF-8?q?use=20movim=E2=80=99s=20database=20user?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nixos/modules/services/web-apps/movim.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix
index 51c3156fef063..b3ddce693c08c 100644
--- a/nixos/modules/services/web-apps/movim.nix
+++ b/nixos/modules/services/web-apps/movim.nix
@@ -575,7 +575,7 @@ in
         package = mkDefault pkgs.mariadb;
         ensureDatabases = [ cfg.database.name ];
         ensureUsers = [{
-          name = cfg.user;
+          name = cfg.database.user;
           ensureDBOwnership = true;
         }];
       };
@@ -584,7 +584,7 @@ in
         enable = mkDefault true;
         ensureDatabases = [ cfg.database.name ];
         ensureUsers = [{
-          name = cfg.user;
+          name = cfg.database.user;
           ensureDBOwnership = true;
         }];
         authentication = ''

From 431afe7289d8d6c233c21f08222bb202abb743a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=95=E0=B8=B1=E0=B8=A5?=
 <toastal@posteo.net>
Date: Wed, 11 Dec 2024 20:27:03 +0700
Subject: [PATCH 329/340] use mkDefaults for Nginx config

---
 nixos/modules/services/web-apps/movim.nix | 171 +++++++++++-----------
 1 file changed, 86 insertions(+), 85 deletions(-)

diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix
index b3ddce693c08c..4cb18c6b9b31c 100644
--- a/nixos/modules/services/web-apps/movim.nix
+++ b/nixos/modules/services/web-apps/movim.nix
@@ -483,92 +483,93 @@ in
         };
       };
 
-      nginx = mkIf (cfg.nginx != null) {
-        enable = true;
-        recommendedOptimisation = true;
-        recommendedGzipSettings = true;
-        recommendedBrotliSettings = true;
-        recommendedProxySettings = true;
-        # TODO: recommended cache options already in Nginx⁇
-        appendHttpConfig = /* nginx */ ''
-          fastcgi_cache_path /tmp/nginx_cache levels=1:2 keys_zone=nginx_cache:100m inactive=60m;
-          fastcgi_cache_key "$scheme$request_method$host$request_uri";
-        '';
-        virtualHosts."${cfg.domain}" = mkMerge [
-          cfg.nginx
-          {
-            root = lib.mkForce "${package}/share/php/movim/public";
-            locations = {
-              "/favicon.ico" = {
-                priority = 100;
-                extraConfig = /* nginx */ ''
-                  access_log off;
-                  log_not_found off;
-                '';
-              };
-              "/robots.txt" = {
-                priority = 100;
-                extraConfig = /* nginx */ ''
-                  access_log off;
-                  log_not_found off;
-                '';
-              };
-              "~ /\\.(?!well-known).*" = {
-                priority = 210;
-                extraConfig = /* nginx */ ''
-                  deny all;
-                '';
-              };
-              # Ask nginx to cache every URL starting with "/picture"
-              "/picture" = {
-                priority = 400;
-                tryFiles = "$uri $uri/ /index.php$is_args$args";
-                extraConfig = /* nginx */ ''
-                  set $no_cache 0; # Enable cache only there
-                '';
-              };
-              "/" = {
-                priority = 490;
-                tryFiles = "$uri $uri/ /index.php$is_args$args";
-                extraConfig = /* nginx */ ''
-                  # https://github.com/movim/movim/issues/314
-                  add_header Content-Security-Policy "default-src 'self'; img-src 'self' aesgcm: https:; media-src 'self' aesgcm: https:; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline';";
-                  set $no_cache 1;
-                '';
-              };
-              "~ \\.php$" = {
-                priority = 500;
-                tryFiles = "$uri =404";
-                extraConfig = /* nginx */ ''
-                  include ${config.services.nginx.package}/conf/fastcgi.conf;
-                  add_header X-Cache $upstream_cache_status;
-                  fastcgi_ignore_headers "Cache-Control" "Expires" "Set-Cookie";
-                  fastcgi_cache nginx_cache;
-                  fastcgi_cache_valid any 7d;
-                  fastcgi_cache_bypass $no_cache;
-                  fastcgi_no_cache $no_cache;
-                  fastcgi_split_path_info ^(.+\.php)(/.+)$;
-                  fastcgi_index index.php;
-                  fastcgi_pass unix:${fpm.socket};
-                '';
-              };
-              "/ws/" = {
-                priority = 900;
-                proxyPass = "http://${cfg.settings.DAEMON_INTERFACE}:${builtins.toString cfg.port}/";
-                proxyWebsockets = true;
-                recommendedProxySettings = true;
-                extraConfig = /* nginx */ ''
-                  proxy_set_header X-Forwarded-Proto $scheme;
-                  proxy_redirect off;
-                '';
+      nginx = mkIf (cfg.nginx != null)
+        {
+          enable = true;
+          recommendedOptimisation = mkDefault true;
+          recommendedProxySettings = true;
+          # TODO: recommended cache options already in Nginx⁇
+          appendHttpConfig = /* nginx */ ''
+            fastcgi_cache_path /tmp/nginx_cache levels=1:2 keys_zone=nginx_cache:100m inactive=60m;
+            fastcgi_cache_key "$scheme$request_method$host$request_uri";
+          '';
+          virtualHosts."${cfg.domain}" = mkMerge [
+            cfg.nginx
+            {
+              root = lib.mkForce "${package}/share/php/movim/public";
+              locations = {
+                "/favicon.ico" = {
+                  priority = 100;
+                  extraConfig = /* nginx */ ''
+                    access_log off;
+                    log_not_found off;
+                  '';
+                };
+                "/robots.txt" = {
+                  priority = 100;
+                  extraConfig = /* nginx */ ''
+                    access_log off;
+                    log_not_found off;
+                  '';
+                };
+                "~ /\\.(?!well-known).*" = {
+                  priority = 210;
+                  extraConfig = /* nginx */ ''
+                    deny all;
+                  '';
+                };
+                # Ask nginx to cache every URL starting with "/picture"
+                "/picture" = {
+                  priority = 400;
+                  tryFiles = "$uri $uri/ /index.php$is_args$args";
+                  extraConfig = /* nginx */ ''
+                    set $no_cache 0; # Enable cache only there
+                  '';
+                };
+                "/" = {
+                  priority = 490;
+                  tryFiles = "$uri $uri/ /index.php$is_args$args";
+                  extraConfig = /* nginx */ ''
+                    # https://github.com/movim/movim/issues/314
+                    add_header Content-Security-Policy "default-src 'self'; img-src 'self' aesgcm: https:; media-src 'self' aesgcm: https:; script-src 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline';";
+                    set $no_cache 1;
+                  '';
+                };
+                "~ \\.php$" = {
+                  priority = 500;
+                  tryFiles = "$uri =404";
+                  extraConfig = /* nginx */ ''
+                    include ${config.services.nginx.package}/conf/fastcgi.conf;
+                    add_header X-Cache $upstream_cache_status;
+                    fastcgi_ignore_headers "Cache-Control" "Expires" "Set-Cookie";
+                    fastcgi_cache nginx_cache;
+                    fastcgi_cache_valid any 7d;
+                    fastcgi_cache_bypass $no_cache;
+                    fastcgi_no_cache $no_cache;
+                    fastcgi_split_path_info ^(.+\.php)(/.+)$;
+                    fastcgi_index index.php;
+                    fastcgi_pass unix:${fpm.socket};
+                  '';
+                };
+                "/ws/" = {
+                  priority = 900;
+                  proxyPass = "http://${cfg.settings.DAEMON_INTERFACE}:${builtins.toString cfg.port}/";
+                  proxyWebsockets = true;
+                  recommendedProxySettings = true;
+                  extraConfig = /* nginx */ ''
+                    proxy_set_header X-Forwarded-Proto $scheme;
+                    proxy_redirect off;
+                  '';
+                };
               };
-            };
-            extraConfig = /* ngnix */ ''
-              index index.php;
-            '';
-          }
-        ];
-      };
+              extraConfig = /* ngnix */ ''
+                index index.php;
+              '';
+            }
+          ];
+        }
+      // lib.optionalAttrs (cfg.precompressStaticFiles.gzip.enable) { recommendedGzipSettings = mkDefault true; }
+      // lib.optionalAttrs (cfg.precompressStaticFiles.brotli.enable) { recommendedBrotliSettings = mkDefault true; };
 
       mysql = mkIf (cfg.database.createLocally && cfg.database.type == "mysql") {
         enable = mkDefault true;

From c15c466d29f4e80bd04ad5c679e0c081f66fcad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=95=E0=B8=B1=E0=B8=A5?=
 <toastal@posteo.net>
Date: Wed, 11 Dec 2024 20:28:05 +0700
Subject: [PATCH 330/340] typo in script name

---
 nixos/modules/services/web-apps/movim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix
index 4cb18c6b9b31c..96090a7b0a1d3 100644
--- a/nixos/modules/services/web-apps/movim.nix
+++ b/nixos/modules/services/web-apps/movim.nix
@@ -113,7 +113,7 @@ let
             (lib.optionalString gzip.enable ''
               echo -n "Precompressing static files with Gzip …"
               find ${appDir}/public -type f ${findTextFileNames} -print0 \
-                | xargs -0 -n 1 -P $NIX_BUILD_CORES ${pkgs.writeShellScript "movim_precompress_broti" ''
+                | xargs -0 -n 1 -P $NIX_BUILD_CORES ${pkgs.writeShellScript "movim_precompress_gzip" ''
                     file="$1"
                     ${lib.getExe gzip.package} -c -${builtins.toString gzip.compressionLevel} $file > $file.gz
                   ''}

From 22c7e68534e76001fffea10181a3d63fb84c2e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=95=E0=B8=B1=E0=B8=A5?=
 <toastal@posteo.net>
Date: Thu, 12 Dec 2024 01:50:53 +0700
Subject: [PATCH 331/340] syntax hints for tree-sitter

---
 nixos/modules/services/web-apps/movim.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix
index 96090a7b0a1d3..5d15b8e12ecb2 100644
--- a/nixos/modules/services/web-apps/movim.nix
+++ b/nixos/modules/services/web-apps/movim.nix
@@ -60,7 +60,7 @@ let
       let
         appDir = "$out/share/php/${finalAttrs.pname}";
 
-        stateDirectories = ''
+        stateDirectories = /* sh */ ''
           # Symlinking in our state directories
           rm -rf $out/.env $out/cache ${appDir}/public/cache
           ln -s ${cfg.dataDir}/.env ${appDir}/.env
@@ -69,7 +69,7 @@ let
           ln -s ${cfg.runtimeDir}/cache ${appDir}/cache
         '';
 
-        exposeComposer = ''
+        exposeComposer = /* sh */ ''
           # Expose PHP Composer for scripts
           mkdir -p $out/bin
           echo "#!${lib.getExe pkgs.dash}" > $out/bin/movim-composer
@@ -85,10 +85,10 @@ let
                   # Disable all Admin panel options that were set in the
                   # `cfg.podConfig` to prevent confusing situtions where the
                   # values are rewritten on server reboot
-                  ''
-                    substituteInPlace ${appDir}/app/Widgets/AdminMain/adminmain.tpl \
-                      --replace-warn 'name="${k}"' 'name="${k}" readonly'
-                  '')
+                  /* sh */ ''
+                  substituteInPlace ${appDir}/app/Widgets/AdminMain/adminmain.tpl \
+                    --replace-warn 'name="${k}"' 'name="${k}" readonly'
+                '')
               [ ]
               cfg.podConfig));
 
@@ -101,7 +101,7 @@ let
                 [ "css" "ini" "js" "json" "manifest" "mjs" "svg" "webmanifest" ]);
           in
           lib.concatStringsSep "\n" [
-            (lib.optionalString brotli.enable ''
+            (lib.optionalString brotli.enable /* sh */ ''
               echo -n "Precompressing static files with Brotli …"
               find ${appDir}/public -type f ${findTextFileNames} -print0 \
                 | xargs -0 -n 1 -P $NIX_BUILD_CORES ${pkgs.writeShellScript "movim_precompress_broti" ''
@@ -110,7 +110,7 @@ let
                   ''}
               echo " done."
             '')
-            (lib.optionalString gzip.enable ''
+            (lib.optionalString gzip.enable /* sh */ ''
               echo -n "Precompressing static files with Gzip …"
               find ${appDir}/public -type f ${findTextFileNames} -print0 \
                 | xargs -0 -n 1 -P $NIX_BUILD_CORES ${pkgs.writeShellScript "movim_precompress_gzip" ''
@@ -637,7 +637,7 @@ in
           LoadCredential = "env-secrets:${cfg.secretFile}";
         };
 
-        script = ''
+        script = /* sh */ ''
           # Env vars
           rm -f ${cfg.dataDir}/.env
           cp --no-preserve=all ${configFile} ${cfg.dataDir}/.env

From 0d59a5928e712e3a87c7c0cfef7fbb40f0e53975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=95=E0=B8=B1=E0=B8=A5?=
 <toastal@posteo.net>
Date: Thu, 12 Dec 2024 12:14:47 +0700
Subject: [PATCH 332/340] optionally add group to nginx user

---
 nixos/modules/services/web-apps/movim.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix
index 5d15b8e12ecb2..58827170ef796 100644
--- a/nixos/modules/services/web-apps/movim.nix
+++ b/nixos/modules/services/web-apps/movim.nix
@@ -440,6 +440,7 @@ in
           isSystemUser = true;
           group = cfg.group;
         };
+      } // lib.optionalAttrs (cfg.nginx != null) {
         "${config.services.nginx.user}".extraGroups = [ cfg.group ];
       };
       groups = {

From 180c953138c3371620197dee79cee3afd6c0ae1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=95=E0=B8=B1=E0=B8=A5?=
 <toastal@posteo.net>
Date: Mon, 16 Dec 2024 17:36:53 +0700
Subject: [PATCH 333/340] nixos/movim: rm logs if found

---
 nixos/modules/services/web-apps/movim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix
index 58827170ef796..78efbcf7b1b24 100644
--- a/nixos/modules/services/web-apps/movim.nix
+++ b/nixos/modules/services/web-apps/movim.nix
@@ -62,7 +62,7 @@ let
 
         stateDirectories = /* sh */ ''
           # Symlinking in our state directories
-          rm -rf $out/.env $out/cache ${appDir}/public/cache
+          rm -rf $out/{.env,cache} ${appDir}/{log,public/cache}
           ln -s ${cfg.dataDir}/.env ${appDir}/.env
           ln -s ${cfg.dataDir}/public/cache ${appDir}/public/cache
           ln -s ${cfg.logDir} ${appDir}/log

From 8b4fd3e8d61280c3d690723ca3a8ee2dd4556e56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=95=E0=B8=B1=E0=B8=A5?=
 <toastal@posteo.net>
Date: Mon, 16 Dec 2024 18:07:19 +0700
Subject: [PATCH 334/340] movim: make mainProgram name match

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

diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix
index 5aa5f4ed70ffe..bc4b138ecc4e3 100644
--- a/pkgs/by-name/mo/movim/package.nix
+++ b/pkgs/by-name/mo/movim/package.nix
@@ -155,8 +155,9 @@ php.buildComposerProject (finalAttrs: {
   postInstall = ''
     mkdir -p $out/bin
     echo "#!${lib.getExe dash}" > $out/bin/movim
-    echo "${lib.getExe finalAttrs.php} $out/share/php/${finalAttrs.pname}/daemon.php \"\$@\"" >> $out/bin/movim
-    chmod +x $out/bin/movim
+    echo "${lib.getExe finalAttrs.php} $out/share/php/${finalAttrs.pname}/daemon.php \"\$@\"" >> $out/bin/${finalAttrs.meta.mainProgram}
+    chmod +x $out/bin/${finalAttrs.meta.mainProgram}
+
 
     mkdir -p $out/share/{bash-completion/completion,fish/vendor_completions.d,zsh/site-functions}
     $out/bin/movim completion bash | sed "s/daemon.php/movim/g" > $out/share/bash-completion/completion/movim.bash

From 33a28d82f0f17344b1816f8036a290b81d668263 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 29 Dec 2024 14:23:41 +0800
Subject: [PATCH 335/340] arc_unpacker: fix build

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

diff --git a/pkgs/by-name/ar/arc_unpacker/package.nix b/pkgs/by-name/ar/arc_unpacker/package.nix
index a4ccc53567dc9..e11506a976c69 100644
--- a/pkgs/by-name/ar/arc_unpacker/package.nix
+++ b/pkgs/by-name/ar/arc_unpacker/package.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation {
   postPatch = ''
     cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h
     sed '1i#include <limits>' -i src/dec/eagls/pak_archive_decoder.cc # gcc12
+    sed '1i#include <vector>' -i src/flow/cli_facade.h # gcc14
   '';
 
   nativeBuildInputs = [

From 33b717475894bfd8fc5448c4830e25582efaa6b0 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 21 Dec 2024 11:01:50 +0800
Subject: [PATCH 336/340] peakperf: init at 1.17-unstable-2024-10-07

---
 pkgs/by-name/pe/peakperf/package.nix | 74 ++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 pkgs/by-name/pe/peakperf/package.nix

diff --git a/pkgs/by-name/pe/peakperf/package.nix b/pkgs/by-name/pe/peakperf/package.nix
new file mode 100644
index 0000000000000..379963aac1567
--- /dev/null
+++ b/pkgs/by-name/pe/peakperf/package.nix
@@ -0,0 +1,74 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  config,
+  enableCuda ? config.cudaSupport,
+  cudaPackages,
+  versionCheckHook,
+  installShellFiles,
+  unstableGitUpdater,
+  fetchpatch,
+  autoAddDriverRunpath,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "peakperf";
+  version = "1.17-unstable-2024-10-07";
+
+  src = fetchFromGitHub {
+    owner = "Dr-Noob";
+    repo = "peakperf";
+    rev = "289c8a2f58eb51712d346d5c993b3c1d136bf031";
+    hash = "sha256-CoGWj+zskcv8caFjhy55GKTKqFq2y1/nMjiVc6TzU1c=";
+  };
+
+  nativeBuildInputs =
+    [
+      cmake
+      installShellFiles
+    ]
+    ++ lib.optionals enableCuda [
+      cudaPackages.cuda_nvcc
+      autoAddDriverRunpath
+    ];
+
+  buildInputs = lib.optionals enableCuda [
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_nvml_dev
+  ];
+
+  postInstall = ''
+    installManPage ${finalAttrs.src}/peakperf.1
+  '';
+
+  passthru = {
+    updateScript = unstableGitUpdater { };
+  };
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = [
+    "-v"
+  ];
+
+  preVersionCheck = ''
+    export version=1.17
+  '';
+
+  doInstallCheck = true;
+
+  versionCheckProgram = "${placeholder "out"}/bin/peakperf";
+
+  meta = {
+    homepage = "https://github.com/Dr-Noob/peakperf";
+    description = "Achieve peak performance on x86 CPUs and NVIDIA GPUs";
+    mainProgram = "peakperf";
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    platforms = [ "x86_64-linux" ];
+    license = lib.licenses.gpl2Only;
+  };
+})

From 8a3157d3b9ef0b1d4eae1e2cb57d40b4762476f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 09:03:02 +0000
Subject: [PATCH 337/340] mympd: 19.0.1 -> 19.0.2

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

diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix
index 6de5fae0aec5c..fda140295ea5c 100644
--- a/pkgs/by-name/my/mympd/package.nix
+++ b/pkgs/by-name/my/mympd/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mympd";
-  version = "19.0.1";
+  version = "19.0.2";
 
   src = fetchFromGitHub {
     owner = "jcorporation";
     repo = "myMPD";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-kpNsISDc9L+eeaKCFg3QsZFHIv1+yTIv3svRdGGbNQ0=";
+    sha256 = "sha256-44aorX4i+/kwWMIlM1Z+I81PT+Udjk0llg706eVKONY=";
   };
 
   nativeBuildInputs = [

From 716c9419b082aed4560232b277f8be6250858926 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 29 Dec 2024 04:09:33 -0500
Subject: [PATCH 338/340] ghostty: add nixos tests, add build options, fix x11
 backend (#368726)

* ghostty: add nixos test

* ghostty: add nixosTests.allTerminfo to passthru.tests

* ghostty: factor out dependencies

This is meant to make cross platform support a bit easier. The options
are kept private as they aren't meant to be touched by end users

* ghostty: add optimizationLevel option

* ghostty: cleanup outputs

* ghostty: fix x11 backend

Forcing linkage isn't enough for Zig's `dlopen()` call. Let's just point
it towards the exact path instead

* ghostty: add darwin to meta.platforms
---
 nixos/tests/terminal-emulators.nix  |   2 +
 pkgs/by-name/gh/ghostty/package.nix | 190 ++++++++++++++++++----------
 2 files changed, 124 insertions(+), 68 deletions(-)

diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix
index 1affcbf3c8f79..3fc820d3ac8ba 100644
--- a/nixos/tests/terminal-emulators.nix
+++ b/nixos/tests/terminal-emulators.nix
@@ -44,6 +44,8 @@ let
 
     germinal.pkg = p: p.germinal;
 
+    ghostty.pkg = p: p.ghostty;
+
     gnome-terminal.pkg = p: p.gnome-terminal;
 
     guake.pkg = p: p.guake;
diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix
index cbafd16ba3623..dc5e936d2e141 100644
--- a/pkgs/by-name/gh/ghostty/package.nix
+++ b/pkgs/by-name/gh/ghostty/package.nix
@@ -1,44 +1,59 @@
 {
+  lib,
+  stdenv,
   bzip2,
   callPackage,
-  expat,
   fetchFromGitHub,
   fontconfig,
   freetype,
   glib,
   glslang,
   harfbuzz,
-  lib,
-  libadwaita,
   libGL,
-  libpng,
   libX11,
-  libXcursor,
-  libXi,
-  libXrandr,
+  libadwaita,
   ncurses,
   nixosTests,
   oniguruma,
   pandoc,
   pkg-config,
   removeReferencesTo,
-  stdenv,
   versionCheckHook,
   wrapGAppsHook4,
   zig_0_13,
-  zlib,
+  # Usually you would override `zig.hook` with this, but we do that internally
+  # since upstream recommends a non-default level
+  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/PACKAGING.md#build-options
+  optimizeLevel ? "ReleaseFast",
+  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/build.zig#L106
+  withAdwaita ? true,
 }:
+
 let
-  # Ghostty needs to be built with --release=fast, --release=debug and
-  # --release=safe enable too many runtime safety checks.
   zig_hook = zig_0_13.hook.overrideAttrs {
-    zig_default_flags = "-Dcpu=baseline -Doptimize=ReleaseFast --color off";
+    zig_default_flags = "-Dcpu=baseline -Doptimize=${optimizeLevel} --color off";
   };
+
+  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/apprt.zig#L72-L76
+  appRuntime = if stdenv.hostPlatform.isLinux then "gtk" else "none";
+  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/font/main.zig#L94
+  fontBackend = if stdenv.hostPlatform.isDarwin then "coretext" else "fontconfig_freetype";
+  # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/renderer.zig#L51-L52
+  renderer = if stdenv.hostPlatform.isDarwin then "metal" else "opengl";
 in
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "ghostty";
   version = "1.0.0";
 
+  outputs = [
+    "out"
+    "man"
+    "shell_integration"
+    "terminfo"
+    "vim"
+  ];
+
   src = fetchFromGitHub {
     owner = "ghostty-org";
     repo = "ghostty";
@@ -46,50 +61,56 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-AHI1Z4mfgXkNwQA8xYq4tS0/BARbHL7gQUT41vCxQTM=";
   };
 
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    glib # Required for `glib-compile-schemas`
-    ncurses
-    pandoc
-    pkg-config
-    removeReferencesTo
-    wrapGAppsHook4
-    zig_hook
-  ];
-
-  buildInputs = [
-    bzip2
-    expat
-    fontconfig
-    freetype
-    glslang
-    harfbuzz
-    libadwaita
-    libGL
-    libpng
-    libX11
-    libXcursor
-    libXi
-    libXrandr
-    oniguruma
-    zlib
-  ];
-
-  dontConfigure = true;
-  # doCheck is set to false because unit tests currently fail inside the Nix sandbox.
-  doCheck = false;
-  doInstallCheck = true;
+  # Avoid using runtime hacks to help find X11
+  postPatch = lib.optionalString (appRuntime == "gtk") ''
+    substituteInPlace src/apprt/gtk/x11.zig \
+      --replace-warn 'std.DynLib.open("libX11.so");' 'std.DynLib.open("${lib.getLib libX11}/lib/libX11.so");'
+  '';
 
   deps = callPackage ./deps.nix {
     name = "${finalAttrs.pname}-cache-${finalAttrs.version}";
   };
 
+  strictDeps = true;
+
+  nativeBuildInputs =
+    [
+      ncurses
+      pandoc
+      pkg-config
+      removeReferencesTo
+      zig_hook
+    ]
+    ++ lib.optionals (appRuntime == "gtk") [
+      glib # Required for `glib-compile-schemas`
+      wrapGAppsHook4
+    ];
+
+  buildInputs =
+    [
+      glslang
+      oniguruma
+    ]
+    ++ lib.optional (appRuntime == "gtk" && withAdwaita) libadwaita
+    ++ lib.optional (appRuntime == "gtk") libX11
+    ++ lib.optional (renderer == "opengl") libGL
+    ++ lib.optionals (fontBackend == "fontconfig_freetype") [
+      bzip2
+      fontconfig
+      freetype
+      harfbuzz
+    ];
+
   zigBuildFlags =
     [
       "--system"
       "${finalAttrs.deps}"
       "-Dversion-string=${finalAttrs.version}"
+
+      "-Dapp-runtime=${appRuntime}"
+      "-Dfont-backend=${fontBackend}"
+      "-Dgtk-adwaita=${lib.boolToString withAdwaita}"
+      "-Drenderer=${renderer}"
     ]
     ++ lib.mapAttrsToList (name: package: "-fsys=${name} --search-prefix ${lib.getLib package}") {
       inherit glslang;
@@ -97,40 +118,65 @@ stdenv.mkDerivation (finalAttrs: {
 
   zigCheckFlags = finalAttrs.zigBuildFlags;
 
-  outputs = [
-    "out"
-    "terminfo"
-    "shell_integration"
-    "vim"
-  ];
+  # Unit tests currently fail inside the sandbox
+  doCheck = false;
 
-  postInstall = ''
-    mkdir -p "$terminfo/share"
-    mv "$out/share/terminfo" "$terminfo/share/terminfo"
-    ln -sf "$terminfo/share/terminfo" "$out/share/terminfo"
+  /**
+    Ghostty really likes all of it's resources to be in the same directory, so link them back after we split them
 
-    mkdir -p "$shell_integration"
-    mv "$out/share/ghostty/shell-integration" "$shell_integration/shell-integration"
-    ln -sf "$shell_integration/shell-integration" "$out/share/ghostty/shell-integration"
+    - https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/os/resourcesdir.zig#L11-L52
+    - https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/termio/Exec.zig#L745-L750
+    - https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/termio/Exec.zig#L818-L834
+
+    terminfo and shell integration should also be installable on remote machines
+
+    ```nix
+    { pkgs, ... }: {
+      environment.systemPackages = [ pkgs.ghostty.terminfo ];
+
+      programs.bash = {
+        interactiveShellInit = ''
+          if [[ "$TERM" == "xterm-ghostty" ]]; then
+            builtin source ${pkgs.ghostty.shell_integration}/bash/ghostty.bash
+          fi
+        '';
+      };
+    }
+    ```
+  */
+  postFixup = ''
+    ln -s $man/share/man $out/share/man
+
+    moveToOutput share/terminfo $terminfo
+    ln -s $terminfo/share/terminfo $out/share/terminfo
+
+    mv $out/share/ghostty/shell-integration $shell_integration
+    ln -s $shell_integration $out/share/ghostty/shell-integration
+
+    mv $out/share/vim/vimfiles $vim
+    rmdir $out/share/vim
+    ln -s $vim $out/share/vim-plugins
 
-    mv "$out/share/vim/vimfiles" "$vim"
-    ln -sf "$vim" "$out/share/vim/vimfiles"
-  '';
 
-  preFixup = ''
     remove-references-to -t ${finalAttrs.deps} $out/bin/ghostty
   '';
 
-  NIX_LDFLAGS = [ "-lX11" ];
-
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
 
+  doInstallCheck = true;
+
   versionCheckProgramArg = [ "--version" ];
 
+  passthru = {
+    tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
+      inherit (nixosTests) allTerminfo;
+      nixos = nixosTests.terminal-emulators.ghostty;
+    };
+  };
+
   meta = {
-    homepage = "https://ghostty.org/";
     description = "Fast, native, feature-rich terminal emulator pushing modern features";
     longDescription = ''
       Ghostty is a terminal emulator that differentiates itself by being
@@ -138,16 +184,24 @@ stdenv.mkDerivation (finalAttrs: {
       emulators available, they all force you to choose between speed,
       features, or native UIs. Ghostty provides all three.
     '';
+    homepage = "https://ghostty.org/";
     downloadPage = "https://ghostty.org/download";
 
     license = lib.licenses.mit;
-    platforms = lib.platforms.linux;
     mainProgram = "ghostty";
-    outputsToInstall = finalAttrs.outputs;
     maintainers = with lib.maintainers; [
       jcollie
       pluiedev
       getchoo
     ];
+    outputsToInstall = [
+      "out"
+      "man"
+      "shell_integration"
+      "terminfo"
+    ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    # Issues finding the SDK in the sandbox
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

From 24543ec1cd4600143b18a1d177f171980b7e7578 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sat, 21 Dec 2024 09:59:45 +0800
Subject: [PATCH 339/340] gpufetch: init at 0.25

---
 pkgs/by-name/gp/gpufetch/package.nix | 75 ++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 pkgs/by-name/gp/gpufetch/package.nix

diff --git a/pkgs/by-name/gp/gpufetch/package.nix b/pkgs/by-name/gp/gpufetch/package.nix
new file mode 100644
index 0000000000000..3a40a1df76f7f
--- /dev/null
+++ b/pkgs/by-name/gp/gpufetch/package.nix
@@ -0,0 +1,75 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  config,
+  pciutils,
+  cudaSupport ? config.cudaSupport,
+  cudaPackages,
+  installShellFiles,
+  autoAddDriverRunpath,
+  gitUpdater,
+  versionCheckHook,
+  zlib,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gpufetch";
+  version = "0.25";
+
+  src = fetchFromGitHub {
+    owner = "Dr-Noob";
+    repo = "gpufetch";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-1j23h3TDxa2xu03o37fXfRL3XFYyhMWFGupAlkrYpBY=";
+  };
+
+  nativeBuildInputs =
+    [
+      cmake
+      installShellFiles
+    ]
+    ++ lib.optionals cudaSupport [
+      cudaPackages.cuda_nvcc
+      autoAddDriverRunpath
+    ];
+
+  buildInputs =
+    [
+      zlib
+      pciutils
+    ]
+    ++ lib.optionals cudaSupport [
+      cudaPackages.cuda_cudart
+      cudaPackages.cuda_nvml_dev
+    ];
+
+  installPhase = ''
+    runHook preInstall
+
+    installManPage ${finalAttrs.src}/gpufetch.1
+    install -Dm755 ./gpufetch $out/bin/gpufetch
+
+    runHook postInstall
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+  };
+
+  meta = {
+    description = "Simple yet fancy GPU architecture fetching tool";
+    homepage = "https://github.com/Dr-Noob/gpufetch";
+    license = lib.licenses.gpl2Only;
+    mainProgram = "gpufetch";
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    platforms = [ "x86_64-linux" ];
+  };
+})

From 6f9f68e6d680024acd15b4b9c29b94f6379fa716 Mon Sep 17 00:00:00 2001
From: Iliyan Kostov <59366790+IliyanKostov9@users.noreply.github.com>
Date: Sun, 29 Dec 2024 12:24:26 +0200
Subject: [PATCH 340/340] Update package.nix

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

diff --git a/pkgs/by-name/vi/viber/package.nix b/pkgs/by-name/vi/viber/package.nix
index fb039938c8c98..3158d9d446e34 100644
--- a/pkgs/by-name/vi/viber/package.nix
+++ b/pkgs/by-name/vi/viber/package.nix
@@ -95,6 +95,7 @@ stdenv.mkDerivation {
     wayland
     zlib
     zstd
+    ffmpeg
 
     xorg.libICE
     xorg.libSM