From 963f17c958855a2454bfaee7b600938373799012 Mon Sep 17 00:00:00 2001
From: lunik1 <ch.gpg@themaw.xyz>
Date: Tue, 22 Feb 2022 16:56:28 +0000
Subject: [PATCH 001/141] nixos/connman: remove syslog.target

---
 nixos/modules/services/networking/connman.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index c626945ccd0c..4d012e525693 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -100,7 +100,7 @@ in {
     systemd.services.connman = {
       description = "Connection service";
       wantedBy = [ "multi-user.target" ];
-      after = [ "syslog.target" ] ++ lib.optional enableIwd "iwd.service";
+      after = lib.optional enableIwd "iwd.service";
       requires = lib.optional enableIwd "iwd.service";
       serviceConfig = {
         Type = "dbus";
@@ -119,7 +119,6 @@ in {
     systemd.services.connman-vpn = lib.mkIf cfg.enableVPN {
       description = "ConnMan VPN service";
       wantedBy = [ "multi-user.target" ];
-      after = [ "syslog.target" ];
       before = [ "connman.service" ];
       serviceConfig = {
         Type = "dbus";

From c74e40fb3e1efca3932bd4cbe6ea472764b6e1f2 Mon Sep 17 00:00:00 2001
From: lunik1 <ch.gpg@themaw.xyz>
Date: Tue, 11 Jan 2022 18:42:37 +0000
Subject: [PATCH 002/141] nixos/aesmd: remove syslog.target

---
 nixos/modules/services/security/aesmd.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/nixos/modules/services/security/aesmd.nix b/nixos/modules/services/security/aesmd.nix
index 8b3f010d7c4d..8c474a3fcb1f 100644
--- a/nixos/modules/services/security/aesmd.nix
+++ b/nixos/modules/services/security/aesmd.nix
@@ -104,11 +104,7 @@ in
         description = "Intel Architectural Enclave Service Manager";
         wantedBy = [ "multi-user.target" ];
 
-        after = [
-          "auditd.service"
-          "network.target"
-          "syslog.target"
-        ];
+        after = [ "auditd.service" "network.target" ];
 
         environment = {
           NAME = "aesm_service";

From 2eb085d9b5ced7ced94dd0d74b6d5c596d31ce0a Mon Sep 17 00:00:00 2001
From: lunik1 <ch.gpg@themaw.xyz>
Date: Tue, 11 Jan 2022 18:43:36 +0000
Subject: [PATCH 003/141] nixos/keepalived: remove syslog.target

---
 nixos/modules/services/networking/keepalived/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix
index 599dfd52e271..5be15c326490 100644
--- a/nixos/modules/services/networking/keepalived/default.nix
+++ b/nixos/modules/services/networking/keepalived/default.nix
@@ -308,7 +308,7 @@ in
 
     systemd.timers.keepalived-boot-delay = {
       description = "Keepalive Daemon delay to avoid instant transition to MASTER state";
-      after = [ "network.target" "network-online.target" "syslog.target" ];
+      after = [ "network.target" "network-online.target" ];
       requires = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
       timerConfig = {
@@ -321,7 +321,7 @@ in
       finalConfigFile = if cfg.secretFile == null then keepalivedConf else "/run/keepalived/keepalived.conf";
     in {
       description = "Keepalive Daemon (LVS and VRRP)";
-      after = [ "network.target" "network-online.target" "syslog.target" ];
+      after = [ "network.target" "network-online.target" ];
       wants = [ "network-online.target" ];
       serviceConfig = {
         Type = "forking";

From 3d3913890084f9847d4f2eb3f5a95de6a5fe25fa Mon Sep 17 00:00:00 2001
From: lunik1 <ch.gpg@themaw.xyz>
Date: Tue, 11 Jan 2022 18:44:19 +0000
Subject: [PATCH 004/141] nixos/cloud-init: remove syslog.target

---
 nixos/modules/services/system/cloud-init.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix
index 00ae77be4271..e6288270c8e2 100644
--- a/nixos/modules/services/system/cloud-init.nix
+++ b/nixos/modules/services/system/cloud-init.nix
@@ -204,7 +204,7 @@ in
       description = "Apply the settings specified in cloud-config";
       wantedBy = [ "multi-user.target" ];
       wants = [ "network-online.target" ];
-      after = [ "network-online.target" "syslog.target" "cloud-config.target" ];
+      after = [ "network-online.target" "cloud-config.target" ];
 
       path = path;
       serviceConfig = {
@@ -220,7 +220,7 @@ in
       description = "Execute cloud user/final scripts";
       wantedBy = [ "multi-user.target" ];
       wants = [ "network-online.target" ];
-      after = [ "network-online.target" "syslog.target" "cloud-config.service" "rc-local.service" ];
+      after = [ "network-online.target" "cloud-config.service" "rc-local.service" ];
       requires = [ "cloud-config.target" ];
       path = path;
       serviceConfig = {

From 8e02b5f478f6fb15cabfe943c4173c454792cf8d Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Wed, 15 May 2024 17:28:01 +0100
Subject: [PATCH 005/141] nixos/loki: Start Loki after the network comes online

Otherwise Loki fails to reach S3 stores after it comes up.
---
 nixos/modules/services/monitoring/loki.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/monitoring/loki.nix b/nixos/modules/services/monitoring/loki.nix
index ba63f95e7f1a..5acb92e3d804 100644
--- a/nixos/modules/services/monitoring/loki.nix
+++ b/nixos/modules/services/monitoring/loki.nix
@@ -93,6 +93,8 @@ in {
 
     systemd.services.loki = {
       description = "Loki Service Daemon";
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = let

From 06791fce8f9e5a461f1d3f67a6f7b3ac8303e090 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Sat, 21 Sep 2024 16:00:00 +0200
Subject: [PATCH 006/141] nixos/nbd: remove `with lib;`

---
 nixos/modules/services/networking/nbd.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/networking/nbd.nix b/nixos/modules/services/networking/nbd.nix
index e4a7bb1604f9..c2cf1612296a 100644
--- a/nixos/modules/services/networking/nbd.nix
+++ b/nixos/modules/services/networking/nbd.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib) mkIf mkOption types optionalAttrs;
+  inherit (lib.types) nullOr listOf str attrsOf submodule;
   cfg = config.services.nbd;
   iniFields = with types; attrsOf (oneOf [ bool int float str ]);
   # The `[generic]` section must come before all the others in the
@@ -19,12 +19,12 @@ let
     }));
   };
   exportSections =
-    mapAttrs
+    lib.mapAttrs
       (_: { path, allowAddresses, extraOptions }:
         extraOptions // {
           exportname = path;
         } // (optionalAttrs (allowAddresses != null) {
-          authfile = pkgs.writeText "authfile" (concatStringsSep "\n" allowAddresses);
+          authfile = pkgs.writeText "authfile" (lib.concatStringsSep "\n" allowAddresses);
         }))
       cfg.server.exports;
   serverConfig =
@@ -33,9 +33,9 @@ let
       ${lib.generators.toINI {} exportSections}
     '';
   splitLists =
-    partition
-      (path: hasPrefix "/dev/" path)
-      (mapAttrsToList (_: { path, ... }: path) cfg.server.exports);
+    lib.partition
+      (path: lib.hasPrefix "/dev/" path)
+      (lib.mapAttrsToList (_: { path, ... }: path) cfg.server.exports);
   allowedDevices = splitLists.right;
   boundPaths = splitLists.wrong;
 in
@@ -43,7 +43,7 @@ in
   options = {
     services.nbd = {
       server = {
-        enable = mkEnableOption "the Network Block Device (nbd) server";
+        enable = lib.mkEnableOption "the Network Block Device (nbd) server";
 
         listenPort = mkOption {
           type = types.port;
@@ -65,7 +65,7 @@ in
         exports = mkOption {
           description = "Files or block devices to make available over the network.";
           default = { };
-          type = with types; attrsOf
+          type = attrsOf
             (submodule {
               options = {
                 path = mkOption {
@@ -97,7 +97,7 @@ in
         };
 
         listenAddress = mkOption {
-          type = with types; nullOr str;
+          type = nullOr str;
           description = "Address to listen on. If not specified, the server will listen on all interfaces.";
           default = null;
           example = "10.10.0.1";

From aa6ef8e22bab27416982a101ce5ce73f0bd03c89 Mon Sep 17 00:00:00 2001
From: danjujan <44864658+danjujan@users.noreply.github.com>
Date: Thu, 26 Sep 2024 14:41:46 +0200
Subject: [PATCH 007/141] nixos/gitlab-runner: let script options accept
 scripts as strings

The script options not only accept paths to a script but also the script as string. See https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section
---
 .../services/continuous-integration/gitlab-runner.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index 34e9b6200783..b755cc94920a 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -499,21 +499,21 @@ in {
             '';
           };
           preGetSourcesScript = mkOption {
-            type = types.nullOr types.path;
+            type = types.nullOr (types.either types.str types.path);
             default = null;
             description = ''
               Runner-specific command script executed before code is pulled.
             '';
           };
           postGetSourcesScript = mkOption {
-            type = types.nullOr types.path;
+            type = types.nullOr (types.either types.str types.path);
             default = null;
             description = ''
               Runner-specific command script executed after code is pulled.
             '';
           };
           preBuildScript = mkOption {
-            type = types.nullOr types.path;
+            type = types.nullOr (types.either types.str types.path);
             default = null;
             description = ''
               Runner-specific command script executed after code is pulled,
@@ -521,7 +521,7 @@ in {
             '';
           };
           postBuildScript = mkOption {
-            type = types.nullOr types.path;
+            type = types.nullOr (types.either types.str types.path);
             default = null;
             description = ''
               Runner-specific command script executed after code is pulled

From c713db2b9fe7ec1d0e7641a6ef7471012279ec96 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Sat, 26 Oct 2024 21:50:11 +0200
Subject: [PATCH 008/141] python3Packages.pyalsaaudio: init at 0.11.0

---
 .../python-modules/pyalsaaudio/default.nix    | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyalsaaudio/default.nix

diff --git a/pkgs/development/python-modules/pyalsaaudio/default.nix b/pkgs/development/python-modules/pyalsaaudio/default.nix
new file mode 100644
index 000000000000..7697f6bdf78f
--- /dev/null
+++ b/pkgs/development/python-modules/pyalsaaudio/default.nix
@@ -0,0 +1,34 @@
+{
+  alsa-lib,
+  buildPythonPackage,
+  fetchPypi,
+  lib,
+}:
+
+buildPythonPackage rec {
+  pname = "pyalsaaudio";
+  version = "0.11.0";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-p4qdyjNSSyyQZLNOIfWrh0JyMTzzJKmndZLzlqXg/dw=";
+  };
+
+  buildInputs = [
+    alsa-lib
+  ];
+
+  pythonImportsCheck = [ "alsaaudio" ];
+
+  # Unit tests exist in test.py, but they require hardware (and therefore /dev) access.
+  doCheck = false;
+
+  meta = with lib; {
+    description = "ALSA wrappers for Python";
+    homepage = "https://github.com/larsimmisch/pyalsaaudio";
+    changelog = "https://github.com/larsimmisch/pyalsaaudio/blob/${version}/CHANGES.md";
+    license = licenses.psfl;
+    maintainers = with maintainers; [ timschumi ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0e4926959ab1..a65271d86570 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10197,6 +10197,8 @@ self: super: with self; {
 
   pyaehw4a1 = callPackage ../development/python-modules/pyaehw4a1 { };
 
+  pyalsaaudio = callPackage ../development/python-modules/pyalsaaudio { };
+
   pyatag = callPackage ../development/python-modules/pyatag { };
 
   pyatem = callPackage ../development/python-modules/pyatem { };

From bac10f202ba3ac18070734b50a4cad58fd259895 Mon Sep 17 00:00:00 2001
From: purpole <101905225+purpole@users.noreply.github.com>
Date: Sat, 2 Nov 2024 14:18:33 +0100
Subject: [PATCH 009/141] maintainers: Add purpole

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6fd827cd72b9..8d46fd50c9d1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17673,6 +17673,12 @@
     githubId = 5636;
     name = "Steve Purcell";
   };
+  purpole = {
+    email = "mail@purpole.io";
+    github = "purpole";
+    githubId = 101905225;
+    name = "David Schneider";
+  };
   purrpurrn = {
     email = "scrcpynovideoaudiocodecraw+nixpkgs@gmail.com";
     github = "purrpurrn";

From fd8506f99748a18b4f177e240c4782ea1918d097 Mon Sep 17 00:00:00 2001
From: purpole <101905225+purpole@users.noreply.github.com>
Date: Sat, 2 Nov 2024 14:14:03 +0100
Subject: [PATCH 010/141] sccmhunter: init at 1.0.6-unstable-2024-11-07

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

diff --git a/pkgs/by-name/sc/sccmhunter/package.nix b/pkgs/by-name/sc/sccmhunter/package.nix
new file mode 100644
index 000000000000..62ced9ce2af8
--- /dev/null
+++ b/pkgs/by-name/sc/sccmhunter/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "sccmhunter";
+  version = "1.0.6-unstable-2024-11-07";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "garrettfoster13";
+    repo = "sccmhunter";
+    rev = "33c23f0d71e48127a0b03b06a019148df71049ef";
+    hash = "sha256-mU3GKgX8gcuJ+YT3xL0/dDds34uhFD+Rc3m15W7zoKc=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    cmd2
+    cryptography
+    impacket
+    ldap3
+    pandas
+    pyasn1
+    pyasn1-modules
+    requests
+    requests-ntlm
+    requests-toolbelt
+    rich
+    tabulate
+    typer
+    urllib3
+    pyopenssl
+    pycryptodome
+  ];
+
+  meta = {
+    description = "Post exploitation tool to identify and attack SCCM related assets in an Active Directory domain";
+    homepage = "https://github.com/garrettfoster13/sccmhunter";
+    changelog = "https://github.com/garrettfoster13/sccmhunter/blob/${src.rev}/changelog.md";
+    license = lib.licenses.mit;
+    mainProgram = "sccmhunter.py";
+    maintainers = with lib.maintainers; [ purpole ];
+  };
+}

From 833e1164761bda7438dcaed1c82fe41859b42671 Mon Sep 17 00:00:00 2001
From: Misael Aguayo <aguayo.misael@gmail.com>
Date: Sat, 2 Nov 2024 23:59:52 -0500
Subject: [PATCH 011/141] static-web-server: 2.33.0 -> 2.33.1

---
 pkgs/by-name/st/static-web-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix
index aba331f581d3..d612eb51c97e 100644
--- a/pkgs/by-name/st/static-web-server/package.nix
+++ b/pkgs/by-name/st/static-web-server/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "static-web-server";
-  version = "2.33.0";
+  version = "2.33.1";
 
   src = fetchFromGitHub {
     owner = "static-web-server";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-WR8fzpeN6zufvakanJBSMtgTpfDRqCyaTfEzE5NqFOA=";
+    hash = "sha256-2vkRLQ4FKw/gkv4GuwFVcL8oDV4cNuKualQVc/X2B/Y=";
   };
 
-  cargoHash = "sha256-AasNva4SOTSrvBTrGHX/jOPjcjt3o8KUsFL7e4uhW6M=";
+  cargoHash = "sha256-wRDYzm6mYze9CX+Ug53M3wuf3Ry6l3NGTDyCL7rbdc8=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 

From e032def5eaeb453a9eb6bd0b3763235b29cd84c6 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Fri, 15 Nov 2024 08:41:55 +0000
Subject: [PATCH 012/141] rcodesign: 0.27.0 -> 0.28.0

Just a straightforward version bump; we get to drop a couple patches
that merged upstream!
---
 .../rc/rcodesign/fix-verbosity-level.patch    | 19 --------
 pkgs/by-name/rc/rcodesign/package.nix         | 13 ++---
 .../update-time-rs-in-cargo-lock.patch        | 47 -------------------
 3 files changed, 3 insertions(+), 76 deletions(-)
 delete mode 100644 pkgs/by-name/rc/rcodesign/fix-verbosity-level.patch
 delete mode 100644 pkgs/by-name/rc/rcodesign/update-time-rs-in-cargo-lock.patch

diff --git a/pkgs/by-name/rc/rcodesign/fix-verbosity-level.patch b/pkgs/by-name/rc/rcodesign/fix-verbosity-level.patch
deleted file mode 100644
index 5d134bd71165..000000000000
--- a/pkgs/by-name/rc/rcodesign/fix-verbosity-level.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/apple-codesign/src/cli/mod.rs b/apple-codesign/src/cli/mod.rs
-index 53e9649271..82d4d061a6 100644
---- a/apple-codesign/src/cli/mod.rs
-+++ b/apple-codesign/src/cli/mod.rs
-@@ -2499,9 +2499,11 @@
-         _ => LevelFilter::Trace,
-     };
- 
--    let mut builder = env_logger::Builder::from_env(
--        env_logger::Env::default().default_filter_or(log_level.as_str()),
--    );
-+    let mut builder = env_logger::Builder::new();
-+
-+    builder
-+        .filter_level(log_level)
-+        .parse_default_env();
- 
-     // Disable log context except at higher log levels.
-     if log_level <= LevelFilter::Info {
diff --git a/pkgs/by-name/rc/rcodesign/package.nix b/pkgs/by-name/rc/rcodesign/package.nix
index b96258cf1672..c4e2f601a193 100644
--- a/pkgs/by-name/rc/rcodesign/package.nix
+++ b/pkgs/by-name/rc/rcodesign/package.nix
@@ -8,28 +8,21 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rcodesign";
-  version = "0.27.0";
+  version = "0.28.0";
 
   src = fetchFromGitHub {
     owner = "indygreg";
     repo = "apple-platform-rs";
     rev = "apple-codesign/${version}";
-    hash = "sha256-F6Etl3Zbpmh3A/VeCcSXIy3W1WYFg8WUSJBJV/akCxU=";
+    hash = "sha256-xyjq5mdc29OwzlUAQZWSg1k68occ81i7KBGUiiq0ke0=";
   };
 
-  cargoPatches = [
-    # Update time to a version that is compatible with Rust 1.80
-    ./update-time-rs-in-cargo-lock.patch
-  ];
-
   patches = [
-    # Fix rcodesign’s verbosity level to set the logging level as intended. Needed for cli_tests.
-    ./fix-verbosity-level.patch
     # Disable cli_tests test that requires network access.
     ./disable-sign-for-notarization-test.patch
   ];
 
-  cargoHash = "sha256-VrexypkCW58asvzXo3wj/Rgi72tiGuchA31BkEZoYpI=";
+  cargoHash = "sha256-xMhyKovXoBPZp6epWQ+CYODpyvHgpv6eZfdWPTuDnK8=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
 
diff --git a/pkgs/by-name/rc/rcodesign/update-time-rs-in-cargo-lock.patch b/pkgs/by-name/rc/rcodesign/update-time-rs-in-cargo-lock.patch
deleted file mode 100644
index 892c5c2ae402..000000000000
--- a/pkgs/by-name/rc/rcodesign/update-time-rs-in-cargo-lock.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 3a5dd6d244..787b048829 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -2257,6 +2257,12 @@
- ]
- 
- [[package]]
-+name = "num-conv"
-+version = "0.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-+
-+[[package]]
- name = "num-integer"
- version = "0.1.45"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -3605,12 +3611,13 @@
- 
- [[package]]
- name = "time"
--version = "0.3.31"
-+version = "0.3.36"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
-+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
- dependencies = [
-  "deranged",
-  "itoa",
-+ "num-conv",
-  "powerfmt",
-  "serde",
-  "time-core",
-@@ -3625,10 +3632,11 @@
- 
- [[package]]
- name = "time-macros"
--version = "0.2.16"
-+version = "0.2.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
-+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
- dependencies = [
-+ "num-conv",
-  "time-core",
- ]
- 

From 90633c1825085e8ba98495d0835cebf0e8b5a272 Mon Sep 17 00:00:00 2001
From: Patryk Wychowaniec <pwychowaniec@pm.me>
Date: Fri, 15 Nov 2024 16:38:51 +0100
Subject: [PATCH 013/141] pcloud: 1.14.7 -> 1.14.8

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

diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix
index 3a2a479e78eb..afec1baa79f6 100644
--- a/pkgs/by-name/pc/pcloud/package.nix
+++ b/pkgs/by-name/pc/pcloud/package.nix
@@ -38,13 +38,13 @@
 
 let
   pname = "pcloud";
-  version = "1.14.7";
-  code = "XZhPkU0Zh5gulxHfMn4j1dYBS4dh45iDQHby";
+  version = "1.14.8";
+  code = "XZ6qNX5ZgodGJnOmGT5jY4UaBxqEVVbaUzGX";
 
   # Archive link's codes: https://www.pcloud.com/release-notes/linux.html
   src = fetchzip {
     url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip";
-    hash = "sha256-fzQVuCI3mK93Y3Fwzc0WM5rti0fTZhRm+Qj1CHC8CJ4=";
+    hash = "sha256-o26HI1v6VzF14d261M1rWp8wlM4O6uL4YJ/cmkwqRXU=";
   };
 
   appimageContents = appimageTools.extractType2 {

From acae8e9cc9bd65e99a4796c8ec4d4061235fe98d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 17 Nov 2024 20:32:43 +0000
Subject: [PATCH 014/141] python312Packages.readchar: 4.2.0 -> 4.2.1

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

diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix
index 29c4f5d0bd2d..ada2890edd82 100644
--- a/pkgs/development/python-modules/readchar/default.nix
+++ b/pkgs/development/python-modules/readchar/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "readchar";
-  version = "4.2.0";
+  version = "4.2.1";
   pyproject = true;
 
   # Don't use wheels on PyPI
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "magmax";
     repo = "python-${pname}";
     rev = "refs/tags/v${version}";
-    hash = "sha256-xha3bGuDYt4gLcK3x62ym+zCAQVyZjlV1HyKh8kHe64=";
+    hash = "sha256-r+dKGv0a7AU+Ef94AGCCJLQolLqTTxaNmqRQYkxk15s=";
   };
 
   postPatch = ''

From f6253960d35467b963e30889495060e51de85bd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Nov 2024 06:10:32 +0000
Subject: [PATCH 015/141] sdrangel: 7.22.2 -> 7.22.4

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

diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix
index 170173c3bc39..143dfa8b68fd 100644
--- a/pkgs/applications/radio/sdrangel/default.nix
+++ b/pkgs/applications/radio/sdrangel/default.nix
@@ -53,13 +53,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdrangel";
-  version = "7.22.2";
+  version = "7.22.4";
 
   src = fetchFromGitHub {
     owner = "f4exb";
     repo = "sdrangel";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HFAQ+Pjl//F18O4TryU1zIiAqtb/mBXKipaqNCeeqQo=";
+    hash = "sha256-+7s2VFxqyk9zLxztpYqV9eqGWA7clphKq8JVwIUPb4c=";
   };
 
   nativeBuildInputs = [

From 1c537cf04ac89ffb85f45963d114d5463eae90e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Nov 2024 14:09:00 +0000
Subject: [PATCH 016/141] git-lfs: 3.5.1 -> 3.6.0

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

diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 8021e165e6c6..22ee1a17f218 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "git-lfs";
-  version = "3.5.1";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "git-lfs";
     repo = "git-lfs";
     rev = "v${version}";
-    hash = "sha256-xSLXbAvIoY3c341qi89pTrjBZdXh/bPrweJD2O2gkjY=";
+    hash = "sha256-PpNdbvtDAZDT43yyEkUvnhfUTAMM+mYImb3dVbAVPic=";
   };
 
-  vendorHash = "sha256-N8HB2qwBxjzfNucftHxmX2W9srCx62pjmkCWzwiCj/I=";
+  vendorHash = "sha256-JT0r/hs7ZRtsYh4aXy+v8BjwiLvRJ10e4yRirqmWVW0=";
 
   nativeBuildInputs = [ asciidoctor installShellFiles ];
 

From 2a8cac1d474f89fcbe2bb494863d7ecb7ffd6259 Mon Sep 17 00:00:00 2001
From: Arne Keller <2012gdwu+github@posteo.de>
Date: Sat, 23 Nov 2024 11:21:07 +0100
Subject: [PATCH 017/141] blender: use numpy 1.x

---
 pkgs/applications/misc/blender/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index e2af0b3f9338..583c2f1d88f1 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -171,8 +171,8 @@ stdenv.mkDerivation (finalAttrs: {
       "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"
       "-DPYTHON_LIBPATH=${python3}/lib"
       "-DPYTHON_LIBRARY=${python3.libPrefix}"
-      "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy}/${python3.sitePackages}/numpy/core/include"
-      "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python3.sitePackages}"
+      "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include"
+      "-DPYTHON_NUMPY_PATH=${python3Packages.numpy_1}/${python3.sitePackages}"
       "-DPYTHON_VERSION=${python3.pythonVersion}"
       "-DWITH_ALEMBIC=ON"
       "-DWITH_BUILDINFO=OFF"
@@ -333,7 +333,7 @@ stdenv.mkDerivation (finalAttrs: {
     in
     [
       ps.materialx
-      ps.numpy
+      ps.numpy_1
       ps.requests
       ps.zstandard
     ]

From fd17f3cd76eb7299002798f142a2470dc6854aae Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Mon, 18 Nov 2024 23:00:04 +0100
Subject: [PATCH 018/141] cplay-ng: 5.2.0 -> 5.3.1

Diff: https://github.com/xi/cplay-ng/compare/5.2.0...5.3.1
---
 pkgs/by-name/cp/cplay-ng/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cp/cplay-ng/package.nix b/pkgs/by-name/cp/cplay-ng/package.nix
index caecd35bed18..f5eca1896672 100644
--- a/pkgs/by-name/cp/cplay-ng/package.nix
+++ b/pkgs/by-name/cp/cplay-ng/package.nix
@@ -8,19 +8,25 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "cplay-ng";
-  version = "5.2.0";
+  version = "5.3.1";
 
   src = fetchFromGitHub {
     owner = "xi";
     repo = "cplay-ng";
     rev = version;
-    hash = "sha256-M9WpB59AWSaGMnGrO37Fc+7O6pVBc2BDAv/BGlPmo8E=";
+    hash = "sha256-6mphhoLDkGZ2r+elzLlPl3B8fNz3loqrQB8x8276AHI=";
   };
 
   nativeBuildInputs = [
     makeWrapper
   ];
 
+  build-system = [
+    python3.pkgs.setuptools
+  ];
+
+  pyproject = true;
+
   postInstall = ''
     wrapProgram $out/bin/cplay-ng \
       --prefix PATH : ${lib.makeBinPath [ mpv pulseaudio ]}

From 0d48c50f4b01ff434fa58900e62c02a078f62681 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 30 Nov 2024 07:01:29 +0100
Subject: [PATCH 019/141] nixos/networkd: use upstream wait-online@ unit

Use the upstream unit for systemd-networkd-wait-online@.service and fix
the spelling.
---
 nixos/modules/system/boot/networkd.nix | 16 ++++++----------
 nixos/tests/systemd-networkd.nix       |  4 ++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 2ff79f1cdc85..2bd24414bbe9 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -2843,16 +2843,11 @@ let
         ];
       };
 
-      systemd.services."systemd-network-wait-online@" = {
-        description = "Wait for Network Interface %I to be Configured";
-        conflicts = [ "shutdown.target" ];
-        requisite = [ "systemd-networkd.service" ];
-        after = [ "systemd-networkd.service" ];
-        serviceConfig = {
-          Type = "oneshot";
-          RemainAfterExit = true;
-          ExecStart = "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %I ${utils.escapeSystemdExecArgs cfg.wait-online.extraArgs}";
-        };
+      systemd.services."systemd-networkd-wait-online@" = {
+        serviceConfig.ExecStart = [
+          ""
+          "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %i ${utils.escapeSystemdExecArgs cfg.wait-online.extraArgs}"
+        ];
       };
 
     })
@@ -2872,6 +2867,7 @@ let
 
       systemd.additionalUpstreamSystemUnits = [
         "systemd-networkd-wait-online.service"
+        "systemd-networkd-wait-online@.service"
         "systemd-networkd.service"
         "systemd-networkd.socket"
         "systemd-networkd-persistent-storage.service"
diff --git a/nixos/tests/systemd-networkd.nix b/nixos/tests/systemd-networkd.nix
index 34272f9b0411..2923967cc897 100644
--- a/nixos/tests/systemd-networkd.nix
+++ b/nixos/tests/systemd-networkd.nix
@@ -96,7 +96,11 @@ in import ./make-test-python.nix ({pkgs, ... }: {
   };
 testScript = ''
     start_all()
+    node1.succeed("systemctl start systemd-networkd-wait-online@eth1.service")
+    node1.wait_for_unit("systemd-networkd-wait-online@eth1.service")
     node1.wait_for_unit("systemd-networkd-wait-online.service")
+    node2.succeed("systemctl start systemd-networkd-wait-online@eth1.service")
+    node2.wait_for_unit("systemd-networkd-wait-online@eth1.service")
     node2.wait_for_unit("systemd-networkd-wait-online.service")
 
     # ================================

From 77b57f0a525c431b8992bebc3c205c421d070ed2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Nov 2024 11:06:23 +0000
Subject: [PATCH 020/141] armadillo: 14.0.3 -> 14.2.1

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

diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix
index 6b83d72a9716..8ec47c8681b7 100644
--- a/pkgs/by-name/ar/armadillo/package.nix
+++ b/pkgs/by-name/ar/armadillo/package.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "armadillo";
-  version = "14.0.3";
+  version = "14.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    hash = "sha256-69YhXusB7kEv7QeMip9/h9Th9hh+vNwbwJ9GCVpPQAM=";
+    hash = "sha256-JJWBXPnRMPcP/7ahJzPQ3K+Gy6rFHotLgq0lGD7aHdU=";
   };
 
   nativeBuildInputs = [ cmake ];

From 6e867a01c7a2f7b53c47752948a21b7fcd86c2a1 Mon Sep 17 00:00:00 2001
From: PixelSergey <sergey.ichtchenko@gmail.com>
Date: Sat, 30 Nov 2024 11:13:56 +0000
Subject: [PATCH 021/141] meow: 2.1.3 -> 2.1.4

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

diff --git a/pkgs/by-name/me/meow/package.nix b/pkgs/by-name/me/meow/package.nix
index afadac89b9b8..d5573f60c972 100644
--- a/pkgs/by-name/me/meow/package.nix
+++ b/pkgs/by-name/me/meow/package.nix
@@ -6,19 +6,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "meow";
-  version = "2.1.3";
+  version = "2.1.4";
 
   src = fetchFromGitHub {
     owner = "PixelSergey";
     repo = "meow";
     rev = "v${version}";
-    hash = "sha256-PB871c137uxxPaYbV6NB8kECVUrQWTeVz0ciVLHrph4=";
+    hash = "sha256-iskpT0CU/cGp+8myWaVmdw/uC0VoP8Sv+qbjpDDKS3o=";
   };
 
-  cargoHash = "sha256-4BoKZUgt4jf8jy2HU3J6RuT0GXNqkJnBUR09wNlNm7E=";
+  cargoHash = "sha256-/XzXgbmgJ1EN3cQmgWNMUpYtNWRlwJ0mvaQWCsP3FMk=";
 
   postInstall = ''
-    ln -s $out/bin/meow-cli $out/bin/meow
+    mv $out/bin/meow-cli $out/bin/meow
   '';
 
   meta = {

From fafa1755825e99fcd86e95abbb9a5e868d13a019 Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Sat, 30 Nov 2024 10:56:43 +0000
Subject: [PATCH 022/141] ugrep: 7.1.0 -> 7.1.1

Changes: https://github.com/Genivia/ugrep/releases/tag/v7.1.1

Co-authored-by: Samuel Tardieu <sam@rfc1149.net>
---
 pkgs/by-name/ug/ugrep/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ug/ugrep/package.nix b/pkgs/by-name/ug/ugrep/package.nix
index 4adaa02aa623..5b1bce33d932 100644
--- a/pkgs/by-name/ug/ugrep/package.nix
+++ b/pkgs/by-name/ug/ugrep/package.nix
@@ -6,6 +6,7 @@
 , bzip2
 , bzip3
 , lz4
+, makeWrapper
 , pcre2
 , testers
 , xz
@@ -15,15 +16,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ugrep";
-  version = "7.1.0";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "Genivia";
     repo = "ugrep";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-H2c2PpdgjzPwR2aOFgQSLTeyxCBg4Ngibf0t1aT3xl8=";
+    hash = "sha256-l/AHt0OLI76AEOOziFXdfQdJlx6HqdFoEJ27YhwUJnQ=";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
+
   buildInputs = [
     boost
     brotli
@@ -36,6 +39,12 @@ stdenv.mkDerivation (finalAttrs: {
     zstd
   ];
 
+  postFixup = ''
+    for i in ug+ ugrep+; do
+      wrapProgram "$out/bin/$i" --prefix PATH : "$out/bin"
+    done
+  '';
+
   passthru.tests = {
     version = testers.testVersion {
       package = finalAttrs.finalPackage;

From 528f3ea62a48c4495b0e90405f2d60386bdf5518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFs?= <49660929+SailorSnoW@users.noreply.github.com>
Date: Sat, 30 Nov 2024 13:15:56 +0100
Subject: [PATCH 023/141] roon-server: 2.0-1470 -> 2.0-1483

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

diff --git a/pkgs/by-name/ro/roon-server/package.nix b/pkgs/by-name/ro/roon-server/package.nix
index de90d8b8e040..dd79f2b66da5 100644
--- a/pkgs/by-name/ro/roon-server/package.nix
+++ b/pkgs/by-name/ro/roon-server/package.nix
@@ -15,7 +15,7 @@
 , stdenv
 }:
 let
-  version = "2.0-1470";
+  version = "2.0-1483";
   urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
 in
 stdenv.mkDerivation {
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
-    hash = "sha256-esaxrSdvl1qUNfotOSs8Tj/AUg6hFpl23DGbji/uFO8=";
+    hash = "sha256-y8MYiWlc3HfF7a3n7yrs84H/9KbEoANd8+7t2ORIm6w=";
   };
 
   dontConfigure = true;

From c500419053b9270e9f86a39a15469ced7ede82ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Nov 2024 20:51:38 +0000
Subject: [PATCH 024/141] catppuccin-kvantum: 0-unstable-2024-10-10 ->
 0-unstable-2024-10-25

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

diff --git a/pkgs/by-name/ca/catppuccin-kvantum/package.nix b/pkgs/by-name/ca/catppuccin-kvantum/package.nix
index 169ac2147151..a595edbd6de5 100644
--- a/pkgs/by-name/ca/catppuccin-kvantum/package.nix
+++ b/pkgs/by-name/ca/catppuccin-kvantum/package.nix
@@ -13,13 +13,13 @@ in
 
   stdenvNoCC.mkDerivation {
     inherit pname;
-    version = "0-unstable-2024-10-10";
+    version = "0-unstable-2024-10-25";
 
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "Kvantum";
-      rev = "bdaa531318d5756cea5674a750a99134dad0bbbc";
-      hash = "sha256-O85y8Gg0l+xQP1eQi9GizuKfLEGePZ3wPdBNR+0V4ZQ=";
+      rev = "a87694e0a3c97644dbb34f8835112d17b54ace68";
+      hash = "sha256-eQmEeKC+L408ajlNg3oKMnDK6Syy2GV6FrR2TN5ZBCg=";
     };
 
     installPhase = ''

From d95509902600d7e4bc69a030351e80c3311e1867 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Dec 2024 05:57:21 +0000
Subject: [PATCH 025/141] aws-sam-cli: 1.127.0 -> 1.131.0

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

diff --git a/pkgs/by-name/aw/aws-sam-cli/package.nix b/pkgs/by-name/aw/aws-sam-cli/package.nix
index a65a16fdbf8f..696098a88581 100644
--- a/pkgs/by-name/aw/aws-sam-cli/package.nix
+++ b/pkgs/by-name/aw/aws-sam-cli/package.nix
@@ -11,14 +11,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "aws-sam-cli";
-  version = "1.127.0";
+  version = "1.131.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-sam-cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5/zXvO5xrNkhPCei4O/nMXA/e18VNrED2lpBbflaJLQ=";
+    hash = "sha256-xA0scuj7R/lA2UCogWYaYSgxzk5i6QI+IxuM/TkBpBs=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From 3bc8b401c1137084aff0041b9ab657f9f2969cd0 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 30 Nov 2024 22:08:52 +0800
Subject: [PATCH 026/141] gnome.updateScript: Fetch cache.json from
 download.gnome.org/sources

ftp.gnome.org/pub/GNOME/sources already redirects to download.gnome.org/sources. For some reason sometimes
I get "Application is not available" when using the former link but this does not happen with the latter.
---
 pkgs/desktops/gnome/find-latest-version.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome/find-latest-version.py b/pkgs/desktops/gnome/find-latest-version.py
index 1cc2b55fadb3..d921fd7366cb 100644
--- a/pkgs/desktops/gnome/find-latest-version.py
+++ b/pkgs/desktops/gnome/find-latest-version.py
@@ -102,7 +102,7 @@ def make_version_policy(
 
 def find_versions(package_name: str, version_policy: VersionPolicy) -> List[Version]:
     # The structure of cache.json: https://gitlab.gnome.org/Infrastructure/sysadmin-bin/blob/master/ftpadmin#L762
-    cache = json.loads(requests.get(f"https://ftp.gnome.org/pub/GNOME/sources/{package_name}/cache.json").text)
+    cache = json.loads(requests.get(f"https://download.gnome.org/sources/{package_name}/cache.json").text)
     if type(cache) != list or cache[0] != 4:
         raise Exception("Unknown format of cache.json file.")
 
@@ -117,7 +117,7 @@ parser = argparse.ArgumentParser(
 )
 parser.add_argument(
     "package-name",
-    help="Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.",
+    help="Name of the directory in https://download.gnome.org/sources/ containing the package.",
 )
 parser.add_argument(
     "version-policy",

From dceede07386180883ae5f948dbe15e82739a6ef9 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 30 Nov 2024 14:23:53 +0000
Subject: [PATCH 027/141] =?UTF-8?q?evolution:=203.54.1=20=E2=86=92=203.54.?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/evolution/-/compare/3.54.1...3.54.2
---
 .../networking/mailreaders/evolution/evolution/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index 7b948ccdddf0..b8d1c3740e44 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -45,11 +45,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution";
-  version = "3.54.1";
+  version = "3.54.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-qEQzdJd6AcY70Dr9tcY+c6SOZ0XX1Fm08mgj3Vz5lxs=";
+    hash = "sha256-7eopEv/bZZnA6gKJw6muIBe/43oI14IjWEUhqlaGtXY=";
   };
 
   nativeBuildInputs = [

From 0031ce04c1e2cf350dd6192edd5548243d4152ae Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 30 Nov 2024 15:15:10 +0000
Subject: [PATCH 028/141] =?UTF-8?q?evolution-data-server:=203.54.1=20?=
 =?UTF-8?q?=E2=86=92=203.54.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/evolution-data-server/-/compare/3.54.1...3.54.2
---
 pkgs/by-name/ev/evolution-data-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix
index 1bddb3481aab..07d16d22110c 100644
--- a/pkgs/by-name/ev/evolution-data-server/package.nix
+++ b/pkgs/by-name/ev/evolution-data-server/package.nix
@@ -49,13 +49,13 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-data-server";
-  version = "3.54.1";
+  version = "3.54.2";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz";
-    hash = "sha256-JbM2xIprq8NjIdiAlLOCrq8Yq8urSpQ4s//5DCnhBa4=";
+    hash = "sha256-EfAlMInIq/RWz/2j/mWKNaDeK4rpPY8lfWsCCueWPSA=";
   };
 
   patches = [

From e9bbe484dc3af380bc00030d8e1ad653809467ee Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 30 Nov 2024 15:17:05 +0000
Subject: [PATCH 029/141] =?UTF-8?q?evolution-ews:=203.54.1=20=E2=86=92=203?=
 =?UTF-8?q?.54.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/evolution-ews/-/compare/3.54.1...3.54.2
---
 .../mailreaders/evolution/evolution-ews/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
index ccdef5cb3df9..74d2d776643c 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-ews";
-  version = "3.54.1";
+  version = "3.54.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-oeM9aED4GLdLv+iafb2jcpXdgUWn30JlrS2yQUU4kDo=";
+    hash = "sha256-77UZ2inoIX58t3dNQ9BGJiSMO+WKGUbIpjwyDl2IPNQ=";
   };
 
   patches = [

From af6f153f5495725b57f4eea65495598c365abdc4 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 30 Nov 2024 14:23:55 +0000
Subject: [PATCH 030/141] =?UTF-8?q?file-roller:=2044.3=20=E2=86=92=2044.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/file-roller/-/compare/44.3...44.4

* use_native_appchooser is disabled by default.
* libhandy is for GTK 3.
---
 pkgs/by-name/fi/file-roller/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/fi/file-roller/package.nix b/pkgs/by-name/fi/file-roller/package.nix
index 91c463802353..5de8f9f14f46 100644
--- a/pkgs/by-name/fi/file-roller/package.nix
+++ b/pkgs/by-name/fi/file-roller/package.nix
@@ -16,20 +16,18 @@
 , gnome
 , gtk4
 , libadwaita
-, libhandy
 , json-glib
 , libarchive
-, libportal-gtk4
 , nautilus
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "file-roller";
-  version = "44.3";
+  version = "44.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz";
-    hash = "sha256-BMinRiX+yEJn/exAMGr7QQS9My2FBh4NNtSrBTOt+ko=";
+    hash = "sha256-uMMJ2jqnhMcZVYw0ZkAjePSj1sro7XfPaEmqzVbOuew=";
   };
 
   nativeBuildInputs = [
@@ -50,10 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk4
     libadwaita
-    libhandy
     json-glib
     libarchive
-    libportal-gtk4
     nautilus
   ];
 

From 9f9b49e2aa866d91dec04a8779a2b1a15e135a3c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 30 Nov 2024 14:24:05 +0000
Subject: [PATCH 031/141] =?UTF-8?q?ghex:=2046.0=20=E2=86=92=2046.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/ghex/-/compare/46.0...46.1
---
 pkgs/by-name/gh/ghex/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix
index 69e4c0f94ff0..b4fd1da04ff0 100644
--- a/pkgs/by-name/gh/ghex/package.nix
+++ b/pkgs/by-name/gh/ghex/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ghex";
-  version = "46.0";
+  version = "46.1";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/ghex/${lib.versions.major version}/ghex-${version}.tar.xz";
-    hash = "sha256-ocRvMCDLNYuDIwJds6U5yX2ZSkxG9wH0jtxjV/f7y9E=";
+    hash = "sha256-ihOXVHTu4ncZsprXY/GyR2Chrt5tfaS2I3AwcLwm6f0=";
   };
 
   nativeBuildInputs = [

From 649da5fca307469c7f89f5bb9038cd62c2096f54 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 30 Nov 2024 14:24:39 +0000
Subject: [PATCH 032/141] =?UTF-8?q?gnome-maps:=2047.1=20=E2=86=92=2047.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/v47.1...v47.2
---
 pkgs/by-name/gn/gnome-maps/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix
index c8d8785c9349..863ffb85cbe6 100644
--- a/pkgs/by-name/gn/gnome-maps/package.nix
+++ b/pkgs/by-name/gn/gnome-maps/package.nix
@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-maps";
-  version = "47.1";
+  version = "47.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
-    hash = "sha256-TwLtLo44GeWdptm0rIgA6GY1349GpHzyqv2ThsgwEwM=";
+    hash = "sha256-WFHnhtrsZY8h5FeiBv8KmtFlnzdBqtlJCxvzGSFU/ps=";
   };
 
   doCheck = !stdenv.hostPlatform.isDarwin;

From 73e0a97730976ad7c951a6c1b1a3b723306e3b3d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 30 Nov 2024 14:24:57 +0000
Subject: [PATCH 033/141] =?UTF-8?q?gnome-software:=2047.1=20=E2=86=92=2047?=
 =?UTF-8?q?.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-software/-/compare/47.1...47.2
---
 pkgs/by-name/gn/gnome-software/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix
index 0d0569ed6b38..d265ff11611d 100644
--- a/pkgs/by-name/gn/gnome-software/package.nix
+++ b/pkgs/by-name/gn/gnome-software/package.nix
@@ -48,11 +48,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-software";
-  version = "47.1";
+  version = "47.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
-    hash = "sha256-k8pQA2YxZ0VZTvBfytHAXPQ/Au+PZggMF/fruMo/NL8=";
+    hash = "sha256-ESM4+KmOflEl3j9XIphzU0IVt37u830/1CYvAhUcfOo=";
   };
 
   patches = [

From f01af5e44ba649bbf393f30a8bac6b021b79f078 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 30 Nov 2024 14:25:05 +0000
Subject: [PATCH 034/141] =?UTF-8?q?gnome-text-editor:=2047.1=20=E2=86=92?=
 =?UTF-8?q?=2047.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/47.1...47.2
---
 pkgs/by-name/gn/gnome-text-editor/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix
index 2baf665c08b1..1ecedd090343 100644
--- a/pkgs/by-name/gn/gnome-text-editor/package.nix
+++ b/pkgs/by-name/gn/gnome-text-editor/package.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-text-editor";
-  version = "47.1";
+  version = "47.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-3pVkLitA/yZf7s2GuTng/QGOTrK6SZNQ8rrSv8xUAQw=";
+    hash = "sha256-fQQDmxYXTsX9Zf6i9Efz/r2f3yqjbpmXq8b/mSzDHjg=";
   };
 
   nativeBuildInputs = [

From f182cbffc24c85791bd2024dabc381f2bd7cf60a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 30 Nov 2024 14:25:33 +0000
Subject: [PATCH 035/141] =?UTF-8?q?gtksourceview5:=205.14.1=20=E2=86=92=20?=
 =?UTF-8?q?5.14.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/5.14.1...5.14.2
---
 pkgs/development/libraries/gtksourceview/5.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix
index e034bff9e576..d83c019379e4 100644
--- a/pkgs/development/libraries/gtksourceview/5.x.nix
+++ b/pkgs/development/libraries/gtksourceview/5.x.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtksourceview";
-  version = "5.14.1";
+  version = "5.14.2";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor finalAttrs.version}/gtksourceview-${finalAttrs.version}.tar.xz";
-    hash = "sha256-AJhi6HuSnaWnJOzgefAfjO4p50eXoeysNJ9YwVo8vFg=";
+    hash = "sha256-Gm04emgHX4rv1OdSz0hxd8SmgjsU/4pDSYaFiurvYmQ=";
   };
 
   patches = [

From fb664c3bc713e38c38f822c5d779bc5e3f90ecd4 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 30 Nov 2024 14:26:10 +0000
Subject: [PATCH 036/141] =?UTF-8?q?libspelling:=200.4.4=20=E2=86=92=200.4.?=
 =?UTF-8?q?5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/libspelling/-/compare/0.4.4...0.4.5
---
 pkgs/by-name/li/libspelling/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libspelling/package.nix b/pkgs/by-name/li/libspelling/package.nix
index 8aec418da377..9d0eac13bcd3 100644
--- a/pkgs/by-name/li/libspelling/package.nix
+++ b/pkgs/by-name/li/libspelling/package.nix
@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libspelling";
-  version = "0.4.4";
+  version = "0.4.5";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     owner = "GNOME";
     repo = "libspelling";
     rev = version;
-    hash = "sha256-6ggegeDR4UBP2LKn6lj0pOB1Iz7MwLEf9usIB28SEMA=";
+    hash = "sha256-+WjhBg98s5RxQfd85FtMNuoVWjw9Hap9yDqnpYNAGgw=";
   };
 
   nativeBuildInputs = [

From f1136c5cb23aaa8ea64ec1a995b9ff793be17e34 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 30 Nov 2024 14:26:33 +0000
Subject: [PATCH 037/141] =?UTF-8?q?orca:=2047.1=20=E2=86=92=2047.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/orca/-/compare/ORCA_47_1...ORCA_47_2
---
 pkgs/by-name/or/orca/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix
index 4acbd6492b25..04dbff20fcc6 100644
--- a/pkgs/by-name/or/orca/package.nix
+++ b/pkgs/by-name/or/orca/package.nix
@@ -28,13 +28,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "orca";
-  version = "47.1";
+  version = "47.2";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-0H16zehWVUaXOp8pcwcy8xcmq2vJ3Mzq0uEgTX2ARO0=";
+    hash = "sha256-XmevNX9xmOoApEOByrTE+U5oJtbtgAZo85QWziqrjlo=";
   };
 
   patches = [

From 68562c604685c770943e2698d5d25e2a34439345 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 30 Nov 2024 14:26:45 +0000
Subject: [PATCH 038/141] =?UTF-8?q?rhythmbox:=203.4.7=20=E2=86=92=203.4.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/rhythmbox/-/compare/v3.4.7...v3.4.8
---
 pkgs/by-name/rh/rhythmbox/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/rh/rhythmbox/package.nix b/pkgs/by-name/rh/rhythmbox/package.nix
index eb4d9629fbb8..0095ffd15444 100644
--- a/pkgs/by-name/rh/rhythmbox/package.nix
+++ b/pkgs/by-name/rh/rhythmbox/package.nix
@@ -35,11 +35,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rhythmbox";
-  version = "3.4.7";
+  version = "3.4.8";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "L21WwT/BpkxTT1AHiPtIKTbOVHs0PtkMZ94fK84M+n4=";
+    sha256 = "IBaoqNKpWcB6RnrJaCxu1gW6iIP7dgQQ1otoq4ON+fI=";
   };
 
   nativeBuildInputs = [

From d37e098e8dc8ccf6562122b33d54f509c9b089f2 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 1 Dec 2024 22:37:24 +0800
Subject: [PATCH 039/141] Revert "gnome-maps: remove absolute path in desktop
 entry"

This reverts commit 8816be7bdaa297e6b4448473f8e23e08b0ed1a0b.

Well this is not a desktop entry... I think.

This fixes opening Maps in GNOME (from the activity view) for me:
"JS ERROR: Error: Requiring GLib, version 2.0: Typelib file for namespace 'GLib',
version '2.0' not found".

I learned from the KDE docs[1] that *unlike desktop files*, dbus files should contain
full path to the application to start. I tried not using full path previously in a
sticky PR[2] and it just fails to start with `org.freedesktop.DBus.Error.Spawn.ExecFailed`.

[1]: https://develop.kde.org/docs/features/d-bus/dbus_autostart_services/#creating-a-service-file
[2]: https://github.com/linuxmint/sticky/pull/118
---
 pkgs/by-name/gn/gnome-maps/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix
index 863ffb85cbe6..2add8e28306f 100644
--- a/pkgs/by-name/gn/gnome-maps/package.nix
+++ b/pkgs/by-name/gn/gnome-maps/package.nix
@@ -76,6 +76,16 @@ stdenv.mkDerivation (finalAttrs: {
     ''}"
   ];
 
+  postPatch = ''
+    # The .service file isn't wrapped with the correct environment
+    # so misses GIR files when started. By re-pointing from the gjs
+    # entry point to the wrapped binary we get back to a wrapped
+    # binary.
+    substituteInPlace "data/org.gnome.Maps.service.in" \
+      --replace-fail "Exec=@pkgdatadir@/@app-id@" \
+                     "Exec=$out/bin/gnome-maps"
+  '';
+
   preCheck = ''
     # “time.js” included by “timeTest” and “translationsTest” depends on “org.gnome.desktop.interface” schema.
     export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS"

From a31a2b90ad1732f1f8add379b018e6e431af538b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 1 Dec 2024 22:26:34 +0100
Subject: [PATCH 040/141] janus-gateway: 1.2.4 -> 1.3.0

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

diff --git a/pkgs/by-name/ja/janus-gateway/package.nix b/pkgs/by-name/ja/janus-gateway/package.nix
index dadd67e735cf..bf49f0d9023f 100644
--- a/pkgs/by-name/ja/janus-gateway/package.nix
+++ b/pkgs/by-name/ja/janus-gateway/package.nix
@@ -34,13 +34,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "janus-gateway";
-  version = "1.2.4";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "meetecho";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-oUX9PxiNdmrC03p+DAGkxD+mbi2jzuCgwlgd2JZ4Gwo=";
+    sha256 = "sha256-11UdQ4FYB8bjkD0U1C/5Ukd9F9oGl065gAvGo6L4Xpc=";
   };
 
   nativeBuildInputs = [

From b8d5143f7f677c35cf3bd2873dd9c67a0ea2c226 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 09:44:17 +0000
Subject: [PATCH 041/141] svgbob: 0.7.2 -> 0.7.4

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

diff --git a/pkgs/by-name/sv/svgbob/package.nix b/pkgs/by-name/sv/svgbob/package.nix
index 7789148c1502..435ffe99ab14 100644
--- a/pkgs/by-name/sv/svgbob/package.nix
+++ b/pkgs/by-name/sv/svgbob/package.nix
@@ -2,15 +2,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "svgbob";
-  version = "0.7.2";
+  version = "0.7.4";
 
   src = fetchCrate {
     inherit version;
     crateName = "svgbob_cli";
-    hash = "sha256-QWDi6cpADm5zOzz8hXuqOBtVrqb0DteWmiDXC6PsLS4=";
+    hash = "sha256-qSY12WjSPMoWqJHkYnPvhCtZAuI3eq+sA+/Yr9Yssp8=";
   };
 
-  cargoHash = "sha256-Fj1qjG4SKlchUWW4q0tBC+9fHFFuY6MHngJCFz6J5JY=";
+  cargoHash = "sha256-dgOEztAlX823M+bc+vnrOvmeWtxxCsCR6+k1Yho82EM=";
 
   postInstall = ''
     mv $out/bin/svgbob_cli $out/bin/svgbob

From e5e661b30ab5a318e9d5ed313506a89e226f50e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Dec 2024 05:11:06 +0000
Subject: [PATCH 042/141] ocamlPackages.ca-certs-nss: 3.103 -> 3.107

Co-authored-by: sternenseemann <sternenseemann@systemli.org>
---
 .../development/ocaml-modules/ca-certs-nss/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix
index 9956dacf8885..f8e17420c44c 100644
--- a/pkgs/development/ocaml-modules/ca-certs-nss/default.nix
+++ b/pkgs/development/ocaml-modules/ca-certs-nss/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildDunePackage
 , fetchurl
-, mirage-crypto
+, digestif
 , mirage-clock
 , x509
 , logs
@@ -13,19 +13,19 @@
 
 buildDunePackage rec {
   pname = "ca-certs-nss";
-  version = "3.103";
+  version = "3.107";
 
-  minimalOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.13";
 
   src = fetchurl {
     url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz";
-    hash = "sha256-ZBwPBUwYuBBuzukgocEHBoqorotLmzHkjUYCmWRqYAw=";
+    hash = "sha256-VIT5cIa+MWpQlTLtywPp6Qx5jgCyNEyHRQcQWvXw/GA=";
   };
 
   propagatedBuildInputs = [
-    mirage-crypto
     mirage-clock
     x509
+    digestif
   ];
 
   buildInputs = [

From 23c2d03311a1946ec2ca9add5d98927321565c98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 13:41:59 +0000
Subject: [PATCH 043/141] otpauth: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/by-name/ot/otpauth/package.nix b/pkgs/by-name/ot/otpauth/package.nix
index 95d9288b6bab..f7f4fa3b8144 100644
--- a/pkgs/by-name/ot/otpauth/package.nix
+++ b/pkgs/by-name/ot/otpauth/package.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "otpauth";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "dim13";
     repo = "otpauth";
     rev = "v${version}";
-    sha256 = "sha256-1+A1oXY5sKMr9dVa/4vB+ZkfZSDdhag5y5LfM7OJmKo=";
+    sha256 = "sha256-q6QQST3SDskEXd6X55A4VgOM8tZITUrpHfI/NV+NSwk=";
   };
 
-  vendorHash = "sha256-ZRCwZGlWzlWh+E3KUH83639Tfck7bwE36wXVnG7EQIE=";
+  vendorHash = "sha256-lATdsuqSM2EaclhvNN9BmJ6NC2nghDfggRrwvRjF7us=";
 
   meta = with lib; {
     description = "Google Authenticator migration decoder";

From 8f5afb64438861aa3086e1edb1539bc1483d904e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 2 Dec 2024 09:29:12 -0600
Subject: [PATCH 044/141] grim: khaneliman adopt package

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

diff --git a/pkgs/by-name/gr/grim/package.nix b/pkgs/by-name/gr/grim/package.nix
index c728f5f19aa2..7a226b0884e5 100644
--- a/pkgs/by-name/gr/grim/package.nix
+++ b/pkgs/by-name/gr/grim/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Grab images from a Wayland compositor";
     license = lib.licenses.mit;
     mainProgram = "grim";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ khaneliman ];
     platforms = lib.platforms.linux;
   };
 })

From 0186d2908260da545e37feeafbe92c5cfb6a067d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 15:36:43 +0000
Subject: [PATCH 045/141] cargo-lock: 9.0.0 -> 10.0.1

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

diff --git a/pkgs/by-name/ca/cargo-lock/package.nix b/pkgs/by-name/ca/cargo-lock/package.nix
index 6c1f35b1244d..bac23c491856 100644
--- a/pkgs/by-name/ca/cargo-lock/package.nix
+++ b/pkgs/by-name/ca/cargo-lock/package.nix
@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-lock";
-  version = "9.0.0";
+  version = "10.0.1";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-SMxM66qo3Xmst+SVXu4LYZ0Zzn15wqVVNqqHzAkip/s=";
+    hash = "sha256-Ui/Z4syhSxemV1R815R+yytDwN2YJBcHGscUYUp/0zE=";
   };
 
-  cargoHash = "sha256-wUp4zBY64MvD4anGlVsJrI3pyfwVSQGnn6YuweTeYNk=";
+  cargoHash = "sha256-5Hg0y723wjV13rdEExK2II7EPpzAR29ZCqVgOeuJpO0=";
 
   buildFeatures = [ "cli" ];
 

From f835ff5a2a97d4c7f14d6ed41dbb26650bf08bff Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 2 Dec 2024 21:54:34 +0100
Subject: [PATCH 046/141] ntpd-rs: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix
index df3089013d86..473138ffb476 100644
--- a/pkgs/by-name/nt/ntpd-rs/package.nix
+++ b/pkgs/by-name/nt/ntpd-rs/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ntpd-rs";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "pendulum-project";
     repo = "ntpd-rs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-0fbl50kugqYHeS+9a/kCkwy1wPDqDCYwPIGZ37NFa/Y=";
+    hash = "sha256-WN+6Ba3oGnoiH5SC0ZHBHqS4F/XPqEyC3J71Fj+3CrQ=";
   };
 
-  cargoHash = "sha256-9HLbGC6j0Wq/lG//CeEAfnYzlGG14CnDpmluL1moHWQ=";
+  cargoHash = "sha256-IksW8a6OGZzgEInX0P2sS/UMH8XaPRwXCesq7qxvURk=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     darwin.apple_sdk_11_0.frameworks.Security

From fe3a65826f5a47baf49e6f8b108999a7a5bf7be9 Mon Sep 17 00:00:00 2001
From: Maxime Brunet <max@brnt.mx>
Date: Mon, 2 Dec 2024 19:11:33 -0300
Subject: [PATCH 047/141] kubelogin: 0.1.4 -> 0.1.5

---
 pkgs/by-name/ku/kubelogin/package.nix | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ku/kubelogin/package.nix b/pkgs/by-name/ku/kubelogin/package.nix
index 529779b87708..77f0bfd0b24c 100644
--- a/pkgs/by-name/ku/kubelogin/package.nix
+++ b/pkgs/by-name/ku/kubelogin/package.nix
@@ -1,21 +1,28 @@
-{ stdenv, lib, fetchFromGitHub, buildGoModule, installShellFiles, go }:
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  installShellFiles,
+  testers,
+  kubelogin,
+}:
 
 buildGoModule rec {
   pname = "kubelogin";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-DRXvnIOETNlZ50oa8PbLSwmq6VJJcerUe1Ir7s4/7Kw=";
+    sha256 = "sha256-/qA/M0Z71j3h5zKDMUWsni9lgbrCcjYHpnhFPVRJ1qA=";
   };
 
-  vendorHash = "sha256-K/GfRJ0KbizsVmKa6V3/ZLDKivJttEsqA3Q84S0S4KI=";
+  vendorHash = "sha256-qz51x1d8Uk3N5vrDMVgJxFIxXTMiDCPplI7SmJjZ3sI=";
 
   ldflags = [
-    "-X main.version=${version}"
-    "-X main.goVersion=${lib.getVersion go}"
+    "-X main.gitTag=v${version}"
   ];
 
   nativeBuildInputs = [ installShellFiles ];
@@ -27,6 +34,11 @@ buildGoModule rec {
     installShellCompletion kubelogin.{bash,fish,zsh}
   '';
 
+  passthru.tests.version = testers.testVersion {
+    package = kubelogin;
+    version = "v${version}";
+  };
+
   __darwinAllowLocalNetworking = true;
 
   meta = with lib; {

From 896d058ebcf50c84e46cf1bc3bfb1cff9c3e6341 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 31 Oct 2024 15:40:34 +0100
Subject: [PATCH 048/141] mediamtx: 1.9.2 -> 1.9.3

---
 pkgs/by-name/me/mediamtx/package.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix
index b0cc36acefcd..c0d1f224b387 100644
--- a/pkgs/by-name/me/mediamtx/package.nix
+++ b/pkgs/by-name/me/mediamtx/package.nix
@@ -8,27 +8,37 @@
 
 let
   hlsJs = fetchurl {
-    url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.15/dist/hls.min.js";
-    hash = "sha256-qRwhj9krOcLJKbGghAC8joXfNKXUdN7OkgEDosUWdd8=";
+    url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.17/dist/hls.min.js";
+    hash = "sha256-SEBU6M0D0/bReB+39AK9wxjYpMUn+TOpXGJOJ8yalHA=";
   };
 in
 buildGoModule rec {
   pname = "mediamtx";
   # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "bluenviron";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-aHVSGyrLuLX/RYf1I1dDackmOeU3m24QcwBus4Uly0I=";
+    hash = "sha256-2qFJujfnlpmiOAmDBPl3hrbbHDOZOWFy8Yh2VOU0FEI=";
   };
 
-  vendorHash = "sha256-YpwbFCfI2kfmX3nI1G9OGUv5qpZ/JMis5VyUkqsESZA=";
+  vendorHash = "sha256-6MHtYrHZF3Oo53MV1Di0wGw9Xk+2CMei2XeoI0OcKsQ=";
 
   postPatch = ''
     cp ${hlsJs} internal/servers/hls/hls.min.js
     echo "v${version}" > internal/core/VERSION
+
+    # disable binary-only rpi camera support
+    substituteInPlace internal/staticsources/rpicamera/camera_disabled.go \
+      --replace-fail '!linux || (!arm && !arm64)' 'linux'
+    substituteInPlace internal/staticsources/rpicamera/{component,camera,params_serialize,pipe}.go \
+      --replace-fail '(linux && arm) || (linux && arm64)' 'linux && !linux'
+    substituteInPlace internal/staticsources/rpicamera/component_32.go \
+      --replace-fail 'linux && arm' 'linux && !linux'
+    substituteInPlace internal/staticsources/rpicamera/component_64.go \
+      --replace-fail 'linux && arm64' 'linux && !linux'
   '';
 
   subPackages = [ "." ];
@@ -41,7 +51,7 @@ buildGoModule rec {
   };
 
   meta = with lib; {
-    description = "Ready-to-use RTSP server and RTSP proxy that allows to read and publish video and audio streams";
+    description = "SRT, WebRTC, RTSP, RTMP, LL-HLS media server and media proxy";
     inherit (src.meta) homepage;
     license = licenses.mit;
     mainProgram = "mediamtx";

From 178b701ef353e35d47f22df0bc86f05b222c358e Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 3 Dec 2024 01:53:01 +0100
Subject: [PATCH 049/141] darwin.iproute2mac: format with nixfmt

---
 pkgs/os-specific/darwin/iproute2mac/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix
index c7582de3352a..ae0a4dfbbea9 100644
--- a/pkgs/os-specific/darwin/iproute2mac/default.nix
+++ b/pkgs/os-specific/darwin/iproute2mac/default.nix
@@ -1,4 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, darwin, python3 }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  darwin,
+  python3,
+}:
 
 stdenv.mkDerivation rec {
   version = "1.4.1";

From bcda866739d27fee82fbcfc40cbc565278d79991 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 3 Dec 2024 01:54:11 +0100
Subject: [PATCH 050/141] darwin.iproute2mac: refactor

---
 .../darwin/iproute2mac/default.nix            | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix
index ae0a4dfbbea9..b18f109e4022 100644
--- a/pkgs/os-specific/darwin/iproute2mac/default.nix
+++ b/pkgs/os-specific/darwin/iproute2mac/default.nix
@@ -14,30 +14,35 @@ stdenv.mkDerivation rec {
     owner = "brona";
     repo = "iproute2mac";
     rev = "v${version}";
-    sha256 = "sha256-MaL8eb9UOZ71BL4Jvc6Od+EJ+F6j96n9a+vRnHeveIU=";
+    hash = "sha256-MaL8eb9UOZ71BL4Jvc6Od+EJ+F6j96n9a+vRnHeveIU=";
   };
 
   buildInputs = [ python3 ];
 
   postPatch = ''
     substituteInPlace src/ip.py \
-      --replace /sbin/ifconfig ${darwin.network_cmds}/bin/ifconfig \
-      --replace /sbin/route ${darwin.network_cmds}/bin/route \
-      --replace /usr/sbin/netstat ${darwin.network_cmds}/bin/netstat \
-      --replace /usr/sbin/ndp ${darwin.network_cmds}/bin/ndp \
-      --replace /usr/sbin/arp ${darwin.network_cmds}/bin/arp \
-      --replace /usr/sbin/networksetup ${darwin.network_cmds}/bin/networksetup
-  '';
-  installPhase = ''
-    mkdir -p $out/bin
-    install -D -m 755 src/ip.py $out/bin/ip
+      --replace-fail /sbin/ifconfig ${darwin.network_cmds}/bin/ifconfig \
+      --replace-fail /sbin/route ${darwin.network_cmds}/bin/route \
+      --replace-fail /usr/sbin/netstat ${darwin.network_cmds}/bin/netstat \
+      --replace-fail /usr/sbin/ndp ${darwin.network_cmds}/bin/ndp \
+      --replace-fail /usr/sbin/arp ${darwin.network_cmds}/bin/arp \
+      --replace-fail /usr/sbin/networksetup ${darwin.network_cmds}/bin/networksetup
   '';
 
-  meta = with lib; {
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    install -D -m 755 src/ip.py $out/bin/ip
+
+    runHook postInstall
+  '';
+
+  meta = {
     homepage = "https://github.com/brona/iproute2mac";
     description = "CLI wrapper for basic network utilites on Mac OS X inspired with iproute2 on Linux systems - ip command";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jiegec ];
-    platforms = platforms.darwin;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jiegec ];
+    platforms = lib.platforms.darwin;
   };
 }

From 4bc254a7308259e0365f1fc7ffa76fffe59e8ee2 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 3 Dec 2024 01:57:25 +0100
Subject: [PATCH 051/141] darwin.iproute2mac: 1.4.1 -> 1.5.4

---
 pkgs/os-specific/darwin/iproute2mac/default.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix
index b18f109e4022..8149580703c8 100644
--- a/pkgs/os-specific/darwin/iproute2mac/default.nix
+++ b/pkgs/os-specific/darwin/iproute2mac/default.nix
@@ -3,24 +3,27 @@
   stdenv,
   fetchFromGitHub,
   darwin,
+  makeWrapper,
   python3,
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.1";
+  version = "1.5.4";
   pname = "iproute2mac";
 
   src = fetchFromGitHub {
     owner = "brona";
     repo = "iproute2mac";
     rev = "v${version}";
-    hash = "sha256-MaL8eb9UOZ71BL4Jvc6Od+EJ+F6j96n9a+vRnHeveIU=";
+    hash = "sha256-hmSqJ2gc0DOXUuFrp1ZG8usjFdo07zjV/1JLs5r/E04=";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
+
   buildInputs = [ python3 ];
 
   postPatch = ''
-    substituteInPlace src/ip.py \
+    substituteInPlace src/iproute2mac.py \
       --replace-fail /sbin/ifconfig ${darwin.network_cmds}/bin/ifconfig \
       --replace-fail /sbin/route ${darwin.network_cmds}/bin/route \
       --replace-fail /usr/sbin/netstat ${darwin.network_cmds}/bin/netstat \
@@ -32,8 +35,12 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/bin
-    install -D -m 755 src/ip.py $out/bin/ip
+    mkdir -p $out/bin $out/libexec
+    install -D -m 755 src/iproute2mac.py $out/libexec/iproute2mac.py
+    install -D -m 755 src/ip.py $out/libexec/ip
+    install -D -m 755 src/bridge.py $out/libexec/bridge
+    makeWrapper $out/libexec/ip $out/bin/ip
+    makeWrapper $out/libexec/bridge $out/bin/bridge
 
     runHook postInstall
   '';

From 49d98edb5114e39df9d73ff087cc2f46ef17aec0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Dec 2024 02:18:58 +0000
Subject: [PATCH 052/141] haproxy: 3.0.5 -> 3.1.0

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

diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix
index 2e2a6c96ddf1..cfb6ef7da7c1 100644
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@@ -28,11 +28,11 @@ let
   sslPkg = sslPkgs.${sslLibrary};
 in stdenv.mkDerivation (finalAttrs: {
   pname = "haproxy";
-  version = "3.0.5";
+  version = "3.1.0";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-rjgiHoWuugOKcl7771v+XnZnG6eVnl63TDn9B55dAC4";
+    hash = "sha256-VqFGhXSrQR3Kveg3+WvqbPPC65DieUafde0dzccPzhE=";
   };
 
   buildInputs = [ sslPkg zlib libxcrypt ]

From ac708d05d29169d5e1cb9e216b1a2e88b30278ff Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Tue, 3 Dec 2024 06:49:42 +0100
Subject: [PATCH 053/141] gerrit: 3.10.3 -> 3.11.0

Release notes: https://www.gerritcodereview.com/3.11.html

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/ge/gerrit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix
index 0db54bbf88ec..bacde1e71365 100644
--- a/pkgs/by-name/ge/gerrit/package.nix
+++ b/pkgs/by-name/ge/gerrit/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gerrit";
-  version = "3.10.3";
+  version = "3.11.0";
 
   src = fetchurl {
     url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
-    hash = "sha256-pVI5YZihvJNuaboh2dLe/Aw371rNPiGbaLUd0ALpANQ=";
+    hash = "sha256-wFUks4yGzO4obPWIIfCgL+/ZF37RDgXKvlOMSFvU5Bk=";
   };
 
   buildCommand = ''

From accd0c74031f5fe0c9acf5750da12c46bfd2fd49 Mon Sep 17 00:00:00 2001
From: Harbiinger <=>
Date: Mon, 26 Aug 2024 12:12:46 +0200
Subject: [PATCH 054/141] maintainers: add harbiinger

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fded278d3927..f0e072939fe1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8657,6 +8657,13 @@
     githubId = 5317234;
     name = "Raphael Megzari";
   };
+  harbiinger = {
+    email = "theo.godin@protonmail.com";
+    matrix = "@hrbgr:matrix.org";
+    github = "harbiinger";
+    githubId = 55398594;
+    name = "Theo Godin";
+  };
   hardselius = {
     email = "martin@hardselius.dev";
     github = "hardselius";

From 1f3aeb467dbe01cbbc66e4f1d097b1357344f6f7 Mon Sep 17 00:00:00 2001
From: Harbiinger <=>
Date: Mon, 26 Aug 2024 12:13:18 +0200
Subject: [PATCH 055/141] ankama-launcher: init at 3.12.24

Co-authored-by: FilipeS0usa <filipes0usa.git@proton.me>
---
 pkgs/by-name/an/ankama-launcher/package.nix | 62 +++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 pkgs/by-name/an/ankama-launcher/package.nix

diff --git a/pkgs/by-name/an/ankama-launcher/package.nix b/pkgs/by-name/an/ankama-launcher/package.nix
new file mode 100644
index 000000000000..d2977d638a51
--- /dev/null
+++ b/pkgs/by-name/an/ankama-launcher/package.nix
@@ -0,0 +1,62 @@
+{
+  appimageTools,
+  fetchurl,
+  lib,
+}:
+let
+  pname = "ankama-launcher";
+  version = "3.12.24";
+
+  # The original URL for the launcher is:
+  # https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage
+  # As it does not encode the version, we use the wayback machine (web.archive.org) to get a fixed URL.
+  # To update the client, head to web.archive.org and create a new snapshot of the download page.
+  src = fetchurl {
+    url = "https://web.archive.org/web/20241202103051/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage";
+    hash = "sha256-jI/qcIIrNU9ViaZ/LKMkUETXZpintDsofSgiRfe4GOU=";
+  };
+
+  appimageContents = appimageTools.extract { inherit pname version src; };
+
+in
+
+appimageTools.wrapType2 {
+  inherit pname version src;
+  extraPkgs = pkgs: [ pkgs.wine ];
+
+  extraInstallCommands = ''
+    desktop_file="${appimageContents}/zaap.desktop"
+
+    nix_version="${version}"
+    archive_version=$(grep -oP '(?<=X-AppImage-Version=).*' $desktop_file)
+
+    if [[ "$archive_version" != "$nix_version"* ]]; then
+      echo "ERROR - Version mismatch:"
+      echo -e "\t- Expected (pkgs.ankama-launcher.version): $nix_version"
+      echo -e "\t- Version found in 'zaap.desktop': $archive_version"
+      echo -e "\n-> Update the version attribute of the derivation."
+      echo "-> Note: Ignore the last part of the version: Do not write '3.12.24.19260' but '3.12.24'."
+      exit 1
+    fi
+
+    install -m 444 -D "$desktop_file" $out/share/applications/ankama-launcher.desktop
+    sed -i 's/.*Exec.*/Exec=ankama-launcher/' $out/share/applications/ankama-launcher.desktop
+    install -m 444 -D ${appimageContents}/zaap.png $out/share/icons/hicolor/256x256/apps/zaap.png
+  '';
+
+  meta = {
+    description = "Ankama Launcher";
+    longDescription = ''
+      Ankama Launcher is a portal that allows you to access Ankama's video games, VOD animations, webtoons, and livestreams, as well as download updates, stay up to date with the latest news, and chat with your friends.
+
+      If you encounter a `wine` error while running *Dofus*, delete or rename the `cinematics/` directory:
+      - Go to the directory where you installed the game and run: `mv content/gfx/cinematics content/gfx/cinematics_DISABLE`
+    '';
+    homepage = "https://www.ankama.com/en/launcher";
+    license = lib.licenses.unfree;
+    mainProgram = "ankama-launcher";
+    maintainers = with lib.maintainers; [ harbiinger ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    platforms = [ "x86_64-linux" ];
+  };
+}

From 89f30442238e28eade1a54fbba9610368a0db5b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Dec 2024 08:09:08 +0000
Subject: [PATCH 056/141] nuclear: 0.6.39 -> 0.6.40

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

diff --git a/pkgs/by-name/nu/nuclear/package.nix b/pkgs/by-name/nu/nuclear/package.nix
index 201e25b5a6a0..2fb5812e85cb 100644
--- a/pkgs/by-name/nu/nuclear/package.nix
+++ b/pkgs/by-name/nu/nuclear/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "nuclear";
-  version = "0.6.39";
+  version = "0.6.40";
 
   src = fetchurl {
     # Nuclear currenntly only publishes AppImage releases for x86_64, which is hardcoded in
@@ -13,7 +13,7 @@ let
     # provide more arches, we should use stdenv.hostPlatform to determine the arch and choose
     # source URL accordingly.
     url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage";
-    hash = "sha256-X5IQ9NlFTFTEYDhuCyrzkPGmvNK66nCSdbmJZxObkBo=";
+    hash = "sha256-OzTT4f+cdMzmSwdTHk8LXGg3AQcWw1ItIBbrfp16qAw=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From 5668a8986c7d4c2373b3b93ca196286f76560353 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 10:58:51 +0100
Subject: [PATCH 057/141] python312Packages.mypy-boto3-chime-sdk-voice: 1.35.16
 -> 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2a8bbabe760a..5960c2ca4ad4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -206,8 +206,8 @@ rec {
       "sha256-FytBZE72zKuoagYWnfv77mS7Wx6WcE427Spd/2h78kc=";
 
   mypy-boto3-chime-sdk-voice =
-    buildMypyBoto3Package "chime-sdk-voice" "1.35.16"
-      "sha256-O7mrqn+S0rDcOnhxXI10mB/NHzI+f23HqNXoO5gxiPc=";
+    buildMypyBoto3Package "chime-sdk-voice" "1.35.72"
+      "sha256-KWtXvo/mX4FbAg3WG0g4SAsGaGb2VT8ENeREzap5BMY=";
 
   mypy-boto3-cleanrooms =
     buildMypyBoto3Package "cleanrooms" "1.35.56"

From 44471d01edbf36f323d95e09d386fe27dfe2087e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 10:58:52 +0100
Subject: [PATCH 058/141] python312Packages.mypy-boto3-cleanrooms: 1.35.56 ->
 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5960c2ca4ad4..4bb11a5f59ca 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -210,8 +210,8 @@ rec {
       "sha256-KWtXvo/mX4FbAg3WG0g4SAsGaGb2VT8ENeREzap5BMY=";
 
   mypy-boto3-cleanrooms =
-    buildMypyBoto3Package "cleanrooms" "1.35.56"
-      "sha256-9klgPrVKNaG6PWOIZkvsXNP98+TOgJfVPT5aPV3SDtI=";
+    buildMypyBoto3Package "cleanrooms" "1.35.72"
+      "sha256-1EcmHpvpqH23RxsDS/TgfszwSeETfFLXuenPwPYc2qc=";
 
   mypy-boto3-cloud9 =
     buildMypyBoto3Package "cloud9" "1.35.0"

From 66d42b0305cd806a744d790d93d8dafb7e6227e0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 10:59:05 +0100
Subject: [PATCH 059/141] python312Packages.mypy-boto3-connect: 1.35.70 ->
 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 4bb11a5f59ca..12d0799465bb 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -338,8 +338,8 @@ rec {
       "sha256-qycjnRcrEJ2P3dpciMVFPno1wz3tEJ6pa6z8TlLwTME=";
 
   mypy-boto3-connect =
-    buildMypyBoto3Package "connect" "1.35.70"
-      "sha256-oq3BEKupaGgOJd3zlXSaglG4SaPfRuU++XEai2N8vRs=";
+    buildMypyBoto3Package "connect" "1.35.72"
+      "sha256-fGo6vO49IgOCiRqAChO/33HU+hRjkdWnu77EG40PrRY=";
 
   mypy-boto3-connect-contact-lens =
     buildMypyBoto3Package "connect-contact-lens" "1.35.0"

From 69ae8e7712b9b249fc52ef5e220659f4261872e3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 10:59:07 +0100
Subject: [PATCH 060/141] python312Packages.mypy-boto3-customer-profiles:
 1.35.64 -> 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 12d0799465bb..c35e9878c4cf 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -366,8 +366,8 @@ rec {
       "sha256-YEm3nBfWCSzwPZ3Yvm4Nf3cMxaTccvHdBrs84g7KE4g=";
 
   mypy-boto3-customer-profiles =
-    buildMypyBoto3Package "customer-profiles" "1.35.64"
-      "sha256-ZF9Vuw2lXjo4n1jsd4Xwmc4olte2DZaP0HZDrbMxdiY=";
+    buildMypyBoto3Package "customer-profiles" "1.35.72"
+      "sha256-QWgwS2PBsWUSNz2wAFL+prgB3874X4cYv69ElCSL48Q=";
 
   mypy-boto3-databrew =
     buildMypyBoto3Package "databrew" "1.35.0"

From 9b7b02ca174c4a719454473727af4440facbc120 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 10:59:17 +0100
Subject: [PATCH 061/141] python312Packages.mypy-boto3-ec2: 1.35.70 -> 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c35e9878c4cf..2b5cc4699080 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -446,8 +446,8 @@ rec {
       "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.35.70"
-      "sha256-k/ndrawwPWPzTNTApgpoLACNZV07LPp00SNPvemgtAE=";
+    buildMypyBoto3Package "ec2" "1.35.72"
+      "sha256-0v9DrRxCZVy8uwbRHf90s4J1A9gKmaeAmKtSug+7cjU=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.35.0"

From 9d38b489d444c716a403435d15f61bae4453cc85 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 10:59:19 +0100
Subject: [PATCH 062/141] python312Packages.mypy-boto3-ecs: 1.35.66 -> 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2b5cc4699080..7f7cacd8138f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -462,8 +462,8 @@ rec {
       "sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g=";
 
   mypy-boto3-ecs =
-    buildMypyBoto3Package "ecs" "1.35.66"
-      "sha256-0DmtbDZK4a4BjvhPcFEWIzWF8L+hCRYW+OF+cRhl0Rc=";
+    buildMypyBoto3Package "ecs" "1.35.72"
+      "sha256-jplX7a1Rql7+97/chlK4bd1PECDUD5OqELNt5ErhDFg=";
 
   mypy-boto3-efs =
     buildMypyBoto3Package "efs" "1.35.65"

From 0f397666a8a2076e75dfdce7791e6861f879e164 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 10:59:21 +0100
Subject: [PATCH 063/141] python312Packages.mypy-boto3-eks: 1.35.57 -> 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7f7cacd8138f..9d9309a6b53e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -470,8 +470,8 @@ rec {
       "sha256-Pf+g7g5cjPoIqAL5sJqqMtPWU0hqGDQnfzwoxNgL5OE=";
 
   mypy-boto3-eks =
-    buildMypyBoto3Package "eks" "1.35.57"
-      "sha256-efYfxn51rtR6LCnAU3k7ct78OuNnSecGSwYi0OIidt8=";
+    buildMypyBoto3Package "eks" "1.35.72"
+      "sha256-YTMrjEKtexM+4I6u/5qw3TnI1koVwqnA5k5chBVLggo=";
 
   mypy-boto3-elastic-inference =
     buildMypyBoto3Package "elastic-inference" "1.35.38"

From 29ca3b74a0102ea6b487dc5b7657d1c0c0f3b372 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 10:59:26 +0100
Subject: [PATCH 064/141] python312Packages.mypy-boto3-events: 1.35.0 ->
 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 9d9309a6b53e..f0d5c6f6b56f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -518,8 +518,8 @@ rec {
       "sha256-ad5PQgRxRqEQ4QOjM0wPGe/4JXPNqlB5exRHacx7YKw=";
 
   mypy-boto3-events =
-    buildMypyBoto3Package "events" "1.35.0"
-      "sha256-IXJGXd/J+EwN1FcHofPq9AatYysD6FRrny39MzqF6yY=";
+    buildMypyBoto3Package "events" "1.35.72"
+      "sha256-hm9IcgtcrJLJ4wq5BFTOQHzCkWp0I8Isbi7X7gQrnOY=";
 
   mypy-boto3-evidently =
     buildMypyBoto3Package "evidently" "1.35.0"

From 01488e368c32e87a1e92b5a972b3d3d4da8ed364 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 10:59:31 +0100
Subject: [PATCH 065/141] python312Packages.mypy-boto3-fsx: 1.35.71 -> 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index f0d5c6f6b56f..85f2511703e9 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -558,8 +558,8 @@ rec {
       "sha256-dUbtx84rCJ5zRHxmdpGFAychNH/F98eviwdwqmslPLk=";
 
   mypy-boto3-fsx =
-    buildMypyBoto3Package "fsx" "1.35.71"
-      "sha256-niDZs6XFOHHFSVxFNNbHqTeEiFqIpAYrOSd/A0I/FbI=";
+    buildMypyBoto3Package "fsx" "1.35.72"
+      "sha256-J2Vkx1tNMM+0GBKAQD1HWFN6jmJwY+XkghmKgP21NP0=";
 
   mypy-boto3-gamelift =
     buildMypyBoto3Package "gamelift" "1.35.59"

From 4c1cc4fa8042e8e04b895dafd469942acfb223ed Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 10:59:36 +0100
Subject: [PATCH 066/141] python312Packages.mypy-boto3-guardduty: 1.35.55 ->
 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 85f2511703e9..15fc39d7934a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -594,8 +594,8 @@ rec {
       "sha256-U0sYInE/1XsjwQCxmcYLVvmEQf4R6drtdSqTr0b+3OM=";
 
   mypy-boto3-guardduty =
-    buildMypyBoto3Package "guardduty" "1.35.55"
-      "sha256-4iTPGfSTkel+xJtH/7/oPxbtmuZJk6p9FrZR3rKMaLA=";
+    buildMypyBoto3Package "guardduty" "1.35.72"
+      "sha256-khmU1gjVuni8d1qUVIETdPhQBEyqtMOuf/HfOkWtY10=";
 
   mypy-boto3-health =
     buildMypyBoto3Package "health" "1.35.67"

From 5bc58463af76bb48e89672074511d3f3d51814f0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 10:59:38 +0100
Subject: [PATCH 067/141] python312Packages.mypy-boto3-imagebuilder: 1.35.46 ->
 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 15fc39d7934a..83a4df478644 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -614,8 +614,8 @@ rec {
       "sha256-wHm7wHBhEX3c29MwZtbZPXH1su5MsAzLmj5h8V3/3V0=";
 
   mypy-boto3-imagebuilder =
-    buildMypyBoto3Package "imagebuilder" "1.35.46"
-      "sha256-eWIWfLQql7QVkg1CfOrfs46h3UqIQxpmpn4+yYsUZRQ=";
+    buildMypyBoto3Package "imagebuilder" "1.35.72"
+      "sha256-BiU7oalSHsdxJV1KXAChTABpge4GuZcZU83jZLje4h8=";
 
   mypy-boto3-importexport =
     buildMypyBoto3Package "importexport" "1.35.0"

From d45bbb9acf917f38aa1aca443feb0581efa462a1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 10:59:59 +0100
Subject: [PATCH 068/141] python312Packages.mypy-boto3-logs: 1.35.67 -> 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 83a4df478644..b9b83bd95967 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -810,8 +810,8 @@ rec {
       "sha256-6Vs5eRibHCZvDDIcIEThPa6T1OmfJXjLg4GAZlworsM=";
 
   mypy-boto3-logs =
-    buildMypyBoto3Package "logs" "1.35.67"
-      "sha256-zyKW1rPjwwXr2B+9L72BlZbpdWHjWfCHberXoA5VQZQ=";
+    buildMypyBoto3Package "logs" "1.35.72"
+      "sha256-YIi6QAIdgiUQZ0aCNaQ8ESpqlBBx+xxSHQB5myqF4Eo=";
 
   mypy-boto3-lookoutequipment =
     buildMypyBoto3Package "lookoutequipment" "1.35.0"

From 6d1157d2b6a3b646f889a74ce3c30a0235847aca Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 11:00:10 +0100
Subject: [PATCH 069/141] python312Packages.mypy-boto3-memorydb: 1.35.36 ->
 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b9b83bd95967..a6c95ca91dd2 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -898,8 +898,8 @@ rec {
       "sha256-u+GgBEtw2AVonu+XqL8gDIJig9foiUufz1++qmrfx00=";
 
   mypy-boto3-memorydb =
-    buildMypyBoto3Package "memorydb" "1.35.36"
-      "sha256-WLbTMLs4KXOtoesqSm6X4MK/BcCAqcCxH7mbBBisYzQ=";
+    buildMypyBoto3Package "memorydb" "1.35.72"
+      "sha256-idcq48WzunZVghmxe/LJ/gdVDg0jZD+7aofYlu2nCdM=";
 
   mypy-boto3-meteringmarketplace =
     buildMypyBoto3Package "meteringmarketplace" "1.35.0"

From e82dab120b681b02c6431132e7163a2dc2759079 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 11:00:17 +0100
Subject: [PATCH 070/141] python312Packages.mypy-boto3-opensearch: 1.35.58 ->
 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a6c95ca91dd2..79f78eda5154 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -970,8 +970,8 @@ rec {
       "sha256-/IGDrv1Yyk0eeDfdQTVkxhrANPPCqnfjatSRItkGWRM=";
 
   mypy-boto3-opensearch =
-    buildMypyBoto3Package "opensearch" "1.35.58"
-      "sha256-8D48c4NG00r6zpgcoK8FjQqCpOBB4DNE653lwn/K36k=";
+    buildMypyBoto3Package "opensearch" "1.35.72"
+      "sha256-gk+hOc05mEusC1o3pQaRvIDXJR3sPc5W2Af7l1SL1sk=";
 
   mypy-boto3-opensearchserverless =
     buildMypyBoto3Package "opensearchserverless" "1.35.52"

From 233d542a88762f1e6cc9413285fa9b390849cfc1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 11:00:19 +0100
Subject: [PATCH 071/141] python312Packages.mypy-boto3-organizations: 1.35.60
 -> 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 79f78eda5154..45b3f921e2fc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -986,8 +986,8 @@ rec {
       "sha256-qyUZN9Gz8Q6TBDg1LW+M58TLwDlmqJ9aCr4021LbSL0=";
 
   mypy-boto3-organizations =
-    buildMypyBoto3Package "organizations" "1.35.60"
-      "sha256-xOhCq83c8jf6Nn4lLHiHidFtIk3qzBkCQ/NCV6vq7v0=";
+    buildMypyBoto3Package "organizations" "1.35.72"
+      "sha256-sIQ3HrziVY2CE/+sIk0IRAhhI3PaCwFwxwK75K0oH/s=";
 
   mypy-boto3-osis =
     buildMypyBoto3Package "osis" "1.35.0"

From caabacb4e3b92608df5fbed90a31f77ccde533a6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 11:00:30 +0100
Subject: [PATCH 072/141] python312Packages.mypy-boto3-rds: 1.35.66 -> 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 45b3f921e2fc..aa3a376ce9f5 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1086,8 +1086,8 @@ rec {
       "sha256-12AIEWhTwK3YdCUhImozJeO83Ye9G2D1VaKMeqbV/pE=";
 
   mypy-boto3-rds =
-    buildMypyBoto3Package "rds" "1.35.66"
-      "sha256-CFDLW93aGFPGukS7jcG/DTA+pHKfjN+YLQ5NkfCKstk=";
+    buildMypyBoto3Package "rds" "1.35.72"
+      "sha256-TDReYWp3Z5UyhKDVSrbbq9iwaP41OzQZS3k2S0cXa2E=";
 
   mypy-boto3-rds-data =
     buildMypyBoto3Package "rds-data" "1.35.64"

From fb385d1026ea7a83868bb7f600d322659a9d539f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 11:00:37 +0100
Subject: [PATCH 073/141] python312Packages.mypy-boto3-s3: 1.35.69 -> 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index aa3a376ce9f5..17d102449973 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1162,8 +1162,8 @@ rec {
       "sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw=";
 
   mypy-boto3-s3 =
-    buildMypyBoto3Package "s3" "1.35.69"
-      "sha256-l/eUSoSkpJKCglvvFIOiVoDc3OddpgF3RdcJ0s8qocA=";
+    buildMypyBoto3Package "s3" "1.35.72"
+      "sha256-Vx5lnB01VJnV5QcPM+YToeJR5vXSpX1TXF6u9S67aoY=";
 
   mypy-boto3-s3control =
     buildMypyBoto3Package "s3control" "1.35.55"

From 5cd6895dfd8f5a8d4d2ce0df3353eb8264fc3b01 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 11:00:38 +0100
Subject: [PATCH 074/141] python312Packages.mypy-boto3-s3control: 1.35.55 ->
 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 17d102449973..0c4e7c008345 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1166,8 +1166,8 @@ rec {
       "sha256-Vx5lnB01VJnV5QcPM+YToeJR5vXSpX1TXF6u9S67aoY=";
 
   mypy-boto3-s3control =
-    buildMypyBoto3Package "s3control" "1.35.55"
-      "sha256-9gTlb+iIU+IT+2jAIU7l62gN4VenI4JLaTEFJCbgiAc=";
+    buildMypyBoto3Package "s3control" "1.35.72"
+      "sha256-jrEiZn/Log2BPKShiAc1fQMhXS17u/Ei6zeCVH1PpVE=";
 
   mypy-boto3-s3outposts =
     buildMypyBoto3Package "s3outposts" "1.35.0"

From 341999702e4a8b4e7786789f692482f7877e44cf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 11:00:44 +0100
Subject: [PATCH 075/141] python312Packages.mypy-boto3-securityhub: 1.35.29 ->
 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0c4e7c008345..60b97e715f12 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1222,8 +1222,8 @@ rec {
       "sha256-w30YExW6ENhUaHIwTX8mbnRhQpsI5jUHwjzFCMPvQmQ=";
 
   mypy-boto3-securityhub =
-    buildMypyBoto3Package "securityhub" "1.35.29"
-      "sha256-RQXlvvSr0DNC2eXEVTQjx4TCR6A/v9qsRArIfg9Mq+w=";
+    buildMypyBoto3Package "securityhub" "1.35.72"
+      "sha256-+AeLQrA2MHQ94z4Rwq5/mhYc1+uJ0qZI1pm1FSnQOqM=";
 
   mypy-boto3-securitylake =
     buildMypyBoto3Package "securitylake" "1.35.40"

From 26a0fda8054599b323fc452e72c8ce7e0b7973c6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 11:00:59 +0100
Subject: [PATCH 076/141] python312Packages.mypy-boto3-transfer: 1.35.40 ->
 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 60b97e715f12..af76fb6e0aa9 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1370,8 +1370,8 @@ rec {
       "sha256-pRyowqpW9cqiZe0aCDvcJAqIaRkEhG8DFRxP89daIPo=";
 
   mypy-boto3-transfer =
-    buildMypyBoto3Package "transfer" "1.35.40"
-      "sha256-uJ15ZsA5oQgzjNTqX2Zhg+K29HBfyK40BVlG0GicyRA=";
+    buildMypyBoto3Package "transfer" "1.35.72"
+      "sha256-1lLzmlLLKOVAWu49Sc6QdWkpJ+nC/yX5VMgQORhVjew=";
 
   mypy-boto3-translate =
     buildMypyBoto3Package "translate" "1.35.0"

From 0590b490691e32ef61a139741dc43525c9bcb516 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Dec 2024 11:01:01 +0100
Subject: [PATCH 077/141] python312Packages.mypy-boto3-vpc-lattice: 1.35.0 ->
 1.35.72

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index af76fb6e0aa9..0a265f8fbd6b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1386,8 +1386,8 @@ rec {
       "sha256-mxpiis9WGSEclfaHOxFJxGIAO42R2c5zc58xQo4MOn0=";
 
   mypy-boto3-vpc-lattice =
-    buildMypyBoto3Package "vpc-lattice" "1.35.0"
-      "sha256-hjsCIge5vyWpgeklpO+u3QGPwCbpdnZcfJErYrPPyeA=";
+    buildMypyBoto3Package "vpc-lattice" "1.35.72"
+      "sha256-+lBkc6lWYMQU8six/6cPy1+J0ACZ0a3JL/VW7O98Qtk=";
 
   mypy-boto3-waf =
     buildMypyBoto3Package "waf" "1.35.0"

From 664ee243c4a721ab44b6376428331e25180544fe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 10:04:05 +0100
Subject: [PATCH 078/141] python312Packages.mypy-boto3-s3control: 1.35.72 ->
 1.35.73

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0a265f8fbd6b..14e9da40f374 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1166,8 +1166,8 @@ rec {
       "sha256-Vx5lnB01VJnV5QcPM+YToeJR5vXSpX1TXF6u9S67aoY=";
 
   mypy-boto3-s3control =
-    buildMypyBoto3Package "s3control" "1.35.72"
-      "sha256-jrEiZn/Log2BPKShiAc1fQMhXS17u/Ei6zeCVH1PpVE=";
+    buildMypyBoto3Package "s3control" "1.35.73"
+      "sha256-FITxvFeoOEHAVVYyyC1xnjkj5lks74SEOT1YWltMliI=";
 
   mypy-boto3-s3outposts =
     buildMypyBoto3Package "s3outposts" "1.35.0"

From bdfcdf2dce2077d32008dd67d78fca74ee0a65ab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 10:31:03 +0100
Subject: [PATCH 079/141] coinlive: refactor

---
 pkgs/tools/misc/coinlive/default.nix | 38 +++++++++++++++-------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/misc/coinlive/default.nix b/pkgs/tools/misc/coinlive/default.nix
index 564f19f85b97..498874ed5be9 100644
--- a/pkgs/tools/misc/coinlive/default.nix
+++ b/pkgs/tools/misc/coinlive/default.nix
@@ -1,10 +1,11 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, openssl
-, pkg-config
-, rustPlatform
-, Security
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  Security,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -13,31 +14,32 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "mayeranalytics";
-    repo = pname;
-    rev = "v${version}";
+    repo = "coinlive";
+    rev = "refs/tags/v${version}";
     hash = "sha256-llw97jjfPsDd4nYi6lb9ug6sApPoD54WlzpJswvdbRs=";
   };
 
   cargoHash = "sha256-T1TgwnohUDvfpn6GXNP4xJGHM3aenMK+ORxE3z3PPA4=";
 
-  nativeBuildInputs = [
-    pkg-config
-  ];
+  nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [
-    openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Security
-  ];
+  buildInputs =
+    [
+      openssl
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      Security
+    ];
 
   checkFlags = [
-    # requires network access
+    # Test requires network access
     "--skip=utils::test_get_infos"
   ];
 
   meta = with lib; {
     description = "Live cryptocurrency prices CLI";
     homepage = "https://github.com/mayeranalytics/coinlive";
+    changelog = "https://github.com/mayeranalytics/coinlive/releases/tag/v${version}";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ fab ];
     mainProgram = "coinlive";

From c1ad9fc2f62e812058d4fb67c79d83ea820a3fdb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 10:33:50 +0100
Subject: [PATCH 080/141] coinlive: add versionCheckHook

---
 pkgs/tools/misc/coinlive/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/misc/coinlive/default.nix b/pkgs/tools/misc/coinlive/default.nix
index 498874ed5be9..a24ff65d45ca 100644
--- a/pkgs/tools/misc/coinlive/default.nix
+++ b/pkgs/tools/misc/coinlive/default.nix
@@ -6,6 +6,7 @@
   pkg-config,
   rustPlatform,
   Security,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -31,11 +32,15 @@ rustPlatform.buildRustPackage rec {
       Security
     ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   checkFlags = [
     # Test requires network access
     "--skip=utils::test_get_infos"
   ];
 
+  doInstallCheck = true;
+
   meta = with lib; {
     description = "Live cryptocurrency prices CLI";
     homepage = "https://github.com/mayeranalytics/coinlive";

From 36f08301c23da885cb4c9e009d837527e09c78ae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 10:40:03 +0100
Subject: [PATCH 081/141] coinlive: move to pkgs/by-name

---
 .../coinlive/default.nix => by-name/co/coinlive/package.nix}  | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{tools/misc/coinlive/default.nix => by-name/co/coinlive/package.nix} (95%)

diff --git a/pkgs/tools/misc/coinlive/default.nix b/pkgs/by-name/co/coinlive/package.nix
similarity index 95%
rename from pkgs/tools/misc/coinlive/default.nix
rename to pkgs/by-name/co/coinlive/package.nix
index a24ff65d45ca..96c5fe8e4ef1 100644
--- a/pkgs/tools/misc/coinlive/default.nix
+++ b/pkgs/by-name/co/coinlive/package.nix
@@ -1,11 +1,11 @@
 {
   lib,
   stdenv,
+  darwin,
   fetchFromGitHub,
   openssl,
   pkg-config,
   rustPlatform,
-  Security,
   versionCheckHook,
 }:
 
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
       openssl
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      Security
+      darwin.apple_sdk.frameworks.Security
     ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6d18c1a3849..c23552649fa5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8946,10 +8946,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) OpenGL;
   };
 
-  coinlive = callPackage ../tools/misc/coinlive {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   inherit (cosmopolitan) cosmocc;
 
   ctranslate2 = callPackage ../development/libraries/ctranslate2 rec {

From 7ed1bb9467ff4ed0d298b40b4b927ee6e219de6c Mon Sep 17 00:00:00 2001
From: budimanjojo <budimanjojo@gmail.com>
Date: Tue, 3 Dec 2024 16:44:27 +0700
Subject: [PATCH 082/141] nixos/fireqos: fix service not being enabled

Signed-off-by: budimanjojo <budimanjojo@gmail.com>
---
 nixos/modules/services/networking/fireqos.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/fireqos.nix b/nixos/modules/services/networking/fireqos.nix
index aa7d8c2c03ef..eef54f2e5536 100644
--- a/nixos/modules/services/networking/fireqos.nix
+++ b/nixos/modules/services/networking/fireqos.nix
@@ -35,6 +35,7 @@ in {
     systemd.services.fireqos = {
       description = "FireQOS";
       after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         Type = "oneshot";
         RemainAfterExit = true;

From 6342e63fa80d2716418cf3f3fe59ec3d3d889af0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 10:47:04 +0100
Subject: [PATCH 083/141] rustcat: refactor

- format with nixfmt
- add versionCheckHook
- add changelog to meta
---
 pkgs/tools/networking/rustcat/default.nix | 25 +++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/rustcat/default.nix b/pkgs/tools/networking/rustcat/default.nix
index dba12bf58ac4..0933137335eb 100644
--- a/pkgs/tools/networking/rustcat/default.nix
+++ b/pkgs/tools/networking/rustcat/default.nix
@@ -1,8 +1,10 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, rustPlatform
-, Security
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  Security,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -11,18 +13,25 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "robiot";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-/6vNFh7n6WvYerrL8m9sgUKsO2KKj7/f8xc4rzHy9Io=";
+    repo = "rustcat";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/6vNFh7n6WvYerrL8m9sgUKsO2KKj7/f8xc4rzHy9Io=";
   };
 
   cargoHash = "sha256-wqoU9UfXDmf7KIHgFif5rZfZY8Zu0SsaMVfwTtXLzHg=";
 
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
+  versionCheckProgram = [ "${placeholder "out"}/bin/rcat" ];
+
   meta = with lib; {
     description = "Port listener and reverse shell";
     homepage = "https://github.com/robiot/rustcat";
+    changelog = "https://github.com/robiot/rustcat/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
     mainProgram = "rcat";

From c2e4f3c99f4cc249040ac95ed405539035a69cce Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 10:51:05 +0100
Subject: [PATCH 084/141] rustcat: move to pkgs/by-name

---
 .../rustcat/default.nix => by-name/ru/rustcat/package.nix}    | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{tools/networking/rustcat/default.nix => by-name/ru/rustcat/package.nix} (88%)

diff --git a/pkgs/tools/networking/rustcat/default.nix b/pkgs/by-name/ru/rustcat/package.nix
similarity index 88%
rename from pkgs/tools/networking/rustcat/default.nix
rename to pkgs/by-name/ru/rustcat/package.nix
index 0933137335eb..d61e84588068 100644
--- a/pkgs/tools/networking/rustcat/default.nix
+++ b/pkgs/by-name/ru/rustcat/package.nix
@@ -1,9 +1,9 @@
 {
   lib,
   stdenv,
+  darwin,
   fetchFromGitHub,
   rustPlatform,
-  Security,
   versionCheckHook,
 }:
 
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-wqoU9UfXDmf7KIHgFif5rZfZY8Zu0SsaMVfwTtXLzHg=";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6d18c1a3849..d1dc98ee7dbb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5161,10 +5161,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  rustcat = callPackage ../tools/networking/rustcat {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   rustscan = callPackage ../tools/security/rustscan {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From 58c4fb6e110f7e801a689e2f0c3322e0164dfb46 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 11:10:41 +0100
Subject: [PATCH 085/141] slowlorust: refactor

---
 pkgs/tools/networking/slowlorust/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/slowlorust/default.nix b/pkgs/tools/networking/slowlorust/default.nix
index d5e924d10272..89b6c961305c 100644
--- a/pkgs/tools/networking/slowlorust/default.nix
+++ b/pkgs/tools/networking/slowlorust/default.nix
@@ -11,8 +11,8 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "MJVL";
-    repo = pname;
-    rev = version;
+    repo = "slowlorust";
+    rev = "refs/tags/${version}";
     hash = "sha256-c4NWkQ/QvlUo1YoV2s7rWB6wQskAP5Qp1WVM23wvV3c=";
   };
 
@@ -25,6 +25,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Lightweight slowloris (HTTP DoS) tool";
     homepage = "https://github.com/MJVL/slowlorust";
+    changelog = "https://github.com/MJVL/slowlorust/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
     mainProgram = "slowlorust";

From ab73ad0d48f21b588c2b4d32767e93d523ecb74d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 11:11:02 +0100
Subject: [PATCH 086/141] slowlorust: format with nixfmt

---
 pkgs/tools/networking/slowlorust/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/slowlorust/default.nix b/pkgs/tools/networking/slowlorust/default.nix
index 89b6c961305c..d68ad8d59aa1 100644
--- a/pkgs/tools/networking/slowlorust/default.nix
+++ b/pkgs/tools/networking/slowlorust/default.nix
@@ -1,8 +1,9 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, rustPlatform
-, Security
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  Security,
 }:
 
 rustPlatform.buildRustPackage rec {

From c91e47f589d09b49e40b59917a38d755dc2fdce3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 3 Dec 2024 11:11:45 +0100
Subject: [PATCH 087/141] nixos/fireqos: modernize

---
 nixos/modules/services/networking/fireqos.nix | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/networking/fireqos.nix b/nixos/modules/services/networking/fireqos.nix
index eef54f2e5536..eb1e46b4b2d1 100644
--- a/nixos/modules/services/networking/fireqos.nix
+++ b/nixos/modules/services/networking/fireqos.nix
@@ -1,21 +1,19 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   cfg = config.services.fireqos;
-  fireqosConfig = pkgs.writeText "fireqos.conf" "${cfg.config}";
-in {
+  fireqosConfig = pkgs.writeText "fireqos.conf" cfg.config;
+in
+{
   options.services.fireqos = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      description = ''
-        If enabled, FireQOS will be launched with the specified
-        configuration given in `config`.
-      '';
-    };
+    enable = lib.mkEnableOption "FireQOS";
 
     config = lib.mkOption {
-      type = lib.types.str;
-      default = "";
+      type = lib.types.lines;
       example = ''
         interface wlp3s0 world-in input rate 10mbit ethernet
           class web commit 50kbit
@@ -26,7 +24,7 @@ in {
             match tcp ports 80,443
       '';
       description = ''
-        The FireQOS configuration goes here.
+        The FireQOS configuration.
       '';
     };
   };

From 29657fce4b05ca4580bd8ba50e3a7124f354ee91 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 11:16:36 +0100
Subject: [PATCH 088/141] slowlorust: add versionCheckHook

---
 pkgs/tools/networking/slowlorust/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/tools/networking/slowlorust/default.nix b/pkgs/tools/networking/slowlorust/default.nix
index d68ad8d59aa1..efb4fb6b463c 100644
--- a/pkgs/tools/networking/slowlorust/default.nix
+++ b/pkgs/tools/networking/slowlorust/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   rustPlatform,
   Security,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -19,10 +20,22 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-Wu1mm+yJw2SddddxC5NfnMWLr+dplnRxH3AJ1/mTAKM=";
 
+  postPatch = ''
+    # https://github.com/MJVL/slowlorust/issues/2
+    substituteInPlace src/main.rs \
+      --replace-fail 'version = "1.0"' 'version = "${version}"'
+  '';
+
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     Security
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = [ "--version" ];
+
   meta = with lib; {
     description = "Lightweight slowloris (HTTP DoS) tool";
     homepage = "https://github.com/MJVL/slowlorust";

From fe5fb91889ea2e2dff29b2bd363af7eca4d50bbe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 11:20:57 +0100
Subject: [PATCH 089/141] slowlorust: move to pkgs/by-name

---
 .../default.nix => by-name/sl/slowlorust/package.nix}       | 6 ++----
 pkgs/top-level/all-packages.nix                             | 4 ----
 2 files changed, 2 insertions(+), 8 deletions(-)
 rename pkgs/{tools/networking/slowlorust/default.nix => by-name/sl/slowlorust/package.nix} (90%)

diff --git a/pkgs/tools/networking/slowlorust/default.nix b/pkgs/by-name/sl/slowlorust/package.nix
similarity index 90%
rename from pkgs/tools/networking/slowlorust/default.nix
rename to pkgs/by-name/sl/slowlorust/package.nix
index efb4fb6b463c..3d3ced6d29ec 100644
--- a/pkgs/tools/networking/slowlorust/default.nix
+++ b/pkgs/by-name/sl/slowlorust/package.nix
@@ -1,9 +1,9 @@
 {
   lib,
   stdenv,
+  darwin,
   fetchFromGitHub,
   rustPlatform,
-  Security,
   versionCheckHook,
 }:
 
@@ -26,9 +26,7 @@ rustPlatform.buildRustPackage rec {
       --replace-fail 'version = "1.0"' 'version = "${version}"'
   '';
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    Security
-  ];
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6d18c1a3849..ba99cad15808 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5235,10 +5235,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_12;
   };
 
-  slowlorust = callPackage ../tools/networking/slowlorust {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   slstatus = callPackage ../applications/misc/slstatus {
     conf = config.slstatus.conf or null;
   };

From 47bb8b2150a707aaa180096499eac4bd4e33e7d0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 11:23:40 +0100
Subject: [PATCH 090/141] python312Packages.thinqconnect: 1.0.1 -> 1.0.2

Diff: https://github.com/thinq-connect/pythinqconnect/compare/refs/tags/1.0.1...1.0.2
---
 pkgs/development/python-modules/thinqconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/thinqconnect/default.nix b/pkgs/development/python-modules/thinqconnect/default.nix
index e47ca0287792..263c48522220 100644
--- a/pkgs/development/python-modules/thinqconnect/default.nix
+++ b/pkgs/development/python-modules/thinqconnect/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "thinqconnect";
-  version = "1.0.1";
+  version = "1.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "thinq-connect";
     repo = "pythinqconnect";
     rev = "refs/tags/${version}";
-    hash = "sha256-kKmC2RMxJpNIX8bhHlPnFwP+0l7+MC+mWlCRjACy4cg=";
+    hash = "sha256-Y/L/PhTBTUF8INqLgIi1llRrticlGPb8F/sPq3XWxN4=";
   };
 
   build-system = [ setuptools ];

From 0a4c5699f340f654e2d67b521995abba7801781a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 11:27:38 +0100
Subject: [PATCH 091/141] gotestwaf: migrate to versionCheckHook

---
 pkgs/tools/security/gotestwaf/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix
index 32797408a874..747ee15bf070 100644
--- a/pkgs/tools/security/gotestwaf/default.nix
+++ b/pkgs/tools/security/gotestwaf/default.nix
@@ -2,8 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  gotestwaf,
-  testers,
+  versionCheckHook,
 }:
 
 buildGoModule rec {
@@ -19,8 +18,7 @@ buildGoModule rec {
 
   vendorHash = "sha256-mPqCphweDF9RQibdjTaXXfXdO8NENHVMdIPxrJEw2g4=";
 
-  # Some tests require networking as of v0.4.0
-  doCheck = false;
+  nativeInstallCheckInputs = [ versionCheckHook ];
 
   ldflags = [
     "-w"
@@ -28,11 +26,12 @@ buildGoModule rec {
     "-X=github.com/wallarm/gotestwaf/internal/version.Version=v${version}"
   ];
 
-  passthru.tests.version = testers.testVersion {
-    command = "gotestwaf --version";
-    package = gotestwaf;
-    version = "v${version}";
-  };
+  # Tests require network access
+  doCheck = false;
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = [ "--version" ];
 
   meta = with lib; {
     description = "Tool for API and OWASP attack simulation";

From dc28b5b21f65db8e403683d08448037224f51c7c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 11:29:30 +0100
Subject: [PATCH 092/141] gotestwaf: move to pkgs/by-name

---
 .../default.nix => by-name/go/gotestwaf/package.nix}          | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 4 deletions(-)
 rename pkgs/{tools/security/gotestwaf/default.nix => by-name/go/gotestwaf/package.nix} (100%)

diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/by-name/go/gotestwaf/package.nix
similarity index 100%
rename from pkgs/tools/security/gotestwaf/default.nix
rename to pkgs/by-name/go/gotestwaf/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6d18c1a3849..e64d1fa48f1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18152,10 +18152,6 @@ with pkgs;
     binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
   };
 
-  gotestwaf = callPackage ../tools/security/gotestwaf {
-    buildGoModule = buildGo123Module;
-  };
-
   gotrue = callPackage ../tools/security/gotrue { };
 
   gotrue-supabase = callPackage ../tools/security/gotrue/supabase.nix { };

From e331bd9a9200f27f58ebd68612a0d8e383ba23f6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 11:32:53 +0100
Subject: [PATCH 093/141] websocat: format with nixfmt

---
 pkgs/tools/misc/websocat/default.nix | 36 +++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix
index 19196355558e..7127b48af2e6 100644
--- a/pkgs/tools/misc/websocat/default.nix
+++ b/pkgs/tools/misc/websocat/default.nix
@@ -1,5 +1,15 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, openssl, rustPlatform, libiconv
-, Security, makeWrapper, bash }:
+{
+  lib,
+  stdenv,
+  bash,
+  fetchFromGitHub,
+  libiconv,
+  makeWrapper,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  Security,
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "websocat";
@@ -14,14 +24,21 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-2THUFcaM4niB7YiQiRXJQuaQu02fpgZKPWrejfhmRQ0=";
 
-  nativeBuildInputs = [ pkg-config makeWrapper ];
-  buildInputs = [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ];
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+  buildInputs =
+    [ openssl ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      libiconv
+      Security
+    ];
 
   buildFeatures = [ "ssl" ];
 
   # Needed to get openssl-sys to use pkg-config.
-  OPENSSL_NO_VENDOR=1;
+  OPENSSL_NO_VENDOR = 1;
 
   # The wrapping is required so that the "sh-c" option of websocat works even
   # if sh is not in the PATH (as can happen, for instance, when websocat is
@@ -32,11 +49,14 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with lib; {
-    homepage = "https://github.com/vi/websocat";
     description = "Command-line client for WebSockets (like netcat/socat)";
+    homepage = "https://github.com/vi/websocat";
     changelog = "https://github.com/vi/websocat/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ thoughtpolice Br1ght0ne ];
+    maintainers = with maintainers; [
+      thoughtpolice
+      Br1ght0ne
+    ];
     mainProgram = "websocat";
   };
 }

From f1e02d7a44f70f51d062c4f7a118cedc969e50db Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 11:36:12 +0100
Subject: [PATCH 094/141] websocat: add versionCheckHook

---
 pkgs/tools/misc/websocat/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix
index 7127b48af2e6..89f9acd7bc9f 100644
--- a/pkgs/tools/misc/websocat/default.nix
+++ b/pkgs/tools/misc/websocat/default.nix
@@ -9,6 +9,7 @@
   pkg-config,
   rustPlatform,
   Security,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -17,9 +18,9 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "vi";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-v5+9cbKe3c12/SrW7mgN6tvQIiAuweqvMIl46Ce9f2A=";
+    repo = "websocat";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-v5+9cbKe3c12/SrW7mgN6tvQIiAuweqvMIl46Ce9f2A=";
   };
 
   cargoHash = "sha256-2THUFcaM4niB7YiQiRXJQuaQu02fpgZKPWrejfhmRQ0=";
@@ -28,6 +29,7 @@ rustPlatform.buildRustPackage rec {
     pkg-config
     makeWrapper
   ];
+
   buildInputs =
     [ openssl ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
@@ -35,6 +37,8 @@ rustPlatform.buildRustPackage rec {
       Security
     ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   buildFeatures = [ "ssl" ];
 
   # Needed to get openssl-sys to use pkg-config.
@@ -48,6 +52,8 @@ rustPlatform.buildRustPackage rec {
       --prefix PATH : ${lib.makeBinPath [ bash ]}
   '';
 
+  doInstallCheck = true;
+
   meta = with lib; {
     description = "Command-line client for WebSockets (like netcat/socat)";
     homepage = "https://github.com/vi/websocat";

From 1d957b2e3acf568e8017c29439f9edb3ed9313ae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 11:41:03 +0100
Subject: [PATCH 095/141] websocat: move to pkgs/by-name

---
 .../websocat/default.nix => by-name/we/websocat/package.nix}  | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{tools/misc/websocat/default.nix => by-name/we/websocat/package.nix} (96%)

diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/by-name/we/websocat/package.nix
similarity index 96%
rename from pkgs/tools/misc/websocat/default.nix
rename to pkgs/by-name/we/websocat/package.nix
index 89f9acd7bc9f..a0e14ac56c06 100644
--- a/pkgs/tools/misc/websocat/default.nix
+++ b/pkgs/by-name/we/websocat/package.nix
@@ -2,13 +2,13 @@
   lib,
   stdenv,
   bash,
+  darwin,
   fetchFromGitHub,
   libiconv,
   makeWrapper,
   openssl,
   pkg-config,
   rustPlatform,
-  Security,
   versionCheckHook,
 }:
 
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     [ openssl ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       libiconv
-      Security
+      darwin.apple_sdk.frameworks.Security
     ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6d18c1a3849..de5f8be121c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18176,10 +18176,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  websocat = callPackage ../tools/misc/websocat {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   vector = callPackage ../tools/misc/vector {
     inherit (darwin.apple_sdk.frameworks) Security CoreServices SystemConfiguration;
   };

From ece89eabe57ca74b908392b74661330a2222f35c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 11:45:25 +0100
Subject: [PATCH 096/141] rates: refactor

- use hash
- add changelog to meta
---
 pkgs/tools/misc/rates/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/rates/default.nix b/pkgs/tools/misc/rates/default.nix
index c774721eeecc..5bcb6898b7e9 100644
--- a/pkgs/tools/misc/rates/default.nix
+++ b/pkgs/tools/misc/rates/default.nix
@@ -11,9 +11,9 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "lunush";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-zw2YLTrvqbGKR8Dg5W+kJTDKIfro+MNyjHXfZMXZhaw=";
+    repo = "rates";
+    rev = "refs/tags/${version}";
+    hash = "sha256-zw2YLTrvqbGKR8Dg5W+kJTDKIfro+MNyjHXfZMXZhaw=";
   };
 
   cargoHash = "sha256-5EcTeMfa1GNp1q60qSgEi/I3298hXUD1Vc1K55XGW4I=";
@@ -23,6 +23,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "CLI tool that brings currency exchange rates right into your terminal";
     homepage = "https://github.com/lunush/rates";
+    changelog = "https://github.com/lunush/rates/releases/tag/${version}";
     license = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ fab ];
     mainProgram = "rates";

From a72e7d1cd29ba801da1d989d98d88d81f6295b4c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 11:46:01 +0100
Subject: [PATCH 097/141] rates:format with nixfmt

---
 pkgs/tools/misc/rates/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/rates/default.nix b/pkgs/tools/misc/rates/default.nix
index 5bcb6898b7e9..25cf21c5f59d 100644
--- a/pkgs/tools/misc/rates/default.nix
+++ b/pkgs/tools/misc/rates/default.nix
@@ -1,8 +1,9 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, rustPlatform
-, Security
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  Security,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -24,7 +25,10 @@ rustPlatform.buildRustPackage rec {
     description = "CLI tool that brings currency exchange rates right into your terminal";
     homepage = "https://github.com/lunush/rates";
     changelog = "https://github.com/lunush/rates/releases/tag/${version}";
-    license = with licenses; [ asl20 /* or */ mit ];
+    license = with licenses; [
+      asl20
+      mit
+    ];
     maintainers = with maintainers; [ fab ];
     mainProgram = "rates";
   };

From 51adde8e757de222348b337000eac5827c6a8e22 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 11:47:59 +0100
Subject: [PATCH 098/141] rates: add versionCheckHook

---
 pkgs/tools/misc/rates/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/misc/rates/default.nix b/pkgs/tools/misc/rates/default.nix
index 25cf21c5f59d..1056f184ae06 100644
--- a/pkgs/tools/misc/rates/default.nix
+++ b/pkgs/tools/misc/rates/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   rustPlatform,
   Security,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -21,6 +22,12 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = [ "--version" ];
+
   meta = with lib; {
     description = "CLI tool that brings currency exchange rates right into your terminal";
     homepage = "https://github.com/lunush/rates";

From 5061e5448d555b415d60bb27d4f2414e577ee2cf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 11:50:49 +0100
Subject: [PATCH 099/141] rates: move to pkgs/by-name

---
 .../misc/rates/default.nix => by-name/ra/rates/package.nix}   | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{tools/misc/rates/default.nix => by-name/ra/rates/package.nix} (89%)

diff --git a/pkgs/tools/misc/rates/default.nix b/pkgs/by-name/ra/rates/package.nix
similarity index 89%
rename from pkgs/tools/misc/rates/default.nix
rename to pkgs/by-name/ra/rates/package.nix
index 1056f184ae06..3360f3961666 100644
--- a/pkgs/tools/misc/rates/default.nix
+++ b/pkgs/by-name/ra/rates/package.nix
@@ -1,9 +1,9 @@
 {
   lib,
   stdenv,
+  darwin,
   fetchFromGitHub,
   rustPlatform,
-  Security,
   versionCheckHook,
 }:
 
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-5EcTeMfa1GNp1q60qSgEi/I3298hXUD1Vc1K55XGW4I=";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6d18c1a3849..1cfb18202e80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18512,10 +18512,6 @@ with pkgs;
 
   qzdl = libsForQt5.callPackage ../games/qzdl { };
 
-  rates = callPackage ../tools/misc/rates {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   rbspy = darwin.apple_sdk_11_0.callPackage ../development/tools/rbspy { };
 
   pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker {

From 8d3349cda3706f41d1ed61f212a6279e6a1f9e85 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 2 Dec 2024 18:27:55 +0100
Subject: [PATCH 100/141] linux_testing: 6.12-rc7 -> 6.13-rc1

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

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index a2887cdb2b4e..735218caa3f1 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,7 +1,7 @@
 {
     "testing": {
-        "version": "6.12-rc7",
-        "hash": "sha256:1rsglb7zwbn4f6wv4g95jl8ra1wbs03k7xyfdlmwzl3vgzx3bnzv"
+        "version": "6.13-rc1",
+        "hash": "sha256:0k3fj9wia9z0pv0vn3hzfzsrbp0lc84yjmww63ygac0fdvkml6l5"
     },
     "6.1": {
         "version": "6.1.119",

From 9f80d0187283e28ef8486e8ea61e82ea1698ac18 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 2 Dec 2024 18:30:05 +0100
Subject: [PATCH 101/141] linux-rt_5_10: 5.10.225-rt117 -> 5.10.229-rt121

---
 pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
index 257754d218ec..be797faf8c10 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "5.10.225-rt117"; # updated by ./update-rt.sh
+  version = "5.10.229-rt121"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "0770757ildcc0cs6alnb5cspg6ysg2wqly9z5q1vjf3mh0xbzmw5";
+    sha256 = "1q6di05rk4bsy91r03zw6vz14zzcpvv25dv7gw0yz1gzpgkbb9h8";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "1c14gm4wzcbkhzgdm5lwq1as9is784yra7bc226bz3bqs3h7vmw2";
+      sha256 = "0bjmnk2nx50spyad2fq1l67jwp63yzxc7s39mx8sih6hm21d8y77";
     };
   }; in [ rt-patch ] ++ kernelPatches;
 

From 6431119ca4bd83856143ab35268f76e667de0277 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 2 Dec 2024 18:30:37 +0100
Subject: [PATCH 102/141] linux-rt_5_4: 5.4.278-rt91 -> 5.4.285-rt93

---
 pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
index 7863cf42f7dd..4fa02ec87080 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "5.4.278-rt91"; # updated by ./update-rt.sh
+  version = "5.4.285-rt93"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -15,14 +15,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "1245zf7vk2fyprw9fspljqy9wlzma9bayri7xx2g8iam2430d875";
+    sha256 = "1722sc365ajxmqyr4r49yp73mzdckay3rx5c2gx29xzny9zc6cmy";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0s1ars3d18jg55kpvk6q5b6rk66c74d2khd2mxzdm5ifgm47047k";
+      sha256 = "1vj7b47cb7a94xmkdcfbqhx44g3ivqd7fif3vg256ikqlid8cl4q";
     };
   }; in [ rt-patch ] ++ kernelPatches;
 

From ee127a0590af4404ef6d162cff17a991686d7372 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 2 Dec 2024 18:31:21 +0100
Subject: [PATCH 103/141] linux-rt_6_1: 6.1.112-rt43 -> 6.1.119-rt45

---
 pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
index 16c4f021ed00..4514adffd4a9 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "6.1.112-rt43"; # updated by ./update-rt.sh
+  version = "6.1.119-rt45"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -19,14 +19,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-    sha256 = "094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b";
+    sha256 = "0y1j8bz99d5vkxklzpwhns5r77lpz2prszf6whfahi58s0wszkdf";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0qvil92xkbwmyrmj0zlg0ssg95ncscmr4ga4380903bqhhh74d6h";
+      sha256 = "0a7qga7xadp9ghhzz4iifdhap7vm288b789mv0xr9y8gnnk7cc9m";
     };
   }; in [ rt-patch ] ++ kernelPatches;
 

From adb7bd4be87fe6d943f30d9dcf8ec9ac2827172b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 2 Dec 2024 18:32:00 +0100
Subject: [PATCH 104/141] linux-rt_6_6: 6.6.58-rt45 -> 6.6.63-rt46

---
 pkgs/os-specific/linux/kernel/linux-rt-6.6.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
index ffbe4fc47e4c..3f5796cf627f 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "6.6.58-rt45"; # updated by ./update-rt.sh
+  version = "6.6.63-rt46"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -19,14 +19,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-    sha256 = "1nwrd017l5m4w12yrcf31y3g0l9xqm5b0fzcqdgan3ypi3jq3pz7";
+    sha256 = "0d8q0vwv3lcix3wiq2n53rir3h298flg2l0ghpify4rlh2s4l1fi";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0npvydlk2z33c5xqhg31xky045s5rvjnvfqml30nycmzbsmqjc7c";
+      sha256 = "1p0kbkz21m2y9yjcyhbrnnnw9x885l3zamykjkmgxgg3s8awg025";
     };
   }; in [ rt-patch ] ++ kernelPatches;
 

From b5964b825f0e00fca26be7161bc4c78fa8c93483 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 2 Dec 2024 18:33:07 +0100
Subject: [PATCH 105/141] linux/hardened/patches/6.1: v6.1.118-hardened1 ->
 v6.1.119-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index d9b9efb8838d..8c5ad746cc70 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -32,12 +32,12 @@
     "6.1": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.1.118-hardened1.patch",
-            "sha256": "0jk1ndy7xw6x425v1q945gawyi44bygryq71jxpf33z99xyqbyid",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.118-hardened1/linux-hardened-v6.1.118-hardened1.patch"
+            "name": "linux-hardened-v6.1.119-hardened1.patch",
+            "sha256": "0ns3c2qdpxipyk3i9127rfmadi99dnr43lr06vgw0p0ymqgjccj7",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.119-hardened1/linux-hardened-v6.1.119-hardened1.patch"
         },
-        "sha256": "0k12d4l03ziiba1b4f6jfxv5ir0lrd6kshlasr62rhv1f6yq81q1",
-        "version": "6.1.118"
+        "sha256": "0y1j8bz99d5vkxklzpwhns5r77lpz2prszf6whfahi58s0wszkdf",
+        "version": "6.1.119"
     },
     "6.11": {
         "patch": {

From 08cf416d5f79a87b38ac24b9cf4d81b9b64e58c7 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 2 Dec 2024 18:33:43 +0100
Subject: [PATCH 106/141] linux/hardened/patches/6.11: v6.11.9-hardened1 ->
 v6.11.10-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 8c5ad746cc70..6f3f98880ae8 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -42,12 +42,12 @@
     "6.11": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.11.9-hardened1.patch",
-            "sha256": "1w3c7vni6pwlyav796fanj5cx5k3w7gsdpwihnniskyy9j1pvi4g",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.11.9-hardened1/linux-hardened-v6.11.9-hardened1.patch"
+            "name": "linux-hardened-v6.11.10-hardened1.patch",
+            "sha256": "10m3xkanix9yhj95p1qr5dk3gydq1hbnbnibrlp4ag9yqd5ki7d4",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.11.10-hardened1/linux-hardened-v6.11.10-hardened1.patch"
         },
-        "sha256": "1d44yfk105bsf9f853f2fpnzqd0xbqn8drg1dv4ri5dxldx8lrbm",
-        "version": "6.11.9"
+        "sha256": "0xzynjyyr16my0wrla4ggpjbh4g7nsqixaimz5hrsqlhaa8q9hab",
+        "version": "6.11.10"
     },
     "6.6": {
         "patch": {

From 609b25dfa683d121d91792fa9e5f7dd008f6f671 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 2 Dec 2024 18:34:28 +0100
Subject: [PATCH 107/141] linux/hardened/patches/6.6: v6.6.62-hardened1 ->
 v6.6.63-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 6f3f98880ae8..947eb036a655 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -52,11 +52,11 @@
     "6.6": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.6.62-hardened1.patch",
-            "sha256": "1rk6plakzwa4bsi0cibl1l3g13bzry65533wk2khbgsikqnyi9fq",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.62-hardened1/linux-hardened-v6.6.62-hardened1.patch"
+            "name": "linux-hardened-v6.6.63-hardened1.patch",
+            "sha256": "1nsg9f6fgh1yfa95gwrdh8g8kwywbczl2rv8j06qsk0y6b79kmw1",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.63-hardened1/linux-hardened-v6.6.63-hardened1.patch"
         },
-        "sha256": "0dlkgph6chvqrask746wjijqp62vmvrp3n2dkldr8d2mfw8mdhz2",
-        "version": "6.6.62"
+        "sha256": "0d8q0vwv3lcix3wiq2n53rir3h298flg2l0ghpify4rlh2s4l1fi",
+        "version": "6.6.63"
     }
 }

From f97c2cfddf2d1d7feb054d11db19ef6c6508be02 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 13:19:12 +0100
Subject: [PATCH 108/141] wafw00f: refactor

- format with nixfmt
- add changelog to meta
---
 pkgs/by-name/wa/wafw00f/package.nix | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/wa/wafw00f/package.nix b/pkgs/by-name/wa/wafw00f/package.nix
index d8d89a3e325a..11925b7afd6d 100644
--- a/pkgs/by-name/wa/wafw00f/package.nix
+++ b/pkgs/by-name/wa/wafw00f/package.nix
@@ -1,21 +1,24 @@
-{ lib
-, fetchFromGitHub
-, python3
+{
+  lib,
+  fetchFromGitHub,
+  python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "wafw00f";
   version = "2.2.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "EnableSecurity";
-    repo = pname;
+    repo = "wafw00f";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-wJZ1/aRMFpE6Q5YAtGxXwxe2G9H/de+l3l0C5rwEWA8=";
+    hash = "sha256-wJZ1/aRMFpE6Q5YAtGxXwxe2G9H/de+l3l0C5rwEWA8=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
     requests
     pluginbase
   ];
@@ -23,15 +26,14 @@ python3.pkgs.buildPythonApplication rec {
   # Project has no tests
   doCheck = false;
 
-  pythonImportsCheck = [
-    "wafw00f"
-  ];
+  pythonImportsCheck = [ "wafw00f" ];
 
   meta = with lib; {
     description = "Tool to identify and fingerprint Web Application Firewalls (WAF)";
-    mainProgram = "wafw00f";
     homepage = "https://github.com/EnableSecurity/wafw00f";
-    license = with licenses; [ bsd3 ];
+    changelog = "https://github.com/EnableSecurity/wafw00f/releases/tag/v${version}";
+    license = licenses.bsd3;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "wafw00f";
   };
 }

From 11ad6d0722a5db346bb93d74d74bb4fe4d09b542 Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Tue, 3 Dec 2024 16:16:06 +0100
Subject: [PATCH 109/141] cyclonedx-cli: 0.25.1 -> 0.27.2

---
 pkgs/by-name/cy/cyclonedx-cli/deps.nix    | 16 ++++++++--------
 pkgs/by-name/cy/cyclonedx-cli/package.nix | 11 ++++++++---
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/cy/cyclonedx-cli/deps.nix b/pkgs/by-name/cy/cyclonedx-cli/deps.nix
index 526fd3ca2f75..a23e5c5a1915 100644
--- a/pkgs/by-name/cy/cyclonedx-cli/deps.nix
+++ b/pkgs/by-name/cy/cyclonedx-cli/deps.nix
@@ -5,10 +5,10 @@
   (fetchNuGet { pname = "CoderPatros.AntPathMatching"; version = "0.1.1"; hash = "sha256-U6xUTX5iuCM84QfwOpOtYK5RfKqojYcPfYQtw1+EPak="; })
   (fetchNuGet { pname = "coverlet.collector"; version = "3.1.2"; hash = "sha256-v7ZoEFZyhF8VcRZj1uim4HNiRsG+XdJ4x/dwPBIWUz8="; })
   (fetchNuGet { pname = "CsvHelper"; version = "29.0.0"; hash = "sha256-nELjcMLQgfUxzOSWX8Z62pqGcfZvuf+0QLFnLEsfsXQ="; })
-  (fetchNuGet { pname = "CycloneDX.Core"; version = "7.0.0"; hash = "sha256-OzsHjO5V3rN2N2Zo35W2iboVR2iEOw0KKQ0cSu+1WkM="; })
-  (fetchNuGet { pname = "CycloneDX.Spdx"; version = "7.0.0"; hash = "sha256-RkD17CBuXSdte2kOZpUtKbp0mdM1jMQo9/uoYQAFCkM="; })
-  (fetchNuGet { pname = "CycloneDX.Spdx.Interop"; version = "7.0.0"; hash = "sha256-cPeSfJPRdLZWBhkyvVvgPLp4ueQw0AJUvQsP8s40Q4U="; })
-  (fetchNuGet { pname = "CycloneDX.Utils"; version = "7.0.0"; hash = "sha256-iwQPhNI4H1WxvWtZGuQnpX74aLPFE1XvCIkxtNvB4e4="; })
+  (fetchNuGet { pname = "CycloneDX.Core"; version = "8.0.3"; hash = "sha256-d9GiOXYxQ1Sv35rN5jywhgTS+HKHSydHVcJNbKs7Htg="; })
+  (fetchNuGet { pname = "CycloneDX.Spdx"; version = "8.0.3"; hash = "sha256-86E8rIXeE6gu+W3yK33abZ5w5zwuDR0Qv5texxJnsv0="; })
+  (fetchNuGet { pname = "CycloneDX.Spdx.Interop"; version = "8.0.3"; hash = "sha256-WpM0VZAjhN2f/IckRIzIeMIkpir9ZNAW+0ZGxL2cBNY="; })
+  (fetchNuGet { pname = "CycloneDX.Utils"; version = "8.0.3"; hash = "sha256-CW6e3uPmCP1U98fcQsiDvn3fLkQOGcchPiUNq4aXDbQ="; })
   (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.2.0"; hash = "sha256-NtTiowrMQgoTiQQheioseb/eGGLH+qR/NXDFAsWrO08="; })
   (fetchNuGet { pname = "Json.More.Net"; version = "1.9.0"; hash = "sha256-ySIEHWZJLk6LeWYdAA9Ci3coKXkRgpu4N79MD4pRXdk="; })
   (fetchNuGet { pname = "JsonPointer.Net"; version = "3.0.3"; hash = "sha256-fWR1aCDWyc6flBLFaGSJmXg9vg2qMlAIN5wnj2RYqLY="; })
@@ -29,8 +29,8 @@
   (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.3"; hash = "sha256-PSHK+Qn52ytdEySdZyjCUGxV5y4hI/vir2WgVsCgv50="; })
   (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; })
   (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; })
-  (fetchNuGet { pname = "protobuf-net"; version = "3.2.26"; hash = "sha256-C1tvk/KSswIr2hxWK7kR8VKfx90TSeOZkhw/aLshj9U="; })
-  (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.26"; hash = "sha256-vJwiCTQkLzwcXsl8YkDl6oY/SQsL0bmCCM6q9jwaOfM="; })
+  (fetchNuGet { pname = "protobuf-net"; version = "3.2.45"; hash = "sha256-rWitxe3uP3SOyoG1fwM5n00RpR5IL1V6u1zXMI0p0JA="; })
+  (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.45"; hash = "sha256-bsMGUmd0yno8g0H0637jJboKJwyyHLHoHg45+bt9pLQ="; })
   (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; })
   (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; })
   (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; })
@@ -164,8 +164,8 @@
   (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; })
   (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; })
   (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; })
-  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="; })
-  (fetchNuGet { pname = "System.Text.Json"; version = "7.0.2"; hash = "sha256-bkfxuc3XPxtYcOJTGRMc/AkJiyIU+fTLK7PxtbuN3sQ="; })
+  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; hash = "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="; })
+  (fetchNuGet { pname = "System.Text.Json"; version = "6.0.2"; hash = "sha256-YLpB48NRiQ8oCuUx0AHJzqUHYgUwXW/60shFkkN/5tM="; })
   (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; })
   (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; })
   (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; })
diff --git a/pkgs/by-name/cy/cyclonedx-cli/package.nix b/pkgs/by-name/cy/cyclonedx-cli/package.nix
index 9b702601d3bc..06ff0b9c6b7c 100644
--- a/pkgs/by-name/cy/cyclonedx-cli/package.nix
+++ b/pkgs/by-name/cy/cyclonedx-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildDotnetModule rec {
   pname = "cyclonedx-cli";
-  version = "0.25.1";
+  version = "0.27.2";
 
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9G9g4bfH6EGSTZQlaiLsRjnryl+mQ3uNXdBUBVcKwlg=";
+    hash = "sha256-QU/MaT8iIf/9VpOb2mixOfOtG/J+sE7S0mT6BKYQnlI=";
   };
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
   nugetDeps = ./deps.nix;
 
   preFixup = ''
@@ -23,6 +23,11 @@ buildDotnetModule rec {
     find . ! -name 'cyclonedx' -type f -exec rm -f {} +
   '';
 
+  postPatch = ''
+    substituteInPlace src/cyclonedx/cyclonedx.csproj tests/cyclonedx.tests/cyclonedx.tests.csproj \
+      --replace-fail 'net6.0' 'net8.0'
+  '';
+
   meta = with lib; {
     description = "CycloneDX CLI tool for SBOM analysis, merging, diffs and format conversions";
     homepage = "https://github.com/CycloneDX/cyclonedx-cli";

From 7ce5501df0460974a6286b5d7389743c4f241fbb Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Tue, 3 Dec 2024 16:23:50 +0100
Subject: [PATCH 110/141] cyclonedx-cli: add team cyberus to maintainers

---
 pkgs/by-name/cy/cyclonedx-cli/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/cy/cyclonedx-cli/package.nix b/pkgs/by-name/cy/cyclonedx-cli/package.nix
index 06ff0b9c6b7c..2938acbc49af 100644
--- a/pkgs/by-name/cy/cyclonedx-cli/package.nix
+++ b/pkgs/by-name/cy/cyclonedx-cli/package.nix
@@ -32,7 +32,7 @@ buildDotnetModule rec {
     description = "CycloneDX CLI tool for SBOM analysis, merging, diffs and format conversions";
     homepage = "https://github.com/CycloneDX/cyclonedx-cli";
     changelog = "https://github.com/CycloneDX/cyclonedx-cli/releases/tag/v${version}";
-    maintainers = with maintainers; [ thillux ];
+    maintainers = (with maintainers; [ thillux ]) ++ teams.cyberus.members;
     license = licenses.asl20;
     platforms = with platforms; (linux ++ darwin);
     mainProgram = "cyclonedx";

From a248a23589b5a56120e0d21e0abeb94d6e543186 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 3 Dec 2024 19:34:00 +0300
Subject: [PATCH 111/141] mastodon: 4.3.1 -> 4.3.2

Changelog:
https://github.com/mastodon/mastodon/releases/tag/v4.3.2
---
 pkgs/servers/mastodon/gemset.nix | 4 ++--
 pkgs/servers/mastodon/source.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix
index 10ca3b991bbd..f5f0ec29087a 100644
--- a/pkgs/servers/mastodon/gemset.nix
+++ b/pkgs/servers/mastodon/gemset.nix
@@ -2753,10 +2753,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rr145mvjgc4n28lfy0gw87aw3ab680h83bdi5i102ik8mixk3zn";
+      sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
       type = "gem";
     };
-    version = "3.3.8";
+    version = "3.3.9";
   };
   rotp = {
     groups = ["default"];
diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index 9d7ac7df238c..8a752ce7d22d 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -1,7 +1,7 @@
 # This file was generated by pkgs.mastodon.updateScript.
 { fetchFromGitHub, applyPatches, patches ? [] }:
 let
-  version = "4.3.1";
+  version = "4.3.2";
 in
 (
   applyPatches {
@@ -9,7 +9,7 @@ in
       owner = "mastodon";
       repo = "mastodon";
       rev = "v${version}";
-      hash = "sha256-JlpQGyVPTLcB3RcWMBrmYc1AAUT1JLfS4IDas9ZoWh4=";
+      hash = "sha256-A1sSUBtlztKFsZ3TY/c9CXFV8LhttRW2JmSU0QSVOIg=";
     };
     patches = patches ++ [];
   }) // {

From 695f21d26ddaf8c2e59d98c70280fc89da72edf2 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 3 Dec 2024 11:03:53 -0600
Subject: [PATCH 112/141] vimPlugins: update on 2024-12-03

---
 .../editors/vim/plugins/generated.nix         | 679 +++++++++---------
 .../editors/vim/plugins/overrides.nix         |   2 +-
 2 files changed, 341 insertions(+), 340 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 2d7a25f879ed..bbd15a1c1fc7 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -65,12 +65,12 @@ final: prev:
 
   CopilotChat-nvim = buildVimPlugin {
     pname = "CopilotChat.nvim";
-    version = "2024-11-25";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "CopilotC-Nvim";
       repo = "CopilotChat.nvim";
-      rev = "49edd2e21dfdc0f1bf4ed872099674cb8fe30280";
-      sha256 = "0cjqnzjsk6mb66jc7wvli3xyg6yxdrag552b91d8b8fa013h4k6d";
+      rev = "86bdee82848955641e14930e0593820cf9b161bf";
+      sha256 = "015vbn3q9d4a09baqbll49qfiahiwdqk2rgwipanyq11g7h5q5vn";
     };
     meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/";
   };
@@ -185,24 +185,24 @@ final: prev:
 
   LazyVim = buildVimPlugin {
     pname = "LazyVim";
-    version = "2024-11-26";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "LazyVim";
       repo = "LazyVim";
-      rev = "9eccb5d2defef4c1fe63719528b20bb210e1ef0c";
-      sha256 = "1nd3cwpxpwa1g4179rmnj0fbfbjnqfk8jyr236824z2cc4kdr5vx";
+      rev = "4a626a81372df74c3ea33b435e91b127ef55a796";
+      sha256 = "0y0569j9yiqk08paa5ic58r2gvk06iy3211sgl41fkfg00dk362v";
     };
     meta.homepage = "https://github.com/LazyVim/LazyVim/";
   };
 
   LeaderF = buildVimPlugin {
     pname = "LeaderF";
-    version = "2024-11-18";
+    version = "2024-11-28";
     src = fetchFromGitHub {
       owner = "Yggdroot";
       repo = "LeaderF";
-      rev = "26ed56df8c4f89a23727232bc52fd8fc41ec9c98";
-      sha256 = "1a2vzkhdpg390h9546gajwa563df8nxffi60xbp6ip3rw6wq0mfq";
+      rev = "1116c71e3290560a6f98fa336adf39d9bba7a997";
+      sha256 = "1izvlbxjffsgjppcg2whxh2lraj5v4iakhnc1v44f2hbnxdhs3n7";
     };
     meta.homepage = "https://github.com/Yggdroot/LeaderF/";
   };
@@ -341,12 +341,12 @@ final: prev:
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "2024-11-24";
+    version = "2024-12-01";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "bbd005a56daab7a19ceea22360a836957ac2c42c";
-      sha256 = "0jixj9m0k0cwqv0lr3h4jq36ryzjkpm4418jj3qdva8d87l5lp06";
+      rev = "f922d46e17019e7fcadc1f0c1cfba31e8300819a";
+      sha256 = "0vv3jfq0maldrzsbk6dhqxkamb7bwlvbk9mv8s10wybzypgfgx30";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
   };
@@ -558,12 +558,12 @@ final: prev:
 
   aerial-nvim = buildVimPlugin {
     pname = "aerial.nvim";
-    version = "2024-11-13";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "aerial.nvim";
-      rev = "ddd25f57e5205b36bc2e939c486b47818bef9ec3";
-      sha256 = "0yrf4r09vf77sksfyyv65q561nsml9gs09ais8gbm6sv1x9fyl86";
+      rev = "fd7fbe36772d7a955815c90ff9b58523bfdb410d";
+      sha256 = "1dvv9mmwvr06hh4wl50nk1bdd07b45ll2lrmj39inbxgf7gcd790";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@@ -631,12 +631,12 @@ final: prev:
 
   ale = buildVimPlugin {
     pname = "ale";
-    version = "2024-11-23";
+    version = "2024-11-27";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "9d30fb2f59132c58808e2db2099cab5dbf9b2894";
-      sha256 = "0dgbrdk9r0ymwbqq3xiv4xwv881vhmj9fm7p069k9w1qj5w46zyz";
+      rev = "65b49c1b8172d0ab1b08ffe8fdcabb93fc1328df";
+      sha256 = "1rganfcn10zhqfkf19c28pbkxm3j6pifrpkhf4kw6y735lzhdlvg";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
   };
@@ -763,12 +763,12 @@ final: prev:
 
   astrotheme = buildVimPlugin {
     pname = "astrotheme";
-    version = "2024-10-14";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astrotheme";
-      rev = "b1405cc96823d5f6cdd5a2f7ebeb137183220840";
-      sha256 = "0npfxdl64qqcz49xy1jinsc140qfab4hr1dla64p8zwi8z99isch";
+      rev = "32bdcfd450ee1ef533301cde2248adf8a9a70b3b";
+      sha256 = "0s1jb06l53g0j6v9cknxhqcr6w30bk76p9rwmip42fkchxsm29nd";
     };
     meta.homepage = "https://github.com/AstroNvim/astrotheme/";
   };
@@ -967,12 +967,12 @@ final: prev:
 
   auto-session = buildVimPlugin {
     pname = "auto-session";
-    version = "2024-11-18";
+    version = "2024-11-27";
     src = fetchFromGitHub {
       owner = "rmagatti";
       repo = "auto-session";
-      rev = "8d2eddb14ef66ed1019c92251e2d31bb7a2a2f87";
-      sha256 = "1mkrxc7smp56dqzayl2h8ls6p2ymwrpdr1dccdlli2mkv8wcwa9z";
+      rev = "021b64ed7d4ac68a37be3ad28d8e1cba5bec582c";
+      sha256 = "0m9vkjk69vmw7m7ajyfmsdzz6xbs0lm8nl68mv06x71crcgkpn6n";
     };
     meta.homepage = "https://github.com/rmagatti/auto-session/";
   };
@@ -1027,12 +1027,12 @@ final: prev:
 
   avante-nvim = buildVimPlugin {
     pname = "avante.nvim";
-    version = "2024-11-25";
+    version = "2024-12-01";
     src = fetchFromGitHub {
       owner = "yetone";
       repo = "avante.nvim";
-      rev = "16c4254b14ebe8acb79f6abecb49ca36b9d96cb0";
-      sha256 = "107iykwf40byw4f0ry0rfs8yvjl1caswg0f1dpgqa7k7wxs97ggs";
+      rev = "57311bf8cd2f48729565d2351bcbf383b6a56907";
+      sha256 = "1pw96j7452mqkpakaqlwsah9qcqsa1hs3al4vl40q3vpqwkv20np";
     };
     meta.homepage = "https://github.com/yetone/avante.nvim/";
   };
@@ -1364,12 +1364,12 @@ final: prev:
 
   bufferline-nvim = buildVimPlugin {
     pname = "bufferline.nvim";
-    version = "2024-10-24";
+    version = "2024-11-28";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "bufferline.nvim";
-      rev = "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44";
-      sha256 = "1k9n2xmd76h44c2h16z87slf4lir0di7vwam7cyzf0kmmvqrg51j";
+      rev = "261a72b90d6db4ed8014f7bda976bcdc9dd7ce76";
+      sha256 = "1cp9md0pv0m1866fynasam01bdcqj5fvfcfqqq5licxfr0cgdb6f";
     };
     meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
   };
@@ -1963,12 +1963,12 @@ final: prev:
 
   cmp-nixpkgs-maintainers = buildVimPlugin {
     pname = "cmp-nixpkgs-maintainers";
-    version = "2024-10-19";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "GaetanLepage";
       repo = "cmp-nixpkgs-maintainers";
-      rev = "86711e7d3e92097b26e53f0b146b93863176377d";
-      sha256 = "0r1v2lr33zx0zssrpngh74ls8cl3smfajnyc405ykzlbn9p876rm";
+      rev = "4179ab637b7134671f3d0119377e8d5738d113dc";
+      sha256 = "0dmqq8wzvb4v7z6zwqv960h6xjl70pj59cfx0xdwmrxl28n5vw8m";
     };
     meta.homepage = "https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/";
   };
@@ -2275,12 +2275,12 @@ final: prev:
 
   cmp_yanky = buildVimPlugin {
     pname = "cmp_yanky";
-    version = "2024-11-17";
+    version = "2024-11-27";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "cmp_yanky";
-      rev = "042cbc4ffc62fcc75d9f0c8d9252fde770ac6bd0";
-      sha256 = "0ay1rhi7kkgcp1wgvwf36cg8xzz2wzm5yq7f9j7a1ds8hm5m6l3z";
+      rev = "fcd2e221f072ef917ed45583de0ee34d43685347";
+      sha256 = "0404bqwarm86f0d6ryagvyfzi0gf2z5ap4hn1wlhqzr5zv9x55nn";
     };
     meta.homepage = "https://github.com/chrisgrieser/cmp_yanky/";
   };
@@ -2407,36 +2407,36 @@ final: prev:
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "2024-11-26";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      rev = "d3a9e7fddb90cfb5a147e458d12727ddf8187168";
-      sha256 = "1v6i055scwc88qavybf5wqzknd9s2x4aqw08lmdi1pv2b97xpf4a";
+      rev = "7768080c8fd472ca96372a078ed6c28e867b3649";
+      sha256 = "1aif3893b7q27d7hwv8052zh8dsgvj5221i246fql851z1adl9d6";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
   };
 
   codeium-nvim = buildVimPlugin {
     pname = "codeium.nvim";
-    version = "2024-10-28";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "Exafunction";
       repo = "codeium.nvim";
-      rev = "dddaee0d1e9a1d0bcaea66f08a8103b3cdf26604";
-      sha256 = "17wrbhlm9zrskrxn78pin54qp9q8vdn6yahfdmr9763vzjf88cml";
+      rev = "27d2b1ce8c7ba14dbf6e4504bdea8e5548be5476";
+      sha256 = "15ng0dx1ly78svmpzk29ssqr4bg6jg4gzxj6gvfrwzpg3cd4fd4a";
     };
     meta.homepage = "https://github.com/Exafunction/codeium.nvim/";
   };
 
   codeium-vim = buildVimPlugin {
     pname = "codeium.vim";
-    version = "2024-11-19";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "Exafunction";
       repo = "codeium.vim";
-      rev = "605ab06780c9c42a63fc8afa8c0bd02b3b51b66f";
-      sha256 = "07rcn46grv4y7zlgl8dd5c5vrvryzyndknlngnp4jlpxl6kcwk8b";
+      rev = "d152e6cd3d814a44f36447bb0d21d51f6787fe9c";
+      sha256 = "0av68v2m5f16kqbxxrc468jb77jjnb4fk8m0bq65gk9f9z2hkbrp";
     };
     meta.homepage = "https://github.com/Exafunction/codeium.vim/";
   };
@@ -2515,12 +2515,12 @@ final: prev:
 
   command-t = buildVimPlugin {
     pname = "command-t";
-    version = "2024-11-09";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "command-t";
-      rev = "46f872325e5a6b084b286f7a6066986c62b7be99";
-      sha256 = "1x75i52py1vfc0ai6m804ibyg5m7zlp9v4bylhh8lqr8fc1gq8s8";
+      rev = "d2867d1b9a5f42905995c16baec574b6937accd3";
+      sha256 = "0h18hrj3bd7nbqw0il843jcc75brd3s2q2sayprv331x431px1df";
     };
     meta.homepage = "https://github.com/wincent/command-t/";
   };
@@ -2671,12 +2671,12 @@ final: prev:
 
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "2024-11-24";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "a203480a350b03092e473bf3001733d547160a73";
-      sha256 = "1bxaidj11lfd26w0ijczch7797q31vk42bw6j615msxhfmns2qhs";
+      rev = "d2fdcc3fa48cf2f2696f13730a5c74f97a7e9677";
+      sha256 = "011kvwasyygp1mw4nfl0fw5jzy3xaa276325lpc9vslw1h25i0sk";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/conform.nvim/";
@@ -2684,12 +2684,12 @@ final: prev:
 
   conjure = buildVimPlugin {
     pname = "conjure";
-    version = "2024-11-22";
+    version = "2024-12-01";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "conjure";
-      rev = "9197941c0ef05bd594bf8fbcc907129361ed456f";
-      sha256 = "15f11k4icshfdid1fka7qrhavr5jghygqmwl6c9iakv1kabf102j";
+      rev = "9b05693577a911d28cb26b577087917ad80104d2";
+      sha256 = "0xdcw92hzmk3g471xlg4dq45x6ij0jhx4l6s3i8q68a3k1gmg2vy";
     };
     meta.homepage = "https://github.com/Olical/conjure/";
   };
@@ -2780,12 +2780,12 @@ final: prev:
 
   coq-thirdparty = buildVimPlugin {
     pname = "coq.thirdparty";
-    version = "2024-11-20";
+    version = "2024-12-01";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq.thirdparty";
-      rev = "25b860f8631b1d659f5fecef8ee382dce1aa957e";
-      sha256 = "1gand9mq66ym7igjnmp92x9hvd55ziwyyn2x5ldxsb7nhpjpbw4d";
+      rev = "12ce499eddf83b524e0540f6fa2e49dcaec6060c";
+      sha256 = "0j6w6hpxnwbbrwj56k9y62j0fwhq2igf4blmf5bng8jymrqsa7q9";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
   };
@@ -2804,12 +2804,12 @@ final: prev:
 
   coq_nvim = buildVimPlugin {
     pname = "coq_nvim";
-    version = "2024-11-19";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "eb81b7ad6b1863d1eacfca380716980ee78b624a";
-      sha256 = "0gb5i3wwk3n845s4l4kh32g1ifbb2357wq020rzm2mb8fgwj8zgv";
+      rev = "e41271746c87ada02a7f99e967ad5780f0688ebe";
+      sha256 = "0mifd2nixggbd422ssandvfwcqdfg61rhh3qavmsfvnpij49qh5l";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
   };
@@ -2876,12 +2876,12 @@ final: prev:
 
   csharpls-extended-lsp-nvim = buildVimPlugin {
     pname = "csharpls-extended-lsp.nvim";
-    version = "2024-11-13";
+    version = "2024-11-27";
     src = fetchFromGitHub {
       owner = "Decodetalkers";
       repo = "csharpls-extended-lsp.nvim";
-      rev = "4cee463b73b72091b2165c4460a4b973a69478ef";
-      sha256 = "1hmh5sph2q3fzz4wn0s32dpiz6f8v01wjy5flpl8vxzfwia27pgk";
+      rev = "c788fed627827238de348195c3f318cd090e8e77";
+      sha256 = "018p5h9r66p3m8brx9bwlw1cbgz8nq3bmgpf2gxiybsfx7f6bfbp";
     };
     meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/";
   };
@@ -2972,12 +2972,12 @@ final: prev:
 
   darkearth-nvim = buildVimPlugin {
     pname = "darkearth-nvim";
-    version = "2024-10-23";
+    version = "2024-11-27";
     src = fetchFromGitHub {
       owner = "ptdewey";
       repo = "darkearth-nvim";
-      rev = "0d14f2cbd813c4732f01f996658ef67d25c70c51";
-      sha256 = "1cn2p0cqx8fr67ylk61aacq4mw06ypfrliw3v3gad18fpyxdfxq9";
+      rev = "a8382f396ebd9dfafcf0524dbaecd18e4168e6ae";
+      sha256 = "02q2hincblghm8abisinisnw7499dhm07bhxwxin5lhm3vjmrxm2";
     };
     meta.homepage = "https://github.com/ptdewey/darkearth-nvim/";
   };
@@ -3044,12 +3044,12 @@ final: prev:
 
   ddc-source-lsp = buildVimPlugin {
     pname = "ddc-source-lsp";
-    version = "2024-11-22";
+    version = "2024-11-27";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "ddc-source-lsp";
-      rev = "873230b0a6448f3c5e9cdba95567ddf6896848ed";
-      sha256 = "044z250prxr52lyc7sbhzkz2h2ydqlbfy3w1n5sslyjjg70148wm";
+      rev = "b928f9212f6ef536119e9aa155a1e266dcad7890";
+      sha256 = "1pjid5f9pdxhvlzbhjsgyskizwl1xskgq8x0l3lgb989hdji9d0j";
     };
     meta.homepage = "https://github.com/Shougo/ddc-source-lsp/";
   };
@@ -3080,24 +3080,24 @@ final: prev:
 
   ddc-vim = buildVimPlugin {
     pname = "ddc.vim";
-    version = "2024-11-25";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "ddc.vim";
-      rev = "ec2a8963b3710aaaebc07a513e79eaa9cbb52be6";
-      sha256 = "0kpdvnwx1gnrazgcbdswlacw82iqawggc70ab768rrdcd9krdjl6";
+      rev = "0743f16a9e8a34b5c421cf9dcbaef76281af73a4";
+      sha256 = "1sc1xc34518sp1165d8dv061xn6dxvf6qxmivi7dy4v67wbkxk8n";
     };
     meta.homepage = "https://github.com/Shougo/ddc.vim/";
   };
 
   debugprint-nvim = buildVimPlugin {
     pname = "debugprint.nvim";
-    version = "2024-11-25";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "andrewferrier";
       repo = "debugprint.nvim";
-      rev = "e4e289a12244f1f0fc13a640681dfba995671c42";
-      sha256 = "0gdqpy662v4zixm4isgf4bpnm5yzq727g9xr80jchnilnzsamfwq";
+      rev = "9d1d703edd8bd6550174dd21d9ecdddc98065758";
+      sha256 = "0lp4sim5ac5dmvr7rfvizhk6yczq0rp9f0jkhc9pslykvwjgd2qg";
     };
     meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/";
   };
@@ -3200,12 +3200,12 @@ final: prev:
 
   denops-vim = buildVimPlugin {
     pname = "denops.vim";
-    version = "2024-11-08";
+    version = "2024-11-28";
     src = fetchFromGitHub {
       owner = "vim-denops";
       repo = "denops.vim";
-      rev = "0c722617d72c56751e748070c12ec9d827e8fba3";
-      sha256 = "12j3ypjwcw232mvdchysmg0d65bgji6khfrh7sl27wv44wrw7vrl";
+      rev = "e3fd5039040e3061db3b951f4448c92cbbc3375e";
+      sha256 = "1s8vsylj3lcnbnp68qc6451qjpd6pw4hl1ac0m1f2mk4yx3aj5dy";
     };
     meta.homepage = "https://github.com/vim-denops/denops.vim/";
   };
@@ -3634,12 +3634,12 @@ final: prev:
 
   dropbar-nvim = buildVimPlugin {
     pname = "dropbar.nvim";
-    version = "2024-11-17";
+    version = "2024-11-29";
     src = fetchFromGitHub {
       owner = "Bekaboo";
       repo = "dropbar.nvim";
-      rev = "595c4e7eb5ba9e7d90bc64a50e46afe7e68015d2";
-      sha256 = "0f165wi73zbl234kjnq0y6c2r8l2v98naivkbknrn84gx9xragf7";
+      rev = "f3b1b03cb717186c3789e8e8a509fd18df4a2d10";
+      sha256 = "04yp8i89ivpia1gz1xz0byckg3yqijp7q6lly4qldr4yafq2i69v";
     };
     meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
   };
@@ -3876,12 +3876,12 @@ final: prev:
 
   falcon = buildVimPlugin {
     pname = "falcon";
-    version = "2023-03-12";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "634cef5919b14d0c68cec6fc7b094554e8ef9d7f";
-      sha256 = "1vrnvn7xgzdz1zn0wi516l96nkmi5jnwqzar5v9x0xdszjhqa553";
+      rev = "a7f5d325ebdad20c8b74ebe4f4fede8d451ac1dd";
+      sha256 = "1hljin08g22b820lxzqf7x9ygc817sj7iyp5pzp0a5b11n2mf6ca";
     };
     meta.homepage = "https://github.com/fenetikm/falcon/";
   };
@@ -4129,12 +4129,12 @@ final: prev:
 
   flutter-tools-nvim = buildVimPlugin {
     pname = "flutter-tools.nvim";
-    version = "2024-11-24";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "nvim-flutter";
       repo = "flutter-tools.nvim";
-      rev = "1787090d66482552505a6498e3d2f06fb4290f96";
-      sha256 = "1ggw82vqn51fpv3w1yhpgay358p82wzks68gy6wwavdalhyc27gg";
+      rev = "824faf57964c77ae8a80c9e642e5124d0e5c28e9";
+      sha256 = "1lmwr2y238n4a7brs30bjdvwfc5fgpk6y4hz0jcbkvphdhhnyaw5";
     };
     meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/";
   };
@@ -4214,12 +4214,12 @@ final: prev:
 
   friendly-snippets = buildVimPlugin {
     pname = "friendly-snippets";
-    version = "2024-10-07";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "rafamadriz";
       repo = "friendly-snippets";
-      rev = "de8fce94985873666bd9712ea3e49ee17aadb1ed";
-      sha256 = "0aq3k61x8qni60ad30n67s531jpfpq2m5a08zshc8rkllz4i3phz";
+      rev = "efff286dd74c22f731cdec26a70b46e5b203c619";
+      sha256 = "1vb5l8ipfjwsrqffbq8v2z5p1cpg035b3gk57692wd7835kr3i13";
     };
     meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
   };
@@ -4322,12 +4322,12 @@ final: prev:
 
   fzf-lua = buildNeovimPlugin {
     pname = "fzf-lua";
-    version = "2024-11-24";
+    version = "2024-11-29";
     src = fetchFromGitHub {
       owner = "ibhagwan";
       repo = "fzf-lua";
-      rev = "ce978474e406f4faacd2e66ec35d93b9e8ae069e";
-      sha256 = "078i9f5n2iphghjxrz42gra5hnfcwqhprp5wj9rwlsq4ws6ks4d6";
+      rev = "175ddbb9bbe28eef006516f38b126215de1fef57";
+      sha256 = "0s0r87hw8f6hcrpwfmavvsibaacvvvm356wfcyafgy3610cvx748";
     };
     meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
   };
@@ -4585,12 +4585,12 @@ final: prev:
 
   go-nvim = buildVimPlugin {
     pname = "go.nvim";
-    version = "2024-11-12";
+    version = "2024-12-01";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "go.nvim";
-      rev = "6368756601a358b1491ac2ff10d0e2939a76df5e";
-      sha256 = "0w9rfywqnw7r1qlymf9k9f8h893d23a5fs4nwh6rr3lb876686kl";
+      rev = "c6d5ca26377d01c4de1f7bff1cd62c8b43baa6bc";
+      sha256 = "1vx86g8lgyhg7wa4azl4hajzh42hvb1a1q9ndihwb1v4dy5bizxf";
     };
     meta.homepage = "https://github.com/ray-x/go.nvim/";
   };
@@ -4705,12 +4705,12 @@ final: prev:
 
   grug-far-nvim = buildVimPlugin {
     pname = "grug-far.nvim";
-    version = "2024-11-13";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "MagicDuck";
       repo = "grug-far.nvim";
-      rev = "9a2f78219390b47d67795ab09390d7f092e23976";
-      sha256 = "1xvabhlzmqnf1g0mkqdnvsx9ims803l0cw15y08hbh0x3c62nc38";
+      rev = "8d0ad05760ee13e4e17dca19b2a1254eb335199a";
+      sha256 = "15567cp4m509j5lhmcw8amb4l9ldp42r2z6j7nq1g92nkbyswjkx";
     };
     meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/";
   };
@@ -4777,12 +4777,12 @@ final: prev:
 
   gruvbox-material-nvim = buildVimPlugin {
     pname = "gruvbox-material.nvim";
-    version = "2024-09-26";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "f4z3r";
       repo = "gruvbox-material.nvim";
-      rev = "4f48b72656c2c3eaefd3764d5c8a19bff0c6ab19";
-      sha256 = "0bzmhv5m7rn1zpv7pn8mxwk4jmvjfpmbia077j2bzqciyxphl7nf";
+      rev = "b704a8f8d93e3cf3a86969f22d368d46b482d8ee";
+      sha256 = "145iaaj804878vqh7m1cw9v7cpqx6928bc0xyxc9yzbfbyjrzb2d";
     };
     meta.homepage = "https://github.com/f4z3r/gruvbox-material.nvim/";
   };
@@ -4813,12 +4813,12 @@ final: prev:
 
   guard-nvim = buildVimPlugin {
     pname = "guard.nvim";
-    version = "2024-11-21";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "guard.nvim";
-      rev = "e1034f65e15e132a90a2f409d8fcd12a5b8833f5";
-      sha256 = "13dqr4g4wlis2qypca1y4wmy635vxh2943j7yfx9y3996qp6wkxi";
+      rev = "48f2f75a2f2b56ab4e3c4dd95e4a424b5664c535";
+      sha256 = "079bz4swlrcr1vmnvasdq9qsiascfw2rmhi28xfyjmy566zdl8g3";
     };
     meta.homepage = "https://github.com/nvimdev/guard.nvim/";
   };
@@ -5221,14 +5221,14 @@ final: prev:
 
   idris2-nvim = buildVimPlugin {
     pname = "idris2-nvim";
-    version = "2023-09-05";
+    version = "2024-11-28";
     src = fetchFromGitHub {
-      owner = "ShinKage";
+      owner = "idris-community";
       repo = "idris2-nvim";
-      rev = "8bff02984a33264437e70fd9fff4359679d910da";
-      sha256 = "sha256-guEmds98XEBKuJVdB+rQB01G+RmnQaG+RTjM6smccAI=";
+      rev = "fd051fa8dde6541a6d345e020a05d2cc8f7a3f8d";
+      sha256 = "0pqrnwa3685p9lbfmy09c72nq6d3l54qbi4r9xpk43vl4b6q6j83";
     };
-    meta.homepage = "https://github.com/ShinKage/idris2-nvim/";
+    meta.homepage = "https://github.com/idris-community/idris2-nvim/";
   };
 
   idris2-vim = buildVimPlugin {
@@ -5257,12 +5257,12 @@ final: prev:
 
   img-clip-nvim = buildVimPlugin {
     pname = "img-clip.nvim";
-    version = "2024-08-26";
+    version = "2024-11-26";
     src = fetchFromGitHub {
       owner = "HakonHarnes";
       repo = "img-clip.nvim";
-      rev = "28a32d811d69042f4fa5c3d5fa35571df2bc1623";
-      sha256 = "0yi94bsr3yja619lrh9npsqrzvbk2207j3wnzdvidbbb1nix2dsd";
+      rev = "5ff183655ad98b5fc50c55c66540375bbd62438c";
+      sha256 = "15db3md2c822v8w3rkbfhw2jfmx31fak6b6mpvbsmjqsq89zi2s3";
     };
     meta.homepage = "https://github.com/HakonHarnes/img-clip.nvim/";
   };
@@ -5293,12 +5293,12 @@ final: prev:
 
   inc-rename-nvim = buildVimPlugin {
     pname = "inc-rename.nvim";
-    version = "2024-11-25";
+    version = "2024-11-28";
     src = fetchFromGitHub {
       owner = "smjonas";
       repo = "inc-rename.nvim";
-      rev = "b0d5b5bdd0a91eb47ff4a49b250bdc5a5eb45353";
-      sha256 = "12zypdb7ybd9akhz94wscg8yhkk5vi77xybhm2k36n51krpll7ah";
+      rev = "1871ca49ae6ee3e9ebee37955ba10c7b1425974f";
+      sha256 = "11hrqx1jyg8av0rrvk186djnbcq8ksykja5jphjr3xcgp0x0v1mm";
     };
     meta.homepage = "https://github.com/smjonas/inc-rename.nvim/";
   };
@@ -5800,12 +5800,12 @@ final: prev:
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2024-11-25";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "166b941f72ce399df8063c113514e4ecbfb316e6";
-      sha256 = "0xjjg7jg67xygvnyqwkc145rmhpd7g0iy3hv8xg9mq568am55ywd";
+      rev = "7a029736236d90f7a25d1f0fc18b987439604660";
+      sha256 = "0gp1nrdh8g64m1pqd31s9a1i19vxd62q1a9dwma8n7xa8h8g49av";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
   };
@@ -5848,24 +5848,24 @@ final: prev:
 
   leetcode-nvim = buildVimPlugin {
     pname = "leetcode.nvim";
-    version = "2024-11-14";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "kawre";
       repo = "leetcode.nvim";
-      rev = "9197cf8f09b8b50056388a6792e058af818468fe";
-      sha256 = "0s2zfxax52x8yzkjvr2yb6ipan98ycgwp965fcl3snrynvsjgcls";
+      rev = "98136532e61f6eb6a51b8130a8bbf73ccdee3d51";
+      sha256 = "0jirmzg5vy626xcv7xw7m9b5gg0xndlr3xzyry52r60pzyzly1ph";
     };
     meta.homepage = "https://github.com/kawre/leetcode.nvim/";
   };
 
   legendary-nvim = buildVimPlugin {
     pname = "legendary.nvim";
-    version = "2024-11-22";
+    version = "2024-11-29";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "legendary.nvim";
-      rev = "12b04a4c201b10ed71bb33356856b103bbcc7195";
-      sha256 = "0z7qa2pvvq6n8rzx9pga2hpxas927yyjzaq4xd6gafbpc4574rl6";
+      rev = "4c5d95c4a191c104989a66278e222bdc0ca93313";
+      sha256 = "1sf2ardkb8z531kk1fqyf4wmbzxvhyz6ymfphg6y8l128nc9mrk1";
     };
     meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
   };
@@ -5896,12 +5896,12 @@ final: prev:
 
   lexima-vim = buildVimPlugin {
     pname = "lexima.vim";
-    version = "2023-12-20";
+    version = "2024-11-30";
     src = fetchFromGitHub {
       owner = "cohama";
       repo = "lexima.vim";
-      rev = "5513d686801993b40c55baa65602f79cd3cf3c77";
-      sha256 = "08gmpxxfjsjqvhcicr3rwm97xddsn93afxnqipyz4vjclzmpxgwg";
+      rev = "b9eb29e063fe9315f68f9abbbe4bb7a6c7205153";
+      sha256 = "1c14pajzd9n11yd954v2rsm1q10q6pz7zjhvz9l92v95kc1ybsnm";
     };
     meta.homepage = "https://github.com/cohama/lexima.vim/";
   };
@@ -5932,12 +5932,12 @@ final: prev:
 
   lh-vim-lib = buildVimPlugin {
     pname = "lh-vim-lib";
-    version = "2024-10-14";
+    version = "2024-11-26";
     src = fetchFromGitHub {
       owner = "LucHermitte";
       repo = "lh-vim-lib";
-      rev = "d51bc713d7158b5837f903b3e50c9f44ae936bcd";
-      sha256 = "1blrrr76r21mg6bbyjajqyqy42qa89dyvqyg42hacfy0v39pi3gz";
+      rev = "b8d79fe7733c9ed5205e68aedfd63cd774c69a07";
+      sha256 = "1idcdv3qzqp6c1nd8q87bjs9768d26xdar3909iwpa4bi97qvx1c";
     };
     meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/";
   };
@@ -6267,12 +6267,12 @@ final: prev:
 
   lspecho-nvim = buildVimPlugin {
     pname = "lspecho.nvim";
-    version = "2024-10-06";
+    version = "2024-11-30";
     src = fetchFromGitHub {
       owner = "deathbeam";
       repo = "lspecho.nvim";
-      rev = "6b00e2ed29a1f7b254a07d4b8a918ebf855026e5";
-      sha256 = "0z45b0mk7hd5h9d79318nyhhyhprwr929rpqfbblk5x0j4x2glxf";
+      rev = "8817eef7ebeb518341c621091c21946f547034c8";
+      sha256 = "02g3b7ymgzrv95g4kxc58kydldikynw92ks519rznciw1ddl0s2d";
     };
     meta.homepage = "https://github.com/deathbeam/lspecho.nvim/";
   };
@@ -6339,12 +6339,12 @@ final: prev:
 
   luasnip = buildNeovimPlugin {
     pname = "luasnip";
-    version = "2024-11-18";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "l3mon4d3";
       repo = "luasnip";
-      rev = "0f7bbce41ea152a94d12aea286f2ce98e63c0f58";
-      sha256 = "0fn6ymm4c006a7jp1b84xcvlii33wpg4pjx10b1fm7m1dkm7fiqw";
+      rev = "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d";
+      sha256 = "0rk3y5xa3y40hs2x4wgwka853z09c4xhfmiapxhmbk473ym13ywi";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@@ -6497,12 +6497,12 @@ final: prev:
 
   mason-lspconfig-nvim = buildVimPlugin {
     pname = "mason-lspconfig.nvim";
-    version = "2024-11-18";
+    version = "2024-11-28";
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason-lspconfig.nvim";
-      rev = "43894adcf10bb1190c2184bd7c1750e8ea2b3dce";
-      sha256 = "0ggqqrx3q0xd301dr62xkp089amya0yl8mp9d3k0752ryxbbd9zw";
+      rev = "8e46de9241d3997927af12196bd8faa0ed08c29a";
+      sha256 = "0161gf3lmc1pp8dw9m20c9f4kc382yimk5143n6c2wbqnhlm6jq3";
     };
     meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
   };
@@ -6605,12 +6605,12 @@ final: prev:
 
   melange-nvim = buildVimPlugin {
     pname = "melange-nvim";
-    version = "2024-11-05";
+    version = "2024-11-29";
     src = fetchFromGitHub {
       owner = "savq";
       repo = "melange-nvim";
-      rev = "4963ebe8336a78eeedbb18b4fbd546dc27bae510";
-      sha256 = "1fidd90mfjx9ijs9m6fx70r5bfkdm5m46drhm0as1daf1j9n4c54";
+      rev = "9252c78c7bffd3126b0c9e47e51e0b5211acffb1";
+      sha256 = "1lzp2kx3d55i3ndlv4islqprs4yh7f4i7hrr5z5pikk8wkj5pv95";
     };
     meta.homepage = "https://github.com/savq/melange-nvim/";
   };
@@ -6689,12 +6689,12 @@ final: prev:
 
   mini-animate = buildVimPlugin {
     pname = "mini.animate";
-    version = "2024-09-06";
+    version = "2024-12-01";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.animate";
-      rev = "d33ddf0eefee6338bbd95805c4595c1b34e6bfe2";
-      sha256 = "1fn5vsz5m3v63gmg1i03zi9qbmlbbjgm24k3j9lmwlin75cnxizh";
+      rev = "d14190ac3040116540889e2ebc25f488b195799e";
+      sha256 = "15raqvmgp4srh7asll1y3finbm76l1sfmf52h69jj2y2w4kfdqv5";
     };
     meta.homepage = "https://github.com/echasnovski/mini.animate/";
   };
@@ -6821,12 +6821,12 @@ final: prev:
 
   mini-diff = buildVimPlugin {
     pname = "mini.diff";
-    version = "2024-10-29";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.diff";
-      rev = "65c59f9967fec965d8759a88c1baa43147699035";
-      sha256 = "0bcyxg0yzja19cci5pr4fv1w1zdcxxn6asgqmnrnjw7vy1jgwfry";
+      rev = "5947342c95a9c2e24c659b54bb8ef083da4495ad";
+      sha256 = "0vib7s42zdl4irn9kaznl488l3cvv89vydvq51i2y0i98xpngkii";
     };
     meta.homepage = "https://github.com/echasnovski/mini.diff/";
   };
@@ -6857,12 +6857,12 @@ final: prev:
 
   mini-files = buildVimPlugin {
     pname = "mini.files";
-    version = "2024-10-15";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.files";
-      rev = "6abe854f1410fc6aec69897a78b1db994c32d9c6";
-      sha256 = "1drznn7iscyifkqy153r5fqg0a5q7cridbpkd743575vph2hr9pd";
+      rev = "84efb81e5207ae8c41f54abdafb79c6212fc0971";
+      sha256 = "0b73v72hpa74ziw2b62cf4kd9g5dwj8v4bbpjwchxj5b7garjkrd";
     };
     meta.homepage = "https://github.com/echasnovski/mini.files/";
   };
@@ -6893,12 +6893,12 @@ final: prev:
 
   mini-hipatterns = buildVimPlugin {
     pname = "mini.hipatterns";
-    version = "2024-09-27";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.hipatterns";
-      rev = "797cbdc893cdcc2f0fbc05a23b4dae238a1fb0ae";
-      sha256 = "0j4a7c03km0q7wlh0g9x0652bfll0valh2fbvyc32n2k6v2f978v";
+      rev = "f34975103a38b3f608219a1324cdfc58ea660b8b";
+      sha256 = "08mhgd7p69fzy9l99adns1gwb407wdq18di8nm6iy1nw6wrhx7yc";
     };
     meta.homepage = "https://github.com/echasnovski/mini.hipatterns/";
   };
@@ -7013,12 +7013,12 @@ final: prev:
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2024-11-26";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "c8922aef8207137e66c80acdb9523668599ba62a";
-      sha256 = "0syc3gwnspbncx7lbg0zd5m9wdpd4cwsghzzlp5dqzjlzk0c6s6m";
+      rev = "690a3b4c78c4956f7ecf770124b522d32084b872";
+      sha256 = "0yn6yssak386cqhxa29lyymi87fzavaw2wdaf9p4ni3zrcxql2di";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
   };
@@ -7601,12 +7601,12 @@ final: prev:
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "2024-11-26";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "201f49346bfbf9abe9bc9bc41be0623045deb1c7";
-      sha256 = "0j4f6wkmrvwkvlmb6djz2nn6w207gynvjlv2f6x20xi27vvjmkv4";
+      rev = "c7d4266401689ca4be0a0029cad3161174683544";
+      sha256 = "1ixyk2brq7gyd8zgd17ix5rm5vhnvpybbxjzp309q29yjhnhasw9";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
   };
@@ -7673,12 +7673,12 @@ final: prev:
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "2024-11-24";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "26c5550016b20e4f47b376192f12a54be8897aaa";
-      sha256 = "07ssj7vwbnsvgj0lgb9fgfmg5wb4mzn2zsnbbg24qmmvkhazrkk0";
+      rev = "dc36aa4b1172189a2e80cbdbd4be2e884e60c09e";
+      sha256 = "19hmnr59sa125njvjmnkwsbk091sk06v21ibhyv8hd2birmm04cm";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
   };
@@ -7761,8 +7761,8 @@ final: prev:
     src = fetchFromGitHub {
       owner = "karb94";
       repo = "neoscroll.nvim";
-      rev = "e58ecc61e38f348dcc8f2af037fe7031f8a6ef7c";
-      sha256 = "08bq6adrafkkczbd314rbi0yzk66fpqk3z0g2j52sq7fff2v8fgm";
+      rev = "81c47f9d111c00d13111b65bfd13cc81b7b347a1";
+      sha256 = "120jxrn3lsm5y13zx6kjnxiaf0jx0wqinpn3k2ii1ryaf6055yhv";
     };
     meta.homepage = "https://github.com/karb94/neoscroll.nvim/";
   };
@@ -7854,12 +7854,12 @@ final: prev:
 
   neotest-dotnet = buildVimPlugin {
     pname = "neotest-dotnet";
-    version = "2024-07-24";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "Issafalcon";
       repo = "neotest-dotnet";
-      rev = "03509791912eaeac9f993f7cf49e170eca06a8bc";
-      sha256 = "0kz7k26047mzyzsldm8ai1i4wyr7wx0rwpfqj3zh3nncns40b4nl";
+      rev = "14087e68ff208b4fe7ff577f317ec5013148ea85";
+      sha256 = "00bisybd53bfqqh0lifw5v6nciwgkjlhd6l8nyrwpk5adhd30sw7";
     };
     meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/";
   };
@@ -7903,12 +7903,12 @@ final: prev:
 
   neotest-golang = buildVimPlugin {
     pname = "neotest-golang";
-    version = "2024-11-21";
+    version = "2024-11-30";
     src = fetchFromGitHub {
       owner = "fredrikaverpil";
       repo = "neotest-golang";
-      rev = "cdb0eb0edfedcdf145972fdbe19fb95d17d987c2";
-      sha256 = "1pc4blxk6zikkcxjjpnvqf4vkrfqdpa63sxjdmh13k1kass8qdr9";
+      rev = "51a165e0b9d6c757d9da2b467b3c05e61f54a8ee";
+      sha256 = "13r7zw5pzzj0750nam831bpwsds66a4isfz0k4cs0h4g4rragkb2";
     };
     meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/";
   };
@@ -7940,12 +7940,12 @@ final: prev:
 
   neotest-haskell = buildVimPlugin {
     pname = "neotest-haskell";
-    version = "2024-11-24";
+    version = "2024-12-01";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "e93f3fa0b9655c523cbbba99278e0ac41027686d";
-      sha256 = "0ami5zvk1a1pzs6amnpqfpf5j8ygpl3kajkv702gixap3j85isrk";
+      rev = "54f633c2964e42e3e48132f82f6967e88f8c8101";
+      sha256 = "1bgwvbvsr7l4m9749c8qc8g1s202pz6sq6fa7fabnkz26j2lsgzn";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
   };
@@ -8048,12 +8048,12 @@ final: prev:
 
   neotest-rspec = buildVimPlugin {
     pname = "neotest-rspec";
-    version = "2024-08-05";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "neotest-rspec";
-      rev = "53fc108a06ae43d7f873d42ee5189c2301e33623";
-      sha256 = "0z8vh5miw3ysn4y45i4ckyc7s1k104l4m4yrpf7rx2wbd5gmkshw";
+      rev = "64287b022b68038ec2ffeecb9decd33fa36a0878";
+      sha256 = "038a7i544jb70lfq5ih5ifziq6qzqq1pfd1wwcn2g23s9gvbj4mc";
     };
     meta.homepage = "https://github.com/olimorris/neotest-rspec/";
   };
@@ -8348,12 +8348,12 @@ final: prev:
 
   nlsp-settings-nvim = buildVimPlugin {
     pname = "nlsp-settings.nvim";
-    version = "2024-11-25";
+    version = "2024-11-27";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "29f82b7270733214bae21edac41e210322a98ba8";
-      sha256 = "13y5dbb6rvscy4adgjhxx8rf8miza95zyixcs9s6dnvsblyqpy00";
+      rev = "d501e8933fcdbaef340f590c02d01b61058f247f";
+      sha256 = "0y6652bksbjhs0cy93pcl7k43dfjl0mnayg7z4spa55ndq8xf1n7";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
   };
@@ -8384,12 +8384,12 @@ final: prev:
 
   no-neck-pain-nvim = buildVimPlugin {
     pname = "no-neck-pain.nvim";
-    version = "2024-10-04";
+    version = "2024-11-30";
     src = fetchFromGitHub {
       owner = "shortcuts";
       repo = "no-neck-pain.nvim";
-      rev = "c7efdbd0b739646c58d22fa44f6fffa2973f303e";
-      sha256 = "0av6xbykh6s7viwi70snyng34kvi4iiafzmkdq5g05lyr9d7w1na";
+      rev = "2a786bf7130cce20449885fb799f3c7f4ce93595";
+      sha256 = "1iinas3bfwyajasw10kscfm14nm2ah5lk6nbcrc7dhx8p0k5w29g";
     };
     meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/";
   };
@@ -8412,20 +8412,20 @@ final: prev:
     src = fetchFromGitHub {
       owner = "folke";
       repo = "noice.nvim";
-      rev = "16ddc5650f14b3025b7ccabaf708e615042b8a84";
-      sha256 = "036sd4drjz6a01wcjlai24zn6shvy8sxbkdbrd8w9bk6pr91pjjs";
+      rev = "c6f6fb178ebe9b4fd90383de743c3399f8c3a37c";
+      sha256 = "0s0ggyg68rr4hdprqk4drlwvgkh1g97cf2pmc8qs04ss728wq4ni";
     };
     meta.homepage = "https://github.com/folke/noice.nvim/";
   };
 
   none-ls-nvim = buildVimPlugin {
     pname = "none-ls.nvim";
-    version = "2024-11-19";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "nvimtools";
       repo = "none-ls.nvim";
-      rev = "1f2bf17eddfdd45aed254b6922c6c68b933dba9e";
-      sha256 = "0c9p921v7pm2b8543kliwrds4d8cj2yda5jacs3l3yhji3898b09";
+      rev = "58866c670d68ef80397c317a3a1ee5f53ca646fd";
+      sha256 = "11jcq0c2azqrdkfqmmh9p2six8bjgy5izj5plmjw770a9j9avlf2";
     };
     meta.homepage = "https://github.com/nvimtools/none-ls.nvim/";
   };
@@ -8660,12 +8660,12 @@ final: prev:
 
   nvim-cmp = buildNeovimPlugin {
     pname = "nvim-cmp";
-    version = "2024-11-25";
+    version = "2024-11-30";
     src = fetchFromGitHub {
       owner = "hrsh7th";
       repo = "nvim-cmp";
-      rev = "ed31156aa2cc14e3bc066c59357cc91536a2bc01";
-      sha256 = "08r7yry0xa2az0j7c6ipydnppyd36wzpwl1kbzwcwhh5ysngb5j6";
+      rev = "ca4d3330d386e76967e53b85953c170658255ecb";
+      sha256 = "0x810i5yzwz9cy5g95qqsr4c1dc51chvw54qp17sq28npnadyjgv";
     };
     meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
   };
@@ -8768,12 +8768,12 @@ final: prev:
 
   nvim-dap = buildVimPlugin {
     pname = "nvim-dap";
-    version = "2024-11-18";
+    version = "2024-11-29";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "cc92b054720a96170eca6bd9bdedd43d2b0a7a8a";
-      sha256 = "12c6c9m2p3lbg7b49mzid91yk64p3jnvdj8lmydk4wy5vlcm8k8h";
+      rev = "0a0daa796a5919a51e5e5019ffa91219c94c4fef";
+      sha256 = "155m2xvmrpaiv9sqvszspwnwn4fy0kh68cfjw7hhc07jscqj1nva";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
   };
@@ -8804,12 +8804,12 @@ final: prev:
 
   nvim-dap-python = buildVimPlugin {
     pname = "nvim-dap-python";
-    version = "2024-10-24";
+    version = "2024-11-29";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap-python";
-      rev = "3e3dd98d4d83715c9e0e429b4a5da7bd706e6ceb";
-      sha256 = "176aawvphqp2f65msf1lyvacw12jzv39zs7wflaaww0inh9cwkha";
+      rev = "34282820bb713b9a5fdb120ae8dd85c2b3f49b51";
+      sha256 = "162kr9nkc5cshmsn3lsksc9qj63g6ln9cwhvm2v7mzvjcmj1wga3";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/";
   };
@@ -8936,12 +8936,12 @@ final: prev:
 
   nvim-genghis = buildVimPlugin {
     pname = "nvim-genghis";
-    version = "2024-11-26";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-genghis";
-      rev = "940fda51657e78d87e5e2c0c5cbf6a9110d79537";
-      sha256 = "020jis356h2indzinwhby4jba62jfa1k1ygfd2w17fq2zs0q3rzb";
+      rev = "fecc25ea6b2d7f77aae06a2bf0f366892a79a9ba";
+      sha256 = "08gin4bjy0sl225jldfwza4am4vddhxl76r2prb31j7x1bc703wv";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/";
   };
@@ -9151,12 +9151,12 @@ final: prev:
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2024-11-26";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "16008a64f6ab9309641f30b8a7c9a432f1649b9a";
-      sha256 = "0qviz4n73b3zd59fcvqx07z2vvdh3l0qz9xr1msfb6m150342qqv";
+      rev = "1aa9f36b6d542dafc0b4a38c48969d036003b00a";
+      sha256 = "1nhvsi0y4fb514ji3zw5d04qwidalajsv51j7748fsr023nnvfzs";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -9403,24 +9403,24 @@ final: prev:
 
   nvim-rip-substitute = buildVimPlugin {
     pname = "nvim-rip-substitute";
-    version = "2024-11-26";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-rip-substitute";
-      rev = "e6c3f6d0a367cbe41a426891fc90aef1168dee79";
-      sha256 = "03gjkxh0vc1p7wjay3r1z8cli4xm7bm5whdclidvx4bkqwqms2rk";
+      rev = "7e9b84c2fc01b20d581d0369bf324a2346aab5a9";
+      sha256 = "1yd0ny5pbzmkfy4xd04w7zxcalqams7fk7va8nx4ir6kir06m197";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/";
   };
 
   nvim-scissors = buildVimPlugin {
     pname = "nvim-scissors";
-    version = "2024-11-26";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-scissors";
-      rev = "a21a34712da6e88d716d2034e1409fc8b47bb96f";
-      sha256 = "0338hjfh4d8r9gh5mkaaa29d7n1xfhwldyas3m7x8p90da0lqdd5";
+      rev = "0fa8282b0d34f4c6d0273f6c59949046c30206c3";
+      sha256 = "0vs2p7qxr9hgvamp0vkixpk4dpn3zmrp2mcpnk7x5m3za3gd59fg";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/";
   };
@@ -9523,24 +9523,24 @@ final: prev:
 
   nvim-spider = buildVimPlugin {
     pname = "nvim-spider";
-    version = "2024-11-26";
+    version = "2024-11-27";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-spider";
-      rev = "fc7857bbda37b5f76c47baf4d609e393ee742eeb";
-      sha256 = "0j9w5a5620ln955kwfjf8cpz9jvkvzsnsfidzyvakg3a2nx00dq4";
+      rev = "77a74131775f7d427f148c65a6119966a0b3da25";
+      sha256 = "1naz9h6620jh6grx71cd6sbd1dabgi611wq6gjjp6vd6ia52vsmg";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
   };
 
   nvim-surround = buildVimPlugin {
     pname = "nvim-surround";
-    version = "2024-10-28";
+    version = "2024-11-28";
     src = fetchFromGitHub {
       owner = "kylechui";
       repo = "nvim-surround";
-      rev = "dca2e998ff26681ee422b92c6ed39b3d2908d8a9";
-      sha256 = "192nfbfzjfcjczkj97pxg04jx1g37pv2n86iid1djxy8rnh2yp2x";
+      rev = "9f0cb495f25bff32c936062d85046fbda0c43517";
+      sha256 = "1c78320liqhza52gq2xylykd9m6rl50cn44flldg43a4l7rrabxh";
     };
     meta.homepage = "https://github.com/kylechui/nvim-surround/";
   };
@@ -9595,24 +9595,24 @@ final: prev:
 
   nvim-treesitter = buildVimPlugin {
     pname = "nvim-treesitter";
-    version = "2024-11-26";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "28591731d84c2fc18ddda60e1d53da24c31c4987";
-      sha256 = "0nxj4jz00p1bch9ji4acksiilc2kglsvixwf57wgiq8nlkwnsp6l";
+      rev = "b31188671d8a060022dbbeb6905019e69e310108";
+      sha256 = "1i75pr8hqzkms9ax1kasdw1i51ricdaws6b2751j576f5l4fiizw";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
 
   nvim-treesitter-context = buildVimPlugin {
     pname = "nvim-treesitter-context";
-    version = "2024-11-25";
+    version = "2024-12-01";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-context";
-      rev = "6b081ea63a3711243d11540ce28ccdb6f35ecd33";
-      sha256 = "1ymdx89d7nivjlqzy4ah8jdjk9iffqcl0201l8k0yzxbdkzc4g2b";
+      rev = "920999bf53daa63ddf12efdeb5137a7cea1cc201";
+      sha256 = "01k11jj1w3bfh1wxwxf7igqm11bawwz6fx1h4qbh7bn39cbzgk61";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
   };
@@ -9703,12 +9703,12 @@ final: prev:
 
   nvim-ts-autotag = buildVimPlugin {
     pname = "nvim-ts-autotag";
-    version = "2024-08-27";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "windwp";
       repo = "nvim-ts-autotag";
-      rev = "e239a560f338be31337e7abc3ee42515daf23f5e";
-      sha256 = "1qk3pij5m9hxksyyj9bk8a7x5vn3rc6wwy6idc91c2pyyhmd8k20";
+      rev = "1cca23c9da708047922d3895a71032bc0449c52d";
+      sha256 = "0fp8q08giyf4vi25hylsjmawcx56l5xhgmj3rli3ca9k28a56qxz";
     };
     meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";
   };
@@ -9727,12 +9727,12 @@ final: prev:
 
   nvim-ufo = buildVimPlugin {
     pname = "nvim-ufo";
-    version = "2024-11-22";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "kevinhwang91";
       repo = "nvim-ufo";
-      rev = "e9886b2b3381b49cadb11ef62a8c51f662927232";
-      sha256 = "11svvrgal2mv8hidjz3sa1alndq3jq2qf32031f586qlm8j0fmiq";
+      rev = "95cbe2e99901135704aabdc8732d722cf68b12c9";
+      sha256 = "01yf6675gd0chlpzwpcm7j1693hb57jwjs92cw6nkmhm33p7zpsf";
     };
     meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/";
   };
@@ -9751,24 +9751,24 @@ final: prev:
 
   nvim-various-textobjs = buildVimPlugin {
     pname = "nvim-various-textobjs";
-    version = "2024-11-26";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-various-textobjs";
-      rev = "b13c4c56419d6efb85ef14a2c1f380196e743a36";
-      sha256 = "0n0vhg8hs9hwysq5sv6jlljjvkpw8cqy6s8y47r2gf8qv1iapqxz";
+      rev = "da0935d8556c1e795c284b9f286a442b9f7556f6";
+      sha256 = "116vcb8v04biy5kknajxmz5dkbdhl7k3bm0r57bxnxr6fkbxbmlg";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/";
   };
 
   nvim-web-devicons = buildVimPlugin {
     pname = "nvim-web-devicons";
-    version = "2024-11-25";
+    version = "2024-11-30";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-web-devicons";
-      rev = "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509";
-      sha256 = "1h6bzq94r531brz7xmd1chnbxrql6lam4vip0n9apc5a7pf3jyz5";
+      rev = "203da76ecfbb4b192cf830665b03eb651b635c94";
+      sha256 = "14ljgk5b8p9kmakrvdq86crvlm2d4hhlp9nkwqiss8skibksn7sa";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
   };
@@ -9859,24 +9859,24 @@ final: prev:
 
   nvzone-minty = buildVimPlugin {
     pname = "nvzone-minty";
-    version = "2024-11-19";
+    version = "2024-11-30";
     src = fetchFromGitHub {
       owner = "nvzone";
       repo = "minty";
-      rev = "b454ca0229f8e22a631fd3c014ec99973fb8cad4";
-      sha256 = "0pj75b8n40pnphz437hl1nc0jkw2bnzk36fa2v3hwlskvbfh4my2";
+      rev = "6dce9f097667862537823d515a0250ce58faab05";
+      sha256 = "0wkp6wjc630mh3i0xd41x5shdkyzwh7n53y7rl304smmz0bk38jk";
     };
     meta.homepage = "https://github.com/nvzone/minty/";
   };
 
   nvzone-volt = buildVimPlugin {
     pname = "nvzone-volt";
-    version = "2024-11-21";
+    version = "2024-12-01";
     src = fetchFromGitHub {
       owner = "nvzone";
       repo = "volt";
-      rev = "8d35e03c70490190149a77c59155618ef4370721";
-      sha256 = "17pkafikr10px5a8yalg3p50npb17ia6c17b5rqb93ggyww2kp0y";
+      rev = "e01090ff27b34288574c24a09cb166e47c4a0c3d";
+      sha256 = "0xwqzlmlwf1qq7m8by0hy88njh4xpvz7fxxy7znqd014jkvz0v9d";
     };
     meta.homepage = "https://github.com/nvzone/volt/";
   };
@@ -9919,12 +9919,12 @@ final: prev:
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "2024-11-17";
+    version = "2024-12-01";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "51f18085561805732e0306cf7300f773ec86872c";
-      sha256 = "1w1z43m1r6imcmbxgwd40895bkkaqs19826f2higj8plp59x6bx3";
+      rev = "14d412f517a3cbea4cd4299207ee067fde542062";
+      sha256 = "1likkjkqgyb36ly44mpzdir1a4kk79c4s43v2i56kvl1axc5jxf9";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
   };
@@ -9968,12 +9968,12 @@ final: prev:
 
   omnisharp-extended-lsp-nvim = buildVimPlugin {
     pname = "omnisharp-extended-lsp.nvim";
-    version = "2024-06-29";
+    version = "2024-11-28";
     src = fetchFromGitHub {
       owner = "Hoffs";
       repo = "omnisharp-extended-lsp.nvim";
-      rev = "aad7bf06b4ca0de816b919d475a75b30f5f62b61";
-      sha256 = "0bjsraykq6xjzydrki7fwm3yxfvkqd46qqc0vv3yvy9hdxll4miz";
+      rev = "4916fa12e5b28d21a1f031f0bdd10aa15a75d85d";
+      sha256 = "0w2zbiz2sxblnmhnqp6f6n7d9g9cm40ksk66anl3s7qnqffvc3cl";
     };
     meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/";
   };
@@ -10100,12 +10100,12 @@ final: prev:
 
   openingh-nvim = buildVimPlugin {
     pname = "openingh.nvim";
-    version = "2024-03-10";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "Almo7aya";
       repo = "openingh.nvim";
-      rev = "613c18967d42202f3e2a9ac788caf62a402e7c1a";
-      sha256 = "1s1rnk1slw6bc9dvk70r9hgsva598n19smpyk89ix3h5xw81sr64";
+      rev = "9131016c1167e23522a8e874b62217829fd327b8";
+      sha256 = "1m5l4cdg4nq2cqgjspkjmj47y19l7d8j3gbl62i79cr0hf1gxz94";
     };
     meta.homepage = "https://github.com/Almo7aya/openingh.nvim/";
   };
@@ -10136,12 +10136,12 @@ final: prev:
 
   other-nvim = buildVimPlugin {
     pname = "other.nvim";
-    version = "2024-10-19";
+    version = "2024-11-30";
     src = fetchFromGitHub {
       owner = "rgroli";
       repo = "other.nvim";
-      rev = "64a2f8756468a4d09534a55b98d9d6bf86fa105e";
-      sha256 = "0p4asblgwiagxmz3vlk6xblkfqfdnyirplz3haq6xwwy8a0z574m";
+      rev = "933aa489ad02f8f973269a565bfea16cc784cbbf";
+      sha256 = "0pp3xcy0aaijk4fjzv67q9yc2phxq764yxprb9s16f35fim7awwq";
     };
     meta.homepage = "https://github.com/rgroli/other.nvim/";
   };
@@ -10281,12 +10281,12 @@ final: prev:
 
   pear-tree = buildVimPlugin {
     pname = "pear-tree";
-    version = "2024-11-02";
+    version = "2024-11-29";
     src = fetchFromGitHub {
       owner = "tmsvg";
       repo = "pear-tree";
-      rev = "52d65cf625eb6e6487a3f813ec9636868efcae9c";
-      sha256 = "03vc8xf21s3lh9xq238hl3dwr54sc22x72k7s57582s1xj0k2l0c";
+      rev = "2d2fb6d5893d26be2ef280852f80494ff166529a";
+      sha256 = "1vjcsc2n9c2wcgp49y4mp9pvcmz6rlw7vz23k5dds45qaw79fa20";
     };
     meta.homepage = "https://github.com/tmsvg/pear-tree/";
   };
@@ -10894,12 +10894,12 @@ final: prev:
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "2024-11-25";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "6096cf3608b576a38fd1396227dbc0473091714d";
-      sha256 = "1ssfi9lvvfkx7dqmmcz5995kjwy7i71abzi38x0qpp2l3hwxdz3g";
+      rev = "61850bf7df4af8398e97559a35b62378ba8435b1";
+      sha256 = "0d38m572yr8mx42xj9lrh543054rka0gyv59254bg7828lzawfxp";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
   };
@@ -10918,12 +10918,13 @@ final: prev:
 
   resession-nvim = buildVimPlugin {
     pname = "resession.nvim";
-    version = "2024-08-16";
+    version = "2024-11-28";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "resession.nvim";
-      rev = "c4d92a57b3936a2d6e1c087dbd6b670da2b1b082";
-      sha256 = "sha256-S5mN/1yzUjV76YTYB41aaTL1xuGEfTN2LpEsc28RhDM=";
+      rev = "d3b6b369efe7aade98b20aab0ab7bab4477d02a9";
+      sha256 = "01hd9gsccrja2jc193f8nxm3ynq884pkwjy46f2vccybpw8ihlpd";
+      fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/resession.nvim/";
   };
@@ -11159,12 +11160,12 @@ final: prev:
 
   scrollbar-nvim = buildVimPlugin {
     pname = "scrollbar.nvim";
-    version = "2024-08-18";
+    version = "2024-11-28";
     src = fetchFromGitHub {
       owner = "Xuyuanp";
       repo = "scrollbar.nvim";
-      rev = "d7e6966c258cb30c29f50012543d687aec707b9e";
-      sha256 = "1va53c2l86qwy1cmv77hc8iki4734f760lm4m36hj71m0bdlwkwx";
+      rev = "a399fc9048293f635992b1c6755d7eba7ce2b341";
+      sha256 = "1ifg1bb8fwi2k3n11aark9gvpcwpbdl2kdh276pjiys6rycadq32";
     };
     meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/";
   };
@@ -11340,12 +11341,12 @@ final: prev:
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2024-11-22";
+    version = "2024-11-29";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "d8b0e772a0244169534b1fd57c1660c9bf323d26";
-      sha256 = "0qrfgml81pfsnk9hn835qdacscqy8m9xbaxikb8ikqwk87s52lqv";
+      rev = "07f9614f5b9405392d3b22fca9f51a9857f2d9b3";
+      sha256 = "0rn4vhvcm0cqwb8srhwkzyrlw9vaiji7rb8084z1z4wxmm41rlsy";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
   };
@@ -11388,24 +11389,24 @@ final: prev:
 
   snacks-nvim = buildVimPlugin {
     pname = "snacks.nvim";
-    version = "2024-12-01";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "snacks.nvim";
-      rev = "5f768f8584e5247e3283201bfa068fa394ed0c4b";
-      sha256 = "05pf9ljs8xwnbqd6zdgfgv386pjmj8k4y0mjdb815fkik428sm3w";
+      rev = "60bd4e108cf7b2df0c0f578815b2b985d2cc2871";
+      sha256 = "1227jsgfakszwd1xf4v2x9mj3rdiycvsh7nqc0jggvamnki7z420";
     };
     meta.homepage = "https://github.com/folke/snacks.nvim/";
   };
 
   snap = buildVimPlugin {
     pname = "snap";
-    version = "2024-11-18";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "camspiers";
       repo = "snap";
-      rev = "6a79d67451aaa70f8479fb5d100c3d888d7c5d53";
-      sha256 = "0xlzdgq5prm435w4hjbqzbh132hky3gzcbr53ggi80c31k0i6dxj";
+      rev = "3e7346b64adff100ff65c63df153fdd93f0f8fa7";
+      sha256 = "06sp47yqabf33i5fazpsm6hlja6jgi418fx0piqcyzzdnhhgcd3n";
     };
     meta.homepage = "https://github.com/camspiers/snap/";
   };
@@ -11496,12 +11497,12 @@ final: prev:
 
   spaceman-nvim = buildVimPlugin {
     pname = "spaceman.nvim";
-    version = "2024-11-03";
+    version = "2024-11-30";
     src = fetchFromGitHub {
       owner = "FireIsGood";
       repo = "spaceman.nvim";
-      rev = "7910d202073bcc5f567481426f771b3737451dd9";
-      sha256 = "1p2j6yygqsmxbvxns4ssiyspsnpbz12pq29s9vs3n5x2ddxrrwjn";
+      rev = "b7ba2ea591ec95bda259a32b8201aaa11cc0f0f6";
+      sha256 = "0j5n772wir3si26pac4qv5glxlnly1npcxaa8baaksv9877jbxs8";
     };
     meta.homepage = "https://github.com/FireIsGood/spaceman.nvim/";
   };
@@ -11906,12 +11907,12 @@ final: prev:
 
   tabby-nvim = buildVimPlugin {
     pname = "tabby.nvim";
-    version = "2024-11-23";
+    version = "2024-12-01";
     src = fetchFromGitHub {
       owner = "nanozuki";
       repo = "tabby.nvim";
-      rev = "41669e37ab79ab2dce90c4352dacbbc26e938dd7";
-      sha256 = "0qm12d9x2a3wf3a0v0rckakb3z5zsxwyxlnf9hq8ymfwxfjwpjip";
+      rev = "9705aeec0009f7c5abc573e69bce63682974c2bd";
+      sha256 = "1x91933qlm29wdsirpiqmpci46jg6i97wzjvd9yh8kmskwzn4mcz";
     };
     meta.homepage = "https://github.com/nanozuki/tabby.nvim/";
   };
@@ -12269,12 +12270,12 @@ final: prev:
 
   telescope-manix = buildNeovimPlugin {
     pname = "telescope-manix";
-    version = "2024-11-24";
+    version = "2024-12-01";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "telescope-manix";
-      rev = "4e78ac3207ffe1b047948fb945f550f019691f96";
-      sha256 = "149v5m0gi9q9gi2pnj6vsfz410lqnkn60rskn21liczkgnams6aa";
+      rev = "287b4a2e6e6d8bbcf8ad1a53d21f6d42339282db";
+      sha256 = "1hrig1q77zk783dp8c7ax8w4qcn3cjj2m2vd9miixdhfah70071x";
     };
     meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
   };
@@ -12293,24 +12294,24 @@ final: prev:
 
   telescope-nvim = buildNeovimPlugin {
     pname = "telescope.nvim";
-    version = "2024-10-29";
+    version = "2024-11-29";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "85922dde3767e01d42a08e750a773effbffaea3e";
-      sha256 = "0yv3v4nlh42s96r0xa4fvlil4rh4p0q6l50jk8yg0hmc8vxxzbs1";
+      rev = "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc";
+      sha256 = "0bkpys6dj01x6ycylmf6vrd2mqjibmny9a2hxxrqn0jqqvagm5ly";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
 
   telescope-project-nvim = buildVimPlugin {
     pname = "telescope-project.nvim";
-    version = "2024-11-19";
+    version = "2024-12-01";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-project.nvim";
-      rev = "7dea0d37dc59f68cbd74459f74869ff740517a60";
-      sha256 = "15jyram4d520lzvhydz31ifnh3s8dq2d3v8kk6v2234g7ayd4x0r";
+      rev = "1d7920e799fc5001dffc7bd10909a86e0358eaf4";
+      sha256 = "0dil6dj0nd173l4kxlbfjc29bsz67v47pv3ygsxr41hacr2r2hx8";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/";
   };
@@ -12630,12 +12631,12 @@ final: prev:
 
   tiny-inline-diagnostic-nvim = buildVimPlugin {
     pname = "tiny-inline-diagnostic.nvim";
-    version = "2024-11-24";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-inline-diagnostic.nvim";
-      rev = "c39c4af4e6500effb17eeaaa2306dd0bb75afd62";
-      sha256 = "0w1bp9x4hryiwf0lrml6iqdbxpr25v080ra05k1cah97b9w6znb3";
+      rev = "cec1cee1e25bbb2cbc588d40a460953012595479";
+      sha256 = "1wnwk480x0zzr9j4g3krw9a15ldll4z715m4yfnn7q1c0s1a7s9x";
     };
     meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
   };
@@ -12739,12 +12740,12 @@ final: prev:
 
   tokyonight-nvim = buildVimPlugin {
     pname = "tokyonight.nvim";
-    version = "2024-11-19";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "tokyonight.nvim";
-      rev = "c2725eb6d086c8c9624456d734bd365194660017";
-      sha256 = "02662k6kxaf19w17fq71zc6hv4yylgzzmrrhhzid0sz0ghafb9dw";
+      rev = "15d83cda572d7498b43bbdaa223bc75bf341183e";
+      sha256 = "1m8yhir6whs8fsvn4vx298mx7mcpls234p3lc82lg2jgsi3rcbkb";
     };
     meta.homepage = "https://github.com/folke/tokyonight.nvim/";
   };
@@ -12836,12 +12837,12 @@ final: prev:
 
   trouble-nvim = buildVimPlugin {
     pname = "trouble.nvim";
-    version = "2024-11-06";
+    version = "2024-11-27";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "trouble.nvim";
-      rev = "3dc00c0447c016cd43e03054c3d49436a1f2076d";
-      sha256 = "1y6mxs9xlrx3n7brk2zvapfn61nai0zhdqvj97650ib2xaip8j6d";
+      rev = "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6";
+      sha256 = "12ky8alz6zi2vlqspnacmkj99d4sam4hrzs92i3n4sz6jx2w8696";
     };
     meta.homepage = "https://github.com/folke/trouble.nvim/";
   };
@@ -12992,12 +12993,12 @@ final: prev:
 
   typst-preview-nvim = buildVimPlugin {
     pname = "typst-preview.nvim";
-    version = "2024-11-25";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "chomosuke";
       repo = "typst-preview.nvim";
-      rev = "051d5b41e7de91e3a2004f14b2526988a33eb2c2";
-      sha256 = "0naxmq4wf30y35465x3ck3ylg19j4x4hqflhl8z9adrccm8y9w3w";
+      rev = "0cb5f5627312f50ce089f785ec42b55a85f30ce7";
+      sha256 = "0z1d8jn88abxqlrb03cl763s73ybybdq1hiva0vj52ldygc1k0xr";
     };
     meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/";
   };
@@ -13076,12 +13077,12 @@ final: prev:
 
   unison = buildVimPlugin {
     pname = "unison";
-    version = "2024-11-26";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "d17b1f64fe6c9fe85a9a2b409ae43a54692ca0f4";
-      sha256 = "0kzzfmmbv8z9xx566gq78di464qxxb4sxx4jp76dgfr39y1m5zq4";
+      rev = "ce0e9af25ce83482f7fdeca6031017202791cb2b";
+      sha256 = "07jab3rdbdcsjrxrhba3pl0km9mbcpl3v0vcj7cbc7vpzvszd87b";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
   };
@@ -14276,24 +14277,24 @@ final: prev:
 
   vim-dadbod-completion = buildVimPlugin {
     pname = "vim-dadbod-completion";
-    version = "2024-11-08";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "kristijanhusak";
       repo = "vim-dadbod-completion";
-      rev = "da0e75c09c27a82aad078d993bb1b2f4afd43427";
-      sha256 = "0b2mix5risfy2wn8vm4hdrc36v26ljskz6xf2c4yd8s4hfmkbfc9";
+      rev = "04485bfb53a629423233a4178d71cd4f8abf7406";
+      sha256 = "1cbny9swh6m4f68f0inw5srml7144f6m14n5rzidy4m3284c9jdx";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/";
   };
 
   vim-dadbod-ui = buildVimPlugin {
     pname = "vim-dadbod-ui";
-    version = "2024-11-21";
+    version = "2024-12-01";
     src = fetchFromGitHub {
       owner = "kristijanhusak";
       repo = "vim-dadbod-ui";
-      rev = "28a16902cb2134c934b85da5250033ee43b0dee5";
-      sha256 = "1ykqvskzq8ql22wswrqmz7rlizvkklz35szbi0d7mmm3b4n3xs2c";
+      rev = "7f89265a84fc003ccfa500fd99b9fea9db2c75c7";
+      sha256 = "1z0ppjjqvw19daa7ssfynpq55p0qvb9p76b76qk4ph3g9nj6qdqn";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";
   };
@@ -14372,12 +14373,12 @@ final: prev:
 
   vim-dirvish = buildVimPlugin {
     pname = "vim-dirvish";
-    version = "2024-09-02";
+    version = "2024-11-27";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "vim-dirvish";
-      rev = "2ddd8ee63d6066ae910b29285d9786cbd0226657";
-      sha256 = "0vjnr6rq27g9aamqdvyg4yszbs0jr4zlp3lvb0n109nbdma680rb";
+      rev = "c87a8e103f2e8b44b411a38dda9bbe1229547952";
+      sha256 = "0wzxd26fbzxkhbwy0ylw7nxizm7rc9xlq3b79s24ibxmi3417kdv";
     };
     meta.homepage = "https://github.com/justinmk/vim-dirvish/";
   };
@@ -15910,12 +15911,12 @@ final: prev:
 
   vim-lsp-settings = buildVimPlugin {
     pname = "vim-lsp-settings";
-    version = "2024-11-26";
+    version = "2024-11-29";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "vim-lsp-settings";
-      rev = "6e17b4c35e964c2644614d250192721a5aa9e792";
-      sha256 = "1jmvfk6p6wjmjgzlrlykkswyjaibmzpjav3gisinxy3ww3hqpq9d";
+      rev = "9cf5846335321df5742b04d573979a3a52478a12";
+      sha256 = "18mxk0bn1x6p6lpab06z5ps2qdh2smwa1xsj3g1357l016ar4qlg";
     };
     meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
   };
@@ -16127,12 +16128,12 @@ final: prev:
 
   vim-monokai = buildVimPlugin {
     pname = "vim-monokai";
-    version = "2024-11-15";
+    version = "2024-11-28";
     src = fetchFromGitHub {
       owner = "crusoexia";
       repo = "vim-monokai";
-      rev = "c4f32e02127e1f9b17fe0bce8854d410e745518e";
-      sha256 = "0nmf1dqnk72gnwwxcrq0gfs5ia2rnps39y39b6rsdzn856a3z72g";
+      rev = "1c46309037c9e07dfb83531654bc61290c6be114";
+      sha256 = "0w5bk3q0dfi2m8mif64jg6vvmr21cq1n329j8wxr2qj2r0piz3bs";
     };
     meta.homepage = "https://github.com/crusoexia/vim-monokai/";
   };
@@ -16571,12 +16572,12 @@ final: prev:
 
   vim-paper = buildVimPlugin {
     pname = "vim-paper";
-    version = "2024-10-29";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "yorickpeterse";
       repo = "vim-paper";
-      rev = "1965ff861fecc2d524aef1454abf95cacec9cfa3";
-      sha256 = "1v0i0zcmwrqvzs8281xv8hgxbiv1wa69igk5nknvip9ldc8zn9xz";
+      rev = "94b5a32afc8499467884233fe640b1827a1aea0d";
+      sha256 = "122vjw46fq8jibpyrhdany03i144ap0x3zys3cb59mgsz275xk4q";
     };
     meta.homepage = "https://github.com/yorickpeterse/vim-paper/";
   };
@@ -18120,12 +18121,12 @@ final: prev:
 
   vim-which-key = buildVimPlugin {
     pname = "vim-which-key";
-    version = "2024-01-18";
+    version = "2024-12-03";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vim-which-key";
-      rev = "470cd19ce11b616e0640f2b38fb845c42b31a106";
-      sha256 = "1fargy2zk4j62irslr9gs8h8lwhkh6hj0f5q9aq03skh0p8y0413";
+      rev = "4843811d6f2104fe2140d4cddbb49352976647df";
+      sha256 = "18x3ijp2llw3jzh7c4gj67f9371sw3w7s6r8hs0b08kwkygqfvvh";
     };
     meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
   };
@@ -18228,12 +18229,12 @@ final: prev:
 
   vim-zettel = buildVimPlugin {
     pname = "vim-zettel";
-    version = "2024-10-30";
+    version = "2024-11-28";
     src = fetchFromGitHub {
       owner = "michal-h21";
       repo = "vim-zettel";
-      rev = "6ed715da7e69148a1112943041465f9b5f7c2c63";
-      sha256 = "0xb2m34x2a96rkjh1jjxn7hjgkkckw6vfcgdl5bxmyz2v6rhfs6c";
+      rev = "9a941a7167b1b415520f7b67a6036eea94d73cad";
+      sha256 = "127ffmwxzmhwhr4yzxizcq9qjc6v3krblj45m9h642cpk2sycrwf";
     };
     meta.homepage = "https://github.com/michal-h21/vim-zettel/";
   };
@@ -18300,12 +18301,12 @@ final: prev:
 
   vimade = buildVimPlugin {
     pname = "vimade";
-    version = "2024-11-26";
+    version = "2024-12-01";
     src = fetchFromGitHub {
       owner = "TaDaa";
       repo = "vimade";
-      rev = "cde9665d44225d9eb40007780211d1bb9dc2f19f";
-      sha256 = "1c4swfwcy1600slp52h6d395sz2lbr1rbvml77cghfqz1cdxjh60";
+      rev = "364452635fc4f358824d5fcfa5476e6795bb47ea";
+      sha256 = "0lm6zxkdkndjz83g9sfmg59gqf2qphlq9ka7bggpz4b866wi03ja";
     };
     meta.homepage = "https://github.com/TaDaa/vimade/";
   };
@@ -18577,12 +18578,12 @@ final: prev:
 
   which-key-nvim = buildVimPlugin {
     pname = "which-key.nvim";
-    version = "2024-11-26";
+    version = "2024-11-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "which-key.nvim";
-      rev = "b9684c6ec54d8a8452bdcf0d613c7ad0223fc3fe";
-      sha256 = "09rlc8m6l49ws10kvz3sfzfy3fmailhq11c4nmxns63962wr7q31";
+      rev = "9b365a6428a9633e3eeb34dbef1b791511c54f70";
+      sha256 = "1r9zq4p8hm3pk2m65m4qczrls6g4bp0j17lfyyyd3b3lsdnnd577";
     };
     meta.homepage = "https://github.com/folke/which-key.nvim/";
   };
@@ -18613,12 +18614,12 @@ final: prev:
 
   wiki-vim = buildVimPlugin {
     pname = "wiki.vim";
-    version = "2024-11-07";
+    version = "2024-11-29";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "wiki.vim";
-      rev = "d84d105909e72afd50c7b3bc098eee5892139b05";
-      sha256 = "0m6rhik60hclspw64px4nkrbwqx22ibi9rrm6abxyanxas1cwkiw";
+      rev = "b407abedab7d625a1b7e7d514f0b9bed301c0c68";
+      sha256 = "064xii10y1l1ac45qn1382irhnbihappyayjl1dgd8w2d4svjica";
     };
     meta.homepage = "https://github.com/lervag/wiki.vim/";
   };
@@ -18806,12 +18807,12 @@ final: prev:
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "2024-11-24";
+    version = "2024-12-02";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "053867916a9be3cb46f84b6f095ee731bbddd213";
-      sha256 = "133ifr5jkzf38lnvnnm698jrr8gx9ngpd9hx1dhvk5h50qiabg63";
+      rev = "d09f94e79fc0a28f7242ff94af17ca96d8a41878";
+      sha256 = "1qgfbl450sq3ci7py1ghsw7dk28378a7mb4acxpy3vci59j3pizc";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
   };
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 64182160f3c3..b5ff7ce37fef 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -204,7 +204,7 @@ in
         pname = "avante-nvim-lib";
         inherit (oldAttrs) version src;
 
-        cargoHash = "sha256-aB+KhqSTGTiZKml6G+cte94EAWNWo1dP8igfFOIfHXA=";
+        cargoHash = "sha256-PApZwqlu7GgCEvdTZVm1uB6ny6KSje1rL4Bzjt+iKF4=";
 
         nativeBuildInputs = [
           pkg-config

From fd0e09c3f180ed8dbc95d61a1115901743b51d88 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 3 Dec 2024 11:03:56 -0600
Subject: [PATCH 113/141] vimPlugins: resolve github repository redirects

---
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index a949fa56fac0..341681cc2242 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -433,7 +433,7 @@ https://github.com/nvimtools/hydra.nvim/,HEAD,
 https://github.com/mboughaba/i3config.vim/,,
 https://github.com/cocopon/iceberg.vim/,,
 https://github.com/idris-hackers/idris-vim/,,
-https://github.com/ShinKage/idris2-nvim/,,
+https://github.com/idris-community/idris2-nvim/,,
 https://github.com/edwinb/idris2-vim/,,
 https://github.com/3rd/image.nvim/,HEAD,
 https://github.com/HakonHarnes/img-clip.nvim/,HEAD,

From 995adf49fe65b4e151fb5ce93ca8fe727256bc37 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 3 Dec 2024 11:03:59 -0600
Subject: [PATCH 114/141] vimPlugins.nvim-treesitter: update grammars

---
 .../vim/plugins/nvim-treesitter/generated.nix | 144 +++++++++---------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 7a55e6a047ca..184d62a6970f 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -38,12 +38,12 @@
   };
   apex = buildGrammar {
     language = "apex";
-    version = "0.0.0+rev=46d4a12";
+    version = "0.0.0+rev=f5a1d21";
     src = fetchFromGitHub {
       owner = "aheber";
       repo = "tree-sitter-sfapex";
-      rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074";
-      hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY=";
+      rev = "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5";
+      hash = "sha256-iNoMqyZmS3CoazDQv9/hJb1CRXojEM4IyE5ReqHV4k8=";
     };
     location = "apex";
     meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
@@ -548,12 +548,12 @@
   };
   editorconfig = buildGrammar {
     language = "editorconfig";
-    version = "0.0.0+rev=5f4f84f";
+    version = "0.0.0+rev=3288aa4";
     src = fetchFromGitHub {
       owner = "ValdezFOmar";
       repo = "tree-sitter-editorconfig";
-      rev = "5f4f84f0e79049e4526c0a1db669378092ecb256";
-      hash = "sha256-SjH1g2a7/wc9WNkscDVgffzOc0I2ULBH70CntIAlsuE=";
+      rev = "3288aa46e30e1295133bd6f303c00ac71b4f61ad";
+      hash = "sha256-hVCp4cRgc3ALVbpRAd8wYTZ77wZMDAQGmGddt0QuOFY=";
     };
     meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
   };
@@ -581,12 +581,12 @@
   };
   elixir = buildGrammar {
     language = "elixir";
-    version = "0.0.0+rev=5345854";
+    version = "0.0.0+rev=d301895";
     src = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "tree-sitter-elixir";
-      rev = "53458546e3bb717beee1d15df30724c81eb41d1c";
-      hash = "sha256-Zuqjv4QEeCiHYCxGT9HYAXlqrRFTi8V88wAsot6O5TI=";
+      rev = "d30189581a8b2802f237884287fdb7c40f32a041";
+      hash = "sha256-xaQ9NZUt0eE7IB1SmhBZqMM8KluI5mid//jJNsLuS4M=";
     };
     meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir";
   };
@@ -735,12 +735,12 @@
   };
   fortran = buildGrammar {
     language = "fortran";
-    version = "0.0.0+rev=4c96c4d";
+    version = "0.0.0+rev=6f16bab";
     src = fetchFromGitHub {
       owner = "stadelmanma";
       repo = "tree-sitter-fortran";
-      rev = "4c96c4d00b5c17b109028e8627407971085034ce";
-      hash = "sha256-c/UfQOUfIAL6BVprefuWmCSZJXP90cRN64OgPgWJgN0=";
+      rev = "6f16bab7455cd2906a86679a1be83dd4f378db81";
+      hash = "sha256-WsAKQ1R9wDjgrC/5t3RRZFSszehtgxY3uHtv9JKrgV4=";
     };
     meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
   };
@@ -1309,12 +1309,12 @@
   };
   inko = buildGrammar {
     language = "inko";
-    version = "0.0.0+rev=aecabed";
+    version = "0.0.0+rev=a6fb0b0";
     src = fetchFromGitHub {
       owner = "inko-lang";
       repo = "tree-sitter-inko";
-      rev = "aecabede39b0db05678e2d4686258d4f71b00a51";
-      hash = "sha256-29vt7zf/prmbjPBJoItzJz2sOp40ySqiqtwlaBobjoQ=";
+      rev = "a6fb0b0bfee5dede688968fd91282da799e5aa8e";
+      hash = "sha256-Egigdlesj5gaHk+nfc2y7+qFuNl7RzTGrzsPCssHHQk=";
     };
     meta.homepage = "https://github.com/inko-lang/tree-sitter-inko";
   };
@@ -1530,12 +1530,12 @@
   };
   ledger = buildGrammar {
     language = "ledger";
-    version = "0.0.0+rev=19699bd";
+    version = "0.0.0+rev=d313153";
     src = fetchFromGitHub {
       owner = "cbarrete";
       repo = "tree-sitter-ledger";
-      rev = "19699bd9fe0bacf90d464747aab9b6179fc7b1c0";
-      hash = "sha256-5kTLVwakxAph33nWqMvGcHERJaSzvUGImxv7obLGz1E=";
+      rev = "d313153eef68c557ba4538b20de2d0e92f3ef6f8";
+      hash = "sha256-/dE3Uqi5zuTWtbjPAm9j7+z6RnTKJeXdS5na+XoGCE0=";
     };
     meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger";
   };
@@ -1662,24 +1662,24 @@
   };
   markdown = buildGrammar {
     language = "markdown";
-    version = "0.0.0+rev=5cdc549";
+    version = "0.0.0+rev=c89a30c";
     src = fetchFromGitHub {
       owner = "MDeiml";
       repo = "tree-sitter-markdown";
-      rev = "5cdc549ab8f461aff876c5be9741027189299cec";
-      hash = "sha256-dLj233xHPCJbawUVqkxxhHXbu/CrJIHcCyLXTgsWMFo=";
+      rev = "c89a30ce556a5ea5552e816e5dc2f2c0de96237d";
+      hash = "sha256-v1M6CBOjBwtxkO2k1hksQS4ZkdFNcoXmu1nc7X8OKG0=";
     };
     location = "tree-sitter-markdown";
     meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
   };
   markdown_inline = buildGrammar {
     language = "markdown_inline";
-    version = "0.0.0+rev=5cdc549";
+    version = "0.0.0+rev=c89a30c";
     src = fetchFromGitHub {
       owner = "MDeiml";
       repo = "tree-sitter-markdown";
-      rev = "5cdc549ab8f461aff876c5be9741027189299cec";
-      hash = "sha256-dLj233xHPCJbawUVqkxxhHXbu/CrJIHcCyLXTgsWMFo=";
+      rev = "c89a30ce556a5ea5552e816e5dc2f2c0de96237d";
+      hash = "sha256-v1M6CBOjBwtxkO2k1hksQS4ZkdFNcoXmu1nc7X8OKG0=";
     };
     location = "tree-sitter-markdown-inline";
     meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
@@ -1730,12 +1730,12 @@
   };
   mlir = buildGrammar {
     language = "mlir";
-    version = "0.0.0+rev=3362ba5";
+    version = "0.0.0+rev=72929ac";
     src = fetchFromGitHub {
       owner = "artagnon";
       repo = "tree-sitter-mlir";
-      rev = "3362ba5caab4de11f42b4a736a0e2bcdc9343480";
-      hash = "sha256-LyjGD0aND/ErSDc80zvA89TbWvvMcJGd+r43aEw3BZk=";
+      rev = "72929ac13d7e1c46010114202262b7102a821293";
+      hash = "sha256-lJzZAWYjqX7HG/fbYCIoYWBjpndhlUV5c7ukFvXvRLQ=";
     };
     generate = true;
     meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -1819,12 +1819,12 @@
   };
   nix = buildGrammar {
     language = "nix";
-    version = "0.0.0+rev=0eca4c5";
+    version = "0.0.0+rev=21897cc";
     src = fetchFromGitHub {
       owner = "cstrahan";
       repo = "tree-sitter-nix";
-      rev = "0eca4c5cb06196cca6d9e81a64cb4b73bdab1c87";
-      hash = "sha256-Vi+hdH6gAAXsqOsTjEzzwU2TvpBqxO4Jxfa7omUtJ5o=";
+      rev = "21897cc3dcd15325303e46b85295b743742af6ab";
+      hash = "sha256-B2DSacC5+FwyBtzsKaelr19Osc93we7BSH8HG1uIksk=";
     };
     meta.homepage = "https://github.com/cstrahan/tree-sitter-nix";
   };
@@ -1852,12 +1852,12 @@
   };
   nu = buildGrammar {
     language = "nu";
-    version = "0.0.0+rev=74e6037";
+    version = "0.0.0+rev=41a1c57";
     src = fetchFromGitHub {
       owner = "nushell";
       repo = "tree-sitter-nu";
-      rev = "74e6037383ce3a77ed6fdb8281bbd69316c723a4";
-      hash = "sha256-gkHPhTy/GxsYekMwVKTbSPpN6zyU0QWuhAdqOeF3u5M=";
+      rev = "41a1c570b57987386ed9a928fc214928f8ddc669";
+      hash = "sha256-wHehCdT79O5f0pRSuCG1Feo3hZ6xJ+c70i4NS44fnKE=";
     };
     meta.homepage = "https://github.com/nushell/tree-sitter-nu";
   };
@@ -2554,12 +2554,12 @@
   };
   sflog = buildGrammar {
     language = "sflog";
-    version = "0.0.0+rev=46d4a12";
+    version = "0.0.0+rev=f5a1d21";
     src = fetchFromGitHub {
       owner = "aheber";
       repo = "tree-sitter-sfapex";
-      rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074";
-      hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY=";
+      rev = "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5";
+      hash = "sha256-iNoMqyZmS3CoazDQv9/hJb1CRXojEM4IyE5ReqHV4k8=";
     };
     location = "sflog";
     meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
@@ -2621,35 +2621,35 @@
   };
   solidity = buildGrammar {
     language = "solidity";
-    version = "0.0.0+rev=ee5a2d2";
+    version = "0.0.0+rev=bf26872";
     src = fetchFromGitHub {
       owner = "JoranHonig";
       repo = "tree-sitter-solidity";
-      rev = "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c";
-      hash = "sha256-q9SFHnxBUDet65WuxxYFS3N8xDHuQz7K2LWED7uSaWA=";
+      rev = "bf268722bc6406429776f71f012e6d1a88801931";
+      hash = "sha256-mpKLES5tHhQFMldjOYLzh7a29DbtImENwM2+y0wJ3hk=";
     };
     meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity";
   };
   soql = buildGrammar {
     language = "soql";
-    version = "0.0.0+rev=46d4a12";
+    version = "0.0.0+rev=f5a1d21";
     src = fetchFromGitHub {
       owner = "aheber";
       repo = "tree-sitter-sfapex";
-      rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074";
-      hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY=";
+      rev = "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5";
+      hash = "sha256-iNoMqyZmS3CoazDQv9/hJb1CRXojEM4IyE5ReqHV4k8=";
     };
     location = "soql";
     meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
   };
   sosl = buildGrammar {
     language = "sosl";
-    version = "0.0.0+rev=46d4a12";
+    version = "0.0.0+rev=f5a1d21";
     src = fetchFromGitHub {
       owner = "aheber";
       repo = "tree-sitter-sfapex";
-      rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074";
-      hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY=";
+      rev = "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5";
+      hash = "sha256-iNoMqyZmS3CoazDQv9/hJb1CRXojEM4IyE5ReqHV4k8=";
     };
     location = "sosl";
     meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
@@ -2678,12 +2678,12 @@
   };
   sql = buildGrammar {
     language = "sql";
-    version = "0.0.0+rev=3d516e6";
+    version = "0.0.0+rev=035354e";
     src = fetchFromGitHub {
       owner = "derekstride";
       repo = "tree-sitter-sql";
-      rev = "3d516e6ae778bd41f9d5178823798ff6af96da60";
-      hash = "sha256-5lmnH4ro4+M5dCpW8GnnOHEuSCCQMCqhlK3bnzEr518=";
+      rev = "035354ea51c835cfe8fc9abf81bb081965a42b4c";
+      hash = "sha256-EUOR8VP1u0Sz0HSg+IUSInQ6pD/1k5e3a/r7lPPShYo=";
     };
     meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
   };
@@ -2733,12 +2733,12 @@
   };
   styled = buildGrammar {
     language = "styled";
-    version = "0.0.0+rev=2e0e623";
+    version = "0.0.0+rev=75d3ad2";
     src = fetchFromGitHub {
       owner = "mskelton";
       repo = "tree-sitter-styled";
-      rev = "2e0e6231348d8cb0a82406490771825b8ac80422";
-      hash = "sha256-RwhHCWK1ckXdPgIVZ4NC5zCBna91NBYub2MlrIwHeGk=";
+      rev = "75d3ad20818c30c49b445ca2cb35999c278b3453";
+      hash = "sha256-2GMOHPO1vDqeXazAlQw35XhrOXrAmZnITibIfe0hscA=";
     };
     meta.homepage = "https://github.com/mskelton/tree-sitter-styled";
   };
@@ -2755,12 +2755,12 @@
   };
   superhtml = buildGrammar {
     language = "superhtml";
-    version = "0.0.0+rev=dbb0d1f";
+    version = "0.0.0+rev=1fda813";
     src = fetchFromGitHub {
       owner = "kristoff-it";
       repo = "superhtml";
-      rev = "dbb0d1fc54f8525f41289a413ea6c0722e92bf9c";
-      hash = "sha256-c0JjQ3RZyKtP4ayDT9M+riYhK6JlMF/oVJfkfY17/7k=";
+      rev = "1fda813bd9dc108e962e018e6a327434767ad616";
+      hash = "sha256-+32toY540h92Xk5xoYvZaMYNDxXWI4pRbkrBnU4xRjM=";
     };
     location = "tree-sitter-superhtml";
     meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -2800,12 +2800,12 @@
   };
   swift = buildGrammar {
     language = "swift";
-    version = "0.0.0+rev=6accc2f";
+    version = "0.0.0+rev=77fbac9";
     src = fetchFromGitHub {
       owner = "alex-pinkus";
       repo = "tree-sitter-swift";
-      rev = "6accc2f720c7ff8573f6956a34ea22f50c44d839";
-      hash = "sha256-SFzOo7Nx7kjQ69KUIH9raGj4zYYI0HPeagECAZJGfww=";
+      rev = "77fbac9b574105a12d08dde1ed8d6273331e7d13";
+      hash = "sha256-K5NuZX5/MZrA3fZQxZcUWrM4BhRvuN9WV7jAU1EY1Kk=";
     };
     generate = true;
     meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -2834,12 +2834,12 @@
   };
   t32 = buildGrammar {
     language = "t32";
-    version = "0.0.0+rev=476f0d8";
+    version = "0.0.0+rev=7c85796";
     src = fetchFromGitLab {
       owner = "xasc";
       repo = "tree-sitter-t32";
-      rev = "476f0d8ab4b012d3b6f9598890217ada70f1a8ba";
-      hash = "sha256-zyMThhLjjiL/wtz5DGmjbfGTfcIj4JNSVCKfBIEw/0w=";
+      rev = "7c8579685e34116c61971240780b316c54be698b";
+      hash = "sha256-WfF0Eczk+n/xCxxeYlfv+KG3LSErBwceih2n7ddfces=";
     };
     meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git";
   };
@@ -2979,12 +2979,12 @@
   };
   toml = buildGrammar {
     language = "toml";
-    version = "0.0.0+rev=16a30c8";
+    version = "0.0.0+rev=64b5683";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-toml";
-      rev = "16a30c83ce427385b8d14939c45c137fcfca6c42";
-      hash = "sha256-VYsPM0NVxegfanVaaKkSkEzJ502xkKSjZWrsJpDmack=";
+      rev = "64b56832c2cffe41758f28e05c756a3a98d16f41";
+      hash = "sha256-m9RlGkHiOL/PNENrdEPqtPlahSqGymsx7gZrCoN/Lsk=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-toml";
   };
@@ -3048,12 +3048,12 @@
   };
   typespec = buildGrammar {
     language = "typespec";
-    version = "0.0.0+rev=0ee0554";
+    version = "0.0.0+rev=53d892f";
     src = fetchFromGitHub {
       owner = "happenslol";
       repo = "tree-sitter-typespec";
-      rev = "0ee05546d73d8eb64635ed8125de6f35c77759fe";
-      hash = "sha256-qXA87soeEdlpzj8svEao8L0F5V14NSZc1WsX9z0PVB0=";
+      rev = "53d892fd975da3f81374f7732af3cd3abb6b85d9";
+      hash = "sha256-vosf8sf+8FSOSFpdkxy99e0jGgzwjEf0ViCxC1CDWnk=";
     };
     meta.homepage = "https://github.com/happenslol/tree-sitter-typespec";
   };
@@ -3182,12 +3182,12 @@
   };
   vhdl = buildGrammar {
     language = "vhdl";
-    version = "0.0.0+rev=0703da9";
+    version = "0.0.0+rev=c438173";
     src = fetchFromGitHub {
       owner = "jpt13653903";
       repo = "tree-sitter-vhdl";
-      rev = "0703da905ba3b7331f4431790951bd347539e6f1";
-      hash = "sha256-dy31BjTaSho84jyGy7kLft1MgnF7dhBvi/pPBQKuNX0=";
+      rev = "c438173a3cbb92b349c994f2acf822a0f3b961a0";
+      hash = "sha256-R4Gcs1EA3iFCOSuXwUrSgvKlt9t+l9kqZC58EtureV8=";
     };
     meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
   };
@@ -3315,12 +3315,12 @@
   };
   xresources = buildGrammar {
     language = "xresources";
-    version = "0.0.0+rev=ce8129b";
+    version = "0.0.0+rev=1fffefe";
     src = fetchFromGitHub {
       owner = "ValdezFOmar";
       repo = "tree-sitter-xresources";
-      rev = "ce8129b03f03413f18f8cd989f88c05c59151bb5";
-      hash = "sha256-r/3aFqq6e8LYUOQ5HggqL84jlovixBdUzTzWXYjFN0E=";
+      rev = "1fffefe05bb7f37016f2ada74b50a29e9820b52f";
+      hash = "sha256-kNAq9sR6Y/vN1tHZ4Bl61PRCs0WT9qp57OeOV1jsPfA=";
     };
     meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
   };

From 6869d3315cb099f497ba32376f88d7571002bbbe Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 3 Dec 2024 11:23:53 -0600
Subject: [PATCH 115/141] vimPlugins.blink-cmp: 0.6.2 -> 0.7.1

---
 pkgs/applications/editors/vim/plugins/blink-cmp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix
index 719ab57c061d..3d061ddb45cc 100644
--- a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix
+++ b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix
@@ -7,12 +7,12 @@
   nix-update-script,
 }:
 let
-  version = "0.6.2";
+  version = "0.7.1";
   src = fetchFromGitHub {
     owner = "Saghen";
     repo = "blink.cmp";
     rev = "refs/tags/v${version}";
-    hash = "sha256-uAIO8Q9jQvZ36Ngz9dURH7Jo7+WX/swauhj3ltIkZ5c=";
+    hash = "sha256-IHl+XIldo2kculpbiOuLIJ6RJbFODiRlQU4x8hvE7pI=";
   };
   libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
   blink-fuzzy-lib = rustPlatform.buildRustPackage {

From 6648c58eae48ea85b00413dbebb8993650e128c9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 2 Dec 2024 22:31:17 +0100
Subject: [PATCH 116/141] stdenv.mkDerivation: support structuredAttrs in
 inputDerivation

The goal is to print all store references into $out.

First, $out itself is not defined with structuredAttrs, but we can work
around that with placeholder. Alternatively we could source
$stdenv/setup after sourcing the attrs.sh file, but that feels like
overkill.

To support structuredAttrs we source the attrs.sh file. export will not
be enough anymore, because the attrs file sets bash variables, not
environment variables. Thus we resort to declare -p.

Resolves #321005
---
 pkgs/stdenv/generic/make-derivation.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index ca878fe1032d..c4e4bd930936 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -613,13 +613,19 @@ extendDerivation
        _derivation_original_args = derivationArg.args;
 
        builder = stdenv.shell;
-       # The bash builtin `export` dumps all current environment variables,
+       # The builtin `declare -p` dumps all bash and environment variables,
        # which is where all build input references end up (e.g. $PATH for
        # binaries). By writing this to $out, Nix can find and register
        # them as runtime dependencies (since Nix greps for store paths
-       # through $out to find them)
+       # through $out to find them). Using placeholder for $out works with
+       # and without structuredAttrs.
+       # This build script does not use setup.sh or stdenv, to keep
+       # the env most pristine. This gives us a very bare bones env,
+       # hence the extra/duplicated compatibility logic and "pure bash" style.
        args = [ "-c" ''
-         export > $out
+         out="${placeholder "out"}"
+         if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
+         declare -p > $out
          for var in $passAsFile; do
              pathVar="''${var}Path"
              printf "%s" "$(< "''${!pathVar}")" >> $out

From 52b6a6cd9621ed0578b679ad7019cbd284d4c787 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 2 Dec 2024 17:31:42 +0100
Subject: [PATCH 117/141] python312Packages.pytorch-pfn-extras: 0.7.7 -> 0.8.1

Diff: https://github.com/pfnet/pytorch-pfn-extras/compare/refs/tags/v0.7.7...v0.8.1

Changelog: https://github.com/pfnet/pytorch-pfn-extras/releases/tag/v0.8.1
---
 .../pytorch-pfn-extras/default.nix             | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
index 60d03910bcfb..a7f6dd539b65 100644
--- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
+++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -16,21 +17,18 @@
   onnx,
   pytestCheckHook,
   torchvision,
-
-  pythonAtLeast,
-  stdenv,
 }:
 
 buildPythonPackage rec {
   pname = "pytorch-pfn-extras";
-  version = "0.7.7";
+  version = "0.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pfnet";
     repo = "pytorch-pfn-extras";
     rev = "refs/tags/v${version}";
-    hash = "sha256-0+ltkm7OH18hlpHYyZCmy1rRleF52IM2BjLoW44tJUY=";
+    hash = "sha256-6KHVsUHN2KDKAaMdhBpZgTq0XILWUsHJPgeRD0m9m20=";
   };
 
   build-system = [ setuptools ];
@@ -52,9 +50,6 @@ buildPythonPackage rec {
     # Requires CUDA access which is not possible in the nix environment.
     "-m 'not gpu and not mpi'"
     "-Wignore::DeprecationWarning"
-
-    # FutureWarning: You are using `torch.load` with `weights_only=False` (the current default value), which uses the default pickle module implicitly...
-    "-Wignore::FutureWarning"
   ];
 
   pythonImportsCheck = [ "pytorch_pfn_extras" ];
@@ -90,11 +85,10 @@ buildPythonPackage rec {
 
       # RuntimeError: No Op registered for Gradient with domain_version of 9
       "tests/pytorch_pfn_extras_tests/onnx_tests/test_grad.py"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # RuntimeError: Dynamo is not supported on Python 3.12+
+
+      # torch._dynamo.exc.BackendCompilerFailed: backend='compiler_fn' raised:
+      # AttributeError: module 'torch.fx.experimental.proxy_tensor' has no attribute 'maybe_disable_fake_tensor_mode'
       "tests/pytorch_pfn_extras_tests/dynamo_tests/test_compile.py"
-      "tests/pytorch_pfn_extras_tests/test_ops/test_register.py"
     ]
     ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
       # torch.distributed is not available on darwin

From b27ac6e75fe3e9bb907c0b1487c0e2389bbbc67e Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Tue, 3 Dec 2024 10:14:36 -0800
Subject: [PATCH 118/141] ton: fix build on Darwin

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

diff --git a/pkgs/by-name/to/ton/package.nix b/pkgs/by-name/to/ton/package.nix
index f929c0b618b0..bccdd713aaff 100644
--- a/pkgs/by-name/to/ton/package.nix
+++ b/pkgs/by-name/to/ton/package.nix
@@ -13,6 +13,8 @@
 , secp256k1
 , zlib
 , nix-update-script
+, darwinMinVersionHook
+, apple-sdk_11
 }:
 
 stdenv.mkDerivation rec {
@@ -44,14 +46,15 @@ stdenv.mkDerivation rec {
     readline
     secp256k1
     zlib
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
+    (darwinMinVersionHook "10.13")
+    apple-sdk_11
   ];
 
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
-    # The build fails on darwin as:
-    #   error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
-    broken = stdenv.hostPlatform.isDarwin;
     description = "Fully decentralized layer-1 blockchain designed by Telegram";
     homepage = "https://ton.org/";
     changelog = "https://github.com/ton-blockchain/ton/blob/v${version}/Changelog.md";

From ae09090884b55e608816cbf9efebaf3183790f48 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 3 Dec 2024 09:04:52 +0100
Subject: [PATCH 119/141] python312Packages.moderngl-window: 3.0.2 -> 3.0.3

Diff: https://github.com/moderngl/moderngl_window/compare/refs/tags/3.0.2...3.0.3

Changelog: https://github.com/moderngl/moderngl-window/blob/3.0.3/CHANGELOG.md
---
 .../python-modules/moderngl-window/default.nix            | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/moderngl-window/default.nix b/pkgs/development/python-modules/moderngl-window/default.nix
index 0f24382261fe..e9eed7317097 100644
--- a/pkgs/development/python-modules/moderngl-window/default.nix
+++ b/pkgs/development/python-modules/moderngl-window/default.nix
@@ -22,20 +22,22 @@
   pysdl2,
   pyside2,
   pyqt5,
+  reportlab,
+  av,
 
   mesa,
 }:
 
 buildPythonPackage rec {
   pname = "moderngl-window";
-  version = "3.0.2";
+  version = "3.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "moderngl";
     repo = "moderngl_window";
     rev = "refs/tags/${version}";
-    hash = "sha256-J7vcEuJC0fVYyalSm9jDT44mLThoMw78Xmj5Ap3Q9ME=";
+    hash = "sha256-WXHQVJJCE+7FQJjRgjnmpoGGnF20OQ6/X6Fnrzsp2fA=";
   };
 
   pythonRelaxDeps = [ "pillow" ];
@@ -62,6 +64,8 @@ buildPythonPackage rec {
     PySDL2 = [ pysdl2 ];
     PySide2 = [ pyside2 ];
     pyqt5 = [ pyqt5 ];
+    pdf = [ reportlab ];
+    av = [ av ];
   };
 
   # Tests need a display to run.

From 117601c9a0b8637280725da5470e24c17ae86664 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 2 Dec 2024 15:17:29 +0000
Subject: [PATCH 120/141] exo: 0-unstable-2024-11-14 -> 0-unstable-2024-11-30

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

diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix
index feddf544e7b9..f76fb70400f4 100644
--- a/pkgs/by-name/ex/exo/package.nix
+++ b/pkgs/by-name/ex/exo/package.nix
@@ -7,14 +7,14 @@
 }:
 python3Packages.buildPythonApplication {
   pname = "exo";
-  version = "0-unstable-2024-11-14";
+  version = "0-unstable-2024-11-30";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "exo-explore";
     repo = "exo";
-    rev = "f1eec9fa64a0c14e0ef2eec092b799009b3d4a1e";
-    hash = "sha256-WrJrhMtq+S5VD3oyW1k3fkOHunTzdFk0HavjOXLhIKU=";
+    rev = "fcce9c347404e37921890e85f8d251e17025acc0";
+    hash = "sha256-ROWNhQuAwjKfcEWYWSJTPaksXdxQZ9nOoR7Ft63Kx2A=";
   };
 
   build-system = with python3Packages; [ setuptools ];
@@ -27,13 +27,14 @@ python3Packages.buildPythonApplication {
     aiohttp
     aiohttp-cors
     aiofiles
-    blobfile
     grpcio
     grpcio-tools
     jinja2
     netifaces
     numpy
+    nuitka
     nvidia-ml-py
+    opencv-python
     pillow
     prometheus-client
     protobuf
@@ -41,7 +42,6 @@ python3Packages.buildPythonApplication {
     pydantic
     requests
     rich
-    safetensors
     tenacity
     tqdm
     transformers

From 256e947ef141828887e2f7cbadaf14e9b43a65c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Dec 2024 07:58:31 +0000
Subject: [PATCH 121/141] chrpath: 0.17 -> 0.18

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

diff --git a/pkgs/by-name/ch/chrpath/package.nix b/pkgs/by-name/ch/chrpath/package.nix
index f4dc6d9148be..6116eb7d4679 100644
--- a/pkgs/by-name/ch/chrpath/package.nix
+++ b/pkgs/by-name/ch/chrpath/package.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "chrpath";
-  version = "0.17";
+  version = "0.18";
 
   src = fetchurl {
     url = "https://codeberg.org/pere/chrpath/archive/release-${version}.tar.gz";
-    hash = "sha256-Sh2syR9OrxyMP3Z/2IHrH+OlCaINBii/l2DZCsEkvQw=";
+    hash = "sha256-8JxJ8GGGYMoR/G2VgN3ekExyJNTG0Pby0fm83JECyao=";
   };
 
   nativeBuildInputs = [

From 34ba4e87ce089c43939b18899996fe564549521b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 09:44:54 +0000
Subject: [PATCH 122/141] lftp: 4.9.2 -> 4.9.3

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

diff --git a/pkgs/by-name/lf/lftp/package.nix b/pkgs/by-name/lf/lftp/package.nix
index 482347a5ab98..1d25888f5d38 100644
--- a/pkgs/by-name/lf/lftp/package.nix
+++ b/pkgs/by-name/lf/lftp/package.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "lftp";
-  version = "4.9.2";
+  version = "4.9.3";
 
   src = fetchurl {
     urls = [
       "https://lftp.yar.ru/ftp/${pname}-${version}.tar.xz"
       "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${pname}-${version}.tar.xz"
       ];
-    sha256 = "03b7y0h3mf4jfq5y8zw6hv9v44z3n6i8hc1iswax96y3z7sc85y5";
+    sha256 = "sha256-lucZnXk1vjPPaxFh6VWyqrQKt37N8qGc6k/BGT9Fftw=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From f1f074f2132ac75d8239f69038746c68d2916bb8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Dec 2024 08:44:14 +0000
Subject: [PATCH 123/141] deconz: 2.28.0 -> 2.28.1

---
 pkgs/servers/deconz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/deconz/default.nix b/pkgs/servers/deconz/default.nix
index 0d18de0781b7..809c990152b8 100644
--- a/pkgs/servers/deconz/default.nix
+++ b/pkgs/servers/deconz/default.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "deconz";
-  version = "2.28.0";
+  version = "2.28.1";
 
   src = fetchurl {
     url = "https://deconz.dresden-elektronik.de/ubuntu/beta/deconz-${version}-qt5.deb";
-    sha256 = "sha256-/lsPhpG8z4nNRuk55n7Xo1Q97muWk33Uo3vmX5GxPxU=";
+    sha256 = "sha256-uHbo0XerUx81o7gXK570iJKiotkQ0aCXUVcyYelMu4k=";
   };
 
   nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper wrapQtAppsHook ];

From 285daaec0ddfbae1615a79272e333f0c01f5119f Mon Sep 17 00:00:00 2001
From: Sebastian Sellmeier <mail@sebastian-sellmeier.de>
Date: Tue, 3 Dec 2024 19:46:12 +0100
Subject: [PATCH 124/141] 1password-gui: 8.10.48 -> 8.10.54,
 1password-gui-beta: 8.10.50-8.BETA -> 8.10.56-1.BETA

---
 .../misc/1password-gui/default.nix             | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix
index d0d18bdd16ab..66428a4902d0 100644
--- a/pkgs/applications/misc/1password-gui/default.nix
+++ b/pkgs/applications/misc/1password-gui/default.nix
@@ -10,43 +10,43 @@
 
 let
   pname = "1password";
-  version = if channel == "stable" then "8.10.48" else "8.10.50-8.BETA";
+  version = if channel == "stable" then "8.10.54" else "8.10.56-1.BETA";
 
   sources = {
     stable = {
       x86_64-linux = {
         url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
-        hash = "sha256-6yC7wDYd6FJluiVXyc6O03GiZkG48ttRl1N1A9djI9A=";
+        hash = "sha256-kpFO59DPBCgD3EdYxq1tom/5/misBsafbsJS+Wj2l3I=";
       };
       aarch64-linux = {
         url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
-        hash = "sha256-RN3FC7JIAJvd1hWdVH1CAOUsYr5rpq9o3JVbyfwWWKk=";
+        hash = "sha256-ZZKuPxshI9yLSUMccpXaQDbu8gTvFCaS68tqMstZHJE=";
       };
       x86_64-darwin = {
         url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
-        hash = "sha256-iJkIzVeI/mqFbBAGqQPABq1sAeS9k0j+EuUND1VYWJQ=";
+        hash = "sha256-Xha7aOuBvG+R1K48gdPj/v4URuIEYv2le+TCxwDnCwk=";
       };
       aarch64-darwin = {
         url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
-        hash = "sha256-LZ56dIJ5vXJ1SbCI8hdeldKJwzkfM0Tp8d9eZ4tQ9/k=";
+        hash = "sha256-ukfx7V8totRIyHpmjWDR2O9IDkAY3uq/0jtGPXiZ5Bw=";
       };
     };
     beta = {
       x86_64-linux = {
         url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
-        hash = "sha256-Wm8TZjPVkqn+Y0PvSxTBAGduQNBAWUvy0AEGveVvMS0=";
+        hash = "sha256-25vBmc3AJv4NTI2oOrnTR5pMBMK+wx1s/eg5g8jjtb8=";
       };
       aarch64-linux = {
         url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
-        hash = "sha256-pF1DmzfcfyT/JVJx97dykbFwEjgOMpTvofTaZvwIIvE=";
+        hash = "sha256-MLnXEqJM9E+2GAXlqX2dGUzFVk0xv5pmUzLdncakWf8=";
       };
       x86_64-darwin = {
         url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
-        hash = "sha256-MOilWgFZazVrMc6cCHqZO03KmBP8HCPevrxcKAMKEoE=";
+        hash = "sha256-W7VA7DFpIY2D+0ZqNaLfOzTTqryqpA1iy0+yACNrPlg=";
       };
       aarch64-darwin = {
         url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
-        hash = "sha256-TBA2OJXSjKzAR+gvVPCetSc7MVCNoyw4xo6w+9EIayc=";
+        hash = "sha256-ZH7xuL0SrkncxI/ngDIYHf4bLwUyTQC4Ki3HgUVza+I=";
       };
     };
   };

From 99a6022ebfbd5ff07377a863046d6bf1f7ee07b6 Mon Sep 17 00:00:00 2001
From: Sebastian Sellmeier <mail@sebastian-sellmeier.de>
Date: Tue, 3 Dec 2024 20:03:42 +0100
Subject: [PATCH 125/141] librist: remove sebtm as maintainer

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

diff --git a/pkgs/by-name/li/librist/package.nix b/pkgs/by-name/li/librist/package.nix
index 97fbece7aa27..a98400a89d35 100644
--- a/pkgs/by-name/li/librist/package.nix
+++ b/pkgs/by-name/li/librist/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     description = "Library that can be used to easily add the RIST protocol to your application";
     homepage = "https://code.videolan.org/rist/librist";
     license = with licenses; [ bsd2 mit isc ];
-    maintainers = with maintainers; [ raphaelr sebtm ];
+    maintainers = with maintainers; [ raphaelr ];
     platforms = platforms.all;
   };
 }

From 0eb05d90f12351ecdbd7bf833e534f1fb2088c2f Mon Sep 17 00:00:00 2001
From: Sebastian Sellmeier <mail@sebastian-sellmeier.de>
Date: Tue, 3 Dec 2024 20:05:50 +0100
Subject: [PATCH 126/141] swayrbar: remove sebtm as maintainer

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

diff --git a/pkgs/by-name/sw/swayrbar/package.nix b/pkgs/by-name/sw/swayrbar/package.nix
index 00a668c71174..d3437590337a 100644
--- a/pkgs/by-name/sw/swayrbar/package.nix
+++ b/pkgs/by-name/sw/swayrbar/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://git.sr.ht/~tsdh/swayr#a-idswayrbarswayrbara";
     license = with licenses; [ gpl3Plus ];
     platforms = platforms.linux;
-    maintainers = with maintainers; [ sebtm ];
+    maintainers = with maintainers; [];
     mainProgram = "swayrbar";
   };
 }

From 7bff69e5e23e1a84bb28d8dc4c0ffeecf627b3e1 Mon Sep 17 00:00:00 2001
From: Sebastian Sellmeier <mail@sebastian-sellmeier.de>
Date: Tue, 3 Dec 2024 20:08:52 +0100
Subject: [PATCH 127/141] tp-auto-kbbl: remove sebtm as maintainer

---
 pkgs/by-name/tp/tp-auto-kbbl/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/tp/tp-auto-kbbl/package.nix b/pkgs/by-name/tp/tp-auto-kbbl/package.nix
index ebb87a3207e7..15292fad1785 100644
--- a/pkgs/by-name/tp/tp-auto-kbbl/package.nix
+++ b/pkgs/by-name/tp/tp-auto-kbbl/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
     description = "Auto toggle keyboard back-lighting on Thinkpads (and maybe other laptops) for Linux";
     homepage = "https://github.com/saibotd/tp-auto-kbbl";
     license = licenses.mit;
-    maintainers = with maintainers; [ sebtm ];
+    maintainers = with maintainers; [];
     platforms = platforms.linux;
     mainProgram = "tp-auto-kbbl";
   };

From f1804e27b73ecb941270310e3d6c304e2e0108ba Mon Sep 17 00:00:00 2001
From: Sebastian Sellmeier <mail@sebastian-sellmeier.de>
Date: Tue, 3 Dec 2024 20:10:19 +0100
Subject: [PATCH 128/141] wlprop: remove sebtm as maintainer

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

diff --git a/pkgs/by-name/wl/wlprop/package.nix b/pkgs/by-name/wl/wlprop/package.nix
index bec633dc60fc..f46a9a965533 100644
--- a/pkgs/by-name/wl/wlprop/package.nix
+++ b/pkgs/by-name/wl/wlprop/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "Xprop clone for wlroots based compositors";
     homepage = "https://gist.github.com/crispyricepc/f313386043395ff06570e02af2d9a8e0";
     license = licenses.mit;
-    maintainers = with maintainers; [ sebtm ];
+    maintainers = with maintainers; [];
     platforms = platforms.linux;
     mainProgram = "wlprop";
   };

From fbb7dcdbe0408969aa3581b149a17bc7fa835ef5 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 3 Dec 2024 14:57:32 -0500
Subject: [PATCH 129/141] hepmc3: fix HepMC3-config on darwin (#360478)

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

diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix
index f7f281af74f3..5294f18661e3 100644
--- a/pkgs/development/libraries/physics/hepmc3/default.nix
+++ b/pkgs/development/libraries/physics/hepmc3/default.nix
@@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     substituteInPlace "$out"/bin/HepMC3-config \
-      --replace 'greadlink' '${coreutils}/bin/readlink' \
-      --replace 'readlink' '${coreutils}/bin/readlink'
+      --replace-fail '$(greadlink' '$(${coreutils}/bin/readlink' \
+      --replace-fail '$(readlink' '$(${coreutils}/bin/readlink'
   '';
 
   pythonImportsCheck = [ "pyHepMC3" ];

From 1904047ff063bed7623e62921df263be08c33227 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 3 Dec 2024 14:57:50 -0500
Subject: [PATCH 130/141] python3Packages.pyhepmc: 2.13.4 -> 2.14.0 (#360461)

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

diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix
index ade8cac689ea..1186d443a0a1 100644
--- a/pkgs/development/python-modules/pyhepmc/default.nix
+++ b/pkgs/development/python-modules/pyhepmc/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyhepmc";
-  version = "2.13.4";
+  version = "2.14.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "scikit-hep";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-86LDk0G9ckbV+/pNtLJa9EsA6plxerKI3ygxq680IKo=";
+    hash = "sha256-yh02Z1nPGjghZYHkPBlClDEztq4VQsW3H+kuco/lBpk=";
     fetchSubmodules = true;
   };
 

From 8d3033ab45ee165a89ba7cd8a99af571197940fb Mon Sep 17 00:00:00 2001
From: Jules Aguillon <jules@j3s.fr>
Date: Tue, 3 Dec 2024 21:10:47 +0100
Subject: [PATCH 131/141] ocamlformat: Build on OCaml 4.14 (#361404)

* ocamlformat: Build on OCaml 4.14

OCamlformat fails to build since the bump to OCaml 5.2 in
https://github.com/NixOS/nixpkgs/pull/346071

       error: ocamlformat 0.26.1 is not available for OCaml 5.2.1

This changes which version of the compiler is used to build OCamlformat.
4.14 is used to increase sharing when several versions of the tool are
used at the same time. This will not change OCamlformat's behaviors.

* ocamlformat_0_26_2: Build on the latest compiler
---
 pkgs/top-level/all-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02fe78d397cc..e864279ba1bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6796,12 +6796,12 @@ with pkgs;
 
   inherit (ocaml-ng.ocamlPackages_4_14)
     ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0
-    ocamlformat_0_22_4;
+    ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1
+    ocamlformat_0_26_0 ocamlformat_0_26_1;
 
   inherit (ocamlPackages)
     ocamlformat # latest version
-    ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 ocamlformat_0_26_0
-    ocamlformat_0_26_1 ocamlformat_0_26_2;
+    ocamlformat_0_26_2;
 
   inherit (ocamlPackages) odig;
 

From d47140b9bd2ea7b736cb9260785e1fa09599516e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 3 Dec 2024 21:29:04 +0100
Subject: [PATCH 132/141] nixos/loki: fix eval after ccaf4694

---
 nixos/modules/services/monitoring/loki.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/loki.nix b/nixos/modules/services/monitoring/loki.nix
index 128128008731..892605fa7016 100644
--- a/nixos/modules/services/monitoring/loki.nix
+++ b/nixos/modules/services/monitoring/loki.nix
@@ -96,7 +96,6 @@ in {
       wants = [ "network-online.target" ];
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
 
       serviceConfig = let
         conf = if cfg.configFile == null

From d1100914878d19696e323b4d35cbb0aae862df5f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 10:55:22 +0100
Subject: [PATCH 133/141] nbtscanner: refactor

- add changelog to meta
---
 pkgs/tools/security/nbtscanner/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/nbtscanner/default.nix b/pkgs/tools/security/nbtscanner/default.nix
index ec6d9a1d661b..82a9c1796f6c 100644
--- a/pkgs/tools/security/nbtscanner/default.nix
+++ b/pkgs/tools/security/nbtscanner/default.nix
@@ -11,8 +11,8 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "jonkgrimes";
-    repo = pname;
-    rev = version;
+    repo = "nbtscanner";
+    rev = "refs/tags/${version}";
     hash = "sha256-lnTTutOc829COwfNhBkSK8UpiNnGsm7Da53b+eSBt1Q=";
   };
 
@@ -26,9 +26,10 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "NetBIOS scanner written in Rust";
-    mainProgram = "nbtscanner";
     homepage = "https://github.com/jonkgrimes/nbtscanner";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/jonkgrimes/nbtscanner/releases/tag/${version}";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "nbtscanner";
   };
 }

From efa0a14b3b28c616c72b2434169ecd5a1a478fd5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 10:56:00 +0100
Subject: [PATCH 134/141] nbtscanner: format with nixfmt

---
 pkgs/tools/security/nbtscanner/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/nbtscanner/default.nix b/pkgs/tools/security/nbtscanner/default.nix
index 82a9c1796f6c..aca8e3daed2b 100644
--- a/pkgs/tools/security/nbtscanner/default.nix
+++ b/pkgs/tools/security/nbtscanner/default.nix
@@ -1,8 +1,9 @@
-{ lib
-, stdenv
-, rustPlatform
-, fetchFromGitHub
-, Security
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  Security,
 }:
 
 rustPlatform.buildRustPackage rec {

From 2187a09269bb83d08094d78b648dd235506c32cb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 11:02:54 +0100
Subject: [PATCH 135/141] nbtscanner: add versionCheckHook

---
 pkgs/tools/security/nbtscanner/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/tools/security/nbtscanner/default.nix b/pkgs/tools/security/nbtscanner/default.nix
index aca8e3daed2b..06e824463106 100644
--- a/pkgs/tools/security/nbtscanner/default.nix
+++ b/pkgs/tools/security/nbtscanner/default.nix
@@ -4,6 +4,7 @@
   rustPlatform,
   fetchFromGitHub,
   Security,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -23,8 +24,20 @@ rustPlatform.buildRustPackage rec {
     ./Cargo.lock.patch
   ];
 
+  postPatch = ''
+    # https://github.com/jonkgrimes/nbtscanner/issues/4
+    substituteInPlace src/main.rs \
+      --replace-fail '.version("0.1")' '.version("${version}")'
+  '';
+
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = [ "--version" ];
+
   meta = with lib; {
     description = "NetBIOS scanner written in Rust";
     homepage = "https://github.com/jonkgrimes/nbtscanner";

From 96a1839b9b044b9d6af7cda542c33e529c1e1fed Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Tue, 3 Dec 2024 23:02:06 +0200
Subject: [PATCH 136/141] yt-dlp: 2024.11.18 -> 2024.12.3

Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2024.12.03
Diff: https://github.com/yt-dlp/yt-dlp/compare/2024.11.18...2024.12.03
---
 pkgs/by-name/yt/yt-dlp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index 884089079e1d..7da4db2e7af3 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec {
   # The websites yt-dlp deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2024.11.18";
+  version = "2024.12.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "yt_dlp";
-    hash = "sha256-uKTCPTya/X5Ha824fzi2wOjhLjojnXmI8TrLQ0IA9U0=";
+    hash = "sha256-Nav/UcV2IDMQPyMwugqKH0jEOIpBOi2M3JuEZC/o7dQ=";
   };
 
   build-system = with python3Packages; [

From 776885fdf5b07b3c13d7ec0f5ad700505d86a6d8 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Wed, 4 Dec 2024 05:18:37 +0800
Subject: [PATCH 137/141] starpls: 0.1.15 -> 0.1.17 (#360344)

---
 pkgs/by-name/st/starpls/manifest.json | 18 +++++++++++-------
 pkgs/by-name/st/starpls/update.py     |  1 +
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/st/starpls/manifest.json b/pkgs/by-name/st/starpls/manifest.json
index 99de0529906f..2d11d58eea61 100644
--- a/pkgs/by-name/st/starpls/manifest.json
+++ b/pkgs/by-name/st/starpls/manifest.json
@@ -1,17 +1,21 @@
 {
-  "version": "0.1.15",
+  "version": "0.1.17",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.15/starpls-linux-amd64",
-      "hash": "sha256-6rLYCRg7K36xKxW0nI86w6u1MjAPGTtJQbY5HCSukTE="
+      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-linux-amd64",
+      "hash": "sha256-LGW7KBC0/q/JMdpQSaTjqSqjjNqH49WoZJQMXKOkq5c="
     },
     "aarch64-linux": {
-      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.15/starpls-linux-aarch64",
-      "hash": "sha256-sHyPcaBlhZrepfnVGE5CxvZZOrBMT0qDP9hHj78CXJQ="
+      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-linux-aarch64",
+      "hash": "sha256-qsS0J4qiaj7nuC9Gv2hZHAuZ3L+GZFaZAazkxOlZvAc="
+    },
+    "x86_64-darwin": {
+      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-darwin-amd64",
+      "hash": "sha256-VB2Y8UMyVxkPmeA0wTlIq/0Rc4Yei9PZrMz86m111GA="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.15/starpls-darwin-arm64",
-      "hash": "sha256-Q8U+Vagwb9F63N5UA8sAOd+tfCvyZMdtAmZcNgtwiSo="
+      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-darwin-arm64",
+      "hash": "sha256-JSJ6gypX1bcPJ57f4XIB5DCL2HynhhIlG6pwbJjpVCE="
     }
   }
 }
diff --git a/pkgs/by-name/st/starpls/update.py b/pkgs/by-name/st/starpls/update.py
index c019a893d189..5b397e3d0c00 100755
--- a/pkgs/by-name/st/starpls/update.py
+++ b/pkgs/by-name/st/starpls/update.py
@@ -11,6 +11,7 @@ import httpx
 platforms = {
     "x86_64-linux": "linux-amd64",
     "aarch64-linux": "linux-aarch64",
+    "x86_64-darwin": "darwin-amd64",
     "aarch64-darwin": "darwin-arm64",
 }
 

From 229da450d6f628a9444c6d39d4b2349ea53b7e44 Mon Sep 17 00:00:00 2001
From: Marco Rebhan <me@dblsaiko.net>
Date: Tue, 3 Dec 2024 21:20:17 +0000
Subject: [PATCH 138/141] nix-plugin-pijul: 0.1.5 -> 0.1.6 (#360578)

---
 pkgs/by-name/ni/nix-plugin-pijul/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ni/nix-plugin-pijul/package.nix b/pkgs/by-name/ni/nix-plugin-pijul/package.nix
index 34241da25652..b1695931b95b 100644
--- a/pkgs/by-name/ni/nix-plugin-pijul/package.nix
+++ b/pkgs/by-name/ni/nix-plugin-pijul/package.nix
@@ -2,7 +2,8 @@
   lib,
   stdenv,
   fetchzip,
-  cmake,
+  meson,
+  ninja,
   pkg-config,
   boost,
   howard-hinnant-date,
@@ -17,15 +18,16 @@
 let nix = if nixOverride != null then nixOverride else nixVersions.nix_2_24;
 in stdenv.mkDerivation (finalAttrs: {
   pname = "nix-plugin-pijul";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchzip {
     url = "https://dblsaiko.net/pub/nix-plugin-pijul/nix-plugin-pijul-${finalAttrs.version}.tar.gz";
-    hash = "sha256-1BJZ0lv7XDgT/AiXmJ2Z5Jn0tEa1Yerp9YYcjVCHqoI=";
+    hash = "sha256-BOuBaFvejv1gffhBlAJADLtd5Df71oQbuCnniU07nF4=";
   };
 
   nativeBuildInputs = [
-    cmake
+    meson
+    ninja
     pkg-config
   ];
 

From 1930a6cb529d3b5ed4f5565cae6fd7c35cc003b4 Mon Sep 17 00:00:00 2001
From: Brian Wong <bwong@stalerice.com>
Date: Tue, 3 Dec 2024 16:52:28 -0500
Subject: [PATCH 139/141] open-webui: add missing dependencies

Added `iso-639` and `langdetect` modules.
---
 pkgs/by-name/op/open-webui/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index 3523f578d8d1..d2164ff8c261 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -92,9 +92,11 @@ python312.pkgs.buildPythonApplication rec {
     ftfy
     google-generativeai
     googleapis-common-protos
+    iso-639
     langchain
     langchain-chroma
     langchain-community
+    langdetect
     langfuse
     ldap3
     markdown

From 0dedae51b9756a052b3abe22f7e50697108ef3be Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Dec 2024 22:53:40 +0100
Subject: [PATCH 140/141] nbtscanner: move to pkgs/by-name

---
 .../security => by-name/nb}/nbtscanner/Cargo.lock.patch     | 0
 .../default.nix => by-name/nb/nbtscanner/package.nix}       | 6 +++---
 pkgs/top-level/all-packages.nix                             | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{tools/security => by-name/nb}/nbtscanner/Cargo.lock.patch (100%)
 rename pkgs/{tools/security/nbtscanner/default.nix => by-name/nb/nbtscanner/package.nix} (90%)

diff --git a/pkgs/tools/security/nbtscanner/Cargo.lock.patch b/pkgs/by-name/nb/nbtscanner/Cargo.lock.patch
similarity index 100%
rename from pkgs/tools/security/nbtscanner/Cargo.lock.patch
rename to pkgs/by-name/nb/nbtscanner/Cargo.lock.patch
diff --git a/pkgs/tools/security/nbtscanner/default.nix b/pkgs/by-name/nb/nbtscanner/package.nix
similarity index 90%
rename from pkgs/tools/security/nbtscanner/default.nix
rename to pkgs/by-name/nb/nbtscanner/package.nix
index 06e824463106..17894259a546 100644
--- a/pkgs/tools/security/nbtscanner/default.nix
+++ b/pkgs/by-name/nb/nbtscanner/package.nix
@@ -1,9 +1,9 @@
 {
   lib,
   stdenv,
-  rustPlatform,
+  darwin,
   fetchFromGitHub,
-  Security,
+  rustPlatform,
   versionCheckHook,
 }:
 
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
       --replace-fail '.version("0.1")' '.version("${version}")'
   '';
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e864279ba1bd..5fc35b5ebbc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4205,10 +4205,6 @@ with pkgs;
 
   nanoemoji = with python3Packages; toPythonApplication nanoemoji;
 
-  nbtscanner = callPackage ../tools/security/nbtscanner {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-
   netexec = python3Packages.callPackage ../tools/security/netexec { };
 
   netdata = callPackage ../tools/system/netdata {

From 4aacc1cb8af48c320ec9b3f0c6127db6ff8126e8 Mon Sep 17 00:00:00 2001
From: Linus Karl <linus@lotz.li>
Date: Wed, 4 Dec 2024 00:00:41 +0100
Subject: [PATCH 141/141] maintainers: fix typo

Fixed typo in my username
---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b7842f942bc5..6e50e5d0e96f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18656,7 +18656,7 @@
   };
   returntoreality = {
     email = "linus@lotz.li";
-    github = "retuntoreality";
+    github = "returntoreality";
     githubId = 255667;
     name = "Linus Karl";
   };