From 113ccac44f7ec2b44874cab4c4ac373d966531bb Mon Sep 17 00:00:00 2001
From: lewistorrington <lu5a@proton.me>
Date: Wed, 25 Dec 2024 15:34:07 +0200
Subject: [PATCH 001/101] maintainers: add lu1a

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b56630427149b..58cccc66de1b4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13248,6 +13248,12 @@
     githubId = 37505890;
     name = "Luis Wirth";
   };
+  lu1a = {
+    email = "lu5a@proton.me";
+    github = "lu1a";
+    githubId = 83420438;
+    name = "Lewis";
+  };
   LucaGuerra = {
     email = "luca@guerra.sh";
     github = "LucaGuerra";

From e9cde7f1ed35162fb1efe55e6c067e969e8ec052 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 07:59:16 +0000
Subject: [PATCH 002/101] realm: 2.6.0 -> 2.7.0

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

diff --git a/pkgs/by-name/re/realm/package.nix b/pkgs/by-name/re/realm/package.nix
index efe93beb7713a..b40e45af22a78 100644
--- a/pkgs/by-name/re/realm/package.nix
+++ b/pkgs/by-name/re/realm/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "realm";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "zhboner";
     repo = "realm";
     rev = "v${version}";
-    hash = "sha256-G3scFSOxbmR3Q2fkRdg115WN/GCYpys/8Y4JC4YMGdY=";
+    hash = "sha256-vkLGfSDRYqvoqyVM/CWGJjpvXXPisEZxUSjLZGjNzno=";
   };
 
-  cargoHash = "sha256-EvXafTujqTdQwfK4NXgT7lGKGnrpyP9ouplD6DmJUKU=";
+  cargoHash = "sha256-SrTymeGERDO42/S3m5ErwtB15KslPzdmcn3KlrVNVIc=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.Security

From a9dc181f359d4eaf14872361e4cb19dcdbe6cf3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jan 2025 11:24:37 +0000
Subject: [PATCH 003/101] kubectl-cnpg: 1.24.2 -> 1.25.0

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

diff --git a/pkgs/by-name/ku/kubectl-cnpg/package.nix b/pkgs/by-name/ku/kubectl-cnpg/package.nix
index 05c32829ec4d8..fa9e163e5a733 100644
--- a/pkgs/by-name/ku/kubectl-cnpg/package.nix
+++ b/pkgs/by-name/ku/kubectl-cnpg/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubectl-cnpg";
-  version = "1.24.2";
+  version = "1.25.0";
 
   src = fetchFromGitHub {
     owner = "cloudnative-pg";
     repo = "cloudnative-pg";
     rev = "v${version}";
-    hash = "sha256-XXlqtqn2PiBo2YHaBnwt1BpTnON+ActIuLO0EFDAxMw=";
+    hash = "sha256-pU8OgGmRzZEfcMOhMHXhwK+oA/6zyj7F7QZ0ZNJIjsQ=";
   };
 
-  vendorHash = "sha256-FpCM2R/bQ1BScYHEK5xaO0kZ/hCUZaUDhu6XoTNPn2o=";
+  vendorHash = "sha256-sKYREfo107RYGACXn37X9ENz/rwkdiBswRlFN4Z20yY=";
 
   subPackages = [ "cmd/kubectl-cnpg" ];
 

From 3d5cf8110d9fba048ee4909fd9629484f14f732e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 3 Jan 2025 19:31:29 +0300
Subject: [PATCH 004/101] galene: 0.9.1 -> 0.96

Diff: https://github.com/jech/galene/compare/galene-0.9.1...galene-0.96

Changelog: https://github.com/jech/galene/raw/galene-0.96/CHANGES
---
 pkgs/by-name/ga/galene/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ga/galene/package.nix b/pkgs/by-name/ga/galene/package.nix
index 6bc8b9fdc23f1..b8e5b2e4cf78b 100644
--- a/pkgs/by-name/ga/galene/package.nix
+++ b/pkgs/by-name/ga/galene/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "galene";
-  version = "0.9.1";
+  version = "0.96";
 
   src = fetchFromGitHub {
     owner = "jech";
     repo = "galene";
     rev = "galene-${version}";
-    hash = "sha256-Ky38PM9HX1jV1LTMUeqaY8fUjZAxe4uK52YKQF8WOMA=";
+    hash = "sha256-E/xFh60Fzy/bRX414N1Juc7j4D8fN8CEDYPOUrNp5/4=";
   };
 
-  vendorHash = "sha256-U8DH3b2KbFQbEV+7suVsBiTA42FEl6DebH+GJDaH6aE=";
+  vendorHash = "sha256-LDLKjD4qYn/Aae6GUX6gZ57+MUfKc058H+YHM0bNZV0=";
 
   ldflags = [ "-s" "-w" ];
   preCheck = "export TZ=UTC";

From 07679c4cc1909da9a0709382e4f48caa0904c360 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sun, 5 Jan 2025 11:03:59 +0200
Subject: [PATCH 005/101] mactracker: add update script

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

diff --git a/pkgs/by-name/ma/mactracker/package.nix b/pkgs/by-name/ma/mactracker/package.nix
index faf8d004e70a6..5b5cdc6cb2591 100644
--- a/pkgs/by-name/ma/mactracker/package.nix
+++ b/pkgs/by-name/ma/mactracker/package.nix
@@ -3,6 +3,12 @@
   stdenvNoCC,
   fetchurl,
   unzip,
+  writeShellApplication,
+  curl,
+  cacert,
+  libxml2,
+  xmlstarlet,
+  common-updater-scripts,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -31,6 +37,22 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = lib.getExe (writeShellApplication {
+    name = "mactracker-update-script";
+    runtimeInputs = [
+      curl
+      cacert
+      libxml2
+      xmlstarlet
+      common-updater-scripts
+    ];
+    text = ''
+      url="https://mactracker.ca/releasenotes-mac.html"
+      version=$(curl -s "$url" | xmllint -html -xmlout - | xmlstarlet sel -t -v "//faq/h5[1]")
+      update-source-version mactracker "$version"
+    '';
+  });
+
   meta = {
     description = "Mactracker provides detailed information on every Apple Macintosh, iPod, iPhone, iPad, and Apple Watch ever made";
     homepage = "https://mactracker.ca";

From fef34957c967257e7b5790f6df80e64629e22a60 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sun, 5 Jan 2025 11:09:03 +0200
Subject: [PATCH 006/101] mactracker: 7.13 -> 7.13.2

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

diff --git a/pkgs/by-name/ma/mactracker/package.nix b/pkgs/by-name/ma/mactracker/package.nix
index 5b5cdc6cb2591..9ee5c07704cf2 100644
--- a/pkgs/by-name/ma/mactracker/package.nix
+++ b/pkgs/by-name/ma/mactracker/package.nix
@@ -13,11 +13,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mactracker";
-  version = "7.13";
+  version = "7.13.2";
 
   src = fetchurl {
     url = "https://mactracker.ca/downloads/Mactracker_${finalAttrs.version}.zip";
-    hash = "sha256-GbaGhYF9Pf3EpzoLQd9fkWYxHFwCkYdlRyy33lieUxM=";
+    hash = "sha256-Ns2es6uMqfHKmeVV6ehGXV0pNtv2T3eNYLnRvsjOhpE=";
   };
 
   dontPatch = true;

From 2b2be7f8a892e2de458b342a8551a11b954b323b Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sun, 5 Jan 2025 12:36:09 +0200
Subject: [PATCH 007/101] mactracker: add version check

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

diff --git a/pkgs/by-name/ma/mactracker/package.nix b/pkgs/by-name/ma/mactracker/package.nix
index 9ee5c07704cf2..430373fe90c58 100644
--- a/pkgs/by-name/ma/mactracker/package.nix
+++ b/pkgs/by-name/ma/mactracker/package.nix
@@ -9,6 +9,9 @@
   libxml2,
   xmlstarlet,
   common-updater-scripts,
+  versionCheckHook,
+  writeShellScript,
+  xcbuild,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -53,6 +56,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     '';
   });
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = writeShellScript "version-check" ''
+    ${xcbuild}/bin/PlistBuddy -c "Print :CFBundleVersion" "$1"
+  '';
+  versionCheckProgramArg = [ "${placeholder "out"}/Applications/Mactracker.app/Contents/Info.plist" ];
+  doInstallCheck = true;
+
   meta = {
     description = "Mactracker provides detailed information on every Apple Macintosh, iPod, iPhone, iPad, and Apple Watch ever made";
     homepage = "https://mactracker.ca";

From 56221c3462b140aa9fd0a09aa33558e46028834d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jan 2025 00:46:47 +0000
Subject: [PATCH 008/101] gmetronome: 0.3.4 -> 0.4.1

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

diff --git a/pkgs/by-name/gm/gmetronome/package.nix b/pkgs/by-name/gm/gmetronome/package.nix
index eec5e5bbeda70..97a310c1d912e 100644
--- a/pkgs/by-name/gm/gmetronome/package.nix
+++ b/pkgs/by-name/gm/gmetronome/package.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation rec {
   pname = "gmetronome";
-  version = "0.3.4";
+  version = "0.4.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "dqpb";
     repo = "gmetronome";
     rev = version;
-    hash = "sha256-fjtdM2/LMZx0dFt78Ih4BG5+NZoocPknh5INA+2e5qk=";
+    hash = "sha256-w7ziWfpaFU8KTJcCTJUsLghy4Q3cCL1Bi0TxrReiP7s=";
   };
 
   nativeBuildInputs = [

From 55bd4d4796ee798d2a8c3e913cf687e50a3baec8 Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-git@spacefrogg.net>
Date: Tue, 7 Jan 2025 17:05:16 +0100
Subject: [PATCH 009/101] libdeltachat: 1.152.2 -> 1.153.0

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

diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index 9c740ff6cd298..529e012275743 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "1.152.2";
+  version = "1.153.0";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-core-rust";
     tag = "v${version}";
-    hash = "sha256-NPdUHBge6k2BqWf6SxA35Tqo0xGjFIIU2t5dbdnbMGg=";
+    hash = "sha256-kRyDmbz17zHCDfIvxejEvNZTRRF0bHApa3jT5hs4htM=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "deltachat-core-rust";
     inherit version src;
-    hash = "sha256-AbFtGL63wl2fo4rbxq8Hx8VvEw64sawtLHS8jQ496Vw=";
+    hash = "sha256-hPfWyJbBFFlh+Cy1ZrzJ9mq1nhEVr+GGTneMkqYfAtk=";
   };
 
   nativeBuildInputs = [

From e12eb3ea24df94fe90bf1661d1f711fe6fe80202 Mon Sep 17 00:00:00 2001
From: Louis Thevenet <louis.tvnt@gmail.com>
Date: Sun, 22 Dec 2024 11:38:23 +0100
Subject: [PATCH 010/101] vault-tasks: 0.6.1 -> 0.8.0

---
 pkgs/by-name/va/vault-tasks/package.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/va/vault-tasks/package.nix b/pkgs/by-name/va/vault-tasks/package.nix
index eeefef797010e..c7f2e53309eef 100644
--- a/pkgs/by-name/va/vault-tasks/package.nix
+++ b/pkgs/by-name/va/vault-tasks/package.nix
@@ -2,20 +2,26 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
+  nix-update-script,
 }:
-rustPlatform.buildRustPackage rec {
+let
+  version = "0.8.0";
+in
+rustPlatform.buildRustPackage {
   pname = "vault-tasks";
-  version = "0.6.1";
+  inherit version;
   src = fetchFromGitHub {
     owner = "louis-thevenet";
     repo = "vault-tasks";
     rev = "v${version}";
-    hash = "sha256-H0cfzjOtVzOEoGmj3u80hj1QlK1QEgbl9vq4otlXKew=";
+    hash = "sha256-liU2zxBEOH5KMftru2PaIYZHLskm9WLNmUakn300/Xo=";
   };
-  cargoHash = "sha256-Iezin3TguweHd9RIyFvNL4IWUtXNJbQH2KXIgaXJHgk=";
+  cargoHash = "sha256-uKhgi3u7YSKLqG2ROCWs6+p206xghnsQ7nIZw5OtkY4=";
 
   postInstall = "install -Dm444 desktop/vault-tasks.desktop -t $out/share/applications";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "TUI Markdown Task Manager";
     longDescription = ''

From 8e1cf3648761af537f29c3147b331d1759b50de2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jan 2025 09:31:25 +0000
Subject: [PATCH 011/101] proto: 0.44.1 -> 0.44.4

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

diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix
index f753f0ead366d..2a67ab55c137b 100644
--- a/pkgs/by-name/pr/proto/package.nix
+++ b/pkgs/by-name/pr/proto/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "proto";
-  version = "0.44.1";
+  version = "0.44.4";
 
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = "proto";
     rev = "v${version}";
-    hash = "sha256-TVyKnxS7XDDXxZNuw6Gp9iEsyJmQCn8tAcnkc8kbCJg=";
+    hash = "sha256-K/mpwSzZuaNx3vbEJD0mYzFUylB6bUhYRhW81BcXin4=";
   };
 
-  cargoHash = "sha256-zYM4hEjcKo/ThbPcLjhmIBAPws8UKfEDnexycf5ke9o=";
+  cargoHash = "sha256-Zq8PTXc9mEFbswTUUiBmguuzIZVRN41aBiW37Jr7WWM=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk.frameworks.SystemConfiguration

From d97c13592774bfdb210d75e0bfa75819881dc66f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 8 Jan 2025 11:18:17 +0100
Subject: [PATCH 012/101] python313Packages.python-mimeparse: add legacy-cgi

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

diff --git a/pkgs/development/python-modules/python-mimeparse/default.nix b/pkgs/development/python-modules/python-mimeparse/default.nix
index 5291c12e53a1e..979bb67ce7c7b 100644
--- a/pkgs/development/python-modules/python-mimeparse/default.nix
+++ b/pkgs/development/python-modules/python-mimeparse/default.nix
@@ -2,7 +2,9 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  legacy-cgi,
   pytestCheckHook,
+  pythonAtLeast,
 }:
 
 buildPythonPackage rec {
@@ -15,6 +17,8 @@ buildPythonPackage rec {
     sha256 = "76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78";
   };
 
+  dependencies = lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   meta = with lib; {

From c6706b564471e3a589f7ddfc3da5205e605e3454 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 8 Jan 2025 11:22:55 +0100
Subject: [PATCH 013/101] python313Packages.python-mimeparse: 1.6.0 -> 2.0.0

Diff: https://github.com/falconry/python-mimeparse/compare/refs/tags/1.6.0...2.0.0

Changelog: https://github.com/falconry/python-mimeparse/releases/tag/2.0.0
---
 .../python-mimeparse/default.nix              | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/python-mimeparse/default.nix b/pkgs/development/python-modules/python-mimeparse/default.nix
index 979bb67ce7c7b..9a8ca2837a94a 100644
--- a/pkgs/development/python-modules/python-mimeparse/default.nix
+++ b/pkgs/development/python-modules/python-mimeparse/default.nix
@@ -1,29 +1,34 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  legacy-cgi,
+  fetchFromGitHub,
   pytestCheckHook,
-  pythonAtLeast,
+  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "python-mimeparse";
-  version = "1.6.0";
-  format = "setuptools";
+  version = "2.0.0";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78";
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "falconry";
+    repo = "python-mimeparse";
+    tag = version;
+    hash = "sha256-4LdfxVOioiyjeZjxCrvOELG+mJ4YOX4CUn+CXYWCtOo=";
   };
 
-  dependencies = lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+  build-system = [ setuptools ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   meta = with lib; {
     description = "Module provides basic functions for parsing mime-type names and matching them against a list of media-ranges";
     homepage = "https://github.com/dbtsai/python-mimeparse";
+    changelog = "https://github.com/falconry/python-mimeparse/releases/tag/${version}";
     license = licenses.mit;
     maintainers = [ ];
   };

From 3e14eaa7ec5e9b6d6c30c0403355a6dfcae6dcfd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jan 2025 12:31:54 +0000
Subject: [PATCH 014/101] bash_unit: 2.3.1 -> 2.3.2

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

diff --git a/pkgs/by-name/ba/bash_unit/package.nix b/pkgs/by-name/ba/bash_unit/package.nix
index f796eb03bf98a..6ab45612b442c 100644
--- a/pkgs/by-name/ba/bash_unit/package.nix
+++ b/pkgs/by-name/ba/bash_unit/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bash_unit";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "pgrange";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-kd5h12yjzvR/RBE/IjVXNSyjcf+rz6B2eoO8w2jiaps=";
+    sha256 = "sha256-n5ehN7NrWID72xP7EYOk/mpnQJaDn71esIugWrLbZr0=";
   };
 
   patchPhase = ''

From 095321be4b2f296e70af5af06a886e1d8c34d9a3 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 7 Jan 2025 17:43:50 +0200
Subject: [PATCH 015/101] courier-unicode: init at 2.3.1

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

diff --git a/pkgs/by-name/co/courier-unicode/package.nix b/pkgs/by-name/co/courier-unicode/package.nix
new file mode 100644
index 0000000000000..c9a8354d70c5b
--- /dev/null
+++ b/pkgs/by-name/co/courier-unicode/package.nix
@@ -0,0 +1,32 @@
+{
+  stdenv,
+  fetchurl,
+  lib,
+  perl,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "courier-unicode";
+  version = "2.3.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/courier/courier-unicode/${version}/courier-unicode-${version}.tar.bz2";
+    sha256 = "sha256-uD7mRqR8Kp1pL7bvuThWRmjDLsF51PrAwH6s6KG4/JE=";
+  };
+
+  nativeBuildInputs = [
+    perl
+  ];
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  meta = {
+    homepage = "http://www.courier-mta.org/unicode/";
+    description = "The Courier Unicode Library is used by most other Courier packages";
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+  };
+}

From 6f1400cbf7321ad612671be8afc1c74db16815ca Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 7 Jan 2025 17:44:55 +0200
Subject: [PATCH 016/101] maildrop: 2.6.0 -> 3.1.8

---
 .../ma/maildrop/maildrop.configure.hack.patch        |  6 +++---
 pkgs/by-name/ma/maildrop/package.nix                 | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch b/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch
index 08988f6cde507..69874b17bc3e9 100644
--- a/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch
+++ b/pkgs/by-name/ma/maildrop/maildrop.configure.hack.patch
@@ -1,6 +1,6 @@
---- a/maildrop/configure	2012-09-06 01:52:13.000000000 +0100
-+++ b/maildrop/configure	2013-01-04 03:00:57.095628327 +0000
-@@ -17562,8 +17562,8 @@
+--- a/libs/maildrop/configure	2012-09-06 01:52:13.000000000 +0100
++++ b/libs/maildrop/configure	2013-01-04 03:00:57.095628327 +0000
+@@ -19857,8 +19862,8 @@
  check_spooldir() {
    if test "$CHECKED_SPOOLDIR" != 1
    then
diff --git a/pkgs/by-name/ma/maildrop/package.nix b/pkgs/by-name/ma/maildrop/package.nix
index 6e891e434513a..3f222a427293b 100644
--- a/pkgs/by-name/ma/maildrop/package.nix
+++ b/pkgs/by-name/ma/maildrop/package.nix
@@ -3,22 +3,26 @@
   lib,
   stdenv,
   pkg-config,
-  pcre,
+  courier-unicode,
+  pcre2,
+  libidn2,
   perl,
 }:
 
 stdenv.mkDerivation rec {
   pname = "maildrop";
-  version = "2.6.0";
+  version = "3.1.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/courier/maildrop/${version}/maildrop-${version}.tar.bz2";
-    sha256 = "1a94p2b41iy334cwfwmzi19557dn5j61abh0cp2rfc9dkc8ibhdg";
+    sha256 = "sha256-foJsAxkXRE8berccH82QODWVZEhG4rOyYONSsc4D6VA=";
   };
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
-    pcre
+    courier-unicode
+    libidn2
+    pcre2
     perl
   ];
 

From 40a6c466fcb8eec9a95b523557176d61127735b8 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 6 Jan 2025 01:47:09 +0000
Subject: [PATCH 017/101] testers.testBuildFailure: fix structuredAttrs support

Fixes `testers.testBuildFailure` compatibility with `__structuredAttrs`.

The two main issues are, when `structuredAttrs` is enabled:
- `$__structuredAttrs` is not set
- `$outputs` is not set

`$__structuredAttrs` not being set is fixed by checking for
`$NIX_ATTRS_SH_FILE`, as per pkgs/stdenv/generic/setup.sh

`$outputs` not being set is fixed by sourcing `$NIX_ATTRS_SH_FILE`,
as-per pkgs/stdenv/generic/default-builder.sh
---
 pkgs/build-support/testers/default.nix       |  7 +++-
 pkgs/build-support/testers/expect-failure.sh | 34 ++++++++++++--------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix
index 92b248882e6f6..fbe37c3b86788 100644
--- a/pkgs/build-support/testers/default.nix
+++ b/pkgs/build-support/testers/default.nix
@@ -24,7 +24,12 @@
   testBuildFailure = drv: drv.overrideAttrs (orig: {
     builder = buildPackages.bash;
     args = [
-      (replaceVars ./expect-failure.sh { coreutils = buildPackages.coreutils; })
+      (replaceVars ./expect-failure.sh {
+        coreutils = buildPackages.coreutils;
+        vars = lib.toShellVars {
+          outputNames = (orig.outputs or [ "out" ]);
+        };
+      })
       orig.realBuilder or stdenv.shell
     ] ++ orig.args or ["-e" (orig.builder or ../../stdenv/generic/default-builder.sh)];
   });
diff --git a/pkgs/build-support/testers/expect-failure.sh b/pkgs/build-support/testers/expect-failure.sh
index 9c725d48bf342..e8eb612b0d8b2 100644
--- a/pkgs/build-support/testers/expect-failure.sh
+++ b/pkgs/build-support/testers/expect-failure.sh
@@ -34,19 +34,28 @@ echo "testBuildFailure: Original builder produced exit code: $r"
 
 # -----------------------------------------
 # Write the build log to the default output
+
+# Source structured attrs as per nixpkgs/pkgs/stdenv/generic/default-builder.sh
+#
+# We need this so that we can read $outputs when `__structuredAttrs` is enabled
 #
-# # from stdenv setup.sh
-getAllOutputNames() {
-    if [ -n "$__structuredAttrs" ]; then
-        echo "${!outputs[*]}"
-    else
-        echo "$outputs"
-    fi
-}
+# NOTE: This MUST be done after the original builder has finished!
+#       Otherwise we could pollute its environment.
+if [ -e "${NIX_ATTRS_SH_FILE:-}" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
 
-outs=( $(getAllOutputNames) )
-defOut=${outs[0]}
-defOutPath=${!defOut}
+# Variables injected by replaceVars
+#
+# `$outputs` is unordered when `__structuredAttrs` is enabled,
+# so we use `replaceVars` to pass in an ordered `$outputNames` array
+@vars@
+
+declare -a outputPaths
+for name in "${outputNames[@]}"; do
+    # Either dereference $name, or access $outputs[] associative array
+    outputPath=${!name:-${outputs[$name]}}
+    outputPaths+=( "$outputPath" )
+done
+defOutPath=${outputPaths[0]}
 
 if [[ ! -d $defOutPath ]]; then
   if [[ -e $defOutPath ]]; then
@@ -63,8 +72,7 @@ echo $r >$defOutPath/testBuildFailure.exit
 # ------------------------------------------------------
 # Put empty directories in place for any missing outputs
 
-for outputName in ${outputs:-out}; do
-  outputPath="${!outputName}"
+for outputPath in "${outputPaths[@]}"; do
   if [[ ! -e "${outputPath}" ]]; then
     @coreutils@/bin/mkdir "${outputPath}";
   fi

From fea17445f048d04ae79df49aa4787b4a749e446b Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Wed, 8 Jan 2025 18:09:28 +0000
Subject: [PATCH 018/101] tests.testers.testBuildFailure: assert hooks have no
 side-effects

If `$stdenv/setup` is sourced by `expect-failure.sh`, then the original
builder's hooks could be re-run, potentially leading to unintended
side-effects.
---
 pkgs/build-support/testers/test/default.nix | 36 +++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix
index a198cc6774ec6..2a7c6a1d6b419 100644
--- a/pkgs/build-support/testers/test/default.nix
+++ b/pkgs/build-support/testers/test/default.nix
@@ -6,6 +6,7 @@
   runCommand,
   emptyFile,
   emptyDirectory,
+  stdenvNoCC,
   ...
 }:
 let
@@ -167,6 +168,41 @@ lib.recurseIntoAttrs {
           echo 'All good.'
           touch $out
         '';
+
+    sideEffects =
+      runCommand "testBuildFailure-sideEffects"
+        {
+          failed = testers.testBuildFailure (
+            stdenvNoCC.mkDerivation {
+              name = "fail-with-side-effects";
+              src = emptyDirectory;
+
+              postHook = ''
+                echo touching side-effect...
+                # Assert that the side-effect doesn't exist yet...
+                # We're checking that this hook isn't run by expect-failure.sh
+                if [[ -e side-effect ]]; then
+                  echo "side-effect already exists"
+                  exit 1
+                fi
+                touch side-effect
+              '';
+
+              buildPhase = ''
+                echo i am failing
+                exit 1
+              '';
+            }
+          );
+        }
+        ''
+          grep -F 'touching side-effect...' $failed/testBuildFailure.log >/dev/null
+          grep -F 'i am failing' $failed/testBuildFailure.log >/dev/null
+          [[ 1 = $(cat $failed/testBuildFailure.exit) ]]
+          [[ ! -e side-effect ]]
+
+          touch $out
+        '';
   };
 
   testEqualContents = lib.recurseIntoAttrs {

From 68be5bbbde1f79543d0d4d3a8128b673b07865c3 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 6 Jan 2025 21:29:50 +0000
Subject: [PATCH 019/101] tests.testers.testBuildFailure: test with
 `structuredAttrs`

---
 pkgs/build-support/testers/test/default.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix
index 2a7c6a1d6b419..b0f2b4c1d391a 100644
--- a/pkgs/build-support/testers/test/default.nix
+++ b/pkgs/build-support/testers/test/default.nix
@@ -22,6 +22,15 @@ let
     label = "test";
   };
 
+  overrideStructuredAttrs =
+    enable: drv:
+    drv.overrideAttrs (old: {
+      failed = old.failed.overrideAttrs (oldFailed: {
+        name = oldFailed.name + "${lib.optionalString (!enable) "-no"}-structuredAttrs";
+        __structuredAttrs = enable;
+      });
+    });
+
 in
 lib.recurseIntoAttrs {
   lycheeLinkCheck = lib.recurseIntoAttrs pkgs.lychee.tests;
@@ -93,7 +102,7 @@ lib.recurseIntoAttrs {
     }
   );
 
-  testBuildFailure = lib.recurseIntoAttrs {
+  testBuildFailure = lib.recurseIntoAttrs rec {
     happy =
       runCommand "testBuildFailure-happy"
         {
@@ -123,6 +132,8 @@ lib.recurseIntoAttrs {
           touch $out
         '';
 
+    happyStructuredAttrs = overrideStructuredAttrs true happy;
+
     helloDoesNotFail =
       runCommand "testBuildFailure-helloDoesNotFail"
         {
@@ -169,6 +180,8 @@ lib.recurseIntoAttrs {
           touch $out
         '';
 
+    multiOutputStructuredAttrs = overrideStructuredAttrs true multiOutput;
+
     sideEffects =
       runCommand "testBuildFailure-sideEffects"
         {
@@ -203,6 +216,8 @@ lib.recurseIntoAttrs {
 
           touch $out
         '';
+
+    sideEffectStructuredAttrs = overrideStructuredAttrs true sideEffects;
   };
 
   testEqualContents = lib.recurseIntoAttrs {

From e652e9c696a02a2e86116c6703122faeea8ac7cd Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Mon, 6 Jan 2025 03:44:13 +0000
Subject: [PATCH 020/101] neovim.tests: enable `failing_check`

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

diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix
index 8f14fd8556ffe..431e4fbb0762b 100644
--- a/pkgs/applications/editors/neovim/tests/default.nix
+++ b/pkgs/applications/editors/neovim/tests/default.nix
@@ -13,6 +13,7 @@ Here are some common neovim flags used in the tests:
 , neovim-unwrapped
 , fetchFromGitLab
 , runCommandLocal
+, testers
 , pkgs
 }:
 let
@@ -107,8 +108,7 @@ in
 
   inherit nmt;
 
-  # Disabled because of https://github.com/NixOS/nixpkgs/pull/352727
-  # failed_check = pkgs.testers.testBuildFailure nvim-run-failing-check;
+  failed_check = testers.testBuildFailure nvim-run-failing-check;
 
   vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; };
 

From 93b32b9502bdc1701e377553f0a58eb932658d81 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 8 Jan 2025 20:26:41 +0100
Subject: [PATCH 021/101] vvenc: updateScript ignore rc

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

diff --git a/pkgs/by-name/vv/vvenc/package.nix b/pkgs/by-name/vv/vvenc/package.nix
index 8419b215b8320..4b542713d61b9 100644
--- a/pkgs/by-name/vv/vvenc/package.nix
+++ b/pkgs/by-name/vv/vvenc/package.nix
@@ -39,7 +39,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   passthru = {
-    updateScript = gitUpdater { rev-prefix = "v"; };
+    updateScript = gitUpdater {
+      rev-prefix = "v";
+      ignoredVersions = "rc";
+    };
     tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
   };
 

From 9507cc97a0b4038b02568c49703a4126b8c65925 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 8 Jan 2025 19:27:20 +0000
Subject: [PATCH 022/101] vvenc: 1.12.1 -> 1.13.0

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

diff --git a/pkgs/by-name/vv/vvenc/package.nix b/pkgs/by-name/vv/vvenc/package.nix
index 4b542713d61b9..51bcd961d412e 100644
--- a/pkgs/by-name/vv/vvenc/package.nix
+++ b/pkgs/by-name/vv/vvenc/package.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vvenc";
-  version = "1.12.1";
+  version = "1.13.0";
 
   outputs = [
     "out"
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "fraunhoferhhi";
     repo = "vvenc";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Et/JmF/2hh6A1EsOzvgzruMN47rd5cPgRke3uPvz298=";
+    hash = "sha256-9fWKunafTniBsY9hK09+xYwvB7IgGPhZmgqauPHgB/g=";
   };
 
   env.NIX_CFLAGS_COMPILE = toString (

From 14a1e95ef6390d6079bdb26296c0b6a4830dcc41 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Sun, 5 Jan 2025 16:08:59 +0100
Subject: [PATCH 023/101] doc/rl-2505: mention nvidia package change

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

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 07c56a9b6ee04..bc71f6c4abb09 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -132,6 +132,8 @@
   +services.asusd.asusdConfig.text = '''file contents'''
   ```
 
+- `linuxPackages.nvidiaPackages.stable` now defaults to the `production` variant instead of `latest`.
+
 - `timescaledb` requires manual upgrade steps.
     After you run ALTER EXTENSION, you must run [this SQL script](https://github.com/timescale/timescaledb-extras/blob/master/utils/2.15.X-fix_hypertable_foreign_keys.sql). For more details, see the following pull requests [#6797](https://github.com/timescale/timescaledb/pull/6797).
     PostgreSQL 13 is no longer supported in TimescaleDB v2.16.

From 4dbb65b7587568a9f30dd48160fbbb1586869482 Mon Sep 17 00:00:00 2001
From: Konrad Malik <konrad.malik@gmail.com>
Date: Tue, 31 Dec 2024 12:41:49 +0100
Subject: [PATCH 024/101] usage: 0.3.1 -> 1.7.4

Fixes ./examples/mounted.sh test
---
 pkgs/by-name/us/usage/package.nix | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/us/usage/package.nix b/pkgs/by-name/us/usage/package.nix
index 96406b3636028..20d925f9c6eb6 100644
--- a/pkgs/by-name/us/usage/package.nix
+++ b/pkgs/by-name/us/usage/package.nix
@@ -2,23 +2,39 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  stdenv,
+  installShellFiles,
   nix-update-script,
   usage,
   testers,
 }:
 
 rustPlatform.buildRustPackage rec {
-  pname = "jdx";
-  version = "0.3.1";
+  pname = "usage";
+  version = "1.7.4";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "usage";
     rev = "v${version}";
-    hash = "sha256-9zQ+gkBVhzjqSIieGjxoD9vc7999lfRQ7awkvlEkseE=";
+    hash = "sha256-+Wt/ZOwj9LHgt0EOFF554TGf2tZyuRoXAPpCebPZfNY=";
   };
 
-  cargoHash = "sha256-4ebjD1Tf7F2YyNrF7eEi2yKonctprnyu4nMf+vE2whY=";
+  cargoHash = "sha256-w8GWvMjC6Plho+zw542Q00hU/KZMdyyoP/rGAg72h1s=";
+
+  postPatch = ''
+    substituteInPlace ./examples/mounted.sh \
+      --replace-fail '/usr/bin/env -S usage' "$(pwd)/target/${stdenv.targetPlatform.rust.rustcTargetSpec}/release/usage"
+  '';
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installShellCompletion --cmd usage \
+      --bash <($out/bin/usage --completions bash) \
+      --fish <($out/bin/usage --completions fish) \
+      --zsh <($out/bin/usage --completions zsh)
+  '';
 
   passthru = {
     updateScript = nix-update-script { };

From 1e4221b0e27e8b468173d837ee3f30fffa981b79 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 8 Jan 2025 12:32:19 +0100
Subject: [PATCH 025/101] nixos/sway: warn on too old Nvidia

---
 nixos/modules/programs/wayland/sway.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix
index 74fc216569e56..6f2bb5c2fba02 100644
--- a/nixos/modules/programs/wayland/sway.nix
+++ b/nixos/modules/programs/wayland/sway.nix
@@ -113,6 +113,19 @@ in
         }
       ];
 
+      warnings =
+          lib.mkIf
+            (
+              (lib.elem "nvidia" config.services.xserver.videoDrivers)
+              && !config.hardware.nvidia.open
+              && (lib.versionOlder "551" (
+                lib.versions.major (lib.getVersion config.hardware.nvidia.package)
+              ))
+            )
+            [
+              "Using Sway with Nvidia driver version <= 550 may result in a broken system. Configure hardware.nvidia.package to use a newer version."
+            ];
+
       environment = {
         systemPackages = lib.optional (cfg.package != null) cfg.package ++ cfg.extraPackages;
 

From 19174b417938917a81f48df8f7348f5d54a7a231 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jan 2025 15:29:00 +0000
Subject: [PATCH 026/101] testkube: 2.1.83 -> 2.1.84

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

diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix
index d4ae19720cdb3..d23c403e49774 100644
--- a/pkgs/by-name/te/testkube/package.nix
+++ b/pkgs/by-name/te/testkube/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
   pname = "testkube";
-  version = "2.1.83";
+  version = "2.1.84";
 
   src = fetchFromGitHub {
     owner = "kubeshop";
     repo = "testkube";
     rev = "v${version}";
-    hash = "sha256-JC31BsCqctpl2hx0RYkrUY5nrQdN22V6OzAfGK45SDc=";
+    hash = "sha256-1w+n/CXFWVLROSlI/bo5g9MMb1UNsqFDz8mL+5Xxg/s=";
   };
 
   vendorHash = "sha256-GCXbp8cJUji7vAEVpTP9T/mRIwfu5+TqEKtoOQWlxrY=";

From e4bba63bfa9611b66974308ce21b5c0102159582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 9 Jan 2025 18:15:52 +0100
Subject: [PATCH 027/101] papermc: fix build failure by updating to new api url

---
 pkgs/games/papermc/derivation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/papermc/derivation.nix b/pkgs/games/papermc/derivation.nix
index 90041b5642f27..125052abc7542 100644
--- a/pkgs/games/papermc/derivation.nix
+++ b/pkgs/games/papermc/derivation.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       buildNum = builtins.elemAt version-split 1;
     in
     fetchurl {
-      url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar";
+      url = "https://api.papermc.io/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar";
       inherit (finalAttrs) hash;
     };
 

From 1410b3755127a648b0eac95722703c7ab3a3af14 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jan 2025 17:27:56 +0000
Subject: [PATCH 028/101] terraform-providers.newrelic: 3.53.0 -> 3.54.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 d3ad8efd000d9..d35131241f559 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -858,13 +858,13 @@
     "vendorHash": null
   },
   "newrelic": {
-    "hash": "sha256-xHBr+6rI0G6Fv7HXTrdvtDc+Ij53IfPAb7bvXgyTaH0=",
+    "hash": "sha256-kyfNlLVzrNMLKGCahpbzeyqvFYPug6RyPPxCnxwP/W4=",
     "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
     "owner": "newrelic",
     "repo": "terraform-provider-newrelic",
-    "rev": "v3.53.0",
+    "rev": "v3.54.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-UsekZjrioy2F/OvfrvXMVYlZO3I2NU4B+BOZHwP5YSk="
+    "vendorHash": "sha256-hxDLJrv7a8JZ6etYS7u+kiIcudJJeB47PKQTE3NzCvI="
   },
   "nomad": {
     "hash": "sha256-k61iQ9FQG3nscBp5CE/fFCbHpeLawbUAtGPM+IZtfVc=",

From bfe191ca75c559b4dac32149db25ec5f9e63c4b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jan 2025 17:39:46 +0000
Subject: [PATCH 029/101] tanka: 0.31.0 -> 0.31.1

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

diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix
index 66db433fcfd89..79f2acbc612e1 100644
--- a/pkgs/by-name/ta/tanka/package.nix
+++ b/pkgs/by-name/ta/tanka/package.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "tanka";
-  version = "0.31.0";
+  version = "0.31.1";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-h7oIL9MWah5kEBj0N6Ro53P0T9fF0B8qdfv1031vLN8=";
+    sha256 = "sha256-q/tIG+RS/guRcKLo1iXmXi8IcgXS2pfJNFEvn/jxFks=";
   };
 
   vendorHash = "sha256-/8tPq/piCrguFoRigzGoAUSBJ2C1AY0ghyHosPE5n68=";

From 3b1f39b7d1bc111784168abdf320ec140b0f141a Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 8 Jan 2025 12:32:19 +0100
Subject: [PATCH 030/101] python312Packages.immutabledict: disable flaky test

---
 pkgs/development/python-modules/immutabledict/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix
index d341e26d1e3d8..0f8426de29ba1 100644
--- a/pkgs/development/python-modules/immutabledict/default.nix
+++ b/pkgs/development/python-modules/immutabledict/default.nix
@@ -27,6 +27,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  disabledTests = [
+    # fails if builder load is highly variable
+    "test_performance"
+  ];
+
   meta = with lib; {
     description = "Fork of frozendict, an immutable wrapper around dictionaries";
     homepage = "https://github.com/corenting/immutabledict";

From eae1a64297b815bf8bcb2a236d06e6c8d2b2155b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jan 2025 17:56:07 +0000
Subject: [PATCH 031/101] steampipePackages.steampipe-plugin-aws: 1.4.0 ->
 1.5.0

---
 .../steampipe-packages/steampipe-plugin-aws/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
index 52db405630149..a5df42a1b5b81 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "steampipe-plugin-aws";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe-plugin-aws";
     tag = "v${version}";
-    hash = "sha256-KJsZZLjZj+p18HRXY+rQ9ooonxxTavmXi1ISA4mR26s=";
+    hash = "sha256-HJi5GhtUKhfV27Ic94iIYEe/ZeyL6CeduhWi/cSXOmA=";
   };
 
-  vendorHash = "sha256-RM/bsoQTbOj/NKr16GsCQWCxV0f7pYYf2aYcWGghGEQ=";
+  vendorHash = "sha256-76mIpOWpW4NgyKDzeVd7LkmiRhcikMvFaqt8qvh16+U=";
 
   ldflags = [
     "-s"

From c7aed5c6bd007120a218775e0b712c4f38ccd23a Mon Sep 17 00:00:00 2001
From: 9R <git@9-r.net>
Date: Thu, 9 Jan 2025 18:18:13 +0100
Subject: [PATCH 032/101] python3.pkgs.liquidctl: 1.13.0 -> 1.14.0

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

diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix
index bee0580e27e8a..bb0a263ecdc6a 100644
--- a/pkgs/development/python-modules/liquidctl/default.nix
+++ b/pkgs/development/python-modules/liquidctl/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "liquidctl";
-  version = "1.13.0";
+  version = "1.14.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -30,17 +30,9 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-LU8rQmXrEIoOBTTFotGvMeHqksYGrtNo2YSl2l2e/UI=";
+    hash = "sha256-HkMxYULeWcAYdlEI4N4qv7AGh/+xY0zuvV2mFPStPq8=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "tests-pillow-10.2.0-compat.patch";
-      url = "https://github.com/liquidctl/liquidctl/commit/c50afa4e610bd2e268e85c347e2644794c817a78.diff";
-      hash = "sha256-1cKk3drl3RybHmnPXdlJoeYK6UDz25jHSS2YS/XLHIY=";
-    })
-  ];
-
   nativeBuildInputs = [
     installShellFiles
     setuptools

From 21b4714acae2b9ed424683e8efda25a8ce67b05d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jan 2025 18:39:11 +0000
Subject: [PATCH 033/101] dayon: 15.0.0 -> 15.0.1

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

diff --git a/pkgs/by-name/da/dayon/package.nix b/pkgs/by-name/da/dayon/package.nix
index 722bc175d3df2..11a171c2bb08b 100644
--- a/pkgs/by-name/da/dayon/package.nix
+++ b/pkgs/by-name/da/dayon/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dayon";
-  version = "15.0.0";
+  version = "15.0.1";
 
   src = fetchFromGitHub {
     owner = "RetGal";
     repo = "dayon";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Tnw1Tr+iRxvHFzSICwOcf4mErNx+imD7/WxVspiR7yo=";
+    hash = "sha256-3/A8aAWnaPg0sgzWJKU4Ys/R3nXYQj8aFuEVMgzauqQ=";
   };
 
   nativeBuildInputs = [

From 7e3b7d547128cbdb8ae649bfc118c3c16593c827 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jan 2025 19:02:08 +0000
Subject: [PATCH 034/101] jan: 0.5.12 -> 0.5.13

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

diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix
index e7c8416b9924a..a29891f11a107 100644
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -5,10 +5,10 @@
 
 let
   pname = "jan";
-  version = "0.5.12";
+  version = "0.5.13";
   src = fetchurl {
     url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage";
-    hash = "sha256-tIylP5VOt53wK/KfgsK6HiMX0YhuiJMDLn0L9XY6aJQ=";
+    hash = "sha256-QetnD+0SCzn5Zx5v1EJNjhx8U9ueHdp+zZu/Yf77AdY=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };

From 62b3428c72828f5b008770387aae79afecb60982 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jan 2025 20:06:55 +0000
Subject: [PATCH 035/101] cargo-binstall: 1.10.18 -> 1.10.19

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

diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix
index 2579e8e9137c7..ac353879f7ec2 100644
--- a/pkgs/by-name/ca/cargo-binstall/package.nix
+++ b/pkgs/by-name/ca/cargo-binstall/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-binstall";
-  version = "1.10.18";
+  version = "1.10.19";
 
   src = fetchFromGitHub {
     owner = "cargo-bins";
     repo = "cargo-binstall";
     rev = "v${version}";
-    hash = "sha256-EFDaKxAUDgMwkURKcupL2s9TS/oSYviqA38qa8Jo1Ek=";
+    hash = "sha256-dKQRXEZfvONaWocvoaEQtENAyNvIUaqomckaSj7bUtM=";
   };
 
-  cargoHash = "sha256-td47+/LYCJy9ED/2VJDE9P9bXcr+SEgRY1N4LAi2C7s=";
+  cargoHash = "sha256-gN6aNPV6K8BUTUvTTKtTu54JFLwL1XSA0rA4EyKdovc=";
 
   nativeBuildInputs = [
     pkg-config

From a3f44971629638a648f1ba9d29c876f5c80babe2 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 9 Jan 2025 10:27:02 -0800
Subject: [PATCH 036/101] rose-pine-gtk-theme: unstable-2022-09-01 -> 2.2.0

rose-pine-gtk-theme: forgot to update hash

rose-pine-gtk-theme: oops rev not tag, hash no sha256
---
 pkgs/by-name/ro/rose-pine-gtk-theme/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/rose-pine-gtk-theme/package.nix b/pkgs/by-name/ro/rose-pine-gtk-theme/package.nix
index 9a92d5f769ec5..bdc2a459b3c2a 100644
--- a/pkgs/by-name/ro/rose-pine-gtk-theme/package.nix
+++ b/pkgs/by-name/ro/rose-pine-gtk-theme/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "rose-pine-gtk-theme";
-  version = "unstable-2022-09-01";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "rose-pine";
     repo = "gtk";
-    rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304";
-    sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67";
+    tag = "v${version}";
+    hash = "sha256-vCWs+TOVURl18EdbJr5QAHfB+JX9lYJ3TPO6IklKeFE=";
   };
 
   buildInputs = [

From dc6a3ca8b480af82ec970ae46a23af467e32b31d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jan 2025 20:28:16 +0000
Subject: [PATCH 037/101] gallery-dl: 1.28.2 -> 1.28.3

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

diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix
index ac029bee4a84f..02e14e963a178 100644
--- a/pkgs/by-name/ga/gallery-dl/package.nix
+++ b/pkgs/by-name/ga/gallery-dl/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gallery-dl";
-  version = "1.28.2";
+  version = "1.28.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mikf";
     repo = "gallery-dl";
     rev = "v${version}";
-    hash = "sha256-AVycp24wGhit9JVE0b+didc2GRnB+EQNnJ3y9a5dMQw=";
+    hash = "sha256-OV+4BJmJNvkNmDsogI9V7SLmnc5HJkZd5xqsFoZCHEk=";
   };
 
   build-system = [ python3Packages.setuptools ];

From feca9c4a10f860480947dec3cbe46e8c252b51fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jan 2025 20:41:52 +0000
Subject: [PATCH 038/101] kubernetes-helmPlugins.helm-unittest: 0.7.0 -> 0.7.1

---
 .../networking/cluster/helm/plugins/helm-unittest.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
index 2bdd10248afd5..7d06c2a6f6d67 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "helm-unittest";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Ma/UcG+DkUR2FqRKFGMjPxMXDrbcbytZVi59zaK1W0k=";
+    hash = "sha256-TZ2qY0aJHIJq9gd522NJyNkUDYQuICyTsUnQBf34Pq0=";
   };
 
-  vendorHash = "sha256-7LI08qFcNRyZEZXVWpu2PR2PwpRlcTLIcE05Y5YgABg=";
+  vendorHash = "sha256-kMQIXN7Qu39MUFUHtLl1vnNv2qOUUcDhGes1MJ2Nh64=";
 
   # NOTE: Remove the install and upgrade hooks.
   postPatch = ''

From 477ebad6a424ad563874105a3a02cb05921d8c57 Mon Sep 17 00:00:00 2001
From: merrkry <merrkry@tsubasa.moe>
Date: Thu, 9 Jan 2025 21:53:50 +0100
Subject: [PATCH 039/101] tsukimi: 0.18.1 -> 0.18.2

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

diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix
index 5934eb4d7b620..a11e25d0544fa 100644
--- a/pkgs/by-name/ts/tsukimi/package.nix
+++ b/pkgs/by-name/ts/tsukimi/package.nix
@@ -15,18 +15,18 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "tsukimi";
-  version = "0.18.1";
+  version = "0.18.2";
 
   src = fetchFromGitHub {
     owner = "tsukinaha";
     repo = "tsukimi";
     tag = "v${version}";
-    hash = "sha256-S4+mhFgBNSl2h8dk0izNyCw9//u3CaLGd/shCSWmN3M=";
+    hash = "sha256-5c/Rfiz9CkBasfWTCviC3HnWKkMVOEWoaMvsZyQN/iw=";
     fetchSubmodules = true;
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-zVzDpZRni/0AyGE5ahBH7hm8Ovyt+Fn6x1NOHkyI0v8=";
+  cargoHash = "sha256-KvyF10kP/zRpgNdy+lLkgUgqiu075QvezYklMbkVvxQ=";
 
   nativeBuildInputs = [
     pkg-config

From 0dd4ef7bd9573d821ca30ac834c9e391f983c401 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jan 2025 22:33:35 +0000
Subject: [PATCH 040/101] python312Packages.pixel-font-knife: 0.0.10 -> 0.0.11

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

diff --git a/pkgs/development/python-modules/pixel-font-knife/default.nix b/pkgs/development/python-modules/pixel-font-knife/default.nix
index e5cd443ff59b2..c8ca0cbd2c073 100644
--- a/pkgs/development/python-modules/pixel-font-knife/default.nix
+++ b/pkgs/development/python-modules/pixel-font-knife/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pixel-font-knife";
-  version = "0.0.10";
+  version = "0.0.11";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pixel_font_knife";
     inherit version;
-    hash = "sha256-kgr9j/i8Z7U4KvjQMoZp5JaWMlSYwuhaFMmvEktNw8w=";
+    hash = "sha256-tm5cAaeUBL9vbdvq73N2HCytlwYe0Q2Tovo+6XU59GQ=";
   };
 
   build-system = [ hatchling ];

From e33bc55df8a69db2a9332a69ade4592a39b4112c Mon Sep 17 00:00:00 2001
From: aftix <aftix@aftix.xyz>
Date: Thu, 9 Jan 2025 17:24:27 -0600
Subject: [PATCH 041/101] nushellPlugins.dbus: 0.13.0 -> 0.14.0

Diff: https://github.com/devyn/nu_plugin_dbus/compare/0.13.0...0.14.0
---
 pkgs/shells/nushell/plugins/dbus.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/dbus.nix b/pkgs/shells/nushell/plugins/dbus.nix
index c86cebf2377c4..91b2633315396 100644
--- a/pkgs/shells/nushell/plugins/dbus.nix
+++ b/pkgs/shells/nushell/plugins/dbus.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nu_plugin_dbus";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "devyn";
     repo = pname;
     rev = version;
-    hash = "sha256-w+0H0A+wQa4BUzKx9G2isn29IicoZsLlWCDnC3YSzek=";
+    hash = "sha256-Ga+1zFwS/v+3iKVEz7TFmJjyBW/gq6leHeyH2vjawto=";
   };
 
-  cargoHash = "sha256-NuWwPfAo3qYer4eUNDQ+VR9R+uLp5WAT2mhnr/zayEI=";
+  cargoHash = "sha256-2QbsgxY82Vq7Op5kc45ejK/H14iDNpSqVWVAVaMObFY=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs = [ dbus ];

From eb6556bdbebb4a6d07b827edf277e536119c61cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 00:38:44 +0000
Subject: [PATCH 042/101] clapboard: 0.1.1 -> 1.0.0

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

diff --git a/pkgs/by-name/cl/clapboard/package.nix b/pkgs/by-name/cl/clapboard/package.nix
index 022e17029826d..7b8948a6bdc89 100644
--- a/pkgs/by-name/cl/clapboard/package.nix
+++ b/pkgs/by-name/cl/clapboard/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "clapboard";
-  version = "0.1.1";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "bjesus";
     repo = "clapboard";
     rev = "v${version}";
-    hash = "sha256-/4HBhsW2C3xYzKVw9TuSj8b7LdirWbNg4OxLm/ebf40=";
+    hash = "sha256-dXlUOIYgptYqUIIC7batc0TVQeP89i8vizwYSIUlzGA=";
   };
 
-  cargoHash = "sha256-bq+r2J2lhhZKTEV69OnsXiAGKspOZ0kF0q2hDnbIXn8=";
+  cargoHash = "sha256-Ll2fpH0v3ZWizrl6Mip0gaPCHlQAdddh9F9bNXveb/0=";
 
   meta = with lib; {
     description = "Wayland clipboard manager that will make you clap";

From c5db5d6b01c593017fcdec455f78ffc24d499642 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 00:50:28 +0000
Subject: [PATCH 043/101] rtrtr: 0.3.0 -> 0.3.1

---
 pkgs/servers/rtrtr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/rtrtr/default.nix b/pkgs/servers/rtrtr/default.nix
index 2926438523ffc..d78f5b56db589 100644
--- a/pkgs/servers/rtrtr/default.nix
+++ b/pkgs/servers/rtrtr/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rtrtr";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-P9bofTmDpnNCVQAGeq9J2XqfNeula8nL1KoBIHMZNWg=";
+    hash = "sha256-c1jzUP7cYjqn49gbjXLWTge8ywHBI29gSnhzWDzNCV8=";
   };
 
-  cargoHash = "sha256-ToJLE4nqgTqg5D4Qh2zi+wjmcdwDo0aupoDwKJCTwnM=";
+  cargoHash = "sha256-2/pm/Tfn6UxFpHW6HW20yOxEtm6N3jOe8kk9k7OPppU=";
 
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
   nativeBuildInputs = [ pkg-config ];

From 9e3215b2b46b2f5d95a30d497892e658d29de039 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 00:52:55 +0000
Subject: [PATCH 044/101] prometheus-pushgateway: 1.10.0 -> 1.11.0

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

diff --git a/pkgs/by-name/pr/prometheus-pushgateway/package.nix b/pkgs/by-name/pr/prometheus-pushgateway/package.nix
index 08210d806f133..5d71ec9da6f50 100644
--- a/pkgs/by-name/pr/prometheus-pushgateway/package.nix
+++ b/pkgs/by-name/pr/prometheus-pushgateway/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "pushgateway";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "pushgateway";
     rev = "v${version}";
-    sha256 = "sha256-Avp5hWRdkM/vCz6B/b7uOrnYjFrN5UkE7siK0+ANO1Q=";
+    sha256 = "sha256-VIqk5GxI5qFnsjeq6FL1UUd7lX3VLLhTcPlo4j8oL/c=";
   };
 
-  vendorHash = "sha256-cyZ/LzKB3UlyqzID9f6I4niwJ/sPIm2htVOn3Ik2HAY=";
+  vendorHash = "sha256-PXJkjRg699tu/WPrFkekmAbGwPPHoUXaiYfxuju9Dwk=";
 
   ldflags = [
     "-s"

From b205f325b5dca763ec7982925227649609e36840 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 01:12:57 +0000
Subject: [PATCH 045/101] julia-mono: 0.058 -> 0.059

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

diff --git a/pkgs/by-name/ju/julia-mono/package.nix b/pkgs/by-name/ju/julia-mono/package.nix
index c465e2a48ea4f..36a92c0527b74 100644
--- a/pkgs/by-name/ju/julia-mono/package.nix
+++ b/pkgs/by-name/ju/julia-mono/package.nix
@@ -6,12 +6,12 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "JuliaMono-ttf";
-  version = "0.058";
+  version = "0.059";
 
   src = fetchzip {
     url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz";
     stripRoot = false;
-    hash = "sha256-QKMTU6ISP983Kg4ZxyPV4IgiuO0ZXMiOtvZPwP7dF7k=";
+    hash = "sha256-b0h88rpylvMaRh9U/8oOhr4yOftzf7OvdwhpCuIeUjE=";
   };
 
   installPhase = ''

From c980787b6171ca45f0483cf967c7982b42d6b6e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 01:57:27 +0000
Subject: [PATCH 046/101] geesefs: 0.42.3 -> 0.42.4

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

diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix
index 3ca92cd8be1f6..71d303d947196 100644
--- a/pkgs/by-name/ge/geesefs/package.nix
+++ b/pkgs/by-name/ge/geesefs/package.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "0.42.3";
+  version = "0.42.4";
 in
 buildGoModule {
   pname = "geesefs";
@@ -15,7 +15,7 @@ buildGoModule {
     owner = "yandex-cloud";
     repo = "geesefs";
     rev = "v${version}";
-    hash = "sha256-keF6KrkHI5sIm5XCIpWAvKD1qu5XvWx3uR70eKhOZk8=";
+    hash = "sha256-INCsDMFhVRkNSPkhVPJkLP+8zBinYcj8S6C0rYO1h6M=";
   };
 
   # hashes differ per architecture otherwise.

From f24aefdde919b9fd6eac23c09e6fe74bdbe1501d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 03:14:27 +0000
Subject: [PATCH 047/101] topicctl: 1.18.0 -> 1.19.1

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

diff --git a/pkgs/by-name/to/topicctl/package.nix b/pkgs/by-name/to/topicctl/package.nix
index 06f30390937eb..36814b7d6a45d 100644
--- a/pkgs/by-name/to/topicctl/package.nix
+++ b/pkgs/by-name/to/topicctl/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "topicctl";
-  version = "1.18.0";
+  version = "1.19.1";
 
   src = fetchFromGitHub {
     owner = "segmentio";
     repo = "topicctl";
     rev = "v${version}";
-    sha256 = "sha256-ZvyMGtsmXnJUGUoC9UciqCpQJsbxykzeRDo+i4ni82o=";
+    sha256 = "sha256-3sYi2/c5twM10Q70/73Pd58qkAl5m8KqghG7oV+p2t8=";
   };
 
-  vendorHash = "sha256-+mnnvdna1g6JE29weOJZmdO3jFp2a75dV9wK2XcWJ9s=";
+  vendorHash = "sha256-vPeqStOjoJPYKpdkHQNTBJFKc8NBjTH4A/W9B+HAy1I=";
 
   ldflags = [
     "-X main.BuildVersion=${version}"

From fac9c9eb362a1d0289f90d4629e4ccece1492512 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 03:21:40 +0000
Subject: [PATCH 048/101] workcraft: 3.5.1 -> 3.5.2

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

diff --git a/pkgs/by-name/wo/workcraft/package.nix b/pkgs/by-name/wo/workcraft/package.nix
index cec867c8bd55a..cb6a6b6c8e82f 100644
--- a/pkgs/by-name/wo/workcraft/package.nix
+++ b/pkgs/by-name/wo/workcraft/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "workcraft";
-  version = "3.5.1";
+  version = "3.5.2";
 
   src = fetchurl {
     url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz";
-    sha256 = "sha256-326iDxQ1t9iih2JVRO07C41V5DtkUzwkcNHCz5kLHT8=";
+    sha256 = "sha256-/Qax8cSO9j77OXNTYoZoAk5H5teWuNuR+9ubQuFq6qc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 7ab31ee08de1b30b81b0a089f45ec0cee0d377b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 03:27:54 +0000
Subject: [PATCH 049/101] trillian: 1.7.0 -> 1.7.1

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

diff --git a/pkgs/by-name/tr/trillian/package.nix b/pkgs/by-name/tr/trillian/package.nix
index 2266c626c6df5..0f65953ea0e02 100644
--- a/pkgs/by-name/tr/trillian/package.nix
+++ b/pkgs/by-name/tr/trillian/package.nix
@@ -6,14 +6,14 @@
 
 buildGoModule rec {
   pname = "trillian";
-  version = "1.7.0";
-  vendorHash = "sha256-5zUCDKOeINVN/4PWDzqWMRhELc2wRvgJNdOJSAsFwUA=";
+  version = "1.7.1";
+  vendorHash = "sha256-muPKjhUbpBJBMq8abcgTzq8/bjGXVPLoYHqQJKv8a1k=";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-E4A53Jru69sPIcB6Ydv8KauzjS9jvfhm5VbH69bfrt4=";
+    sha256 = "sha256-TOJqBfYVubwgDF/9i6lwmCLj6x0utzz0O7QJ5SqshCA=";
   };
 
   subPackages = [

From 84189027fca6a3693b0c5a752d2a1dfd58841d00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 03:49:48 +0000
Subject: [PATCH 050/101] git-absorb: 0.6.16 -> 0.6.17

---
 pkgs/applications/version-management/git-absorb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix
index 3c112daea5a10..ae477caec042b 100644
--- a/pkgs/applications/version-management/git-absorb/default.nix
+++ b/pkgs/applications/version-management/git-absorb/default.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-absorb";
-  version = "0.6.16";
+  version = "0.6.17";
 
   src = fetchFromGitHub {
     owner = "tummychow";
     repo = "git-absorb";
     tag = version;
-    hash = "sha256-5ZCCrq/mc9FAjl7AMbuQyRak5sL1dG3qWnrdNzUu4Ss=";
+    hash = "sha256-wtXqJfI/I0prPip3AbfFk0OvPja6oytPsl6hFtZ6b50=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  cargoHash = "sha256-CzZgAjAIJryhFEJve3E62rg4QGRPSvBMuFZJzHGf09w=";
+  cargoHash = "sha256-R9hh696KLoYUfJIe3X4X1VHOpPmv1fhZ55y8muVAdRI=";
 
   postInstall =
     ''

From b9e90b542a14e151bb028d05252fcd200fe2400c Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Fri, 10 Jan 2025 16:15:57 +0900
Subject: [PATCH 051/101] crystal: 1.14.0 -> 1.14.1

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/development/compilers/crystal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 0468bca709a7d..702a6ec37dbb2 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -328,8 +328,8 @@ rec {
   };
 
   crystal_1_14 = generic {
-    version = "1.14.0";
-    sha256 = "sha256-ayMF5yinHVOUaZxhlmqxb/iiGJHmloeYuKcnrPmxo9Y=";
+    version = "1.14.1";
+    sha256 = "sha256-cQWK92BfksOW8GmoXn4BmPGJ7CLyLAeKccOffQMh5UU=";
     binary = binaryCrystal_1_10;
     llvmPackages = llvmPackages_18;
     doCheck = false; # Some compiler spec problems on x86-64_linux with the .0 release

From 05974f06d7a081e37086587f617716ec347e883d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Jan 2025 08:41:20 +0100
Subject: [PATCH 052/101] python313Packages.publicsuffixlist: 1.0.2.20250107 ->
 1.0.2.20250110

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250110-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 04125ca41ddde..01f403c58be46 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20250107";
+  version = "1.0.2.20250110";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-GvJVQooR09RXTebkrq5QlhlgxRktJp1D2RUgGEwpLHk=";
+    hash = "sha256-qG3vY6LWm3N2RTiErmz8H644YFsMRjXS2ZMpBby7MTI=";
   };
 
   build-system = [ setuptools ];

From 6d7bf065d7bf1addfbaee5efaec954229d8e82c1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Jan 2025 08:42:13 +0100
Subject: [PATCH 053/101] python313Packages.tencentcloud-sdk-python: 3.0.1299
 -> 3.0.1300

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1299...3.0.1300

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1300/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 6e98830be27cd..430baca08ccf5 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.1299";
+  version = "3.0.1300";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-9HdpQDB2TflCk2NK0tJ/EOo0tyZFWWHKSbHeXUwqXqo=";
+    hash = "sha256-pvs2vLceRtg4Ro+ZqGdTNXchezu/dO6xizoRZ4xYRZ8=";
   };
 
   build-system = [ setuptools ];

From 483daef6cc6bce0510ada602054c437643db3071 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Jan 2025 08:45:07 +0100
Subject: [PATCH 054/101] python313Packages.boto3-stubs: 1.35.95 -> 1.35.96

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index bd9eb754246b0..a0d13ed3edcaf 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.35.95";
+  version = "1.35.96";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-xEwUHCSDw8Ksz14p9g01oX7F/dLTh3IWtQiniLwDH8I=";
+    hash = "sha256-A2hb88YvKjTrjlVCAHTxdZQBU82QDkXK864xVu5seGE=";
   };
 
   build-system = [ setuptools ];

From 982dc5fb0c7ecf20bb6b66ea1f6b7e0bab6254a8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Jan 2025 08:45:11 +0100
Subject: [PATCH 055/101] python313Packages.botocore-stubs: 1.35.95 -> 1.35.96

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

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 8ffd456ec592d..5df230adcdd7f 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.35.95";
+  version = "1.35.96";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-ZLiCnm4QcizMGrbWjl4LG/MZizsRvn0XRxGdfFzDnpk=";
+    hash = "sha256-pBfc3PEn2mRMl1ljvHQDsYjSrlqMG7kHhJ1LhoHk+5A=";
   };
 
   nativeBuildInputs = [ setuptools ];

From f29166847782a3f0f5b7342d995d757ba4f8003b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Jan 2025 08:49:04 +0100
Subject: [PATCH 056/101] cnspec: 11.36.0 -> 11.36.2

Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.36.0...v11.36.2

Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.36.2
---
 pkgs/tools/security/cnspec/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix
index 1f5723948f788..22320eef193b3 100644
--- a/pkgs/tools/security/cnspec/default.nix
+++ b/pkgs/tools/security/cnspec/default.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "11.36.0";
+  version = "11.36.2";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-oi5ftC6xuh6DEIn5qYZxCbKis656fU4kRVbjWOjNCLA=";
+    hash = "sha256-VwGD9qfz8WdUl6nxTw0SuA5sfahdt2eIaryfPbI4NY4=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-XLDbhNN7Y1E/yBQeFs8RmUP3WgI9G+s/tfts8WJsdvA=";
+  vendorHash = "sha256-Uivl9RzshS2FkdoGdVWKzLvch1d+JQxG1tcT83yU0hs=";
 
   subPackages = [ "apps/cnspec" ];
 

From da959d85736e5922edf01ff0f0a51581a1701cd6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Jan 2025 08:50:43 +0100
Subject: [PATCH 057/101] python313Packages.boschshcpy: 0.2.95 -> 0.2.101

Diff: https://github.com/tschamm/boschshcpy/compare/refs/tags/0.2.95...0.2.101
---
 pkgs/development/python-modules/boschshcpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix
index 17b61499c2d94..3fa0b149aefd5 100644
--- a/pkgs/development/python-modules/boschshcpy/default.nix
+++ b/pkgs/development/python-modules/boschshcpy/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "boschshcpy";
-  version = "0.2.95";
+  version = "0.2.101";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "tschamm";
     repo = "boschshcpy";
     tag = version;
-    hash = "sha256-5kPC6UxqysJEHNWDoXhg7oo/hQSKICuqWmOdjlljoLs=";
+    hash = "sha256-PUTa4ypq6zmoeNMp5SyqB05H//M2zNVILcjmU5Mzv8M=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 090e31fe60f77a47dfc23bc1ef2aa7cdd9686015 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Jan 2025 08:51:20 +0100
Subject: [PATCH 058/101] python313Packages.boschshcpy: refactor

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

diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix
index 3fa0b149aefd5..1d834ff471657 100644
--- a/pkgs/development/python-modules/boschshcpy/default.nix
+++ b/pkgs/development/python-modules/boschshcpy/default.nix
@@ -24,9 +24,9 @@ buildPythonPackage rec {
     hash = "sha256-PUTa4ypq6zmoeNMp5SyqB05H//M2zNVILcjmU5Mzv8M=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     cryptography
     getmac
     requests

From 0b7aa6a6532105c6e1755c9273d39768db1cabe6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Jan 2025 08:54:25 +0100
Subject: [PATCH 059/101] python313Packages.garminconnect: 0.2.23 -> 0.2.25

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

diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix
index 59203e1ef3623..cee048cbaa87c 100644
--- a/pkgs/development/python-modules/garminconnect/default.nix
+++ b/pkgs/development/python-modules/garminconnect/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "garminconnect";
-  version = "0.2.23";
+  version = "0.2.25";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -20,9 +20,11 @@ buildPythonPackage rec {
     owner = "cyberjunky";
     repo = "python-garminconnect";
     tag = version;
-    hash = "sha256-rY3jIrCl5y2Pyw7qakUuMtdPTR7e61n5pScPavvBtbM=";
+    hash = "sha256-V+i+e1McE9YFVuq2fuQtD3RKTHw9u3u0bZ2zCi9yZCM=";
   };
 
+  pythonRelaxDeps = [ "withings-sync" ];
+
   build-system = [ pdm-backend ];
 
   dependencies = [

From 06f178052252ba09456cffd80630757756720e4c Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 02:04:44 +0900
Subject: [PATCH 060/101] python312Packages.dotty-dict: refactor

---
 .../python-modules/dotty-dict/default.nix     | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/dotty-dict/default.nix b/pkgs/development/python-modules/dotty-dict/default.nix
index b3384fe03f5ce..d9ab527478952 100644
--- a/pkgs/development/python-modules/dotty-dict/default.nix
+++ b/pkgs/development/python-modules/dotty-dict/default.nix
@@ -1,27 +1,34 @@
 {
   lib,
-  fetchPypi,
+  fetchFromGitHub,
   buildPythonPackage,
-  setuptools-scm,
+  poetry-core,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
-  pname = "dotty_dict";
+  pname = "dotty-dict";
   version = "1.3.1";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-SwFuA7iuJlU5dXpT66JLm/2lBvuU+84L7oQ8bwVUGhU=";
+  src = fetchFromGitHub {
+    owner = "pawelzny";
+    repo = "dotty_dict";
+    tag = "v${version}";
+    hash = "sha256-kY7o9wgfsV7oc5twOeuhG47C0Js6JzCt02S9Sd8dSGc=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ poetry-core ];
 
-  doCheck = false;
+  pythonImportsCheck = [ "dotty_dict" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
     description = "Dictionary wrapper for quick access to deeply nested keys";
     homepage = "https://dotty-dict.readthedocs.io";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    changelog = "https://github.com/pawelzny/dotty_dict/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
   };
 }

From 1f5a0cdf8b77904e39d20173c6ac4aafa4b35f71 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 1 Jan 2025 02:05:58 +0900
Subject: [PATCH 061/101] python312Packages.qmk-dotty-dict: remove

qmk-dotty-dict has been removed. It is no longer needed since the fixes
have been merged into dotty-dict.
---
 .../python-modules/qmk-dotty-dict/default.nix | 35 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 pkgs/development/python-modules/qmk-dotty-dict/default.nix

diff --git a/pkgs/development/python-modules/qmk-dotty-dict/default.nix b/pkgs/development/python-modules/qmk-dotty-dict/default.nix
deleted file mode 100644
index b5399d896844c..0000000000000
--- a/pkgs/development/python-modules/qmk-dotty-dict/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  buildPythonPackage,
-  fetchFromGitHub,
-  lib,
-  poetry-core,
-}:
-
-buildPythonPackage rec {
-  pname = "qmk_dotty_dict";
-  version = "1.3.1";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "pawelzny";
-    repo = "dotty_dict";
-    tag = "v${version}";
-    hash = "sha256-kY7o9wgfsV7oc5twOeuhG47C0Js6JzCt02S9Sd8dSGc=";
-  };
-
-  nativeBuildInputs = [ poetry-core ];
-
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = "https://github.com/pawelzny/dotty_dict";
-    description = "Dictionary wrapper for quick access to deeply nested keys";
-    longDescription = ''
-      This is a version of dotty-dict by QMK (https://qmk.fm) since the original
-      dotty-dict published to pypi has non-ASCII characters that breaks with
-      some non-UTF8 locale settings.
-    '';
-    license = licenses.mit;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index d6fc096ca3c23..ab45e88b25ecd 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -582,6 +582,7 @@ mapAliases ({
   qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
   qds-sdk = throw "qds-sdk was removed as it is unmaintained upstream and depends on the removed boto package"; # Added 2024-09-22
   qds_sdk = qds-sdk; # added 2023-10-21
+  qmk-dotty-dict = throw "qmk-dotty-dict has been removed. It is no longer needed since the fixes have been merged into dotty-dict."; # added 2025-01-01
   Quandl = quandl; # added 2023-02-19
   quamash = throw "'quamash' has been removed, since it is unmaintained and broken"; # added 2024-10-17
   querystring_parser = querystring-parser; # added 2024-01-07
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bb340ba7b4204..8277eee0a8635 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13769,8 +13769,6 @@ self: super: with self; {
 
   qutip = callPackage ../development/python-modules/qutip { };
 
-  qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { };
-
   pythonqwt = callPackage ../development/python-modules/pythonqwt { };
 
   r2pipe = callPackage ../development/python-modules/r2pipe { };

From 07e7069044cb4030cb433d6503dbc81185409e65 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 3 Jan 2025 22:37:18 +0900
Subject: [PATCH 062/101] python312Packages.guidance: fix build

---
 .../python-modules/guidance/default.nix       | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix
index 676e2f3a5299f..43091110602b6 100644
--- a/pkgs/development/python-modules/guidance/default.nix
+++ b/pkgs/development/python-modules/guidance/default.nix
@@ -11,6 +11,8 @@
   diskcache,
   fastapi,
   gptcache,
+  huggingface-hub,
+  jsonschema,
   msal,
   numpy,
   openai,
@@ -18,6 +20,7 @@
   platformdirs,
   protobuf,
   pyformlang,
+  pydantic,
   requests,
   tiktoken,
   torch,
@@ -57,15 +60,29 @@ buildPythonPackage rec {
     platformdirs
     protobuf
     pyformlang
+    pydantic
     requests
     tiktoken
     uvicorn
   ];
 
+  optional-dependencies = {
+    azureai = [ openai ];
+    openai = [ openai ];
+    schemas = [ jsonschema ];
+    server = [
+      fastapi
+      uvicorn
+    ];
+  };
+
   nativeCheckInputs = [
+    huggingface-hub
     pytestCheckHook
     torch
-  ];
+  ] ++ optional-dependencies.schemas;
+
+  pytestFlagsArray = [ "tests/unit" ];
 
   disabledTests = [
     # require network access
@@ -79,6 +96,10 @@ buildPythonPackage rec {
     "test_recursion_error"
     "test_openai_class_detection"
     "test_openai_chat_without_roles"
+    "test_local_image"
+    "test_remote_image"
+    "test_image_from_bytes"
+    "test_remote_image_not_found"
 
     # flaky tests
     "test_remote_mock_gen" # frequently fails when building packages in parallel
@@ -86,11 +107,12 @@ buildPythonPackage rec {
 
   disabledTestPaths = [
     # require network access
-    "tests/library/test_gen.py"
+    "tests/unit/test_tokenizers.py"
   ];
 
   preCheck = ''
     export HOME=$TMPDIR
+    rm tests/conftest.py
   '';
 
   pythonImportsCheck = [ "guidance" ];

From b8edf7befdd74b253e2f8c6b3a1bd3c77f41cbcf Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Fri, 3 Jan 2025 22:39:23 +0900
Subject: [PATCH 063/101] python312Packages.guidance: refactor

---
 .../python-modules/guidance/default.nix       | 27 ++++---------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/guidance/default.nix b/pkgs/development/python-modules/guidance/default.nix
index 43091110602b6..38eebb5654ae0 100644
--- a/pkgs/development/python-modules/guidance/default.nix
+++ b/pkgs/development/python-modules/guidance/default.nix
@@ -3,23 +3,17 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
   pybind11,
   setuptools,
-  wheel,
-  aiohttp,
   diskcache,
   fastapi,
-  gptcache,
   huggingface-hub,
   jsonschema,
-  msal,
   numpy,
   openai,
   ordered-set,
   platformdirs,
   protobuf,
-  pyformlang,
   pydantic,
   requests,
   tiktoken,
@@ -32,8 +26,6 @@ buildPythonPackage rec {
   version = "0.1.16";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "guidance-ai";
     repo = "guidance";
@@ -41,29 +33,20 @@ buildPythonPackage rec {
     hash = "sha256-dPakdT97cuLv4OwdaUFncopD5X6uXGyUjwzqn9fxnhU=";
   };
 
-  nativeBuildInputs = [ pybind11 ];
-
   build-system = [
+    pybind11
     setuptools
-    wheel
   ];
 
   dependencies = [
-    aiohttp
     diskcache
-    fastapi
-    gptcache
-    msal
     numpy
-    openai
     ordered-set
     platformdirs
     protobuf
-    pyformlang
     pydantic
     requests
     tiktoken
-    uvicorn
   ];
 
   optional-dependencies = {
@@ -119,11 +102,11 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Guidance language for controlling large language models";
     homepage = "https://github.com/guidance-ai/guidance";
-    changelog = "https://github.com/guidance-ai/guidance/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ natsukium ];
+    changelog = "https://github.com/guidance-ai/guidance/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ natsukium ];
   };
 }

From 7eec6211fa30caded645aa177756184b1a489c3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 08:34:25 +0000
Subject: [PATCH 064/101] circup: 2.0.4 -> 2.1.0

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

diff --git a/pkgs/by-name/ci/circup/package.nix b/pkgs/by-name/ci/circup/package.nix
index 0d5e8ff1a47b7..f212569df456e 100644
--- a/pkgs/by-name/ci/circup/package.nix
+++ b/pkgs/by-name/ci/circup/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "circup";
-  version = "2.0.4";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "adafruit";
     repo = "circup";
     tag = version;
-    hash = "sha256-Iid6IwPoj7F9X6Yb0ESsuvD9/tZdRQyCceGOVt2R1qw=";
+    hash = "sha256-4jmqS/XMB8t7aMfHriipi+VnCbZqrqjt21K5ktes2ec=";
   };
 
   pythonRelaxDeps = [ "semver" ];

From 72fcfac1b3d45b6520e3a88bb2646bcf05f84c48 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 09:04:15 +0000
Subject: [PATCH 065/101] cht-sh: 0-unstable-2024-11-13 ->
 0-unstable-2024-12-31

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

diff --git a/pkgs/by-name/ch/cht-sh/package.nix b/pkgs/by-name/ch/cht-sh/package.nix
index 0cba6cd2e58c2..7c7828976d452 100644
--- a/pkgs/by-name/ch/cht-sh/package.nix
+++ b/pkgs/by-name/ch/cht-sh/package.nix
@@ -12,15 +12,15 @@
 
 stdenv.mkDerivation {
   pname = "cht.sh";
-  version = "0-unstable-2024-11-13";
+  version = "0-unstable-2024-12-31";
 
   nativeBuildInputs = [ makeWrapper ];
 
   src = fetchFromGitHub {
     owner = "chubin";
     repo = "cheat.sh";
-    rev = "4cebb8c066cab49375694a7b30bc39185472ca1c";
-    sha256 = "xmFjypxnSZ3LYZbwIegFd1Rc0Vbdf9U6b/LGHN39FUg=";
+    rev = "045d15f074310028c0760b9ae61b96245c835325";
+    sha256 = "5Vsyd8z5qkPyDJVX41EFlMimRkRtjGFL+n+jnmONaVI=";
   };
 
   # Fix ".cht.sh-wrapped" in the help message

From 3a26691f23c8c960b7d26a951cdce55e060e644e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 10:19:48 +0000
Subject: [PATCH 066/101] vscode-extensions.timonwong.shellcheck: 0.37.3 ->
 0.37.4

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

diff --git a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix
index a37e7d54c7d23..a2761b16a7b6d 100644
--- a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix
@@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "shellcheck";
     publisher = "timonwong";
-    version = "0.37.3";
-    sha256 = "sha256-bVddcoj0zO+pWySg7JOGXqLJeJnoet3Lo/I1ctd0znk=";
+    version = "0.37.4";
+    sha256 = "sha256-+DFoHjb5sl9s5Vqw7onsv+MKjS4+loGVnZsF9/e+7dQ=";
   };
   nativeBuildInputs = [
     jq

From 6adcfc72948d69c71d9a34b101eb2cb793b09030 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 10:35:01 +0000
Subject: [PATCH 067/101] coroot-node-agent: 1.23.1 -> 1.23.3

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

diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix
index fd2b3631417a4..d82ef369389c1 100644
--- a/pkgs/by-name/co/coroot-node-agent/package.nix
+++ b/pkgs/by-name/co/coroot-node-agent/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "coroot-node-agent";
-  version = "1.23.1";
+  version = "1.23.3";
 
   src = fetchFromGitHub {
     owner = "coroot";
     repo = "coroot-node-agent";
     rev = "v${version}";
-    hash = "sha256-kisYm0bM+IZJ9qRx1lDlcFtZIdjsNfu6Ao75q84ruDM=";
+    hash = "sha256-YRIlmOwCE1Q4h9Jeow4X6fYI8GFyfuqppW1XFJHVvQM=";
   };
 
-  vendorHash = "sha256-EXI4xpo4j/EzugW8zyu0Dvk2i6bYFBIF+SsL6GZ+J2Q=";
+  vendorHash = "sha256-SxyIlyDHuu8Ls1+/rujWE9elZiTfSYWIrV8vP5xsqTU=";
 
   buildInputs = [ systemdLibs ];
 

From b3cafaa7967d578cc671baaf53d5dee7271c7913 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 10:39:01 +0000
Subject: [PATCH 068/101] gh-dash: 4.8.1 -> 4.9.0

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

diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix
index 4df061439ad3e..6b9bf2a6d8a88 100644
--- a/pkgs/by-name/gh/gh-dash/package.nix
+++ b/pkgs/by-name/gh/gh-dash/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "gh-dash";
-  version = "4.8.1";
+  version = "4.9.0";
 
   src = fetchFromGitHub {
     owner = "dlvhdr";
     repo = "gh-dash";
     rev = "v${version}";
-    hash = "sha256-d6wAyn6Vj4pWnPUmYodSm+SQtBf3EU1vVSCUnfiXRas=";
+    hash = "sha256-25Ik5VsTYLssI9u235pBWD1XNABvWCzbXma04pJX2nQ=";
   };
 
   vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE=";

From aae7c1714e326414e9909d2c7973ad5c56925409 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 10 Jan 2025 00:51:00 +0100
Subject: [PATCH 069/101] vorta: cleanup

---
 pkgs/applications/backup/vorta/default.nix | 32 +++++++++++++---------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix
index 18fd4e2126deb..51991069e0c4f 100644
--- a/pkgs/applications/backup/vorta/default.nix
+++ b/pkgs/applications/backup/vorta/default.nix
@@ -1,13 +1,14 @@
 {
   lib,
+  stdenv,
   python3Packages,
   fetchFromGitHub,
   wrapQtAppsHook,
-  borgbackup,
-  qtbase,
   qtwayland,
-  stdenv,
+  borgbackup,
+  versionCheckHook,
   makeFontsConf,
+  qtbase,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -23,7 +24,6 @@ python3Packages.buildPythonApplication rec {
   };
 
   nativeBuildInputs = [
-    python3Packages.setuptools
     wrapQtAppsHook
   ];
 
@@ -31,18 +31,22 @@ python3Packages.buildPythonApplication rec {
     qtwayland
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    packaging
     peewee
-    pyqt6
+    platformdirs
     psutil
+    pyqt6
     secretstorage
-    setuptools
-    platformdirs
   ];
 
   postPatch = ''
     substituteInPlace src/vorta/assets/metadata/com.borgbase.Vorta.desktop \
-    --replace com.borgbase.Vorta "com.borgbase.Vorta-symbolic"
+    --replace-fail com.borgbase.Vorta "com.borgbase.Vorta-symbolic"
   '';
 
   postInstall = ''
@@ -61,7 +65,9 @@ python3Packages.buildPythonApplication rec {
     pytest-qt
     pytest-mock
     pytestCheckHook
+    versionCheckHook
   ];
+  versionCheckProgramArg = [ "--version" ];
 
   preCheck =
     let
@@ -89,13 +95,13 @@ python3Packages.buildPythonApplication rec {
       "tests/network_manager/test_darwin.py"
     ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/borgbase/vorta/releases/tag/v${version}";
     description = "Desktop Backup Client for Borg";
     homepage = "https://vorta.borgbase.com/";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ma27 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ma27 ];
+    platforms = lib.platforms.linux;
     mainProgram = "vorta";
   };
 }

From c4cfe9bba53f20887657a667a640b873b7d47685 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 10 Jan 2025 16:31:15 +0530
Subject: [PATCH 070/101] golds: 0.7.2 -> 0.7.4

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/go/golds/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix
index 83f4aaa0ae7ca..de811d147b9c2 100644
--- a/pkgs/by-name/go/golds/package.nix
+++ b/pkgs/by-name/go/golds/package.nix
@@ -3,17 +3,18 @@
   buildGoModule,
   fetchFromGitHub,
   versionCheckHook,
+  nix-update-script,
 }:
 
 buildGoModule rec {
   pname = "golds";
-  version = "0.7.2";
+  version = "0.7.4";
 
   src = fetchFromGitHub {
     owner = "go101";
     repo = "golds";
     tag = "v${version}";
-    hash = "sha256-ExvCVGWYAngasnDHVzBLeLmms4cFNcQ/KzuE4t3r36A=";
+    hash = "sha256-kVXr/5qJCTjpfRpz2mDIsMRirp5dT5aGo/BlLR9Qp0M=";
   };
 
   # nixpkgs is not using the go distpack archive and missing a VERSION file in the source
@@ -21,7 +22,7 @@ buildGoModule rec {
   # https://github.com/NixOS/nixpkgs/pull/358316#discussion_r1855322027
   patches = [ ./info_module-gover.patch ];
 
-  vendorHash = "sha256-omjHRZB/4VzPhc6RrFY11s6BRD69+Y4RRZ2XdeKbZf0=";
+  vendorHash = "sha256-Sy9O23iCW8voImPFQkqczPxqGyD5rf0/tKxaRDFgbSs=";
 
   ldflags = [ "-s" ];
 
@@ -29,6 +30,8 @@ buildGoModule rec {
   versionCheckProgramArg = [ "--version" ];
   doInstallCheck = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Experimental Go local docs server/generator and code reader implemented with some fresh ideas";
     homepage = "https://github.com/go101/golds";

From d91fa5989f591028f9dfd8d16ce54bd18582c887 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 10 Jan 2025 12:44:41 +0100
Subject: [PATCH 071/101] python313Packages.netutils: 1.10.0 -> 1.12.0

Diff: https://github.com/networktocode/netutils/compare/refs/tags/v1.10.0...v1.12.0

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

diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix
index aa04df459d6b9..80f3ca4527dd5 100644
--- a/pkgs/development/python-modules/netutils/default.nix
+++ b/pkgs/development/python-modules/netutils/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "netutils";
-  version = "1.10.0";
+  version = "1.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "networktocode";
     repo = "netutils";
     tag = "v${version}";
-    hash = "sha256-VhX0KDlGf0J6fiO1RzOoqJ4WMDM8Bb2+lYYMlgQ9nkc=";
+    hash = "sha256-LslE/ROfr/2gU5VPiLKgaTxd4miM+Bvrh9OdY06zkr0=";
   };
 
   build-system = [ poetry-core ];

From 0561ea4d4abc5a4fb394f6505f892bf7c75e6104 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 11:48:30 +0000
Subject: [PATCH 072/101] slackdump: 3.0.0 -> 3.0.2

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

diff --git a/pkgs/by-name/sl/slackdump/package.nix b/pkgs/by-name/sl/slackdump/package.nix
index 59c4ba6466e7b..79e7dde76c623 100644
--- a/pkgs/by-name/sl/slackdump/package.nix
+++ b/pkgs/by-name/sl/slackdump/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "slackdump";
-  version = "3.0.0";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "rusq";
     repo = "slackdump";
     tag = "v${version}";
-    hash = "sha256-gnZbBY1XMYSGgsVG5MqR2y3o574hOwapcLZf5F21AJg=";
+    hash = "sha256-XkNxkLKm22an8Ts1kLdOyqNyV7mG5ZQJXOsAoFh3CjY=";
   };
 
   nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.IOKitTools;
@@ -32,7 +32,7 @@ buildGoModule rec {
       "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$"
     ];
 
-  vendorHash = "sha256-GUPBrSgwxVXA3vEVbY36IZQfd2jEhvgk0OlFdP/2DU0=";
+  vendorHash = "sha256-4fgII2IJ0UCbUtqutMak9T2qhpZg1hu9Y+bxSaxcgqc=";
 
   __darwinAllowLocalNetworking = true;
 

From 59efedde36991d1ec3e126c5ef721a39123ff405 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 11:48:43 +0000
Subject: [PATCH 073/101] reindeer: 2024.12.30.00 -> 2025.01.06.00

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

diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index e6bf1c5b9d887..b115c57a6a756 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reindeer";
-  version = "2024.12.30.00";
+  version = "2025.01.06.00";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
     tag = "v${version}";
-    hash = "sha256-o8PHtGG3Ndz6Ei9ZBoAdeNmBb70m4c+jCvHCGOjaA+w=";
+    hash = "sha256-3Wa10eLlvOXw8DZAwQiCTGFOcUEsHvYhl6OTEYsCdZ8=";
   };
 
-  cargoHash = "sha256-guRi+kYLjPHFLm4eN3kJ2kHYIBZ5JXMb3ii8416e+IA=";
+  cargoHash = "sha256-UI70YLTR/+fKh+4wD2hZJyuzN4ZNUCkrhyf9CRepetA=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 179683ddaf48803e8bf1968afebdaeb62113d5a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 12:03:31 +0000
Subject: [PATCH 074/101] python312Packages.open-clip-torch: 2.29.0 -> 2.30.0

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

diff --git a/pkgs/development/python-modules/open-clip-torch/default.nix b/pkgs/development/python-modules/open-clip-torch/default.nix
index 590ce2bfe8ed8..a06c212947204 100644
--- a/pkgs/development/python-modules/open-clip-torch/default.nix
+++ b/pkgs/development/python-modules/open-clip-torch/default.nix
@@ -29,14 +29,14 @@
 }:
 buildPythonPackage rec {
   pname = "open-clip-torch";
-  version = "2.29.0";
+  version = "2.30.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mlfoundations";
     repo = "open_clip";
     tag = "v${version}";
-    hash = "sha256-X5nOWdGhIv+HiiauIezIkPh3G1Odtxr0HPygRp/D184=";
+    hash = "sha256-Ht59pYJfcBkfoWSTDipsoy/71pMzc5rlDD6xHgvUs1g=";
   };
 
   build-system = [ pdm-backend ];

From 1eeaf5f198867ebdcdd092c0a58ad8a9c940d3af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 12:34:32 +0000
Subject: [PATCH 075/101] libmcfp: 1.3.3 -> 1.3.4

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

diff --git a/pkgs/by-name/li/libmcfp/package.nix b/pkgs/by-name/li/libmcfp/package.nix
index e30193d7d17c6..085798010bd89 100644
--- a/pkgs/by-name/li/libmcfp/package.nix
+++ b/pkgs/by-name/li/libmcfp/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmcfp";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "mhekkel";
     repo = "libmcfp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hAY560uFrrM3gH3r4ArprWEsK/1w/XXDeyTMIYUv+qY=";
+    hash = "sha256-7Oy7qEXIAJ50NXL4+Mm67WrivpubDz7uLWZ3YVzTFxA=";
   };
 
   nativeBuildInputs = [

From 460a759851be32ca526d6faf7e08d5875d279b5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 13:00:04 +0000
Subject: [PATCH 076/101] cargo-shear: 1.1.4 -> 1.1.8

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

diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix
index d8efe2547c433..da227d0b48cd1 100644
--- a/pkgs/by-name/ca/cargo-shear/package.nix
+++ b/pkgs/by-name/ca/cargo-shear/package.nix
@@ -6,7 +6,7 @@
   cargo-shear,
 }:
 let
-  version = "1.1.4";
+  version = "1.1.8";
 in
 rustPlatform.buildRustPackage {
   pname = "cargo-shear";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
     owner = "Boshen";
     repo = "cargo-shear";
     rev = "v${version}";
-    hash = "sha256-40LBTB/lDY1UxK2dCqZJu1CUIqJxMbDxpSTlSLClpVY=";
+    hash = "sha256-T05BSeVF67T7F6GMwsGDOYyiuz//0aTstTlGoOZndRM=";
   };
 
-  cargoHash = "sha256-GmNKUv0jfQ59pG8AspZT1NTX0AJQ9xl93LbCgUzPllo=";
+  cargoHash = "sha256-iV2hV57zuqnsDX0krtAADGvFo3YSCkiEm6+dNAz3W08=";
 
   # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23
   SHEAR_VERSION = version;

From d1d22f3f5f98e37f7e4ac7fdb4e4b779ae742d33 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 13:10:20 +0000
Subject: [PATCH 077/101] twilio-cli: 5.22.7 -> 5.22.8

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

diff --git a/pkgs/by-name/tw/twilio-cli/package.nix b/pkgs/by-name/tw/twilio-cli/package.nix
index 64b5f40d2fcd0..4af5c7ef5ca14 100644
--- a/pkgs/by-name/tw/twilio-cli/package.nix
+++ b/pkgs/by-name/tw/twilio-cli/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "twilio-cli";
-  version = "5.22.7";
+  version = "5.22.8";
 
   src = fetchzip {
     url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-JHI5WZbInlZgRPZwh+XO39T7p05oSS+PkcHJ6QdUtOk=";
+    hash = "sha256-1vDSFi6VL7s7IAMlTMj+7GrvY8evrnFPXaznSM27c6E=";
   };
 
   buildInputs = [ nodejs-slim ];

From 438a86097ab7245b29f5b9a04027ca5ad873aa32 Mon Sep 17 00:00:00 2001
From: lewistorrington <lu5a@proton.me>
Date: Wed, 25 Dec 2024 15:29:41 +0200
Subject: [PATCH 078/101] upcloud-cli: init at 3.14.0

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

diff --git a/pkgs/by-name/up/upcloud-cli/package.nix b/pkgs/by-name/up/upcloud-cli/package.nix
new file mode 100644
index 0000000000000..05f2c95084f8f
--- /dev/null
+++ b/pkgs/by-name/up/upcloud-cli/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+
+buildGoModule rec {
+  pname = "upcloud-cli";
+  version = "3.14.0";
+
+  src = fetchFromGitHub {
+    owner = "UpCloudLtd";
+    repo = "upcloud-cli";
+    tag = "v${version}";
+    hash = "sha256-zKPoJFfgqi6ZIeZKJy7YeYuqHWVPH0LXvWpOYCEM7dE=";
+  };
+
+  vendorHash = "sha256-76bLk4zten9SGXbt/M8VKPSylCwQqclyscSVQQaAtbA=";
+
+  ldflags = [
+    "-s -w -X github.com/UpCloudLtd/upcloud-cli/v3/internal/config.Version=${version}"
+  ];
+
+  subPackages = [
+    "cmd/upctl"
+    "internal/*"
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgram = "${placeholder "out"}/bin/upctl";
+  versionCheckProgramArg = [ "version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = lib.nix-update-script { };
+  };
+
+  meta = {
+    changelog = "https://github.com/UpCloudLtd/upcloud-cli/blob/refs/tags/v${version}/CHANGELOG.md";
+    description = "Command-line tool for managing UpCloud services";
+    homepage = "https://github.com/UpCloudLtd/upcloud-cli";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ lu1a ];
+    mainProgram = "upctl";
+  };
+}

From 3d2e30986c4fee71c09bd32da2f46d527afffcaa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 13:11:51 +0000
Subject: [PATCH 079/101] cargo-udeps: 0.1.53 -> 0.1.54

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

diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix
index 1ad27f4a9b99d..76f0401e72f38 100644
--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/pkgs/development/tools/rust/cargo-udeps/default.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-udeps";
-  version = "0.1.53";
+  version = "0.1.54";
 
   src = fetchFromGitHub {
     owner = "est31";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-l5r0ZbF3LlGzJgMt0rPizzP0ZBLJQNLGBynPw4nAwMc=";
+    sha256 = "sha256-R4t1mzXX95rVbEuHvoAnxxEYt7XYg+Bmr8Mh4LIhnMs=";
   };
 
-  cargoHash = "sha256-XRK26pYVUVOUAQsWxIhY2m5bwSIqCMBZ2r34eN3RQiE=";
+  cargoHash = "sha256-DigRCz9BicNI+bkEwdJEKy9i0pT9HAhLsN56hAbEzUI=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 5a0ac110f771269b1aef89fa6d83075877f6610b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 13:13:26 +0000
Subject: [PATCH 080/101] inferno: 0.12.0 -> 0.12.1

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

diff --git a/pkgs/by-name/in/inferno/package.nix b/pkgs/by-name/in/inferno/package.nix
index 0eb5e39b43b12..f5fee0f211896 100644
--- a/pkgs/by-name/in/inferno/package.nix
+++ b/pkgs/by-name/in/inferno/package.nix
@@ -2,17 +2,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "inferno";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "jonhoo";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-KB9E4kqi85reDJnjb2PKgOsBo9opTuPVUW4nDrJIMmU=";
+    hash = "sha256-lnNS3+2VZ+DgbmaM8/9X79vhqoxw3G8M9macLILX//w=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-AA1Bm70W2gAL2IohQwY0wcLNq6AOzQ3oqVRzzyeRyxA=";
+  cargoHash = "sha256-L2Mq8y5v0n4OP8nZLeB0A8+UBr0snEDjTDZAGZQTxuo=";
 
   # skip flaky tests
   checkFlags = [

From 930433a84992729d340f7bba5151f243b1ee3c50 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 13:22:35 +0000
Subject: [PATCH 081/101] host-spawn: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/by-name/ho/host-spawn/package.nix b/pkgs/by-name/ho/host-spawn/package.nix
index 6fd12d0968e6f..95b06655d7d8a 100644
--- a/pkgs/by-name/ho/host-spawn/package.nix
+++ b/pkgs/by-name/ho/host-spawn/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "host-spawn";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "1player";
     repo = "host-spawn";
     rev = "v${version}";
-    hash = "sha256-017o50MSSkehn4zMEdCTPW2o2IQaXbI21z8Z+jfRuDs=";
+    hash = "sha256-V8WI0TyJw+dkCyG8huIrg6VDFI2Kmak7bI/GXU8RI/w=";
   };
 
   vendorHash = "sha256-Agc3hl+VDTNW7cnh/0g4G8BgzNAX11hKASYQKieBN4M=";

From 130c218c61720fbc3f7aa26f0cf2d64933a89fba Mon Sep 17 00:00:00 2001
From: delliottxyz <150736012+delliottxyz@users.noreply.github.com>
Date: Fri, 10 Jan 2025 13:27:23 +0000
Subject: [PATCH 082/101] Revert "ddns-updater: disable updates"

---
 pkgs/by-name/dd/ddns-updater/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/dd/ddns-updater/package.nix b/pkgs/by-name/dd/ddns-updater/package.nix
index 453b18d4d9398..8ceaeecd14def 100644
--- a/pkgs/by-name/dd/ddns-updater/package.nix
+++ b/pkgs/by-name/dd/ddns-updater/package.nix
@@ -29,9 +29,6 @@ buildGoModule rec {
     tests = {
       inherit (nixosTests) ddns-updater;
     };
-    # nixpkgs-update: no auto update
-    # Necessary only as rryantm keeps getting confused and thinks 2.6.1 is newer than 2.7.0
-    # TODO remove once version newer than 2.7.0 is released
     updateScript = nix-update-script { };
   };
 

From 480f1aa89744a656fcf4672d927c097bf3f39207 Mon Sep 17 00:00:00 2001
From: Rishik Yalamanchili <73787402+Rishik-Y@users.noreply.github.com>
Date: Fri, 10 Jan 2025 18:58:22 +0530
Subject: [PATCH 083/101] =?UTF-8?q?gitkraken:=2010.5.0=20=E2=86=92=2010.6.?=
 =?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix
index 5e52145944e59..0bbd3e73d186a 100644
--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@@ -57,24 +57,24 @@
 
 let
   pname = "gitkraken";
-  version = "10.5.0";
+  version = "10.6.0";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchzip {
       url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-      hash = "sha256-zgzKwQCt1FoBgzVn1WrllANuBvYxKjPJNhVq0JqiXCM=";
+      hash = "sha256-I4Pxz4pH5V4X1vguH1/TwoVDhZseKzkXZobqH/WVxTE=";
     };
 
     x86_64-darwin = fetchzip {
       url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
-      hash = "sha256-H1rxvCGo0m8g5XSUcuREMfe+Im/QsL6nsDbPQDo09j4=";
+      hash = "sha256-k/ilZie8PVo8jjrR/7c0Yw6GpudzgZrc3uMwXeWd76M=";
     };
 
     aarch64-darwin = fetchzip {
       url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
-      hash = "sha256-OsCbTtGNo+heQQL6OEeUq64Dlbs86FUpfqEJ80PnV2o=";
+      hash = "sha256-d+CsEPoznjsyhFQHjMxFffT60ak8j9BtTSvDVmvXWDA=";
     };
   };
 

From 13fa4b9ca0ddcc871c45107bbf3367f087b8ae5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 13:52:33 +0000
Subject: [PATCH 084/101] prometheus-nut-exporter: 3.1.1 -> 3.1.3

---
 pkgs/servers/monitoring/prometheus/nut-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/servers/monitoring/prometheus/nut-exporter.nix
index 92ba73329bb45..e831319e1b391 100644
--- a/pkgs/servers/monitoring/prometheus/nut-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nut-exporter.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "nut-exporter";
-  version = "3.1.1";
+  version = "3.1.3";
 
   src = fetchFromGitHub {
     owner = "DRuggeri";
     repo = "nut_exporter";
     rev = "v${version}";
-    sha256 = "sha256-izD2Ks29/4/FBsZoH0raFzqb0DgPR8hXRYBZQEvET+s=";
+    sha256 = "sha256-sX0yNuUg/x8BtMLbbq1gz+4//Cce+n5Qi/zspC7/scI=";
   };
 
   vendorHash = "sha256-DGCNYklINPPzC7kCdEUS7TqVvg2SnKFqe0qHs5RSmzY=";

From 73e18b5606967ebaa20166dc0529a2fcd8379581 Mon Sep 17 00:00:00 2001
From: Jon Gjengset <jon.gjengset@helsing.ai>
Date: Thu, 9 Jan 2025 09:05:35 +0100
Subject: [PATCH 085/101] cago-hakari: 0.9.33 -> 0.9.35

- <https://github.com/guppy-rs/guppy/releases/tag/cargo-hakari-0.9.34>
- <https://github.com/guppy-rs/guppy/releases/tag/cargo-hakari-0.9.35>

Also adds the `versionCheckHook` and `nix-update-script` passthru.
---
 pkgs/by-name/ca/cargo-hakari/package.nix | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-hakari/package.nix b/pkgs/by-name/ca/cargo-hakari/package.nix
index ba5c2e999776b..34a6763e2d4b8 100644
--- a/pkgs/by-name/ca/cargo-hakari/package.nix
+++ b/pkgs/by-name/ca/cargo-hakari/package.nix
@@ -2,20 +2,22 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-hakari";
-  version = "0.9.33";
+  version = "0.9.35";
 
   src = fetchFromGitHub {
     owner = "guppy-rs";
     repo = "guppy";
-    rev = "cargo-hakari-${version}";
-    sha256 = "sha256-oJZiGXsOl00Bim/olYYSqt/p3j6dTw25IURcwdXYrAo=";
+    tag = "cargo-hakari-${version}";
+    hash = "sha256-+IjtK4kSm2vThgIxDsBLpoh0j9cDhhEqI6Hr2BmC7hc=";
   };
 
-  cargoHash = "sha256-V9QmaZYBXj26HJrP8gABwhhUPwBxnyLoO4O45lnPyew=";
+  cargoHash = "sha256-xMgNk82U32AtMeZJ8v2M0faHLAPkXrdIJHwOJcqE9m8=";
 
   cargoBuildFlags = [
     "-p"
@@ -26,6 +28,14 @@ rustPlatform.buildRustPackage rec {
     "cargo-hakari"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = [ "--version" ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Manage workspace-hack packages to speed up builds in large workspaces";
     mainProgram = "cargo-hakari";

From 95811c53e9eca88e301194f67270d2a45ba18256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theo1.bori@epitech.eu>
Date: Fri, 10 Jan 2025 15:07:07 +0100
Subject: [PATCH 086/101] ddnet: 18.8.2 -> 18.9

---
 pkgs/games/ddnet/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix
index a5d5b5d2355e7..a9874dce375b9 100644
--- a/pkgs/games/ddnet/default.nix
+++ b/pkgs/games/ddnet/default.nix
@@ -32,19 +32,19 @@
 
 stdenv.mkDerivation rec {
   pname = "ddnet";
-  version = "18.8.2";
+  version = "18.9";
 
   src = fetchFromGitHub {
     owner = "ddnet";
     repo = pname;
     rev = version;
-    hash = "sha256-+X56o8s9kbNxufDeQVLAaVG8jxcSTFVssn1HnxIHhZQ=";
+    hash = "sha256-aJzNfo7K5OOo14XJRmDOYzXFF5fZK0aXgIfVvjvzjrU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     name = "${pname}-${version}";
     inherit src;
-    hash = "sha256-b1JOj8p5+Q2SvmbBvLxGFPCLALcOc4mAdegPCsMnNqc=";
+    hash = "sha256-WN8hYl3L1z+yAfxQnDKnr/zC+0GOYvjzM8YL5XQgVJg=";
   };
 
   nativeBuildInputs = [

From 7ef83af8e44542433ac8dbd9fea3eed8cb254e02 Mon Sep 17 00:00:00 2001
From: Johan Larsson <jolars@posteo.com>
Date: Fri, 10 Jan 2025 09:00:51 +0100
Subject: [PATCH 087/101] vimPlugins.gx-nvim: init at 2025-01-07
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use substituteAll instead

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>

Change string in patch

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>

Remove postPatch

Make patch specific to linux

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix | 12 ++++++++++++
 .../vim/plugins/patches/gx-nvim/fix-paths.patch     | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 4 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/editors/vim/plugins/patches/gx-nvim/fix-paths.patch

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index c9d6a47ffdd9b..6ba29bb90efd3 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -4907,6 +4907,19 @@ final: prev:
     meta.homepage = "https://github.com/junegunn/gv.vim/";
   };
 
+  gx-nvim = buildVimPlugin {
+    pname = "gx.nvim";
+    version = "2025-01-07";
+    src = fetchFromGitHub {
+      owner = "chrishrb";
+      repo = "gx.nvim";
+      rev = "c7e6a0ace694a098a5248d92a866c290bd2da1cc";
+      sha256 = "14cjwnsrjdfhqx0hbd6j1b9lm668a6c3f72wklx66vp18qy0pafb";
+      fetchSubmodules = true;
+    };
+    meta.homepage = "https://github.com/chrishrb/gx.nvim/";
+  };
+
   hardhat-nvim = buildVimPlugin {
     pname = "hardhat.nvim";
     version = "2024-09-22";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index c2dddac4eeeef..0c1dc0bd8f74e 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -59,6 +59,7 @@
   typescript,
   vim,
   which,
+  xdg-utils,
   xdotool,
   xkb-switch,
   xorg,
@@ -1168,6 +1169,17 @@ in
     dependencies = [ self.guard-nvim ];
   };
 
+  gx-nvim = super.gx-nvim.overrideAttrs {
+    patches = lib.optionals stdenv.hostPlatform.isLinux [
+      (substituteAll {
+        src = ./patches/gx-nvim/fix-paths.patch;
+        inherit xdg-utils;
+      })
+    ];
+
+    nvimRequireCheck = "gx";
+  };
+
   hardhat-nvim = super.hardhat-nvim.overrideAttrs {
     dependencies = with self; [
       overseer-nvim
diff --git a/pkgs/applications/editors/vim/plugins/patches/gx-nvim/fix-paths.patch b/pkgs/applications/editors/vim/plugins/patches/gx-nvim/fix-paths.patch
new file mode 100644
index 0000000000000..380a32b4d54ca
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/patches/gx-nvim/fix-paths.patch
@@ -0,0 +1,13 @@
+diff --git a/lua/gx/init.lua b/lua/gx/init.lua
+index 12272d4..c51771a 100644
+--- a/lua/gx/init.lua
++++ b/lua/gx/init.lua
+@@ -73,7 +73,7 @@ local function get_open_browser_app()
+   if sysname == "Darwin" then
+     app = "open"
+   elseif sysname == "Linux" then
+-    app = "xdg-open"
++    app = "@xdg-utils@/bin/xdg-open"
+   elseif sysname == "Windows_NT" then
+     app = "powershell.exe"
+   end
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index c21f5536c49b8..d28bc08ec4021 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -406,6 +406,7 @@ https://github.com/nvimdev/guard.nvim/,HEAD,
 https://github.com/nmac427/guess-indent.nvim/,HEAD,
 https://github.com/sjl/gundo.vim/,,
 https://github.com/junegunn/gv.vim/,,
+https://github.com/chrishrb/gx.nvim/,HEAD,
 https://github.com/TheSnakeWitcher/hardhat.nvim/,HEAD,
 https://github.com/m4xshen/hardtime.nvim/,HEAD,
 https://git.sr.ht/~sircmpwn/hare.vim,HEAD,

From c5940999475c97aaea48b2dad10497eb0ceca60e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 14:34:56 +0000
Subject: [PATCH 088/101] ironicclient: 5.9.0 -> 5.10.0

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

diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix
index 54b989d4576bf..c1b31bfb091a0 100644
--- a/pkgs/development/python-modules/python-ironicclient/default.nix
+++ b/pkgs/development/python-modules/python-ironicclient/default.nix
@@ -25,12 +25,12 @@
 
 buildPythonPackage rec {
   pname = "python-ironicclient";
-  version = "5.9.0";
+  version = "5.10.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wlXeHtQCrazCSpDdYjENbVc10WbzmV6r6eqQ23xnvbY=";
+    hash = "sha256-Eg2eakri5+1hPuKyq9+f4dL33il6G4LYLZvoWYfU4LY=";
   };
 
   build-system = [

From 05204b552da55775f7d348ce39e07fd2c8d77a99 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 14:38:10 +0000
Subject: [PATCH 089/101] heatclient: 4.0.0 -> 4.1.0

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

diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix
index ac13fca2c722f..dd0a7220896ae 100644
--- a/pkgs/development/python-modules/python-heatclient/default.nix
+++ b/pkgs/development/python-modules/python-heatclient/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "python-heatclient";
-  version = "4.0.0";
+  version = "4.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ozpv4yyu8lmWmKg2iGMMN8IJ29zr87Gj73dn5QMgifI=";
+    hash = "sha256-1oSZzmcDEwThBbF8M/nvY//axJLyQUxDAVOYIsLr9w0=";
   };
 
   build-system = [

From f9863a907258fe2da0fdfd7f434d08df4d909591 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jan 2025 00:59:18 +1000
Subject: [PATCH 090/101] gatekeeper: 3.18.1 -> 3.18.2 (#372540)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/by-name/ga/gatekeeper/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ga/gatekeeper/package.nix b/pkgs/by-name/ga/gatekeeper/package.nix
index a6089418a9425..15988ea3b421b 100644
--- a/pkgs/by-name/ga/gatekeeper/package.nix
+++ b/pkgs/by-name/ga/gatekeeper/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gatekeeper";
-  version = "3.18.1";
+  version = "3.18.2";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "gatekeeper";
-    rev = "v${version}";
-    hash = "sha256-u/XOJjXk6gq+A6VFh/97VgI7eu33/lA91YqL9efUjTU=";
+    tag = "v${version}";
+    hash = "sha256-lO+z/6JRn0iKNoCMiMgYKZ8Jo53udoylleHFRyTF+4w=";
   };
 
   vendorHash = null;

From 864ab9147990e7044402b53c4a9d27acc953dcb9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 15:01:56 +0000
Subject: [PATCH 091/101] rasm: 2.2.11 -> 2.3.0

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

diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix
index cf20b5ddb9ed6..1d40233a15d95 100644
--- a/pkgs/by-name/ra/rasm/package.nix
+++ b/pkgs/by-name/ra/rasm/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rasm";
-  version = "2.2.11";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "EdouardBERGE";
     repo = "rasm";
     rev = "v${version}";
-    hash = "sha256-wFdRMWnOZ3gVp9RwTwD1bJEKVJ9khPRSQoCi75/YiPM=";
+    hash = "sha256-xDiGVPXi12P2YzSESO4I4WGeQgWU9UPhJbenoN8sADc=";
   };
 
   # by default the EXEC variable contains `rasm.exe`

From 633369cbee840a16d1fbb3513d746932b048a42a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 15:05:30 +0000
Subject: [PATCH 092/101] showmethekey: 1.17.0 -> 1.18.0

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

diff --git a/pkgs/by-name/sh/showmethekey/package.nix b/pkgs/by-name/sh/showmethekey/package.nix
index f533522983716..1af1969bb0129 100644
--- a/pkgs/by-name/sh/showmethekey/package.nix
+++ b/pkgs/by-name/sh/showmethekey/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "showmethekey";
-  version = "1.17.0";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "AlynxZhou";
     repo = "showmethekey";
     tag = "v${version}";
-    hash = "sha256-d+k7EbGrFWOztr/e+ugnXVP/hUZAIEgmLDvQDf18K48=";
+    hash = "sha256-D8eh0Wun3bm5k2kuCgaEAR33O6i4aowifd1b0tSWV64=";
   };
 
   nativeBuildInputs = [

From 28a3a358ab5dca2a020782e0623259e630826f6c Mon Sep 17 00:00:00 2001
From: Simon Hauser <simon.hauser@helsinki-systems.de>
Date: Fri, 10 Jan 2025 15:26:05 +0100
Subject: [PATCH 093/101] proxysql: 2.6.0 -> 2.7.1 and fix build

---
 .../by-name/pr/proxysql/dont-phone-home.patch | 12 +--
 pkgs/by-name/pr/proxysql/makefiles.patch      | 78 ++++++++++---------
 pkgs/by-name/pr/proxysql/package.nix          | 17 +++-
 3 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/pkgs/by-name/pr/proxysql/dont-phone-home.patch b/pkgs/by-name/pr/proxysql/dont-phone-home.patch
index 5701d86b4b405..7c4244fd22f79 100644
--- a/pkgs/by-name/pr/proxysql/dont-phone-home.patch
+++ b/pkgs/by-name/pr/proxysql/dont-phone-home.patch
@@ -1,12 +1,12 @@
 diff --git a/src/main.cpp b/src/main.cpp
-index 39dfaa24..634b004b 100644
+index 382b4236..4e1ecc62 100644
 --- a/src/main.cpp
 +++ b/src/main.cpp
-@@ -237,6 +237,7 @@ static char * main_check_latest_version() {
- 
- 
+@@ -201,6 +201,7 @@ static char * main_check_latest_version() {
+  * @return NULL.
+  */
  void * main_check_latest_version_thread(void *arg) {
 +	return NULL;
+ 	set_thread_name("CheckLatestVers");
+ 	// Fetch the latest version information
  	char * latest_version = main_check_latest_version();
- 	if (latest_version) {
- 		if (
diff --git a/pkgs/by-name/pr/proxysql/makefiles.patch b/pkgs/by-name/pr/proxysql/makefiles.patch
index 6a6d003a60883..61cb744101ffe 100644
--- a/pkgs/by-name/pr/proxysql/makefiles.patch
+++ b/pkgs/by-name/pr/proxysql/makefiles.patch
@@ -1,21 +1,29 @@
 diff --git a/Makefile b/Makefile
-index f8902b4f..57844bd7 100644
+index dd6b8c44..7a703858 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -59,11 +59,7 @@ endif
- 
- export MAKEOPT=-j ${NPROCS}
+@@ -73,10 +73,7 @@ endif
+ export MAKEOPT := -j${NPROCS}
  
+ ### systemd
+-SYSTEMD := 0
 -ifeq ($(wildcard /usr/lib/systemd/system), /usr/lib/systemd/system)
--	SYSTEMD=1
--else
--	SYSTEMD=0
+-	SYSTEMD := 1
 -endif
-+SYSTEMD=1
++SYSTEMD := 1
+ 
+ ### check user/group
  USERCHECK := $(shell getent passwd proxysql)
- GROUPCHECK := $(shell getent group proxysql)
+@@ -238,7 +235,7 @@ build_tap_test_debug: build_tap_tests_debug
+ build_tap_tests_debug: build_src_debug
+ 	cd test/tap && OPTZ="${O0} -ggdb -DDEBUG" CC=${CC} CXX=${CXX} ${MAKE} debug
  
-@@ -303,16 +299,10 @@ cleanbuild:
+-# ClickHouse build targets are now default build targets. 
++# ClickHouse build targets are now default build targets.
+ # To maintain backward compatibility, ClickHouse targets are still available.
+ .PHONY: build_deps_clickhouse
+ build_deps_clickhouse: build_deps_default
+@@ -382,16 +379,10 @@ cleanbuild:
  
  .PHONY: install
  install: src/proxysql
@@ -36,11 +44,11 @@ index f8902b4f..57844bd7 100644
  	install -m 0755 etc/init.d/proxysql /etc/init.d
  ifeq ($(DISTRO),"CentOS Linux")
 diff --git a/deps/Makefile b/deps/Makefile
-index 710e070b..fd1352f6 100644
+index 25bcc603..8fafc224 100644
 --- a/deps/Makefile
 +++ b/deps/Makefile
-@@ -69,10 +69,7 @@ default: $(tmpdefault)
- 
+@@ -54,10 +54,7 @@ default: $(targets)
+ ### deps targets
  
  libinjection/libinjection/src/libinjection.a:
 -	cd libinjection && rm -rf libinjection-*/ || true
@@ -49,8 +57,8 @@ index 710e070b..fd1352f6 100644
 -	cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff
  	cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch
  endif
- ifeq ($(UNAME_S),Darwin)
-@@ -86,11 +83,7 @@ libinjection: libinjection/libinjection/src/libinjection.a
+ ifeq ($(SYS_KERN),Darwin)
+@@ -71,11 +68,7 @@ libinjection: libinjection/libinjection/src/libinjection.a
  
  
  libssl/openssl/libssl.a:
@@ -61,17 +69,17 @@ index 710e070b..fd1352f6 100644
 -#	cd libssl/openssl && patch crypto/asn1/a_time.c < ../a_time.c-multiplication-overflow.patch
  	cd libssl/openssl && ./config no-ssl3 no-tests
  	cd libssl/openssl && CC=${CC} CXX=${CXX} ${MAKE}
- 	cd libssl/openssl && ln -s . lib # curl wants this path
-@@ -108,8 +101,6 @@ ifeq ($(MIN_VERSION),$(lastword $(SORTED_VERSIONS)))
- endif
+ 	cd libssl/openssl && ln -fs ./ lib # curl wants this path
+@@ -84,8 +77,6 @@ libssl: libssl/openssl/libssl.a
+ 
  
  libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a
 -	cd libhttpserver && rm -rf libhttpserver-*/ || true
 -	cd libhttpserver && tar -zxf libhttpserver-*.tar.gz
- #ifeq ($(REQUIRE_PATCH), true)
  	cd libhttpserver/libhttpserver && patch -p1 < ../noexcept.patch
  	cd libhttpserver/libhttpserver && patch -p1 < ../re2_regex.patch
-@@ -127,8 +118,6 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a
+ 	cd libhttpserver/libhttpserver && patch -p1 < ../final_val_post_process.patch
+@@ -103,8 +94,6 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a
  
  
  libev/libev/.libs/libev.a:
@@ -80,7 +88,7 @@ index 710e070b..fd1352f6 100644
  	cd libev/libev && patch ev.c < ../ev.c-multiplication-overflow.patch
  	cd libev/libev && ./configure
  	cd libev/libev && CC=${CC} CXX=${CXX} ${MAKE}
-@@ -144,8 +133,6 @@ coredumper/coredumper/src/libcoredumper.a:
+@@ -121,8 +110,6 @@ coredumper/coredumper/src/libcoredumper.a:
  coredumper: coredumper/coredumper/src/libcoredumper.a
  
  curl/curl/lib/.libs/libcurl.a: libssl/openssl/libssl.a
@@ -88,25 +96,18 @@ index 710e070b..fd1352f6 100644
 -	cd curl && tar -zxf curl-*.tar.gz
  #	cd curl/curl && ./configure --disable-debug --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --disable-manual --disable-ipv6 --disable-sspi --disable-crypto-auth --disable-ntlm-wb --disable-tls-srp --without-nghttp2 --without-libidn2 --without-libssh2 --without-brotli --with-ssl=$(shell pwd)/../../libssl/openssl/ && CC=${CC} CXX=${CXX} ${MAKE}
  	cd curl/curl && autoreconf -fi
- ifeq ($(UNAME_S),Darwin)
-@@ -157,16 +144,6 @@ curl: curl/curl/lib/.libs/libcurl.a
+ ifeq ($(SYS_KERN),Darwin)
+@@ -134,9 +121,6 @@ curl: curl/curl/lib/.libs/libcurl.a
  
  
  libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a:
 -	cd libmicrohttpd && rm -rf libmicrohttpd-*/ || true
--	cd libmicrohttpd && rm -f libmicrohttpd || true
--ifeq ($(CENTOSVER),6)
--	cd libmicrohttpd && ln -s libmicrohttpd-0.9.55 libmicrohttpd
--	cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.55.tar.gz
--else
--	cd libmicrohttpd && ln -s libmicrohttpd-0.9.75 libmicrohttpd
--	cd libmicrohttpd && tar -zxf libmicrohttpd-0.9.75.tar.gz
+-	cd libmicrohttpd && tar -zxf libmicrohttpd-*.tar.gz
 -#	cd libmicrohttpd/libmicrohttpd && patch src/microhttpd/connection.c < ../connection.c-snprintf-overflow.patch
--endif
  	cd libmicrohttpd/libmicrohttpd && ./configure --enable-https && CC=${CC} CXX=${CXX} ${MAKE}
  
  microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a
-@@ -182,8 +159,6 @@ cityhash: cityhash/cityhash/src/.libs/libcityhash.a
+@@ -152,8 +136,6 @@ cityhash: cityhash/cityhash/src/.libs/libcityhash.a
  
  
  lz4/lz4/lib/liblz4.a:
@@ -115,7 +116,7 @@ index 710e070b..fd1352f6 100644
  	cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE}
  
  lz4: lz4/lz4/lib/liblz4.a
-@@ -209,8 +184,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s
+@@ -171,8 +153,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s
  
  
  libdaemon/libdaemon/libdaemon/.libs/libdaemon.a:
@@ -124,7 +125,7 @@ index 710e070b..fd1352f6 100644
  	cd libdaemon/libdaemon && patch -p0 < ../daemon_fork_umask.patch
  	cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples
  	cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE}
-@@ -299,8 +272,6 @@ sqlite3: sqlite3/sqlite3/sqlite3.o
+@@ -256,8 +236,6 @@ sqlite3: sqlite3/sqlite3/sqlite3.o
  
  
  libconfig/libconfig/lib/.libs/libconfig++.a:
@@ -133,7 +134,7 @@ index 710e070b..fd1352f6 100644
  	cd libconfig/libconfig && ./configure --disable-examples
  	cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE}
  
-@@ -308,9 +279,6 @@ libconfig: libconfig/libconfig/lib/.libs/libconfig++.a
+@@ -265,9 +243,6 @@ libconfig: libconfig/libconfig/lib/.libs/libconfig++.a
  
  
  prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a:
@@ -143,7 +144,7 @@ index 710e070b..fd1352f6 100644
  	cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch
  	cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch
  	cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch
-@@ -339,8 +303,6 @@ re2: re2/re2/obj/libre2.a
+@@ -296,8 +271,6 @@ re2: re2/re2/obj/libre2.a
  
  
  pcre/pcre/.libs/libpcre.a:
@@ -152,3 +153,8 @@ index 710e070b..fd1352f6 100644
  	cd pcre/pcre && patch pcretest.c < ../pcretest.c-multiplication-overflow.patch
  	cd pcre/pcre && ./configure
  	cd pcre/pcre && CC=${CC} CXX=${CXX} ${MAKE}
+@@ -334,4 +307,3 @@ cleanall:
+ 	cd cityhash && rm -rf cityhash-*/ || true
+ 	cd coredumper && rm -rf coredumper-*/ || true
+ .PHONY: cleanall
+-
diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix
index edf8d11267dd4..ca7ce16a8adce 100644
--- a/pkgs/by-name/pr/proxysql/package.nix
+++ b/pkgs/by-name/pr/proxysql/package.nix
@@ -33,13 +33,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "proxysql";
-  version = "2.6.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "sysown";
     repo = "proxysql";
     rev = finalAttrs.version;
-    hash = "sha256-vFPTBSp5DPNRuhtSD34ah2074almS+jiYxBE1L9Pz6g=";
+    hash = "sha256-Ouz1SSc35gQaJcVQO95azkxNgLxuY712ELAwM5buEtY=";
   };
 
   patches = [
@@ -154,7 +154,18 @@ stdenv.mkDerivation (finalAttrs: {
               }
               {
                 f = "prometheus-cpp";
-                p = prometheus-cpp;
+                p = prometheus-cpp.overrideAttrs (
+                  finalAttrs: _: {
+                    version = "1.1.0";
+
+                    src = fetchFromGitHub {
+                      owner = "jupp0r";
+                      repo = "prometheus-cpp";
+                      tag = "v${finalAttrs.version}";
+                      hash = "sha256-qx6oBxd0YrUyFq+7ArnKBqOwrl5X8RS9nErhRDUJ7+8=";
+                    };
+                  }
+                );
               }
             ]
         )

From 695d658add83720002d258c83ed3304748a77dec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 15:25:04 +0000
Subject: [PATCH 094/101] fantomas: 6.3.16 -> 7.0.0

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

diff --git a/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix
index 050330f49fac4..c0142b6ba85d4 100644
--- a/pkgs/by-name/fa/fantomas/package.nix
+++ b/pkgs/by-name/fa/fantomas/package.nix
@@ -2,9 +2,9 @@
 
 buildDotnetGlobalTool {
   pname = "fantomas";
-  version = "6.3.16";
+  version = "7.0.0";
 
-  nugetHash = "sha256-4tRdYf+/Q1iedx+DDuIKVGlIWQdr6erM51VdKzZkhCs=";
+  nugetHash = "sha256-v4bXmvjZOYxl5RSIHuqVfDzBQdRz5SrmzZtD6SeEYTY=";
 
   meta = with lib; {
     description = "F# source code formatter";

From a889b3948e1000466d2afa1d354c44db7f2a3823 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 10 Jan 2025 18:34:57 +0300
Subject: [PATCH 095/101] linux_6_6: 6.6.70 -> 6.6.71

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

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 77ca7cf60ed08..81cc4843cb4d8 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:043dl195h06hs3zdjd6j1m1zgvmky3s0plrpma75zqf8ab05yghy"
     },
     "6.6": {
-        "version": "6.6.70",
-        "hash": "sha256:15rgzl86q52ki0n7n4xlhb1pmipxbshmnafinsyfnvxjgzh3xll4"
+        "version": "6.6.71",
+        "hash": "sha256:0kkj5v1hd6z8z1vhvdly303kabvp2a93zb89pagm79ng5nx1b5r1"
     },
     "6.11": {
         "version": "6.11.11",

From aa4b3705c50bf5330b5461019e3843df54f57aff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 15:49:20 +0000
Subject: [PATCH 096/101] mkgmap: 4922 -> 4923

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

diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix
index 19e16d2d854ba..47c566f6b4b7d 100644
--- a/pkgs/applications/misc/mkgmap/default.nix
+++ b/pkgs/applications/misc/mkgmap/default.nix
@@ -17,12 +17,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mkgmap";
-  version = "4922";
+  version = "4923";
 
   src = fetchsvn {
     url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk";
     rev = version;
-    sha256 = "sha256-LgGdV6l9tjRR4BpGTDTm0MeAq2uiOe7Pv0qv87nbbWw=";
+    sha256 = "sha256-tB/0VFLn/ch7XWPz1sJ3kqy/1U5Hk1yV9+wq7ohTRWw=";
   };
 
   patches = [

From 36d525a027cd20d86dc14e17d0e4518fbb52aa4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jan 2025 12:42:07 +0000
Subject: [PATCH 097/101] lighttpd: 1.4.76 -> 1.4.77

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

diff --git a/pkgs/by-name/li/lighttpd/package.nix b/pkgs/by-name/li/lighttpd/package.nix
index 3d7bea50a1aff..798a330dda693 100644
--- a/pkgs/by-name/li/lighttpd/package.nix
+++ b/pkgs/by-name/li/lighttpd/package.nix
@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lighttpd";
-  version = "1.4.76";
+  version = "1.4.77";
 
   src = fetchurl {
     url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";
-    sha256 = "sha256-jL9CluNzz9DO3+nZeHYLWwXFj9xASLTivK8KYayPUBE=";
+    sha256 = "sha256-rK+r2/oiZ9i2RS0D2F/dKmZSXz8Fo2p5tmRcAX8VYs4=";
   };
 
   separateDebugInfo = true;

From a5fef0d0f4bc225fa6742506fe0758dd0ef49e78 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Wed, 8 Jan 2025 15:56:31 +0200
Subject: [PATCH 098/101] libnvidia-container: fix cross-compilation for
 aarch64-linux

Signed-off-by: Alexander V. Nikolaev <avn@avnik.info>
---
 pkgs/by-name/li/libnvidia-container/package.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libnvidia-container/package.nix b/pkgs/by-name/li/libnvidia-container/package.nix
index 7f8e75e6ac9a1..bdebfa16221e1 100644
--- a/pkgs/by-name/li/libnvidia-container/package.nix
+++ b/pkgs/by-name/li/libnvidia-container/package.nix
@@ -84,12 +84,19 @@ stdenv.mkDerivation rec {
     #    libtirpc (for now)
     # 4. prevent installation of static libraries because of step 3
     # 5. prevent installation of libnvidia-container-go.so twice
+    # 6. Replace pkg-config and objcopy with target platform's one
+    # 7. Stub ldconfig
+    #
     sed -i Makefile \
       -e 's#DESTDIR=\$(DEPS_DIR)#DESTDIR=""#g' \
       -e 's#\$(DEPS_DIR)\$#\$#g' \
       -e 's#all: shared static tools#all: shared tools#g' \
       -e '/$(INSTALL) -m 644 $(LIB_STATIC) $(DESTDIR)$(libdir)/d' \
-      -e '/$(INSTALL) -m 755 $(libdir)\/$(LIBGO_SHARED) $(DESTDIR)$(libdir)/d'
+      -e '/$(INSTALL) -m 755 $(libdir)\/$(LIBGO_SHARED) $(DESTDIR)$(libdir)/d' \
+      -e "s,pkg-config,$PKG_CONFIG,g"
+    substituteInPlace mk/common.mk \
+      --replace-fail objcopy '$(OBJCOPY)' \
+      --replace-fail ldconfig true
   '';
 
   enableParallelBuilding = true;
@@ -98,7 +105,12 @@ stdenv.mkDerivation rec {
     HOME="$(mktemp -d)"
   '';
 
-  env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getInclude libtirpc}/include/tirpc" ];
+  env = {
+    NIX_CFLAGS_COMPILE = toString [ "-I${lib.getInclude libtirpc}/include/tirpc" ];
+    CGO_ENABLED = "1"; # Needed for cross-compilation
+    GOFLAGS = "-trimpath"; # Don't include paths to Go stdlib to resulting binary
+    inherit (go) GOARCH GOOS;
+  };
   NIX_LDFLAGS = [
     "-L${lib.getLib libtirpc}/lib"
     "-ltirpc"

From f471445fe35ce3a2d695eb6215e028a7915c34e0 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 10 Jan 2025 10:46:42 -0600
Subject: [PATCH 099/101] vimPlugins.blink-emoji-nvim: init at 2025-01-04

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix  |  4 ++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 3 files changed, 17 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index ac7f5cbe5cec1..5b0d9679bb2af 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1290,6 +1290,18 @@ final: prev:
     meta.homepage = "https://github.com/Saghen/blink.compat/";
   };
 
+  blink-emoji-nvim = buildVimPlugin {
+    pname = "blink-emoji.nvim";
+    version = "2025-01-04";
+    src = fetchFromGitHub {
+      owner = "moyiz";
+      repo = "blink-emoji.nvim";
+      rev = "81e6c080d1e64c9ef548534c51147fd8063481c8";
+      sha256 = "1kh5sblmnkspdjhcski2dghmkv2asw35k1cib1227h21rlalqc67";
+    };
+    meta.homepage = "https://github.com/moyiz/blink-emoji.nvim/";
+  };
+
   blink-ripgrep-nvim = buildVimPlugin {
     pname = "blink-ripgrep.nvim";
     version = "2025-01-04";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 0b2222023a5f6..c4e3678ada56a 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -266,6 +266,10 @@ in
     dependencies = [ self.copilot-lua ];
   };
 
+  blink-emoji-nvim = super.blink-emoji-nvim.overrideAttrs {
+    dependencies = [ self.blink-cmp ];
+  };
+
   bluloco-nvim = super.bluloco-nvim.overrideAttrs {
     dependencies = [ self.lush-nvim ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index b77212ae4d518..b8971349d6a32 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -104,6 +104,7 @@ https://github.com/max397574/better-escape.nvim/,,
 https://github.com/LunarVim/bigfile.nvim/,,
 https://github.com/APZelos/blamer.nvim/,HEAD,
 https://github.com/giuxtaposition/blink-cmp-copilot/,HEAD,
+https://github.com/moyiz/blink-emoji.nvim/,HEAD,
 https://github.com/mikavilpas/blink-ripgrep.nvim/,HEAD,
 https://github.com/Saghen/blink.compat/,HEAD,
 https://github.com/HampusHauffman/block.nvim/,HEAD,

From a974e43a90865245b2cd9a544299d8d7565f74a1 Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Fri, 10 Jan 2025 08:22:25 -0800
Subject: [PATCH 100/101] libsixel: make linking against gd a choosable option.

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

diff --git a/pkgs/by-name/li/libsixel/package.nix b/pkgs/by-name/li/libsixel/package.nix
index 186920ccf282a..76d028ced1e5a 100644
--- a/pkgs/by-name/li/libsixel/package.nix
+++ b/pkgs/by-name/li/libsixel/package.nix
@@ -7,19 +7,33 @@
   gdk-pixbuf,
   gd,
   pkg-config,
+
+  # Enable linking against image loading libraries as part of the
+  # implementation of the sixel_helper_{load,write}_image_file() functions.
+  # These helper functions are not needed for the main functionality of the
+  # library to encode image buffers to sixels.
+  #
+  # libsixel already uses vendored stb image loading to provide basic
+  # implementations, but also allows for the "gd" library to be linked for
+  # a wider set of image formats.
+  # This pulls in a large amount of deps bloating the resulting library.
+  #
+  # Default off, but configurable in case you really need it.
+  withGd ? false,
 }:
-stdenv.mkDerivation rec {
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "libsixel";
   version = "1.10.5";
 
   src = fetchFromGitHub {
     owner = "libsixel";
     repo = "libsixel";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-obzBZAknN3N7+Bvtd0+JHuXcemVb7wRv+Pt4VjS6Bck=";
   };
 
-  buildInputs = [
+  buildInputs = lib.optionals withGd [
     gdk-pixbuf
     gd
   ];
@@ -34,8 +48,14 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Dtests=enabled"
-    # build system seems to be broken here, it still seems to handle jpeg
-    # through some other ways.
+    "-Dimg2sixel=enabled"
+    "-Dsixel2png=enabled"
+
+    (lib.mesonEnable "gd" withGd)
+
+    # build system seems to be broken here; error message indicates pkconfig
+    # issue.
+    # Not to worry: jpeg and png are handled by the built-in stb and/or gd lib.
     "-Djpeg=disabled"
     "-Dpng=disabled"
   ];
@@ -47,4 +67,4 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     platforms = platforms.unix;
   };
-}
+})

From fa4a76acc7474edb7e8e175281bb41d8c0961ccf Mon Sep 17 00:00:00 2001
From: Sergio Scabuzzo <sergio@ecotechie.io>
Date: Thu, 9 Jan 2025 15:42:46 -0800
Subject: [PATCH 101/101] zoom-us: 6.3.1.5673 -> 6.2.11.5069 (x86_64-linux
 only)

Downgrade the version of Zoom on x86_64-linux due to OOM issues
---
 pkgs/by-name/zo/zoom-us/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 0b2581aaf4581..7cc46715e99c5 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -47,12 +47,12 @@ let
   throwSystem = throw "Unsupported system: ${system}";
 
   # Zoom versions are released at different times for each platform
-  # and often with different versions.  We write them on three lines
+  # and often with different versions. We write them on three lines
   # like this (rather than using {}) so that the updater script can
   # find where to edit them.
   versions.aarch64-darwin = "6.3.1.45300";
   versions.x86_64-darwin = "6.3.1.45300";
-  versions.x86_64-linux = "6.3.1.5673";
+  versions.x86_64-linux = "6.2.11.5069";
 
   srcs = {
     aarch64-darwin = fetchurl {
@@ -66,7 +66,7 @@ let
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-0gREcRnGkiFj6kIra0laR5PUqrb0Jvoj6gDfpAVLRtg=";
+      hash = "sha256-k8T/lmfgAFxW1nwEyh61lagrlHP5geT2tA7e5j61+qw=";
     };
   };