From a22671fab0d478c9e3fb61119a4ea659593efeb8 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 12 Jan 2025 21:15:05 +0000
Subject: [PATCH 01/96] python312Packages.cffi: disable checks for pkgsLLVM
 build

pkgsLLVM's check environment doesn't appear to supply a
cc
---
 pkgs/development/python-modules/cffi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index 6597dd4749d0..d392915f05f8 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -49,7 +49,7 @@ else
     # The tests use -Werror but with python3.6 clang detects some unreachable code.
     env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument -Wno-unreachable-code -Wno-c++11-narrowing";
 
-    doCheck = !stdenv.hostPlatform.isMusl;
+    doCheck = !(stdenv.hostPlatform.isMusl || stdenv.hostPlatform.useLLVM or false);
 
     nativeCheckInputs = [ pytestCheckHook ];
 

From 565893559c26748b059c7987b51d83503cd54ac0 Mon Sep 17 00:00:00 2001
From: Zhong Jianxin <azuwis@gmail.com>
Date: Sat, 11 Jan 2025 11:02:28 +0800
Subject: [PATCH 02/96] uchmviewer: init at 8.4

Description: CHM (Winhelp) files viewer (fork of KchmViewer)

Homepage: https://github.com/eBookProjects/uChmViewer
---
 pkgs/by-name/uc/uchmviewer/package.nix | 56 ++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 pkgs/by-name/uc/uchmviewer/package.nix

diff --git a/pkgs/by-name/uc/uchmviewer/package.nix b/pkgs/by-name/uc/uchmviewer/package.nix
new file mode 100644
index 000000000000..30996a7a63aa
--- /dev/null
+++ b/pkgs/by-name/uc/uchmviewer/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  chmlib,
+  libzip,
+  qt6,
+  cmake,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "uchmviewer";
+  version = "8.4";
+
+  src = fetchFromGitHub {
+    owner = "eBookProjects";
+    repo = "uChmViewer";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-p3KIIg2B+sSlwJr1rNMP7JByxYXyYFsj+UyUiDbJge8=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    chmlib
+    libzip
+    qt6.qt5compat
+    qt6.qtwebengine
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "USE_WEBENGINE" true)
+  ];
+
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/{Applications,bin}
+    mv $out/uchmviewer.app $out/Applications
+    ln -s $out/Applications/uchmviewer.app/Contents/MacOS/uchmviewer $out/bin/uchmviewer
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/eBookProjects/uChmViewer/releases/tag/v${finalAttrs.version}";
+    description = "CHM (Winhelp) files viewer (fork of KchmViewer)";
+    homepage = "https://github.com/eBookProjects/uChmViewer";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "uchmviewer";
+    maintainers = with lib.maintainers; [ azuwis ];
+    platforms = lib.platforms.unix;
+  };
+})

From 39c15b35c591b5e9e1b6cebb9a13db78d81b8d4a Mon Sep 17 00:00:00 2001
From: Peter Kling <1018801+pitkling@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:41:24 +0100
Subject: [PATCH 03/96] mbrola: 3.3 -> 3.3-unstable-2024-01-29

To include fixes (specifically numediart/MBROLA@d0119cc6cd8eb93b391af35d46b140d1405fd0b5 and numediart/MBROLA@19f31ebf68d74a14fe0262345c4d43b21d2ea803) that enable compilation on Darwin.
---
 pkgs/applications/audio/mbrola/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/mbrola/default.nix b/pkgs/applications/audio/mbrola/default.nix
index ade11f764c70..e025827fed7a 100644
--- a/pkgs/applications/audio/mbrola/default.nix
+++ b/pkgs/applications/audio/mbrola/default.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "mbrola";
-  version = "3.3";
+  version = "3.3-unstable-2024-01-29";
 
   meta = with lib; {
     license = licenses.agpl3Plus;
@@ -25,8 +25,8 @@ let
     src = fetchFromGitHub {
       owner = "numediart";
       repo = "MBROLA";
-      rev = version;
-      sha256 = "1w86gv6zs2cbr0731n49z8v6xxw0g8b0hzyv2iqb9mqcfh38l8zy";
+      rev = "bf17e9e1416a647979ac683657a536e8ca5d880e";
+      hash = "sha256-ZjCl1gx/6sGtpXAYO4sAh6dutjwzClQ7kZoq0WaaBlU=";
     };
 
     # required for cross compilation

From 3d0eeff147d13807a2e2f680d004df7e479be332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 21 Jan 2025 17:23:10 -0800
Subject: [PATCH 04/96] python313Packages.dlinfo: 1.2.1 -> 2.0.0

Changelog: https://github.com/fphammerle/python-dlinfo/blob/v2.0.0/CHANGELOG.md
---
 .../python-modules/dlinfo/default.nix         | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/dlinfo/default.nix b/pkgs/development/python-modules/dlinfo/default.nix
index 1b774b8e85c0..1937f601ff22 100644
--- a/pkgs/development/python-modules/dlinfo/default.nix
+++ b/pkgs/development/python-modules/dlinfo/default.nix
@@ -2,31 +2,33 @@
   lib,
   stdenv,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools-scm,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "dlinfo";
-  version = "1.2.1";
+  version = "2.0.0";
+  pyproject = true;
 
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "5f6f43b47f3aa5fe12bd347cf536dc8fca6068c61a0a260e408bec7f6eb4bd38";
+  src = fetchFromGitHub {
+    owner = "fphammerle";
+    repo = "python-dlinfo";
+    tag = "v${version}";
+    hash = "sha256-W9WfXU5eIMQQImzRgTJS0KL4IZfRtLrK8TYmdEc0VLI=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "dlinfo" ];
 
   meta = {
+    changelog = "https://github.com/fphammerle/python-dlinfo/blob/${src.tag}/CHANGELOG.md";
     description = "Python wrapper for libc's dlinfo and dyld_find on Mac";
-    homepage = "https://github.com/cloudflightio/python-dlinfo";
+    homepage = "https://github.com/fphammerle/python-dlinfo";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dotlambda ];
     broken = stdenv.hostPlatform.isDarwin;

From d68b25f43b3baa09c5253c2d5f87d3bb3708c7f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2025 08:04:39 +0000
Subject: [PATCH 05/96] mitra: 3.13.1 -> 3.14.0

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

diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix
index cdc870d16174..9168ed8b5596 100644
--- a/pkgs/by-name/mi/mitra/package.nix
+++ b/pkgs/by-name/mi/mitra/package.nix
@@ -6,18 +6,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mitra";
-  version = "3.13.1";
+  version = "3.14.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "silverpill";
     repo = "mitra";
     rev = "v${version}";
-    hash = "sha256-jAh3sWOHbqo5EpH+Ap/AOha2AKk6iwMvyUme6Ct96qI=";
+    hash = "sha256-4f0zh7rdS0lTnN4OzUEL8tn6S18cYTj92vA8akyt4K4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-GDhdMShO+W05ny/hgXKcwDzcO9Stk3NM4U95ArImRYU=";
+  cargoHash = "sha256-MA/C/8x7Bmh6ekd4iHvjX9Lf/hG43Qb5nhEHINpeBHA=";
 
   # require running database
   doCheck = false;

From 3b863ac0e19cc305789d169ebb0f451136e3159a Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 22 Jan 2025 19:14:55 -0500
Subject: [PATCH 06/96] ols: do not set -microarch:native

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

diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix
index 39f11a15c51d..4919c80dadd2 100644
--- a/pkgs/by-name/ol/ols/package.nix
+++ b/pkgs/by-name/ol/ols/package.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation {
   };
 
   postPatch = ''
+    substituteInPlace build.sh \
+      --replace-fail "-microarch:native" ""
     patchShebangs build.sh odinfmt.sh
   '';
 

From 20775195500f784d1f2b6a5945e166446769acf0 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Jan 2025 10:50:54 +0100
Subject: [PATCH 07/96] vmpk: move to pkgs/by-name

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

diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/by-name/vm/vmpk/package.nix
similarity index 77%
rename from pkgs/applications/audio/vmpk/default.nix
rename to pkgs/by-name/vm/vmpk/package.nix
index 7201030bac35..2920105542cc 100644
--- a/pkgs/applications/audio/vmpk/default.nix
+++ b/pkgs/by-name/vm/vmpk/package.nix
@@ -1,16 +1,15 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchurl,
   cmake,
   pkg-config,
-  qttools,
-  qtx11extras,
-  drumstick,
+  qt5,
+  libsForQt5,
   docbook-xsl-nons,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "vmpk";
   version = "0.8.8";
 
@@ -22,18 +21,19 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
+    qt5.qttools
     docbook-xsl-nons
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    drumstick
-    qtx11extras
+    libsForQt5.drumstick
+    qt5.qtx11extras
   ];
 
   postInstall = ''
     # vmpk drumstickLocales looks here:
-    ln -s ${drumstick}/share/drumstick $out/share/
+    ln -s ${libsForQt5.drumstick}/share/drumstick $out/share/
   '';
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5750b99a5dc1..c7d97ef930df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15617,8 +15617,6 @@ with pkgs;
     onlyLibVLC = true;
   };
 
-  vmpk = libsForQt5.callPackage ../applications/audio/vmpk { };
-
   vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { };
 
   vorbis-tools = callPackage ../applications/audio/vorbis-tools {

From f7f9e973fd3356fc8eb110090155e46585136bfe Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Jan 2025 10:53:44 +0100
Subject: [PATCH 08/96] vmpk: 0.8.8 -> 0.9.1

---
 pkgs/by-name/vm/vmpk/package.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/vm/vmpk/package.nix b/pkgs/by-name/vm/vmpk/package.nix
index 2920105542cc..3804ea818abf 100644
--- a/pkgs/by-name/vm/vmpk/package.nix
+++ b/pkgs/by-name/vm/vmpk/package.nix
@@ -4,36 +4,35 @@
   fetchurl,
   cmake,
   pkg-config,
-  qt5,
-  libsForQt5,
+  qt6,
+  qt6Packages,
   docbook-xsl-nons,
 }:
 
 stdenv.mkDerivation rec {
   pname = "vmpk";
-  version = "0.8.8";
+  version = "0.9.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-+NjTcszb1KXGynIcCf4IEDvN4f8pgXtR1TksxGR5ZHQ=";
+    hash = "sha256-O/uIg1Wq6Hwt7J5AkoXQshBhrKrQdfVTbb8qr7ttSNw=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    qt5.qttools
+    qt6.qttools
     docbook-xsl-nons
-    qt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    libsForQt5.drumstick
-    qt5.qtx11extras
+    qt6Packages.drumstick
   ];
 
   postInstall = ''
     # vmpk drumstickLocales looks here:
-    ln -s ${libsForQt5.drumstick}/share/drumstick $out/share/
+    ln -s ${qt6Packages.drumstick}/share/drumstick $out/share/
   '';
 
   meta = with lib; {

From bf211cf6c305dcc6bdc8b026c345cf59142b19db Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Tue, 21 Jan 2025 19:08:49 +0800
Subject: [PATCH 09/96] localsend: refactor

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

diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix
index 648ea6c6fb6c..af1fca2790c8 100644
--- a/pkgs/by-name/lo/localsend/package.nix
+++ b/pkgs/by-name/lo/localsend/package.nix
@@ -21,9 +21,9 @@ let
     inherit pname version;
 
     src = fetchFromGitHub {
-      owner = pname;
-      repo = pname;
-      rev = "v${version}";
+      owner = "localsend";
+      repo = "localsend";
+      tag = "v${version}";
       hash = "sha256-9nW1cynvRgX565ZupR+ogfDH9Qem+LQH4XZupVsrEWo=";
     };
 
@@ -37,7 +37,6 @@ let
     };
 
     nativeBuildInputs = [
-      pkg-config
       copyDesktopItems
     ];
 
@@ -52,18 +51,28 @@ let
     '';
 
     extraWrapProgramArgs = ''
-      --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib"
+      --prefix LD_LIBRARY_PATH : $out/app/localsend/lib
     '';
 
     desktopItems = [
       (makeDesktopItem {
         name = "LocalSend";
-        exec = "localsend_app";
+        exec = "localsend_app %U";
         icon = "localsend";
         desktopName = "LocalSend";
         startupWMClass = "localsend_app";
         genericName = "An open source cross-platform alternative to AirDrop";
-        categories = [ "Network" ];
+        categories = [
+          "GTK"
+          "FileTransfer"
+          "Utility"
+        ];
+        keywords = [
+          "Sharing"
+          "LAN"
+          "Files"
+        ];
+        startupNotify = true;
       })
     ];
 
@@ -93,12 +102,17 @@ let
     sourceRoot = ".";
 
     installPhase = ''
+      runHook preInstall
+
       mkdir -p $out/Applications
-      cp -r *.app $out/Applications
+      cp -r LocalSend.app $out/Applications
       makeBinaryWrapper $out/Applications/LocalSend.app/Contents/MacOS/LocalSend $out/bin/localsend
+
+      runHook postInstall
     '';
 
     meta = metaCommon // {
+      mainProgram = "localsend";
       sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
       platforms = [
         "x86_64-darwin"
@@ -111,7 +125,6 @@ let
     description = "Open source cross-platform alternative to AirDrop";
     homepage = "https://localsend.org/";
     license = lib.licenses.mit;
-    mainProgram = "localsend";
     maintainers = with lib.maintainers; [
       sikmir
       linsui

From 8bd04ce7b565c9d84834842db0a3a906c9eb787c Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Tue, 21 Jan 2025 21:04:32 +0800
Subject: [PATCH 10/96] localsend: fix autostart

---
 pkgs/by-name/lo/localsend/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix
index af1fca2790c8..3b7c25d55682 100644
--- a/pkgs/by-name/lo/localsend/package.nix
+++ b/pkgs/by-name/lo/localsend/package.nix
@@ -7,7 +7,6 @@
   makeDesktopItem,
   copyDesktopItems,
   nixosTests,
-  pkg-config,
   libayatana-appindicator,
   undmg,
   makeBinaryWrapper,
@@ -36,6 +35,11 @@ let
       pasteboard = "sha256-lJA5OWoAHfxORqWMglKzhsL1IFr9YcdAQP/NVOLYB4o=";
     };
 
+    postPatch = ''
+      substituteInPlace lib/util/native/autostart_helper.dart \
+        --replace-fail 'Exec=''${Platform.resolvedExecutable}' "Exec=localsend_app"
+    '';
+
     nativeBuildInputs = [
       copyDesktopItems
     ];

From 3896419a2b4ffd135381f72d07a34e2c9716aab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 30 Jan 2025 16:41:46 -0800
Subject: [PATCH 11/96] python313Packages.calmjs-parse: 1.3.2 -> 1.3.3

Diff: https://github.com/calmjs/calmjs.parse/compare/1.3.2...1.3.3

Changelog: https://github.com/calmjs/calmjs.parse/blob/1.3.3/CHANGES.rst
---
 .../python-modules/calmjs-parse/default.nix    | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/calmjs-parse/default.nix b/pkgs/development/python-modules/calmjs-parse/default.nix
index 16722ff9d01d..59818f92153e 100644
--- a/pkgs/development/python-modules/calmjs-parse/default.nix
+++ b/pkgs/development/python-modules/calmjs-parse/default.nix
@@ -4,20 +4,20 @@
   fetchFromGitHub,
   setuptools,
   ply,
-  python,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "calmjs-parse";
-  version = "1.3.2";
+  version = "1.3.3";
 
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "calmjs";
     repo = "calmjs.parse";
-    rev = version;
-    hash = "sha256-+tel9AJFaKqsuSjqS1KPyRjO6iU7V90ECSEYLBdfqZU=";
+    tag = version;
+    hash = "sha256-aGGIwQBHToujc69zzIeEbvmYwLKA5X3bamVWBRmJtSE=";
   };
 
   postPatch = ''
@@ -32,13 +32,9 @@ buildPythonPackage rec {
     ply
   ];
 
-  checkPhase = ''
-    runHook preCheck
-
-    ${python.interpreter} -m unittest calmjs.parse.tests.make_suite
-
-    runHook postCheck
-  '';
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [
     "calmjs.parse"

From 26d42513d4efec659b6e1ee3d36a6dee2d510095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 30 Jan 2025 16:54:16 -0800
Subject: [PATCH 12/96] flare-signal: 0.15.7 -> 0.15.8

Diff: https://gitlab.com/schmiddi-on-mobile/flare/-/compare/0.15.7...0.15.8

Changelog: https://gitlab.com/schmiddi-on-mobile/flare/-/blob/0.15.8/CHANGELOG.md
---
 pkgs/by-name/fl/flare-signal/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix
index 2c147db9a429..f1db4dafe0da 100644
--- a/pkgs/by-name/fl/flare-signal/package.nix
+++ b/pkgs/by-name/fl/flare-signal/package.nix
@@ -22,19 +22,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flare";
-  version = "0.15.7";
+  version = "0.15.8";
 
   src = fetchFromGitLab {
     domain = "gitlab.com";
     owner = "schmiddi-on-mobile";
     repo = "flare";
     rev = finalAttrs.version;
-    hash = "sha256-KFxBdWNN7LYQ5jiDZhAs4pqX2cRLvEGaAhYabaQh1n0=";
+    hash = "sha256-uvqLcFHtoXn4VALd/SOWg5i6ndjsvcZ+Uxokjg7YEO8=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-bZL9/0MYGxXefrj9whG+N7iMaBpaZSeBVAWR0AKKEvo=";
+    hash = "sha256-ZKq/6MEYq99lLS2b7o1iXXgnmTIzvhmPhRXbQeYPONA=";
   };
 
   nativeBuildInputs = [

From efd0fbe61b8b12eddb267fd599b5ff019e5c3637 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Sat, 25 Jan 2025 16:50:11 +0800
Subject: [PATCH 13/96] yutto: 2.0.0-rc.7 -> 2.0.0

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

diff --git a/pkgs/by-name/yu/yutto/package.nix b/pkgs/by-name/yu/yutto/package.nix
index c2e583dde832..5684087104bd 100644
--- a/pkgs/by-name/yu/yutto/package.nix
+++ b/pkgs/by-name/yu/yutto/package.nix
@@ -8,7 +8,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "yutto";
-  version = "2.0.0-rc.7";
+  version = "2.0.0";
   pyproject = true;
 
   disabled = python3Packages.pythonOlder "3.9";
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
     owner = "yutto-dev";
     repo = "yutto";
     tag = "v${version}";
-    hash = "sha256-yNAQmpR65FSCbciSSdO2eHUJcE6Dl8J4dqq6GHt5NDQ=";
+    hash = "sha256-qbT72SGtSz7/7j1xUzQh5bXxM0GKsJorZ6Y8jshP2WU=";
   };
 
   build-system = with python3Packages; [ hatchling ];

From f905e740c9faec6b0bea1b2679883aa718561194 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 1 Feb 2025 12:04:22 +0100
Subject: [PATCH 14/96] python3Packages.ttfautohint-py: fix loading some
 modules

---
 .../python-modules/ttfautohint-py/default.nix   | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/ttfautohint-py/default.nix b/pkgs/development/python-modules/ttfautohint-py/default.nix
index d6ae488bb342..b99908f2bda3 100644
--- a/pkgs/development/python-modules/ttfautohint-py/default.nix
+++ b/pkgs/development/python-modules/ttfautohint-py/default.nix
@@ -23,10 +23,15 @@ buildPythonPackage rec {
     hash = "sha256-NTog461RpyHKo/Qpicj3tflehaKj9LlZEN9qeCMM6JQ=";
   };
 
-  postPatch = ''
-    substituteInPlace src/python/ttfautohint/__init__.py \
-      --replace-fail 'find_library("ttfautohint")' '"${lib.getLib ttfautohint}/lib/libttfautohint${stdenv.hostPlatform.extensions.sharedLibrary}"'
-  '';
+  postPatch =
+    ''
+      substituteInPlace src/python/ttfautohint/__init__.py \
+        --replace-fail 'find_library("ttfautohint")' '"${lib.getLib ttfautohint}/lib/libttfautohint${stdenv.hostPlatform.extensions.sharedLibrary}"'
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      substituteInPlace src/python/ttfautohint/memory.py \
+        --replace-fail 'find_library("c")' '"${lib.getLib stdenv.cc.libc}/lib/libc.so.6"'
+    '';
 
   env.TTFAUTOHINTPY_BUNDLE_DLL = false;
 
@@ -36,6 +41,10 @@ buildPythonPackage rec {
     distutils
   ];
 
+  dependencies = [
+    setuptools # for pkg_resources
+  ];
+
   buildInputs = [ ttfautohint ];
 
   nativeCheckInputs = [

From 445d027784f7a96182068961247d32d3dcd7e7a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Feb 2025 15:29:13 +0000
Subject: [PATCH 15/96] zapret: 69.9 -> 70

---
 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 9de0012d1a75..8b1c922f86a0 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.9";
+  version = "70";
 
   src = fetchFromGitHub {
     owner = "bol-van";
     repo = "zapret";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rpm9v/7twsrImeipz3I7fHUrk98qzkLQ2b4Kz3Rc+GI=";
+    hash = "sha256-ywqJ44WN0UmZEVUlghuBDSdeaBpf7F8KjrcKSwx/ATI=";
   };
 
   buildInputs = [

From 7e98ff642e38350da6a4f378cb6ec0cf6485539f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Feb 2025 20:52:32 +0100
Subject: [PATCH 16/96] python312Packages.python-motionmount: 2.2.0 -> 2.3.0

Diff: https://github.com/vogelsproducts/python-MotionMount/compare/refs/tags/2.2.0...2.3.0
---
 .../development/python-modules/python-motionmount/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-motionmount/default.nix b/pkgs/development/python-modules/python-motionmount/default.nix
index be922822f69c..1500b0f335b4 100644
--- a/pkgs/development/python-modules/python-motionmount/default.nix
+++ b/pkgs/development/python-modules/python-motionmount/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "python-motionmount";
-  version = "2.2.0";
+  version = "2.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "vogelsproducts";
     repo = "python-MotionMount";
     tag = version;
-    hash = "sha256-07wTlyfUSt44dBwOXjkXADA+HDy8531KYxJAKqBWKeQ=";
+    hash = "sha256-T7LMEISgc8HytiyANDUPdsE+l14g9wdW2QiDKFx2gY0=";
   };
 
   build-system = [ setuptools ];

From c9a0b01b0ef34f93a007c2e2c939445d96b3c9e0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Feb 2025 20:55:10 +0100
Subject: [PATCH 17/96] python313Packages.tencentcloud-sdk-python: 3.0.1310 ->
 3.0.1311

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1310...3.0.1311

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1311/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 9fd7a701a09d..ecf7b4990771 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.1310";
+  version = "3.0.1311";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-m7Kg3aWgvSHLiDPC52lVen+6dRfVDMPdv1IItd/aBjM=";
+    hash = "sha256-UgtbOc5/7NAqC4W6A7EBBr8Wm0moWn+xSTq3NBMGVOU=";
   };
 
   build-system = [ setuptools ];

From 9e229c659693a6e682149112eac92187d7daca75 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 1 Feb 2025 20:48:26 +0100
Subject: [PATCH 18/96] zathura: correctly read global configuration file at
 /etc/zathurarc

zathura made the sysconfdir, i.e. /etc, configurable in 0.5.10. The
default value of sysconfdir unfortunately uses prefix, so zathura would
search for the global config file at $out/etc/zathurarc where it can't
be created (without overriding the derivation):
https://github.com/pwmt/zathura/commit/213a2be033f5638cd085ff50c26ec46d96b089ae

All documentation on zathura claims that /etc/zathurarc is read (e.g.
the man pages installed with the package), so we should actually make
sure that the package behaves as advertised and restore the behavior of
pre 0.5.10.
---
 pkgs/applications/misc/zathura/core/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index b23e88761577..899e1ee92fba 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -53,6 +53,8 @@ stdenv.mkDerivation (finalAttrs: {
     "-Dconvert-icon=enabled"
     "-Dsynctex=enabled"
     "-Dtests=disabled"
+    # by default, zathura searches for zathurarc under $out/etc
+    "-Dsysconfdir=/etc"
     # Make sure tests are enabled for doCheck
     # (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
     (lib.mesonEnable "seccomp" stdenv.hostPlatform.isLinux)

From 5eb932f8a119c2c27af30d7a81267d03fb8ef291 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Feb 2025 21:12:38 +0100
Subject: [PATCH 19/96] python313Packages.yeelight: 0.7.14 -> 0.7.16

Diff: https://gitlab.com/stavros/python-yeelight/-/compare/refs/tags/v0.7.14...v0.7.16

Changelog: https://gitlab.com/stavros/python-yeelight/-/blob/v0.7.16/CHANGELOG.md
---
 .../development/python-modules/yeelight/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix
index ba9faf0217b2..8b08b68fb29c 100644
--- a/pkgs/development/python-modules/yeelight/default.nix
+++ b/pkgs/development/python-modules/yeelight/default.nix
@@ -3,7 +3,6 @@
   async-timeout,
   buildPythonPackage,
   fetchFromGitLab,
-  fetchpatch2,
   flit-core,
   ifaddr,
   pytestCheckHook,
@@ -12,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "yeelight";
-  version = "0.7.14";
+  version = "0.7.16";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,17 +20,9 @@ buildPythonPackage rec {
     owner = "stavros";
     repo = "python-yeelight";
     rev = "refs/tags/v${version}";
-    hash = "sha256-BnMvRs95rsmoBa/5bp0zShgU1BBHtZzyADjbH0y1d/o=";
+    hash = "sha256-WLEXTDVcSpGCmfEI31cQXGf9+4EIUCkcaeaj25f4ERU=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "remove-future-dependency.patch";
-      url = "https://gitlab.com/stavros/python-yeelight/-/commit/654f4f34e0246e65d8db02a107e2ab706de4806d.patch";
-      hash = "sha256-olKpYCzIq/E7zup40Kwzwgk5iOtCubLHo9uQDOhaByQ=";
-    })
-  ];
-
   build-system = [ flit-core ];
 
   dependencies = [ ifaddr ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];

From c1d3584f4a65c56ad11c4098ef623963cde4eaf0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Feb 2025 20:20:55 +0000
Subject: [PATCH 20/96] cf-terraforming: 0.22.0 -> 0.23.2

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

diff --git a/pkgs/by-name/cf/cf-terraforming/package.nix b/pkgs/by-name/cf/cf-terraforming/package.nix
index d7938a072e71..c2900ad83531 100644
--- a/pkgs/by-name/cf/cf-terraforming/package.nix
+++ b/pkgs/by-name/cf/cf-terraforming/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "cf-terraforming";
-  version = "0.22.0";
+  version = "0.23.2";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cf-terraforming";
     rev = "v${version}";
-    sha256 = "sha256-vWsA/VNtQvnrypcBB/5CJbiHEvnYkjuesdkq4soTMVM=";
+    sha256 = "sha256-y98UXRC8pyCIhCUHh9vqxXkN+HDwSTfplOAJZwKnIxw=";
   };
 
-  vendorHash = "sha256-eTc9K9EXlWmj1YAcOOEIUwELq6szLsj1zYj44VTvquw=";
+  vendorHash = "sha256-tSN+ExQeDlaw8kTnDGIGbdAoX5wCPhp9MgYi2Z8fGvc=";
   ldflags = [
     "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}"
   ];

From 7cb541ddbbb4ffb173f7673c3efcd9639d484183 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Feb 2025 20:58:32 +0000
Subject: [PATCH 21/96] nwg-panel: 0.9.61 -> 0.9.62

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

diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix
index 5031835507eb..dcf88c90c63b 100644
--- a/pkgs/by-name/nw/nwg-panel/package.nix
+++ b/pkgs/by-name/nw/nwg-panel/package.nix
@@ -23,13 +23,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nwg-panel";
-  version = "0.9.61";
+  version = "0.9.62";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-panel";
     tag = "v${version}";
-    hash = "sha256-1p6fWP4iS8yryVv0DC+yQSSJj5EeAYNdiJiklKpfqgM=";
+    hash = "sha256-h+lhk3gqJj3/GZ8S4vnUE8UaunmT1KcaGquSb/I+kpI=";
   };
 
   # No tests

From e420dbc2f8688f8e58e3d662f3484108ce780235 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Feb 2025 20:58:57 +0000
Subject: [PATCH 22/96] instaloader: 4.14 -> 4.14.1

---
 pkgs/tools/misc/instaloader/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/instaloader/default.nix b/pkgs/tools/misc/instaloader/default.nix
index ed97970b34c2..10f89891e591 100644
--- a/pkgs/tools/misc/instaloader/default.nix
+++ b/pkgs/tools/misc/instaloader/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "instaloader";
-  version = "4.14";
+  version = "4.14.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "instaloader";
     repo = "instaloader";
     tag = "v${version}";
-    sha256 = "sha256-UgnqO52q4kPYPz/eTrQOQXC+zZgtr4KwWPRRDTpzFuc=";
+    sha256 = "sha256-ZGCO5xNUwrQFsSaAiP1yffrkSN+Mxdtrw+Kve0s2t2E=";
   };
 
   nativeBuildInputs = [

From 8f94e4b51a6c9fb06f8ba0dce6bca9cfc51303d3 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sun, 26 Jan 2025 14:23:41 -0500
Subject: [PATCH 23/96] python312Packages.pdfplumber: fix dependencies

The version depends on pypdfium2, not wand. Now that pypdfium2 is
packaged for nixpkgs, this patch updates to pull it. We can now execute
their test suite too.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 .../python-modules/pdfplumber/default.nix     | 37 ++++++-------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/python-modules/pdfplumber/default.nix b/pkgs/development/python-modules/pdfplumber/default.nix
index fd1881adf6a7..5130c287c9c1 100644
--- a/pkgs/development/python-modules/pdfplumber/default.nix
+++ b/pkgs/development/python-modules/pdfplumber/default.nix
@@ -9,11 +9,11 @@
   pandas-stubs,
   pdfminer-six,
   pillow,
+  pypdfium2,
+  pytest-cov,
   pytest-parallel,
   pytestCheckHook,
-  pythonOlder,
   types-pillow,
-  wand,
 }:
 
 buildPythonPackage rec {
@@ -21,8 +21,6 @@ buildPythonPackage rec {
   version = "0.11.5";
   format = "setuptools";
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "jsvine";
     repo = "pdfplumber";
@@ -30,19 +28,17 @@ buildPythonPackage rec {
     hash = "sha256-oe6lZyQKXASzG7Ho6o7mlXY+BOgVBaACebxbYD+1+x0=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "--cov=pdfplumber --cov-report xml:coverage.xml --cov-report term" ""
-  '';
-
-  propagatedBuildInputs = [
+  dependencies = [
     pdfminer-six
     pillow
-    wand
+    pypdfium2
   ];
 
   preCheck = ''
     export HOME=$(mktemp -d)
+    # test_issue_1089 assumes the soft limit on open files is "low", otherwise it never completes
+    # reported at: https://github.com/jsvine/pdfplumber/issues/1263
+    ulimit -n 1024
   '';
 
   nativeCheckInputs = [
@@ -51,6 +47,7 @@ buildPythonPackage rec {
     nbexec
     pandas
     pandas-stubs
+    pytest-cov
     pytest-parallel
     pytestCheckHook
     types-pillow
@@ -58,24 +55,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pdfplumber" ];
 
-  disabledTests = [
-    # flaky
-    "test__repr_png_"
-  ];
-
-  disabledTestPaths = [
-    # Tests requires pypdfium2
-    "tests/test_display.py"
-    # Tests requires pypdfium2
-    "tests/test_issues.py"
-  ];
-
-  meta = with lib; {
+  meta = {
     description = "Plumb a PDF for detailed information about each char, rectangle, line, et cetera — and easily extract text and tables";
     mainProgram = "pdfplumber";
     homepage = "https://github.com/jsvine/pdfplumber";
     changelog = "https://github.com/jsvine/pdfplumber/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ happysalada ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ happysalada ];
   };
 }

From e8a1eaac327ca5ab4286554c6221a3c7c2b25479 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sun, 26 Jan 2025 14:24:46 -0500
Subject: [PATCH 24/96] unstructured-api: add missing pypdfium2 dependency

The python package was recently packaged for nixpkgs.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
---
 pkgs/servers/unstructured-api/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/unstructured-api/default.nix b/pkgs/servers/unstructured-api/default.nix
index 5f323fdd3053..96a5a15584d8 100644
--- a/pkgs/servers/unstructured-api/default.nix
+++ b/pkgs/servers/unstructured-api/default.nix
@@ -100,7 +100,7 @@ let
       pypandoc
       pyparsing
       pypdf
-      # pypdfium2
+      pypdfium2
       python-dateutil
       python-docx
       # python-iso639

From 03669bd1a80f0c5db5209c05ee624c99b8cdcb02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Feb 2025 21:08:16 +0000
Subject: [PATCH 25/96] openapi-python-client: 0.23.0 -> 0.23.1

---
 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 4a7011ab9086..10969063980e 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.23.0";
+  version = "0.23.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
     owner = "openapi-generators";
     repo = "openapi-python-client";
     tag = "v${version}";
-    hash = "sha256-jMRnzrQ5ZySaxrCloE9DLXt2O78d04+XHq4XlFUohjs=";
+    hash = "sha256-40Cb+1QNpjOlJCYEHtVUfn3wbWEYIt1LkqAMIwA9sK0=";
   };
 
   nativeBuildInputs =

From 8e50eafdff5dcc1a5782e11b38dc95a37efdb6ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Feb 2025 21:21:44 +0000
Subject: [PATCH 26/96] cargo-semver-checks: 0.38.0 -> 0.39.0

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

diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix
index f9bf755ec48c..55e9e46543c2 100644
--- a/pkgs/by-name/ca/cargo-semver-checks/package.nix
+++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-semver-checks";
-  version = "0.38.0";
+  version = "0.39.0";
 
   src = fetchFromGitHub {
     owner = "obi1kenobi";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-IcKjiKFvkFvu8+LFCAmm39AGUaUdK8zhtNzzSb8VPE0=";
+    hash = "sha256-ZP0Zu9NLhJNsVwKiAj5RuGdZn5Q3meJW7/U+quAdoxw=";
   };
 
-  cargoHash = "sha256-QfJ7QnGKmbrGDwYtVyAJNNGoAukD97/tmCwAROvWBIg=";
+  cargoHash = "sha256-uBRlGz+iQLR/KkvVOOIGmfDy9mr2E4ntsNfTwnxPqyk=";
 
   nativeBuildInputs = [
     cmake

From 9c334dcc4825235e6fb07514b8b8ab75eaf0a7b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Feb 2025 21:31:25 +0000
Subject: [PATCH 27/96] terraform-providers.grafana: 3.16.0 -> 3.18.2

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index f12ded476f33..3635ebdad116 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -534,13 +534,13 @@
     "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
   },
   "grafana": {
-    "hash": "sha256-IGMq770Fshwr4pmGMzrksquxe5eN2WtUkCQAnAXP8uw=",
+    "hash": "sha256-oyYQkSyqsARguSaMLHiTMY9UGfAKvueSX6Dyj6EK7+w=",
     "homepage": "https://registry.terraform.io/providers/grafana/grafana",
     "owner": "grafana",
     "repo": "terraform-provider-grafana",
-    "rev": "v3.16.0",
+    "rev": "v3.18.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-PEm/5AMATheF/yxEMVlEC/7hsRsMtMcp5wHpqrFBlFA="
+    "vendorHash": "sha256-s2Ee9wB0smWx4mDPf/mUkCrmWfBrRzYlriWKB/I9Ax8="
   },
   "gridscale": {
     "hash": "sha256-kgpEPbQLqiu8X0lOs6dCUqWpYTDxQX8fMgWoP0wWtBw=",

From 59664c9bee34f32c3e18a9038e601447d4819f02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Feb 2025 21:42:14 +0000
Subject: [PATCH 28/96] pocketbase: 0.24.4 -> 0.25.0

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

diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix
index 7852cbef4d5c..8f4fe9e56e69 100644
--- a/pkgs/by-name/po/pocketbase/package.nix
+++ b/pkgs/by-name/po/pocketbase/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "pocketbase";
-  version = "0.24.4";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = "pocketbase";
     rev = "v${version}";
-    hash = "sha256-wUHPp48kI+9ij/eVkgWKTxwGNOhrUBZXGhKd3z6YHZU=";
+    hash = "sha256-ftBAjEX2dzPZA1FGqJUr9Kji+qQMJsSGjkOnJBRZMIE=";
   };
 
-  vendorHash = "sha256-Elli5NSddF2tgKiJg8CH8KtR3mP+OfaIMRc15oKYNh8=";
+  vendorHash = "sha256-ap5idG2ydS/k3ZYvVT1VV6i578m+cXY3AbibaqEVCo8=";
 
   # This is the released subpackage from upstream repo
   subPackages = [ "examples/base" ];

From 68e82fce0131000da272515c9ca77bd0239eb099 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Feb 2025 22:01:50 +0000
Subject: [PATCH 29/96] dnsx: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/by-name/dn/dnsx/package.nix b/pkgs/by-name/dn/dnsx/package.nix
index e93957700849..7828cff04f5b 100644
--- a/pkgs/by-name/dn/dnsx/package.nix
+++ b/pkgs/by-name/dn/dnsx/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "dnsx";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "dnsx";
     tag = "v${version}";
-    hash = "sha256-scp0CDIO8F2TqpSCgXXfb8I83stvO/GZqSA5/BkN8pE=";
+    hash = "sha256-v5GDDA+ubHtUtLvhe0Hwm6l3OqTcIFbdm6HuxxV2zco=";
   };
 
-  vendorHash = "sha256-WbFkBTPy4N+mAVSkq1q9XcNs1jk6YuBcYxiEmQV/TsM=";
+  vendorHash = "sha256-B9GwQaX/W2xjpIFicfFFGBcopxyhMKZZRKBPcQ/r5Oo=";
 
   subPackages = [ "cmd/dnsx" ];
 

From 499ff80fd961d200a683cda99770eb23144d5f2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Feb 2025 22:16:21 +0000
Subject: [PATCH 30/96] faudio: 25.01 -> 25.02

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

diff --git a/pkgs/by-name/fa/faudio/package.nix b/pkgs/by-name/fa/faudio/package.nix
index 831131a27f04..64b8c69ca56e 100644
--- a/pkgs/by-name/fa/faudio/package.nix
+++ b/pkgs/by-name/fa/faudio/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "faudio";
-  version = "25.01";
+  version = "25.02";
 
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FAudio";
     rev = version;
-    sha256 = "sha256-k/cu8yqrwohpr37oZNBi7+Ln+Fj0TGXkl5VmdcjZB1o=";
+    sha256 = "sha256-nPU225LLQYN0D1LUsp9XGm2bCcB5WLpD3TcGDiWCe0c=";
   };
 
   nativeBuildInputs = [ cmake ];

From a9c69c0691f2a3ec9d469cba7e9e91c9b56fd134 Mon Sep 17 00:00:00 2001
From: hellwolf <hellwolf@freehell.org>
Date: Sat, 1 Feb 2025 16:08:19 +0200
Subject: [PATCH 31/96] owncloud-client: 5.3.1 -> 5.3.2

---
 pkgs/by-name/ow/owncloud-client/package.nix | 22 ++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ow/owncloud-client/package.nix b/pkgs/by-name/ow/owncloud-client/package.nix
index b903a944b11a..1ff93232c75a 100644
--- a/pkgs/by-name/ow/owncloud-client/package.nix
+++ b/pkgs/by-name/ow/owncloud-client/package.nix
@@ -2,45 +2,47 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  nix-update-script,
+  qt6Packages,
+  # nativeBuildInputs
   pkg-config,
   cmake,
   extra-cmake-modules,
-  qt6,
-  qt6Packages,
+  # buildInputs
   sqlite,
   libsecret,
   libre-graph-api-cpp-qt-client,
   kdsingleapplication,
-  # darwin only:
+  ## darwin only
   libinotify-kqueue,
   sparkleshare,
 }:
 
 stdenv.mkDerivation rec {
   pname = "owncloud-client";
-  version = "5.3.1";
+  version = "5.3.2";
 
   src = fetchFromGitHub {
     owner = "owncloud";
     repo = "client";
     tag = "v${version}";
-    hash = "sha256-ot+2hxipeZ5eI6nPJ8XGE8gFMNQoblUq+koAFZpZDv4=";
+    hash = "sha256-HEnjtedmdNJTpc/PmEyoEsLGUydFkVF3UAsSdzQ4L1Q=";
   };
 
   nativeBuildInputs = [
     pkg-config
     cmake
     extra-cmake-modules
-    qt6.qttools
-    qt6.wrapQtAppsHook
+    qt6Packages.qttools
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs =
     [
       sqlite
       libsecret
-      qt6.qtbase
-      qt6.qtsvg # Needed for the systray icon
+      qt6Packages.qtbase
+      qt6Packages.qtsvg # Needed for the systray icon
       qt6Packages.qtkeychain
       libre-graph-api-cpp-qt-client
       kdsingleapplication
@@ -50,6 +52,8 @@ stdenv.mkDerivation rec {
       sparkleshare
     ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Synchronise your ownCloud with your computer using this desktop client";
     homepage = "https://owncloud.org";

From 3db384e69e10d4ed4a57d2f26362db381bc099b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Feb 2025 22:22:09 +0000
Subject: [PATCH 32/96] fna3d: 25.01 -> 25.02

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

diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix
index 7b415cd053e0..08862d304a6f 100644
--- a/pkgs/by-name/fn/fna3d/package.nix
+++ b/pkgs/by-name/fn/fna3d/package.nix
@@ -7,14 +7,14 @@
 }:
 stdenv.mkDerivation rec {
   pname = "fna3d";
-  version = "25.01";
+  version = "25.02";
 
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FNA3D";
     rev = version;
     fetchSubmodules = true;
-    hash = "sha256-0BD3aFIg3miBhGr6YuWJyrRxWsNnPNIFNiZSzPalJ/c=";
+    hash = "sha256-0rRwIbOciPepo+ApvJiK5IyhMdq/4jsMlCSv0UeDETs=";
   };
 
   buildInputs = [ SDL2 ];

From 9d89b46798e35ccef8080276f4fd59f36dfdcee6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Feb 2025 22:51:11 +0000
Subject: [PATCH 33/96] krabby: 0.2.2 -> 0.3.0

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

diff --git a/pkgs/by-name/kr/krabby/package.nix b/pkgs/by-name/kr/krabby/package.nix
index 331f2a8f1522..4dbd89ad0a0e 100644
--- a/pkgs/by-name/kr/krabby/package.nix
+++ b/pkgs/by-name/kr/krabby/package.nix
@@ -5,14 +5,14 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "krabby";
-  version = "0.2.2";
+  version = "0.3.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-BmTx2kpnibTVuutAIrpFTTOGpO6WzITb6SXwUKuMtYY=";
+    hash = "sha256-UcvCIazuVoqYb4iz62MrOVtQli4EqzrEpg3imv3sXHY=";
   };
 
-  cargoHash = "sha256-gZzjx4JWe3CcG8wuQRTYjyEvvhCyUBXHQSw5sYhih9o=";
+  cargoHash = "sha256-BMePUHbn/PdXw63PBQNB+ER7l1y5DhWInjBWaGtXCYU=";
 
   meta = with lib; {
     description = "Print pokemon sprites in your terminal";

From 33440b1b7afae9ff558b3d731642af012c423f97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Feb 2025 23:06:53 +0000
Subject: [PATCH 34/96] papirus-icon-theme: 20240501 -> 20250201

---
 pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index 22898dd77162..8aa000b133fe 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -14,13 +14,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "papirus-icon-theme";
-  version = "20240501";
+  version = "20250201";
 
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = pname;
     rev = version;
-    hash = "sha256-ZTijLslItfXRBUVKrz9KcOc78Efr5rRV+HfQckKcZSI=";
+    hash = "sha256-E2SpGAMsFfB64axDzUgVOZZwHDyPVbZjEvY4fJzRyUQ=";
   };
 
   nativeBuildInputs = [

From 11f3471ad45e3598ea30fe92a986450ef06206ab Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Sat, 25 Jan 2025 12:06:37 +0100
Subject: [PATCH 35/96] python312Packages.mkdocs-glightbox: init at 0.4.0

---
 .../mkdocs-glightbox/default.nix              | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/mkdocs-glightbox/default.nix

diff --git a/pkgs/development/python-modules/mkdocs-glightbox/default.nix b/pkgs/development/python-modules/mkdocs-glightbox/default.nix
new file mode 100644
index 000000000000..65fdad8f38a8
--- /dev/null
+++ b/pkgs/development/python-modules/mkdocs-glightbox/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+  pytest-click,
+  mkdocs-material,
+}:
+
+buildPythonPackage rec {
+  pname = "mkdocs-glightbox";
+  version = "0.4.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "blueswen";
+    repo = "mkdocs-glightbox";
+    tag = "v${version}";
+    hash = "sha256-9HgXK7cE2z0fvKwEpCG5PTaaqGiet9KMNN2Ys9VJgeE=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-click
+    mkdocs-material
+  ];
+
+  disabledTests = [
+    # Checks compatible with material privacy plugin, which is currently not packaged in nixpkgs.
+    "privacy"
+  ];
+
+  pythonImportsCheck = [
+    "mkdocs_glightbox"
+  ];
+
+  meta = {
+    description = "MkDocs plugin supports image lightbox (zoom effect) with GLightbox";
+    homepage = "https://github.com/blueswen/mkdocs-glightbox";
+    changelog = "https://github.com/blueswen/mkdocs-glightbox/blob/v${version}/CHANGELOG";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ marcel ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a957a5cefaf4..d42fe3eb43d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8297,6 +8297,8 @@ self: super: with self; {
 
   mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { };
 
+  mkdocs-glightbox = callPackage ../development/python-modules/mkdocs-glightbox { };
+
   mkdocs-jupyter = callPackage ../development/python-modules/mkdocs-jupyter { };
 
   mkdocs-linkcheck = callPackage ../development/python-modules/mkdocs-linkcheck { };

From 1ce1ef25e2a06d3ce875c93ccbca7f9f269434df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 01:09:24 +0000
Subject: [PATCH 36/96] rmapi: 0.0.28 -> 0.0.29

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

diff --git a/pkgs/by-name/rm/rmapi/package.nix b/pkgs/by-name/rm/rmapi/package.nix
index 182a98e8058f..44036731dd4c 100644
--- a/pkgs/by-name/rm/rmapi/package.nix
+++ b/pkgs/by-name/rm/rmapi/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "rmapi";
-  version = "0.0.28";
+  version = "0.0.29";
 
   src = fetchFromGitHub {
     owner = "ddvk";
     repo = "rmapi";
     rev = "v${version}";
-    sha256 = "sha256-/eiW0i7+FLa8i9a2RFcABVSC40MUwhsV+bHVLdPpV3s=";
+    sha256 = "sha256-pVmG9XD3AcHDRo1A25QSnPStKPsgku3lWhN47xdYrwE=";
   };
 
   vendorHash = "sha256-Qisfw+lCFZns13jRe9NskCaCKVj5bV1CV8WPpGBhKFc=";

From 1c06094b9606e74a2047b7766c6fd833edcf0f79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 01:21:49 +0000
Subject: [PATCH 37/96] tflint: 0.55.0 -> 0.55.1

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

diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix
index 3a3a6e18856f..ed98987a6188 100644
--- a/pkgs/by-name/tf/tflint/package.nix
+++ b/pkgs/by-name/tf/tflint/package.nix
@@ -11,7 +11,7 @@
 
 let
   pname = "tflint";
-  version = "0.55.0";
+  version = "0.55.1";
 in
 buildGoModule {
   inherit pname version;
@@ -20,10 +20,10 @@ buildGoModule {
     owner = "terraform-linters";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-RCA3kd15Lutx5VGOswEt3l1iLkFqUKeK93Fgwy4DegA=";
+    hash = "sha256-TIMOsd/m0Z274HvTH1VZYezIN6EfLRPJMO8F9xXGyrI=";
   };
 
-  vendorHash = "sha256-VrC1ytmQjx1PalpT+rxSIpW6UBwxAPnKckws07mmuos=";
+  vendorHash = "sha256-6FY9aZwbA3DpdaKNRquONu8DzYyacu9a1OZpeupdWoc=";
 
   doCheck = false;
 

From 6c667536482831e4da1d94b20b25b0e0c15fcb56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 01:37:32 +0000
Subject: [PATCH 38/96] uair: 0.6.2 -> 0.6.3

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

diff --git a/pkgs/by-name/ua/uair/package.nix b/pkgs/by-name/ua/uair/package.nix
index 8dcdd62844fe..4b5f169e522f 100644
--- a/pkgs/by-name/ua/uair/package.nix
+++ b/pkgs/by-name/ua/uair/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "uair";
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "metent";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-s6st4rBuviH1DACui3dakRt90z3TphIS4ptMN3eHpr8=";
+    hash = "sha256-VytbtTQch8O5hCg3L3ANNOfFOyiQY1V7DvGMEKr1R04=";
   };
 
-  cargoHash = "sha256-n7Kaha22Rh/5AGoHUiAxnaZvHtZ+rPsmLHiUYfA0YPE=";
+  cargoHash = "sha256-+926OTJ5rM791KzmAieemwBAQ0HJg85rYK7viHb1N/U=";
 
   nativeBuildInputs = [
     installShellFiles

From bc1b92264e34e67c236737bd9462bdd364ee8b35 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 01:54:20 +0000
Subject: [PATCH 39/96] xan: 0.42.0 -> 0.43.0

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

diff --git a/pkgs/by-name/xa/xan/package.nix b/pkgs/by-name/xa/xan/package.nix
index ba66b1e68f4b..1cead8746b39 100644
--- a/pkgs/by-name/xa/xan/package.nix
+++ b/pkgs/by-name/xa/xan/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "xan";
-  version = "0.42.0";
+  version = "0.43.0";
 
   src = fetchFromGitHub {
     owner = "medialab";
     repo = "xan";
     tag = version;
-    hash = "sha256-8uNfiPJjZWqtbrBU/LRYM7PI5/4JBqZGe1dtCWArU8M=";
+    hash = "sha256-a9vEAKYZv2ItUKeWAcoXw/Q/EIHMhnBZFct0UKcRKg0=";
   };
 
-  cargoHash = "sha256-TRT//USKHCc7MAgNWAiZoovQmkud3isT+kwsNkJH8Bk=";
+  cargoHash = "sha256-IKKDlIfzDkpGtpdKU5IKMJc9nIhwoECj8fj4dyImrwU=";
   useFetchCargoVendor = true;
 
   # FIXME: tests fail and I do not have the time to investigate. Temporarily disable

From 01463412255f70a1f6b5fc9752f36ac99a7debe8 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 25 Jan 2025 12:39:11 -0800
Subject: [PATCH 40/96] firebase-tools: 1.3.29.1 -> 13.29.2

---
 .../fi/firebase-tools/001-override-nan.patch  | 54 -------------------
 pkgs/by-name/fi/firebase-tools/package.nix    | 17 ++----
 2 files changed, 3 insertions(+), 68 deletions(-)
 delete mode 100644 pkgs/by-name/fi/firebase-tools/001-override-nan.patch

diff --git a/pkgs/by-name/fi/firebase-tools/001-override-nan.patch b/pkgs/by-name/fi/firebase-tools/001-override-nan.patch
deleted file mode 100644
index 5da013133fb1..000000000000
--- a/pkgs/by-name/fi/firebase-tools/001-override-nan.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
-index da429c128..9c69ec8cb 100644
---- a/npm-shrinkwrap.json
-+++ b/npm-shrinkwrap.json
-@@ -14637,9 +14637,10 @@
-       }
-     },
-     "node_modules/nan": {
--      "version": "2.17.0",
--      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
--      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
-+      "version": "2.22.0",
-+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
-+      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
-+      "license": "MIT",
-       "optional": true
-     },
-     "node_modules/nanoid": {
-@@ -31852,9 +31853,9 @@
-       }
-     },
-     "nan": {
--      "version": "2.17.0",
--      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
--      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
-+      "version": "2.22.0",
-+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz",
-+      "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==",
-       "optional": true
-     },
-     "nanoid": {
-@@ -33672,7 +33673,7 @@
-       "optional": true,
-       "requires": {
-         "install-artifact-from-github": "^1.3.1",
--        "nan": "^2.17.0",
-+        "nan": "^2.22.0",
-         "node-gyp": "^9.3.0"
-       }
-     },
-diff --git a/package.json b/package.json
-index a4284d841..90a0524f2 100644
---- a/package.json
-+++ b/package.json
-@@ -98,6 +98,9 @@
-       "src/test/**/*"
-     ]
-   },
-+  "overrides" : {
-+    "nan": "^2.22.0"
-+  },
-   "dependencies": {
-     "@electric-sql/pglite": "^0.2.0",
-     "@google-cloud/cloud-sql-connector": "^1.3.3",
diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index ce164a12789d..db2a4e57850e 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -8,30 +8,19 @@
   fetchpatch,
 }:
 let
-  version = "13.29.1";
+  version = "13.29.2";
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     tag = "v${version}";
-    hash = "sha256-j6luT+L/vN9qaGjjeMW+8QGuzjJxzbn0sMGDjhqoeZA=";
+    hash = "sha256-A/UHJC1BY2A/Zezdvq3W7Ra55TEwqTaYDI8VTwy7yrA=";
   };
 in
 buildNpmPackage {
   pname = "firebase-tools";
   inherit version src;
 
-  npmDepsHash = "sha256-lQmoemIxzy2biu80UTR2eA+KJBeXWPh0xZRs/1of0eo=";
-
-  patches = [
-    # Use modern version of `ajv` instead of the four year old default in 13.29.1
-    (fetchpatch {
-      name = "bump-ajv.patch";
-      url = "https://github.com/firebase/firebase-tools/commit/b684155d827e7d1e8390e22511c0e1b5c46812ef.patch";
-      hash = "sha256-yv2AknT85Eyurc1ZFbbF5S9Sj/VEaVnHXBcXI10OWpw=";
-    })
-    # Fix embedded nan version to support node 22
-    ./001-override-nan.patch
-  ];
+  npmDepsHash = "sha256-5ARfYHmWJFaO7pngWVDQ7R3PAopg4+2Q2kspBTpKclM=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

From 0baa78a374edb068e1a9c04cb3c691ca936b2b7a Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 1 Feb 2025 18:18:23 -0800
Subject: [PATCH 41/96] Add sarahec as maintainer

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

diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index db2a4e57850e..7877540a8c4f 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -44,6 +44,9 @@ buildNpmPackage {
     homepage = "https://github.com/firebase/firebase-tools";
     license = lib.licenses.mit;
     mainProgram = "firebase";
-    maintainers = with lib.maintainers; [ momeemt ];
+    maintainers = with lib.maintainers; [
+      momeemt
+      sarahec
+    ];
   };
 }

From 210a433a0a240a8a28a5acec89f2b0e961341f24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 03:14:55 +0000
Subject: [PATCH 42/96] changedetection-io: 0.48.06 -> 0.49.0

---
 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 56943720cc0b..ba853b424837 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.06";
+  version = "0.49.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "dgtlmoon";
     repo = "changedetection.io";
     tag = version;
-    hash = "sha256-6ofCVmdO8Z/EyJjbzAQdwnqUfsjtPzveNd5Zfj3pcFM=";
+    hash = "sha256-u0sJSOwPmt6Bg++hlL9CR+PREdLF/mYuha8VRgMBMHg=";
   };
 
   pythonRelaxDeps = true;

From 390f7d1952a5cffe7d4ebfdf901632e86c65e96b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 03:34:41 +0000
Subject: [PATCH 43/96] flameshot: 12.1.0-unstable-2025-01-19 ->
 12.1.0-unstable-2025-02-01

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

diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix
index 7ab9796afa4e..e62671840b89 100644
--- a/pkgs/by-name/fl/flameshot/package.nix
+++ b/pkgs/by-name/fl/flameshot/package.nix
@@ -25,13 +25,13 @@ in
 stdenv'.mkDerivation {
   pname = "flameshot";
   # wlr screenshotting is currently only available on unstable version (>12.1.0)
-  version = "12.1.0-unstable-2025-01-19";
+  version = "12.1.0-unstable-2025-02-01";
 
   src = fetchFromGitHub {
     owner = "flameshot-org";
     repo = "flameshot";
-    rev = "10d12e0b54d59de2ac2567c540a93113672cd884";
-    hash = "sha256-3ujqwiQrv/H1HzkpD/Q+hoqyrUdO65gA0kKqtRV0vmw=";
+    rev = "61a6074bec8d07b6528b85cbb45bb3be7dd6ac0b";
+    hash = "sha256-tqKUCfvb5oWudCXhUzclQOF75eIcHqPz+zm7MtNKuSA=";
   };
 
   patches = [

From 1e2e461e133e95e1f51f6368f8b54ba6ae9a08c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 03:34:49 +0000
Subject: [PATCH 44/96] terraform-providers.artifactory: 12.8.1 -> 12.8.3

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index f12ded476f33..5fb5ca151598 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -81,13 +81,13 @@
     "vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE="
   },
   "artifactory": {
-    "hash": "sha256-v0tHvbYzD1xS5/cSD2409jlAOfbgzG3kOrLjWrXF4ok=",
+    "hash": "sha256-VGIUgIYQSlczUFT/lXab/qTTTjZw7RNeLHnLK5D7pBo=",
     "homepage": "https://registry.terraform.io/providers/jfrog/artifactory",
     "owner": "jfrog",
     "repo": "terraform-provider-artifactory",
-    "rev": "v12.8.1",
+    "rev": "v12.8.3",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-gF8aLRn2OCOzGRS6jb+K6M1cSbXPcQoVrIqrrRc7sMg="
+    "vendorHash": "sha256-V2CublY/9xSosrgxMYwHpnHtTucjiSuyzm+W4AY3pz0="
   },
   "auth0": {
     "hash": "sha256-4ZHTy4mBQ+ZgiUOZQEku8n+AfMmA9azioyAPeWUUae0=",

From 2d3b80888adc3be01f0cf9b2b5c605ef8e9ea5f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 1 Feb 2025 19:41:30 -0800
Subject: [PATCH 45/96] python313Packages.hahomematic: 2025.1.11 -> 2025.2.0

Diff: https://github.com/SukramJ/hahomematic/compare/refs/tags/2025.1.11...2025.2.0

Changelog: https://github.com/SukramJ/hahomematic/blob/2025.2.0/changelog.md
---
 pkgs/development/python-modules/hahomematic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index c7123783cf2e..64a2262160a1 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "hahomematic";
-  version = "2025.1.11";
+  version = "2025.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "SukramJ";
     repo = "hahomematic";
     tag = version;
-    hash = "sha256-XHXQ1A6s5ew5hsivlC83oufYiImpKCRJ7v7NsAn6PJs=";
+    hash = "sha256-QuPHSd6GHBu7OILMnnif/sbIuujtk+dGKIn8c6Aitq4=";
   };
 
   __darwinAllowLocalNetworking = true;

From 3339b9772c5a0ed0505ed6bff95eb75fcd61813d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 1 Feb 2025 19:41:38 -0800
Subject: [PATCH 46/96] home-assistant-custom-components.homematicip_local:
 1.79.1 -> 1.80.0

Diff: https://github.com/SukramJ/custom_homematic/compare/refs/tags/1.79.1...1.80.0

Changelog: https://github.com/SukramJ/custom_homematic/blob/1.80.0/changelog.md
---
 .../custom-components/homematicip_local/package.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
index 6b9e34c13e0d..d524cd8fdffe 100644
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
   owner = "SukramJ";
   domain = "homematicip_local";
-  version = "1.79.1";
+  version = "1.80.0";
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "custom_homematic";
     tag = version;
-    hash = "sha256-kkUN7orPs9Xdq23VPwVp+AxqkWXMLiDcYRFNWeVlVpM=";
+    hash = "sha256-smagkEz5ec3Wrv5ldMY9hv+TnSzQ7pbZUURnTKBsF1g=";
   };
 
   postPatch = ''

From d33d8fdcc813ac9fe4b7bc5110c9011a5ee1c28b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 04:20:59 +0000
Subject: [PATCH 47/96] eigenlayer: 0.11.0 -> 0.11.1

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

diff --git a/pkgs/by-name/ei/eigenlayer/package.nix b/pkgs/by-name/ei/eigenlayer/package.nix
index 9d14f03bbbb3..8602a70110ad 100644
--- a/pkgs/by-name/ei/eigenlayer/package.nix
+++ b/pkgs/by-name/ei/eigenlayer/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
   pname = "eigenlayer";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "Layr-Labs";
     repo = "eigenlayer-cli";
     rev = "v${version}";
-    hash = "sha256-NIie5x7gaveUFkKPP6BXtrFfnjYmwV0NbsTGufmMw1A=";
+    hash = "sha256-CqEHf19Xup2p+pBRZQUnh+hapSJxgo26xz7WcAH4iQM=";
   };
 
-  vendorHash = "sha256-cKESs8W0q25KRlEPEqkcV7bMcknti28OkF/LmmZ0vO0=";
+  vendorHash = "sha256-CUCxGSZ7NxCu3uQswp2mrcJClCTQtLnCvpO/KdKZAZo=";
 
   ldflags = ["-s" "-w"];
   subPackages = ["cmd/eigenlayer"];

From ebba6d1b770e56efed9b4ef1d161c561be2f588a Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Sat, 1 Feb 2025 20:31:36 -0800
Subject: [PATCH 48/96] nixos/homepage-dashboard: fix links

These links were returning 404 not found.
---
 .../services/misc/homepage-dashboard.nix       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/misc/homepage-dashboard.nix b/nixos/modules/services/misc/homepage-dashboard.nix
index 35908488f487..d4f601700ad3 100644
--- a/nixos/modules/services/misc/homepage-dashboard.nix
+++ b/nixos/modules/services/misc/homepage-dashboard.nix
@@ -38,7 +38,7 @@ in
 
           See the upstream documentation:
 
-          https://gethomepage.dev/latest/installation/docker/#using-environment-secrets
+          https://gethomepage.dev/installation/docker/#using-environment-secrets
         '';
         default = "";
       };
@@ -48,7 +48,7 @@ in
         description = ''
           Custom CSS for styling Homepage.
 
-          See https://gethomepage.dev/latest/configs/custom-css-js/.
+          See https://gethomepage.dev/configs/custom-css-js/.
         '';
         default = "";
       };
@@ -58,7 +58,7 @@ in
         description = ''
           Custom Javascript for Homepage.
 
-          See https://gethomepage.dev/latest/configs/custom-css-js/.
+          See https://gethomepage.dev/configs/custom-css-js/.
         '';
         default = "";
       };
@@ -68,7 +68,7 @@ in
         description = ''
           Homepage bookmarks configuration.
 
-          See https://gethomepage.dev/latest/configs/bookmarks/.
+          See https://gethomepage.dev/configs/bookmarks/.
         '';
         # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/bookmarks.yaml
         example = [
@@ -105,7 +105,7 @@ in
         description = ''
           Homepage services configuration.
 
-          See https://gethomepage.dev/latest/configs/services/.
+          See https://gethomepage.dev/configs/services/.
         '';
         # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/services.yaml
         example = [
@@ -138,7 +138,7 @@ in
         description = ''
           Homepage widgets configuration.
 
-          See https://gethomepage.dev/latest/configs/service-widgets/.
+          See https://gethomepage.dev/widgets/.
         '';
         # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/widgets.yaml
         example = [
@@ -164,7 +164,7 @@ in
         description = ''
           Homepage kubernetes configuration.
 
-          See https://gethomepage.dev/latest/configs/kubernetes/.
+          See https://gethomepage.dev/configs/kubernetes/.
         '';
         default = { };
       };
@@ -174,7 +174,7 @@ in
         description = ''
           Homepage docker configuration.
 
-          See https://gethomepage.dev/latest/configs/docker/.
+          See https://gethomepage.dev/configs/docker/.
         '';
         default = { };
       };
@@ -184,7 +184,7 @@ in
         description = ''
           Homepage settings.
 
-          See https://gethomepage.dev/latest/configs/settings/.
+          See https://gethomepage.dev/configs/settings/.
         '';
         # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/settings.yaml
         default = { };

From 7d82e4777517b687ed8acf4d3264dd9c4292bfe8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 04:53:51 +0000
Subject: [PATCH 49/96] terraform-providers.aiven: 4.33.0 -> 4.34.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index f12ded476f33..f95c1ac51e22 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -27,13 +27,13 @@
     "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
   },
   "aiven": {
-    "hash": "sha256-m2T8MNHBQfAyFDL28v4HE0UJzTKZFH1DY5OlfmCp+kE=",
+    "hash": "sha256-hvGLHjdvFVFH1gMivC4uTPA7Yf2j1+Niw2dMF9bwFoA=",
     "homepage": "https://registry.terraform.io/providers/aiven/aiven",
     "owner": "aiven",
     "repo": "terraform-provider-aiven",
-    "rev": "v4.33.0",
+    "rev": "v4.34.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-0WLhjCCOMi6uQJ+yEA+W6KHyZaf5L2P5hTFSdyb1ExU="
+    "vendorHash": "sha256-kux6AYEVA0VytEJsEjLjFvGGygW1zsTv+AQt4YdaZyA="
   },
   "akamai": {
     "hash": "sha256-acGLXJclAfg43AkJRoROReIOjBEnhgSpDRgvO6LumIY=",

From 6bf6c6f470550f94ff888ac8dd53d6624c86db9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 05:23:25 +0000
Subject: [PATCH 50/96] terraform-providers.opentelekomcloud: 1.36.29 ->
 1.36.30

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index f12ded476f33..b1c1ff703045 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -958,13 +958,13 @@
     "vendorHash": "sha256-0Atbzx1DjInPMa1lNxyNKfNMILjN4S814TlIAQeTfdI="
   },
   "opentelekomcloud": {
-    "hash": "sha256-KA0SMkf+Wt/YDa/lPndedD75yCMTcDO/EFX9wrLtIVY=",
+    "hash": "sha256-Hbu2CX6g62rVNtquz5G41O1dtKeyOUWs/OB9lxF7t2o=",
     "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
     "owner": "opentelekomcloud",
     "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.36.29",
+    "rev": "v1.36.30",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-/vhalSK/kxbBc3Pq19BPl6H6L0FXhAqkK0/p1MPXckc="
+    "vendorHash": "sha256-o4Ib/mw2LLnhD0TdumutZjvZMqjcg3NCQDgmVozTyIE="
   },
   "opsgenie": {
     "hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=",

From acff5ba50e26e71b0a00c1fdca734d855d5eb6b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 05:36:04 +0000
Subject: [PATCH 51/96] terraform-providers.datadog: 3.52.1 -> 3.53.0

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index f12ded476f33..f301819b2e18 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -317,13 +317,13 @@
     "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
   },
   "datadog": {
-    "hash": "sha256-/RaKITbDBaTcF4xL+66gTBlEitbwj7z2NhJ60o+Cje0=",
+    "hash": "sha256-evCfICTIjyEhfAFuLcBVlIzjx5BV3MJcrflIRQtfruw=",
     "homepage": "https://registry.terraform.io/providers/DataDog/datadog",
     "owner": "DataDog",
     "repo": "terraform-provider-datadog",
-    "rev": "v3.52.1",
+    "rev": "v3.53.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-rbGBGmgOmv+PtkYlj89FXagDscrtVRl7J0ZP3n+lVdU="
+    "vendorHash": "sha256-U/Ii8VsmtBry6N0YVUA/cpxDKJeufE2TkW73QmmRKys="
   },
   "deno": {
     "hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=",

From 69e9738182c5876826302e0c7d338d0d323a83bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 05:52:12 +0000
Subject: [PATCH 52/96] terramate: 0.11.6 -> 0.11.8

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

diff --git a/pkgs/by-name/te/terramate/package.nix b/pkgs/by-name/te/terramate/package.nix
index 1630d33ba1d0..7bb87d545505 100644
--- a/pkgs/by-name/te/terramate/package.nix
+++ b/pkgs/by-name/te/terramate/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "terramate";
-  version = "0.11.6";
+  version = "0.11.8";
 
   src = fetchFromGitHub {
     owner = "terramate-io";
     repo = "terramate";
     rev = "v${version}";
-    hash = "sha256-MqJc1gi+Din7G+WxOQaZmXvDvN9YXRIevenFK1m72S0=";
+    hash = "sha256-VRoYjn0iZD0fbctpJPgvvRQIAV7ZoOoFeqlDSCDc3ME=";
   };
 
-  vendorHash = "sha256-6nnUyNOdG1QmaHeRXRWvyjLhYPXA3Xs9062ZkF82Kzo=";
+  vendorHash = "sha256-rvUsYBrz85TWtnivX3QmIXdIDVbDbQRmXcYjcP2S3kg=";
 
   # required for version info
   nativeBuildInputs = [ git ];

From 807ba34d00103f72179fee05caceb93df564ad8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 06:33:19 +0000
Subject: [PATCH 53/96] go-ios: 1.0.168 -> 1.0.174

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

diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix
index d297854794eb..593db50af789 100644
--- a/pkgs/by-name/go/go-ios/package.nix
+++ b/pkgs/by-name/go/go-ios/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "go-ios";
-  version = "1.0.168";
+  version = "1.0.174";
 
   src = fetchFromGitHub {
     owner = "danielpaulus";
     repo = "go-ios";
     rev = "v${version}";
-    sha256 = "sha256-BaJFFaNPPpPvDc8bMl89SfGYglvx9TwpoDQUEr0mqYM=";
+    sha256 = "sha256-Z8But7NE5Guf7CKKAgJJBF9RvUo5YaY7VJJYfBYd000=";
   };
 
   proxyVendor = true;

From efe016639593855054f4805732266a5219dc88bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 06:49:04 +0000
Subject: [PATCH 54/96] arkade: 0.11.32 -> 0.11.33

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

diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix
index 2cd06c01dcb1..88c31711007c 100644
--- a/pkgs/by-name/ar/arkade/package.nix
+++ b/pkgs/by-name/ar/arkade/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "arkade";
-  version = "0.11.32";
+  version = "0.11.33";
 
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "arkade";
     rev = version;
-    hash = "sha256-HbIV5eQES3K2wBEPLW1w41y3BPGh4fbkTxA0MpKh9x0=";
+    hash = "sha256-E7xdF1aqUiZFEA1LGwA+f1XOFex3VkiC2Km198cstxA=";
   };
 
   env.CGO_ENABLED = 0;

From 0896abdce1d25454672b26341e720fab6fa9a0a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 07:40:48 +0000
Subject: [PATCH 55/96] google-cloud-sql-proxy: 2.14.3 -> 2.15.0

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

diff --git a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
index a7587da21256..b58855dff007 100644
--- a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
+++ b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "google-cloud-sql-proxy";
-  version = "2.14.3";
+  version = "2.15.0";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "cloud-sql-proxy";
     rev = "v${version}";
-    hash = "sha256-zY4V5QNoesvwJxW9htTkmMk6KPCxKvLg1FVn+xmlw14=";
+    hash = "sha256-bQfOqshn5hikEaylcqRomsUfvfrMuOH94ZeYDq6ted8=";
   };
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-ZwCe8gJ1Sowvt0X+inFoiYpJjhl/sdQUqrkXte2gV2I=";
+  vendorHash = "sha256-enBeWLybIW8MEpireRZrdXzTusf9D0wTRVZ4cG/L+W4=";
 
   checkFlags = [
     "-short"

From c97e9a5bd668f71e0b69db34a92ff618ace68e78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 08:15:30 +0000
Subject: [PATCH 56/96] skeditor: 2.8.3 -> 2.8.5

---
 pkgs/by-name/sk/skeditor/nuget-deps.json | 16 ++++++++--------
 pkgs/by-name/sk/skeditor/package.nix     |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/sk/skeditor/nuget-deps.json b/pkgs/by-name/sk/skeditor/nuget-deps.json
index ebddeadcbee0..c8b40dc5ba61 100644
--- a/pkgs/by-name/sk/skeditor/nuget-deps.json
+++ b/pkgs/by-name/sk/skeditor/nuget-deps.json
@@ -201,18 +201,18 @@
   },
   {
     "pname": "FluentIcons.Avalonia",
-    "version": "1.1.266",
-    "hash": "sha256-Jb0PcacBWTVC1BhiqK9SJRbmeaQJcqY4wY4oHtKMpQo="
+    "version": "1.1.271",
+    "hash": "sha256-TCswtCSLAskSyxQcRglZsNN8y5ZJDJLCRPv6nWLkB3w="
   },
   {
     "pname": "FluentIcons.Avalonia.Fluent",
-    "version": "1.1.266",
-    "hash": "sha256-H/alh+K0X4fHSnbmYNczFCLEqiUkSuvyBsbwroJf8lA="
+    "version": "1.1.271",
+    "hash": "sha256-S+52KCyNhV/kLY6DJAQWrN+Wxi3xQ8ARWDCfak+y2tw="
   },
   {
     "pname": "FluentIcons.Common",
-    "version": "1.1.266",
-    "hash": "sha256-YcmvpwwXXrVue6gyc4R2FOs2RGQfS74gFB3PjnBV5A4="
+    "version": "1.1.271",
+    "hash": "sha256-A1SufiopAAHu92eRJVamq7zcff9Nd4z4qgJV9VeZVQY="
   },
   {
     "pname": "HarfBuzzSharp",
@@ -371,8 +371,8 @@
   },
   {
     "pname": "SkFluentAvalonia",
-    "version": "2.1.1",
-    "hash": "sha256-gF4AL5Ru0pbLRn7UTSK7Lr+kDb+z/OgUbDgUrt3XKPk="
+    "version": "2.1.2",
+    "hash": "sha256-3TG3GCMk8VW1/j6DYJO1FVSx1FylXjLDozafxa2bM2A="
   },
   {
     "pname": "SkiaSharp",
diff --git a/pkgs/by-name/sk/skeditor/package.nix b/pkgs/by-name/sk/skeditor/package.nix
index db5b75491f55..bdf4d2eee2e3 100644
--- a/pkgs/by-name/sk/skeditor/package.nix
+++ b/pkgs/by-name/sk/skeditor/package.nix
@@ -9,13 +9,13 @@
 }:
 buildDotnetModule rec {
   pname = "skeditor";
-  version = "2.8.3";
+  version = "2.8.5";
 
   src = fetchFromGitHub {
     owner = "skeditorteam";
     repo = "skeditor";
     rev = "v${version}";
-    hash = "sha256-I/EW/8AkzezYGyPeiRceRVahq+Pfygf1XiJpwwYd9cI=";
+    hash = "sha256-e8mQTkTvR8RfC27VsONqf9UtkM/H8GebxrYVUdJw7PE=";
   };
 
   projectFile = "SkEditor/SkEditor.csproj";

From c12ad209fed52cd51aaa5e1433da5a9ab4e5b361 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 08:17:34 +0000
Subject: [PATCH 57/96] tabby-agent: 0.23.0 -> 0.23.1

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

diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix
index e2d9c2cf2977..63d0eaec4660 100644
--- a/pkgs/by-name/ta/tabby-agent/package.nix
+++ b/pkgs/by-name/ta/tabby-agent/package.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "tabby-agent";
-  version = "0.23.0";
+  version = "0.23.1";
 
   src = fetchFromGitHub {
     owner = "TabbyML";
     repo = "tabby";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VuyfKIfOJ6+LTiNCO/SQMHk81KffF/dUfxMGT2go6RM=";
+    hash = "sha256-KiADf4vjdMMbD5edSEE4LPphaDP64E0nqLLJ0lVnLDE=";
   };
 
   nativeBuildInputs = [

From 3da5bae74d7bf3c661e985085a55ea463bcbd8ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 08:22:59 +0000
Subject: [PATCH 58/96] cargo-bundle-licenses: 2.3.0 -> 3.0.0

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

diff --git a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
index af8b90d28827..b37db7edbc56 100644
--- a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
+++ b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-bundle-licenses";
-  version = "2.3.0";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "sstadick";
     repo = "cargo-bundle-licenses";
     rev = "v${version}";
-    hash = "sha256-Rw5uwfUPTkIbiOQDohBRoAm0momljJRSYP+VmEOOw/k=";
+    hash = "sha256-dA6jaYqPIxARwCP4R4+agbLKZFgx2gti4Vyhl56FzWw=";
   };
 
-  cargoHash = "sha256-SfTt49J6D7RESo6iO3b/l0+Vu1dEW+PG0M2RIko2OJ4=";
+  cargoHash = "sha256-GxV7maLLGC8xrHtmq9qvV+MrLMN4qV2V+9iOCf7CWfY=";
 
   meta = with lib; {
     description = "Generate a THIRDPARTY file with all licenses in a cargo project";

From 29327895083b2c33668cbd663dd708a62819f1fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 08:39:05 +0000
Subject: [PATCH 59/96] abcmidi: 2025.01.20 -> 2025.01.30

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

diff --git a/pkgs/by-name/ab/abcmidi/package.nix b/pkgs/by-name/ab/abcmidi/package.nix
index 2c25816e7163..85d9febb9e21 100644
--- a/pkgs/by-name/ab/abcmidi/package.nix
+++ b/pkgs/by-name/ab/abcmidi/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "abcmidi";
-  version = "2025.01.20";
+  version = "2025.01.30";
 
   src = fetchFromGitHub {
     owner = "sshlien";
     repo = "abcmidi";
     tag = finalAttrs.version;
-    hash = "sha256-QFtxiIx5MxzMK7QWqVC9xq4SQ44Ba210WEBP7M+QRxo=";
+    hash = "sha256-3l9sOPwoi5jHZraEldNiXXMC3Dz3km5z848IBP+8aPg=";
   };
 
   meta = {

From 477d26d111feea02901d740cb4b9cae3b679e8d9 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Sun, 2 Feb 2025 18:16:58 +0900
Subject: [PATCH 60/96] bun: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix
index 11feb704ad78..ca220dac871c 100644
--- a/pkgs/by-name/bu/bun/package.nix
+++ b/pkgs/by-name/bu/bun/package.nix
@@ -14,7 +14,7 @@
 }:
 
 stdenvNoCC.mkDerivation rec {
-  version = "1.2.1";
+  version = "1.2.2";
   pname = "bun";
 
   src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@@ -73,19 +73,19 @@ stdenvNoCC.mkDerivation rec {
     sources = {
       "aarch64-darwin" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
-        hash = "sha256-+QPKAgbohV+Gm+L3mQi4hzxCTluCrIbMFtjPx905Qgs=";
+        hash = "sha256-xNWOBsXDOIW1JvTZGjjKnr25/D+0zVR/fTMCBVyY5Bw=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
-        hash = "sha256-i3iaovqeH9VAMbb9APW7lGL2vw3BkapOakigimfdKAw=";
+        hash = "sha256-0duqPpryRUn62Svb5Psh+lMwLNBIqPAE6FokCYTJPU0=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip";
-        hash = "sha256-Qy8xKNW9JETmDOMW1Dp467zUOh1L8+Gtkxy1jG/4yyY=";
+        hash = "sha256-Dztuh9hi1AFvjZXaF3vJE2yi6VDz1tPSJqNdcGH/8PE=";
       };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
-        hash = "sha256-Q4DjmFTLTIqt8jfI9dJwJWSaK0lwXakc4zBm3pWdUug=";
+        hash = "sha256-P077iv0fhKwqmMBGYciYVh0dNVJ9Awy0Vx6Zt8hfUHk=";
       };
     };
     updateScript = writeShellScript "update-bun" ''

From 8c90e7887c3d48215bc43c3e26bd822994a55712 Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Sun, 2 Feb 2025 10:53:31 +0100
Subject: [PATCH 61/96] lixVersions: don't allowGitDependencies

Without allowGitDependencies set to false, there is a dependency chain
fetchCargoVendor -> nix-prefetch-git -> nix. This would cause infinite
recursion when the nix package was overlaid with Lix. Since lix-doc does not
have Git dependencies, simply disallow them.

Fixes: https://github.com/NixOS/nixpkgs/issues/378715
---
 pkgs/tools/package-management/lix/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index 1acc5e2efb48..3f981637253c 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -68,6 +68,7 @@ lib.makeExtensible (self: {
       docCargoDeps = rustPlatform.fetchCargoVendor {
         name = "lix-doc-${version}";
         inherit src;
+        allowGitDependencies = false;
         sourceRoot = "${src.name or src}/lix-doc";
         hash = "sha256-VPcrf78gfLlkTRrcbLkPgLOk0o6lsOJBm6HYLvavpNU=";
       };
@@ -88,6 +89,7 @@ lib.makeExtensible (self: {
       docCargoDeps = rustPlatform.fetchCargoVendor {
         name = "lix-doc-${version}";
         inherit src;
+        allowGitDependencies = false;
         sourceRoot = "${src.name or src}/lix-doc";
         hash = "sha256-U820gvcbQIBaFr2OWPidfFIDXycDFGgXX1NpWDDqENs=";
       };

From 8ec2155f617183565a861fba93a7e3fd6308c095 Mon Sep 17 00:00:00 2001
From: Ivan Bastrakov <bastaynav@proton.me>
Date: Sun, 2 Feb 2025 12:50:37 +0300
Subject: [PATCH 62/96] vscode-extensions.vscode-icons-team.vscode-icons:
 12.10.0 -> 12.11.0

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index e776a5e32cf6..36a9195b9967 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5399,8 +5399,8 @@ let
         mktplcRef = {
           name = "vscode-icons";
           publisher = "vscode-icons-team";
-          version = "12.10.0";
-          hash = "sha256-GNDLuszuJN3P0V25F4gm7yUJsFEQgFMMPMTFLWLIvSo=";
+          version = "12.11.0";
+          hash = "sha256-RpuCHJBLqhAXAdvC0qGDUJIy5ww1yqlSb7hKwCALidM=";
         };
         meta = {
           description = "Bring real icons to your Visual Studio Code";

From 0ad9996e9b2083b9e2124925b463292b6da69914 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 09:55:56 +0000
Subject: [PATCH 63/96] comrak: 0.34.0 -> 0.35.0

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

diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix
index ab9607d63f49..861faf2dd402 100644
--- a/pkgs/by-name/co/comrak/package.nix
+++ b/pkgs/by-name/co/comrak/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "comrak";
-  version = "0.34.0";
+  version = "0.35.0";
 
   src = fetchFromGitHub {
     owner = "kivikakk";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-8LBMyCmt4HTYgprChfPSFZm6uQ7yFmJ0+srAUz785MA=";
+    sha256 = "sha256-4aNV9FKqRNirYBMXIgAXjwS2FBCgLuxdhWQCvZbmZp4=";
   };
 
-  cargoHash = "sha256-Z2LNFlHWS3IdjXlwdIizkjNFaPqTbMf0i6Y6jigKCzg=";
+  cargoHash = "sha256-K3dMn90E/0PxlE+6nBAECuHSsDM/TlAIQGF/y1SMm8k=";
 
   meta = with lib; {
     description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter";

From 688ae50a81ad139947838eca8bd243826f3465fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 2 Feb 2025 10:59:16 +0100
Subject: [PATCH 64/96] knot-resolver: disable a problematic test

https://hydra.nixos.org/build/287484678/nixlog/1/tail
---
 pkgs/servers/dns/knot-resolver/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index c5b58811e7e4..73895b016128 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -70,6 +70,13 @@ let # un-indented, over the whole file
             --replace "ffi.load(" "ffi.load('${lib.getLib knot-dns}/lib/' .. "
         done
       ''
+      # https://gitlab.nic.cz/knot/knot-resolver/-/issues/925
+      + ''
+        patch modules/http/meson.build <<EOF
+        @@ -22 +21,0 @@
+        -  ['http', files('http.test.lua')],
+        EOF
+      ''
       # some tests have issues with network sandboxing, apparently
       + optionalString doInstallCheck ''
         echo 'os.exit(77)' > daemon/lua/trust_anchors.test/bootstrap.test.lua

From 1210fe439e1adf63a17ef5e6464bee227dec3cd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 10:05:51 +0000
Subject: [PATCH 65/96] python312Packages.sagemaker: 2.237.3 -> 2.239.0

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

diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 0be0d88a2b27..f418c2bda4ea 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -40,14 +40,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker";
-  version = "2.237.3";
+  version = "2.239.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-python-sdk";
     tag = "v${version}";
-    hash = "sha256-eQ+5WFEobJUHdIK317A94/ro2H1xU738j3b7Z6iddlk=";
+    hash = "sha256-KE3EWCxl4Q90pChswYjmBwtPazAjVw2MaAjNesQoWiM=";
   };
 
   build-system = [

From d975047add65e45bd63f278b923a2f5160b4c169 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 2 Feb 2025 11:13:21 +0100
Subject: [PATCH 66/96] postgresqlPackages.pgddl: refactor strictDeps

This is now done in buildPostgresqlExtension.
---
 pkgs/servers/sql/postgresql/ext/pgddl.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgddl.nix b/pkgs/servers/sql/postgresql/ext/pgddl.nix
index 61ef2095ccdc..b29e78c02725 100644
--- a/pkgs/servers/sql/postgresql/ext/pgddl.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgddl.nix
@@ -17,10 +17,7 @@ buildPostgresqlExtension (finalAttrs: {
     hash = "sha256-W3G6TGtkj+zXXdGZZR0bmZhsLuFJvuGTlDoo8kL8sf0=";
   };
 
-  strictDeps = true;
-
   nativeBuildInputs = [
-    postgresql
     perl
   ];
 

From 682a3b16575ea1d6d9d2dd20543afc41eab5a2d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 10:16:52 +0000
Subject: [PATCH 67/96] cyberpunk-neon: 0-unstable-2024-11-07 ->
 0-unstable-2025-02-01

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

diff --git a/pkgs/by-name/cy/cyberpunk-neon/package.nix b/pkgs/by-name/cy/cyberpunk-neon/package.nix
index 61068405a14a..bb1079c1bb76 100644
--- a/pkgs/by-name/cy/cyberpunk-neon/package.nix
+++ b/pkgs/by-name/cy/cyberpunk-neon/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "cyberpunk-neon";
-  version = "0-unstable-2024-11-07";
+  version = "0-unstable-2025-02-01";
 
   src = fetchFromGitHub {
     owner = "Roboron3042";
     repo = "Cyberpunk-Neon";
-    rev = "f036cc70f39caa91b8ff1dab16194a97848ee378";
-    hash = "sha256-PmCzTj9TfFzilO+Sf976hhcBwUq7qyG1+HbwwBD777o=";
+    rev = "eb7595459c0d4164262e0ccaf8d6e5c1936a6f67";
+    hash = "sha256-whHBIxEGGvTPVUaE/HQDb/Qyl5sPMGlOmofgNCBaNng=";
   };
 
   outputs = [

From e0d9b82e97d88215f4cea533ea8b6478f04e152b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 11:52:50 +0000
Subject: [PATCH 68/96] whoogle-search: 0.9.2 -> 0.9.3

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

diff --git a/pkgs/by-name/wh/whoogle-search/package.nix b/pkgs/by-name/wh/whoogle-search/package.nix
index d298a63a33e8..d6eaf4bdb742 100644
--- a/pkgs/by-name/wh/whoogle-search/package.nix
+++ b/pkgs/by-name/wh/whoogle-search/package.nix
@@ -7,13 +7,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "whoogle-search";
-  version = "0.9.2";
+  version = "0.9.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "whoogle_search";
     inherit version;
-    hash = "sha256-Vp59n8o6hq4q15nuQguLGvQhYWrXpR6ZjDnaBCV4I4M=";
+    hash = "sha256-4NFHz3l8kJ9QBbr5N55dhCgfoU83naC7avQZSzW6L8w=";
   };
 
   build-system = with python3Packages; [ setuptools ];

From 0d077b6d64f5626cc373d3f08921c29ebe48f50e Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <mihai@fufexan.net>
Date: Sun, 2 Feb 2025 10:16:31 +0200
Subject: [PATCH 69/96] hyprlandPlugins/hyprland-plugins: 0.46.0 -> 0.47.0

---
 .../hyprwm/hyprland-plugins/hyprland-plugins.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
index fd00d81af44b..753386fef4ea 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
@@ -14,13 +14,13 @@ let
             mkHyprlandPlugin,
           }:
           let
-            version = "0.46.0";
+            version = "0.47.0";
 
             hyprland-plugins-src = fetchFromGitHub {
               owner = "hyprwm";
               repo = "hyprland-plugins";
               rev = "refs/tags/v${version}";
-              hash = "sha256-Q9bXV9d6xqxr8V1UKmmmHdCgky3I4n2hk1TDxZ/pBto=";
+              hash = "sha256-zys4H2zSSIw54ecnYnBh2NUKZQraWD4B7qftuClrXho=";
             };
           in
           mkHyprlandPlugin hyprland {

From 619ccc288832b325d2644fdaa12316ccfe546c27 Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <mihai@fufexan.net>
Date: Sun, 2 Feb 2025 10:18:46 +0200
Subject: [PATCH 70/96] hyprlandPlugins.hypr-dynamic-cursors:
 0-unstable-2024-12-19 -> 0-unstable-2025-01-27

---
 .../hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
index 9ca164b1887c..d6155639033e 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
@@ -8,13 +8,13 @@
 
 mkHyprlandPlugin hyprland {
   pluginName = "hypr-dynamic-cursors";
-  version = "0-unstable-2024-12-19";
+  version = "0-unstable-2025-01-27";
 
   src = fetchFromGitHub {
     owner = "VirtCode";
     repo = "hypr-dynamic-cursors";
-    rev = "111669a699f998b5eb5a0d5610b5fcb748aab038";
-    hash = "sha256-EeNVNDNxbz1dGWs/jJ/JQbZtWkN+i4qfU7SAiQOMwwY=";
+    rev = "4d1d88522bbeefd07a9113dd5449a0a288d11ba8";
+    hash = "sha256-BTYq6SDfUvhLH/Zjc0sGr19m5qnjB9Vn3OfIpxumsyk=";
   };
 
   dontUseCmakeConfigure = true;

From e647b29de17233dcc563f8ead57a482c047a306a Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <mihai@fufexan.net>
Date: Sun, 2 Feb 2025 10:24:37 +0200
Subject: [PATCH 71/96] hyprlandPlugins.hyprfocus: 0-unstable-2024-11-09 ->
 0-unstable-2025-01-04

Remove patch which was applied in the meantime.

Mark as broken.
---
 .../hyprwm/hyprland-plugins/hyprfocus.nix         | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix
index befba9e11a3d..15dc04ba1d01 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix
@@ -3,28 +3,20 @@
   mkHyprlandPlugin,
   hyprland,
   fetchFromGitHub,
-  fetchpatch2,
   nix-update-script,
 }:
 
 mkHyprlandPlugin hyprland {
   pluginName = "hyprfocus";
-  version = "0-unstable-2024-11-09";
+  version = "0-unstable-2025-01-04";
 
   src = fetchFromGitHub {
     owner = "pyt0xic";
     repo = "hyprfocus";
-    rev = "bead5b77d80f222c006d1a6c6f44ee8b02021d73";
-    hash = "sha256-qIl7opF7fA1ZmC91TGQ7D12tB7kHc6Sn9DrfUN6sbBY=";
+    rev = "de6eaf5846b970b697bdf0e20e731b9fbe08654d";
+    hash = "sha256-o8uDSynpHAgpQZMjXyDiyQbxi+QgxY62uZeB08PcL/A=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      url = "https://github.com/pyt0xic/hyprfocus/commit/e7d9ee3c470b194fe16179ff2f16fc4233e928ef.patch";
-      hash = "sha256-iETrtvoIZfcaD3TcKIIwFL8Rua0dFEqboml9AgQ/RZ0=";
-    })
-  ];
-
   installPhase = ''
     runHook preInstall
 
@@ -41,5 +33,6 @@ mkHyprlandPlugin hyprland {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ donovanglover ];
     platforms = lib.platforms.linux;
+    broken = true; # Doesn't work on Hyprland v0.47.0+
   };
 }

From b75edc29b38c038fa7cbc8fc34134476e5e0b81b Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <mihai@fufexan.net>
Date: Sun, 2 Feb 2025 10:27:01 +0200
Subject: [PATCH 72/96] hyprlandPlugins.hyprgrass: 0.8.2-unstable-2024-12-13 ->
 0.8.2-unstable-2025-02-01

---
 .../window-managers/hyprwm/hyprland-plugins/hyprgrass.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
index 5d17306cb33e..49c9f25e3ee4 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
@@ -13,13 +13,13 @@
 
 mkHyprlandPlugin hyprland {
   pluginName = "hyprgrass";
-  version = "0.8.2-unstable-2024-12-13";
+  version = "0.8.2-unstable-2025-02-01";
 
   src = fetchFromGitHub {
     owner = "horriblename";
     repo = "hyprgrass";
-    rev = "dc19ccb209147312a4f60d76193b995c2634e756";
-    hash = "sha256-3ALmrImk37KT+UHt1EMi6PAHyj8WhL9Xw/Ar/ys4rtk=";
+    rev = "f7017c493e071c02f203c09a63ef7260dede0586";
+    hash = "sha256-F9Jnu36LXJnfDdc3mG4JYKACw/ygsPcwEbZsOdCreIQ=";
   };
 
   nativeBuildInputs = [

From 89c1b0ebde249a6a28edb52d50195da1d3622690 Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <mihai@fufexan.net>
Date: Sun, 2 Feb 2025 10:30:01 +0200
Subject: [PATCH 73/96] hyprlandPlugins.hyprspace: 0-unstable-2024-12-08 ->
 0-unstable-2025-01-18

Mark as broken.
---
 .../window-managers/hyprwm/hyprland-plugins/hyprspace.nix  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix
index ca470d454430..0aeced6c76bb 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix
@@ -8,13 +8,13 @@
 
 mkHyprlandPlugin hyprland {
   pluginName = "hyprspace";
-  version = "0-unstable-2024-12-08";
+  version = "0-unstable-2025-01-18";
 
   src = fetchFromGitHub {
     owner = "KZDKM";
     repo = "hyprspace";
-    rev = "e2d561c933cd085d68bf0b39c4f78870ad0abbc2";
-    hash = "sha256-YiLUDw14NaavML8y9rxXxO7q+j3b/ghQhBmIy0+/Zmk=";
+    rev = "1b5865f4ac9a04ba614df50de7acfaa40dcb852f";
+    hash = "sha256-YQgW4QifYIcNaFF4nMw0LpllXn0rhk/Yb6cwyH3PB9o=";
   };
 
   dontUseCmakeConfigure = true;
@@ -36,5 +36,6 @@ mkHyprlandPlugin hyprland {
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ donovanglover ];
+    broken = true; # Doesn't work on Hyprland v0.47.0+
   };
 }

From db98a21bb417e5a1f82c7207b27eee73b1e24f1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 12:16:45 +0000
Subject: [PATCH 74/96] brave: 1.74.50 -> 1.74.51

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

diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index 60630532c591..2b1283a6184c 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.74.50";
+  version = "1.74.51";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-vit57iZLBp1wP4SK8nqqZRaCHlxwgMRo2MXHVvw8apk=";
+      hash = "sha256-rsoZ5AKdYGyg6zt6k/HlBfK+FNvVZdL5VjNMNYqpKls=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-XnaDaJaqjPOXSXaShia6Ooyn/DegU0vC0XefjBoX6zE=";
+      hash = "sha256-ZlpKfTvsJKDmzpTCnPBqzCCvBKGJJCvOKi65KdEFGlI=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-9fke4rkaXWO5e9GBF+hdiDUjST8OsYJQ8tHxE5kJAcc=";
+      hash = "sha256-VKpxOffAg5+IereL3fLfDa8MSxVDmTKvf6VNbDuibhw=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-TwBmR7LlGZlpgIDJ2ShAS5uHwTh8dHvRONJln7Z9rgs=";
+      hash = "sha256-NrU/J7+7kS6w93bjbp56nviju33gR8tHBOwbNibG3vY=";
     };
   };
 

From c0e2fbbcad694e99e22dd3f099b2b8288b0ae750 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 2 Feb 2025 13:29:03 +0100
Subject: [PATCH 75/96] nixos/amazon-image: fix eval

---
 nixos/modules/virtualisation/amazon-image.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index ed12029fc5c7..d49eb8246d0f 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -28,18 +28,18 @@ in
 
     boot.growPartition = true;
 
-    fileSystems."/" = mkIf (!cfg.zfs.enable) lib.mkDefault {
+    fileSystems."/" = mkIf (!cfg.zfs.enable) (lib.mkDefault {
       device = "/dev/disk/by-label/nixos";
       fsType = "ext4";
       autoResize = true;
-    };
+    });
 
-    fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) lib.mkDefault {
+    fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) (lib.mkDefault {
       # The ZFS image uses a partition labeled ESP whether or not we're
       # booting with EFI.
       device = "/dev/disk/by-label/ESP";
       fsType = "vfat";
-    };
+    });
 
     services.zfs.expandOnBoot = mkIf cfg.zfs.enable "all";
 

From fe28eb11705adf8b244a33a94017de03eae53b20 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Sun, 2 Feb 2025 15:19:56 +0300
Subject: [PATCH 76/96] runzip: fix build

Configure script produces a cryptic message:

```
configure:4540: error: ZLIB version too old, please install at least v1.1.2
```

It's actually misleading and comes from the vendored libzip 0.7.1 configure check.
It fails due to do `-Wimplicit-int`:

```
conftest.c:16:16: error: type defaults to 'int' in declaration of 'unzOpen' [-Wimplicit-int]
   16 | extern ZEXPORT unzOpen (const char *path);
```

Vendored libzip is pretty heavily modified and unvendoring seems impossible.
Furthermore, libzip from nixpkgs in buildInputs
is actually unused and can be dropped - only zlib is necessary.
---
 pkgs/by-name/ru/runzip/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ru/runzip/package.nix b/pkgs/by-name/ru/runzip/package.nix
index 7f196224b676..453afa98fe94 100644
--- a/pkgs/by-name/ru/runzip/package.nix
+++ b/pkgs/by-name/ru/runzip/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libzip,
   libiconv,
+  zlib,
   autoreconfHook,
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [
     libiconv
-    libzip
+    zlib
   ];
 
   src = fetchFromGitHub {
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
     sha256 = "0l5zbb5hswxczigvyal877j0aiq3fc01j3gv88bvy7ikyvw3lc07";
   };
 
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-Wno-error=implicit-int"
+    "-Wno-error=incompatible-pointer-types"
+  ];
+
   meta = {
     description = "Tool to convert filename encoding inside a ZIP archive";
     license = lib.licenses.bsd2;

From 2d4d57fd436902d34cd8c573ab94b855bbc38ae3 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <145775305+xokdvium@users.noreply.github.com>
Date: Sun, 2 Feb 2025 15:31:20 +0300
Subject: [PATCH 77/96] runzip: enable tests

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

diff --git a/pkgs/by-name/ru/runzip/package.nix b/pkgs/by-name/ru/runzip/package.nix
index 453afa98fe94..fecd659c7563 100644
--- a/pkgs/by-name/ru/runzip/package.nix
+++ b/pkgs/by-name/ru/runzip/package.nix
@@ -24,11 +24,17 @@ stdenv.mkDerivation rec {
     sha256 = "0l5zbb5hswxczigvyal877j0aiq3fc01j3gv88bvy7ikyvw3lc07";
   };
 
+  postPatch = ''
+    patchShebangs tests/check-runzip.sh
+  '';
+
   env.NIX_CFLAGS_COMPILE = toString [
     "-Wno-error=implicit-int"
     "-Wno-error=incompatible-pointer-types"
   ];
 
+  doCheck = true;
+
   meta = {
     description = "Tool to convert filename encoding inside a ZIP archive";
     license = lib.licenses.bsd2;

From 331558245cb29baf0f5acba9f2d30fecab6c8e9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 12:43:36 +0000
Subject: [PATCH 78/96] jna: 5.15.0 -> 5.16.0

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

diff --git a/pkgs/by-name/jn/jna/package.nix b/pkgs/by-name/jn/jna/package.nix
index 59bf971a6179..bd9f9772838b 100644
--- a/pkgs/by-name/jn/jna/package.nix
+++ b/pkgs/by-name/jn/jna/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jna";
-  version = "5.15.0";
+  version = "5.16.0";
 
   src = fetchFromGitHub {
     owner = "java-native-access";
     repo = "jna";
     rev = finalAttrs.version;
-    hash = "sha256-PadOJtoH+guPBQ/j6nIBp7BokNz23OQhaYpcFl/wbpQ=";
+    hash = "sha256-IlOdvgZ5acwjuaDQT+vgQhC9itZmMjqzsrQHDNoEapM=";
   };
 
   nativeBuildInputs = [

From a8dc5506dcf44703914c30a69bcd850e4e9082a9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Feb 2025 01:24:53 +0100
Subject: [PATCH 79/96] python312Packages.django-i18nfield: fix 1.10.2 version
 bump

---
 .../python-modules/django-i18nfield/default.nix     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/django-i18nfield/default.nix b/pkgs/development/python-modules/django-i18nfield/default.nix
index 9a4918ee168f..06b89d1101cf 100644
--- a/pkgs/development/python-modules/django-i18nfield/default.nix
+++ b/pkgs/development/python-modules/django-i18nfield/default.nix
@@ -3,6 +3,9 @@
   buildPythonPackage,
   fetchFromGitHub,
 
+  # build-system
+  setuptools,
+
   # tests
   djangorestframework,
   html5lib,
@@ -12,18 +15,20 @@
   pyyaml,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "django-i18nfield";
   version = "1.10.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "raphaelm";
     repo = "django-i18nfield";
-    rev = "10488eb6c673be50e50387c76085a7c8d84e9157";
-    hash = "sha256-FF980LTw7RFuG9QgxA96yJsSczCNNMq9WsbacQqIReE=";
+    tag = version;
+    hash = "sha256-27PR2jLDXxRSgbJvRxDSBK4sTiqGAhP+XYg/fCg9AzM=";
   };
 
+  build-system = [ setuptools ];
+
   env.DJANGO_SETTINGS_MODULE = "tests.settings";
 
   nativeCheckInputs = [

From 5f0d280210d0e4e9ca516f5522786d1247677820 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Feb 2025 01:25:25 +0100
Subject: [PATCH 80/96] python312Packages.django-statici18n: 2.5.0 -> 2.6.0

https://github.com/zyegfryed/django-statici18n/compare/refs/tags/v2.5.0...v2.6.0
---
 pkgs/development/python-modules/django-statici18n/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix
index b233ad229b66..e48234004cc6 100644
--- a/pkgs/development/python-modules/django-statici18n/default.nix
+++ b/pkgs/development/python-modules/django-statici18n/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "django-statici18n";
-  version = "2.5.0";
+  version = "2.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zyegfryed";
     repo = "django-statici18n";
     tag = "v${version}";
-    hash = "sha256-n6HqHcXvz2ihwN+gJr5P+/Yt4RpuOu2yAjo9fiNZB54=";
+    hash = "sha256-G1JF/AQEDgvDamvjCYiQM7b6HfbdMBhfEUvT3yL1io0=";
   };
 
   build-system = [ setuptools ];

From bce9b0fde9d50fa2db330fbd1de51a7bc2d49e2e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Feb 2025 01:28:48 +0100
Subject: [PATCH 81/96] pretix: 2024.11.0 -> 2025.1.0

https://pretix.eu/about/en/blog/20250131-release-2025-1-0/
https://github.com/pretix/pretix/compare/refs/tags/v2024.11.0...v2025.1.0
---
 nixos/modules/services/web-apps/pretix.nix |  2 +-
 pkgs/by-name/pr/pretix/package.nix         | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/web-apps/pretix.nix b/nixos/modules/services/web-apps/pretix.nix
index 68b65e2260d2..75c95464d6fa 100644
--- a/nixos/modules/services/web-apps/pretix.nix
+++ b/nixos/modules/services/web-apps/pretix.nix
@@ -439,7 +439,7 @@ in
                 expires 7d;
               '';
             };
-            "^~ /media/(cachedfiles|invoices)" = {
+            "^~ (/media/(cachedfiles|invoices)|/static/(staticfiles.json|CACHE/manifest.json))" = {
               extraConfig = ''
                 deny all;
                 return 404;
diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index 2cb5569135a5..95aa85019412 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -3,7 +3,6 @@
   buildNpmPackage,
   fetchFromGitHub,
   fetchPypi,
-  fetchpatch2,
   nodejs,
   python3,
   gettext,
@@ -43,13 +42,13 @@ let
   };
 
   pname = "pretix";
-  version = "2024.11.0";
+  version = "2025.1.0";
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vmk7oW9foXkZdt3XOLJDbPldX2TruJOgd8mmi5tGqNw=";
+    hash = "sha256-azJFXuoV+9qs5MJQTkc1+ZiJb6UKwEa0Ow0p31CkHqI=";
   };
 
   npmDeps = buildNpmPackage {
@@ -57,7 +56,7 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}/src/pretix/static/npm_dir";
-    npmDepsHash = "sha256-4PrOrI2cykkuzob+DMeAu/GF5OMCho40G3BjCwVW/tE=";
+    npmDepsHash = "sha256-oo9fo3MjwKYA8gueJ5otIPawORaVNj/Js3y8ZuCZ4qQ=";
 
     dontBuild = true;
 
@@ -79,12 +78,6 @@ python.pkgs.buildPythonApplication rec {
     # Discover pretix.plugin entrypoints during build and add them into
     # INSTALLED_APPS, so that their static files are collected.
     ./plugin-build.patch
-
-    (fetchpatch2 {
-      # fix tests after 2025-01-01
-      url = "https://github.com/pretix/pretix/commit/5a5a551c21461d9ef36337480c9874d65a9fdba9.patch";
-      hash = "sha256-ZtSVI6nVlJtNrnBZ9ktIqFGtNf+oWtvNsgCWwOUwVug=";
-    })
   ];
 
   pythonRelaxDeps = [

From 7f1052a12c58a9e942981d952dc3b0a91fe1025e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Feb 2025 01:39:07 +0100
Subject: [PATCH 82/96] pretix.plugins.mollie: 2.2.1 -> 2.2.2

https://github.com/pretix/pretix-mollie/compare/refs/tags/v2.2.1...v2.2.2
---
 pkgs/by-name/pr/pretix/plugins/mollie.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/plugins/mollie.nix b/pkgs/by-name/pr/pretix/plugins/mollie.nix
index da15098b01d2..e843a85c9329 100644
--- a/pkgs/by-name/pr/pretix/plugins/mollie.nix
+++ b/pkgs/by-name/pr/pretix/plugins/mollie.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pretix-mollie";
-  version = "2.2.1";
+  version = "2.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-mollie";
     tag = "v${version}";
-    hash = "sha256-utrdFrE4XHDTi/45gUTFarD+PQoGIHc4gTkDR8dGu40=";
+    hash = "sha256-yc4t+XtHk7u3KcfeS+0CSTrBJ6e6SyLRpaQBHAKYVvo=";
   };
 
   build-system = [

From f5d47da8739ff0b036dbd08ab95af5310421ed03 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Feb 2025 01:40:07 +0100
Subject: [PATCH 83/96] pretix.plugins.zugferd: 2.2.2 -> 2.3.0

https://github.com/pretix/pretix-zugferd/compare/v2.2.2...v2.3.0
---
 pkgs/by-name/pr/pretix/plugins/zugferd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd.nix b/pkgs/by-name/pr/pretix/plugins/zugferd.nix
index bada0bbc9bfd..55f2300ab98f 100644
--- a/pkgs/by-name/pr/pretix/plugins/zugferd.nix
+++ b/pkgs/by-name/pr/pretix/plugins/zugferd.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pretix-zugferd";
-  version = "2.2.2";
+  version = "2.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-zugferd";
     rev = "v${version}";
-    hash = "sha256-urf5HrC3Y64hH+U738t9fchoeR2sawlJAQoLFtwebA4=";
+    hash = "sha256-/efhp9B/cw/C3Bok8/E93dOrP9FHfaVZNSwC/j2lNuA=";
   };
 
   postPatch = ''

From d14cc4ae043f3bcaafb9f9a867c4d9f5ec3f3dd5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Feb 2025 01:50:42 +0100
Subject: [PATCH 84/96] pretix.plugins: migrate to auto-calling

---
 pkgs/by-name/pr/pretix/package.nix             |  3 ++-
 pkgs/by-name/pr/pretix/plugins/default.nix     | 18 ------------------
 .../plugins/{mollie.nix => mollie/package.nix} |  0
 .../plugins/{pages.nix => pages/package.nix}   |  0
 .../openssl.patch}                             |  0
 .../{passbook.nix => passbook/package.nix}     |  2 +-
 .../package.nix}                               |  0
 .../package.nix}                               |  0
 .../{zugferd.nix => zugferd/package.nix}       |  0
 9 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/by-name/pr/pretix/plugins/default.nix
 rename pkgs/by-name/pr/pretix/plugins/{mollie.nix => mollie/package.nix} (100%)
 rename pkgs/by-name/pr/pretix/plugins/{pages.nix => pages/package.nix} (100%)
 rename pkgs/by-name/pr/pretix/plugins/{passbook-openssl.patch => passbook/openssl.patch} (100%)
 rename pkgs/by-name/pr/pretix/plugins/{passbook.nix => passbook/package.nix} (96%)
 rename pkgs/by-name/pr/pretix/plugins/{reluctant-stripe.nix => reluctant-stripe/package.nix} (100%)
 rename pkgs/by-name/pr/pretix/plugins/{stretchgoals.nix => stretchgoals/package.nix} (100%)
 rename pkgs/by-name/pr/pretix/plugins/{zugferd.nix => zugferd/package.nix} (100%)

diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index 95aa85019412..310ffdc66674 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -266,8 +266,9 @@ python.pkgs.buildPythonApplication rec {
       python
       ;
     plugins = lib.recurseIntoAttrs (
-      python.pkgs.callPackage ./plugins {
+      lib.packagesFromDirectoryRecursive {
         inherit (python.pkgs) callPackage;
+        directory = ./plugins;
       }
     );
     tests = {
diff --git a/pkgs/by-name/pr/pretix/plugins/default.nix b/pkgs/by-name/pr/pretix/plugins/default.nix
deleted file mode 100644
index 12c9b6fa02bf..000000000000
--- a/pkgs/by-name/pr/pretix/plugins/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  callPackage,
-  ...
-}:
-
-{
-  mollie = callPackage ./mollie.nix { };
-
-  pages = callPackage ./pages.nix { };
-
-  passbook = callPackage ./passbook.nix { };
-
-  reluctant-stripe = callPackage ./reluctant-stripe.nix { };
-
-  stretchgoals = callPackage ./stretchgoals.nix { };
-
-  zugferd = callPackage ./zugferd.nix { };
-}
diff --git a/pkgs/by-name/pr/pretix/plugins/mollie.nix b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
similarity index 100%
rename from pkgs/by-name/pr/pretix/plugins/mollie.nix
rename to pkgs/by-name/pr/pretix/plugins/mollie/package.nix
diff --git a/pkgs/by-name/pr/pretix/plugins/pages.nix b/pkgs/by-name/pr/pretix/plugins/pages/package.nix
similarity index 100%
rename from pkgs/by-name/pr/pretix/plugins/pages.nix
rename to pkgs/by-name/pr/pretix/plugins/pages/package.nix
diff --git a/pkgs/by-name/pr/pretix/plugins/passbook-openssl.patch b/pkgs/by-name/pr/pretix/plugins/passbook/openssl.patch
similarity index 100%
rename from pkgs/by-name/pr/pretix/plugins/passbook-openssl.patch
rename to pkgs/by-name/pr/pretix/plugins/passbook/openssl.patch
diff --git a/pkgs/by-name/pr/pretix/plugins/passbook.nix b/pkgs/by-name/pr/pretix/plugins/passbook/package.nix
similarity index 96%
rename from pkgs/by-name/pr/pretix/plugins/passbook.nix
rename to pkgs/by-name/pr/pretix/plugins/passbook/package.nix
index d5ca08315f18..ad0ae3febf62 100644
--- a/pkgs/by-name/pr/pretix/plugins/passbook.nix
+++ b/pkgs/by-name/pr/pretix/plugins/passbook/package.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   patches = [
     (substituteAll {
-      src = ./passbook-openssl.patch;
+      src = ./openssl.patch;
       openssl = lib.getExe openssl;
     })
   ];
diff --git a/pkgs/by-name/pr/pretix/plugins/reluctant-stripe.nix b/pkgs/by-name/pr/pretix/plugins/reluctant-stripe/package.nix
similarity index 100%
rename from pkgs/by-name/pr/pretix/plugins/reluctant-stripe.nix
rename to pkgs/by-name/pr/pretix/plugins/reluctant-stripe/package.nix
diff --git a/pkgs/by-name/pr/pretix/plugins/stretchgoals.nix b/pkgs/by-name/pr/pretix/plugins/stretchgoals/package.nix
similarity index 100%
rename from pkgs/by-name/pr/pretix/plugins/stretchgoals.nix
rename to pkgs/by-name/pr/pretix/plugins/stretchgoals/package.nix
diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd.nix b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
similarity index 100%
rename from pkgs/by-name/pr/pretix/plugins/zugferd.nix
rename to pkgs/by-name/pr/pretix/plugins/zugferd/package.nix

From 2a6f860d88f085f4891a319d1a4f81549a3d1c5b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Feb 2025 02:19:58 +0100
Subject: [PATCH 85/96] python312Packages.django-localflavor: refactor

---
 .../django-localflavor/default.nix            | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/django-localflavor/default.nix b/pkgs/development/python-modules/django-localflavor/default.nix
index 0ccadac6705d..7576c4e83eef 100644
--- a/pkgs/development/python-modules/django-localflavor/default.nix
+++ b/pkgs/development/python-modules/django-localflavor/default.nix
@@ -3,10 +3,11 @@
   buildPythonPackage,
   fetchFromGitHub,
 
-  # bring your own
-  django,
+  # build-system
+  setuptools,
 
-  # propagates
+  # dependencies
+  django,
   python-stdnum,
 
   # tests
@@ -17,7 +18,7 @@
 buildPythonPackage rec {
   pname = "django-localflavor";
   version = "4.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django";
@@ -26,9 +27,12 @@ buildPythonPackage rec {
     hash = "sha256-UWp3ei1VlEsEfjbJIE+MpffSzYF4X1HEQw+z+5kZoP0=";
   };
 
-  buildInputs = [ django ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ python-stdnum ];
+  dependencies = [
+    django
+    python-stdnum
+  ];
 
   pythonImportsCheck = [
     # samples
@@ -41,12 +45,12 @@ buildPythonPackage rec {
     "localflavor.za"
   ];
 
-  checkInputs = [
+  nativeCheckInputs = [
     pytest-django
     pytestCheckHook
   ];
 
-  DJANGO_SETTINGS_MODULE = "tests.settings";
+  env.DJANGO_SETTINGS_MODULE = "tests.settings";
 
   meta = with lib; {
     description = "Country-specific Django helpers";

From 4dc6341855d8a39c31cc663835c120ad711efb3a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Feb 2025 14:22:25 +0100
Subject: [PATCH 86/96] firebase-tools: 13.29.2 -> 13.29.3

Diff: https://github.com/firebase/firebase-tools/compare/refs/tags/v13.29.2...v13.29.3

Changelog: https://github.com/firebase/firebase-tools/blob/refs/tags/v13.29.3/CHANGELOG.md
---
 pkgs/by-name/fi/firebase-tools/package.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index 7877540a8c4f..2b0f99cce68f 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -5,22 +5,19 @@
   fetchFromGitHub,
   python3,
   xcbuild,
-  fetchpatch,
 }:
-let
-  version = "13.29.2";
+buildNpmPackage rec {
+  pname = "firebase-tools";
+  version = "13.29.3";
+
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     tag = "v${version}";
-    hash = "sha256-A/UHJC1BY2A/Zezdvq3W7Ra55TEwqTaYDI8VTwy7yrA=";
+    hash = "sha256-ZY4hbo84qdvBGOpGWKKWR3bHHTP2+Poa1od7FCy9uSE=";
   };
-in
-buildNpmPackage {
-  pname = "firebase-tools";
-  inherit version src;
 
-  npmDepsHash = "sha256-5ARfYHmWJFaO7pngWVDQ7R3PAopg4+2Q2kspBTpKclM=";
+  npmDepsHash = "sha256-UqrTyK5IOK4N6z1UfApqzGCHj0H1/FujWdgJPrQoNxQ=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json
@@ -39,7 +36,7 @@ buildNpmPackage {
   };
 
   meta = {
-    changelog = "https://github.com/firebase/firebase-tools/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/firebase/firebase-tools/blob/v${version}/CHANGELOG.md";
     description = "Manage, and deploy your Firebase project from the command line";
     homepage = "https://github.com/firebase/firebase-tools";
     license = lib.licenses.mit;

From 9c9121755402bf478475e0ac911b24ef8a93df6c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Feb 2025 14:25:21 +0100
Subject: [PATCH 87/96] python312Packages.experiment-utilities: 0.3.8 -> 0.3.9

Diff: https://github.com/ChrisReinke/exputils/compare/refs/tags/v0.3.8...v0.3.9

Changelog: https://github.com/ChrisReinke/exputils/releases/tag/v0.3.9
---
 .../python-modules/experiment-utilities/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/experiment-utilities/default.nix b/pkgs/development/python-modules/experiment-utilities/default.nix
index 983f259c10c6..08c72cb88c3e 100644
--- a/pkgs/development/python-modules/experiment-utilities/default.nix
+++ b/pkgs/development/python-modules/experiment-utilities/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "experiment-utilities";
-  version = "0.3.8";
+  version = "0.3.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ChrisReinke";
     repo = "exputils";
     tag = "v${version}";
-    hash = "sha256-fo8kwxm5/oEuLXVKhBrvKg18S0Yh6SkkNRaHUGJfdw4=";
+    hash = "sha256-LQ1RjDcOL1SroNzWSfSS2OUSqsGgWOly7bLcbZ7e8LY=";
   };
 
   pythonRelaxDeps = [

From 36f1c1a660d72d64b688204e099ac106d17d2740 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Feb 2025 13:36:25 +0000
Subject: [PATCH 88/96] lief: 0.16.2 -> 0.16.3

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

diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix
index 209c9b194ddf..3f618f6a6740 100644
--- a/pkgs/development/libraries/lief/default.nix
+++ b/pkgs/development/libraries/lief/default.nix
@@ -11,13 +11,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "lief";
-  version = "0.16.2";
+  version = "0.16.3";
 
   src = fetchFromGitHub {
     owner = "lief-project";
     repo = "LIEF";
     rev = version;
-    sha256 = "sha256-5T/lTtmm3jwkxoFU/8Cl+hPcysZOwnWWqVQ91D5G0LA=";
+    sha256 = "sha256-tV9L4UUl+gwpzJIqrMsNeCCtcxX+wsHvPxNTqtvsoV0=";
   };
 
   outputs = [ "out" "py" ];

From b9024d4b3367112941c35720e0579ebdd248cb52 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Fri, 3 Jan 2025 09:21:31 +0100
Subject: [PATCH 89/96] python3Packages.fenics: pin boost186, add patches

---
 .../python-modules/fenics/default.nix          | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fenics/default.nix b/pkgs/development/python-modules/fenics/default.nix
index b2750f7a7054..15f4fc83b541 100644
--- a/pkgs/development/python-modules/fenics/default.nix
+++ b/pkgs/development/python-modules/fenics/default.nix
@@ -4,7 +4,7 @@
   fetchurl,
   fetchpatch,
   blas,
-  boost,
+  boost186,
   cmake,
   doxygen,
   eigen,
@@ -133,6 +133,13 @@ let
       url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz";
       sha256 = "1zdg6pziss4va74pd7jjl8sc3ya2gmhpypccmyd8p7c66ji23y2g";
     };
+    patches = [
+      (fetchpatch {
+        name = "fenics-ffc-numpy2-compat.patch";
+        url = "https://bitbucket.org/fenics-project/ffc/commits/245d15115b35b5ac091251fe6c84cc6474704b3c/raw";
+        hash = "sha256-TcLQZ44C+uR2ryxtCBjR/5Tjn7B0S4MqoYi0nlP8JwI=";
+      })
+    ];
     nativeBuildInputs = [ pybind11 ];
     propagatedBuildInputs = [
       dijitso
@@ -177,6 +184,11 @@ let
         url = "https://bitbucket.org/fenics-project/dolfin/issues/attachments/1116/fenics-project/dolfin/1602778118.04/1116/0001-Use-__BYTE_ORDER__-instead-of-removed-Boost-endian.h.patch";
         hash = "sha256-wPaDmPU+jaD3ce3nNEbvM5p8e3zBdLozamLTJ/0ai2c=";
       })
+      (fetchpatch {
+        name = "fenics-boost-filesystem-1.85-compat.patch.";
+        url = "https://bitbucket.org/sblauth/dolfin/commits/16fa03887b3e9ec417c484ddf92db104cb9a93f9/raw";
+        hash = "sha256-ZMKfzeWlPre88cKzrj04Tj+nQWS4ixat0bBvyt3TJmk=";
+      })
     ];
     # https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=dolfin&id=a965ad934f7b3d49a5e77fa6fb5e3c710ec2163e
     postPatch = ''
@@ -197,7 +209,7 @@ let
       pkg-config
     ];
     buildInputs = [
-      boost
+      boost186
       dijitso
       eigen
       ffc
@@ -265,7 +277,7 @@ let
     '';
     buildInputs = [
       dolfin
-      boost
+      boost186
     ];
 
     propagatedBuildInputs = [

From 09a045c065f1231bcf3b9c244f52d09292185b41 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Feb 2025 15:36:06 +0100
Subject: [PATCH 90/96] python313Packages.tradfri: refactor and fix pydantic 2
 compat

---
 .../python-modules/pytradfri/default.nix      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix
index cfbcc21fc6cb..ab7772360d65 100644
--- a/pkgs/development/python-modules/pytradfri/default.nix
+++ b/pkgs/development/python-modules/pytradfri/default.nix
@@ -3,6 +3,8 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+  fetchpatch2,
+  setuptools,
   aiocoap,
   dtlssocket,
   pydantic,
@@ -12,7 +14,7 @@
 buildPythonPackage rec {
   pname = "pytradfri";
   version = "13.0.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.9";
 
@@ -23,7 +25,18 @@ buildPythonPackage rec {
     hash = "sha256-CWv3ebDulZuiFP+nJ2Xr7U/HTDFTqA9VYC0USLkpWR0=";
   };
 
-  propagatedBuildInputs = [ pydantic ];
+  patches = [
+    (fetchpatch2 {
+      name = "pydantic2-compat.patch";
+      url = "https://github.com/home-assistant-libs/pytradfri/commit/ecd099837a0b4538a56301af6260fddde77fbbb1.patch";
+      excludes = [ "requirements.txt" ];
+      hash = "sha256-QsvBTB9evKyE1fcfDaB0SN21kHmNmLgGPs3GJHHsMJc=";
+    })
+  ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [ pydantic ];
 
   optional-dependencies = {
     async = [
@@ -42,7 +55,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/home-assistant-libs/pytradfri/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
-    # https://github.com/home-assistant-libs/pytradfri/issues/720
-    broken = versionAtLeast pydantic.version "2";
   };
 }

From 075d541165a381b2ef753ff46c941a7ad32ab56f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Feb 2025 15:36:25 +0100
Subject: [PATCH 91/96] home-assistant: don't patch & test overriden pytradfri
 package

---
 pkgs/servers/home-assistant/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 7ccf9f601a40..7c3b7132aef5 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -222,6 +222,8 @@ let
           rev = "refs/tags/${version}";
           hash = "sha256-xOdTzG0bF5p1QpkXv2btwrVugQRjSwdAj8bXcC0IoQg=";
         };
+        patches = [ ];
+        doCheck = false;
       });
 
       slack-sdk = super.slack-sdk.overridePythonAttrs (oldAttrs: rec {

From 007548518e8aee3e10df187f7df25e3ed8a3c4b3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 3 Feb 2025 00:43:31 +1000
Subject: [PATCH 92/96] python312Packages.aioesphomeapi: 28.0.1 -> 29.0.0
 (#378833)

https://github.com/esphome/aioesphomeapi/releases/tag/v29.0.0
---
 pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index fd82bc553883..267ad87e58d8 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "28.0.1";
+  version = "29.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "esphome";
     repo = "aioesphomeapi";
     tag = "v${version}";
-    hash = "sha256-MAlgr+DaJWQnO4Y8KesP/d9aCRbSjUb9ciuvR5DHz+w=";
+    hash = "sha256-1H6+/V87mjkBvHwPTs3sgrqY24Gc/MCKb97r2ly6oTA=";
   };
 
   build-system = [

From 2d271095d8604fbd6d6fbe03a0437efc20dbc7d9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Feb 2025 15:54:31 +0100
Subject: [PATCH 93/96] python312Packages.mpi4py: 4.0.1 -> 4.0.2

Diff: https://github.com/mpi4py/mpi4py/compare/refs/tags/4.0.1...4.0.2
---
 .../python-modules/mpi4py/default.nix         | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index e8d3ac8be8ac..e16d2cf007d6 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
-  fetchFromGitHub,
   buildPythonPackage,
+  fetchFromGitHub,
   cython,
   setuptools,
   mpi,
@@ -11,36 +11,37 @@
 
 buildPythonPackage rec {
   pname = "mpi4py";
-  version = "4.0.1";
+  version = "4.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     repo = "mpi4py";
     owner = "mpi4py";
-    rev = version;
-    hash = "sha256-pH4z+hyoFOSAUlXv9EKO54/SM5HyLxv7B+18xBidH2Q=";
+    tag = version;
+    hash = "sha256-hsP4aonjiBit2un6EQWQxF+lVjsnMFFqLaAOqBWAzgo=";
   };
 
   build-system = [
     cython
     setuptools
+  ];
+
+  nativeBuildInputs = [
     mpi
   ];
+
   dependencies = [
     mpi
   ];
 
+  pythonImportsCheck = [ "mpi4py" ];
+
   __darwinAllowLocalNetworking = true;
 
   nativeCheckInputs = [
     pytestCheckHook
     mpiCheckPhaseHook
   ];
-  doCheck = true;
-  disabledTestPaths = [
-    # Almost all tests in this file fail (TODO: Report about this upstream..)
-    "test/test_spawn.py"
-  ];
 
   passthru = {
     inherit mpi;
@@ -49,6 +50,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python bindings for the Message Passing Interface standard";
     homepage = "https://github.com/mpi4py/mpi4py";
+    changelog = "https://github.com/mpi4py/mpi4py/blob/${version}/CHANGES.rst";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ doronbehar ];
   };

From 2e7dcac1c37e8ce57293efc941e272a34bb2fecd Mon Sep 17 00:00:00 2001
From: "\"Pedro Alves\"" <"pta2002@pta2002.com">
Date: Sun, 2 Feb 2025 17:14:18 +0000
Subject: [PATCH 94/96] vimPlugins.terminal-nvim: init at 2024-10-14

---
 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 164c0e8fb7bc..2f724348c701 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -12876,6 +12876,18 @@ final: prev:
     meta.homepage = "https://github.com/chomosuke/term-edit.nvim/";
   };
 
+  terminal-nvim = buildVimPlugin {
+    pname = "terminal.nvim";
+    version = "2024-10-14";
+    src = fetchFromGitHub {
+      owner = "rebelot";
+      repo = "terminal.nvim";
+      rev = "95cdb0c22cd2d2f8c2b33a55ec07f0bcbd6cad9e";
+      sha256 = "0bp6m6b7bsw9d4iyn1b8bw3avnvjlk7pi8h941m68fw54n3mf06f";
+    };
+    meta.homepage = "https://github.com/rebelot/terminal.nvim/";
+  };
+
   terminus = buildVimPlugin {
     pname = "terminus";
     version = "2024-07-30";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 1884a1007ff5..812b04c932fb 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1066,6 +1066,7 @@ https://github.com/joerdav/templ.vim/,HEAD,
 https://github.com/axelvc/template-string.nvim/,HEAD,
 https://github.com/jacoborus/tender.vim/,,
 https://github.com/chomosuke/term-edit.nvim/,HEAD,
+https://github.com/rebelot/terminal.nvim/,HEAD,
 https://github.com/wincent/terminus/,,
 https://github.com/oberblastmeister/termwrapper.nvim/,,
 https://github.com/ternjs/tern_for_vim/,,

From 90160dbd10552a81803eca55d68d13d16b29ec01 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Feb 2025 18:23:14 +0100
Subject: [PATCH 95/96] Revert "mbrola: Fix compilation on Darwin"

This reverts commit 479d8786151352de75ea8198ec40624ee18f1f00.

This is not required any longer, after bumping mbrola to an unstable
version that contains these fixes.
---
 pkgs/applications/audio/mbrola/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/applications/audio/mbrola/default.nix b/pkgs/applications/audio/mbrola/default.nix
index 51758aeb1399..e025827fed7a 100644
--- a/pkgs/applications/audio/mbrola/default.nix
+++ b/pkgs/applications/audio/mbrola/default.nix
@@ -29,15 +29,6 @@ let
       hash = "sha256-ZjCl1gx/6sGtpXAYO4sAh6dutjwzClQ7kZoq0WaaBlU=";
     };
 
-    postPatch = ''
-      substituteInPlace Makefile \
-        --replace-fail 'O6' 'O3'
-      substituteInPlace Misc/common.h \
-        --replace-fail '|| defined(TARGET_OS_MAC)' ""
-      substituteInPlace Misc/common.c \
-        --replace-fail '|| defined(TARGET_OS_MAC)' ""
-    '';
-
     # required for cross compilation
     makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
 

From 63d8d3ccbaa3a7996775c8dd9ef9e1dbde6eae2b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Feb 2025 23:00:46 +0100
Subject: [PATCH 96/96] python313Packages.autobahn: fix
 optional-dependencies.all expression

Relying on `with self` leaked in twisted from the outer scope, which
broke the list concat.
---
 pkgs/development/python-modules/autobahn/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index 9770f8e6e940..5b71a43facc0 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -84,8 +84,14 @@ buildPythonPackage rec {
 
   optional-dependencies = lib.fix (self: {
     all =
-      with self;
-      accelerate ++ compress ++ encryption ++ nvx ++ serialization ++ scram ++ twisted ++ ui;
+      self.accelerate
+      ++ self.compress
+      ++ self.encryption
+      ++ self.nvx
+      ++ self.serialization
+      ++ self.scram
+      ++ self.twisted
+      ++ self.ui;
     accelerate = [
       # wsaccel
     ];