From 1ea74e68c8024ac8a316164e2991c0a1dd99cf5f Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Mon, 16 Dec 2024 23:21:42 -0500
Subject: [PATCH 01/54] tor-browser: fix desktop icon

---
 pkgs/by-name/to/tor-browser/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index 8803c3a05704..fb77c43d3066 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -199,6 +199,7 @@ lib.warnIf (useHardenedMalloc != null)
             "x-scheme-handler/http"
             "x-scheme-handler/https"
           ];
+          startupWMClass = "Tor Browser";
         })
       ];
 

From a21e4fa9e0773cdb937a492a60a3207eb231f0cc Mon Sep 17 00:00:00 2001
From: Ilya Epifanov <mail@ilya.network>
Date: Fri, 20 Dec 2024 22:05:47 +0100
Subject: [PATCH 02/54] restic: fixed handling of arguments with spaces in
 restic wrappers

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

diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix
index 0fb601cce589..e4ca2740f8e1 100644
--- a/nixos/modules/services/backup/restic.nix
+++ b/nixos/modules/services/backup/restic.nix
@@ -412,7 +412,7 @@ in
       ]}
       PATH=${config.systemd.services."restic-backups-${name}".environment.PATH}:$PATH
 
-      exec ${resticCmd} $@
+      exec ${resticCmd} "$@"
     '') (lib.filterAttrs (_: v: v.createWrapper) config.services.restic.backups);
   };
 }

From a693796eb0c2bf350a2c5932d4d7361a8f001a6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Dec 2024 07:50:37 +0000
Subject: [PATCH 03/54] python312Packages.meshtastic: 2.5.5 -> 2.5.6post1

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

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 18de6f4c4bb7..6e6a91298036 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.5.5";
+  version = "2.5.6post1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -41,8 +41,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "meshtastic";
     repo = "Meshtastic-python";
-    rev = "refs/tags/${version}";
-    hash = "sha256-k+Hq3pIuh8lwyoCl1KyHLt2B3OrGzBC6XDauUfVEyd8=";
+    tag = version;
+    hash = "sha256-mt+6fPUAxyw3JFG9WyLdNbP00NJbDTeQc84EbccMt9I=";
   };
 
   pythonRelaxDeps = [

From 5c5d7df9cfc6cf6ecffe2c847fead30aa7b87cc0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 05:41:56 +0000
Subject: [PATCH 04/54] tenv: 3.2.11 -> 4.0.3

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

diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix
index 1fe5197e7140..9f347521abe6 100644
--- a/pkgs/by-name/te/tenv/package.nix
+++ b/pkgs/by-name/te/tenv/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "tenv";
-  version = "3.2.11";
+  version = "4.0.3";
 
   src = fetchFromGitHub {
     owner = "tofuutils";
     repo = "tenv";
     rev = "v${version}";
-    hash = "sha256-9xQsfgQrLBhanwr9rgFkt8Ej2Mvt6L7iViTK4duBIRg=";
+    hash = "sha256-DqKgoobzaAGoT7ODA9d5Zgs1dnlAishNJ0E23Nqbp8Y=";
   };
 
-  vendorHash = "sha256-zx3VQu4LsvQ3OgjM9n000wBzWjwZo5MtctppnVx7fYM=";
+  vendorHash = "sha256-JrAzjnXqZSlsukLRXqHReiKPuOyWQS85/F2EnXf043U=";
 
   # Tests disabled for requiring network access to release.hashicorp.com
   doCheck = false;

From aa1d45dc665330c7647aede5684f34a6497ecfaa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Dec 2024 06:12:17 +0000
Subject: [PATCH 05/54] turnon: 1.6.2 -> 2.0.0

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

diff --git a/pkgs/by-name/tu/turnon/package.nix b/pkgs/by-name/tu/turnon/package.nix
index 517672f7510d..aba0ff47ae19 100644
--- a/pkgs/by-name/tu/turnon/package.nix
+++ b/pkgs/by-name/tu/turnon/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "turnon";
-  version = "1.6.2";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "swsnr";
     repo = "turnon";
     rev = "v${version}";
-    hash = "sha256-e9xrBtLAe/OAiDMn87IuzS/6NT8s4ZRHLAI/KF42ZdU=";
+    hash = "sha256-HCeK0aOGxeiZD7Am+kUf3z4rT7JENQxyrAufBStrSms=";
   };
 
-  cargoHash = "sha256-DlEoJ5YJe679RFRfk/Bs217KrOSxSgqDJa+xpdJaTVs=";
+  cargoHash = "sha256-43hv+ZCpgXK6GGMDG0hXza7g4jvRNmr57MTgkvTOvVQ=";
 
   nativeBuildInputs = [
     cairo

From 1cf301833050858627f3eb7e7510c7edb726fb12 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Dec 2024 09:30:42 +0100
Subject: [PATCH 06/54] python312Packages.archinfo: 9.2.133 -> 9.2.134

Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.133...v9.2.134
---
 pkgs/development/python-modules/archinfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index a3047f14ef87..9eb5be283c87 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.2.133";
+  version = "9.2.134";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "archinfo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-opIQm/59X+5PDJiFW8SkB0CrFkICBTgbNW8ZUXMfrnw=";
+    hash = "sha256-3NfiK75RyEFz2Pe+NPLMrbyvwgZxD7fKCGg4o8SpO40=";
   };
 
   build-system = [ setuptools ];

From f5e1da29af5022044aa49b3401eaaed08e913f92 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Dec 2024 09:31:06 +0100
Subject: [PATCH 07/54] python312Packages.ailment: 9.2.133 -> 9.2.134

Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.133...v9.2.134
---
 pkgs/development/python-modules/ailment/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index 3212fd2c284a..c6a3381ca2fb 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "ailment";
-  version = "9.2.133";
+  version = "9.2.134";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "ailment";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3yNMrIQWW+pvwfGzox1rHLXzfY3Y6jjU8YFdrZgMePA=";
+    hash = "sha256-ev3/5TNj7bK0T9ouWVdA6PXqEiC+KFwtM35QD9BIyJs=";
   };
 
   build-system = [ setuptools ];

From c9c5d2b68d9db3df4d1d710d9c8c2949b286e523 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Dec 2024 09:32:51 +0100
Subject: [PATCH 08/54] python312Packages.pyvex: 9.2.133 -> 9.2.134

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

diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index cd719047b6a7..1a1fc99ac3d4 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.2.133";
+  version = "9.2.134";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uFoMI8byPyjwpQhruh8Hpk9MF8PZBkTvqbXemUHDWqs=";
+    hash = "sha256-uskSojAEE+9pQD4531+L5OkgRIAtxwvE4/7AZnlkiBI=";
   };
 
   build-system = [ setuptools ];

From 088b668f2cb9839f67b5f4f8abfde9f89896ebd0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Dec 2024 09:34:17 +0100
Subject: [PATCH 09/54] python312Packages.claripy: 9.2.133 -> 9.2.134

Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.133...v9.2.134
---
 pkgs/development/python-modules/claripy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index 993a8ecd4b83..6b4c1ea360b9 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "claripy";
-  version = "9.2.133";
+  version = "9.2.134";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "claripy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Fdeh0wr7hPa6SG7UG5Ue58W3x7JYD97NAU29FFklLcA=";
+    hash = "sha256-jz7eF01dYOsa/f6ssAwBK66LGxBXozG075yEllq8j9Y=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail

From d69ae91df29b1d2a25440a29ca7b0d748cba1288 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Dec 2024 09:36:09 +0100
Subject: [PATCH 10/54] python312Packages.cle: 9.2.133 -> 9.2.134

Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.133...v9.2.134
---
 pkgs/development/python-modules/cle/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index 26d273b793f9..77ad1bd24587 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -16,14 +16,14 @@
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.2.133";
+  version = "9.2.134";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
     owner = "angr";
     repo = "binaries";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+vAD9XvqV45wf7sf+VuhTbw2gFeJra5gBptfg8r8e8U=";
+    hash = "sha256-2C4vA8lRLLcfwqGoQ3dqV1kGGtlKx2sgSOKy1QqsEVY=";
   };
 in
 buildPythonPackage rec {
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "cle";
     rev = "refs/tags/v${version}";
-    hash = "sha256-R57Qd04/xtDW7/WDcZpOhkYOBCSmBNq2Bn3BYDfjseA=";
+    hash = "sha256-0txid9qiNMEBemSphwok5Gkk3NJvzWSIlvrqFnre5TA=";
   };
 
   build-system = [ setuptools ];

From 92f6de17476dc717dacb5f2ee20bb41353082177 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Dec 2024 09:58:41 +0100
Subject: [PATCH 11/54] python311Packages.angr: 9.2.133 -> 9.2.134

Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.133...v9.2.134
---
 pkgs/development/python-modules/angr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index 4d74eae25fc9..d24131f42230 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -36,7 +36,7 @@
 
 buildPythonPackage rec {
   pname = "angr";
-  version = "9.2.133";
+  version = "9.2.134";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "angr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-dHksVhuQUC0f55WNPSkVHTXTGVuul742LeWSz0CTwrw=";
+    hash = "sha256-wBneJJ+kR99hNHf0Ki1U6CS9pru60wiwIGV26JC8lWU=";
   };
 
   postPatch = ''

From d59220576b1e618040d55775a7e3b6f76a406fe7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 29 Dec 2024 12:22:39 +0100
Subject: [PATCH 12/54] python312Packages.meshtastic: 2.5.6post1 -> 2.5.9

Diff: https://github.com/meshtastic/Meshtastic-python/compare/None...2.5.9

Changelog: https://github.com/meshtastic/python/releases/tag/2.5.9
---
 .../python-modules/meshtastic/default.nix     | 50 +++++++++++--------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix
index 6e6a91298036..6bb0c67f39a2 100644
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@@ -1,21 +1,23 @@
 {
   lib,
+  argcomplete,
   bleak,
   buildPythonPackage,
   dash-bootstrap-components,
+  dash,
   dotmap,
   fetchFromGitHub,
   hypothesis,
   packaging,
+  pandas-stubs,
+  pandas,
   parse,
-  pexpect,
   platformdirs,
   poetry-core,
   ppk2-api,
   print-color,
   protobuf,
   pyarrow,
-  pyparsing,
   pypubsub,
   pyqrcode,
   pyserial,
@@ -27,22 +29,21 @@
   riden,
   setuptools,
   tabulate,
-  timeago,
-  webencodings,
+  wcwidth,
 }:
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.5.6post1";
+  version = "2.5.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "meshtastic";
     repo = "Meshtastic-python";
     tag = version;
-    hash = "sha256-mt+6fPUAxyw3JFG9WyLdNbP00NJbDTeQc84EbccMt9I=";
+    hash = "sha256-q5hGAe3kJk1E/u2l8uCMyHHVuQmlwODkyZDiqxFn3Bo=";
   };
 
   pythonRelaxDeps = [
@@ -54,36 +55,43 @@ buildPythonPackage rec {
 
   dependencies = [
     bleak
-    dotmap
     packaging
-    parse
-    pexpect
-    platformdirs
-    ppk2-api
-    print-color
     protobuf
-    pyarrow
-    pyparsing
     pypubsub
-    pyqrcode
     pyserial
     pyyaml
     requests
     setuptools
     tabulate
-    timeago
-    webencodings
   ];
 
   optional-dependencies = {
+    analysis = [
+      dash
+      dash-bootstrap-components
+      pandas
+      pandas-stubs
+    ];
+    cli = [
+      argcomplete
+      dotmap
+      print-color
+      pyqrcode
+      wcwidth
+    ];
+    powermon = [
+      parse
+      platformdirs
+      ppk2-api
+      pyarrow
+      riden
+    ];
     tunnel = [ pytap2 ];
   };
 
   nativeCheckInputs = [
-    dash-bootstrap-components
     hypothesis
     pytestCheckHook
-    riden
   ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
@@ -117,7 +125,7 @@ buildPythonPackage rec {
     description = "Python API for talking to Meshtastic devices";
     homepage = "https://github.com/meshtastic/Meshtastic-python";
     changelog = "https://github.com/meshtastic/python/releases/tag/${version}";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
 }

From 322fb91a1c68004e9826e8c98ebb4a406cc12a41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 02:57:06 +0000
Subject: [PATCH 13/54] llama-cpp: 4367 -> 4397

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 74369e968aa8..1f500426aa36 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -81,13 +81,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "4367";
+  version = "4397";
 
   src = fetchFromGitHub {
     owner = "ggerganov";
     repo = "llama.cpp";
     rev = "refs/tags/b${finalAttrs.version}";
-    hash = "sha256-N7uNIb6bkTsTx/kgbnc7mahYUIeV1ks4piwwgoXauRM=";
+    hash = "sha256-zPWx8gdai8OfoBCr2X2oJYg45ipLselYZMrL+MbQ1AY=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From 56cf732519b67b2f869b104f94f9164b005e559c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 17:16:15 +0000
Subject: [PATCH 14/54] python312Packages.tree-sitter-javascript: 0.21.3 ->
 0.23.1

---
 .../python-modules/tree-sitter-javascript/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tree-sitter-javascript/default.nix b/pkgs/development/python-modules/tree-sitter-javascript/default.nix
index 8987a233ae37..07a5d35ef751 100644
--- a/pkgs/development/python-modules/tree-sitter-javascript/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-javascript/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "tree-sitter-javascript";
-  version = "0.21.3";
+  version = "0.23.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tree-sitter";
     repo = "tree-sitter-javascript";
-    rev = "v${version}";
-    hash = "sha256-jsdY9Pd9WqZuBYtk088mx1bRQadC6D2/tGGVY+ZZ0J4=";
+    tag = "v${version}";
+    hash = "sha256-apgWWYD0XOvH5c3BY7kAF7UYtwPJaEvJzC5aWvJ9YQ8=";
   };
 
   build-system = [

From efe567f41af0f25ba63447c8f10170c267d2801a Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 29 Dec 2024 22:44:33 +0200
Subject: [PATCH 15/54] python312Packages.tree-sitter: fix failing
 test_properties

---
 pkgs/development/python-modules/tree-sitter/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/tree-sitter/default.nix b/pkgs/development/python-modules/tree-sitter/default.nix
index 4ee037d37f84..88c7a1996e3a 100644
--- a/pkgs/development/python-modules/tree-sitter/default.nix
+++ b/pkgs/development/python-modules/tree-sitter/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -26,6 +27,12 @@ buildPythonPackage rec {
     hash = "sha256-RWnt1g7WN5CDbgWY5YSTuPFZomoxtRgDaSLkG9y2B6w=";
     fetchSubmodules = true;
   };
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/tree-sitter/py-tree-sitter/commit/a85342e16d28c78a1cf1e14c74f4598cd2a5f3e0.patch";
+      hash = "sha256-gm79KciA/KoDqrRfWuSB3GOD1jBx6Skd1olt4zoofaw=";
+    })
+  ];
 
   build-system = [ setuptools ];
 

From 77da7694cc7758e980037b67022d8bb25216355d Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Tue, 31 Dec 2024 01:29:25 +0900
Subject: [PATCH 16/54] python312Packages.zc-buildout: 3.0.1 -> 3.3

Diff: https://github.com/buildout/buildout/compare/3.0.1...3.3
---
 pkgs/development/python-modules/buildout/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix
index a653318ffe6f..b2197c501758 100644
--- a/pkgs/development/python-modules/buildout/default.nix
+++ b/pkgs/development/python-modules/buildout/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "zc-buildout";
-  version = "3.0.1";
+  version = "3.3";
 
   src = fetchFromGitHub {
     owner = "buildout";
     repo = "buildout";
-    rev = version;
-    sha256 = "J/ymUCFhl7EviHMEYSUCTky0ULRT8aL4gNCGxrbqJi0=";
+    tag = version;
+    hash = "sha256-o/iMCc8Jf+jNCHu3OnbCxD+oukoH/b7SUsdm6traO7k=";
   };
 
   propagatedBuildInputs = [

From f632dcd105f70d91ecd7f49f5be7a46574415c8c Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Tue, 31 Dec 2024 01:36:12 +0900
Subject: [PATCH 17/54] python312Packages.zc-buildout: refactor

---
 .../{buildout => zc-buildout}/default.nix      | 18 +++++++++---------
 pkgs/top-level/python-packages.nix             |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename pkgs/development/python-modules/{buildout => zc-buildout}/default.nix (74%)

diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/zc-buildout/default.nix
similarity index 74%
rename from pkgs/development/python-modules/buildout/default.nix
rename to pkgs/development/python-modules/zc-buildout/default.nix
index b2197c501758..fa947a007b2a 100644
--- a/pkgs/development/python-modules/buildout/default.nix
+++ b/pkgs/development/python-modules/zc-buildout/default.nix
@@ -4,12 +4,12 @@
   lib,
   pip,
   setuptools,
-  wheel,
 }:
 
 buildPythonPackage rec {
   pname = "zc-buildout";
   version = "3.3";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "buildout";
@@ -18,22 +18,22 @@ buildPythonPackage rec {
     hash = "sha256-o/iMCc8Jf+jNCHu3OnbCxD+oukoH/b7SUsdm6traO7k=";
   };
 
-  propagatedBuildInputs = [
-    setuptools
-    pip
-    wheel
-  ];
+  build-system = [ setuptools ];
+
+  dependencies = [ pip ];
 
   doCheck = false; # Missing package & BLOCKED on "zc.recipe.egg"
 
   pythonImportsCheck = [ "zc.buildout" ];
 
-  meta = with lib; {
+  pythonNamespaces = [ "zc" ];
+
+  meta = {
     description = "Software build and configuration system";
     mainProgram = "buildout";
     downloadPage = "https://github.com/buildout/buildout";
     homepage = "https://www.buildout.org";
-    license = licenses.zpl21;
-    maintainers = with maintainers; [ gotcha ];
+    license = lib.licenses.zpl21;
+    maintainers = with lib.maintainers; [ gotcha ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 67e850576181..3587848deb2f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18368,7 +18368,7 @@ self: super: with self; {
 
   zarr = callPackage ../development/python-modules/zarr { };
 
-  zc-buildout = callPackage ../development/python-modules/buildout { };
+  zc-buildout = callPackage ../development/python-modules/zc-buildout { };
 
   zc-lockfile = callPackage ../development/python-modules/zc-lockfile { };
 

From 2f11e237682f116b592c7adff26ea3ba33a9cef0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Dec 2024 20:30:06 +0000
Subject: [PATCH 18/54] python312Packages.qtile-bonsai: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/development/python-modules/qtile-bonsai/default.nix b/pkgs/development/python-modules/qtile-bonsai/default.nix
index d8dbd3a8d680..38f10c885182 100644
--- a/pkgs/development/python-modules/qtile-bonsai/default.nix
+++ b/pkgs/development/python-modules/qtile-bonsai/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "qtile-bonsai";
-  version = "0.4.0";
+  version = "0.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aravinda0";
     repo = "qtile-bonsai";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-IWy/YEVdZc+UgIKl75ZpOkOIvpS5hCX0ihQenUOuJHo=";
+    tag = "v${version}";
+    hash = "sha256-1wiBrLQDdQGsoZAT5XUzmuloVo90y+GZu1bqPrbQl48=";
   };
 
   build-system = [

From 4f2ebe9e6479dc02bbb37a932618642b89be9af3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 30 Dec 2024 22:38:44 +0100
Subject: [PATCH 19/54] python312Packages.aiomealie: 0.9.4 -> 0.9.5

Diff: https://github.com/joostlek/python-mealie/compare/refs/tags/v0.9.4...v0.9.5

Changelog: https://github.com/joostlek/python-mealie/releases/tag/v0.9.5
---
 pkgs/development/python-modules/aiomealie/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix
index a795c97e66c4..af7b7643fbc3 100644
--- a/pkgs/development/python-modules/aiomealie/default.nix
+++ b/pkgs/development/python-modules/aiomealie/default.nix
@@ -2,6 +2,7 @@
   lib,
   aiohttp,
   aioresponses,
+  awesomeversion,
   buildPythonPackage,
   fetchFromGitHub,
   mashumaro,
@@ -17,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "aiomealie";
-  version = "0.9.4";
+  version = "0.9.5";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,13 +27,14 @@ buildPythonPackage rec {
     owner = "joostlek";
     repo = "python-mealie";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Sl2n78R/twx4+liob4k0B1pskonYD7B00lo9hz45qIs=";
+    hash = "sha256-hcHXX95d9T/jJMqHkikWN8ZdM5MRxJxhH575U3KDXxY=";
   };
 
   build-system = [ poetry-core ];
 
   dependencies = [
     aiohttp
+    awesomeversion
     mashumaro
     orjson
     yarl

From 8359653f6bb0c1b1533e6d0b2f7998c37f7c6760 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 07:27:53 +0000
Subject: [PATCH 20/54] gh-contribs: 0.9.0 -> 0.10.1

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

diff --git a/pkgs/by-name/gh/gh-contribs/package.nix b/pkgs/by-name/gh/gh-contribs/package.nix
index d3f769ea1b87..46d11241d4f9 100644
--- a/pkgs/by-name/gh/gh-contribs/package.nix
+++ b/pkgs/by-name/gh/gh-contribs/package.nix
@@ -9,13 +9,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "gh-contribs";
-  version = "0.9.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "MintArchit";
     repo = "gh-contribs";
     rev = "v${version}";
-    hash = "sha256-yPJ9pmnbqR+fXH02Q5VMn0v2MuDQbPUpNzKw1awmKVE=";
+    hash = "sha256-fqyxq/lpMcLXOYY0MNI5uv8Go2erpg7dEIsEI+ExSVI=";
   };
 
   nativeBuildInputs = [

From 73c5ff49b746d370de4f17fea0428e0c007a9fea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 07:44:55 +0000
Subject: [PATCH 21/54] ladybird: 0-unstable-2024-12-23 ->
 0-unstable-2024-12-30

---
 pkgs/applications/networking/browsers/ladybird/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix
index a8bdb51c2f08..81c3d4acca1e 100644
--- a/pkgs/applications/networking/browsers/ladybird/default.nix
+++ b/pkgs/applications/networking/browsers/ladybird/default.nix
@@ -48,13 +48,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ladybird";
-  version = "0-unstable-2024-12-23";
+  version = "0-unstable-2024-12-30";
 
   src = fetchFromGitHub {
     owner = "LadybirdWebBrowser";
     repo = "ladybird";
-    rev = "d5bbf8dcf803c429afab76610dfba3b1ee23f0ae";
-    hash = "sha256-Kew/MFFCq6sTXt8jfXC78kpQNHAjX8cQyLWO3+MeikU=";
+    rev = "4324439006a6df1179440ce4f415b67658919957";
+    hash = "sha256-vg2Nb85+fegs7Idika9Mbq+f27wrIO48pWQSUidLKwE=";
   };
 
   postPatch = ''

From e3566e5863553d6951804ece1aa5659146abbaeb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 11:07:57 +0100
Subject: [PATCH 22/54] ldeep: 1.0.77 -> 1.0.78

Diff: https://github.com/franc-pentest/ldeep/compare/None...1.0.78

Changelog: https://github.com/franc-pentest/ldeep/releases/tag/1.0.78
---
 pkgs/by-name/ld/ldeep/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ld/ldeep/package.nix b/pkgs/by-name/ld/ldeep/package.nix
index c8820a7a7da0..6fee78ff4f0d 100644
--- a/pkgs/by-name/ld/ldeep/package.nix
+++ b/pkgs/by-name/ld/ldeep/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ldeep";
-  version = "1.0.77";
+  version = "1.0.78";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "franc-pentest";
     repo = "ldeep";
     tag = version;
-    hash = "sha256-JC5XsKNcWAJBJzlZehWnxYYp+GdxLrwSv7oB16KGcCE=";
+    hash = "sha256-ExAZrlrsx6ijTeUSiPNL06wY4gWUuCNajpyXqpq785I=";
   };
 
   pythonRelaxDeps = [

From d94c8482f238a1324bfc2638a352272458777a9c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 12:35:24 +0100
Subject: [PATCH 23/54] python312Packages.cyclopts: 3.1.2 -> 3.1.3

Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v3.1.2...v3.1.3

Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v3.1.3
---
 pkgs/development/python-modules/cyclopts/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index 7948762c3e21..f17dbf935164 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "cyclopts";
-  version = "3.1.2";
+  version = "3.1.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "BrianPugh";
     repo = "cyclopts";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5LJSo7DlzId0gd8Egv+JAbLk59tSl2HbwjyGm0qy5nI=";
+    hash = "sha256-N53obWs924HqxELxO1Ax4Jy+u+e4KT+FSbX4UhR+pJg=";
   };
 
   build-system = [
@@ -54,6 +54,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "cyclopts" ];
 
+  disabledTests = [
+    # Assertion error
+    "test_pydantic_error_msg"
+  ];
+
   meta = with lib; {
     description = "Module to create CLIs based on Python type hints";
     homepage = "https://github.com/BrianPugh/cyclopts";

From 28243f67679f0e39d6d293b6b118ac2b1f8d775a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 12:52:37 +0100
Subject: [PATCH 24/54] python312Packages.onvif-zeep-async: 3.1.12 -> 3.1.13

Diff: https://github.com/openvideolibs/python-onvif-zeep-async/compare/refs/tags/v3.1.12...v3.1.13

Changelog: https://github.com/openvideolibs/python-onvif-zeep-async/releases/tag/v3.1.13
---
 .../onvif-zeep-async/default.nix              | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix
index 8da15eabe811..58f02971c949 100644
--- a/pkgs/development/python-modules/onvif-zeep-async/default.nix
+++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix
@@ -2,25 +2,30 @@
   lib,
   buildPythonPackage,
   ciso8601,
-  fetchPypi,
+  fetchFromGitHub,
   httpx,
   pythonOlder,
+  setuptools,
   zeep,
 }:
 
 buildPythonPackage rec {
   pname = "onvif-zeep-async";
-  version = "3.1.12";
-  format = "setuptools";
+  version = "3.1.13";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-TXSwrWnDXzntXZN/u09QB3BsIa6tpf6LpGFKEyA/GH8=";
+  src = fetchFromGitHub {
+    owner = "openvideolibs";
+    repo = "python-onvif-zeep-async";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Z9LtKcgyebmdrChRz0QwiQdnrtcIVeCtKQAvL9gBMY4=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     ciso8601
     httpx
     zeep
@@ -33,9 +38,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "ONVIF Client Implementation in Python";
-    mainProgram = "onvif-cli";
     homepage = "https://github.com/hunterjm/python-onvif-zeep-async";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/openvideolibs/python-onvif-zeep-async/releases/tag/v${version}";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "onvif-cli";
   };
 }

From fff77f299b8c7ec43d46d802afbe87c079fb5a7a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 12:56:43 +0100
Subject: [PATCH 25/54] python312Packages.playwrightcapture: 1.27.4 -> 1.27.5

Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.27.4...v1.27.5

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

diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix
index 764f75c56471..02f2035d9c02 100644
--- a/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/pkgs/development/python-modules/playwrightcapture/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "playwrightcapture";
-  version = "1.27.4";
+  version = "1.27.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "Lookyloo";
     repo = "PlaywrightCapture";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1K/e7pJtfNSuQ1GlNT2m8P7zEXqC1zUP1M8acbW2kOY=";
+    hash = "sha256-TnK7CeW4mJGS77tzYkBQJbLn+niZEMWScpLLaWLmQAA=";
   };
 
   pythonRelaxDeps = [

From c330eb238a27327235819930cc6cd32ac6d355bc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 13:01:10 +0100
Subject: [PATCH 26/54] python312Packages.tencentcloud-sdk-python: 3.0.1291 ->
 3.0.1292

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

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1292/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 b3d177f36e9e..77cb84f65ed1 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.1291";
+  version = "3.0.1292";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-Kc+gnY1swnN2Rle/JHPJlopziYbCIFijRKVZx5Phs8w=";
+    hash = "sha256-ESLSp/EtppSs+tkaSYU2CTadLTUYIvtlpyHI9fQs1es=";
   };
 
   build-system = [ setuptools ];

From c0ee061183e7040a18ee9c8b70cee935d9a98a2d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 22 Dec 2024 20:42:49 +0800
Subject: [PATCH 27/54] pantheon.switchboard-plug-applications: 8.0.0 -> 8.1.0

https://github.com/elementary/switchboard-plug-applications/compare/8.0.0...8.1.0
---
 .../pantheon/apps/switchboard-plugs/applications/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index f8d5db7c8b8a..2a7f5c78df6f 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-applications";
-  version = "8.0.0";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-dExMuPZJl/l7lRIY8kkmuRcQaPS39VBfE0dRrINLWx8=";
+    sha256 = "sha256-jdSdzOHu1u/8N/eN6D9MjR/9K7n+rfmuBpyRSweb6lA=";
   };
 
   nativeBuildInputs = [

From 66ca2175e0aede0b81f44cf0911299678f49e057 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 31 Dec 2024 23:02:07 +0800
Subject: [PATCH 28/54] pantheon.switchboard-plug-mouse-touchpad: 8.0.1 ->
 8.0.2

https://github.com/elementary/switchboard-plug-mouse-touchpad/compare/8.0.1...8.0.2
---
 .../apps/switchboard-plugs/mouse-touchpad/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index 2780d98dd38e..4f0d896dc290 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-mouse-touchpad";
-  version = "8.0.1";
+  version = "8.0.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-aOJnjHCyc1tSyF7AuW5nXUXcvzBnZ+pwU91Mk+veusg=";
+    sha256 = "sha256-332y3D3T90G6bDVacRm3a1p4mLK3vsW8sBvre5lW/mk=";
   };
 
   patches = [

From f974f1168bdb70dd40646c04feaa24ce7b4aab8a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 31 Dec 2024 23:25:58 +0800
Subject: [PATCH 29/54] pantheon.elementary-terminal: Backport shortcut fixes

This fixes unexpected behaviour with Ctrl+K / Ctrl+L.
---
 .../apps/elementary-terminal/default.nix         | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index 62a0861432d7..ac0ad40d8455 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   nix-update-script,
   pkg-config,
   meson,
@@ -30,6 +31,21 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-Pr2Jm37vuw1DOx63BXKT3oPK6C7i5v9ObYFNR6Hvhns=";
   };
 
+  patches = [
+    # Fix clear and reset actions when ongoing foreground process
+    # https://github.com/elementary/terminal/pull/823
+    (fetchpatch {
+      url = "https://github.com/elementary/terminal/commit/3c84bcb98ecdadb4d5e0c7a8f52fb5238f5e92f0.patch";
+      hash = "sha256-XViJR+vj+qy2A1nZa3Pdo8uY24tS4ZqZKjTAyPN9sPA=";
+    })
+    # Only reset/clear screen when <Shift> is pressed
+    # https://github.com/elementary/terminal/pull/827
+    (fetchpatch {
+      url = "https://github.com/elementary/terminal/commit/91b93d883c2b8a8549d9743292d6a564e3b2d3cb.patch";
+      hash = "sha256-3opiRhQLJCYFDwDjEbm0CZ9y8CF/6biU+cJk1Ideyks=";
+    })
+  ];
+
   nativeBuildInputs = [
     desktop-file-utils
     meson

From 3b2c5ddf974e7aeb7754df968b7e6d41b1d243e1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 31 Dec 2024 17:14:58 +0100
Subject: [PATCH 30/54] python312Packages.ohmepy: init at 1.2.3

Module for interacting with the Ohme API

https://github.com/dan-r/ohmepy
---
 .../python-modules/ohmepy/default.nix         | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/ohmepy/default.nix

diff --git a/pkgs/development/python-modules/ohmepy/default.nix b/pkgs/development/python-modules/ohmepy/default.nix
new file mode 100644
index 000000000000..c02b87574931
--- /dev/null
+++ b/pkgs/development/python-modules/ohmepy/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "ohmepy";
+  version = "1.2.3";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "dan-r";
+    repo = "ohmepy";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-hCwaB6YXtNHCNOyjRxDSonBdTpKqX9GmLwFMvrY9UpI=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  pythonImportsCheck = [ "ohme" ];
+
+  # Module has no tests
+  doCheck = false;
+
+  meta = {
+    description = "Module for interacting with the Ohme API";
+    homepage = "https://github.com/dan-r/ohmepy";
+    changelog = "https://github.com/dan-r/ohmepy/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index acc79f773b74..73a9855a23f6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4879,6 +4879,8 @@ self: super: with self; {
 
   oelint-parser = callPackage ../development/python-modules/oelint-parser { };
 
+  ohmepy = callPackage ../development/python-modules/ohmepy { };
+
   openstep-parser = callPackage ../development/python-modules/openstep-parser { };
 
   openstep-plist = callPackage ../development/python-modules/openstep-plist { };

From 7d780b94f30f8398762707614deea081f2b393ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 17:35:08 +0000
Subject: [PATCH 31/54] anyrun: 0-unstable-2024-11-08 -> 0-unstable-2024-12-27

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

diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix
index 5153009bde93..645cc1d42784 100644
--- a/pkgs/by-name/an/anyrun/package.nix
+++ b/pkgs/by-name/an/anyrun/package.nix
@@ -17,16 +17,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "anyrun";
-  version = "0-unstable-2024-11-08";
+  version = "0-unstable-2024-12-27";
 
   src = fetchFromGitHub {
     owner = "kirottu";
     repo = "anyrun";
-    rev = "d2017f224b2bfd7e33573c7070e7c3e2960c7dcc";
-    hash = "sha256-L1hLXf4IDZ0KoXbFiSNNZJ7IrReEr/J+CLt6Rl4Ea3M=";
+    rev = "06017e753c8886d5296768dca80745ee09402a2d";
+    hash = "sha256-jU88Q9tP4vuvWYGQcmOdFwI9e2uMPVYJHbXdiklIH9o=";
   };
 
-  cargoHash = "sha256-DgUNSRr2Hs+GeYeR2ex8WiwotmT12G1cjSvQVK2py3c=";
+  cargoHash = "sha256-DtU5Jtx46M+aP1oSdZt+aJH5jqNdNU9G7klzwsVjcZU=";
 
   strictDeps = true;
   enableParallelBuilding = true;

From a46eb8266a241677a2b11be343be4cdd7236c52a Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Tue, 31 Dec 2024 19:27:52 +0000
Subject: [PATCH 32/54] doc/packages/build-support: remove stray backtick

This corrects a start/end error in the formatting of code in one of the
examples.
---
 doc/packages/build-support.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/packages/build-support.md b/doc/packages/build-support.md
index cf6a13384753..80392f4d121e 100644
--- a/doc/packages/build-support.md
+++ b/doc/packages/build-support.md
@@ -98,5 +98,5 @@ substituteAllFiles {
 }
 ```
 
-in the resulting derivation, every instance of `@hello@` will be replaced with `there` in `$out/foo.txt` and` `$out/bar.txt`; `baz.txt` will not be processed nor will it appear in `$out`.
+in the resulting derivation, every instance of `@hello@` will be replaced with `there` in `$out/foo.txt` and `$out/bar.txt`; `baz.txt` will not be processed nor will it appear in `$out`.
 :::

From 5aa8ed779b545f9786698226ce83f6ad8ddfe485 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 31 Dec 2024 21:14:30 +0000
Subject: [PATCH 33/54] asak: 0.3.4 -> 0.3.5

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

diff --git a/pkgs/by-name/as/asak/package.nix b/pkgs/by-name/as/asak/package.nix
index fdfce87a92f9..4270ee0a7034 100644
--- a/pkgs/by-name/as/asak/package.nix
+++ b/pkgs/by-name/as/asak/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "asak";
-  version = "0.3.4";
+  version = "0.3.5";
 
   src = fetchFromGitHub {
     owner = "chaosprint";
     repo = "asak";
     tag = "v${version}";
-    hash = "sha256-Kq1WdVcTRdz6vJxUDd0bqb2bfrNGCl611upwYploR7w=";
+    hash = "sha256-7r05sVIHqBBOKwye2fr0pspo/uDqaYGjt5CpxqgqKzI=";
   };
 
-  cargoHash = "sha256-SS4BDhORiTV/HZhL3F9zwF8oBu/VFVYhF5Jzp2j0QFI=";
+  cargoHash = "sha256-lMqInjFnOfr/GPSfIf1yp2vQjdk9UYdkWA616P8p0FE=";
 
   nativeBuildInputs = [
     pkg-config

From cb2ded517d19254284358616b079075f922170ad Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss+git@proton.me>
Date: Wed, 1 Jan 2025 02:10:39 +0300
Subject: [PATCH 34/54] typos: 0.28.4 -> 0.29.0

---
 pkgs/by-name/ty/typos/package.nix | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix
index 47b1df5a651d..7cfcb113aa68 100644
--- a/pkgs/by-name/ty/typos/package.nix
+++ b/pkgs/by-name/ty/typos/package.nix
@@ -2,40 +2,39 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
-  testers,
+  versionCheckHook,
   nix-update-script,
-  typos,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "typos";
-  version = "1.28.4";
+  version = "1.29.0";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-rE1JK6bG8yNItzsXEggTqKFuIwlFLDnIlNBUCjb9XOg=";
+    repo = "typos";
+    tag = "v${version}";
+    hash = "sha256-UNm5mQYkB9tiNpmXfxBNLyJDd+nwccflCdJEPaYzHWw=";
   };
 
-  cargoHash = "sha256-DQWOAlVKtB0l0qaHCgsrUl239PcKDnic3kdKoSgOjik=";
+  cargoHash = "sha256-CcRzPlkUqAZ2y+klRtLy+uGbMSpnr724rkcAkOzPHY4=";
 
-  passthru = {
-    tests.version = testers.testVersion { package = typos; };
+  passthru.updateScript = nix-update-script { };
 
-    updateScript = nix-update-script { };
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = [ "--version" ];
 
-  meta = with lib; {
+  meta = {
     description = "Source code spell checker";
     mainProgram = "typos";
     homepage = "https://github.com/crate-ci/typos";
-    changelog = "https://github.com/crate-ci/typos/blob/${src.rev}/CHANGELOG.md";
-    license = with licenses; [
+    changelog = "https://github.com/crate-ci/typos/blob/v${version}/CHANGELOG.md";
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       figsoda
       mgttlinger
     ];

From b22d47a1b878c611e2efcac41b7fa09b93513e45 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Tue, 31 Dec 2024 18:31:16 -0500
Subject: [PATCH 35/54] earlyoom: use upstream systemd service and add release
 note

---
 .../manual/release-notes/rl-2505.section.md   |  5 +++
 nixos/modules/services/system/earlyoom.nix    | 45 ++++++++++++-------
 pkgs/by-name/ea/earlyoom/package.nix          | 41 +++++++++--------
 3 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index c9e5123743be..ba8317e9c660 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -127,6 +127,11 @@
 
 - `zammad` has had its support for MySQL removed, since it was never working correctly and is now deprecated upstream. Check the [migration guide](https://docs.zammad.org/en/latest/appendix/migrate-to-postgresql.html) for how to convert your database to PostgreSQL.
 
+- The `earlyoom` service is now using upstream systemd service, which enables
+  hardening and filesystem isolation by default. If you need filesystem write
+  access or want to access home directory via `killHook`, hardening setting can
+  be changed via, e.g. `systemd.services.earlyoom.serviceConfig.ProtectSystem`.
+
 - `nodePackages.vls` has been deprecated, as the upstream consumer of it, vetur, has been deprecated by upstream. Upstream suggests migrating to Volar for Vue LSP tooling instead.
 
 - `nodePackages.create-react-native-app` has been removed, as it is deprecated. Upstream suggests using a framework for React Native apps instead.
diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix
index 7e012dee02cb..adf754c6abd6 100644
--- a/nixos/modules/services/system/earlyoom.nix
+++ b/nixos/modules/services/system/earlyoom.nix
@@ -115,6 +115,11 @@ in
         [README](https://github.com/rfjakob/earlyoom#notifications) and
         [the man page](https://github.com/rfjakob/earlyoom/blob/master/MANPAGE.md#-n-pathtoscript)
         for details.
+
+        WARNING: earlyoom is running in a sandbox with ProtectSystem="strict"
+        by default, so filesystem write is also prohibited for the hook.
+        If you want to change these protection rules, override the systemd
+        service via `systemd.services.earlyoom.serviceConfig.ProtectSystem`.
       '';
     };
 
@@ -149,25 +154,33 @@ in
   config = mkIf cfg.enable {
     services.systembus-notify.enable = mkDefault cfg.enableNotifications;
 
+    systemd.packages = [ cfg.package ];
+
     systemd.services.earlyoom = {
-      description = "Early OOM Daemon for Linux";
+      overrideStrategy = "asDropin";
+
       wantedBy = [ "multi-user.target" ];
       path = optionals cfg.enableNotifications [ pkgs.dbus ];
-      serviceConfig = {
-        StandardError = "journal";
-        ExecStart = concatStringsSep " " ([
-          "${lib.getExe cfg.package}"
-          ("-m ${toString cfg.freeMemThreshold}"
-           + optionalString (cfg.freeMemKillThreshold != null) ",${toString cfg.freeMemKillThreshold}")
-          ("-s ${toString cfg.freeSwapThreshold}"
-           + optionalString (cfg.freeSwapKillThreshold != null) ",${toString cfg.freeSwapKillThreshold}")
-          "-r ${toString cfg.reportInterval}"
-        ]
-        ++ optionals cfg.enableDebugInfo [ "-d" ]
-        ++ optionals cfg.enableNotifications [ "-n" ]
-        ++ optionals (cfg.killHook != null) [ "-N ${escapeShellArg cfg.killHook}" ]
-        ++ cfg.extraArgs);
-      };
+
+      # We setup `EARLYOOM_ARGS` via drop-ins, so disable the default import
+      # from /etc/default/earlyoom.
+      serviceConfig.EnvironmentFile = "";
+
+      environment.EARLYOOM_ARGS =
+        lib.cli.toGNUCommandLineShell { } {
+          m =
+            "${toString cfg.freeMemThreshold}"
+            + optionalString (cfg.freeMemKillThreshold != null) ",${toString cfg.freeMemKillThreshold}";
+          s =
+            "${toString cfg.freeSwapThreshold}"
+            + optionalString (cfg.freeSwapKillThreshold != null) ",${toString cfg.freeSwapKillThreshold}";
+          r = "${toString cfg.reportInterval}";
+          d = cfg.enableDebugInfo;
+          n = cfg.enableNotifications;
+          N = if cfg.killHook != null then cfg.killHook else null;
+        }
+        + " "
+        + lib.escapeShellArgs cfg.extraArgs;
     };
   };
 }
diff --git a/pkgs/by-name/ea/earlyoom/package.nix b/pkgs/by-name/ea/earlyoom/package.nix
index fead6ff586e0..ed3f0006b466 100644
--- a/pkgs/by-name/ea/earlyoom/package.nix
+++ b/pkgs/by-name/ea/earlyoom/package.nix
@@ -1,11 +1,13 @@
 {
   lib,
   fetchFromGitHub,
-  installShellFiles,
   pandoc,
   stdenv,
   nixosTests,
-  # Boolean flags
+  fetchpatch,
+  # The man page requires pandoc to build and resides in a separate "man"
+  # output which is pulled in on-demand. There is no need to disabled it unless
+  # pandoc is hard to build on your platform.
   withManpage ? true,
 }:
 
@@ -22,25 +24,26 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [ "out" ] ++ lib.optionals withManpage [ "man" ];
 
-  patches = [ ./0000-fix-dbus-path.patch ];
-
-  nativeBuildInputs = lib.optionals withManpage [
-    installShellFiles
-    pandoc
+  patches = [
+    ./0000-fix-dbus-path.patch
+    # Respect `MANDIR`.
+    (fetchpatch {
+      url = "https://github.com/rfjakob/earlyoom/commit/c5a1799a5ff4b3fd3132d50a510e8c126933cf4a.patch";
+      hash = "sha256-64AkpTMmjiqZ6Byq6687zNIqrQ/IGRGgzzjyyAfcg14=";
+    })
+    # Correctly handle `PREFIX` as a default rather than always-concatenate.
+    (fetchpatch {
+      url = "https://github.com/rfjakob/earlyoom/commit/f7d6f1cc925962fbdcf57b1c2aeeabbf11e2d542.patch";
+      hash = "sha256-DJDeQzcEGJMoMGIi1D/ogMaKG1VQvPZN9jXtUDGjyjk=";
+    })
   ];
 
+  nativeBuildInputs = lib.optionals withManpage [ pandoc ];
+
   makeFlags = [
     "VERSION=${finalAttrs.version}"
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    install -D earlyoom $out/bin/earlyoom
-  '' + lib.optionalString withManpage ''
-    installManPage earlyoom.1
-  '' + ''
-    runHook postInstall
-  '';
+    "PREFIX=${placeholder "out"}"
+  ] ++ lib.optional withManpage "MANDIR=${placeholder "man"}/share/man";
 
   passthru.tests = {
     inherit (nixosTests) earlyoom;
@@ -58,7 +61,9 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.mit;
     mainProgram = "earlyoom";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [
+      oxalica
+    ];
     platforms = lib.platforms.linux;
   };
 })

From 6ed1504739c59ed02320c3a7b7a2dd4a356393fe Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Thu, 1 Aug 2024 14:30:27 -0400
Subject: [PATCH 36/54] nixosTests.earlyoom: add a proper OOM test

---
 nixos/tests/earlyoom.nix | 55 ++++++++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 14 deletions(-)

diff --git a/nixos/tests/earlyoom.nix b/nixos/tests/earlyoom.nix
index b7850ddeaaab..259fb5aa5d44 100644
--- a/nixos/tests/earlyoom.nix
+++ b/nixos/tests/earlyoom.nix
@@ -1,16 +1,43 @@
-import ./make-test-python.nix ({ lib, ... }: {
-  name = "earlyoom";
-  meta = {
-    maintainers = with lib.maintainers; [ ncfavier AndersonTorres ];
-  };
-
-  machine = {
-    services.earlyoom = {
-      enable = true;
+import ./make-test-python.nix (
+  { lib, ... }:
+  {
+    name = "earlyoom";
+    meta = {
+      maintainers = with lib.maintainers; [
+        ncfavier
+        AndersonTorres
+        oxalica
+      ];
     };
-  };
 
-  testScript = ''
-    machine.wait_for_unit("earlyoom.service")
-  '';
-})
+    nodes.machine =
+      { pkgs, ... }:
+      {
+        # Limit VM resource usage.
+        virtualisation.memorySize = 1024;
+
+        services.earlyoom = {
+          enable = true;
+          # Use SIGKILL, or `tail` will catch SIGTERM and exit successfully.
+          freeMemKillThreshold = 90;
+        };
+
+        systemd.services.testbloat = {
+          description = "Create a lot of memory pressure";
+          serviceConfig = {
+            ExecStart = "${pkgs.coreutils}/bin/tail /dev/zero";
+          };
+        };
+      };
+
+    testScript = ''
+      machine.wait_for_unit("earlyoom.service")
+
+      with subtest("earlyoom should kill the bad service"):
+          machine.fail("systemctl start --wait testbloat.service")
+          assert machine.get_unit_info("testbloat.service")["Result"] == "signal"
+          output = machine.succeed('journalctl -u earlyoom.service -b0')
+          assert 'low memory! at or below SIGKILL limits' in output
+    '';
+  }
+)

From acc2ec20ed3cacd5cd62966340d62c9e68188234 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Tue, 31 Dec 2024 18:33:18 -0500
Subject: [PATCH 37/54] nixos/earlyoom: format and remove dead code

---
 nixos/modules/services/system/earlyoom.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix
index adf754c6abd6..616dea3eb236 100644
--- a/nixos/modules/services/system/earlyoom.nix
+++ b/nixos/modules/services/system/earlyoom.nix
@@ -1,11 +1,14 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 let
   cfg = config.services.earlyoom;
 
   inherit (lib)
-    concatStringsSep
-    escapeShellArg
     literalExpression
     mkDefault
     mkEnableOption
@@ -15,7 +18,8 @@ let
     mkRemovedOptionModule
     optionalString
     optionals
-    types;
+    types
+    ;
 in
 {
   meta = {
@@ -132,8 +136,11 @@ in
 
     extraArgs = mkOption {
       type = types.listOf types.str;
-      default = [];
-      example = [ "-g" "--prefer '(^|/)(java|chromium)$'" ];
+      default = [ ];
+      example = [
+        "-g"
+        "--prefer '(^|/)(java|chromium)$'"
+      ];
       description = "Extra command-line arguments to be passed to earlyoom.";
     };
   };

From f519da9cd9e339344ad91f675e5a2e860a55ea83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 03:10:54 +0000
Subject: [PATCH 38/54] skim: 0.15.5 -> 0.15.7

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

diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix
index e819ec8f53b7..85a6edb75686 100644
--- a/pkgs/by-name/sk/skim/package.nix
+++ b/pkgs/by-name/sk/skim/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "skim";
-  version = "0.15.5";
+  version = "0.15.7";
 
   outputs = [
     "out"
@@ -24,14 +24,14 @@ rustPlatform.buildRustPackage rec {
     owner = "skim-rs";
     repo = "skim";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ijuzEfoYSVLfWiBq4Wnxy3LbX0viDZZ6FZ4EvvUHf1M=";
+    hash = "sha256-vUKHyrvCGtRKziUqgIbgVP7YdH+UW3PFBECV/mo5RxY=";
   };
 
   postPatch = ''
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
   '';
 
-  cargoHash = "sha256-JGsKz361hnRoDDq5zpA64jkk8MB3fqrh8xA3l0ZV1Bs=";
+  cargoHash = "sha256-/tfbhNlpx96jlzUYwbucXi+pk1IE2jqxgWYjNU+4mHg=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 2fbed58cc3ee18d0c6fe1fda5764fb1150f96951 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 06:19:07 +0000
Subject: [PATCH 39/54] hyprlandPlugins.hyprsplit: 0.46.1 -> 0.46.2

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

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
index 0e594ed00297..513f5504ab8e 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
@@ -9,13 +9,13 @@
 }:
 mkHyprlandPlugin hyprland rec {
   pluginName = "hyprsplit";
-  version = "0.46.1";
+  version = "0.46.2";
 
   src = fetchFromGitHub {
     owner = "shezdy";
     repo = "hyprsplit";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Hv8cVJ4lONz0g1zMwdWCL2nBUA/P8ILy7MiFjU26OM4=";
+    hash = "sha256-G+fgzjGNkYl5y6XL9K67ixCPEhb02J45cS9uicdC110=";
   };
 
   nativeBuildInputs = [

From f711bf972b3395a419141ee9be7ff950cebb3a30 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 1 Jan 2025 10:57:26 +0300
Subject: [PATCH 40/54] kdePackages: Plasma 6.2.4 -> 6.2.5

---
 pkgs/kde/generated/sources/plasma.json | 404 ++++++++++++-------------
 1 file changed, 202 insertions(+), 202 deletions(-)

diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index 32469681630c..70357307b834 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,332 +1,332 @@
 {
   "bluedevil": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/bluedevil-6.2.4.tar.xz",
-    "hash": "sha256-5mSo3RvlVwNWki7IV4vZGi24ZlamdsHIbbnDzv2+ogI="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/bluedevil-6.2.5.tar.xz",
+    "hash": "sha256-Tl9D6d2ddZDimkMhSK1Rq7vTHPMChXMUJfW+jyRE8ro="
   },
   "breeze": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/breeze-6.2.4.tar.xz",
-    "hash": "sha256-TZYTiWCC8zZBOrsk74+NhlE/fpmkwLzfL0XNfFu9fCA="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/breeze-6.2.5.tar.xz",
+    "hash": "sha256-HTvUSBu3zSdKE6xdWFK+Uf8pdeYghy38IvvVMbrQTiU="
   },
   "breeze-grub": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/breeze-grub-6.2.4.tar.xz",
-    "hash": "sha256-gUbx1po18gP1XIZXwzlVkvEiEU+8yXV8/NJXukRQrIs="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/breeze-grub-6.2.5.tar.xz",
+    "hash": "sha256-AotNwvjw9mMDnl64Ayh8X549xPXz5f16RPxx1nbcOYk="
   },
   "breeze-gtk": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/breeze-gtk-6.2.4.tar.xz",
-    "hash": "sha256-YQwk1Ghr4IqSM3UWtn6fCcfjZd3cPgKXbSSvNkIzvKA="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/breeze-gtk-6.2.5.tar.xz",
+    "hash": "sha256-IRXwC7zvjmulckfpxs4WM97fNw+S2gHS/Eqvyhp0018="
   },
   "breeze-plymouth": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/breeze-plymouth-6.2.4.tar.xz",
-    "hash": "sha256-IaISI1lhDkM6NiCDYKt4NL/JHHIixqHV7d2ZI9yyDtw="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/breeze-plymouth-6.2.5.tar.xz",
+    "hash": "sha256-4D/NjM4Z3pjxstrzlw29WeF/Wfm2iN7/xOSgd6um4Uo="
   },
   "discover": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/discover-6.2.4.tar.xz",
-    "hash": "sha256-YZqKgGcPUtALvmfa6iLR2w18m0S1eGXclyVYBhutFCc="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/discover-6.2.5.tar.xz",
+    "hash": "sha256-jMu4gTkqS61UCrC7RlY3oOIG72tT578C5xvI+2RTpKQ="
   },
   "drkonqi": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/drkonqi-6.2.4.tar.xz",
-    "hash": "sha256-qXCmXNwUaQWKfMZS3SzM0NazAq6QapMgjTXYINtXMtg="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/drkonqi-6.2.5.tar.xz",
+    "hash": "sha256-+V7FbHAuscukhBH9FwnYcjhJ43D/jqaZgUgtbzpdXHM="
   },
   "flatpak-kcm": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/flatpak-kcm-6.2.4.tar.xz",
-    "hash": "sha256-EPiyGLMv1NCDexfov4duE2ZgR8k4+6I9d730CcOyPoM="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/flatpak-kcm-6.2.5.tar.xz",
+    "hash": "sha256-JshyE62aOUorPcZhYFHWfFyqMji6qoipr7mV3YlnOy4="
   },
   "kactivitymanagerd": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kactivitymanagerd-6.2.4.tar.xz",
-    "hash": "sha256-F2csZVAMcx7rPENknPUuyuEVrf0ZQsJFmQVezj5KkNo="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kactivitymanagerd-6.2.5.tar.xz",
+    "hash": "sha256-824bvFwQD0w50a8AegPEdOo90VhFkgKf4k+72xz52tY="
   },
   "kde-cli-tools": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kde-cli-tools-6.2.4.tar.xz",
-    "hash": "sha256-EXrLp9aABuApn9aBKLb+VIWekg4OOKTzlJmKuIER2ec="
-  },
-  "kdecoration": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kdecoration-6.2.4.tar.xz",
-    "hash": "sha256-rGRbTVgtEQJYaUqeLqK/Zfu9S9WOnen5NUeGOXvE9xo="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kde-cli-tools-6.2.5.tar.xz",
+    "hash": "sha256-HdpX90lQYKCGZYeWUZ1o1U9efaThL6bY1L9GFKxygAI="
   },
   "kde-gtk-config": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kde-gtk-config-6.2.4.tar.xz",
-    "hash": "sha256-6AGhYuhZdmGCvM/S1KvXCT273pUYPidq1N6BkhUeVkU="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kde-gtk-config-6.2.5.tar.xz",
+    "hash": "sha256-KD+YA6FfE3NN5imFWPh1QGpcfA6kbp/7pWR/SAv8alg="
+  },
+  "kdecoration": {
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kdecoration-6.2.5.tar.xz",
+    "hash": "sha256-cmxYzUs0/ElUZXhyekR8diQpOK3Vdyks0zS9YL+djyY="
   },
   "kdeplasma-addons": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kdeplasma-addons-6.2.4.tar.xz",
-    "hash": "sha256-0JnCk13XTrL0mWOHG34m+FS+QOTXdz/Jodash5/Rb5E="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kdeplasma-addons-6.2.5.tar.xz",
+    "hash": "sha256-V9E41RAa27gJLEJMWM63Ph0F0Mzj7Eo1RDJ0Tb0X5CY="
   },
   "kgamma": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kgamma-6.2.4.tar.xz",
-    "hash": "sha256-c6dF/GbNFOqm4TNQw4aDpQRRJYh6GPRh6ytk5Q5qGSI="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kgamma-6.2.5.tar.xz",
+    "hash": "sha256-Pfdc3LAgrP0hbppyJATTgcik2XJivoX2cEsYnmZWEM4="
   },
   "kglobalacceld": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kglobalacceld-6.2.4.tar.xz",
-    "hash": "sha256-0ikE4sg0LbzPeoGX0mDMDff17KWuZZq4ExVXPbgNNno="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kglobalacceld-6.2.5.tar.xz",
+    "hash": "sha256-lLXMN4DKawdAk8SH7J5sNGD2Na5RRXgPh8D+hITYxsk="
   },
   "kinfocenter": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kinfocenter-6.2.4.tar.xz",
-    "hash": "sha256-a92mBn9tEVaiWKQ6Vtc0EmIP8iSwZAs+pCSt8SIwO6I="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kinfocenter-6.2.5.tar.xz",
+    "hash": "sha256-nth+2zokJWGJ+Nx5yCG49FWJqrcDLY3eeNXZTPBjn/k="
   },
   "kmenuedit": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kmenuedit-6.2.4.tar.xz",
-    "hash": "sha256-F09b+xdGQre3JEXylNQQz6zK9lczUMFK9xHkjchWrfk="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kmenuedit-6.2.5.tar.xz",
+    "hash": "sha256-CQhkX0/CSgCwI9BTfKxt7nt6utdceYC0oBxsCY3taEo="
   },
   "kpipewire": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kpipewire-6.2.4.tar.xz",
-    "hash": "sha256-duRWIGqfbpIssQYUR2oZaC+MJ5V8XImY8dGg2tuUyms="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kpipewire-6.2.5.tar.xz",
+    "hash": "sha256-20LVgfDKQnvYDuamfR+pzvARFCZsmu5/qizsvZc+Yxk="
   },
   "krdp": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/krdp-6.2.4.tar.xz",
-    "hash": "sha256-9iKdH3zPzjTXLmVl2LTL3HbvNXmHlM0u0llPca6DV7s="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/krdp-6.2.5.tar.xz",
+    "hash": "sha256-Go0349uR6AyuniK/HFmGmFxCed4kVrp7xIHHJcNKc/w="
   },
   "kscreen": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kscreen-6.2.4.tar.xz",
-    "hash": "sha256-P2YMmOaYtTqU6rdfVd1W4q/y3HrjTIvmmHVGZZnnsAI="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kscreen-6.2.5.tar.xz",
+    "hash": "sha256-YjfEf+cDhNEObyDX8FjGqsylGkk9qSgHf87JGw72lkI="
   },
   "kscreenlocker": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kscreenlocker-6.2.4.tar.xz",
-    "hash": "sha256-Ep0Qw4kiIhaNu/gM29qBCtBiwm3lH3y8JZDmVfVTyxY="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kscreenlocker-6.2.5.tar.xz",
+    "hash": "sha256-Oj7S0EA5TcKoDPJc3SpsQCIUaspU5yxErxbomC6Ljk4="
   },
   "ksshaskpass": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/ksshaskpass-6.2.4.tar.xz",
-    "hash": "sha256-PdkdLhg+9eISmBvSYzkZidKrb8kk+TVROKurB/LKv78="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/ksshaskpass-6.2.5.tar.xz",
+    "hash": "sha256-heccgDfV0hmfhhrnBxifQqfK7S8DdD6oO3Vww0oR63I="
   },
   "ksystemstats": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/ksystemstats-6.2.4.tar.xz",
-    "hash": "sha256-SalO8F5qsOjw/1onIZTzTYpNVy/nn8q2XJbqLsFGDEM="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/ksystemstats-6.2.5.tar.xz",
+    "hash": "sha256-7/9W9V5v5e1CMaR6RMjQjT1G/RDXTRhjRO9PL82VlaE="
   },
   "kwallet-pam": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kwallet-pam-6.2.4.tar.xz",
-    "hash": "sha256-CwShwte6T9wgoHY3J6XNQ2ItKHRSPdn9gzuRLBEB1eM="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kwallet-pam-6.2.5.tar.xz",
+    "hash": "sha256-AWjU8jl64omuAnp9ICsP/V+NehmyM+v6ZBe4Q4Qb/UQ="
   },
   "kwayland": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kwayland-6.2.4.tar.xz",
-    "hash": "sha256-9P5pl4+OmwxABYAZeC8Tv913DPVF2TJaezeIJvDNNKw="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kwayland-6.2.5.tar.xz",
+    "hash": "sha256-KheozlZD/VHDz3h1QgMsEFDaOh+wDcyaMt6iiL0419I="
   },
   "kwayland-integration": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kwayland-integration-6.2.4.tar.xz",
-    "hash": "sha256-NH+TvNhLkNvMIhGMHYl/T3zWhmTA6H9rhm1SQABv4js="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kwayland-integration-6.2.5.tar.xz",
+    "hash": "sha256-Brb7fdzxnHJ3FvR2tyJOIw9Jhsfj02Bm6RiFn9w7RBM="
   },
   "kwin": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kwin-6.2.4.tar.xz",
-    "hash": "sha256-1LeOvclDLLHiJGIaxDz7gbktvO4DSv6Qu+tbIvIY8yE="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kwin-6.2.5.tar.xz",
+    "hash": "sha256-XMRQpuQRBcjEmSm3JVCzMSN/lqr7KUaQ9HB73F93aEg="
   },
   "kwrited": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/kwrited-6.2.4.tar.xz",
-    "hash": "sha256-VbZkMQ2Y0uJtMEh49qLn3BWsMrlBB2rmozkeBJw+m2Y="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/kwrited-6.2.5.tar.xz",
+    "hash": "sha256-BHlPEJF6CpQWeWIBXPuwV8mAIGH/+RsCfeAaPmk315I="
   },
   "layer-shell-qt": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/layer-shell-qt-6.2.4.tar.xz",
-    "hash": "sha256-ABiXp9SZGp6VvnMVLZUTZizH2KUyEXAtkG1Ze3PO2HI="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/layer-shell-qt-6.2.5.tar.xz",
+    "hash": "sha256-vAmHAhjfOHw3e60v7UsqjzkSHdvcXGuyikC+DBsADHc="
   },
   "libkscreen": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/libkscreen-6.2.4.tar.xz",
-    "hash": "sha256-PMBtXFYatNvtvFSKRlURnoYcSsKeVl/1hGJz8MdunLQ="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/libkscreen-6.2.5.tar.xz",
+    "hash": "sha256-Xtr2+i7tbdzvS8R59LsV00gay2Ct8BUOn5oTgmB7vLg="
   },
   "libksysguard": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/libksysguard-6.2.4.tar.xz",
-    "hash": "sha256-95n5Dv07Pg6hexlpuwzFdEx3YuoW0SixtNMd+njMWK4="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/libksysguard-6.2.5.tar.xz",
+    "hash": "sha256-lpTz1rUHi02C645u006yDi0QntfCI0xZpkC8MvMcdqs="
   },
   "libplasma": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/libplasma-6.2.4.tar.xz",
-    "hash": "sha256-Zu2hRftX3MWF25f9flQ/LN/HRc64PBbL49CAk59bGxQ="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/libplasma-6.2.5.tar.xz",
+    "hash": "sha256-r3cPX++XhRLHBJGIlRb7dp00DwCgInCYfS0dF3U2WOw="
   },
   "milou": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/milou-6.2.4.tar.xz",
-    "hash": "sha256-tHpjWQSneqgvsC2WoCYQAMyV2gHQdJjqnynUwHQ3dfk="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/milou-6.2.5.tar.xz",
+    "hash": "sha256-gzvK6v4pLoXv81PgmwYx9gOuISHo0db+BhsfYyAXrM8="
   },
   "ocean-sound-theme": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/ocean-sound-theme-6.2.4.tar.xz",
-    "hash": "sha256-e1SSq62KddJC54g5XNoFTez8hdD/IhvOBbkkUY8WMAo="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/ocean-sound-theme-6.2.5.tar.xz",
+    "hash": "sha256-AX0yXsZzu4DfykQrdu9xoXLMomkRwoojDMc5KwFdxQU="
   },
   "oxygen": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/oxygen-6.2.4.tar.xz",
-    "hash": "sha256-hmpYvaPzYfKweMRHuViFudOQXYCyhUVIYRk9PoY6FFI="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/oxygen-6.2.5.tar.xz",
+    "hash": "sha256-bXct1QnCv9A9f4AeRe/xUfNEFykAuuBbsW2LovjTt9w="
   },
   "oxygen-sounds": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/oxygen-sounds-6.2.4.tar.xz",
-    "hash": "sha256-eWe8OSAwNyWq4bVwAfIZKwaiUIT787joRfXwUaViWN4="
-  },
-  "plasma5support": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma5support-6.2.4.tar.xz",
-    "hash": "sha256-Izu9w/HAuKy7cQ9TxjCDWcMVtpmVj2eEs0Z/RyT5PY0="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/oxygen-sounds-6.2.5.tar.xz",
+    "hash": "sha256-7gg8Zyt2AF3940CQLPAwLKCBs1nKpWZnkzTaln6PdbQ="
   },
   "plasma-activities": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-activities-6.2.4.tar.xz",
-    "hash": "sha256-fJddJCHmeS6MPMpfImEdrFX0Th7IZI35dxLwDLuQfMs="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-activities-6.2.5.tar.xz",
+    "hash": "sha256-d+pznHzlFw2S141vN2XhmjLw4kt0H1JVVdWdx94V5sc="
   },
   "plasma-activities-stats": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-activities-stats-6.2.4.tar.xz",
-    "hash": "sha256-wicYULV7DaboTmEEnD3W1gJE5HSCJFZyqcIg3r8EzLs="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-activities-stats-6.2.5.tar.xz",
+    "hash": "sha256-zduiWSRlHg9d50pvqryJkDAYV7sx9O5KwfadegxIUyw="
   },
   "plasma-browser-integration": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-browser-integration-6.2.4.tar.xz",
-    "hash": "sha256-UEvhuwyyKxoTwLdHE1FnL7o6Rr3I5XJNS6QBPo8tY80="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-browser-integration-6.2.5.tar.xz",
+    "hash": "sha256-JdqQUWafIKG/m9iYfZViGy5mQTGjw4cBo8Xi+G2bXc4="
   },
   "plasma-desktop": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-desktop-6.2.4.tar.xz",
-    "hash": "sha256-gfKrQM3sMykYyQsbcyq7KqDAUChU5IuPoG+4K1KSTaM="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-desktop-6.2.5.tar.xz",
+    "hash": "sha256-tz0pICAxtwSUhdhOYV170KPKiQ3LLCLYEW64/m/p0Gg="
   },
   "plasma-dialer": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-dialer-6.2.4.tar.xz",
-    "hash": "sha256-sdHANPIayXww+bEsnJmPzaJk02cn0v1GSU5lWuecgWc="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-dialer-6.2.5.tar.xz",
+    "hash": "sha256-DWTYOXsRAbqJgyvjbyKazthzFQpUHRECNbXQWawPYEY="
   },
   "plasma-disks": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-disks-6.2.4.tar.xz",
-    "hash": "sha256-cysnzgdv3/7LAbVRhNSVfoWSFhdk5XmDXVnlz/XnJGo="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-disks-6.2.5.tar.xz",
+    "hash": "sha256-m1FKt/sL3gyxhxM0zp6oEV2JjdKJDpbuBo6lpCm+f3U="
   },
   "plasma-firewall": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-firewall-6.2.4.tar.xz",
-    "hash": "sha256-mrcISNBhbwjk8nuzHCN0aqNdgA2bdIKR6qB43RmZPVU="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-firewall-6.2.5.tar.xz",
+    "hash": "sha256-8Om32kgaODrEURIQuqmYuMJjYB8YIRsGVfXJ2YFX2mk="
   },
   "plasma-integration": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-integration-6.2.4.tar.xz",
-    "hash": "sha256-jT2bAirvQRo2qtpWSTGq1OyB34uO9uP0CR42JSIpXMc="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-integration-6.2.5.tar.xz",
+    "hash": "sha256-V5XlIoXe6hCHf9VkdEc9BhBxy0JbqHzvM2aDLVB2Ryk="
   },
   "plasma-mobile": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-mobile-6.2.4.tar.xz",
-    "hash": "sha256-7RmOzJAr3Ow9Zr8ePWBCFFDsP13qdLE5WqaifR7uoK8="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-mobile-6.2.5.tar.xz",
+    "hash": "sha256-rs65urOS/D2f3qWRPCAqEQeMQGB5SSdyJYG9iOxlGNI="
   },
   "plasma-nano": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-nano-6.2.4.tar.xz",
-    "hash": "sha256-X29HKQk7mLclZADJD2m+qgOZ/Qnq3RSN4BBFTYo4WiE="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-nano-6.2.5.tar.xz",
+    "hash": "sha256-czQB7HQ2hPWdrSGa1+ucFW3XMLjhcmv1WA2HlInfGsk="
   },
   "plasma-nm": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-nm-6.2.4.tar.xz",
-    "hash": "sha256-9DY/MnzNdX+wE91L8pkqN6WNtrZifPLQEPMNWvr9gyo="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-nm-6.2.5.tar.xz",
+    "hash": "sha256-FG12k2zphViDmpp88w+pUbfubNPap8MtcczfFXpPbGg="
   },
   "plasma-pa": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-pa-6.2.4.tar.xz",
-    "hash": "sha256-J2V1s4HCYIAnmlrPh69kJQJtLuvhqQZQc4P18J5oGlc="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-pa-6.2.5.tar.xz",
+    "hash": "sha256-UXkzen6sQUWpU7RhRtSJmUXZxDNzrWD3ZpL/xCzxnUc="
   },
   "plasma-sdk": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-sdk-6.2.4.tar.xz",
-    "hash": "sha256-V29qp1HZ0s9mzfCVYs6G7QLLv3PlrlzL0G4B+BY7iHg="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-sdk-6.2.5.tar.xz",
+    "hash": "sha256-dr1i5e89nnF/fEX/WGOHMrgH56UTlCxiRywCsLKuNRE="
   },
   "plasma-systemmonitor": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-systemmonitor-6.2.4.tar.xz",
-    "hash": "sha256-R5a1pXH/Q5b9R1WxsJCyfCP6WWuHFcMs5KAxXRLIBkw="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-systemmonitor-6.2.5.tar.xz",
+    "hash": "sha256-lXXUVi5oIJYnruLzWAcLCRIsw+Cf7lDJBFHfUr8Asso="
   },
   "plasma-thunderbolt": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-thunderbolt-6.2.4.tar.xz",
-    "hash": "sha256-xDXVALHA+iwYSFGtPqIFzWBlGgqqoxqeb82I4K7vtnA="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-thunderbolt-6.2.5.tar.xz",
+    "hash": "sha256-5sOMf+hE66ay04oGzz6fLFHpiYk5ZeFoORfEbZTrJNo="
   },
   "plasma-vault": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-vault-6.2.4.tar.xz",
-    "hash": "sha256-ypk008ov5VYzxCkwIGj4F3i/SmLiIFnuK2qglQ6WhsM="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-vault-6.2.5.tar.xz",
+    "hash": "sha256-a35z/DnGu14sBlc++IqJSO6lcGCKjh5J2RI4mu+lC04="
   },
   "plasma-welcome": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-welcome-6.2.4.tar.xz",
-    "hash": "sha256-2QnEefl0eZZCMv2h+AsFOlTDp0jlEnwhG5OHB2LmtlM="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-welcome-6.2.5.tar.xz",
+    "hash": "sha256-6aKuDK2C75/q50cfYlYo199wmCVeqO5x+reO1IU5Jho="
   },
   "plasma-workspace": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-workspace-6.2.4.tar.xz",
-    "hash": "sha256-Mqo72inXt2p9rn4fjJeJz+f2CeuHjhp5PbSxSQyjwXQ="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-workspace-6.2.5.tar.xz",
+    "hash": "sha256-uCUR5G9i4bj2C5acgoyNjTL8eShAGnDMKMKfhfRsQS8="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plasma-workspace-wallpapers-6.2.4.tar.xz",
-    "hash": "sha256-63qSncfSVIsO59d3N/sPLrV1cfgjXjmM4bM+kuivqls="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma-workspace-wallpapers-6.2.5.tar.xz",
+    "hash": "sha256-2LB6LMPTTRNDTzog6aSW7XUCgFJi47sYnrhG1XTxvIA="
+  },
+  "plasma5support": {
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plasma5support-6.2.5.tar.xz",
+    "hash": "sha256-ysUkSqKWGtAg7SxDQnOJ4II0guyxeZSLX9ayIWBuiwQ="
   },
   "plymouth-kcm": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/plymouth-kcm-6.2.4.tar.xz",
-    "hash": "sha256-KfzAFFAn7WHFgelog49vaCtVWwuo4ODtNtmupZ2ZoX0="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/plymouth-kcm-6.2.5.tar.xz",
+    "hash": "sha256-rfcELy5wmFWZUMQr1hAm/kYtZs1/u9u5l7RY9plrEEg="
   },
   "polkit-kde-agent-1": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/polkit-kde-agent-1-6.2.4.tar.xz",
-    "hash": "sha256-Et5F4Vcjm1gfIb3Zo+2j/3O8VTALqXmkLJeZ8bd1P40="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/polkit-kde-agent-1-6.2.5.tar.xz",
+    "hash": "sha256-sf+z5ETGxT24Iqj7THUFw48mE6gSrhe+JDTgL1DCk/s="
   },
   "powerdevil": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/powerdevil-6.2.4.tar.xz",
-    "hash": "sha256-F8RA19WWvgd5f2BJhcSyX5KXEoqv1vEbiKSpr+IL3a8="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/powerdevil-6.2.5.tar.xz",
+    "hash": "sha256-cCUDltXvrkvn0yAb6Hjg41/Y2b+zkGYNXgOUgosfRks="
   },
   "print-manager": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/print-manager-6.2.4.tar.xz",
-    "hash": "sha256-4Ly5GtOxnkJZp6NQl/cYedLv5tlmUhl5Az+x6R/GuJU="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/print-manager-6.2.5.tar.xz",
+    "hash": "sha256-BWAW67df4Co/LnG/pnmAbAwNwgvcZ240NFwu0Etf6sw="
   },
   "qqc2-breeze-style": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/qqc2-breeze-style-6.2.4.tar.xz",
-    "hash": "sha256-rAKm2xTlOXlvxSVfUS+o1qSOKkyq2sKD72sZDnBHEXo="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/qqc2-breeze-style-6.2.5.tar.xz",
+    "hash": "sha256-OAy2NpbKISYmVlnGGOBWNhk/KOf2pZc0HrkVr13R0Q8="
   },
   "sddm-kcm": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/sddm-kcm-6.2.4.tar.xz",
-    "hash": "sha256-foYsQNW82GlD89vlhVg6pVXU+gvDEqf87csxbq3fsdc="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/sddm-kcm-6.2.5.tar.xz",
+    "hash": "sha256-+kARFrz8aQ/SVXwWzzlGH6nW4d4NkXpPSf+S431f31Y="
   },
   "spacebar": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/spacebar-6.2.4.tar.xz",
-    "hash": "sha256-vvdBZWaHLdxgLATJhgjSCnK3HMWSz3OAwst0HUusilg="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/spacebar-6.2.5.tar.xz",
+    "hash": "sha256-+La9PZgNuwCvjzMHAw6gXq2m2qzT5fI+wXki5mWPV6I="
   },
   "systemsettings": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/systemsettings-6.2.4.tar.xz",
-    "hash": "sha256-YXnzPDWPm5Zub7eaftYnF6qOdJdZVudasPp4clCHwVY="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/systemsettings-6.2.5.tar.xz",
+    "hash": "sha256-tQIvKUMl29PaFqvvtSoSwBjHOjx47aAy34kXPGmr03U="
   },
   "wacomtablet": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/wacomtablet-6.2.4.tar.xz",
-    "hash": "sha256-P68lefv+ibKaLlRIV7lymRFCmD8i1h4xbwnh1L/PYOM="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/wacomtablet-6.2.5.tar.xz",
+    "hash": "sha256-5bNvjj5W1VwphX1tp8HjzsU49wPfihAldmOIoHrPOHs="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.2.4",
-    "url": "mirror://kde/stable/plasma/6.2.4/xdg-desktop-portal-kde-6.2.4.tar.xz",
-    "hash": "sha256-2vLYdp0PRSZO8fSLY/UnREYiJXT/gy5A8h0GpMOCLR0="
+    "version": "6.2.5",
+    "url": "mirror://kde/stable/plasma/6.2.5/xdg-desktop-portal-kde-6.2.5.tar.xz",
+    "hash": "sha256-Hoa/b33EM0AK3pM0dnHsnK2I44JTbdMJMAMORRRiOvE="
   }
 }
\ No newline at end of file

From 55901e028ea58811612640f38ea55bd0dfa4f960 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 07:59:31 +0000
Subject: [PATCH 41/54] pack: 0.36.1 -> 0.36.2

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

diff --git a/pkgs/by-name/pa/pack/package.nix b/pkgs/by-name/pa/pack/package.nix
index c9b3daaa1f53..a1255102d26e 100644
--- a/pkgs/by-name/pa/pack/package.nix
+++ b/pkgs/by-name/pa/pack/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "pack";
-  version = "0.36.1";
+  version = "0.36.2";
 
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = "pack";
     rev = "v${version}";
-    hash = "sha256-pszPntjdEU6zUwA+NawGI3EWjk0fMOFoBr9NPTOSwig=";
+    hash = "sha256-pITQAGt0aMhEfoauPWxAqnr8JxGi4DcqcmgqtooLkd4=";
   };
 
-  vendorHash = "sha256-4c7tWZ+7L0C0zPjOg/9gJlTXuGacV3uxzxs/TF+7vOo=";
+  vendorHash = "sha256-51Qqq2Jpd1XxUoMN+6j4/VZ4fLCm4I9JwBeTcdSHgQw=";
 
   subPackages = [ "cmd/pack" ];
 

From 0670ce28e7a6e8eaf4ab7d7ce7085305aa66fec9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 18:30:56 +1000
Subject: [PATCH 42/54] television: 0.8.1 -> 0.8.5 (#369881)

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

diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix
index f51564c41c38..9f4e711cbd0f 100644
--- a/pkgs/by-name/te/television/package.nix
+++ b/pkgs/by-name/te/television/package.nix
@@ -8,16 +8,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "television";
-  version = "0.8.1";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "alexpasmantier";
     repo = "television";
     rev = "refs/tags/" + version;
-    hash = "sha256-+HLNZvCrpVe+lw7i5uAU6nyO/tTPth6In9qn03S/SX8=";
+    hash = "sha256-LzO6LpKsox5U2IHYZXDDkUbPeZmAa/gBpG6nk78tIzQ=";
   };
 
-  cargoHash = "sha256-A+vXptX+2xEWmxJfO8nqmp0esWHZUx1HIvTLIna/x+U=";
+  cargoHash = "sha256-I0muMgPfk72dnR4iufipjt+C7v6X/IMOdLCH12qHjA8=";
 
   passthru = {
     tests.version = testers.testVersion {

From 9547942d09360e45d6acb144473f316c534ab5ef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 18:34:11 +1000
Subject: [PATCH 43/54] gnome-secrets: 10.3 -> 10.4 (#369598)

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

diff --git a/pkgs/by-name/gn/gnome-secrets/package.nix b/pkgs/by-name/gn/gnome-secrets/package.nix
index 5e5fe23166ec..a6b2fb7f2f34 100644
--- a/pkgs/by-name/gn/gnome-secrets/package.nix
+++ b/pkgs/by-name/gn/gnome-secrets/package.nix
@@ -19,7 +19,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gnome-secrets";
-  version = "10.3";
+  version = "10.4";
   format = "other";
 
   src = fetchFromGitLab {
@@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec {
     owner = "World";
     repo = "secrets";
     rev = version;
-    hash = "sha256-UcTLngBVp5L8Y1LmBxoxPuH5Zag2YfHA2Y+ByPBkh8A=";
+    hash = "sha256-FyBtw7Gkvd5XONkM7OVGxE+S5FpuUIl7KWLFHoQeoN4=";
   };
 
   nativeBuildInputs = [

From 9b79905b2e4be8de2aa386e0866389a167fb1434 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jan 2025 18:34:58 +1000
Subject: [PATCH 44/54] keypunch: 5.0 -> 5.1 (#369797)

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

diff --git a/pkgs/by-name/ke/keypunch/package.nix b/pkgs/by-name/ke/keypunch/package.nix
index a9c91fc3d1c5..ed8f60a0b84f 100644
--- a/pkgs/by-name/ke/keypunch/package.nix
+++ b/pkgs/by-name/ke/keypunch/package.nix
@@ -19,18 +19,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "keypunch";
-  version = "5.0";
+  version = "5.1";
 
   src = fetchFromGitHub {
     owner = "bragefuglseth";
     repo = "keypunch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oP/rbtX72Ng4GVsXl5s8eESrUlJiJ/n05KArZHVo00c=";
+    hash = "sha256-C0WD8vBPlKvCJHVJHSfEbMIxNARoRrCn7PNebJ0rkoI=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-Uz9YbD4k3o3WOXCoIW41eUdi+HIfZLZJNszr9y3qezI=";
+    hash = "sha256-RufJy5mHuirAO056p5/w63jw5h00E41t+H4VQP3kPks=";
   };
 
   strictDeps = true;

From acd43b89dac819386bdff7cdecde13f871a15c2d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 09:42:47 +0100
Subject: [PATCH 45/54] python312Packages.tencentcloud-sdk-python: 3.0.1292 ->
 3.0.1293

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1292...3.0.1293

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1293/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 77cb84f65ed1..ff12a6001792 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.1292";
+  version = "3.0.1293";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-ESLSp/EtppSs+tkaSYU2CTadLTUYIvtlpyHI9fQs1es=";
+    hash = "sha256-ho1RneF7xRO6Lc7i4BxAVjHA9UZiEZA2+olnasv4RSw=";
   };
 
   build-system = [ setuptools ];

From 5ebfa75b5fdf157b79a6f422ba5bb56c69a050c1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 09:46:43 +0100
Subject: [PATCH 46/54] wafw00f: 2.2.0 -> 2.3.1

Diff: https://github.com/EnableSecurity/wafw00f/compare/refs/tags/v2.2.0...v2.3.1

Changelog: https://github.com/EnableSecurity/wafw00f/releases/tag/v2.3.1
---
 pkgs/by-name/wa/wafw00f/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/wafw00f/package.nix b/pkgs/by-name/wa/wafw00f/package.nix
index 11925b7afd6d..9e325bad1495 100644
--- a/pkgs/by-name/wa/wafw00f/package.nix
+++ b/pkgs/by-name/wa/wafw00f/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "wafw00f";
-  version = "2.2.0";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "EnableSecurity";
     repo = "wafw00f";
     rev = "refs/tags/v${version}";
-    hash = "sha256-wJZ1/aRMFpE6Q5YAtGxXwxe2G9H/de+l3l0C5rwEWA8=";
+    hash = "sha256-47lzFPMyAJTtreGGazFWUYiu9e9Q1D3QYsrQbwyaQME=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From 459a017af313a9f18ed9da598ca2bcd2ae8e19de Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 30 Dec 2024 11:06:52 +0100
Subject: [PATCH 47/54] python312Packages.aiorussound: 4.2.0 -> 4.3.0

Diff: https://github.com/noahhusby/aiorussound/compare/refs/tags/4.2.0...4.3.0

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

diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix
index 10590636690b..b9fa44ca18fd 100644
--- a/pkgs/development/python-modules/aiorussound/default.nix
+++ b/pkgs/development/python-modules/aiorussound/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "aiorussound";
-  version = "4.2.0";
+  version = "4.3.0";
   pyproject = true;
 
   # requires newer f-strings introduced in 3.12
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "noahhusby";
     repo = "aiorussound";
     rev = "refs/tags/${version}";
-    hash = "sha256-NO8FIUaMPZqB+zjMpaCvp/1LMyCH14AhdJMpbt6PwFY=";
+    hash = "sha256-qHplUG9kzpWOxwDq200LBLiX+VCZfhGpJfGCRd4KdGg=";
   };
 
   build-system = [ poetry-core ];

From 1a77b3b360f6f0dc2ef891ebcb58166e0fed88c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 10:03:12 +0100
Subject: [PATCH 48/54] python312Packages.aiorussound: 4.3.0 -> 4.4.0

Diff: https://github.com/noahhusby/aiorussound/compare/refs/tags/4.3.0...4.4.0

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

diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix
index b9fa44ca18fd..67c18c76f2fb 100644
--- a/pkgs/development/python-modules/aiorussound/default.nix
+++ b/pkgs/development/python-modules/aiorussound/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "aiorussound";
-  version = "4.3.0";
+  version = "4.4.0";
   pyproject = true;
 
   # requires newer f-strings introduced in 3.12
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "noahhusby";
     repo = "aiorussound";
     rev = "refs/tags/${version}";
-    hash = "sha256-qHplUG9kzpWOxwDq200LBLiX+VCZfhGpJfGCRd4KdGg=";
+    hash = "sha256-y1ArQ4o9RRngJFT3uk3wO/EVZu3kWYXUx2pnTSFUruc=";
   };
 
   build-system = [ poetry-core ];

From 010d40f68be752b36c07ab4e9223ecf6ebef4b53 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 30 Dec 2024 11:06:23 +0100
Subject: [PATCH 49/54] python312Packages.pylamarzocco: 1.4.3 -> 1.4.5

Diff: https://github.com/zweckj/pylamarzocco/compare/refs/tags/v1.4.3...v1.4.5

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

diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix
index 0571811c19bd..4f57d6ce5653 100644
--- a/pkgs/development/python-modules/pylamarzocco/default.nix
+++ b/pkgs/development/python-modules/pylamarzocco/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pylamarzocco";
-  version = "1.4.3";
+  version = "1.4.5";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "zweckj";
     repo = "pylamarzocco";
     rev = "refs/tags/v${version}";
-    hash = "sha256-bSwlAaaUVeORDJFWY8I2iIiQ9OvvDrpDBoQ3Ns5NrRM=";
+    hash = "sha256-LUfeRCi5OezkoYL+htJuJ/VyYJeuFTasAeXROcajzyA=";
   };
 
   build-system = [ setuptools ];

From 760f794ef6e63191f35fba4a92aa2498acbbf599 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 10:04:02 +0100
Subject: [PATCH 50/54] python312Packages.pylamarzocco: 1.4.5 -> 1.4.6

Diff: https://github.com/zweckj/pylamarzocco/compare/refs/tags/v1.4.5...v1.4.6

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

diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix
index 4f57d6ce5653..11810895c8a6 100644
--- a/pkgs/development/python-modules/pylamarzocco/default.nix
+++ b/pkgs/development/python-modules/pylamarzocco/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pylamarzocco";
-  version = "1.4.5";
+  version = "1.4.6";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "zweckj";
     repo = "pylamarzocco";
     rev = "refs/tags/v${version}";
-    hash = "sha256-LUfeRCi5OezkoYL+htJuJ/VyYJeuFTasAeXROcajzyA=";
+    hash = "sha256-Ntss7erVbpeW6EEeKrkR/anzvTUQhzggNhHi6rOIsFQ=";
   };
 
   build-system = [ setuptools ];

From e2543131df13fe40b02673b0437c83384109a78d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 10:11:14 +0100
Subject: [PATCH 51/54] python312Packages.pyvlx: 0.2.25 -> 0.2.26

Diff: https://github.com/Julius2342/pyvlx/compare/refs/tags/0.2.25...0.2.26

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

diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix
index 73973a6ad989..4b863cedb242 100644
--- a/pkgs/development/python-modules/pyvlx/default.nix
+++ b/pkgs/development/python-modules/pyvlx/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pyvlx";
-  version = "0.2.25";
+  version = "0.2.26";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "Julius2342";
     repo = "pyvlx";
     rev = "refs/tags/${version}";
-    hash = "sha256-c0HlmqLvpIn2GXorOArBKJ0YzvWz1spmhWwm6Gow2iU=";
+    hash = "sha256-JwgElt0FFSGs3v+04AKPwTTpxvn8YzihJeD/+llbSMI=";
   };
 
   build-system = [ setuptools ];

From 84b8f93de353dc15c8300c3e2ed0074b4b25f4a3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 10:13:16 +0100
Subject: [PATCH 52/54] python312Packages.aiomisc: 17.5.29 -> 17.5.31

Changelog: https://github.com/aiokitchen/aiomisc/blob/master/CHANGELOG.md
---
 pkgs/development/python-modules/aiomisc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix
index 629cf183e8a2..7b7cd32e4a35 100644
--- a/pkgs/development/python-modules/aiomisc/default.nix
+++ b/pkgs/development/python-modules/aiomisc/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "aiomisc";
-  version = "17.5.29";
+  version = "17.5.31";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-DjOl4eymyD2n1bbDUI+s3iGiWjT/AhRqmTmiZpufLNU=";
+    hash = "sha256-ty2WUMP0S/FNmSHD0ms7putftAFSDqtuP8F4jTA0WpY=";
   };
 
   build-system = [ poetry-core ];

From 45a5b0b4e59d3e95e7dc1c124574226d5429ee75 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 1 Jan 2025 10:47:19 +0100
Subject: [PATCH 53/54] python311Packages.hstspreload: 2024.12.1 -> 2025.1.1

Diff: https://github.com/sethmlarson/hstspreload/compare/refs/tags/2024.12.1...2025.1.1
---
 pkgs/development/python-modules/hstspreload/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix
index 9410c3bcc2e3..b1364c887bc5 100644
--- a/pkgs/development/python-modules/hstspreload/default.nix
+++ b/pkgs/development/python-modules/hstspreload/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "hstspreload";
-  version = "2024.12.1";
+  version = "2025.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "sethmlarson";
     repo = "hstspreload";
     rev = "refs/tags/${version}";
-    hash = "sha256-j1YtT8O4LGpUEOJhACKmz934VTgwM8o7C8ozoqPlsCM=";
+    hash = "sha256-2KtQZroKhRzqFg0xL/gXMA3jP0FgYSPYy1eP3x78rQo=";
   };
 
   build-system = [ setuptools ];

From efe62b612a8b99fd2015f5e2caa386eaafc97c29 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Wed, 1 Jan 2025 20:32:31 +0900
Subject: [PATCH 54/54] satyrographos: init at 0.0.2.13

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

diff --git a/pkgs/by-name/sa/satyrographos/package.nix b/pkgs/by-name/sa/satyrographos/package.nix
new file mode 100644
index 000000000000..611fdd4331e8
--- /dev/null
+++ b/pkgs/by-name/sa/satyrographos/package.nix
@@ -0,0 +1,50 @@
+{
+  ocamlPackages,
+  fetchFromGitHub,
+  lib,
+}:
+
+let
+  pname = "satyrographos";
+  version = "0.0.2.13";
+  src = fetchFromGitHub {
+    owner = "na4zagin3";
+    repo = "satyrographos";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-f9iJTr4nV7dFCMkI8+zv9qvYWRSw8H/xbbZm2LR9cB4=";
+  };
+in
+ocamlPackages.buildDunePackage {
+  inherit pname version src;
+
+  duneVersion = "3";
+
+  nativeBuildInputs = with ocamlPackages; [
+    menhir
+  ];
+
+  buildInputs = with ocamlPackages; [
+    core_unix
+    fileutils
+    opam-format
+    opam-state
+    ppx_deriving
+    ppx_deriving_yojson
+    ppx_import
+    ppx_jane
+    shexp
+    uri
+    uri-sexp
+    yaml-sexp
+    yojson
+  ];
+
+  meta = {
+    changelog = "https://github.com/na4zagin3/satyrographos/releases/tag/${src.rev}";
+    description = "Package manager for SATySFi";
+    homepage = "https://github.com/na4zagin3/satyrographos";
+    maintainers = with lib.maintainers; [ momeemt ];
+    mainProgram = "satyrographos";
+    license = lib.licenses.lgpl3Plus;
+  };
+}