From d84584efcec278d7451807f3f070f95db68aa009 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Nov 2024 05:23:32 +0000
Subject: [PATCH 001/124] filesender: 2.49 -> 2.50

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

diff --git a/pkgs/by-name/fi/filesender/package.nix b/pkgs/by-name/fi/filesender/package.nix
index 27a6cf73e76b..6c32df86c56c 100644
--- a/pkgs/by-name/fi/filesender/package.nix
+++ b/pkgs/by-name/fi/filesender/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "filesender";
-  version = "2.49";
+  version = "2.50";
 
   src = fetchFromGitHub {
     owner = "filesender";
     repo = "filesender";
     rev = "filesender-${finalAttrs.version}";
-    hash = "sha256-GNhborbwV9G2x7pLDyxGVCtTf4AIaMYQGAKNJPzedzo=";
+    hash = "sha256-H42mNkHj0BVof/vr/GBcjIpNY7P0UDTT5VtjPKCbpgg=";
   };
 
   patches = [

From 2f9c81ffb1851e6d49f9157396aee8c12b3a1db5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 7 Nov 2024 16:34:54 +0000
Subject: [PATCH 002/124] ocamlPackages.sel: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/development/ocaml-modules/sel/default.nix b/pkgs/development/ocaml-modules/sel/default.nix
index e9742c9b42d5..e5fdccbc7a3f 100644
--- a/pkgs/development/ocaml-modules/sel/default.nix
+++ b/pkgs/development/ocaml-modules/sel/default.nix
@@ -2,13 +2,13 @@
 
 buildDunePackage rec {
   pname = "sel";
-  version = "0.4.0";
+  version = "0.5.0";
 
   minimalOCamlVersion = "4.07";
 
   src = fetchurl {
     url = "https://github.com/gares/sel/releases/download/v${version}/sel-${version}.tbz";
-    hash = "sha256-Sp0eSeKyFmMvOQrebqLKP+HbHQB0D0eAmEjDzxnFL1I=";
+    hash = "sha256-n4Z+Pe9fkHLnRzwCryxYNe165Q2Vds9+CduRbRJjqI0=";
   };
 
   buildInputs = [

From d231c9ea3a2f78fa15e9c58296128c11495ff263 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Nov 2024 06:09:59 +0000
Subject: [PATCH 003/124] ocamlPackages.cairo2: 0.6.4 -> 0.6.5

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

diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix
index eefac702d7ef..38a6f2324ff7 100644
--- a/pkgs/development/ocaml-modules/cairo2/default.nix
+++ b/pkgs/development/ocaml-modules/cairo2/default.nix
@@ -3,11 +3,11 @@
 
 buildDunePackage rec {
   pname = "cairo2";
-  version = "0.6.4";
+  version = "0.6.5";
 
   src = fetchurl {
     url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz";
-    sha256 = "sha256-QDVzUtcgXTpXNYVWQ4MMs0Xy24OP+dGaUyAYdg1GigU=";
+    sha256 = "sha256-JdxByUNtmrz1bKrZoQWUT/c0YEG4zGoqZUq4hItlc3I=";
   };
 
   minimalOCamlVersion = "4.02";

From ec1db0b7392121d89dbaa1cdb705ff1d1c7f3811 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 9 Nov 2024 10:54:01 +0000
Subject: [PATCH 004/124] turbovnc: 3.1.2 -> 3.1.3

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

diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix
index f9caa657923b..ed3c873d162f 100644
--- a/pkgs/tools/admin/turbovnc/default.nix
+++ b/pkgs/tools/admin/turbovnc/default.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "turbovnc";
-  version = "3.1.2";
+  version = "3.1.3";
 
   src = fetchFromGitHub {
     owner = "TurboVNC";
     repo = "turbovnc";
     rev = finalAttrs.version;
-    hash = "sha256-bU23sCjU3lUQszqyLHjKTxUKj0ngkkrUb8xYi9XSFj0=";
+    hash = "sha256-Bq9Kaz6m8twOjX0Y05TXPpYYQJqKe86WxhBmNEHAOfA=";
   };
 
   # TODO:

From c659022ecb860175ee5464c8f0ad51e6d89bfc25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Nov 2024 08:37:09 +0000
Subject: [PATCH 005/124] schemacrawler: 16.22.2 -> 16.22.3

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

diff --git a/pkgs/by-name/sc/schemacrawler/package.nix b/pkgs/by-name/sc/schemacrawler/package.nix
index 70d54d077445..7b01bc859c06 100644
--- a/pkgs/by-name/sc/schemacrawler/package.nix
+++ b/pkgs/by-name/sc/schemacrawler/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "schemacrawler";
-  version = "16.22.2";
+  version = "16.22.3";
 
   src = fetchzip {
     url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip";
-    hash = "sha256-N08lKCTbpX4b05i4UcCEy6wycsiIJu5BRr7EZ3oZ1rA=";
+    hash = "sha256-bZXJvINVsDkGU+xR1tukK2qY93MAVIp2yGV5TZQoQsY=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 5bdf0a48312158baa1e4c8dc1e1a67c5f4dc9cc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Nov 2024 04:54:20 +0000
Subject: [PATCH 006/124] healthchecks: 3.6 -> 3.7

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

diff --git a/pkgs/by-name/he/healthchecks/package.nix b/pkgs/by-name/he/healthchecks/package.nix
index 5f366a255a0f..c80f753cf46f 100644
--- a/pkgs/by-name/he/healthchecks/package.nix
+++ b/pkgs/by-name/he/healthchecks/package.nix
@@ -14,14 +14,14 @@ let
 in
 py.pkgs.buildPythonApplication rec {
   pname = "healthchecks";
-  version = "3.6";
+  version = "3.7";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "healthchecks";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-aKt9L3ZgZ8HffcNNJaR+hAI38raWuLp2q/6+rvkl2pM=";
+    sha256 = "sha256-pPO1ktPeiXKNryUe74Zeqd7q92yDs3kplEkwEfuvNh8=";
   };
 
   propagatedBuildInputs = with py.pkgs; [

From 6cf58c53e3ca09c4e95fb89271b004a8189362b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Nov 2024 06:06:46 +0000
Subject: [PATCH 007/124] keymapper: 4.8.2 -> 4.9.0

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

diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix
index 8f643d71812c..a0e2150c03c2 100644
--- a/pkgs/by-name/ke/keymapper/package.nix
+++ b/pkgs/by-name/ke/keymapper/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "keymapper";
-  version = "4.8.2";
+  version = "4.9.0";
 
   src = fetchFromGitHub {
     owner = "houmain";
     repo = "keymapper";
     rev = finalAttrs.version;
-    hash = "sha256-4LYGsqHD3msJNgkaInJyH7o+jebeQoh/rUAsvIsqkdM=";
+    hash = "sha256-GckqlKpF1N7Khq/9ju1IG1+jfPBuWhFAHhYnlCMC5Cw=";
   };
 
   # all the following must be in nativeBuildInputs

From 66f4003f0ff82d2a7484ed90a45148933d0ebc5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Nov 2024 07:35:30 +0000
Subject: [PATCH 008/124] sftpgo: 2.6.2 -> 2.6.3

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

diff --git a/pkgs/by-name/sf/sftpgo/package.nix b/pkgs/by-name/sf/sftpgo/package.nix
index 3a3b687459c8..a8577be31592 100644
--- a/pkgs/by-name/sf/sftpgo/package.nix
+++ b/pkgs/by-name/sf/sftpgo/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "sftpgo";
-  version = "2.6.2";
+  version = "2.6.3";
 
   src = fetchFromGitHub {
     owner = "drakkan";
     repo = "sftpgo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-76P4njY/Wb9l4LG+sZwiwQVrvfXCtAELju30GLi7kBE=";
+    hash = "sha256-wkdc6nVJgpl1zizw3WJ3y3N4KzEW6WXSt5G/kOF2su8=";
   };
 
-  vendorHash = "sha256-gBb+qpNFSFhCOYLxXkz3xmyx+3PvyOwLNqjT9zZQuc8=";
+  vendorHash = "sha256-VConM8zvpTTIQ5FIzI7yqDdhN0UPIAoDiudqU4k+5Vo=";
 
   ldflags = [
     "-s"

From 4fc640279dd2c3890abc906bf1dcb920b1993e16 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Nov 2024 00:10:36 +0000
Subject: [PATCH 009/124] dolt: 1.43.1 -> 1.43.15

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

diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index 573c75351266..a27cf61e41ad 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "dolt";
-  version = "1.43.1";
+  version = "1.43.15";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     rev = "v${version}";
-    sha256 = "sha256-i+WW8udVjLQGMg0eu03hInfXaLZzVJ4liKE4eQ/KDww=";
+    sha256 = "sha256-dmRi+VZWmHPbTgkShS/zQ7/JaNJ2GSw0l1gGEC/zmkA=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" ];
-  vendorHash = "sha256-0SvM6I+zGelSUMlbeeqljfzITw0Cnl2BZHJ78n+m5ds=";
+  vendorHash = "sha256-FXVLvPoKzMuGpaXa3sDATURDwhrBwY6wUTnxcjEA0PU=";
   proxyVendor = true;
   doCheck = false;
 

From ee355521d0d0ae2cdc7ae33cd193a3538274f3a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 18 Nov 2024 04:56:52 +0000
Subject: [PATCH 010/124] video2midi: 0.4.8 -> 0.4.9

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

diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix
index 1e3b85858294..5d5cf08c8974 100644
--- a/pkgs/tools/audio/video2midi/default.nix
+++ b/pkgs/tools/audio/video2midi/default.nix
@@ -8,7 +8,7 @@ let
   });
 in pythonPackages.buildPythonApplication rec {
   pname = "video2midi";
-  version = "0.4.8";
+  version = "0.4.9";
 
   format = "other";
 
@@ -16,7 +16,7 @@ in pythonPackages.buildPythonApplication rec {
     owner = "svsdval";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-1q4d136pvEWTOCY7Dv8Ux2HV9zqz5pWRhMrHKGLQ5ic=";
+    sha256 = "sha256-mjqlNUCEiP5dQS0a8HAejOJyEvY6jGFJFpVcnzU2Vds=";
   };
 
   propagatedBuildInputs = with pythonPackages; [ opencv4_ midiutil pygame pyopengl ];

From 8de980f74866b64d4ba05f68052511bf71f00e28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Oct 2024 15:07:28 +0000
Subject: [PATCH 011/124] atlantis: 0.28.5 -> 0.30.0

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

diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix
index c621d042bb24..e68e9da7e3d1 100644
--- a/pkgs/by-name/at/atlantis/package.nix
+++ b/pkgs/by-name/at/atlantis/package.nix
@@ -2,20 +2,20 @@
 
 buildGoModule rec {
   pname = "atlantis";
-  version = "0.28.5";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "runatlantis";
     repo = "atlantis";
     rev = "v${version}";
-    hash = "sha256-oyECtP/YeEhvsltWZq52YNq+Gbbpko9bbbUTh5NA/9c=";
+    hash = "sha256-hM4IycRE3/jiwFLqkU/jz9sPP9KTfeu8ouIJlqgPxmk=";
   };
   ldflags = [
     "-X=main.version=${version}"
     "-X=main.date=1970-01-01T00:00:00Z"
   ];
 
-  vendorHash = "sha256-oiRpmGfuc37s3ZD8R7L9EFieqJP7mYvDsiJBzruCSkA=";
+  vendorHash = "sha256-uH+Q5NXBL1+LFa6tw3x2CE1B5QElqK9KuFeYQpCFAW0=";
 
   subPackages = [ "." ];
 

From e9bc776c6b774006440cb57f5ea26a865cf041cb Mon Sep 17 00:00:00 2001
From: Claudio Bley <claudio.bley@gmail.com>
Date: Tue, 9 Apr 2024 18:00:35 +0200
Subject: [PATCH 012/124] paperjam: init at 1.2.1

Co-authored-by: Anderson Torres <torres.anderson.85@protonmail.com>
---
 pkgs/by-name/pa/paperjam/package.nix | 50 ++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 pkgs/by-name/pa/paperjam/package.nix

diff --git a/pkgs/by-name/pa/paperjam/package.nix b/pkgs/by-name/pa/paperjam/package.nix
new file mode 100644
index 000000000000..f71bae04ae81
--- /dev/null
+++ b/pkgs/by-name/pa/paperjam/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  qpdf,
+  libiconv,
+  libpaper,
+  asciidoc,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "paperjam";
+  version = "1.2.1";
+
+  src = fetchurl {
+    url = "https://mj.ucw.cz/download/linux/paperjam-${finalAttrs.version}.tar.gz";
+    hash = "sha256-vTjtNTkBHwfoRDshmFu1zZfGVuEtk2NXH5JdA5Ekg5s=";
+  };
+
+  buildInputs = [
+    qpdf
+    libpaper
+    asciidoc
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    # prevent real build date which is impure
+    "BUILD_DATE=\<unknown\>"
+    "BUILD_COMMIT=\<unknown\>"
+  ];
+
+  # provide backward compatible PointerHolder, suppress deprecation warnings
+  env.NIX_CFLAGS_COMPILE = "-DPOINTERHOLDER_TRANSITION=1";
+  env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
+
+  meta = {
+    homepage = "https://mj.ucw.cz/sw/paperjam/";
+    description = "Program for transforming PDF files";
+    longDescription = ''
+      PaperJam is a program for transforming PDF files. It can re-arrange
+      pages, scale and rotate them, put multiple pages on a single sheet, draw
+      cropmarks, and many other tricks.
+    '';
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "paperjam";
+    maintainers = with lib.maintainers; [ cbley ];
+    platforms = lib.platforms.all;
+  };
+})

From 650928dc6759e3a87c8b8b17eb0052e9398317f1 Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:24:39 -0500
Subject: [PATCH 013/124] tree-sitter: update webui fix-paths.patch

---
 pkgs/development/tools/parsing/tree-sitter/fix-paths.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/parsing/tree-sitter/fix-paths.patch b/pkgs/development/tools/parsing/tree-sitter/fix-paths.patch
index 6023a5934c8f..478ccb45ff9b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/fix-paths.patch
+++ b/pkgs/development/tools/parsing/tree-sitter/fix-paths.patch
@@ -1,11 +1,11 @@
 diff --git a/cli/loader/src/lib.rs b/cli/loader/src/lib.rs
-index 9c1d8dfc..a5cfc74c 100644
+index 4e3effed..74b4d3e3 100644
 --- a/cli/loader/src/lib.rs
 +++ b/cli/loader/src/lib.rs
-@@ -747,7 +747,7 @@ impl Loader {
-             Podman,
+@@ -969,7 +969,7 @@ impl Loader {
          }
  
+         let root_path = root_path.unwrap_or(src_path);
 -        let emcc_name = if cfg!(windows) { "emcc.bat" } else { "emcc" };
 +        let emcc_name = if cfg!(windows) { "emcc.bat" } else { "@emcc@" };
  

From c2e08444aff5b292a25deea201d42a3e10075de4 Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Sat, 30 Nov 2024 21:36:00 +0100
Subject: [PATCH 014/124] winetricks: enable darwin support

---
 pkgs/applications/emulators/wine/winetricks.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/emulators/wine/winetricks.nix b/pkgs/applications/emulators/wine/winetricks.nix
index 6d3ac4f66296..b809a85a079b 100644
--- a/pkgs/applications/emulators/wine/winetricks.nix
+++ b/pkgs/applications/emulators/wine/winetricks.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     mainProgram = "winetricks";
     license = lib.licenses.lgpl21;
     homepage = "https://github.com/Winetricks/winetricks";
-    platforms = with lib.platforms; linux;
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }

From 00ef09a323377af99d9e9e758a5f8c4ed105862a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Dec 2024 01:34:36 +0000
Subject: [PATCH 015/124] pekwm: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/by-name/pe/pekwm/package.nix b/pkgs/by-name/pe/pekwm/package.nix
index 11ff17f0d76b..d657141d7a4e 100644
--- a/pkgs/by-name/pe/pekwm/package.nix
+++ b/pkgs/by-name/pe/pekwm/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pekwm";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "pekdon";
     repo = "pekwm";
     rev = "release-${finalAttrs.version}";
-    hash= "sha256-hA+TBAs9NMcc5DKIkzyUHWck3Xht+yeCO54xJ6oXXuQ=";
+    hash= "sha256-l43xxCowSEBQjwg7hjpBwybFB12ESOep6hqdzSsD3YI=";
   };
 
   nativeBuildInputs = [

From 9f0eb5a46b4ce68052dc531cdbdfc780b08761b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Dec 2024 04:26:24 +0000
Subject: [PATCH 016/124] emacsPackages.isearch-prop: 0-unstable-2022-12-30 ->
 0-unstable-2024-10-13

---
 .../elisp-packages/manual-packages/isearch-prop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix
index c97d3cc2d491..f8c2a6c6aafe 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix
@@ -7,13 +7,13 @@
 
 melpaBuild {
   pname = "isearch-prop";
-  version = "0-unstable-2022-12-30";
+  version = "0-unstable-2024-10-13";
 
   src = fetchFromGitHub {
     owner = "emacsmirror";
     repo = "isearch-prop";
-    rev = "5787fd57977c0d6c416ce71471c3b9da246dfb78";
-    hash = "sha256-Xli7TxBenl5cDMJv3Qz7ZELFpvJKStMploLpf9a+uoA=";
+    rev = "7b32697c16541036abadbbb4d65dd67a4f1d2812";
+    hash = "sha256-NmFkbxiRFAqi1TaOFfmAOgIs1QZMKXkJfMmXL9fsV14=";
   };
 
   passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };

From ee14c24d032e92b8dbc93b0b0c75d6da114edc48 Mon Sep 17 00:00:00 2001
From: Chris Montgomery <chmont@proton.me>
Date: Fri, 22 Nov 2024 02:33:32 -0500
Subject: [PATCH 017/124] beets: add @montchr as co-maintainer

---
 pkgs/tools/audio/beets/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
index c8064a6310d0..2634d52c10bc 100644
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -174,7 +174,7 @@ EOF
     description = "Music tagger and library organizer";
     homepage = "https://beets.io";
     license = licenses.mit;
-    maintainers = with maintainers; [ aszlig doronbehar lovesegfault pjones ];
+    maintainers = with maintainers; [ aszlig doronbehar lovesegfault montchr pjones ];
     platforms = platforms.linux ++ platforms.darwin;
     mainProgram = "beet";
   };

From a75c56567c36ad2f9eb279fd9fd42c8820685a3a Mon Sep 17 00:00:00 2001
From: Chris Montgomery <chmont@proton.me>
Date: Fri, 22 Nov 2024 11:26:09 -0500
Subject: [PATCH 018/124] beetsPackages.extrafiles: remove broken/unmaintained
 plugin

As noted in a comment in the package expression, the third-party `extrafiles`
plugin has not been maintained since 2020 and has been broken since the release
of beets version 2.0.0 in May 2024.

Since the `beets-stable` package has been updated to version 2.0.0, it is no
longer feasible to keep `beetsPackages.extrafiles` around.
---
 pkgs/tools/audio/beets/default.nix            |  3 +-
 pkgs/tools/audio/beets/plugins/extrafiles.nix | 39 -------------------
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/tools/audio/beets/plugins/extrafiles.nix

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 85244c0e0b89..7300a8029f54 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -55,5 +55,6 @@ lib.makeExtensible (self: {
 
   alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; };
   copyartifacts = callPackage ./plugins/copyartifacts.nix { beets = self.beets-minimal; };
-  extrafiles = callPackage ./plugins/extrafiles.nix { beets = self.beets-minimal; };
+
+  extrafiles = throw "extrafiles is unmaintained since 2020 and broken since beets 2.0.0";
 })
diff --git a/pkgs/tools/audio/beets/plugins/extrafiles.nix b/pkgs/tools/audio/beets/plugins/extrafiles.nix
deleted file mode 100644
index 829d55c257e5..000000000000
--- a/pkgs/tools/audio/beets/plugins/extrafiles.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, fetchFromGitHub, beets, python3Packages }:
-
-python3Packages.buildPythonApplication {
-  pname = "beets-extrafiles";
-  version = "unstable-2020-12-13";
-
-  src = fetchFromGitHub {
-    repo = "beets-extrafiles";
-    owner = "Holzhaus";
-    rev = "a1d6ef9a9682b6bf7af9483541e56a3ff12247b8";
-    sha256 = "sha256-ajuEbieWjTCNjdRZuGUwvStZwjx260jmY0m+ZqNd7ec=";
-  };
-
-  postPatch = ''
-    sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py
-    sed -i -e '/namespace_packages/d' setup.py
-    sed -i -e 's/mediafile~=0.6.0/mediafile>=0.6.0/' setup.py
-  '';
-
-  propagatedBuildInputs = with python3Packages; [ mediafile ];
-
-  nativeCheckInputs = [
-    python3Packages.pytestCheckHook
-    beets
-  ];
-
-  preCheck = ''
-    HOME="$(mktemp -d)"
-  '';
-
-  meta = {
-    homepage = "https://github.com/Holzhaus/beets-extrafiles";
-    description = "Plugin for beets that copies additional files and directories during the import process";
-    license = lib.licenses.mit;
-    inherit (beets.meta) platforms;
-    # Upstream hasn't had commits since 2020, build is broken since beets 2.0.0
-    broken = true;
-  };
-}

From 538aacc1611841a8ab1c588fff24c2c01b707036 Mon Sep 17 00:00:00 2001
From: Chris Montgomery <chmont@proton.me>
Date: Fri, 22 Nov 2024 02:27:17 -0500
Subject: [PATCH 019/124] beets: mark builtin acousticbrainz plugin as
 deprecated

This happened in v2.0.0.
---
 pkgs/tools/audio/beets/builtin-plugins.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix
index 2b9ee3bc5d03..88194bc663e8 100644
--- a/pkgs/tools/audio/beets/builtin-plugins.nix
+++ b/pkgs/tools/audio/beets/builtin-plugins.nix
@@ -12,8 +12,6 @@
     deprecated = true;
     testPaths = [ ];
   };
-
-  acousticbrainz.propagatedBuildInputs = [ python3Packages.requests ];
   albumtypes = { };
   aura = {
     propagatedBuildInputs = with python3Packages; [ flask pillow ];

From 4efaa7aefbdcfaf10b2dcf81f4aa88174c39d4ea Mon Sep 17 00:00:00 2001
From: Chris Montgomery <chmont@proton.me>
Date: Fri, 22 Nov 2024 02:23:03 -0500
Subject: [PATCH 020/124] beets: alphabetize builtin plugins

Most were already in order but some plugins were thrown in at the bottom of the
file.
---
 pkgs/tools/audio/beets/builtin-plugins.nix | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix
index 88194bc663e8..c58300441485 100644
--- a/pkgs/tools/audio/beets/builtin-plugins.nix
+++ b/pkgs/tools/audio/beets/builtin-plugins.nix
@@ -12,11 +12,22 @@
     deprecated = true;
     testPaths = [ ];
   };
+  advancedrewrite = {
+    testPaths = [ ];
+  };
   albumtypes = { };
   aura = {
     propagatedBuildInputs = with python3Packages; [ flask pillow ];
     testPaths = [ ];
   };
+  autobpm = {
+    propagatedBuildInputs = with python3Packages; [
+      librosa
+      # An optional dependency of librosa, needed for beets' autobpm
+      resampy
+    ];
+    testPaths = [ ];
+  };
   badfiles = {
     testPaths = [ ];
     wrapperBins = [ mp3val flac ];
@@ -74,6 +85,10 @@
     propagatedBuildInputs = [ python3Packages.pylast ];
     testPaths = [ ];
   };
+  limit = { };
+  listenbrainz = {
+    testPaths = [ ];
+  };
   loadext = {
     propagatedBuildInputs = [ python3Packages.requests ];
     testPaths = [ ];
@@ -109,6 +124,9 @@
     testPaths = [ ];
   };
   subsonicupdate.propagatedBuildInputs = [ python3Packages.requests ];
+  substitute = {
+    testPaths = [ ];
+  };
   the = { };
   thumbnails = {
     propagatedBuildInputs = with python3Packages; [ pillow pyxdg ];
@@ -118,22 +136,4 @@
   unimported.testPaths = [ ];
   web.propagatedBuildInputs = [ python3Packages.flask ];
   zero = { };
-  limit = { };
-  substitute = {
-    testPaths = [ ];
-  };
-  advancedrewrite = {
-    testPaths = [ ];
-  };
-  autobpm = {
-    propagatedBuildInputs = with python3Packages; [
-      librosa
-      # An optional dependency of librosa, needed for beets' autobpm
-      resampy
-    ];
-    testPaths = [ ];
-  };
-  listenbrainz = {
-    testPaths = [ ];
-  };
 }

From 70a877ad9f7ed5332a83ff33fa1ad7556c4a652d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 1 Dec 2024 15:40:36 +0200
Subject: [PATCH 021/124] beets: nixfmt & remove dead code

---
 pkgs/tools/audio/beets/builtin-plugins.nix    |  55 +++--
 pkgs/tools/audio/beets/common.nix             | 227 ++++++++++--------
 pkgs/tools/audio/beets/default.nix            |  31 +--
 .../audio/beets/plugins/alternatives.nix      |  16 +-
 .../audio/beets/plugins/copyartifacts.nix     |   7 +-
 5 files changed, 199 insertions(+), 137 deletions(-)

diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix
index c58300441485..cf40c1dbbb6a 100644
--- a/pkgs/tools/audio/beets/builtin-plugins.nix
+++ b/pkgs/tools/audio/beets/builtin-plugins.nix
@@ -1,13 +1,15 @@
-{ aacgain
-, ffmpeg
-, flac
-, imagemagick
-, keyfinder-cli
-, mp3gain
-, mp3val
-, python3Packages
-, ...
-}: {
+{
+  aacgain,
+  ffmpeg,
+  flac,
+  imagemagick,
+  keyfinder-cli,
+  mp3gain,
+  mp3val,
+  python3Packages,
+  ...
+}:
+{
   absubmit = {
     deprecated = true;
     testPaths = [ ];
@@ -17,7 +19,10 @@
   };
   albumtypes = { };
   aura = {
-    propagatedBuildInputs = with python3Packages; [ flask pillow ];
+    propagatedBuildInputs = with python3Packages; [
+      flask
+      pillow
+    ];
     testPaths = [ ];
   };
   autobpm = {
@@ -30,7 +35,10 @@
   };
   badfiles = {
     testPaths = [ ];
-    wrapperBins = [ mp3val flac ];
+    wrapperBins = [
+      mp3val
+      flac
+    ];
   };
   bareasc = { };
   beatport.propagatedBuildInputs = [ python3Packages.requests-oauthlib ];
@@ -48,7 +56,10 @@
     propagatedBuildInputs = [ python3Packages.requests ];
     testPaths = [ ];
   };
-  discogs.propagatedBuildInputs = with python3Packages; [ discogs-client requests ];
+  discogs.propagatedBuildInputs = with python3Packages; [
+    discogs-client
+    requests
+  ];
   duplicates.testPaths = [ ];
   edit = { };
   embedart = {
@@ -58,7 +69,10 @@
   embyupdate.propagatedBuildInputs = [ python3Packages.requests ];
   export = { };
   fetchart = {
-    propagatedBuildInputs = with python3Packages; [ requests pillow ];
+    propagatedBuildInputs = with python3Packages; [
+      requests
+      pillow
+    ];
     wrapperBins = [ imagemagick ];
   };
   filefilter = { };
@@ -110,8 +124,12 @@
   playlist.propagatedBuildInputs = [ python3Packages.requests ];
   plexupdate = { };
   random = { };
-  replaygain.wrapperBins = [ aacgain ffmpeg mp3gain ];
-  rewrite.testPaths= [ ];
+  replaygain.wrapperBins = [
+    aacgain
+    ffmpeg
+    mp3gain
+  ];
+  rewrite.testPaths = [ ];
   scrub.testPaths = [ ];
   smartplaylist = { };
   sonosupdate = {
@@ -129,7 +147,10 @@
   };
   the = { };
   thumbnails = {
-    propagatedBuildInputs = with python3Packages; [ pillow pyxdg ];
+    propagatedBuildInputs = with python3Packages; [
+      pillow
+      pyxdg
+    ];
     wrapperBins = [ imagemagick ];
   };
   types.testPaths = [ "test/plugins/test_types_plugin.py" ];
diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
index 2634d52c10bc..7ffb89b73511 100644
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -1,71 +1,75 @@
-{ fetchpatch
-, bashInteractive
-, diffPlugins
-, glibcLocales
-, gobject-introspection
-, gst_all_1
-, lib
-, python3Packages
-, sphinxHook
-, runtimeShell
-, writeScript
+{
+  lib,
+  src,
+  version,
+  bashInteractive,
+  diffPlugins,
+  gobject-introspection,
+  gst_all_1,
+  python3Packages,
+  sphinxHook,
+  runtimeShell,
+  writeScript,
 
-  # plugin deps
-, aacgain
-, essentia-extractor
-, ffmpeg
-, flac
-, imagemagick
-, keyfinder-cli
-, mp3gain
-, mp3val
+  # plugin deps, used indirectly by the @inputs when we `import ./builtin-plugins.nix`
+  aacgain,
+  essentia-extractor,
+  ffmpeg,
+  flac,
+  imagemagick,
+  keyfinder-cli,
+  mp3gain,
+  mp3val,
 
-, src
-, version
-, extraPatches ? [ ]
-, pluginOverrides ? { }
-, disableAllPlugins ? false
-, disabledTests ? []
-, extraNativeBuildInputs ? []
+  extraPatches ? [ ],
+  pluginOverrides ? { },
+  disableAllPlugins ? false,
+  disabledTests ? [ ],
+  extraNativeBuildInputs ? [ ],
 
   # tests
-, runCommand
-, beets
+  runCommand,
+  beets,
 }@inputs:
 let
   inherit (lib) attrNames attrValues concatMap;
 
-  mkPlugin = { name
-  , enable ? !disableAllPlugins
-  , builtin ? false
-  , propagatedBuildInputs ? [ ]
-  , testPaths ? [
-    # NOTE: This conditional can be removed when beets-stable is updated and
-    # the default plugins test path is changed
-    (if (lib.versions.majorMinor version) == "1.6" then
-      "test/test_${name}.py"
-    else
-      "test/plugins/test_${name}.py"
-    )
-  ]
-  , wrapperBins ? [ ]
-  }: {
-    inherit name enable builtin propagatedBuildInputs testPaths wrapperBins;
-  };
+  mkPlugin =
+    {
+      name,
+      enable ? !disableAllPlugins,
+      builtin ? false,
+      propagatedBuildInputs ? [ ],
+      testPaths ? [
+        "test/plugins/test_${name}.py"
+      ],
+      wrapperBins ? [ ],
+    }:
+    {
+      inherit
+        name
+        enable
+        builtin
+        propagatedBuildInputs
+        testPaths
+        wrapperBins
+        ;
+    };
 
   basePlugins = lib.mapAttrs (_: a: { builtin = true; } // a) (import ./builtin-plugins.nix inputs);
-  pluginOverrides' = lib.mapAttrs
-    (plugName: lib.throwIf
-      (basePlugins.${plugName}.deprecated or false)
+  pluginOverrides' = lib.mapAttrs (
+    plugName:
+    lib.throwIf (basePlugins.${plugName}.deprecated or false)
       "beets evaluation error: Plugin ${plugName} was enabled in pluginOverrides, but it has been removed. Remove the override to fix evaluation."
-    )
-    pluginOverrides
-  ;
+  ) pluginOverrides;
 
-  allPlugins = lib.mapAttrs ( n: a: mkPlugin { name = n; } // a) (lib.recursiveUpdate basePlugins pluginOverrides');
+  allPlugins = lib.mapAttrs (n: a: mkPlugin { name = n; } // a) (
+    lib.recursiveUpdate basePlugins pluginOverrides'
+  );
   builtinPlugins = lib.filterAttrs (_: p: p.builtin) allPlugins;
   enabledPlugins = lib.filterAttrs (_: p: p.enable) allPlugins;
   disabledPlugins = lib.filterAttrs (_: p: !p.enable) allPlugins;
+  disabledTestPaths = lib.flatten (attrValues (lib.mapAttrs (_: v: v.testPaths) disabledPlugins));
 
   pluginWrapperBins = concatMap (p: p.wrapperBins) (attrValues enabledPlugins);
 in
@@ -75,20 +79,23 @@ python3Packages.buildPythonApplication {
 
   patches = extraPatches;
 
-  propagatedBuildInputs = with python3Packages; [
-    confuse
-    gst-python
-    jellyfish
-    mediafile
-    munkres
-    musicbrainzngs
-    mutagen
-    pygobject3
-    pyyaml
-    reflink
-    unidecode
-    typing-extensions
-  ] ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins));
+  propagatedBuildInputs =
+    with python3Packages;
+    [
+      confuse
+      gst-python
+      jellyfish
+      mediafile
+      munkres
+      musicbrainzngs
+      mutagen
+      pygobject3
+      pyyaml
+      reflink
+      unidecode
+      typing-extensions
+    ]
+    ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins));
 
   nativeBuildInputs = [
     gobject-introspection
@@ -96,15 +103,24 @@ python3Packages.buildPythonApplication {
     python3Packages.pydata-sphinx-theme
   ] ++ extraNativeBuildInputs;
 
-  buildInputs = [
-  ] ++ (with gst_all_1; [
-    gst-plugins-base
-    gst-plugins-good
-    gst-plugins-ugly
-  ]);
+  buildInputs =
+    [
+    ]
+    ++ (with gst_all_1; [
+      gst-plugins-base
+      gst-plugins-good
+      gst-plugins-ugly
+    ]);
 
-  outputs = [ "out" "doc" "man" ];
-  sphinxBuilders = [ "html" "man" ];
+  outputs = [
+    "out"
+    "doc"
+    "man"
+  ];
+  sphinxBuilders = [
+    "html"
+    "man"
+  ];
 
   postInstall = ''
     mkdir -p $out/share/zsh/site-functions
@@ -117,17 +133,20 @@ python3Packages.buildPythonApplication {
     "--prefix PATH : ${lib.makeBinPath pluginWrapperBins}"
   ];
 
-  nativeCheckInputs = with python3Packages; [
-    pytestCheckHook
-    pytest-cov
-    mock
-    rarfile
-    responses
-  ] ++ pluginWrapperBins;
+  nativeCheckInputs =
+    with python3Packages;
+    [
+      pytestCheckHook
+      pytest-cov
+      mock
+      rarfile
+      responses
+    ]
+    ++ pluginWrapperBins;
 
   __darwinAllowLocalNetworking = true;
 
-  disabledTestPaths = lib.flatten (attrValues (lib.mapAttrs (_: v: v.testPaths) disabledPlugins));
+  inherit disabledTestPaths;
   inherit disabledTests;
 
   # Perform extra "sanity checks", before running pytest tests.
@@ -152,30 +171,38 @@ python3Packages.buildPythonApplication {
     env EDITOR=true "$out/bin/beet" config -e
   '';
 
-
   passthru.plugins = allPlugins;
 
-  passthru.tests.gstreamer = runCommand "beets-gstreamer-test" {
-    meta.timeout = 60;
-  } ''
-    set -euo pipefail
-    export HOME=$(mktemp -d)
-    mkdir $out
+  passthru.tests.gstreamer =
+    runCommand "beets-gstreamer-test"
+      {
+        meta.timeout = 60;
+      }
+      ''
+            set -euo pipefail
+            export HOME=$(mktemp -d)
+            mkdir $out
 
-    cat << EOF > $out/config.yaml
-replaygain:
-  backend: gstreamer
-EOF
+            cat << EOF > $out/config.yaml
+        replaygain:
+          backend: gstreamer
+        EOF
 
-    ${beets}/bin/beet -c $out/config.yaml > /dev/null
-  '';
+            ${beets}/bin/beet -c $out/config.yaml > /dev/null
+      '';
 
-  meta = with lib; {
+  meta = {
     description = "Music tagger and library organizer";
     homepage = "https://beets.io";
-    license = licenses.mit;
-    maintainers = with maintainers; [ aszlig doronbehar lovesegfault montchr pjones ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      aszlig
+      doronbehar
+      lovesegfault
+      montchr
+      pjones
+    ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "beet";
   };
 }
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 7300a8029f54..9e25576492d9 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -1,20 +1,21 @@
-{ lib
-, callPackage
-, fetchFromGitHub
-, python3Packages
+{
+  lib,
+  callPackage,
+  fetchFromGitHub,
+  python3Packages,
 }:
 /*
-** To customize the enabled beets plugins, use the pluginOverrides input to the
-** derivation.
-** Examples:
-**
-** Disabling a builtin plugin:
-** beets.override { pluginOverrides = { beatport.enable = false; }; }
-**
-** Enabling an external plugin:
-** beets.override { pluginOverrides = {
-**   alternatives = { enable = true; propagatedBuildInputs = [ beetsPackages.alternatives ]; };
-** }; }
+  ** To customize the enabled beets plugins, use the pluginOverrides input to the
+  ** derivation.
+  ** Examples:
+  **
+  ** Disabling a builtin plugin:
+  ** beets.override { pluginOverrides = { beatport.enable = false; }; }
+  **
+  ** Enabling an external plugin:
+  ** beets.override { pluginOverrides = {
+  **   alternatives = { enable = true; propagatedBuildInputs = [ beetsPackages.alternatives ]; };
+  ** }; }
 */
 lib.makeExtensible (self: {
   beets = self.beets-stable;
diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix
index 440c476309a6..d2520fcaca63 100644
--- a/pkgs/tools/audio/beets/plugins/alternatives.nix
+++ b/pkgs/tools/audio/beets/plugins/alternatives.nix
@@ -1,4 +1,9 @@
-{ lib, fetchFromGitHub, beets, python3Packages }:
+{
+  lib,
+  fetchFromGitHub,
+  beets,
+  python3Packages,
+}:
 
 python3Packages.buildPythonApplication rec {
   pname = "beets-alternatives";
@@ -27,10 +32,13 @@ python3Packages.buildPythonApplication rec {
     export HOME=$(mktemp -d)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Beets plugin to manage external files";
     homepage = "https://github.com/geigerzaehler/beets-alternatives";
-    maintainers = with maintainers; [ aszlig lovesegfault ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [
+      aszlig
+      lovesegfault
+    ];
+    license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix
index d9d95a9f25d9..a835061deea2 100644
--- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix
+++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix
@@ -1,4 +1,9 @@
-{ lib, fetchFromGitHub, beets, python3Packages }:
+{
+  lib,
+  fetchFromGitHub,
+  beets,
+  python3Packages,
+}:
 
 python3Packages.buildPythonApplication rec {
   pname = "beets-copyartifacts";

From ed73a9dbc4c4030804c02cf5122e15b3b846bf61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= <smancill@smancill.dev>
Date: Sun, 1 Dec 2024 18:39:14 -0300
Subject: [PATCH 022/124] shogun: modernize

---
 .../machine-learning/shogun/default.nix       | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix
index 75bd2278d606..a0ac0fb26711 100644
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -62,6 +62,7 @@ let
       url = "https://github.com/Reactive-Extensions/RxCpp/archive/v${rxcppVersion}.tar.gz";
       sha256 = "sha256-UOc5WrG8KgAA3xJsaSCjbdPE7gSnFJay9MEK31DWUXg=";
     };
+
     gtest = fetchurl {
       url = "https://github.com/google/googletest/archive/release-${gtestVersion}.tar.gz";
       sha256 = "sha256-WKb0J3yivIVlIis7vVihd2CenEiOinJkk1m6UUUNt9g=";
@@ -69,7 +70,7 @@ let
   };
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   inherit pname version;
 
   outputs = [ "out" "dev" "doc" ];
@@ -132,7 +133,6 @@ stdenv.mkDerivation rec {
     ++ lib.optional opencvSupport opencv;
 
   cmakeFlags = let
-    enableIf = cond: if cond then "ON" else "OFF";
     excludeTestsRegex = lib.concatStringsSep "|" [
       # sporadic segfault
       "TrainedModelSerialization"
@@ -144,20 +144,20 @@ stdenv.mkDerivation rec {
       "modelselection_grid_search"
     ];
   in [
-    "-DBUILD_META_EXAMPLES=ON"
-    "-DCMAKE_DISABLE_FIND_PACKAGE_ARPACK=ON"
-    "-DCMAKE_DISABLE_FIND_PACKAGE_ARPREC=ON"
-    "-DCMAKE_DISABLE_FIND_PACKAGE_CPLEX=ON"
-    "-DCMAKE_DISABLE_FIND_PACKAGE_Mosek=ON"
-    "-DCMAKE_DISABLE_FIND_PACKAGE_TFLogger=ON"
-    "-DCMAKE_DISABLE_FIND_PACKAGE_ViennaCL=ON"
-    "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'${excludeTestsRegex}'"
-    "-DENABLE_TESTING=${enableIf doCheck}"
-    "-DDISABLE_META_INTEGRATION_TESTS=ON"
-    "-DTRAVIS_DISABLE_META_CPP=ON"
-    "-DINTERFACE_PYTHON=${enableIf pythonSupport}"
-    "-DOpenCV=${enableIf opencvSupport}"
-    "-DUSE_SVMLIGHT=${enableIf withSvmLight}"
+    (lib.cmakeBool "BUILD_META_EXAMPLES" true)
+    (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_ARPACK" true)
+    (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_ARPREC" true)
+    (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_CPLEX" true)
+    (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_Mosek" true)
+    (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_TFLogger" true)
+    (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_ViennaCL" true)
+    (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'${excludeTestsRegex}'")
+    (lib.cmakeBool "ENABLE_TESTING" finalAttrs.doCheck)
+    (lib.cmakeBool "DISABLE_META_INTEGRATION_TESTS" true)
+    (lib.cmakeBool "TRAVIS_DISABLE_META_CPP" true)
+    (lib.cmakeBool "INTERFACE_PYTHON" pythonSupport)
+    (lib.cmakeBool "OpenCV" opencvSupport)
+    (lib.cmakeBool "USE_SVMLIGHT" withSvmLight)
   ];
 
   CXXFLAGS = "-faligned-new";
@@ -196,7 +196,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     # CMake incorrectly calculates library path from dev prefix
     substituteInPlace $dev/lib/cmake/shogun/ShogunTargets-release.cmake \
-      --replace "\''${_IMPORT_PREFIX}/lib/" "$out/lib/"
+      --replace-fail "\''${_IMPORT_PREFIX}/lib/" "$out/lib/"
   '';
 
   meta = with lib; {
@@ -205,4 +205,4 @@ stdenv.mkDerivation rec {
     license = if withSvmLight then licenses.unfree else licenses.gpl3Plus;
     maintainers = with maintainers; [ edwtjo smancill ];
   };
-}
+})

From 9e5774c4e319c570335c26ca1013fdba3252f5a0 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Sun, 1 Dec 2024 14:14:44 -0800
Subject: [PATCH 023/124] python312Packages.hvplot: fix checks on darwin

fix checkphase on darwin to not access the display
---
 pkgs/development/python-modules/hvplot/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix
index 4831f14335c0..0687b65e297f 100644
--- a/pkgs/development/python-modules/hvplot/default.nix
+++ b/pkgs/development/python-modules/hvplot/default.nix
@@ -69,6 +69,12 @@ buildPythonPackage rec {
     "hvplot/tests/testutil.py"
   ];
 
+  # need to set MPLBACKEND=agg for headless matplotlib for darwin
+  # https://github.com/matplotlib/matplotlib/issues/26292
+  preCheck = ''
+    export MPLBACKEND=agg
+  '';
+
   pythonImportsCheck = [ "hvplot.pandas" ];
 
   meta = {

From ede0d4bd24d538b0b1863ab8488bdfb4ac2f83aa Mon Sep 17 00:00:00 2001
From: Mel Bourgeois <mason.bourgeois@gmail.com>
Date: Fri, 15 Nov 2024 16:57:11 -0600
Subject: [PATCH 024/124] datadog-integrations-core: 7.38.0 -> 7.50.2

---
 .../networking/dd-agent/integrations-core.nix | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix
index 39f3eb9fda4e..7a3a14a80931 100644
--- a/pkgs/tools/networking/dd-agent/integrations-core.nix
+++ b/pkgs/tools/networking/dd-agent/integrations-core.nix
@@ -33,7 +33,7 @@
 #
 # [1]: https://github.com/DataDog/integrations-core
 
-{ pkgs, python, extraIntegrations ? {} }:
+{ pkgs, python, extraIntegrations ? { }, }:
 
 let
   inherit (pkgs.lib) attrValues mapAttrs;
@@ -42,18 +42,21 @@ let
     owner = "DataDog";
     repo = "integrations-core";
     rev = version;
-    sha256 = "sha256-CIzuJ97KwsG1k65Y+8IUSka/3JX1pmQKN3hPHzZnGhQ=";
+    sha256 = "sha256-tgY8Jh7N9ot3Xp+JfsA9vEzj62H2OPTEh6b1YzyNGRU=";
   };
-  version = "7.38.0";
+  version = "7.50.2";
 
   # Build helper to build a single datadog integration package.
-  buildIntegration = { pname, ... }@args: python.pkgs.buildPythonPackage (args // {
-    inherit src version;
-    name = "datadog-integration-${pname}-${version}";
+  buildIntegration = { pname, ... }@args:
+    python.pkgs.buildPythonPackage (args // {
+      inherit src version;
+      name = "datadog-integration-${pname}-${version}";
+      pyproject = true;
 
-    sourceRoot = "${src.name}/${args.sourceRoot or pname}";
-    doCheck = false;
-  });
+      sourceRoot = "${src.name}/${args.sourceRoot or pname}";
+      buildInputs = with python.pkgs; [ hatchling setuptools ];
+      doCheck = false;
+    });
 
   # Base package depended on by all other integrations.
   datadog_checks_base = buildIntegration {

From 5121d2de488bacefa7bdff9c2fb0e2e3633749c3 Mon Sep 17 00:00:00 2001
From: Mel Bourgeois <mason.bourgeois@gmail.com>
Date: Mon, 25 Nov 2024 03:07:33 -0600
Subject: [PATCH 025/124] datadog-agent: 7.50.3 -> 7.56.2

---
 .../networking/dd-agent/datadog-agent.nix     | 40 ++++++++-----------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index 43da147e06ec..027986a408f4 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , cmake
-, buildGoModule
+, buildGo122Module
 , makeWrapper
 , fetchFromGitHub
 , pythonPackages
@@ -9,6 +9,7 @@
 , systemd
 , hostname
 , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
+, withDocker ? true
 , extraTags ? [ ]
 , testers
 , datadog-agent
@@ -16,17 +17,17 @@
 
 let
   # keep this in sync with github.com/DataDog/agent-payload dependency
-  payloadVersion = "5.0.97";
+  payloadVersion = "5.0.124";
   python = pythonPackages.python;
   owner   = "DataDog";
   repo    = "datadog-agent";
   goPackagePath = "github.com/${owner}/${repo}";
-  version = "7.50.3";
+  version = "7.56.2";
 
   src = fetchFromGitHub {
     inherit owner repo;
     rev = version;
-    hash = "sha256-AN5BruLPyrpIGSUkcYkZC0VgItk9NHiZTXstv6j9TlY=";
+    hash = "sha256-rU3eg92MuGs/6r7oJho2roeUCZoyfqYt1xOERoRPqmQ=";
   };
   rtloader = stdenv.mkDerivation {
     pname = "datadog-agent-rtloader";
@@ -37,19 +38,20 @@ let
     cmakeFlags = ["-DBUILD_DEMO=OFF" "-DDISABLE_PYTHON2=ON"];
   };
 
-in buildGoModule rec {
+in buildGo122Module rec {
   pname = "datadog-agent";
   inherit src version;
 
   doCheck = false;
 
-  vendorHash = "sha256-Rn8EB/6FHQk9COlOaxm4TQXjGCIPZHJV2QQnPDcbRnM=";
+  vendorHash = if stdenv.isDarwin
+               then "sha256-3Piq5DPMTZUEjqNkw5HZY25An2kATX6Jac9unQfZnZc="
+               else "sha256-FR0Et3DvjJhbYUPy9mpN0QCJ7QDU4VRZFUTL0J1FSXw=";
 
   subPackages = [
     "cmd/agent"
     "cmd/cluster-agent"
     "cmd/dogstatsd"
-    "cmd/py-launcher"
     "cmd/trace-agent"
   ];
 
@@ -67,6 +69,7 @@ in buildGoModule rec {
     "zlib"
   ]
   ++ lib.optionals withSystemd [ "systemd" ]
+  ++ lib.optionals withDocker [ "docker" ]
   ++ extraTags;
 
   ldflags = [
@@ -74,19 +77,17 @@ in buildGoModule rec {
     "-X ${goPackagePath}/pkg/version.AgentVersion=${version}"
     "-X ${goPackagePath}/pkg/serializer.AgentPayloadVersion=${payloadVersion}"
     "-X ${goPackagePath}/pkg/collector/python.pythonHome3=${python}"
-    "-X ${goPackagePath}/pkg/config.DefaultPython=3"
+    "-X ${goPackagePath}/pkg/config/setup.DefaultPython=3"
     "-r ${python}/lib"
   ];
 
-  preBuild = ''
-    # Keep directories to generate in sync with tasks/go.py
-    go generate ./pkg/status ./cmd/agent/gui
-  '';
-
   # DataDog use paths relative to the agent binary, so fix these.
+  # We can't just point these to $out since that would introduce self-referential paths in the go modules,
+  # which are a fixed-output derivation. However, the patches aren't picked up if we skip them when building
+  # the modules. So we'll just traverse from the bin back to the out folder.
   postPatch = ''
-    sed -e "s|PyChecksPath =.*|PyChecksPath = \"$out/${python.sitePackages}\"|" \
-        -e "s|distPath =.*|distPath = \"$out/share/datadog-agent\"|" \
+    sed -e "s|PyChecksPath =.*|PyChecksPath = filepath.Join(_here, \"..\", \"${python.sitePackages}\")|" \
+        -e "s|distPath =.*|distPath = filepath.Join(_here, \"..\", \"share\", \"datadog-agent\")|" \
         -i cmd/agent/common/path/path_nix.go
     sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \
         -i pkg/util/hostname/fqdn_nix.go
@@ -97,11 +98,9 @@ in buildGoModule rec {
   postInstall = ''
     mkdir -p $out/${python.sitePackages} $out/share/datadog-agent
     cp -R --no-preserve=mode $src/cmd/agent/dist/conf.d $out/share/datadog-agent
-    rm -rf $out/share/datadog-agent/conf.d/{apm.yaml.default,process_agent.yaml.default,winproc.d}
+    rm -rf $out/share/datadog-agent/conf.d/{apm.yaml.default,process_agent.yaml.default,winproc.d,agentcrashdetect.d,myapp.d}
     cp -R $src/cmd/agent/dist/{checks,utils,config.py} $out/${python.sitePackages}
 
-    cp -R $src/pkg/status/templates $out/share/datadog-agent
-
     wrapProgram "$out/bin/agent" \
       --set PYTHONPATH "$out/${python.sitePackages}"''
       + lib.optionalString withSystemd " --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ (lib.getLib systemd) rtloader ]}";
@@ -119,10 +118,5 @@ in buildGoModule rec {
     homepage    = "https://www.datadoghq.com";
     license     = licenses.bsd3;
     maintainers = with maintainers; [ thoughtpolice domenkozar ];
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    # broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
-
-    # Upstream does not support Go > 1.21; for update refer to https://github.com/NixOS/nixpkgs/issues/351119
-    broken = true;
   };
 }

From 2ba6271eccf51714b8a8858059646dffbd63ae98 Mon Sep 17 00:00:00 2001
From: Mel Bourgeois <mason.bourgeois@gmail.com>
Date: Mon, 25 Nov 2024 03:07:54 -0600
Subject: [PATCH 026/124] datadog-integrations-core: 7.50.2 -> 7.56.2

---
 pkgs/tools/networking/dd-agent/integrations-core.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix
index 7a3a14a80931..16c9c2fc8661 100644
--- a/pkgs/tools/networking/dd-agent/integrations-core.nix
+++ b/pkgs/tools/networking/dd-agent/integrations-core.nix
@@ -42,9 +42,9 @@ let
     owner = "DataDog";
     repo = "integrations-core";
     rev = version;
-    sha256 = "sha256-tgY8Jh7N9ot3Xp+JfsA9vEzj62H2OPTEh6b1YzyNGRU=";
+    sha256 = "sha256-p5eoNNHQQl314mfUk2t3qQaerPu02GKA+tKkAY7bojk=";
   };
-  version = "7.50.2";
+  version = "7.56.2";
 
   # Build helper to build a single datadog integration package.
   buildIntegration = { pname, ... }@args:

From bbcd0f30526ddf8bc406bec429251faf1667a2d2 Mon Sep 17 00:00:00 2001
From: Mel Bourgeois <mason.bourgeois@gmail.com>
Date: Mon, 25 Nov 2024 03:08:08 -0600
Subject: [PATCH 027/124] nixos/datadog-agent: migrate deprecated config & set
 bin option

---
 nixos/modules/services/monitoring/datadog-agent.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix
index 8256226041ea..edbfb6467ae7 100644
--- a/nixos/modules/services/monitoring/datadog-agent.nix
+++ b/nixos/modules/services/monitoring/datadog-agent.nix
@@ -13,7 +13,13 @@ let
   // lib.optionalAttrs (cfg.ddUrl != null) { dd_url = cfg.ddUrl; }
   // lib.optionalAttrs (cfg.site != null) { site = cfg.site; }
   // lib.optionalAttrs (cfg.tags != null ) { tags = lib.concatStringsSep ", " cfg.tags; }
-  // lib.optionalAttrs (cfg.enableLiveProcessCollection) { process_config = { enabled = "true"; }; }
+  // lib.optionalAttrs (cfg.enableLiveProcessCollection) {
+    process_config = {
+      dd_agent_bin = "${datadogPkg}/bin/agent";
+      process_collection.enabled = "true";
+      container_collection.enabled = "true";
+    };
+  }
   // lib.optionalAttrs (cfg.enableTraceAgent) { apm_config = { enabled = true; }; }
   // cfg.extraConfig;
 

From 138a57266b8dd89d8b2264a964f276d97103b03c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 1 Dec 2024 15:50:25 +0200
Subject: [PATCH 028/124] beets: 2.0.0 -> 2.2.0

---
 pkgs/tools/audio/beets/builtin-plugins.nix | 22 ++++++++++++++++-----
 pkgs/tools/audio/beets/common.nix          | 23 ++++++++++++++++------
 pkgs/tools/audio/beets/default.nix         |  6 ++----
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix
index cf40c1dbbb6a..bcb22caab20c 100644
--- a/pkgs/tools/audio/beets/builtin-plugins.nix
+++ b/pkgs/tools/audio/beets/builtin-plugins.nix
@@ -17,13 +17,17 @@
   advancedrewrite = {
     testPaths = [ ];
   };
+  acousticbrainz = {
+    deprecated = true;
+    propagatedBuildInputs = [ python3Packages.requests ];
+  };
   albumtypes = { };
   aura = {
     propagatedBuildInputs = with python3Packages; [
       flask
+      flask-cors
       pillow
     ];
-    testPaths = [ ];
   };
   autobpm = {
     propagatedBuildInputs = with python3Packages; [
@@ -31,7 +35,6 @@
       # An optional dependency of librosa, needed for beets' autobpm
       resampy
     ];
-    testPaths = [ ];
   };
   badfiles = {
     testPaths = [ ];
@@ -70,8 +73,10 @@
   export = { };
   fetchart = {
     propagatedBuildInputs = with python3Packages; [
-      requests
+      beautifulsoup4
+      langdetect
       pillow
+      requests
     ];
     wrapperBins = [ imagemagick ];
   };
@@ -107,7 +112,11 @@
     propagatedBuildInputs = [ python3Packages.requests ];
     testPaths = [ ];
   };
-  lyrics.propagatedBuildInputs = [ python3Packages.beautifulsoup4 ];
+  lyrics.propagatedBuildInputs = with python3Packages; [
+    beautifulsoup4
+    langdetect
+    requests
+  ];
   mbcollection.testPaths = [ ];
   mbsubmit = { };
   mbsync = { };
@@ -155,6 +164,9 @@
   };
   types.testPaths = [ "test/plugins/test_types_plugin.py" ];
   unimported.testPaths = [ ];
-  web.propagatedBuildInputs = [ python3Packages.flask ];
+  web.propagatedBuildInputs = with python3Packages; [
+    flask
+    flask-cors
+  ];
   zero = { };
 }
diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
index 7ffb89b73511..07db91eba091 100644
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -76,10 +76,15 @@ in
 python3Packages.buildPythonApplication {
   pname = "beets";
   inherit src version;
+  pyproject = true;
 
   patches = extraPatches;
 
-  propagatedBuildInputs =
+  build-system = [
+    python3Packages.poetry-core
+  ];
+
+  dependencies =
     with python3Packages;
     [
       confuse
@@ -88,10 +93,8 @@ python3Packages.buildPythonApplication {
       mediafile
       munkres
       musicbrainzngs
-      mutagen
-      pygobject3
+      platformdirs
       pyyaml
-      reflink
       unidecode
       typing-extensions
     ]
@@ -146,8 +149,16 @@ python3Packages.buildPythonApplication {
 
   __darwinAllowLocalNetworking = true;
 
-  inherit disabledTestPaths;
-  inherit disabledTests;
+  disabledTestPaths = disabledTestPaths ++ [
+    # touches network
+    "test/plugins/test_aura.py"
+  ];
+  disabledTests = disabledTests ++ [
+    # beets.ui.UserError: unknown command 'autobpm'
+    "test/plugins/test_autobpm.py::TestAutoBPMPlugin::test_import"
+    # AssertionError: assert 0 == 117
+    "test/plugins/test_autobpm.py::TestAutoBPMPlugin::test_command"
+  ];
 
   # Perform extra "sanity checks", before running pytest tests.
   preCheck = ''
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 9e25576492d9..f280b467916d 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -22,14 +22,12 @@ lib.makeExtensible (self: {
 
   beets-stable = callPackage ./common.nix rec {
     inherit python3Packages;
-    # NOTE: ./builtin-plugins.nix and ./common.nix can have some conditionals
-    # be removed when stable version updates
-    version = "2.0.0";
+    version = "2.2.0";
     src = fetchFromGitHub {
       owner = "beetbox";
       repo = "beets";
       rev = "v${version}";
-      hash = "sha256-6pmImyopy0zFBDYoqDyWcBv61FK1kGsZwW2+7fzAnq8=";
+      hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
     };
     extraPatches = [
       # Bash completion fix for Nix

From 33e9c10983c1000084fe9406004dffe903deb4c3 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 1 Dec 2024 15:51:34 +0200
Subject: [PATCH 029/124] beets-unstable: 2.0.0-unstable-2024-05-25 ->
 2.2.0-unstable-2024-12-02

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

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index f280b467916d..9bd644c3d115 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -39,12 +39,12 @@ lib.makeExtensible (self: {
 
   beets-unstable = callPackage ./common.nix {
     inherit python3Packages;
-    version = "2.0.0-unstable-2024-05-25";
+    version = "2.2.0-unstable-2024-12-02";
     src = fetchFromGitHub {
       owner = "beetbox";
       repo = "beets";
-      rev = "2130404217684f22f36de00663428602b3f96d84";
-      hash = "sha256-trqF6YVBcv+i5H4Ez3PKnRQ6mV2Ly/cw3UJC7pl19og=";
+      rev = "f92c0ec8b14fbd59e58374fd123563123aef197b";
+      hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
     };
     extraPatches = [
       # Bash completion fix for Nix

From 395b04b4921384a4141ad8484e902b2dcced70f0 Mon Sep 17 00:00:00 2001
From: Chris Montgomery <chmont@proton.me>
Date: Fri, 22 Nov 2024 19:01:15 -0500
Subject: [PATCH 030/124] beetsPackages.copyartifacts: beets 2.1.0 compat

---
 pkgs/tools/audio/beets/plugins/copyartifacts.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix
index a835061deea2..d1a915a70915 100644
--- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix
+++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix
@@ -20,6 +20,10 @@ python3Packages.buildPythonApplication rec {
     sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py
     sed -i -e '/namespace_packages/d' setup.py
     printf 'from pkgutil import extend_path\n__path__ = extend_path(__path__, __name__)\n' >beetsplug/__init__.py
+
+    # beets v2.1.0 compat
+    # <https://github.com/beetbox/beets/commit/0e87389994a9969fa0930ffaa607609d02e286a8>
+    sed -i -e 's/util\.py3_path/os.fsdecode/g' tests/_common.py
   '';
 
   pytestFlagsArray = [ "-r fEs" ];

From 965d2d2f18e2a6d88840e3201bc481b215670c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= <smancill@smancill.dev>
Date: Sun, 1 Dec 2024 18:39:33 -0300
Subject: [PATCH 031/124] shogun: disable failing tests

---
 .../science/machine-learning/shogun/default.nix        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix
index a0ac0fb26711..550b3296dc00 100644
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -134,10 +134,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = let
     excludeTestsRegex = lib.concatStringsSep "|" [
-      # sporadic segfault
+      # segfault
+      "SerializationXML"
       "TrainedModelSerialization"
       # broken by openblas 0.3.21
       "mathematics_lapack"
+      # fails on aarch64
+      "LinearTimeMMD"
+      "QuadraticTimeMMD"
+      "SGVectorTest"
+      "Statistics"
+      # hangs on aarch64
+      "PRange"
       # these take too long on CI
       "evaluation_cross_validation"
       "modelselection_combined_kernel"

From ba4d412bebf0c36df44c68d6c98ea13c39d9c448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 28 Nov 2024 23:38:31 -0800
Subject: [PATCH 032/124] python312Packages.ua-parser-builtins: init at 1.0.0

---
 .../ua-parser-builtins/default.nix            | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/ua-parser-builtins/default.nix

diff --git a/pkgs/development/python-modules/ua-parser-builtins/default.nix b/pkgs/development/python-modules/ua-parser-builtins/default.nix
new file mode 100644
index 000000000000..c64326ea2148
--- /dev/null
+++ b/pkgs/development/python-modules/ua-parser-builtins/default.nix
@@ -0,0 +1,28 @@
+{
+  buildPythonPackage,
+  hatchling,
+  pyyaml,
+  ua-parser,
+  versioningit,
+}:
+
+buildPythonPackage rec {
+  pname = "ua-parser-builtins";
+  inherit (ua-parser) version src;
+  pyproject = true;
+
+  sourceRoot = "${src.name}/ua-parser-builtins";
+
+  postPatch = ''
+    # break dependency cycle and don't use git to determine version
+    substituteInPlace pyproject.toml \
+      --replace-fail 'dependencies = ["ua-parser"]' "" \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
+  '';
+
+  build-system = [
+    hatchling
+    pyyaml
+    versioningit
+  ];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 88c8b6c96fb6..2e86993d7ed9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17239,6 +17239,8 @@ self: super: with self; {
 
   ua-parser = callPackage ../development/python-modules/ua-parser { };
 
+  ua-parser-builtins = callPackage ../development/python-modules/ua-parser-builtins { };
+
   uarray = callPackage ../development/python-modules/uarray { };
 
   uart-devices = callPackage ../development/python-modules/uart-devices { };

From ae5d860ddc51c69abdbf29ff4b8fc9ecf0975cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 29 Nov 2024 12:03:12 -0800
Subject: [PATCH 033/124] python312Packages.ua-parser-rs: init at 0.1.2

---
 .../python-modules/ua-parser-rs/Cargo.lock    | 865 ++++++++++++++++++
 .../python-modules/ua-parser-rs/default.nix   |  42 +
 pkgs/top-level/python-packages.nix            |   2 +
 3 files changed, 909 insertions(+)
 create mode 100644 pkgs/development/python-modules/ua-parser-rs/Cargo.lock
 create mode 100644 pkgs/development/python-modules/ua-parser-rs/default.nix

diff --git a/pkgs/development/python-modules/ua-parser-rs/Cargo.lock b/pkgs/development/python-modules/ua-parser-rs/Cargo.lock
new file mode 100644
index 000000000000..0aa5944462f8
--- /dev/null
+++ b/pkgs/development/python-modules/ua-parser-rs/Cargo.lock
@@ -0,0 +1,865 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
+[[package]]
+name = "anstream"
+version = "0.6.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "cast"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "ciborium"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
+[[package]]
+name = "criterion"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
+dependencies = [
+ "anes",
+ "cast",
+ "ciborium",
+ "clap",
+ "criterion-plot",
+ "is-terminal",
+ "itertools 0.10.5",
+ "num-traits",
+ "once_cell",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
+dependencies = [
+ "cast",
+ "itertools 0.10.5",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "half"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
+[[package]]
+name = "indexmap"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "indoc"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+
+[[package]]
+name = "js-sys"
+version = "0.3.74"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.167"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "oorandom"
+version = "11.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
+
+[[package]]
+name = "plotters"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
+dependencies = [
+ "plotters-backend",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "pyo3"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884"
+dependencies = [
+ "cfg-if",
+ "indoc",
+ "libc",
+ "memoffset",
+ "once_cell",
+ "portable-atomic",
+ "pyo3-build-config",
+ "pyo3-ffi",
+ "pyo3-macros",
+ "unindent",
+]
+
+[[package]]
+name = "pyo3-build-config"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38"
+dependencies = [
+ "once_cell",
+ "target-lexicon",
+]
+
+[[package]]
+name = "pyo3-ffi"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636"
+dependencies = [
+ "libc",
+ "pyo3-build-config",
+]
+
+[[package]]
+name = "pyo3-macros"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453"
+dependencies = [
+ "proc-macro2",
+ "pyo3-macros-backend",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pyo3-macros-backend"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "pyo3-build-config",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-filtered"
+version = "0.2.0"
+dependencies = [
+ "aho-corasick",
+ "clap",
+ "criterion",
+ "itertools 0.13.0",
+ "regex",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.215"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.215"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.133"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.9.34+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "syn"
+version = "2.0.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+
+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "ua-parser"
+version = "0.2.0"
+dependencies = [
+ "clap",
+ "regex",
+ "regex-filtered",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+]
+
+[[package]]
+name = "ua-parser-rs"
+version = "0.1.2"
+dependencies = [
+ "pyo3",
+ "ua-parser",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+
+[[package]]
+name = "unindent"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
+
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.97"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.97"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.97"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.97"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.97"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49"
+
+[[package]]
+name = "web-sys"
+version = "0.3.74"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
diff --git a/pkgs/development/python-modules/ua-parser-rs/default.nix b/pkgs/development/python-modules/ua-parser-rs/default.nix
new file mode 100644
index 000000000000..3bcf626be55c
--- /dev/null
+++ b/pkgs/development/python-modules/ua-parser-rs/default.nix
@@ -0,0 +1,42 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  rustPlatform,
+}:
+
+buildPythonPackage rec {
+  pname = "ua-parser-rs";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "ua-parser";
+    repo = "uap-rust";
+    rev = "refs/tags/ua-parser-rs-${version}";
+    hash = "sha256-+qAYNGZFOkQyHhzqZZGrxgKHrPTWolO/4KKuppIMSRE=";
+    fetchSubmodules = true;
+  };
+
+  postPatch = ''
+    ln -s ${./Cargo.lock} Cargo.lock
+  '';
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+  };
+
+  buildAndTestSubdir = "ua-parser-py";
+
+  nativeBuildInputs = [
+    rustPlatform.cargoSetupHook
+    rustPlatform.maturinBuildHook
+  ];
+
+  meta = {
+    description = "Native accelerator for ua-parser";
+    homepage = "https://github.com/ua-parser/uap-rust/tree/main/ua-parser-py";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
+    mainProgram = "ua-parser-rs";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2e86993d7ed9..c36f35eff75a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17241,6 +17241,8 @@ self: super: with self; {
 
   ua-parser-builtins = callPackage ../development/python-modules/ua-parser-builtins { };
 
+  ua-parser-rs = callPackage ../development/python-modules/ua-parser-rs { };
+
   uarray = callPackage ../development/python-modules/uarray { };
 
   uart-devices = callPackage ../development/python-modules/uart-devices { };

From 6f9f58a7ada9fe121c7bd2e0997c8706d3775276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Thu, 28 Nov 2024 23:25:06 -0800
Subject: [PATCH 034/124] python312Packages.ua-parser: 0.18.0 -> 1.0.0

Diff: https://github.com/ua-parser/uap-python/compare/0.18.0...1.0.0
---
 .../python-modules/ua-parser/default.nix      | 43 ++++++++++++-------
 .../ua-parser/dont-fetch-submodule.patch      | 17 --------
 2 files changed, 27 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/development/python-modules/ua-parser/dont-fetch-submodule.patch

diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix
index fa0dfffdf6b0..89cb811fbbab 100644
--- a/pkgs/development/python-modules/ua-parser/default.nix
+++ b/pkgs/development/python-modules/ua-parser/default.nix
@@ -2,42 +2,53 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  google-re2,
   pyyaml,
   pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+  ua-parser-builtins,
+  ua-parser-rs,
 }:
 
 buildPythonPackage rec {
   pname = "ua-parser";
-  version = "0.18.0";
-
-  format = "setuptools";
+  version = "1.0.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ua-parser";
     repo = "uap-python";
-    rev = version;
+    rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    hash = "sha256-GiuGPnyYL0HQ/J2OpDTD1/panZCuzKtD3mKW5op5lXA=";
+    hash = "sha256-byKtxmuYIsEYyuUmfnbLhfe7EKj0k7QGkK5HewiTiy4=";
   };
 
-  patches = [ ./dont-fetch-submodule.patch ];
+  build-system = [
+    pyyaml
+    setuptools
+    setuptools-scm
+  ];
 
-  nativeBuildInputs = [ pyyaml ];
+  dependencies = [
+    ua-parser-builtins
+  ];
+
+  optional-dependencies = {
+    yaml = [ pyyaml ];
+    re2 = [ google-re2 ];
+    regex = [ ua-parser-rs ];
+  };
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  preCheck = ''
-    # import from $out
-    rm ua_parser/__init__.py
-  '';
-
   pythonImportsCheck = [ "ua_parser" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/ua-parser/uap-python/releases/tag/${lib.removePrefix "refs/tags/" src.rev}";
     description = "Python implementation of the UA Parser";
     homepage = "https://github.com/ua-parser/uap-python";
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/ua-parser/dont-fetch-submodule.patch b/pkgs/development/python-modules/ua-parser/dont-fetch-submodule.patch
deleted file mode 100644
index fa0cfdeabf32..000000000000
--- a/pkgs/development/python-modules/ua-parser/dont-fetch-submodule.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/setup.py b/setup.py
-index a976eee..6919795 100644
---- a/setup.py
-+++ b/setup.py
-@@ -64,12 +64,6 @@ class build_regexes(Command):
- 
-     def run(self):
-         work_path = self.work_path
--        if not os.path.exists(os.path.join(work_path, ".git")):
--            return
--
--        log.info("initializing git submodules")
--        check_output(["git", "submodule", "init"], cwd=work_path)
--        check_output(["git", "submodule", "update"], cwd=work_path)
- 
-         yaml_src = os.path.join(work_path, "uap-core", "regexes.yaml")
-         if not os.path.exists(yaml_src):

From 7da1445e3d8d489f6c105ac9958fecccc4aa830a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 29 Nov 2024 09:54:30 -0800
Subject: [PATCH 035/124] fittrackee: unpin ua-parser

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

diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix
index b197539cc421..586464b5ad49 100644
--- a/pkgs/by-name/fi/fittrackee/package.nix
+++ b/pkgs/by-name/fi/fittrackee/package.nix
@@ -50,6 +50,7 @@ python.pkgs.buildPythonApplication rec {
     "pyopenssl"
     "pytz"
     "sqlalchemy"
+    "ua-parser"
   ];
 
   dependencies =

From a842f069192efffe94d9efa130665f6b225e3eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 3 Dec 2024 11:25:06 -0800
Subject: [PATCH 036/124] pretix: unpin ua-parser

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

diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index ddbbe8781a4e..fce02ede99c3 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -104,6 +104,7 @@ python.pkgs.buildPythonApplication rec {
     "redis"
     "requests"
     "sentry-sdk"
+    "ua-parser"
   ];
 
   pythonRemoveDeps = [

From 41672bef61ae6e33b0012e3bec5fdc917a86890f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 3 Dec 2024 11:26:00 -0800
Subject: [PATCH 037/124] python312Packages.lacuscore: 1.12.5 -> 1.12.6

Diff: https://github.com/ail-project/LacusCore/compare/refs/tags/v1.12.5...v1.12.6

Changelog: https://github.com/ail-project/LacusCore/releases/tag/v1.12.6
---
 .../python-modules/lacuscore/default.nix      | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix
index 46fd51edf6ab..7b1c27e4c9ff 100644
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   defang,
   dnspython,
+  eval-type-backport,
   fetchFromGitHub,
   playwrightcapture,
   poetry-core,
@@ -11,13 +12,12 @@
   pythonOlder,
   redis,
   requests,
-  sphinx,
   ua-parser,
 }:
 
 buildPythonPackage rec {
   pname = "lacuscore";
-  version = "1.12.5";
+  version = "1.12.6";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "ail-project";
     repo = "LacusCore";
     rev = "refs/tags/v${version}";
-    hash = "sha256-iozCgQ7VULQVlKaHmThxiFDZ2hly2yYMdIrXBFHFRfI=";
+    hash = "sha256-KiYpPgwMsIuIDUjQfw83ATiE5VI2XMaxGsnP5xEypqc=";
   };
 
   pythonRelaxDeps = [
@@ -37,18 +37,21 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
-
-  dependencies = [
-    async-timeout
-    defang
-    dnspython
-    playwrightcapture
-    pydantic
-    redis
-    requests
-    sphinx
-    ua-parser
-  ];
+  dependencies =
+    [
+      defang
+      dnspython
+      playwrightcapture
+      pydantic
+      redis
+      requests
+      ua-parser
+    ]
+    ++ playwrightcapture.optional-dependencies.recaptcha
+    ++ redis.optional-dependencies.hiredis
+    ++ ua-parser.optional-dependencies.regex
+    ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]
+    ++ lib.optionals (pythonOlder "3.10") [ eval-type-backport ];
 
   # Module has no tests
   doCheck = false;

From b0d166fd16b42f9793b9787a551ab1365b0a78f2 Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Wed, 4 Dec 2024 19:21:06 +0800
Subject: [PATCH 038/124] tdlib: 1.8.39 -> 1.8.41

Add vonfry as maintainer
---
 pkgs/by-name/td/tdlib/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix
index b50b747eb35e..66a70a9c7636 100644
--- a/pkgs/by-name/td/tdlib/package.nix
+++ b/pkgs/by-name/td/tdlib/package.nix
@@ -21,7 +21,7 @@ in
 
 stdenv.mkDerivation {
   pname = "tdlib";
-  version = "1.8.39";
+  version = "1.8.41";
 
   src = fetchFromGitHub {
     owner = "tdlib";
@@ -30,8 +30,8 @@ stdenv.mkDerivation {
     # The tdlib authors do not set tags for minor versions, but
     # external programs depending on tdlib constrain the minor
     # version, hence we set a specific commit with a known version.
-    rev = "056963e48fa8d3f89556239c22d6ac843d3c8a5b";
-    hash = "sha256-pQ+uYnyBTH4L6RW3MqAttx7K3z8fyEbzRy8JSjbBL98=";
+    rev = "5b974c298d4ed551d3ad2c061ad7b8280d137c7e";
+    hash = "sha256-1TyGv2yMjX75+ccZSox/2m6SMmwEZAkShIhLfCeNmZg=";
   };
 
   buildInputs = [ gperf openssl readline zlib ];
@@ -56,6 +56,6 @@ stdenv.mkDerivation {
     homepage = "https://core.telegram.org/tdlib/";
     license = [ licenses.boost ];
     platforms = platforms.unix;
-    maintainers = [ maintainers.vyorkin ];
+    maintainers = [ maintainers.vyorkin maintainers.vonfry ];
   };
 }

From acee313dfc257fc8ff49a7275f8677feb561704b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 4 Dec 2024 23:27:37 +0000
Subject: [PATCH 039/124] cpp-utilities: 5.26.1 -> 5.27.0

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

diff --git a/pkgs/by-name/cp/cpp-utilities/package.nix b/pkgs/by-name/cp/cpp-utilities/package.nix
index 1d838b0ba2a2..fc4cea2f40f4 100644
--- a/pkgs/by-name/cp/cpp-utilities/package.nix
+++ b/pkgs/by-name/cp/cpp-utilities/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpp-utilities";
-  version = "5.26.1";
+  version = "5.27.0";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "cpp-utilities";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-ft8gusZ6We3nEAOwccGrUidxpO5tdWR5VNDQ/r5l2P8=";
+    sha256 = "sha256-pjEWTNcZwcrKUsXXHia8aLSCw7R8aEr6GBvD7yiYFXo=";
   };
 
   nativeBuildInputs = [ cmake ];

From f3e27bc730c997fa399ec0a3d38c9fbb2da61ba4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Dec 2024 11:19:45 +0000
Subject: [PATCH 040/124] monkeysAudio: 10.81 -> 10.83

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

diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix
index 7d4cb724ea01..0bda723ba18c 100644
--- a/pkgs/by-name/mo/monkeysAudio/package.nix
+++ b/pkgs/by-name/mo/monkeysAudio/package.nix
@@ -5,13 +5,13 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "10.81";
+  version = "10.83";
   pname = "monkeys-audio";
 
   src = fetchzip {
     url = "https://monkeysaudio.com/files/MAC_${
       builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
-    hash = "sha256-sI2u+H/ewva9r+g5xSNqal0DMul+a9Y4FV6dEzulvSI=";
+    hash = "sha256-QPd3YlQ2IYAqIIau3RVb2FcdE4obQjg5bZi6CUsDyHU=";
     stripRoot = false;
   };
 

From 3477b395af108841b51b3344841fc83f97face85 Mon Sep 17 00:00:00 2001
From: Francesco Carmelo Capria <francesco@capria.eu>
Date: Thu, 5 Dec 2024 18:41:54 +0100
Subject: [PATCH 041/124] hyprgui: 0.1.9 -> 0.2.0

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

diff --git a/pkgs/by-name/hy/hyprgui/package.nix b/pkgs/by-name/hy/hyprgui/package.nix
index 5279bb71358d..5e95b6cd1925 100644
--- a/pkgs/by-name/hy/hyprgui/package.nix
+++ b/pkgs/by-name/hy/hyprgui/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hyprgui";
-  version = "0.1.9";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "hyprutils";
     repo = "hyprgui";
     rev = "refs/tags/v${version}";
-    hash = "sha256-VP+6qWu4nv8h9LLjTnl8Mh1aAlIA+zuufRYoouxl2Tc=";
+    hash = "sha256-akV83bvPuSJUleP0mDcnAR1KFegOXyoKSD0CVyNDJmc=";
   };
 
-  cargoHash = "sha256-t0HqraCA4q7K4EEtPS8J0ZmnhBB+Zf0aX+yXSUdKJzo=";
+  cargoHash = "sha256-SBI2Gk4FImGw8169xIV8L0fbfcKzn6PqvLg6XxbpurI=";
 
   strictDeps = true;
 

From 9efa9ce516b3c94ccec439a7b4a156be015b26d5 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 6 Dec 2024 01:39:35 +0100
Subject: [PATCH 042/124] Plasticity: Fix EGL

---
 pkgs/by-name/pl/plasticity/package.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix
index 7318880e6849..b089c211b751 100644
--- a/pkgs/by-name/pl/plasticity/package.nix
+++ b/pkgs/by-name/pl/plasticity/package.nix
@@ -117,9 +117,8 @@ stdenv.mkDerivation rec {
   '';
 
   #--use-gl=egl for it to use hardware rendering it seems. Otherwise there are terrible framerates
-  postInstall = ''
-    substituteInPlace share/applications/Plasticity.desktop \
-      --replace-fail 'Exec=Plasticity %U' "Exec=Plasticity --use-gl=egl %U"
+  preFixup = ''
+    gappsWrapperArgs+=(--add-flags "--use-gl=egl")
   '';
 
   meta = with lib; {

From 8f1894ffd3018f6225e9133f01e15c12fe4b1538 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Fri, 6 Dec 2024 17:30:37 +0800
Subject: [PATCH 043/124] xournal: drop

---
 .../applications/graphics/xournal/default.nix | 64 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 --
 3 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 pkgs/applications/graphics/xournal/default.nix

diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix
deleted file mode 100644
index 7f618b257387..000000000000
--- a/pkgs/applications/graphics/xournal/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ lib, stdenv, fetchurl, makeDesktopItem
-, ghostscript, atk, gtk2, glib, fontconfig, freetype
-, libgnomecanvas
-, pango, libX11, xorgproto, zlib, poppler
-, autoconf, automake, libtool, pkg-config}:
-
-let
-  isGdkQuartzBackend = (gtk2.gdktarget == "quartz");
-in
-
-stdenv.mkDerivation rec {
-  version = "0.4.8.2016";
-  pname = "xournal";
-  src = fetchurl {
-    url = "mirror://sourceforge/xournal/xournal-${version}.tar.gz";
-    sha256 = "09i88v3wacmx7f96dmq0l3afpyv95lh6jrx16xzm0jd1szdrhn5j";
-  };
-
-  buildInputs = [
-    ghostscript atk gtk2 glib fontconfig freetype
-    libgnomecanvas
-    pango libX11 xorgproto zlib poppler
-  ];
-
-  nativeBuildInputs = [ autoconf automake libtool pkg-config ];
-
-  NIX_LDFLAGS = "-lz"
-    + lib.optionalString (!isGdkQuartzBackend) " -lX11";
-
-  desktopItem = makeDesktopItem {
-    name = "xournal-${version}";
-    exec = "xournal";
-    icon = "xournal";
-    desktopName = "Xournal";
-    comment = meta.description;
-    categories = [ "Office" "Graphics" ];
-    mimeTypes = [ "application/pdf" "application/x-xoj" ];
-    genericName = "PDF Editor";
-  };
-
-  postInstall=''
-      mkdir --parents $out/share/mime/packages
-      cat << EOF > $out/share/mime/packages/xournal.xml
-      <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-         <mime-type type="application/x-xoj">
-          <comment>Xournal Document</comment>
-          <glob pattern="*.xoj"/>
-         </mime-type>
-      </mime-info>
-      EOF
-      cp --recursive ${desktopItem}/share/applications $out/share
-      mkdir --parents $out/share/icons
-      cp $out/share/xournal/pixmaps/xournal.png $out/share/icons
-  '';
-
-  meta = with lib; {
-    homepage = "https://xournal.sourceforge.net/";
-    description = "Note-taking application (supposes stylus)";
-    maintainers = [ maintainers.guibert ];
-    license = licenses.gpl2;
-    platforms = with platforms; linux ++ darwin;
-    mainProgram = "xournal";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 026bbad72d20..19c5aa402725 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1394,6 +1394,7 @@ mapAliases {
   xmlada = gnatPackages.xmlada; # Added 2024-02-25
   xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15
   xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10
+  xournal = throw "'xournal' has been removed due to lack of activity upstream and depending on gnome2. Consider using 'xournalpp' instead."; # Added 2024-12-06
   xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18
   xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14
   xulrunner = firefox-unwrapped; # Added 2023-11-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb418e73c0b0..aa68352f3f2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16250,10 +16250,6 @@ with pkgs;
     inherit (gnome2) libglade GConf;
   };
 
-  xournal = callPackage ../applications/graphics/xournal {
-    inherit (gnome2) libgnomecanvas;
-  };
-
   xournalpp = darwin.apple_sdk_11_0.callPackage ../applications/graphics/xournalpp {
     lua = lua5_3;
   };

From a29d846e26d26638192f5c52be6d7c48e3dbc37a Mon Sep 17 00:00:00 2001
From: FliegendeWurst <2012gdwu+github@posteo.de>
Date: Fri, 6 Dec 2024 12:47:10 +0100
Subject: [PATCH 044/124] filesender: 2.50 -> 2.51

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

diff --git a/pkgs/by-name/fi/filesender/package.nix b/pkgs/by-name/fi/filesender/package.nix
index 6c32df86c56c..32eb0249d55b 100644
--- a/pkgs/by-name/fi/filesender/package.nix
+++ b/pkgs/by-name/fi/filesender/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "filesender";
-  version = "2.50";
+  version = "2.51";
 
   src = fetchFromGitHub {
     owner = "filesender";
     repo = "filesender";
-    rev = "filesender-${finalAttrs.version}";
-    hash = "sha256-H42mNkHj0BVof/vr/GBcjIpNY7P0UDTT5VtjPKCbpgg=";
+    tag = "filesender-${finalAttrs.version}";
+    hash = "sha256-HQ5/Df4F4Gwon0OhlIRTZ0NHTb9SJgQD+BDbH/aIeKw=";
   };
 
   patches = [

From 57fc5be4a6160024d1c88581e71ca72857ed5c4b Mon Sep 17 00:00:00 2001
From: Manuel Mendez <github@i.m.mmlb.dev>
Date: Tue, 3 Dec 2024 16:04:54 -0500
Subject: [PATCH 045/124] flent: Convert to unittestCheckHook

I've figured out a way to use native qt virtual screen instead of
xvfb-run which integrates better with our python tooling.

Needed to add `badPlatforms = darwin` because in theory flent works on
darwin machines but tests aren't passing. This is only showing up now
because xvfb-run was limiting flent to linux for us before.
---
 pkgs/by-name/fl/flent/package.nix | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/fl/flent/package.nix b/pkgs/by-name/fl/flent/package.nix
index 5e78f6923f30..b585dc0aa8d6 100644
--- a/pkgs/by-name/fl/flent/package.nix
+++ b/pkgs/by-name/fl/flent/package.nix
@@ -4,7 +4,6 @@
   fetchPypi,
   procps,
   qt5,
-  xvfb-run,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "flent";
@@ -25,28 +24,15 @@ python3Packages.buildPythonApplication rec {
     qtpy
   ];
 
-  nativeCheckInputs = [
-    python3Packages.mock
-    xvfb-run
-  ];
-
-  checkPhase = ''
-    runHook preCheck
+  nativeCheckInputs = [ python3Packages.unittestCheckHook ];
 
+  preCheck = ''
     # we want the gui tests to always run
     sed -i 's|self.skip|pass; #&|' unittests/test_gui.py
 
-    export XDG_RUNTIME_DIR=$(mktemp -d)
-    export HOME=$(mktemp -d)
-    cat >test-runner <<EOF
-    #!/bin/sh
-    ${python3Packages.python.interpreter} -m unittest discover
-    EOF
-    chmod +x test-runner
-    wrapQtApp test-runner --prefix PYTHONPATH : $PYTHONPATH
-    xvfb-run -s '-screen 0 800x600x24' ./test-runner
-
-    runHook postCheck
+    # Dummy qt setup for gui tests
+    export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}"
+    export QT_QPA_PLATFORM=offscreen
   '';
 
   preFixup = ''
@@ -62,5 +48,6 @@ python3Packages.buildPythonApplication rec {
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ mmlb ];
     mainProgram = "flent";
+    badPlatforms = lib.platforms.darwin;
   };
 }

From f9224197450fa4a29c8ee2721d2d8c36cbaef3cf Mon Sep 17 00:00:00 2001
From: Manuel Mendez <github@i.m.mmlb.dev>
Date: Tue, 3 Dec 2024 21:28:38 -0500
Subject: [PATCH 046/124] flent: Add passthru.updateScript

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

diff --git a/pkgs/by-name/fl/flent/package.nix b/pkgs/by-name/fl/flent/package.nix
index b585dc0aa8d6..9157d4cf28ba 100644
--- a/pkgs/by-name/fl/flent/package.nix
+++ b/pkgs/by-name/fl/flent/package.nix
@@ -4,6 +4,7 @@
   fetchPypi,
   procps,
   qt5,
+  nix-update-script,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "flent";
@@ -42,6 +43,7 @@ python3Packages.buildPythonApplication rec {
     )
   '';
 
+  passthru.updateScript = nix-update-script { };
   meta = {
     description = "FLExible Network Tester";
     homepage = "https://flent.org";

From 921d4010265db55fb3320df22ec181396213ea79 Mon Sep 17 00:00:00 2001
From: Benjamin Manuel <ben@benmanuel.com>
Date: Thu, 5 Dec 2024 19:52:03 -0600
Subject: [PATCH 047/124] jfrog-cli: 2.71.4 -> 2.72.2

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

diff --git a/pkgs/by-name/jf/jfrog-cli/package.nix b/pkgs/by-name/jf/jfrog-cli/package.nix
index 83a9def2f5ad..d52400f2d655 100644
--- a/pkgs/by-name/jf/jfrog-cli/package.nix
+++ b/pkgs/by-name/jf/jfrog-cli/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule rec {
   pname = "jfrog-cli";
-  version = "2.71.4";
+  version = "2.72.2";
 
   src = fetchFromGitHub {
     owner = "jfrog";
     repo = "jfrog-cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pC56OlSo05nMH+Adkg1v0Lba7Vd+bXeHRP4+Phvhlu8=";
+    hash = "sha256-Vu57V6OiMZjR+g0afeLEkQcwGA0e8PZzYAJjR3/wNoI=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-d1VloSjvXAt10MsZwVJ0Fkg9pN+tcOE5vURy7hatg30=";
+  vendorHash = "sha256-BSLBXHcowF2iVS/fMR3UIIdpbuLDgsPXYV4WK/oeHB4=";
 
   postPatch = ''
     # Patch out broken test cleanup.

From c6b810292b497980bab1b477e62ded50cf9b6586 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 6 Dec 2024 22:56:02 +0530
Subject: [PATCH 048/124] viddy: 1.2.1 -> 1.3.0

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/vi/viddy/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/vi/viddy/package.nix b/pkgs/by-name/vi/viddy/package.nix
index 901afe1da275..d1f6e6abcb28 100644
--- a/pkgs/by-name/vi/viddy/package.nix
+++ b/pkgs/by-name/vi/viddy/package.nix
@@ -6,21 +6,21 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "viddy";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "sachaos";
     repo = "viddy";
     rev = "v${version}";
-    hash = "sha256-lk992sI5kXo5Q8+rgBCKo/knV3/6uPs83Zj27JQcR6M=";
+    hash = "sha256-ZdDe0ymPkj0ZGiPLo1Y0qMDk2SsUcPsSStay+Tuf4p0=";
   };
 
-  cargoHash = "sha256-9xXUlsRGKw0rvIYAr4pMDh6oD/ZjBYPaL0g6dCC5sCo=";
+  cargoHash = "sha256-d/wmjvbTITpcGCrMVZrkUcCFPDdas2CDDPlIqoVBl9k=";
 
   # requires nightly features
   env.RUSTC_BOOTSTRAP = 1;
 
-  env.VERGEN_BUILD_DATE = "2024-11-16"; # managed via the update script
+  env.VERGEN_BUILD_DATE = "2024-11-28"; # managed via the update script
   env.VERGEN_GIT_DESCRIBE = "Nixpkgs";
 
   passthru.updateScript.command = [ ./update.sh ];

From b19376407d07ec4fba49830758a13f8f3da30f57 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 17:44:30 +0000
Subject: [PATCH 049/124] balena-cli: 19.0.13 -> 20.0.9

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

diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix
index ee9eb2e640ae..c0363376e235 100644
--- a/pkgs/by-name/ba/balena-cli/package.nix
+++ b/pkgs/by-name/ba/balena-cli/package.nix
@@ -15,16 +15,16 @@
 
 buildNpmPackage rec {
   pname = "balena-cli";
-  version = "19.0.13";
+  version = "20.0.9";
 
   src = fetchFromGitHub {
     owner = "balena-io";
     repo = "balena-cli";
     rev = "v${version}";
-    hash = "sha256-2U+P3LsxaRpktNbDn8iNhHQVjokiWZADYVDpJsDosZU=";
+    hash = "sha256-UmtTFSUCxz9oAep9+k0GBCxfFkHNDwoKvThIkFq93PQ=";
   };
 
-  npmDepsHash = "sha256-CA6qs9Gk19dEK2yCFMVVKmJSoZVLdpnf4V6P5fv2Bcc=";
+  npmDepsHash = "sha256-hie3ZWbqBKB4CRZG46oXyiYC8A/JLjdHkTh6VdZe1Qo=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

From 14c2813bd74299b7da7bf4d58f4f1d886c246bea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 20:15:49 +0000
Subject: [PATCH 050/124] tailwindcss: 3.4.14 -> 3.4.16

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

diff --git a/pkgs/development/tools/tailwindcss/default.nix b/pkgs/development/tools/tailwindcss/default.nix
index 14e859c9c510..b8de6ef462ed 100644
--- a/pkgs/development/tools/tailwindcss/default.nix
+++ b/pkgs/development/tools/tailwindcss/default.nix
@@ -18,16 +18,16 @@ let
   }.${system} or throwSystem;
 
   hash = {
-    aarch64-darwin = "sha256-y1//nTmNDU8hw3wumVeK2kN2b7xoB7X5Kdg16/0HUms=";
-    aarch64-linux = "sha256-o1jubyQBq/z83CPzTII6ZclZUHVXVahsu024GXFrxX8=";
-    armv7l-linux = "sha256-+hb5ahgDCLSoR5o3YovdDp6igbXkHhxu0Lu1iY8Xros=";
-    x86_64-darwin = "sha256-raeEz+Kd3cfzPGTKC79h51vcXpGGDRuZY7luDGZphbs=";
-    x86_64-linux = "sha256-haR0CRyHcK8hXUAkW968Ui6vGpiPP5V1mi7n6lOS71M=";
+    aarch64-darwin = "sha256-AXUcYBnBtL94fS4LHyIb7xvMAQzvVTE/wGkfO2o7Z28=";
+    aarch64-linux = "sha256-HmdGu6bz0011UIiaGgCauQ7jeUpevOYO0QaIrRBoCoc=";
+    armv7l-linux = "sha256-OLWmAuwp1/W+DUx4N9pgedg2mELT+hFMYiUJu06g35U=";
+    x86_64-darwin = "sha256-IglipvNx/DFgX4lWmtZHMJy9g0cc2MKbg/I1pQHDnc4=";
+    x86_64-linux = "sha256-M/JUtUyHVPFu++K+HeOMolGSYw3DbxZFladw1Lv02JM=";
   }.${system} or throwSystem;
 in
 stdenv.mkDerivation rec {
   pname = "tailwindcss";
-  version = "3.4.14";
+  version = "3.4.16";
 
   src = fetchurl {
     url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}";

From 59f6a88d37481bb866b8d70edc6d478b927b5db1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 21:40:14 +0000
Subject: [PATCH 051/124] ollama: 0.4.7 -> 0.5.0

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

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 77071b9c3c3f..43c36d5d69ee 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -41,13 +41,13 @@ assert builtins.elem acceleration [
 let
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.4.7";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     rev = "v${version}";
-    hash = "sha256-X1xGo054+MpThvZzeg/F+IBczY1wn/gTjcq+j1JztDg=";
+    hash = "sha256-WbRs7CdPKIEqxJUZjPT4ZzuWBl+OfGu2dzwjNVrSgVw=";
     fetchSubmodules = true;
   };
 

From ba1e58ddc81b663894772088a400cc349980c138 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 7 Dec 2024 00:02:19 +0100
Subject: [PATCH 052/124] python312Packages.dm-control: 1.0.25 -> 1.0.26

Diff: https://github.com/google-deepmind/dm_control/compare/refs/tags/1.0.25...1.0.26

Changelog: https://github.com/google-deepmind/dm_control/releases/tag/1.0.26
---
 pkgs/development/python-modules/dm-control/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dm-control/default.nix b/pkgs/development/python-modules/dm-control/default.nix
index 28a8b717d4f8..e0497ad48c38 100644
--- a/pkgs/development/python-modules/dm-control/default.nix
+++ b/pkgs/development/python-modules/dm-control/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "dm-control";
-  version = "1.0.25";
+  version = "1.0.26";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google-deepmind";
     repo = "dm_control";
-    rev = "refs/tags/${version}";
-    hash = "sha256-eP85aKECvIu8nxPcSjc3PcCR9sWeTmaVJ7gBtVis0PY=";
+    tag = version;
+    hash = "sha256-CKBgBs0hLTvExkcGYtOZ+h+/Hh4HEgF9wT/jzRe0bV0=";
   };
 
   build-system = [

From 67bb33e820f1e61ebbe2a1d33d19678796fcf48c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 01:31:10 +0000
Subject: [PATCH 053/124] astyle: 3.6.4 -> 3.6.5

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

diff --git a/pkgs/by-name/as/astyle/package.nix b/pkgs/by-name/as/astyle/package.nix
index 43bf239930e7..fd29ba87d9b1 100644
--- a/pkgs/by-name/as/astyle/package.nix
+++ b/pkgs/by-name/as/astyle/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "astyle";
-  version = "3.6.4";
+  version = "3.6.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
-    hash = "sha256-HpS2T08GRh+QOdCUrv6dSyjGbTSRayekVgVefWLXNwI=";
+    hash = "sha256-8jHNZBBHrbbAGtslEVczJqi7eik9F7VMdwVQmT3q3os=";
   };
 
   nativeBuildInputs = [ cmake ];

From 9bc50feb3b271a6cf24e51e6e83be6e2388220e9 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 7 Dec 2024 03:06:28 +0100
Subject: [PATCH 054/124] utm: 4.6.2 -> 4.6.3

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

diff --git a/pkgs/by-name/ut/utm/package.nix b/pkgs/by-name/ut/utm/package.nix
index ce8d48ce0016..7a8eaa761507 100644
--- a/pkgs/by-name/ut/utm/package.nix
+++ b/pkgs/by-name/ut/utm/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "utm";
-  version = "4.6.2";
+  version = "4.6.3";
 
   src = fetchurl {
     url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg";
-    hash = "sha256-M4R0uSAX0MUTUCsPtdRMPESFET9AEQBtjvM7eTcRCas=";
+    hash = "sha256-LKSKbUx7rxNWBybEKA7ah/5esArs9TRFJexLlMlEqjs=";
   };
 
   nativeBuildInputs = [

From 56e8788c8ab6f5d0e29cb68e82be2b2dcf85ca23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 03:10:31 +0000
Subject: [PATCH 055/124] sudo-font: 2.0.0 -> 2.1

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

diff --git a/pkgs/by-name/su/sudo-font/package.nix b/pkgs/by-name/su/sudo-font/package.nix
index 21a447adc821..1d0cb0510606 100644
--- a/pkgs/by-name/su/sudo-font/package.nix
+++ b/pkgs/by-name/su/sudo-font/package.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "sudo-font";
-  version = "2.0.0";
+  version = "2.1";
 
   src = fetchzip {
     url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
-    hash = "sha256-WjhNWwAeb6f7tlvXMr6Q7mtNnaWbHSnBtXK6Ba3YOW4=";
+    hash = "sha256-ER+TpODf+Inqo+XWJRNOHumzGRL4Dms5N1E+BU7Tr94=";
   };
 
   installPhase = ''

From cfc9a8a555f6dda5c09059fca250e71ba25e96b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 03:36:06 +0000
Subject: [PATCH 056/124] cargo-show-asm: 0.2.41 -> 0.2.42

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

diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix
index 049ef9faf03a..e769be4b2002 100644
--- a/pkgs/by-name/ca/cargo-show-asm/package.nix
+++ b/pkgs/by-name/ca/cargo-show-asm/package.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-show-asm";
-  version = "0.2.41";
+  version = "0.2.42";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-U9i/xp9WxMYf4GMsZB7qYOpuuuEw4mWZp+ZEyguGtQQ=";
+    hash = "sha256-3KdHEmoGdtfc5b5H7EQ1q5vqra0hRrROJYCIpiqxshk=";
   };
 
-  cargoHash = "sha256-eUaEpex9x9bdqPJ4p5QvkWKaxs3ih4Gb9+4deGBZgXU=";
+  cargoHash = "sha256-GwzGdy6aWnKyaQbtgRB6t0cnWWiirN9j/GqhdBc5fHU=";
 
   nativeBuildInputs = [
     installShellFiles

From f3cac64f4d786061008d1c5e1aa29e9092528af6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 03:46:33 +0000
Subject: [PATCH 057/124] phpunit: 11.3.6 -> 11.5.0

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

diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix
index dc3b9d470b2c..9bf5dc0a73c2 100644
--- a/pkgs/by-name/ph/phpunit/package.nix
+++ b/pkgs/by-name/ph/phpunit/package.nix
@@ -9,16 +9,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpunit";
-  version = "11.3.6";
+  version = "11.5.0";
 
   src = fetchFromGitHub {
     owner = "sebastianbergmann";
     repo = "phpunit";
     rev = finalAttrs.version;
-    hash = "sha256-bJdatRBrORR7KPcpRVIPYo2picQSfh8Pa0waeOZAH8Q=";
+    hash = "sha256-krlQu5zDxAjpM3zwaqty1p7ZJccnX8+Ru+AsXKSbcDY=";
   };
 
-  vendorHash = "sha256-wRgYEwbvvEGCp7/Rat+WUkvv04JqFHssHXtJjeQZo3o=";
+  vendorHash = "sha256-kz8vSl9OO4kTSYlJa79fca5XVdhyUwVFCyvdJdbYLAQ=";
 
   passthru = {
     updateScript = nix-update-script { };

From d680ca289f88b04399ff70350b467ee307b4ab16 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 04:14:56 +0000
Subject: [PATCH 058/124] sarif-tools: 3.0.2 -> 3.0.4

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

diff --git a/pkgs/development/python-modules/sarif-tools/default.nix b/pkgs/development/python-modules/sarif-tools/default.nix
index b75379c06af2..851bc66b3e12 100644
--- a/pkgs/development/python-modules/sarif-tools/default.nix
+++ b/pkgs/development/python-modules/sarif-tools/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "sarif-tools";
-  version = "3.0.2";
+  version = "3.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "sarif-tools";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-VGdl4WBdIiCWPGfFxqcG4XlbLh0uiLQXdrhUa2OxaVY=";
+    tag = "v${version}";
+    hash = "sha256-Kb7kEntEdLOuIgBqeEolXirG8E1orzRz0vv8XK2oO3Y=";
   };
 
   disabled = pythonOlder "3.8";

From 762a740b7bda4c12149777c4974445ae17df047a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 04:16:08 +0000
Subject: [PATCH 059/124] python312Packages.weaviate-client: 4.9.4 -> 4.9.6

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

diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix
index 58cefeb5bef7..fccbb289976e 100644
--- a/pkgs/development/python-modules/weaviate-client/default.nix
+++ b/pkgs/development/python-modules/weaviate-client/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "weaviate-client";
-  version = "4.9.4";
+  version = "4.9.6";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -34,8 +34,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "weaviate";
     repo = "weaviate-python-client";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-lKb8oxWK8y73zPpPJVX25MYBa6C9n96ZkGxLm3Z9r9U=";
+    tag = "v${version}";
+    hash = "sha256-zg7kHKGYKJH1KzyLIwyrmjKnEVOXEiF7PZfi347BHWc=";
   };
 
   pythonRelaxDeps = [

From 41331ec50715bc39b280ee6bcb410f25d7df13db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 04:22:16 +0000
Subject: [PATCH 060/124] gqlgenc: 0.25.3 -> 0.27.3

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

diff --git a/pkgs/by-name/gq/gqlgenc/package.nix b/pkgs/by-name/gq/gqlgenc/package.nix
index d06916abca1b..334eb2a178e3 100644
--- a/pkgs/by-name/gq/gqlgenc/package.nix
+++ b/pkgs/by-name/gq/gqlgenc/package.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "gqlgenc";
-  version = "0.25.3";
+  version = "0.27.3";
 
   src = fetchFromGitHub {
     owner = "yamashou";
     repo = "gqlgenc";
     rev = "v${version}";
-    sha256 = "sha256-sIXPd/+BVaywAAt2myNOBaAjy/eTY6C8TdSuOoikr0E=";
+    sha256 = "sha256-Ep8wrb/s3mMAMNAl2sSRBwxs9Zifls8+12/D6CgCzXg=";
   };
 
   excludedPackages = [ "example" ];
 
-  vendorHash = "sha256-YGFMQrxghJIgmiwEPfEqaACH7OETVkD8O7oUhm9foJo=";
+  vendorHash = "sha256-ln26CHD0q+iPyAx5DalOGyCtVB1QR+7ls1ZjNK8APBU=";
 
   meta = with lib; {
     description = "Go tool for building GraphQL client with gqlgen";

From a043000373a5bae01f7ae7a10ca413c1aca3e1c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 04:39:47 +0000
Subject: [PATCH 061/124] vtm: 0.9.99.35 -> 0.9.99.55

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

diff --git a/pkgs/by-name/vt/vtm/package.nix b/pkgs/by-name/vt/vtm/package.nix
index 33f866dd56d7..ce9c41638e16 100644
--- a/pkgs/by-name/vt/vtm/package.nix
+++ b/pkgs/by-name/vt/vtm/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vtm";
-  version = "0.9.99.35";
+  version = "0.9.99.55";
 
   src = fetchFromGitHub {
     owner = "netxs-group";
     repo = "vtm";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-XPBInofzFNBMuJ0oP7ZooDuRukuXBWkEzdEq09MHykA=";
+    hash = "sha256-eF5z+w64uIY7k/g4Z2Ynuz8PGyxpy6cOFIyUtV2VkxU=";
   };
 
   nativeBuildInputs = [

From d5f81093065906bb55c497b33687f571158373ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 04:40:33 +0000
Subject: [PATCH 062/124] flarectl: 0.108.0 -> 0.111.0

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

diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix
index 7a9c347c8d45..deec18b18a51 100644
--- a/pkgs/by-name/fl/flarectl/package.nix
+++ b/pkgs/by-name/fl/flarectl/package.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "flarectl";
-  version = "0.108.0";
+  version = "0.111.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflare-go";
     rev = "v${version}";
-    hash = "sha256-9pPDoXYZCcMnusBfQ1PQ8l/ZFvPNTOA8dRJALXY1Kho=";
+    hash = "sha256-/oIY7Sf7XNyoxMsaEqHgSPt8AxWDeMtMsVQ0r/vlICQ=";
   };
 
-  vendorHash = "sha256-U6ogqAweU2DZb26Ct4K/1TnCGRn//p11nVkFKzC+tj0=";
+  vendorHash = "sha256-Zuk+WreO15tGrSYHkuu6h6ZpM3iL+dPyf13LIeVEz44=";
 
   subPackages = [ "cmd/flarectl" ];
 

From 21cf8f9842d66d4f2ccc8c7fcb3fd3013fcdfa23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 04:42:48 +0000
Subject: [PATCH 063/124] crd2pulumi: 1.5.3 -> 1.5.4

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

diff --git a/pkgs/by-name/cr/crd2pulumi/package.nix b/pkgs/by-name/cr/crd2pulumi/package.nix
index 0dca4f13889c..cfb5acb30107 100644
--- a/pkgs/by-name/cr/crd2pulumi/package.nix
+++ b/pkgs/by-name/cr/crd2pulumi/package.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "crd2pulumi";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "crd2pulumi";
     rev = "v${version}";
-    sha256 = "sha256-sXZ5iImN+AwAEV6Xur4EbDZhzQEYJFf9AgaBf1wQAIA=";
+    sha256 = "sha256-PqEQrmSfcPH+GSGnuv6xpAm/2gAyTmLf81C+e25Un4s=";
   };
 
   vendorHash = "sha256-4L1KfpZ+KICPko74x3STRQFtkcNVU/5KFGhKEJ64+Jk=";

From dc6b8fa2ed1ae628c7283d4f902a9fcb611dbbff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 05:04:55 +0000
Subject: [PATCH 064/124] step-ca: 0.28.0 -> 0.28.1

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

diff --git a/pkgs/by-name/st/step-ca/package.nix b/pkgs/by-name/st/step-ca/package.nix
index 355ca94f8334..b1ad82dc2b7d 100644
--- a/pkgs/by-name/st/step-ca/package.nix
+++ b/pkgs/by-name/st/step-ca/package.nix
@@ -13,16 +13,16 @@
 
 buildGoModule rec {
   pname = "step-ca";
-  version = "0.28.0";
+  version = "0.28.1";
 
   src = fetchFromGitHub {
     owner = "smallstep";
     repo = "certificates";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FmhfsfRq6pxDhGDsNqY2IQczHk8NYEdxNaN2hfbhDYw=";
+    hash = "sha256-SFiGRmi8Bd0WEitvDvybfGMEw36gAVjtLrYbBpBAItU=";
   };
 
-  vendorHash = "sha256-ZziypdQJaQHdL5/bcX6P5VHGVtbcl+twtlOg7DlmLZM=";
+  vendorHash = "sha256-t42TAjRuMo1AXq3IKbN2L7G50vJzi/2LmhPKrn5K1Io=";
 
   ldflags = [
     "-w"

From 7053f294538bee194bfc64a2b2906a3bd03a374f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 05:27:16 +0000
Subject: [PATCH 065/124] trueseeing: 2.2.4 -> 2.2.5

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

diff --git a/pkgs/by-name/tr/trueseeing/package.nix b/pkgs/by-name/tr/trueseeing/package.nix
index 2a5001a41a51..7cfff66aa91d 100644
--- a/pkgs/by-name/tr/trueseeing/package.nix
+++ b/pkgs/by-name/tr/trueseeing/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "trueseeing";
-  version = "2.2.4";
+  version = "2.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "alterakey";
     repo = "trueseeing";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-2KELqHa6lw9wdJBaC90vTZSjD7tfkr3K6yDNhqBQrR0=";
+    tag = "v${version}";
+    hash = "sha256-EDnE1BK/nl3nqkan4gmSsP7vqkuMNJ5+oN09ZnQzsy0=";
   };
 
   build-system = with python3.pkgs; [

From 29b647f5c57d2ab03b88ce4f588698843927d605 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 05:40:01 +0000
Subject: [PATCH 066/124] micropython: 1.24.0 -> 1.24.1

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

diff --git a/pkgs/by-name/mi/micropython/package.nix b/pkgs/by-name/mi/micropython/package.nix
index e557a0614d9f..161d584cc007 100644
--- a/pkgs/by-name/mi/micropython/package.nix
+++ b/pkgs/by-name/mi/micropython/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "micropython";
-  version = "1.24.0";
+  version = "1.24.1";
 
   src = fetchFromGitHub {
     owner = "micropython";
     repo = "micropython";
     rev = "v${version}";
-    hash = "sha256-cFoUa4ZpPy1MldlTeY9ISXi9ilulmhmaH5mapUDBzE8=";
+    hash = "sha256-Hn5TtLBKK9kn9x3U2ZcU9O2CS272rcDD0HA+Xva3G4w=";
     fetchSubmodules = true;
 
     # remove unused libraries from rp2 port's SDK. we leave this and the other

From 3d7bcbb8105ae78f09de20e2fab0f4ea6123e2fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 05:47:36 +0000
Subject: [PATCH 067/124] gatus: 5.13.0 -> 5.13.1

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

diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix
index 1dd8ecfbc823..155a3cb6d01f 100644
--- a/pkgs/by-name/ga/gatus/package.nix
+++ b/pkgs/by-name/ga/gatus/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gatus";
-  version = "5.13.0";
+  version = "5.13.1";
 
   src = fetchFromGitHub {
     owner = "TwiN";
     repo = "gatus";
     rev = "v${version}";
-    hash = "sha256-+wXkB6QPAXerv8WKk4f7WA44eEaiw92Z+1bqhkZk9qQ=";
+    hash = "sha256-OY8f4FGlWeE5Jg4ESnVGo/oiTBVavBSXdGKB+uceC7U=";
   };
 
-  vendorHash = "sha256-pM47Jy7WIS8+3mFEmPZdnyxcDjoxgdP46xuTmf4p2JM=";
+  vendorHash = "sha256-FAlf+tGI3ssugHf8PsNc2Fb+rH8MqgS3BWXaee+khZw=";
 
   subPackages = [ "." ];
 

From 0290856af4e05fc9a7a959f2cdb67fee357cfb0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 6 Dec 2024 22:03:44 -0800
Subject: [PATCH 068/124] python312Packages.total-connect-client: 2024.5 ->
 2024.12

Diff: https://github.com/craigjmidwinter/total-connect-client/compare/refs/tags/2024.5...2024.12

Changelog: https://github.com/craigjmidwinter/total-connect-client/releases/tag/2024.12
---
 .../python-modules/total-connect-client/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix
index 6770e65194cc..958da44d4546 100644
--- a/pkgs/development/python-modules/total-connect-client/default.nix
+++ b/pkgs/development/python-modules/total-connect-client/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "total-connect-client";
-  version = "2024.5";
+  version = "2024.12";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -18,8 +18,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "craigjmidwinter";
     repo = "total-connect-client";
-    rev = "refs/tags/${version}";
-    hash = "sha256-NGiI4gn59U7NiRYtB6UydxOu+lVtmbl8qF3nbAjiYwk=";
+    tag = version;
+    hash = "sha256-Pf1OFWbulrJeoWSJdI2QQ/ETd5TV6m8uhvCoKsx0bx8=";
   };
 
   build-system = [ setuptools ];

From 9da738ea18e635b8b0845b91ecfa1ece2edd8d16 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 06:18:19 +0000
Subject: [PATCH 069/124] sonivox: 3.6.13 -> 3.6.14

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

diff --git a/pkgs/by-name/so/sonivox/package.nix b/pkgs/by-name/so/sonivox/package.nix
index 54bbacc847ff..e69f64c1f29a 100644
--- a/pkgs/by-name/so/sonivox/package.nix
+++ b/pkgs/by-name/so/sonivox/package.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sonivox";
-  version = "3.6.13";
+  version = "3.6.14";
 
   src = fetchFromGitHub {
     owner = "pedrolcl";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-QhXMmJbyqDxSJmT847Qbg1jbU3gLFsJ/FWVTy7MV2fE=";
+    hash = "sha256-4IlxXa9D65tGu8W5TXF9qoM/IEP9im0vbdde2SnZyX4=";
   };
 
   nativeBuildInputs = [ cmake ];

From daf0295d630aefbcb65ec7f64d372fb9df78aade Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 06:19:26 +0000
Subject: [PATCH 070/124] xsubfind3r: 0.7.0 -> 0.9.1

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

diff --git a/pkgs/by-name/xs/xsubfind3r/package.nix b/pkgs/by-name/xs/xsubfind3r/package.nix
index 976624c16b60..1ec3e6981dc0 100644
--- a/pkgs/by-name/xs/xsubfind3r/package.nix
+++ b/pkgs/by-name/xs/xsubfind3r/package.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "xsubfind3r";
-  version = "0.7.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "hueristiq";
     repo = "xsubfind3r";
     rev = "refs/tags/${version}";
-    hash = "sha256-tukynKPcIwDwpH0/SFyif6OGVZrmLVdXfhrFaaVd1d8=";
+    hash = "sha256-vmcuIa/ebCggLIALbfljJr92GE6veYEl3glm5gH9IZM=";
   };
 
-  vendorHash = "sha256-0tX/s5a6PPQuEw3BTs6uW9c5OHqXryzIfDNPnQH5sS8=";
+  vendorHash = "sha256-PFeUO3LWNBF4KPSHBxRIczIMR002Xzydcy6FyjKP60A=";
 
   ldflags = [
     "-s"

From f0494f9e82e4aaac037b7b614a9f532f65578d87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 07:38:30 +0000
Subject: [PATCH 071/124] cargo-hack: 0.6.32 -> 0.6.33

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

diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix
index 923867851b5d..5308cfca1158 100644
--- a/pkgs/by-name/ca/cargo-hack/package.nix
+++ b/pkgs/by-name/ca/cargo-hack/package.nix
@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-hack";
-  version = "0.6.32";
+  version = "0.6.33";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-XjubvjK+FySm0nqlzFsRhDQOI9M0enonwwPhZ/KFFlk=";
+    hash = "sha256-/O05q4osyQ30rHKe84oBQJTFuVmPGB5KKy6UM/TzY5Q=";
   };
 
-  cargoHash = "sha256-sWXeGohH9iLMkmBgNjSfg25eDzZHSzWrOGgccuWPBLM=";
+  cargoHash = "sha256-vkvna8+1+qQh+ZXtQ/HJa8UnstuH1sKlFc4CEUZYc5E=";
 
   # some necessary files are absent in the crate version
   doCheck = false;

From 83dbd3e7fb988ba6edc65ce259c960e1183f435c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 07:50:44 +0000
Subject: [PATCH 072/124] python312Packages.django-stubs: 5.1.0 -> 5.1.1

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

diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix
index 9b955fcfff7e..536cd80f5db1 100644
--- a/pkgs/development/python-modules/django-stubs/default.nix
+++ b/pkgs/development/python-modules/django-stubs/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "django-stubs";
-  version = "5.1.0";
+  version = "5.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "django_stubs";
     inherit version;
-    hash = "sha256-hhKMIotl5smoXl3FbrHG9BElkX2uDiHmz+zfGyfmMMU=";
+    hash = "sha256-Em01S73/SQbE6T5jYRl/b7+2Ixw99t74Wikdrm+fV3s=";
   };
 
   build-system = [ setuptools ];

From e398a97f73b52a0a7c01cf845c00204c4ff4ae2a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 09:17:22 +0100
Subject: [PATCH 073/124] python312Packages.pylamarzocco: 1.3.2 -> 1.3.3

Diff: https://github.com/zweckj/pylamarzocco/compare/refs/tags/v1.3.2...v1.3.3

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

diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix
index d3196bb45b64..7d01b6a74db3 100644
--- a/pkgs/development/python-modules/pylamarzocco/default.nix
+++ b/pkgs/development/python-modules/pylamarzocco/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pylamarzocco";
-  version = "1.3.2";
+  version = "1.3.3";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "zweckj";
     repo = "pylamarzocco";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ngTVm1tfs42pXGIQh8Hy8d7UY3D/skCZkbKr6AACYH0=";
+    hash = "sha256-sGjO1DuCYomYSWymtR4R49e1zwd0IM3WJwowoqvAApM=";
   };
 
   build-system = [ setuptools ];

From 5b52d5397efcb44b6868dc0a6033d6a86d9f46d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 08:20:24 +0000
Subject: [PATCH 074/124] gersemi: 0.17.0 -> 0.17.1

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

diff --git a/pkgs/by-name/ge/gersemi/package.nix b/pkgs/by-name/ge/gersemi/package.nix
index 23168bead7b9..f6dd7bceab47 100644
--- a/pkgs/by-name/ge/gersemi/package.nix
+++ b/pkgs/by-name/ge/gersemi/package.nix
@@ -6,13 +6,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gersemi";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "BlankSpruce";
     repo = "gersemi";
-    rev = "refs/tags/${version}";
-    hash = "sha256-t9W27lwNKRFAraynAGEawFb1qCW9/b3RCm/jeb9zJXg=";
+    tag = version;
+    hash = "sha256-AphKC50O9ohywLagyQMfk8A6w4Cm0ceHHWSRAWOnoyM=";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 41c7b2a16954961cfd2fb5ba519079ff3f499386 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 09:22:47 +0100
Subject: [PATCH 075/124] xsubfind3r: format with nixfmt

---
 pkgs/by-name/xs/xsubfind3r/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/xs/xsubfind3r/package.nix b/pkgs/by-name/xs/xsubfind3r/package.nix
index 1ec3e6981dc0..6bfc252145ad 100644
--- a/pkgs/by-name/xs/xsubfind3r/package.nix
+++ b/pkgs/by-name/xs/xsubfind3r/package.nix
@@ -1,6 +1,7 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
 }:
 
 buildGoModule rec {
@@ -23,10 +24,10 @@ buildGoModule rec {
 
   meta = with lib; {
     description = "CLI utility to find subdomains from curated passive online sources";
-    mainProgram = "xsubfind3r";
     homepage = "https://github.com/hueristiq/xsubfind3r";
     changelog = "https://github.com/hueristiq/xsubfind3r/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "xsubfind3r";
   };
 }

From 9c144766f0042fa4e3ca1638b1e42f5d7d9a5c2d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 09:42:48 +0100
Subject: [PATCH 076/124] cloudlist: format with nixfmt

---
 pkgs/by-name/cl/cloudlist/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cl/cloudlist/package.nix b/pkgs/by-name/cl/cloudlist/package.nix
index b89bea347254..07e1e55cb2fe 100644
--- a/pkgs/by-name/cl/cloudlist/package.nix
+++ b/pkgs/by-name/cl/cloudlist/package.nix
@@ -1,6 +1,7 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
 }:
 
 buildGoModule rec {
@@ -23,10 +24,10 @@ buildGoModule rec {
 
   meta = with lib; {
     description = "Tool for listing assets from multiple cloud providers";
-    mainProgram = "cloudlist";
     homepage = "https://github.com/projectdiscovery/cloudlist";
     changelog = "https://github.com/projectdiscovery/cloudlist/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "cloudlist";
   };
 }

From eef600b7720ae1dbc6fe277d5c7763eff9c0573e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 08:45:42 +0000
Subject: [PATCH 077/124] pylyzer: 0.0.71 -> 0.0.72

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

diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix
index f6689e7794f1..0ee4c9b85dfd 100644
--- a/pkgs/by-name/py/pylyzer/package.nix
+++ b/pkgs/by-name/py/pylyzer/package.nix
@@ -14,17 +14,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pylyzer";
-  version = "0.0.71";
+  version = "0.0.72";
 
   src = fetchFromGitHub {
     owner = "mtshiba";
     repo = "pylyzer";
     rev = "refs/tags/v${version}";
-    hash = "sha256-CzmfDOEh+3kUIl8dWYcxXH+6o+6zea/8hzZ09FaT8sw=";
+    hash = "sha256-8KVWLamCM7GYnOyeGzNo3z5guS02OpLT8B8WExiofeE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ZX3ql8GkgDLWFc3M1zIAu4QOYtZ/ryd1rrctkHpYmiU=";
+  cargoHash = "sha256-4CvkdEG3LyP2+b/q42OCsSruRWfunEoRXf0IasNUOKE=";
 
   nativeBuildInputs = [
     git

From c7b6af6e66953fa1311a471765df59caee8f878d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 09:48:40 +0100
Subject: [PATCH 078/124] cloudlist: add versionCheckHook

---
 pkgs/by-name/cl/cloudlist/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/cl/cloudlist/package.nix b/pkgs/by-name/cl/cloudlist/package.nix
index 07e1e55cb2fe..273189376cf4 100644
--- a/pkgs/by-name/cl/cloudlist/package.nix
+++ b/pkgs/by-name/cl/cloudlist/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
 buildGoModule rec {
@@ -17,11 +18,19 @@ buildGoModule rec {
 
   vendorHash = "sha256-6J9AWONLP/FvR0dXt5Zx4n+kTpmnxF79HcWVFp9OZ0g=";
 
+  subPackages = [ "cmd/cloudlist/" ];
+
   ldflags = [
     "-w"
     "-s"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = [ "--version" ];
+
   meta = with lib; {
     description = "Tool for listing assets from multiple cloud providers";
     homepage = "https://github.com/projectdiscovery/cloudlist";

From c6a09301bdcb2b2363c90f2e85b2bf3b5f65ff1f Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sat, 7 Dec 2024 17:07:41 +0800
Subject: [PATCH 079/124] timeshift: format expressions

---
 .../applications/backup/timeshift/default.nix | 42 ++++++++++---------
 .../applications/backup/timeshift/minimal.nix | 15 ++++---
 .../backup/timeshift/unwrapped.nix            | 36 +++++++++-------
 .../applications/backup/timeshift/wrapper.nix | 26 +++++++-----
 4 files changed, 68 insertions(+), 51 deletions(-)

diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix
index 53bcc5a373bf..9f550af44881 100644
--- a/pkgs/applications/backup/timeshift/default.nix
+++ b/pkgs/applications/backup/timeshift/default.nix
@@ -1,13 +1,14 @@
-{ callPackage
-, timeshift-unwrapped
-, rsync
-, coreutils
-, mount
-, umount
-, psmisc
-, cron
-, btrfs-progs
-, grubPackage
+{
+  callPackage,
+  timeshift-unwrapped,
+  rsync,
+  coreutils,
+  mount,
+  umount,
+  psmisc,
+  cron,
+  btrfs-progs,
+  grubPackage,
 }:
 let
   timeshift-wrapper = callPackage ./wrapper.nix { };
@@ -21,12 +22,15 @@ in
   cron
   btrfs-progs
   grubPackage
-])).overrideAttrs (oldAttrs: {
-  meta = oldAttrs.meta // {
-    description = oldAttrs.meta.description;
-    longDescription = oldAttrs.meta.longDescription + ''
-      This package comes with runtime dependencies of command utilities provided by rsync, coreutils, mount, umount, psmisc, cron and btrfs.
-      If you want to use the commands provided by the system, use timeshift-minimal instead.
-    '';
-  };
-})
+])).overrideAttrs
+  (oldAttrs: {
+    meta = oldAttrs.meta // {
+      description = oldAttrs.meta.description;
+      longDescription =
+        oldAttrs.meta.longDescription
+        + ''
+          This package comes with runtime dependencies of command utilities provided by rsync, coreutils, mount, umount, psmisc, cron and btrfs.
+          If you want to use the commands provided by the system, use timeshift-minimal instead.
+        '';
+    };
+  })
diff --git a/pkgs/applications/backup/timeshift/minimal.nix b/pkgs/applications/backup/timeshift/minimal.nix
index 96946fa72e05..113200c30e73 100644
--- a/pkgs/applications/backup/timeshift/minimal.nix
+++ b/pkgs/applications/backup/timeshift/minimal.nix
@@ -1,5 +1,6 @@
-{ callPackage
-, timeshift-unwrapped
+{
+  callPackage,
+  timeshift-unwrapped,
 }:
 let
   timeshift-wrapper = callPackage ./wrapper.nix { };
@@ -7,9 +8,11 @@ in
 (timeshift-wrapper timeshift-unwrapped [ ]).overrideAttrs (oldAttrs: {
   meta = oldAttrs.meta // {
     description = oldAttrs.meta.description + " (without runtime dependencies)";
-    longDescription = oldAttrs.meta.longDescription + ''
-      This package is a wrapped version of timeshift-unwrapped
-      without runtime dependencies of command utilities.
-    '';
+    longDescription =
+      oldAttrs.meta.longDescription
+      + ''
+        This package is a wrapped version of timeshift-unwrapped
+        without runtime dependencies of command utilities.
+      '';
   };
 })
diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix
index 86d6794051ef..3fbaed4b21be 100644
--- a/pkgs/applications/backup/timeshift/unwrapped.nix
+++ b/pkgs/applications/backup/timeshift/unwrapped.nix
@@ -1,18 +1,19 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, gettext
-, help2man
-, meson
-, ninja
-, pkg-config
-, vala
-, gtk3
-, json-glib
-, libgee
-, util-linux
-, vte
-, xapp
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gettext,
+  help2man,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  gtk3,
+  json-glib,
+  libgee,
+  util-linux,
+  vte,
+  xapp,
 }:
 
 stdenv.mkDerivation rec {
@@ -65,6 +66,9 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/linuxmint/timeshift";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ShamrockLee bobby285271 ];
+    maintainers = with maintainers; [
+      ShamrockLee
+      bobby285271
+    ];
   };
 }
diff --git a/pkgs/applications/backup/timeshift/wrapper.nix b/pkgs/applications/backup/timeshift/wrapper.nix
index 84b3f14ac2ff..0769ee957642 100644
--- a/pkgs/applications/backup/timeshift/wrapper.nix
+++ b/pkgs/applications/backup/timeshift/wrapper.nix
@@ -1,14 +1,14 @@
-{ stdenvNoCC
-, lib
-, wrapGAppsHook3
-, gdk-pixbuf
-, librsvg
-, xorg
-, shared-mime-info
+{
+  stdenvNoCC,
+  lib,
+  wrapGAppsHook3,
+  gdk-pixbuf,
+  librsvg,
+  xorg,
+  shared-mime-info,
 }:
 
-timeshift-unwrapped:
-runtimeDeps:
+timeshift-unwrapped: runtimeDeps:
 stdenvNoCC.mkDerivation {
   inherit (timeshift-unwrapped) pname version;
 
@@ -34,7 +34,13 @@ stdenvNoCC.mkDerivation {
     )
     gappsWrapperArgs+=(
       # Thumbnailers
-      --prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ gdk-pixbuf librsvg shared-mime-info ]}"
+      --prefix XDG_DATA_DIRS : "${
+        lib.makeSearchPath "share" [
+          gdk-pixbuf
+          librsvg
+          shared-mime-info
+        ]
+      }"
       "''${makeWrapperArgs[@]}"
     )
     wrapProgram "$out/bin/timeshift" "''${makeWrapperArgs[@]}"

From f25c11670721aad8d2e71aa42ffae3ce6e35609e Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sat, 7 Dec 2024 17:16:34 +0800
Subject: [PATCH 080/124] timeshift: sort dependencies alphabetically

---
 .../applications/backup/timeshift/default.nix | 30 +++++++++----------
 .../applications/backup/timeshift/wrapper.nix |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix
index 9f550af44881..9c6de88703b3 100644
--- a/pkgs/applications/backup/timeshift/default.nix
+++ b/pkgs/applications/backup/timeshift/default.nix
@@ -1,28 +1,28 @@
 {
   callPackage,
-  timeshift-unwrapped,
-  rsync,
-  coreutils,
-  mount,
-  umount,
-  psmisc,
-  cron,
   btrfs-progs,
+  coreutils,
+  cron,
   grubPackage,
+  mount,
+  psmisc,
+  rsync,
+  timeshift-unwrapped,
+  umount,
 }:
 let
   timeshift-wrapper = callPackage ./wrapper.nix { };
 in
-(timeshift-wrapper timeshift-unwrapped ([
-  rsync
-  coreutils
-  mount
-  umount
-  psmisc
-  cron
+(timeshift-wrapper timeshift-unwrapped [
   btrfs-progs
+  coreutils
+  cron
   grubPackage
-])).overrideAttrs
+  mount
+  psmisc
+  rsync
+  umount
+]).overrideAttrs
   (oldAttrs: {
     meta = oldAttrs.meta // {
       description = oldAttrs.meta.description;
diff --git a/pkgs/applications/backup/timeshift/wrapper.nix b/pkgs/applications/backup/timeshift/wrapper.nix
index 0769ee957642..5bbfffb94d46 100644
--- a/pkgs/applications/backup/timeshift/wrapper.nix
+++ b/pkgs/applications/backup/timeshift/wrapper.nix
@@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation {
   dontUnpack = true;
 
   nativeBuildInputs = [
-    xorg.lndir
     wrapGAppsHook3
+    xorg.lndir
   ];
 
   installPhase = ''

From d4b04132463963a40567a955976c48c67e0bb66d Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Sat, 7 Dec 2024 17:40:48 +0800
Subject: [PATCH 081/124] bilibili: 1.14.0-2 -> 1.15.2-2

---
 pkgs/by-name/bi/bilibili/package.nix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/bi/bilibili/package.nix b/pkgs/by-name/bi/bilibili/package.nix
index 14b3e0348370..fb6a23d4dbc1 100644
--- a/pkgs/by-name/bi/bilibili/package.nix
+++ b/pkgs/by-name/bi/bilibili/package.nix
@@ -2,21 +2,21 @@
   lib,
   stdenv,
   fetchurl,
-  electron_30,
+  electron,
   dpkg,
   makeWrapper,
   commandLineArgs ? "",
 }:
 let
-  version = "1.14.0-2";
+  version = "1.15.2-2";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb";
-      hash = "sha256-QQMdEpKE7r/fPMaX/yEoaa7KjilhiPMYLRvGPkv1jds=";
+      hash = "sha256-juAhvdeLzjHDs59eS+wwUn3OmnDecC17Vclp0Q0LtJw=";
     };
     aarch64-linux = fetchurl {
       url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_arm64.deb";
-      hash = "sha256-UaGI4BLhfoYluZpARsj+I0iEmFXYYNfl4JWhBWOOip0=";
+      hash = "sha256-8o0MX0Ih07KQ9wE+nonSZaupSOuUVyuoIbdHYmR29mc=";
     };
   };
   src =
@@ -25,11 +25,6 @@ in
 stdenv.mkDerivation {
   pname = "bilibili";
   inherit src version;
-  unpackPhase = ''
-    runHook preUnpack
-    dpkg -x $src ./
-    runHook postUnpack
-  '';
 
   nativeBuildInputs = [
     makeWrapper
@@ -43,7 +38,7 @@ stdenv.mkDerivation {
     cp -r usr/share $out/share
     sed -i "s|Exec=.*|Exec=$out/bin/bilibili|" $out/share/applications/*.desktop
     cp -r opt/apps/io.github.msojocs.bilibili/files/bin/app $out/opt
-    makeWrapper ${lib.getExe electron_30} $out/bin/bilibili \
+    makeWrapper ${lib.getExe electron} $out/bin/bilibili \
       --argv0 "bilibili" \
       --add-flags "$out/opt/app.asar" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
@@ -67,7 +62,7 @@ stdenv.mkDerivation {
       "x86_64-linux"
       "aarch64-linux"
     ];
-    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     mainProgram = "bilibili";
   };
 }

From 0e2e51188d0b3316d6fba40fa150b3982e20d3f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 09:41:28 +0000
Subject: [PATCH 082/124] gut: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/by-name/gu/gut/package.nix b/pkgs/by-name/gu/gut/package.nix
index 0192fc3df937..9874a9447780 100644
--- a/pkgs/by-name/gu/gut/package.nix
+++ b/pkgs/by-name/gu/gut/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "gut";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "julien040";
     repo = "gut";
     rev = version;
-    hash = "sha256-l7yjZEcpsnVisd93EqIug1n0k18m4tUmCQFXC6b63cg=";
+    hash = "sha256-pjjeA0Nwc5M3LwxZLpBPnFqXJX0b6KDaj4YCPuGoUuU=";
   };
 
   vendorHash = "sha256-G9oDMHLmdv/vQfofTqKAf21xaGp+lvW+sedLmaj+A5A=";

From 2c4ec5fd17f3732b21d5ee5807dea9b495cee922 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 09:59:41 +0000
Subject: [PATCH 083/124] nerdfetch: 8.3.0 -> 8.3.1

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

diff --git a/pkgs/by-name/ne/nerdfetch/package.nix b/pkgs/by-name/ne/nerdfetch/package.nix
index c470b12e114d..f8480813a7de 100644
--- a/pkgs/by-name/ne/nerdfetch/package.nix
+++ b/pkgs/by-name/ne/nerdfetch/package.nix
@@ -5,13 +5,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "nerdfetch";
-  version = "8.3.0";
+  version = "8.3.1";
 
   src = fetchFromGitHub {
     owner = "ThatOneCalculator";
     repo = "NerdFetch";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-CQjIxXGuEUdUbbdclVKshsz/AdkgDTTACoNCVFrHqas=";
+    hash = "sha256-Ptd699Q2kX+04TGnChQK45dBf0W1QUFk7vHpRl3kFKo=";
   };
 
   dontUnpack = true;

From e3939e1c1fa443dc3e586cbb73fb12dde9863bbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 10:14:35 +0000
Subject: [PATCH 084/124] nwg-panel: 0.9.50 -> 0.9.53

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

diff --git a/pkgs/by-name/nw/nwg-panel/package.nix b/pkgs/by-name/nw/nwg-panel/package.nix
index 1d415901d616..01fe763a348d 100644
--- a/pkgs/by-name/nw/nwg-panel/package.nix
+++ b/pkgs/by-name/nw/nwg-panel/package.nix
@@ -23,13 +23,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nwg-panel";
-  version = "0.9.50";
+  version = "0.9.53";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-panel";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-/WJpxFmQ6ED/PWW9/qIp5VheBgAukLIwRSdOxfPoyKM=";
+    tag = "v${version}";
+    hash = "sha256-hku5a2np7J/7jt9oL77GLasslFk1VRPe3cGG6xmQGwY=";
   };
 
   # No tests

From 90cba9b17d57fe5b9f0273211291c28ccee7de4a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 7 Dec 2024 11:24:17 +0100
Subject: [PATCH 085/124] tinymist: 0.12.8 -> 0.12.10

Diff: https://github.com/Myriad-Dreamin/tinymist/compare/refs/tags/v0.12.8...v0.12.10

Changelog: https://github.com/Myriad-Dreamin/tinymist/blob/v0.12.10/CHANGELOG.md
---
 .../vscode/extensions/myriad-dreamin.tinymist/default.nix | 2 +-
 pkgs/by-name/ti/tinymist/package.nix                      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
index eb8db3fd45f6..e22d5a13f56d 100644
--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "tinymist";
     publisher = "myriad-dreamin";
     inherit (tinymist) version;
-    hash = "sha256-dHxeyqVe7cA/xK0RpprWRt5xPViyLHHal0pO6xhq4aE=";
+    hash = "sha256-vkVH+CBGSEWqSIDel+Y2O+B17LvLZbOjpHzbGAvEmWg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix
index 5ff9d8a4a1ed..65bb411bf2c4 100644
--- a/pkgs/by-name/ti/tinymist/package.nix
+++ b/pkgs/by-name/ti/tinymist/package.nix
@@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec {
   pname = "tinymist";
   # Please update the corresponding vscode extension when updating
   # this derivation.
-  version = "0.12.8";
+  version = "0.12.10";
 
   src = fetchFromGitHub {
     owner = "Myriad-Dreamin";
     repo = "tinymist";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-yEvWPCFxdwc+fJOYRpxH1M5Fr+SedPm5fIE5tS1Fzhk=";
+    tag = "v${version}";
+    hash = "sha256-y+H1Q8TJa7XinVcsgZ9XCyeIUqQzvIAjlkgjia9rNso=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-k4X62J5SUDkg70acESbwlqQIF9mnQzNgA0pvHuxCwfs=";
+  cargoHash = "sha256-Fvd8PqT64HseoIIhsWittN6Trp2i4ravIc+ETwiY+xQ=";
 
   nativeBuildInputs = [ pkg-config ];
 

From aa6aa758d63ce0e978721692b606bc981d232a3f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 7 Dec 2024 11:19:15 +0100
Subject: [PATCH 086/124] typstyle: 0.12.7 -> 0.12.8

Diff: https://github.com/Enter-tainer/typstyle/compare/refs/tags/v0.12.7...v0.12.8

Changelog: https://github.com/Enter-tainer/typstyle/blob/refs/tags/v0.12.8/CHANGELOG.md
---
 pkgs/by-name/ty/typstyle/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix
index 546fc7f84688..0e0becafc9f2 100644
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "typstyle";
-  version = "0.12.7";
+  version = "0.12.8";
 
   src = fetchFromGitHub {
     owner = "Enter-tainer";
     repo = "typstyle";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-sezpyp5Nev9i1pxCbFSQcm551VEHPmuP1ouCusNt7h8=";
+    tag = "v${version}";
+    hash = "sha256-JGRFZBPWG2pFur7K9JvQub5Fx4HvdyR+0hQFLI1tpo4=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-sm9U+Y21+m8Tmj5rhJ18iRSp1DACAisRUzNQpA+EG6g=";
+  cargoHash = "sha256-YmG2UO9dkdrEULVieSdzd+NgqFaYOHojnrjHUi2ME8Q=";
 
   # Disabling tests requiring network access
   checkFlags = [
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   meta = {
-    changelog = "https://github.com/Enter-tainer/typstyle/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/Enter-tainer/typstyle/blob/v${version}/CHANGELOG.md";
     description = "Format your typst source code";
     homepage = "https://github.com/Enter-tainer/typstyle";
     license = lib.licenses.asl20;

From 23bc864ee46848016e9483ebdbcd116c2ab1557d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 10:29:07 +0000
Subject: [PATCH 087/124] openapi-python-client: 0.21.6 -> 0.21.7

---
 pkgs/by-name/op/openapi-python-client/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix
index 171434d7a30b..a0876ac951b4 100644
--- a/pkgs/by-name/op/openapi-python-client/package.nix
+++ b/pkgs/by-name/op/openapi-python-client/package.nix
@@ -11,15 +11,15 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "openapi-python-client";
-  version = "0.21.6";
+  version = "0.21.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     inherit version;
     owner = "openapi-generators";
     repo = "openapi-python-client";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-hmVRPQ3+20ZBRCkQltX+S+pGGy2unsBSztyif93sKsw=";
+    tag = "v${version}";
+    hash = "sha256-V3tvAyojSSijbqVfsodk7eiyUBGZOjf1stkedfwTeOQ=";
   };
 
   nativeBuildInputs =

From 1499755c7d1815123d59a721f9050cb060ea1292 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 10:37:45 +0000
Subject: [PATCH 088/124] namespace-cli: 0.0.394 -> 0.0.396

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

diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix
index 36cc397f85a6..4881a247d59e 100644
--- a/pkgs/by-name/na/namespace-cli/package.nix
+++ b/pkgs/by-name/na/namespace-cli/package.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "namespace-cli";
-  version = "0.0.394";
+  version = "0.0.396";
 
   src = fetchFromGitHub {
     owner = "namespacelabs";
     repo = "foundation";
     rev = "v${version}";
-    hash = "sha256-ktXpFhE/+DmlqIaH8R6zu4Y1I7sr8NYeZP8lWeNN0bA=";
+    hash = "sha256-hDCHu/RlZfuEL20wO5V7cBcKQKswoUBwTp531rlYN5A=";
   };
 
   vendorHash = "sha256-E9RhELIGOjFa+gDinl4xDR3ckTtdFLqVoAT0HQoI38I=";

From 122ae6f0380e53e2792af34f8e09f65bf869c1fc Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 7 Dec 2024 11:45:23 +0100
Subject: [PATCH 089/124] zizmor: 0.7.0 -> 0.8.0

Changes:
https://github.com/woodruffw/zizmor/releases/tag/v0.8.0
---
 pkgs/by-name/zi/zizmor/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix
index 199823473dbe..e256a1dfd398 100644
--- a/pkgs/by-name/zi/zizmor/package.nix
+++ b/pkgs/by-name/zi/zizmor/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zizmor";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "woodruffw";
     repo = "zizmor";
-    rev = "v${version}";
-    hash = "sha256-fZD8wXKS8bGh6P+KS2VM3pCuEDIEeNrK5iAykxzC/2Q=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-NNPY73G1DNxN6D/h73teldF8m1sObP0BufRRtlFI0xo=";
   };
 
-  cargoHash = "sha256-n9VLK9i7YayiLD8pnEns19vbtlEktjFutYoKwpXgBCw=";
+  cargoHash = "sha256-I8kKSIRYLbSFGUNGXmBA1UfgJeMXZgBCKDTnqXkTJcE=";
 
   buildInputs = [ openssl ];
 

From 49952726c3f64248cf5fd5dc92164493a3593aeb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 10:47:59 +0000
Subject: [PATCH 090/124] python312Packages.python-linkplay: 0.0.20 -> 0.1.0

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

diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix
index 28dea568850e..d8bb004c3383 100644
--- a/pkgs/development/python-modules/python-linkplay/default.nix
+++ b/pkgs/development/python-modules/python-linkplay/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "python-linkplay";
-  version = "0.0.20";
+  version = "0.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Velleman";
     repo = "python-linkplay";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-UIWubFLHtf43co/aYXh3rxkjLJ77E+Sgkx25UFC5vcg=";
+    tag = "v${version}";
+    hash = "sha256-upgiGAAopRoCYtWaGpYIpmb8nbSHr1iW7wGfBrC1yW4=";
   };
 
   build-system = [ setuptools ];

From 9a4f4d4fa99b670714fa766bd682e80495f9e09b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 10:48:22 +0000
Subject: [PATCH 091/124] gotrue-supabase: 2.163.2 -> 2.165.1

---
 pkgs/tools/security/gotrue/supabase.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix
index a7b9bbad2d94..4903db23918f 100644
--- a/pkgs/tools/security/gotrue/supabase.nix
+++ b/pkgs/tools/security/gotrue/supabase.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "auth";
-  version = "2.163.2";
+  version = "2.165.1";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "auth";
     rev = "v${version}";
-    hash = "sha256-Y+A8uYC6FUmAgD4TMXShhknVdlmSZ5UwiqEfJUEpq6k=";
+    hash = "sha256-Tp8h20GM2YULlElFtHS41rFyWSIT3EGGXKtExkuO5P8=";
   };
 
-  vendorHash = "sha256-Tg2X4vLuff5XTegDl4vrbvCycbuq4BgEq+O5FhWO+Ds=";
+  vendorHash = "sha256-w6qbqHHdXdDYHO5Asa0fkf0UBI7Wr2Voc2K4Ss1zDCE=";
 
   ldflags = [
     "-s"

From d842a192cbe0ae0d216c089412027b2698038263 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 7 Dec 2024 11:31:39 +0100
Subject: [PATCH 092/124] python312Packages.transformers: fix darwin by
 skipping torch.distributed import

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

diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix
index 06508471a619..e9b312cf2c59 100644
--- a/pkgs/development/python-modules/transformers/default.nix
+++ b/pkgs/development/python-modules/transformers/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -68,6 +69,15 @@ buildPythonPackage rec {
     hash = "sha256-TQQ+w+EH/KWLE7iaaAHGxfE74hCiLXcqlIr1TIBFGvo=";
   };
 
+  # torch.distributed is not available on darwin
+  # Fix submitted upstream in https://github.com/huggingface/transformers/pull/35133
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/transformers/pytorch_utils.py \
+      --replace-fail \
+        'if is_torch_greater_or_equal("2.5"):' \
+        'if False:'
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [

From e26653680f871fa7058ff6eba53f8dabddeb9981 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 11:14:03 +0000
Subject: [PATCH 093/124] extism-cli: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/by-name/ex/extism-cli/package.nix b/pkgs/by-name/ex/extism-cli/package.nix
index 36bdd4557d77..933fdeaa8b54 100644
--- a/pkgs/by-name/ex/extism-cli/package.nix
+++ b/pkgs/by-name/ex/extism-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "extism-cli";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "extism";
     repo = "cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FAnPyhCc1R6Xk195hTfO16WVtYVB6RPp7Ih7+uyRy2s=";
+    hash = "sha256-txwpFc1FQlZLAxbpO92Ei7z3vhXBrpdIJHAqnrKp9Bg=";
   };
 
-  vendorHash = "sha256-w8XqHirHfswhlBH/oSrDKLyGdbaiFjQGEZcMH+WVLYo=";
+  vendorHash = "sha256-51/fzq2j55GHmEx2twb0DSi0AmBS4DbViZzo1c5Xn1M=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From c410701f9bc6e6e273cf821241a5c156374fc3b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 11:21:31 +0000
Subject: [PATCH 094/124] fflogs: 8.14.21 -> 8.14.49

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

diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix
index b4c94e54e303..5ff45e5c2199 100644
--- a/pkgs/by-name/ff/fflogs/package.nix
+++ b/pkgs/by-name/ff/fflogs/package.nix
@@ -5,10 +5,10 @@
 
 let
   pname = "fflogs";
-  version = "8.14.21";
+  version = "8.14.49";
   src = fetchurl {
     url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
-    hash = "sha256-sBC2qvtSje2uXzSZAYXBFmycKxf0B6/JZhOvWNyMp20=";
+    hash = "sha256-pgI6xiTz1Gm5OMUnJsXD/B2eBm3MkPKIYQ6DgyVdwYo=";
   };
   extracted = appimageTools.extractType2 { inherit pname version src; };
 in

From e9691a4519249037072a29d34f064511490b2331 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 11:22:56 +0000
Subject: [PATCH 095/124] goawk: 1.28.0 -> 1.29.1

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

diff --git a/pkgs/by-name/go/goawk/package.nix b/pkgs/by-name/go/goawk/package.nix
index dcd541d0bb76..7830258e1377 100644
--- a/pkgs/by-name/go/goawk/package.nix
+++ b/pkgs/by-name/go/goawk/package.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "goawk";
-  version = "1.28.0";
+  version = "1.29.1";
 
   src = fetchFromGitHub {
     owner = "benhoyt";
     repo = "goawk";
     rev = "v${version}";
-    hash = "sha256-3i8czhGFk8XqYaenKTmsvXt2kRSss++rS6amLxfM2DE=";
+    hash = "sha256-PQtayS2403ldNiE/xMQ/Oy+BsZB1ixDALuZcjhRyxLY=";
   };
 
   vendorHash = null;

From 14944e93bfafb7378a1dc0dc4f17e195d5ced4be Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 5 Dec 2024 11:00:22 +0100
Subject: [PATCH 096/124] materialize: minor improvements

---
 pkgs/by-name/ma/materialize/package.nix | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix
index 4847c3dff08d..39c8944af48d 100644
--- a/pkgs/by-name/ma/materialize/package.nix
+++ b/pkgs/by-name/ma/materialize/package.nix
@@ -94,13 +94,13 @@ in
 rustPlatform.buildRustPackage rec {
   pname = "materialize";
   version = "0.84.2";
-  MZ_DEV_BUILD_SHA = "9f8cf75b461d288335cb6a7a73aaa670bab4a466";
+  MZ_DEV_BUILD_SHA = "000000000000000000000000000000000000000000000000000";
 
   src = fetchFromGitHub {
     owner = "MaterializeInc";
     repo = "materialize";
-    rev = "refs/tags/v${version}";
     hash = "sha256-+cvTCiTbuaPYPIyDxQlMWdJA5/6cbMoiTcSmjj5KPjs=";
+    tag = "v${version}";
     fetchSubmodules = true;
   };
 
@@ -156,16 +156,19 @@ rustPlatform.buildRustPackage rec {
   # Skip tests that use the network
   checkFlags = [
     "--exact"
-    "--skip test_client"
-    "--skip test_client_errors"
-    "--skip test_client_all_subjects"
-    "--skip test_client_subject_and_references"
-    "--skip test_no_block"
-    "--skip test_safe_mode"
-    "--skip test_tls"
+    "--skip=test_client"
+    "--skip=test_client_errors"
+    "--skip=test_client_all_subjects"
+    "--skip=test_client_subject_and_references"
+    "--skip=test_no_block"
+    "--skip=test_safe_mode"
+    "--skip=test_tls"
   ];
 
-  cargoBuildFlags = [ "--bin environmentd --bin clusterd" ];
+  cargoBuildFlags = [
+    "--bin=clusterd"
+    "--bin=environmentd"
+  ];
 
   postInstall = ''
     install --mode=444 -D ./misc/dist/materialized.service $out/etc/systemd/system/materialized.service

From 1137de9dc32ae7de9a7c42007e826e52c0a01b0e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 6 Dec 2024 16:02:28 +0100
Subject: [PATCH 097/124] materialize: enable all unix platforms

Until now, aarch64-darwin was excluded.
However, the package seems to build fine there.
---
 pkgs/by-name/ma/materialize/package.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix
index 39c8944af48d..906080b4213f 100644
--- a/pkgs/by-name/ma/materialize/package.nix
+++ b/pkgs/by-name/ma/materialize/package.nix
@@ -189,11 +189,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://materialize.com";
     description = "Streaming SQL materialized view engine for real-time applications";
     license = lib.licenses.bsl11;
-    platforms = [
-      "x86_64-linux"
-      "x86_64-darwin"
-      "aarch64-linux"
-    ];
+    platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ petrosagg ];
     mainProgram = "environmentd";
   };

From f3c3d07d01a1cd6a03dc6b5d341771ce591b307e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 5 Dec 2024 18:45:56 +0100
Subject: [PATCH 098/124] materialize: 0.84.2 -> 0.87.2

Diff:
https://github.com/MaterializeInc/materialize/compare/refs/tags/v0.84.2...0.87.2
---
 pkgs/by-name/ma/materialize/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/materialize/package.nix b/pkgs/by-name/ma/materialize/package.nix
index 906080b4213f..c3745ba58f47 100644
--- a/pkgs/by-name/ma/materialize/package.nix
+++ b/pkgs/by-name/ma/materialize/package.nix
@@ -93,14 +93,14 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "materialize";
-  version = "0.84.2";
+  version = "0.87.2";
   MZ_DEV_BUILD_SHA = "000000000000000000000000000000000000000000000000000";
 
   src = fetchFromGitHub {
     owner = "MaterializeInc";
     repo = "materialize";
-    hash = "sha256-+cvTCiTbuaPYPIyDxQlMWdJA5/6cbMoiTcSmjj5KPjs=";
     tag = "v${version}";
+    hash = "sha256-EHhN+avUxzwKU48MubiMM40W9J93yZlNqV+xeP44dl0=";
     fetchSubmodules = true;
   };
 
@@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-EHVuwVYPZKaoP3GYtJpYJaKG3CLsy9CWuEmajF4P7Qc=";
+  cargoHash = "sha256-+OREisZ/vw3Oi5MNCYn7u06pZKtf+2trlGyn//uAGws=";
 
   nativeBuildInputs =
     [

From a6e34ce3c01810bfd4d9ce4841a8d8ffebd95706 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 11:47:25 +0000
Subject: [PATCH 099/124] cargo-udeps: 0.1.52 -> 0.1.53

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

diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix
index 16ef0f6ea57b..cb1321e451e5 100644
--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/pkgs/development/tools/rust/cargo-udeps/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-udeps";
-  version = "0.1.52";
+  version = "0.1.53";
 
   src = fetchFromGitHub {
     owner = "est31";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-ArFQaQQU6lOT5wS9vxC+hCYpDWaq7D1DbQhjGzPQEjo=";
+    sha256 = "sha256-l5r0ZbF3LlGzJgMt0rPizzP0ZBLJQNLGBynPw4nAwMc=";
   };
 
-  cargoHash = "sha256-fRTOhZVehGBwQcJQM/GWmLgfaDK7aJFYz772MPYhkn4=";
+  cargoHash = "sha256-XRK26pYVUVOUAQsWxIhY2m5bwSIqCMBZ2r34eN3RQiE=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 62ed7c14489ca95e896a9c379d43ad98aa2c48b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 11:49:27 +0000
Subject: [PATCH 100/124] python312Packages.knocki: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/development/python-modules/knocki/default.nix b/pkgs/development/python-modules/knocki/default.nix
index bcdc986033e8..82e4c4985ca1 100644
--- a/pkgs/development/python-modules/knocki/default.nix
+++ b/pkgs/development/python-modules/knocki/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "knocki";
-  version = "0.4.1";
+  version = "0.4.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "swan-solutions";
     repo = "knocki-homeassistant";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-Eh/ykTbR2NMZ9Mjgcc53OU3+2EsX6FWV93DmwCDvsRg=";
+    tag = "v${version}";
+    hash = "sha256-85w+fj00VW0miNt+xRMcU6szg/Z7QaeKLGw2BV7X0T4=";
   };
 
   postPatch = ''

From 4ddb2d07da656a97f10bdfcff35a9880f6b86d4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 12:11:38 +0000
Subject: [PATCH 101/124] gauge-unwrapped: 1.6.9 -> 1.6.10

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

diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix
index 88b740fb6cd4..05538598dd69 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "gauge";
-  version = "1.6.9";
+  version = "1.6.10";
 
   patches = [
     # adds a check which adds an error message when trying to
@@ -14,10 +14,10 @@ buildGoModule rec {
     owner = "getgauge";
     repo = "gauge";
     rev = "v${version}";
-    hash = "sha256-YjLBfQ6L3UwcgQ9LgUfnNSegNhQI8/Gb5Hdpe0/uzOc=";
+    hash = "sha256-D0x+87bKVtZPHJcwZUJ49JXp2o32ieOw/etnE69c8CI=";
   };
 
-  vendorHash = "sha256-Uir/umJNnTHWEKPbVch0Pq7B3hVim8BMtGc/M9esADw=";
+  vendorHash = "sha256-2oEIBIr8oc1ku/k9mlLSg6Q6BbUleufvlmWOaV6wPfU=";
 
   excludedPackages = [ "build" "man" ];
 

From daf879f86913ab6ace09482b5582ba89e8e3e0b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 12:15:32 +0000
Subject: [PATCH 102/124] electrs: 0.10.6 -> 0.10.7

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

diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix
index 868ffaf6e0cd..3c669592c0dd 100644
--- a/pkgs/applications/blockchains/electrs/default.nix
+++ b/pkgs/applications/blockchains/electrs/default.nix
@@ -11,16 +11,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "electrs";
-  version = "0.10.6";
+  version = "0.10.7";
 
   src = fetchFromGitHub {
     owner = "romanz";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-yp9fKD7zH9Ne2+WQUupaxvUx39RWE8RdY4U6lHuDGSc=";
+    hash = "sha256-KDl+SV5U2aqsl3UMK8WWZiwkcqLpaRGmH/J8vBKTZcQ=";
   };
 
-  cargoHash = "sha256-J+6aek1PcW7G6f4h6cQcx5CyliryZeSxkSIQUX3yz6s=";
+  cargoHash = "sha256-vcn+94KklWlYQw4fbH8KxhBnovk0dJc8Hkj+jJ+SeB0=";
 
   # needed for librocksdb-sys
   nativeBuildInputs = [ rustPlatform.bindgenHook ];

From e2e988d9172b8a87b01ecd8a0d863f5bf367a6c7 Mon Sep 17 00:00:00 2001
From: Eman Resu <78693624+llakala@users.noreply.github.com>
Date: Sat, 7 Dec 2024 07:39:43 -0500
Subject: [PATCH 103/124] gnome-extension-manager: fix black screen via
 upstream patch (#358236)

---
 pkgs/by-name/gn/gnome-extension-manager/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/gn/gnome-extension-manager/package.nix b/pkgs/by-name/gn/gnome-extension-manager/package.nix
index 9b6167322aa5..02eb300c59ef 100644
--- a/pkgs/by-name/gn/gnome-extension-manager/package.nix
+++ b/pkgs/by-name/gn/gnome-extension-manager/package.nix
@@ -18,6 +18,7 @@
 , glib
 , libbacktrace
 , text-engine
+, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
@@ -54,6 +55,14 @@ stdenv.mkDerivation rec {
     text-engine
   ];
 
+  patches = [
+    # fix black window when opened, remove in next release
+    (fetchpatch {
+      url = "https://github.com/mjakeman/extension-manager/commit/91d1c42a30e12131dc3c5afd8a709e7db2a95b70.patch";
+      hash = "sha256-NtsJeqclUx4L3wbyQ46ZCoo4IKSu4/HoT/FD20xriZ4=";
+    })
+  ];
+
   mesonFlags = [
     (lib.mesonOption "package" "Nix")
     (lib.mesonOption "distributor" "nixpkgs")

From b89b83eb3116265bacb253ccf2129db0c93f0428 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 12:55:16 +0000
Subject: [PATCH 104/124] topgrade: 16.0.1 -> 16.0.2

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

diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index e077ed9bb2be..fa98d818d59d 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "topgrade";
-  version = "16.0.1";
+  version = "16.0.2";
 
   src = fetchFromGitHub {
     owner = "topgrade-rs";
     repo = "topgrade";
     rev = "v${version}";
-    hash = "sha256-/zSr6PEtfzLI/c32KrBlfHPja34T5DyiiR5a1/GDH/0=";
+    hash = "sha256-0wJxBFGPjJReWoeeKpHEsKaB3npR8nf7Uw8BgPQ+ccs=";
   };
 
-  cargoHash = "sha256-ANmVdT0irhD3d6E4yNBOWqex3ApdfWgmQHxhGKsI4jA=";
+  cargoHash = "sha256-ac62RyjQujEYAOcoGOMlDlbx1MmVmrRKoNpgb3dFUFk=";
 
   nativeBuildInputs = [
     installShellFiles

From dfb0ea1d52c469ab30671c59f29a981ded1a4204 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Sat, 7 Dec 2024 12:55:22 +0000
Subject: [PATCH 105/124] vscode-extensions.haskell.haskell: 2.2.2 -> 2.4.4

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c3b0a65a95dd..4d6b38f57966 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2312,8 +2312,8 @@ let
         mktplcRef = {
           name = "haskell";
           publisher = "haskell";
-          version = "2.2.2";
-          hash = "sha256-zWdIVdz+kZg7KZQ7LeBCB4aB9wg8dUbkWfzGlM0Fq7Q=";
+          version = "2.4.4";
+          hash = "sha256-O7tfZ1bQmlMgZGoWuECjSno6DLCO0+CCteRhT6PjZBY=";
         };
         meta = {
           license = lib.licenses.mit;

From 8bfe42d7e8c9ff9584475ba9804419f6f22835e8 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Sat, 7 Dec 2024 12:59:20 +0000
Subject: [PATCH 106/124] vscode-extensions.jnoortheen.nix-ide: 0.3.1 -> 0.3.5

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 4d6b38f57966..c03e75e9845b 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2706,8 +2706,8 @@ let
         mktplcRef = {
           name = "nix-ide";
           publisher = "jnoortheen";
-          version = "0.3.1";
-          hash = "sha256-05oMDHvFM/dTXB6T3rcDK3EiNG2T0tBN9Au9b+Bk7rI=";
+          version = "0.3.5";
+          hash = "sha256-hiyFZVsZkxpc2Kh0zi3NGwA/FUbetAS9khWxYesxT4s=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog";

From a6efb32b0e9c86f8fb7b6f50061c302217c7a736 Mon Sep 17 00:00:00 2001
From: ophestra <contrib@ophivana.moe>
Date: Sat, 7 Dec 2024 22:04:42 +0900
Subject: [PATCH 107/124] rtkit: fix reduce logging patch URL (#360182)

GitHub returns HTTP 406 for pull request commits superseded by a force
push.
---
 ...son-actual-use-systemd_systemunitdir.patch | 22 ++++++
 .../meson-fix-librt-find_library-check.patch  | 22 ++++++
 pkgs/by-name/rt/rtkit/package.nix             | 20 +----
 ...n-dont-log-debug-messages-by-default.patch | 73 +++++++++++++++++++
 4 files changed, 120 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/by-name/rt/rtkit/meson-actual-use-systemd_systemunitdir.patch
 create mode 100644 pkgs/by-name/rt/rtkit/meson-fix-librt-find_library-check.patch
 create mode 100644 pkgs/by-name/rt/rtkit/rtkit-daemon-dont-log-debug-messages-by-default.patch

diff --git a/pkgs/by-name/rt/rtkit/meson-actual-use-systemd_systemunitdir.patch b/pkgs/by-name/rt/rtkit/meson-actual-use-systemd_systemunitdir.patch
new file mode 100644
index 000000000000..fa1ca26088ce
--- /dev/null
+++ b/pkgs/by-name/rt/rtkit/meson-actual-use-systemd_systemunitdir.patch
@@ -0,0 +1,22 @@
+From 7d62095b94f8df3891c984a1535026d2658bb177 Mon Sep 17 00:00:00 2001
+From: Edmund Wu <fangkazuto@gmail.com>
+Date: Sat, 11 Apr 2020 16:59:35 -0400
+Subject: [PATCH] meson: actually use systemd_systemunitdir
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 02e6c73..ba5ba1e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -58,7 +58,7 @@ if policydir == ''
+         policydir = get_option('datadir') / 'polkit-1' / 'actions'
+ endif
+ 
+-systemunitdir = ''
++systemunitdir = get_option('systemd_systemunitdir')
+ if systemunitdir == '' and systemd_dep.found()
+         systemunitdir = systemd_dep.get_pkgconfig_variable(
+                 'systemdsystemunitdir',
diff --git a/pkgs/by-name/rt/rtkit/meson-fix-librt-find_library-check.patch b/pkgs/by-name/rt/rtkit/meson-fix-librt-find_library-check.patch
new file mode 100644
index 000000000000..54992e84ca66
--- /dev/null
+++ b/pkgs/by-name/rt/rtkit/meson-fix-librt-find_library-check.patch
@@ -0,0 +1,22 @@
+From 98f70edd8f534c371cb4308b9720739c5178918d Mon Sep 17 00:00:00 2001
+From: Felipe Sateler <fsateler@users.noreply.github.com>
+Date: Sat, 11 Apr 2020 10:59:21 -0400
+Subject: [PATCH] meson: fix librt find_library check
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 02e6c73..49da472 100644
+--- a/meson.build
++++ b/meson.build
+@@ -22,7 +22,7 @@ polkit_dep = dependency('polkit-gobject-1', required: false)
+ systemd_dep = dependency('systemd', required: false)
+ thread_dep = dependency('threads')
+ 
+-librt_dep = cc.find_library('z')
++librt_dep = cc.find_library('rt')
+ cc.check_header('sched.h', dependencies: librt_dep)
+ cc.has_function('sched_setscheduler', dependencies: librt_dep)
+ 
diff --git a/pkgs/by-name/rt/rtkit/package.nix b/pkgs/by-name/rt/rtkit/package.nix
index 9c580edc308f..12dc6bbe392f 100644
--- a/pkgs/by-name/rt/rtkit/package.nix
+++ b/pkgs/by-name/rt/rtkit/package.nix
@@ -15,23 +15,9 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    (fetchpatch {
-      name = "meson-actual-use-systemd_systemunitdir.patch";
-      url = "https://github.com/heftig/rtkit/pull/19/commits/7d62095b94f8df3891c984a1535026d2658bb177.patch";
-      sha256 = "17acv549zqcgh7sgprfagbf6drqsr0zdwvf1dsqda7wlqc2h9zn7";
-    })
-
-    (fetchpatch {
-      name = "meson-fix-librt-find_library-check.patch";
-      url = "https://github.com/heftig/rtkit/pull/18/commits/98f70edd8f534c371cb4308b9720739c5178918d.patch";
-      sha256 = "18mnjjsdjfr184nkzi01xyphpdngi31ry4bmkv9ysjxf9wilv4nl";
-    })
-
-    (fetchpatch {
-      name = "rtkit-daemon-dont-log-debug-messages-by-default.patch";
-      url = "https://github.com/heftig/rtkit/pull/33/commits/ad649ee491ed1a41537774ad11564a208e598a09.patch";
-      sha256 = "sha256-p+MdJVMv58rFd1uc1UFKtq83RquDSFZ3M6YfaBU12UU=";
-    })
+    ./meson-actual-use-systemd_systemunitdir.patch
+    ./meson-fix-librt-find_library-check.patch
+    ./rtkit-daemon-dont-log-debug-messages-by-default.patch
   ];
 
   nativeBuildInputs = [ meson ninja pkg-config unixtools.xxd ];
diff --git a/pkgs/by-name/rt/rtkit/rtkit-daemon-dont-log-debug-messages-by-default.patch b/pkgs/by-name/rt/rtkit/rtkit-daemon-dont-log-debug-messages-by-default.patch
new file mode 100644
index 000000000000..667d80ab6915
--- /dev/null
+++ b/pkgs/by-name/rt/rtkit/rtkit-daemon-dont-log-debug-messages-by-default.patch
@@ -0,0 +1,73 @@
+From 4880b9c67628a781bdb183dcdc69f12cb829817d Mon Sep 17 00:00:00 2001
+From: Jean Delvare <jdelvare@suse.de>
+Date: Sat, 15 Apr 2023 11:53:27 +0200
+Subject: [PATCH] rtkit-daemon: Don't log debug messages by default
+
+The rtkit-daemon service is a lot more verbose than other services
+when it doesn't have anything to do. Stop logging the debug messages
+by default to avoid flooding the system log.
+
+This addresses issue #22.
+---
+ rtkit-daemon.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/rtkit-daemon.c b/rtkit-daemon.c
+index 17122fa..0c5d814 100644
+--- a/rtkit-daemon.c
++++ b/rtkit-daemon.c
+@@ -154,6 +154,9 @@ static bool canary_demote_unknown = FALSE;
+ /* Log to stderr? */
+ static bool log_stderr = FALSE;
+ 
++/* Also log debugging messages? */
++static bool log_debug = FALSE;
++
+ /* Scheduling policy to use */
+ static int sched_policy = SCHED_RR;
+ 
+@@ -1876,6 +1879,7 @@ enum {
+         ARG_CANARY_DEMOTE_UNKNOWN,
+         ARG_CANARY_REFUSE_SEC,
+         ARG_STDERR,
++        ARG_DEBUG,
+         ARG_INTROSPECT
+ };
+ 
+@@ -1905,6 +1909,7 @@ static const struct option long_options[] = {
+     { "canary-demote-unknown",       no_argument,       0, ARG_CANARY_DEMOTE_UNKNOWN },
+     { "canary-refuse-sec",           required_argument, 0, ARG_CANARY_REFUSE_SEC },
+     { "stderr",                      no_argument,       0, ARG_STDERR },
++    { "debug",                       no_argument,       0, ARG_DEBUG },
+     { "introspect",                  no_argument,       0, ARG_INTROSPECT },
+     { NULL, 0, 0, 0}
+ };
+@@ -1933,6 +1938,7 @@ static void show_help(const char *exe) {
+                "      --version                       Show version\n\n"
+                "OPTIONS:\n"
+                "      --stderr                        Log to STDERR in addition to syslog\n"
++               "      --debug                         Also log debugging mssages\n"
+                "      --user-name=USER                Run daemon as user (%s)\n\n"
+                "      --scheduling-policy=(RR|FIFO)   Choose scheduling policy (%s)\n"
+                "      --our-realtime-priority=[%i..%i] Realtime priority for the daemon (%u)\n"
+@@ -2222,6 +2228,10 @@ static int parse_command_line(int argc, char *argv[], int *ret) {
+                                 log_stderr = TRUE;
+                                 break;
+ 
++                        case ARG_DEBUG:
++                                log_debug = TRUE;
++                                break;
++
+                         case ARG_INTROSPECT:
+                                 fputs(introspect_xml, stdout);
+                                 *ret = 0;
+@@ -2251,6 +2261,9 @@ static int parse_command_line(int argc, char *argv[], int *ret) {
+                 return -1;
+         }
+ 
++	if (!log_debug)
++                setlogmask(LOG_UPTO(LOG_INFO));
++
+         assert(our_realtime_priority >= (unsigned) sched_get_priority_min(sched_policy));
+         assert(our_realtime_priority <= (unsigned) sched_get_priority_max(sched_policy));
+ 

From b56a00b23c3fb2c1463e4448063be77af725a711 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Sat, 7 Dec 2024 21:13:41 +0800
Subject: [PATCH 108/124] pilipalax: init at 1.0.22-beta.12+174

---
 pkgs/by-name/pi/pilipalax/package.nix       |  126 +
 pkgs/by-name/pi/pilipalax/pubspec.lock.json | 2337 +++++++++++++++++++
 2 files changed, 2463 insertions(+)
 create mode 100644 pkgs/by-name/pi/pilipalax/package.nix
 create mode 100644 pkgs/by-name/pi/pilipalax/pubspec.lock.json

diff --git a/pkgs/by-name/pi/pilipalax/package.nix b/pkgs/by-name/pi/pilipalax/package.nix
new file mode 100644
index 000000000000..726d8afd7ada
--- /dev/null
+++ b/pkgs/by-name/pi/pilipalax/package.nix
@@ -0,0 +1,126 @@
+{
+  autoPatchelfHook,
+  lib,
+  fetchFromGitHub,
+  flutter324,
+  mpv,
+  libass,
+  ffmpeg,
+  libplacebo,
+  libunwind,
+  shaderc,
+  vulkan-loader,
+  lcms,
+  libdovi,
+  libdvdnav,
+  libdvdread,
+  mujs,
+  libbluray,
+  lua,
+  rubberband,
+  libuchardet,
+  zimg,
+  alsa-lib,
+  openal,
+  pipewire,
+  libpulseaudio,
+  libcaca,
+  libdrm,
+  mesa,
+  libXScrnSaver,
+  nv-codec-headers-11,
+  libXpresent,
+  libva,
+  libvdpau,
+  pkg-config,
+  makeDesktopItem,
+  wrapGAppsHook3,
+  copyDesktopItems,
+  xdg-user-dirs,
+}:
+flutter324.buildFlutterApplication rec {
+  pname = "pilipalax";
+  version = "1.0.22-beta.12+174";
+
+  src = fetchFromGitHub {
+    owner = "orz12";
+    repo = "PiliPalaX";
+    tag = version;
+    hash = "sha256-Qjqyg9y5R70hODGfVClS505dJwexL0BbUm6lXSHzhJs=";
+  };
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "pilipalax";
+      exec = "pilipala";
+      icon = "pilipalax";
+      genericName = "PiliPalaX";
+      desktopName = "PiliPalaX";
+    })
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    autoPatchelfHook
+    wrapGAppsHook3
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    mpv
+    libass
+    ffmpeg
+    libplacebo
+    libunwind
+    shaderc
+    vulkan-loader
+    lcms
+    libdovi
+    libdvdnav
+    libdvdread
+    mujs
+    libbluray
+    lua
+    rubberband
+    libuchardet
+    zimg
+    alsa-lib
+    openal
+    pipewire
+    libpulseaudio
+    libcaca
+    libdrm
+    mesa
+    libXScrnSaver
+    libXpresent
+    nv-codec-headers-11
+    libva
+    libvdpau
+  ];
+
+  gitHashes = {
+    ns_danmaku = "sha256-OHlKscybKSLS1Jd1S99rCjHMZfuJXjkQB8U2Tx5iWeA=";
+    auto_orientation = "sha256-0QOEW8+0PpBIELmzilZ8+z7ozNRxKgI0BzuBS8c1Fng=";
+    mime = "sha256-tqFOH85YTyxtp0LbknScx66CvN4SwYKU6YxYQMNeVs4=";
+  };
+
+  postInstall = ''
+    install -Dm644 ./assets/images/logo/logo_android_2.png $out/share/pixmaps/pilipalax.png
+  '';
+
+  extraWrapProgramArgs = ''
+    --prefix LD_LIBRARY_PATH : "$out/app/${pname}/lib" \
+    --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
+  '';
+
+  meta = {
+    description = "Third-party BiliBili client developed with Flutter";
+    homepage = "https://github.com/orz12/PiliPalaX";
+    mainProgram = "pilipala";
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ aucub ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/pi/pilipalax/pubspec.lock.json b/pkgs/by-name/pi/pilipalax/pubspec.lock.json
new file mode 100644
index 000000000000..64f22e5a0f0a
--- /dev/null
+++ b/pkgs/by-name/pi/pilipalax/pubspec.lock.json
@@ -0,0 +1,2337 @@
+{
+  "packages": {
+    "_fe_analyzer_shared": {
+      "dependency": "transitive",
+      "description": {
+        "name": "_fe_analyzer_shared",
+        "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "72.0.0"
+    },
+    "_macros": {
+      "dependency": "transitive",
+      "description": "dart",
+      "source": "sdk",
+      "version": "0.3.2"
+    },
+    "analyzer": {
+      "dependency": "transitive",
+      "description": {
+        "name": "analyzer",
+        "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "6.7.0"
+    },
+    "animations": {
+      "dependency": "direct main",
+      "description": {
+        "name": "animations",
+        "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.0.11"
+    },
+    "ansicolor": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ansicolor",
+        "sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.0.3"
+    },
+    "app_links": {
+      "dependency": "direct main",
+      "description": {
+        "name": "app_links",
+        "sha256": "ad1a6d598e7e39b46a34f746f9a8b011ee147e4c275d407fa457e7a62f84dd99",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "6.3.2"
+    },
+    "app_links_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "app_links_linux",
+        "sha256": "f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.0.3"
+    },
+    "app_links_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "app_links_platform_interface",
+        "sha256": "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
+    "app_links_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "app_links_web",
+        "sha256": "af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.0.4"
+    },
+    "archive": {
+      "dependency": "transitive",
+      "description": {
+        "name": "archive",
+        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.6.1"
+    },
+    "args": {
+      "dependency": "transitive",
+      "description": {
+        "name": "args",
+        "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.5.0"
+    },
+    "asn1lib": {
+      "dependency": "transitive",
+      "description": {
+        "name": "asn1lib",
+        "sha256": "58082b3f0dca697204dbab0ef9ff208bfaea7767ea771076af9a343488428dda",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.5.3"
+    },
+    "async": {
+      "dependency": "transitive",
+      "description": {
+        "name": "async",
+        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.11.0"
+    },
+    "audio_service": {
+      "dependency": "direct main",
+      "description": {
+        "name": "audio_service",
+        "sha256": "9dd5ba7e77567b290c35908b1950d61485b4dfdd3a0ac398e98cfeec04651b75",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.18.15"
+    },
+    "audio_service_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "audio_service_platform_interface",
+        "sha256": "8431a455dac9916cc9ee6f7da5620a666436345c906ad2ebb7fa41d18b3c1bf4",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.1.1"
+    },
+    "audio_service_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "audio_service_web",
+        "sha256": "4cdc2127cd4562b957fb49227dc58e3303fafb09bde2573bc8241b938cf759d9",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.1.3"
+    },
+    "audio_session": {
+      "dependency": "direct main",
+      "description": {
+        "name": "audio_session",
+        "sha256": "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.1.21"
+    },
+    "auto_orientation": {
+      "dependency": "direct main",
+      "description": {
+        "path": ".",
+        "ref": "master",
+        "resolved-ref": "4d28c7d6dad6c099a44058527ddc65405a94b4d0",
+        "url": "https://github.com/orz12/auto_orientation.git"
+      },
+      "source": "git",
+      "version": "2.3.1"
+    },
+    "boolean_selector": {
+      "dependency": "transitive",
+      "description": {
+        "name": "boolean_selector",
+        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.1.1"
+    },
+    "build": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build",
+        "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
+    },
+    "build_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build_config",
+        "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "build_daemon": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build_daemon",
+        "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.0.2"
+    },
+    "build_resolvers": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build_resolvers",
+        "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.4.2"
+    },
+    "build_runner": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "build_runner",
+        "sha256": "dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.4.12"
+    },
+    "build_runner_core": {
+      "dependency": "transitive",
+      "description": {
+        "name": "build_runner_core",
+        "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "7.3.2"
+    },
+    "built_collection": {
+      "dependency": "transitive",
+      "description": {
+        "name": "built_collection",
+        "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "5.1.1"
+    },
+    "built_value": {
+      "dependency": "transitive",
+      "description": {
+        "name": "built_value",
+        "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "8.9.2"
+    },
+    "cached_network_image": {
+      "dependency": "direct main",
+      "description": {
+        "name": "cached_network_image",
+        "sha256": "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.4.1"
+    },
+    "cached_network_image_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cached_network_image_platform_interface",
+        "sha256": "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.1.1"
+    },
+    "cached_network_image_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cached_network_image_web",
+        "sha256": "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.3.1"
+    },
+    "catcher_2": {
+      "dependency": "direct main",
+      "description": {
+        "name": "catcher_2",
+        "sha256": "9e5b5f0f1c06d48a83cbedb15d7b5fc0d785c6f3b835c5d7b1cc61b839d901ea",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.0.0"
+    },
+    "characters": {
+      "dependency": "transitive",
+      "description": {
+        "name": "characters",
+        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.3.0"
+    },
+    "checked_yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "checked_yaml",
+        "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.0.3"
+    },
+    "cli_util": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_util",
+        "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.4.1"
+    },
+    "clock": {
+      "dependency": "transitive",
+      "description": {
+        "name": "clock",
+        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "code_builder": {
+      "dependency": "transitive",
+      "description": {
+        "name": "code_builder",
+        "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.10.0"
+    },
+    "collection": {
+      "dependency": "transitive",
+      "description": {
+        "name": "collection",
+        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.18.0"
+    },
+    "connectivity_plus": {
+      "dependency": "direct main",
+      "description": {
+        "name": "connectivity_plus",
+        "sha256": "77a180d6938f78ca7d2382d2240eb626c0f6a735d0bfdce227d8ffb80f95c48b",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.0.2"
+    },
+    "connectivity_plus_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "connectivity_plus_platform_interface",
+        "sha256": "cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.2.4"
+    },
+    "convert": {
+      "dependency": "transitive",
+      "description": {
+        "name": "convert",
+        "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.1.1"
+    },
+    "cookie_jar": {
+      "dependency": "direct main",
+      "description": {
+        "name": "cookie_jar",
+        "sha256": "a6ac027d3ed6ed756bfce8f3ff60cb479e266f3b0fdabd6242b804b6765e52de",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.0.8"
+    },
+    "cross_file": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cross_file",
+        "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.3.4+2"
+    },
+    "crypto": {
+      "dependency": "direct main",
+      "description": {
+        "name": "crypto",
+        "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.0.5"
+    },
+    "csslib": {
+      "dependency": "transitive",
+      "description": {
+        "name": "csslib",
+        "sha256": "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.17.3"
+    },
+    "cupertino_icons": {
+      "dependency": "direct main",
+      "description": {
+        "name": "cupertino_icons",
+        "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.0.8"
+    },
+    "custom_sliding_segmented_control": {
+      "dependency": "direct main",
+      "description": {
+        "name": "custom_sliding_segmented_control",
+        "sha256": "53c3e931c3ae1f696085d1ec70ac8e934da836595a9b7d9b88fdd0fcbf2a5574",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.8.3"
+    },
+    "dart_style": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dart_style",
+        "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.3.6"
+    },
+    "dbus": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dbus",
+        "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.7.10"
+    },
+    "device_info_plus": {
+      "dependency": "direct main",
+      "description": {
+        "name": "device_info_plus",
+        "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "10.1.2"
+    },
+    "device_info_plus_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "device_info_plus_platform_interface",
+        "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "7.0.1"
+    },
+    "dio": {
+      "dependency": "direct main",
+      "description": {
+        "name": "dio",
+        "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "5.7.0"
+    },
+    "dio_cookie_manager": {
+      "dependency": "direct main",
+      "description": {
+        "name": "dio_cookie_manager",
+        "sha256": "e79498b0f632897ff0c28d6e8178b4bc6e9087412401f618c31fa0904ace050d",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.1.1"
+    },
+    "dio_http2_adapter": {
+      "dependency": "direct main",
+      "description": {
+        "name": "dio_http2_adapter",
+        "sha256": "4c99b7b6960199d836c2ab906b6d2e890a45b31fc67f54f45b3088eabaaa59a1",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.5.3"
+    },
+    "dio_web_adapter": {
+      "dependency": "transitive",
+      "description": {
+        "name": "dio_web_adapter",
+        "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.0.0"
+    },
+    "dismissible_page": {
+      "dependency": "direct main",
+      "description": {
+        "name": "dismissible_page",
+        "sha256": "5b2316f770fe83583f770df1f6505cb19102081c5971979806e77f2e507a9958",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.0.2"
+    },
+    "dynamic_color": {
+      "dependency": "direct main",
+      "description": {
+        "name": "dynamic_color",
+        "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.7.0"
+    },
+    "easy_debounce": {
+      "dependency": "direct main",
+      "description": {
+        "name": "easy_debounce",
+        "sha256": "f082609cfb8f37defb9e37fc28bc978c6712dedf08d4c5a26f820fa10165a236",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.0.3"
+    },
+    "encrypt": {
+      "dependency": "direct main",
+      "description": {
+        "name": "encrypt",
+        "sha256": "62d9aa4670cc2a8798bab89b39fc71b6dfbacf615de6cf5001fb39f7e4a996a2",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "5.0.3"
+    },
+    "extended_image": {
+      "dependency": "direct main",
+      "description": {
+        "name": "extended_image",
+        "sha256": "9786aab821aac117763d6e4419cd49f5031fbaacfe3fd212c5b313d0334c37a9",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "8.2.1"
+    },
+    "extended_image_library": {
+      "dependency": "transitive",
+      "description": {
+        "name": "extended_image_library",
+        "sha256": "9a94ec9314aa206cfa35f16145c3cd6e2c924badcc670eaaca8a3a8063a68cd7",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.0.5"
+    },
+    "extended_list": {
+      "dependency": "transitive",
+      "description": {
+        "name": "extended_list",
+        "sha256": "fa7bcb2645b7d6849918d499fda6ea917cda85e43b2e06dfec2a29b649722974",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.0.2"
+    },
+    "extended_list_library": {
+      "dependency": "transitive",
+      "description": {
+        "name": "extended_list_library",
+        "sha256": "cb424a04464e89bd6737f9ae025029bd8e913c7bf37101ad10c2defe0238d842",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.0.0"
+    },
+    "extended_nested_scroll_view": {
+      "dependency": "direct main",
+      "description": {
+        "name": "extended_nested_scroll_view",
+        "sha256": "835580d40c2c62b448bd14adecd316acba469ba61f1510ef559d17668a85e777",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "6.2.1"
+    },
+    "extended_text": {
+      "dependency": "direct main",
+      "description": {
+        "name": "extended_text",
+        "sha256": "b0cdd240b4ddf61d18d7e33e7775195971f2d033bd69706fa897446dc96c3b81",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "14.1.0"
+    },
+    "extended_text_library": {
+      "dependency": "transitive",
+      "description": {
+        "name": "extended_text_library",
+        "sha256": "55d09098ec56fab0d9a8a68950ca0bbf2efa1327937f7cec6af6dfa066234829",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "12.0.0"
+    },
+    "fading_edge_scrollview": {
+      "dependency": "direct overridden",
+      "description": {
+        "name": "fading_edge_scrollview",
+        "sha256": "1f84fe3ea8e251d00d5735e27502a6a250e4aa3d3b330d3fdcb475af741464ef",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.1.1"
+    },
+    "fake_async": {
+      "dependency": "transitive",
+      "description": {
+        "name": "fake_async",
+        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.3.1"
+    },
+    "ffi": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ffi",
+        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.1.3"
+    },
+    "file": {
+      "dependency": "transitive",
+      "description": {
+        "name": "file",
+        "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "7.0.0"
+    },
+    "fixnum": {
+      "dependency": "transitive",
+      "description": {
+        "name": "fixnum",
+        "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.1.0"
+    },
+    "floating": {
+      "dependency": "direct main",
+      "description": {
+        "name": "floating",
+        "sha256": "ddcd7f28247746dbb62997c48c89d1824118676796df47fdc6f864f8d02849bc",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.0.0"
+    },
+    "flutter": {
+      "dependency": "direct main",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_cache_manager": {
+      "dependency": "transitive",
+      "description": {
+        "name": "flutter_cache_manager",
+        "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.4.1"
+    },
+    "flutter_displaymode": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_displaymode",
+        "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.6.0"
+    },
+    "flutter_html": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_html",
+        "sha256": "02ad69e813ecfc0728a455e4bf892b9379983e050722b1dce00192ee2e41d1ee",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.0.0-beta.2"
+    },
+    "flutter_launcher_icons": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "flutter_launcher_icons",
+        "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.13.1"
+    },
+    "flutter_lints": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "flutter_lints",
+        "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
+    },
+    "flutter_localizations": {
+      "dependency": "direct main",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_mailer": {
+      "dependency": "transitive",
+      "description": {
+        "name": "flutter_mailer",
+        "sha256": "4fffaa35e911ff5ec2e5a4ebbca62c372e99a154eb3bb2c0bf79f09adf6ecf4c",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "flutter_native_splash": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "flutter_native_splash",
+        "sha256": "aa06fec78de2190f3db4319dd60fdc8d12b2626e93ef9828633928c2dcaea840",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
+    },
+    "flutter_plugin_android_lifecycle": {
+      "dependency": "transitive",
+      "description": {
+        "name": "flutter_plugin_android_lifecycle",
+        "sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.0.22"
+    },
+    "flutter_smart_dialog": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_smart_dialog",
+        "sha256": "6b5fd32cd2900745df30c1d95ef597ea0ee1ee8cfa557eab62010e3db1d3d717",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.9.8+1"
+    },
+    "flutter_svg": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_svg",
+        "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.0.10+1"
+    },
+    "flutter_test": {
+      "dependency": "direct dev",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "flutter_volume_controller": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flutter_volume_controller",
+        "sha256": "fa4c36dfe7ef7f423704f34ab8e64e00b4a30a90aa6e56f251e9dba649efcd7f",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.3.2"
+    },
+    "flutter_web_plugins": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.0"
+    },
+    "fluttertoast": {
+      "dependency": "transitive",
+      "description": {
+        "name": "fluttertoast",
+        "sha256": "95f349437aeebe524ef7d6c9bde3e6b4772717cf46a0eb6a3ceaddc740b297cc",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "8.2.8"
+    },
+    "font_awesome_flutter": {
+      "dependency": "direct main",
+      "description": {
+        "name": "font_awesome_flutter",
+        "sha256": "275ff26905134bcb59417cf60ad979136f1f8257f2f449914b2c3e05bbb4cd6f",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "10.7.0"
+    },
+    "frontend_server_client": {
+      "dependency": "transitive",
+      "description": {
+        "name": "frontend_server_client",
+        "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
+    },
+    "get": {
+      "dependency": "direct main",
+      "description": {
+        "name": "get",
+        "sha256": "e4e7335ede17452b391ed3b2ede016545706c01a02292a6c97619705e7d2a85e",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.6.6"
+    },
+    "glob": {
+      "dependency": "transitive",
+      "description": {
+        "name": "glob",
+        "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "graphs": {
+      "dependency": "transitive",
+      "description": {
+        "name": "graphs",
+        "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.3.2"
+    },
+    "gt3_flutter_plugin": {
+      "dependency": "direct main",
+      "description": {
+        "name": "gt3_flutter_plugin",
+        "sha256": "08f35692e937770ad6b3e2017eb8ef81839a82b8a63f5acf3abab14b688fc36c",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.1.0"
+    },
+    "gtk": {
+      "dependency": "transitive",
+      "description": {
+        "name": "gtk",
+        "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "hive": {
+      "dependency": "direct main",
+      "description": {
+        "name": "hive",
+        "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.2.3"
+    },
+    "hive_flutter": {
+      "dependency": "direct main",
+      "description": {
+        "name": "hive_flutter",
+        "sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.1.0"
+    },
+    "hive_generator": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "hive_generator",
+        "sha256": "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.0.1"
+    },
+    "html": {
+      "dependency": "direct main",
+      "description": {
+        "name": "html",
+        "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.15.4"
+    },
+    "http": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http",
+        "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.2.2"
+    },
+    "http2": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http2",
+        "sha256": "9ced024a160b77aba8fb8674e38f70875e321d319e6f303ec18e87bd5a4b0c1d",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.3.0"
+    },
+    "http_client_helper": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_client_helper",
+        "sha256": "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.0.0"
+    },
+    "http_multi_server": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_multi_server",
+        "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.2.1"
+    },
+    "http_parser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "http_parser",
+        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.0.2"
+    },
+    "image": {
+      "dependency": "transitive",
+      "description": {
+        "name": "image",
+        "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.2.0"
+    },
+    "intl": {
+      "dependency": "transitive",
+      "description": {
+        "name": "intl",
+        "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.19.0"
+    },
+    "io": {
+      "dependency": "transitive",
+      "description": {
+        "name": "io",
+        "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.0.4"
+    },
+    "js": {
+      "dependency": "transitive",
+      "description": {
+        "name": "js",
+        "sha256": "cf7243a0c29626284ada2add68a33f5b1102affe3509393e75136e0f6616bd68",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.6.8"
+    },
+    "json_annotation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "json_annotation",
+        "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.9.0"
+    },
+    "leak_tracker": {
+      "dependency": "transitive",
+      "description": {
+        "name": "leak_tracker",
+        "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "10.0.5"
+    },
+    "leak_tracker_flutter_testing": {
+      "dependency": "transitive",
+      "description": {
+        "name": "leak_tracker_flutter_testing",
+        "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.0.5"
+    },
+    "leak_tracker_testing": {
+      "dependency": "transitive",
+      "description": {
+        "name": "leak_tracker_testing",
+        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.0.1"
+    },
+    "lints": {
+      "dependency": "transitive",
+      "description": {
+        "name": "lints",
+        "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.0.0"
+    },
+    "list_counter": {
+      "dependency": "transitive",
+      "description": {
+        "name": "list_counter",
+        "sha256": "c447ae3dfcd1c55f0152867090e67e219d42fe6d4f2807db4bbe8b8d69912237",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.0.2"
+    },
+    "loading_more_list": {
+      "dependency": "direct main",
+      "description": {
+        "name": "loading_more_list",
+        "sha256": "78e1090abe7a4fb0c0854a89017a05f436ee8ffc9f28f0b4c392cbc26087ddf7",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "6.1.1"
+    },
+    "loading_more_list_library": {
+      "dependency": "transitive",
+      "description": {
+        "name": "loading_more_list_library",
+        "sha256": "de6b57edbab83022180f053ec3f598dd5e1192cfd6a285882b8155e3cb5dc581",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.0.0"
+    },
+    "logger": {
+      "dependency": "direct main",
+      "description": {
+        "name": "logger",
+        "sha256": "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.4.0"
+    },
+    "logging": {
+      "dependency": "transitive",
+      "description": {
+        "name": "logging",
+        "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.2.0"
+    },
+    "macros": {
+      "dependency": "transitive",
+      "description": {
+        "name": "macros",
+        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.1.2-main.4"
+    },
+    "mailer": {
+      "dependency": "transitive",
+      "description": {
+        "name": "mailer",
+        "sha256": "3b27d204ff92a20aba227c25bc6467e245b0f19f9fbbc83aa357a9b7fa40267f",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "6.1.2"
+    },
+    "marquee": {
+      "dependency": "direct main",
+      "description": {
+        "name": "marquee",
+        "sha256": "4b5243d2804373bdc25fc93d42c3b402d6ec1f4ee8d0bb72276edd04ae7addb8",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.2.3"
+    },
+    "matcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "matcher",
+        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.12.16+1"
+    },
+    "material_color_utilities": {
+      "dependency": "transitive",
+      "description": {
+        "name": "material_color_utilities",
+        "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.11.1"
+    },
+    "material_design_icons_flutter": {
+      "dependency": "direct main",
+      "description": {
+        "name": "material_design_icons_flutter",
+        "sha256": "6f986b7a51f3ad4c00e33c5c84e8de1bdd140489bbcdc8b66fc1283dad4dea5a",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "7.0.7296"
+    },
+    "media_kit": {
+      "dependency": "direct main",
+      "description": {
+        "name": "media_kit",
+        "sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.1.11"
+    },
+    "media_kit_libs_android_video": {
+      "dependency": "transitive",
+      "description": {
+        "name": "media_kit_libs_android_video",
+        "sha256": "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.3.6"
+    },
+    "media_kit_libs_ios_video": {
+      "dependency": "transitive",
+      "description": {
+        "name": "media_kit_libs_ios_video",
+        "sha256": "b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.1.4"
+    },
+    "media_kit_libs_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "media_kit_libs_linux",
+        "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.1.3"
+    },
+    "media_kit_libs_macos_video": {
+      "dependency": "transitive",
+      "description": {
+        "name": "media_kit_libs_macos_video",
+        "sha256": "f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.1.4"
+    },
+    "media_kit_libs_video": {
+      "dependency": "direct main",
+      "description": {
+        "name": "media_kit_libs_video",
+        "sha256": "20bb4aefa8fece282b59580e1cd8528117297083a6640c98c2e98cfc96b93288",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.0.5"
+    },
+    "media_kit_libs_windows_video": {
+      "dependency": "transitive",
+      "description": {
+        "name": "media_kit_libs_windows_video",
+        "sha256": "32654572167825c42c55466f5d08eee23ea11061c84aa91b09d0e0f69bdd0887",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.0.10"
+    },
+    "media_kit_native_event_loop": {
+      "dependency": "transitive",
+      "description": {
+        "name": "media_kit_native_event_loop",
+        "sha256": "7d82e3b3e9ded5c35c3146c5ba1da3118d1dd8ac3435bac7f29f458181471b40",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.0.9"
+    },
+    "media_kit_video": {
+      "dependency": "direct main",
+      "description": {
+        "name": "media_kit_video",
+        "sha256": "2cc3b966679963ba25a4ce5b771e532a521ebde7c6aa20e9802bec95d9916c8f",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.2.5"
+    },
+    "meta": {
+      "dependency": "transitive",
+      "description": {
+        "name": "meta",
+        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.15.0"
+    },
+    "mime": {
+      "dependency": "direct overridden",
+      "description": {
+        "path": ".",
+        "ref": "HEAD",
+        "resolved-ref": "922e1f3d0b68291c42a2ec3a83542a886ea9b041",
+        "url": "https://github.com/orz12/mime.git"
+      },
+      "source": "git",
+      "version": "1.0.5"
+    },
+    "nil": {
+      "dependency": "direct main",
+      "description": {
+        "name": "nil",
+        "sha256": "ef05770c48942876d843bf6a4822d35e5da0ff893a61f1d5ad96d15c4a659136",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.1.1"
+    },
+    "nm": {
+      "dependency": "transitive",
+      "description": {
+        "name": "nm",
+        "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.5.0"
+    },
+    "ns_danmaku": {
+      "dependency": "direct main",
+      "description": {
+        "path": ".",
+        "ref": "master",
+        "resolved-ref": "dbc28547963dfb6c67fea968459f08d81bb1733c",
+        "url": "https://github.com/orz12/flutter_ns_danmaku.git"
+      },
+      "source": "git",
+      "version": "0.0.5"
+    },
+    "octo_image": {
+      "dependency": "transitive",
+      "description": {
+        "name": "octo_image",
+        "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "package_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "package_config",
+        "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "package_info_plus": {
+      "dependency": "direct main",
+      "description": {
+        "name": "package_info_plus",
+        "sha256": "a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "8.0.2"
+    },
+    "package_info_plus_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "package_info_plus_platform_interface",
+        "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.0.1"
+    },
+    "path": {
+      "dependency": "direct main",
+      "description": {
+        "name": "path",
+        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.9.0"
+    },
+    "path_parsing": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_parsing",
+        "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
+    "path_provider": {
+      "dependency": "direct main",
+      "description": {
+        "name": "path_provider",
+        "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "path_provider_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_android",
+        "sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.2.10"
+    },
+    "path_provider_foundation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_foundation",
+        "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.4.0"
+    },
+    "path_provider_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_linux",
+        "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.2.1"
+    },
+    "path_provider_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_platform_interface",
+        "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "path_provider_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "path_provider_windows",
+        "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.3.0"
+    },
+    "permission_handler": {
+      "dependency": "direct main",
+      "description": {
+        "name": "permission_handler",
+        "sha256": "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "11.3.1"
+    },
+    "permission_handler_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "permission_handler_android",
+        "sha256": "76e4ab092c1b240d31177bb64d2b0bea43f43d0e23541ec866151b9f7b2490fa",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "12.0.12"
+    },
+    "permission_handler_apple": {
+      "dependency": "transitive",
+      "description": {
+        "name": "permission_handler_apple",
+        "sha256": "e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "9.4.5"
+    },
+    "permission_handler_html": {
+      "dependency": "transitive",
+      "description": {
+        "name": "permission_handler_html",
+        "sha256": "af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.1.3+2"
+    },
+    "permission_handler_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "permission_handler_platform_interface",
+        "sha256": "fe0ffe274d665be8e34f9c59705441a7d248edebbe5d9e3ec2665f88b79358ea",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.2.2"
+    },
+    "permission_handler_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "permission_handler_windows",
+        "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.2.1"
+    },
+    "petitparser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "petitparser",
+        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "6.0.2"
+    },
+    "platform": {
+      "dependency": "transitive",
+      "description": {
+        "name": "platform",
+        "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.1.5"
+    },
+    "plugin_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "plugin_platform_interface",
+        "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.1.8"
+    },
+    "pointycastle": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pointycastle",
+        "sha256": "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.9.1"
+    },
+    "pool": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pool",
+        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.5.1"
+    },
+    "protobuf": {
+      "dependency": "direct main",
+      "description": {
+        "name": "protobuf",
+        "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.1.0"
+    },
+    "pub_semver": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pub_semver",
+        "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "pubspec_parse": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pubspec_parse",
+        "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.3.0"
+    },
+    "pull_to_refresh_notification": {
+      "dependency": "direct main",
+      "description": {
+        "name": "pull_to_refresh_notification",
+        "sha256": "5a06c242a6c3264bac3a7facbe2c6d317a5f54fc10c20b556dbd34ceee32c9aa",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.1.0"
+    },
+    "qr": {
+      "dependency": "transitive",
+      "description": {
+        "name": "qr",
+        "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.0.2"
+    },
+    "qr_flutter": {
+      "dependency": "direct main",
+      "description": {
+        "name": "qr_flutter",
+        "sha256": "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.1.0"
+    },
+    "rxdart": {
+      "dependency": "direct overridden",
+      "description": {
+        "name": "rxdart",
+        "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.28.0"
+    },
+    "safe_local_storage": {
+      "dependency": "transitive",
+      "description": {
+        "name": "safe_local_storage",
+        "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.0.2"
+    },
+    "saver_gallery": {
+      "dependency": "direct main",
+      "description": {
+        "name": "saver_gallery",
+        "sha256": "5f4123ec1cd5ed9fcd93198ab30ffe0c7746afcbf6846445432de93240fa7b4e",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.0.6"
+    },
+    "screen_brightness": {
+      "dependency": "direct main",
+      "description": {
+        "name": "screen_brightness",
+        "sha256": "ed8da4a4511e79422fc1aa88138e920e4008cd312b72cdaa15ccb426c0faaedd",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.2.2+1"
+    },
+    "screen_brightness_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_brightness_android",
+        "sha256": "3df10961e3a9e968a5e076fe27e7f4741fa8a1d3950bdeb48cf121ed529d0caf",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.1.0+2"
+    },
+    "screen_brightness_ios": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_brightness_ios",
+        "sha256": "99adc3ca5490b8294284aad5fcc87f061ad685050e03cf45d3d018fe398fd9a2",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.1.0"
+    },
+    "screen_brightness_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_brightness_macos",
+        "sha256": "64b34e7e3f4900d7687c8e8fb514246845a73ecec05ab53483ed025bd4a899fd",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.1.0+1"
+    },
+    "screen_brightness_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_brightness_platform_interface",
+        "sha256": "b211d07f0c96637a15fb06f6168617e18030d5d74ad03795dd8547a52717c171",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.1.0"
+    },
+    "screen_brightness_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_brightness_windows",
+        "sha256": "9261bf33d0fc2707d8cf16339ce25768100a65e70af0fcabaf032fc12408ba86",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.1.3"
+    },
+    "scrollable_positioned_list": {
+      "dependency": "direct main",
+      "description": {
+        "name": "scrollable_positioned_list",
+        "sha256": "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.3.8"
+    },
+    "sentry": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sentry",
+        "sha256": "1af8308298977259430d118ab25be8e1dda626cdefa1e6ce869073d530d39271",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "8.8.0"
+    },
+    "share_plus": {
+      "dependency": "direct main",
+      "description": {
+        "name": "share_plus",
+        "sha256": "468c43f285207c84bcabf5737f33b914ceb8eb38398b91e5e3ad1698d1b72a52",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "10.0.2"
+    },
+    "share_plus_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "share_plus_platform_interface",
+        "sha256": "6ababf341050edff57da8b6990f11f4e99eaba837865e2e6defe16d039619db5",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "5.0.0"
+    },
+    "shelf": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf",
+        "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.4.1"
+    },
+    "shelf_web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_web_socket",
+        "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.0.0"
+    },
+    "sky_engine": {
+      "dependency": "transitive",
+      "description": "flutter",
+      "source": "sdk",
+      "version": "0.0.99"
+    },
+    "source_gen": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_gen",
+        "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.5.0"
+    },
+    "source_helper": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_helper",
+        "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.3.4"
+    },
+    "source_span": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_span",
+        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.10.0"
+    },
+    "sprintf": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sprintf",
+        "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "7.0.0"
+    },
+    "sqflite": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqflite",
+        "sha256": "a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.3.3+1"
+    },
+    "sqflite_common": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqflite_common",
+        "sha256": "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.5.4+2"
+    },
+    "stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stack_trace",
+        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.11.1"
+    },
+    "status_bar_control": {
+      "dependency": "direct main",
+      "description": {
+        "name": "status_bar_control",
+        "sha256": "7f2c1f3f7fd13b85ed284eb7ca3f74ceb8dcfdd25636d3a84186d0a687d36693",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.2.1"
+    },
+    "stream_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_channel",
+        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "stream_transform": {
+      "dependency": "transitive",
+      "description": {
+        "name": "stream_transform",
+        "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.1.0"
+    },
+    "string_scanner": {
+      "dependency": "transitive",
+      "description": {
+        "name": "string_scanner",
+        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.2.0"
+    },
+    "synchronized": {
+      "dependency": "transitive",
+      "description": {
+        "name": "synchronized",
+        "sha256": "a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.2.0"
+    },
+    "system_proxy": {
+      "dependency": "direct main",
+      "description": {
+        "name": "system_proxy",
+        "sha256": "bbdfc9736a963409941fb0e7c494606c1f13c2be34de15833ee385da83cf7ab0",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.1.0"
+    },
+    "term_glyph": {
+      "dependency": "transitive",
+      "description": {
+        "name": "term_glyph",
+        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
+    "test_api": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_api",
+        "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.7.2"
+    },
+    "timing": {
+      "dependency": "transitive",
+      "description": {
+        "name": "timing",
+        "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
+    "typed_data": {
+      "dependency": "transitive",
+      "description": {
+        "name": "typed_data",
+        "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.3.2"
+    },
+    "universal_io": {
+      "dependency": "transitive",
+      "description": {
+        "name": "universal_io",
+        "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.2.2"
+    },
+    "universal_platform": {
+      "dependency": "direct main",
+      "description": {
+        "name": "universal_platform",
+        "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.1.0"
+    },
+    "uri_parser": {
+      "dependency": "transitive",
+      "description": {
+        "name": "uri_parser",
+        "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
+    "url_launcher": {
+      "dependency": "direct main",
+      "description": {
+        "name": "url_launcher",
+        "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "6.3.0"
+    },
+    "url_launcher_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_android",
+        "sha256": "e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "6.3.10"
+    },
+    "url_launcher_ios": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_ios",
+        "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "6.3.1"
+    },
+    "url_launcher_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_linux",
+        "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.2.0"
+    },
+    "url_launcher_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_macos",
+        "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.2.0"
+    },
+    "url_launcher_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_platform_interface",
+        "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.3.2"
+    },
+    "url_launcher_web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_web",
+        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.3.3"
+    },
+    "url_launcher_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "url_launcher_windows",
+        "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    },
+    "uuid": {
+      "dependency": "direct main",
+      "description": {
+        "name": "uuid",
+        "sha256": "f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.5.0"
+    },
+    "vector_graphics": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vector_graphics",
+        "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.1.11+1"
+    },
+    "vector_graphics_codec": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vector_graphics_codec",
+        "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.1.11+1"
+    },
+    "vector_graphics_compiler": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vector_graphics_compiler",
+        "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.1.11+1"
+    },
+    "vector_math": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vector_math",
+        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.1.4"
+    },
+    "visibility_detector": {
+      "dependency": "transitive",
+      "description": {
+        "name": "visibility_detector",
+        "sha256": "dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.4.0+2"
+    },
+    "vm_service": {
+      "dependency": "transitive",
+      "description": {
+        "name": "vm_service",
+        "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "14.2.5"
+    },
+    "volume_controller": {
+      "dependency": "transitive",
+      "description": {
+        "name": "volume_controller",
+        "sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.0.8"
+    },
+    "wakelock_plus": {
+      "dependency": "direct main",
+      "description": {
+        "name": "wakelock_plus",
+        "sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.2.8"
+    },
+    "wakelock_plus_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "wakelock_plus_platform_interface",
+        "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
+    "watcher": {
+      "dependency": "transitive",
+      "description": {
+        "name": "watcher",
+        "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.1.0"
+    },
+    "waterfall_flow": {
+      "dependency": "direct main",
+      "description": {
+        "name": "waterfall_flow",
+        "sha256": "11538b0d890458e55e6248b177732495d20893cfc7e85d7e8dbf4fdce61c9f10",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.0.3"
+    },
+    "web": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web",
+        "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
+    "web_socket": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket",
+        "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "0.1.6"
+    },
+    "web_socket_channel": {
+      "dependency": "transitive",
+      "description": {
+        "name": "web_socket_channel",
+        "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.0.1"
+    },
+    "webview_cookie_manager": {
+      "dependency": "direct main",
+      "description": {
+        "name": "webview_cookie_manager",
+        "sha256": "425a9feac5cd2cb62a71da3dda5ac2eaf9ece5481ee8d79f3868dc5ba8223ad3",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.0.6"
+    },
+    "webview_flutter": {
+      "dependency": "direct main",
+      "description": {
+        "name": "webview_flutter",
+        "sha256": "ec81f57aa1611f8ebecf1d2259da4ef052281cb5ad624131c93546c79ccc7736",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "4.9.0"
+    },
+    "webview_flutter_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webview_flutter_android",
+        "sha256": "6e64fcb1c19d92024da8f33503aaeeda35825d77142c01d0ea2aa32edc79fdc8",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.16.7"
+    },
+    "webview_flutter_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webview_flutter_platform_interface",
+        "sha256": "d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "2.10.0"
+    },
+    "webview_flutter_wkwebview": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webview_flutter_wkwebview",
+        "sha256": "1942a12224ab31e9508cf00c0c6347b931b023b8a4f0811e5dec3b06f94f117d",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.15.0"
+    },
+    "win32": {
+      "dependency": "transitive",
+      "description": {
+        "name": "win32",
+        "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "5.5.4"
+    },
+    "win32_registry": {
+      "dependency": "transitive",
+      "description": {
+        "name": "win32_registry",
+        "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.1.4"
+    },
+    "xdg_directories": {
+      "dependency": "transitive",
+      "description": {
+        "name": "xdg_directories",
+        "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "1.0.4"
+    },
+    "xml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "xml",
+        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "6.5.0"
+    },
+    "yaml": {
+      "dependency": "transitive",
+      "description": {
+        "name": "yaml",
+        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+        "url": "https://mirrors.tuna.tsinghua.edu.cn/dart-pub/"
+      },
+      "source": "hosted",
+      "version": "3.1.2"
+    }
+  },
+  "sdks": {
+    "dart": ">=3.5.0 <4.0.0",
+    "flutter": ">=3.24.0"
+  }
+}

From 3b299a3c9ba649bac23402d4051b1f371102d788 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 21:21:29 +0000
Subject: [PATCH 109/124] minio: 2024-09-22T00-33-43Z -> 2024-11-07T00-52-20Z

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

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 7d872128f1f9..9af26fb2af30 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -21,16 +21,16 @@ let
 in
 buildGoModule rec {
   pname = "minio";
-  version = "2024-09-22T00-33-43Z";
+  version = "2024-11-07T00-52-20Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    hash = "sha256-/2H79fJYdusFNBXj/2i4p+O16wseHzPzJ5LnS1O+Gm4=";
+    hash = "sha256-vWrNqfB41Y3MAF9PuyopIDrGq4Bj41Y4gISbN6nO0zU=";
   };
 
-  vendorHash = "sha256-MDClQjCh/ygdbybE4jIoWGBsqr3roNn7stXUw9eoN2Y=";
+  vendorHash = "sha256-yYAEh4L1eStx0/bID0+wZ5kdqPYshJrSZgVGuXgtgvs=";
 
   doCheck = false;
 

From 6ad564a324d33163e41fcc8d5aeff42b9c14b260 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 7 Dec 2024 21:49:15 +0800
Subject: [PATCH 110/124] satellite: refactor

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

diff --git a/pkgs/by-name/sa/satellite/package.nix b/pkgs/by-name/sa/satellite/package.nix
index 077c4bfef8ca..959204a338e3 100644
--- a/pkgs/by-name/sa/satellite/package.nix
+++ b/pkgs/by-name/sa/satellite/package.nix
@@ -1,11 +1,12 @@
-{ lib
-, python3
-, fetchFromGitea
-, gobject-introspection
-, gtk3
-, libhandy
-, modemmanager
-, wrapGAppsHook3
+{
+  lib,
+  python3,
+  fetchFromGitea,
+  gobject-introspection,
+  gtk3,
+  libhandy,
+  modemmanager,
+  wrapGAppsHook3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -15,26 +16,27 @@ python3.pkgs.buildPythonApplication rec {
   pyproject = true;
 
   src = fetchFromGitea {
-    domain ="codeberg.org";
+    domain = "codeberg.org";
     owner = "tpikonen";
     repo = "satellite";
-    rev = version;
+    tag = version;
     hash = "sha256-61HCk0W07w0LybSVB4APvQX4PMSsqH9mKGzc+Rmno90=";
   };
 
   nativeBuildInputs = [
     gobject-introspection
-    python3.pkgs.setuptools
     wrapGAppsHook3
   ];
 
+  build-system = with python3.pkgs; [ setuptools ];
+
   buildInputs = [
     gtk3
     libhandy
     modemmanager
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
     gpxpy
     pygobject3
     pynmea2
@@ -42,16 +44,16 @@ python3.pkgs.buildPythonApplication rec {
 
   strictDeps = true;
 
-  meta = with lib; {
+  meta = {
     description = "Program for showing navigation satellite data";
     longDescription = ''
       Satellite is an adaptive GTK3 / libhandy application which displays global navigation satellite system (GNSS: GPS et al.) data obtained from ModemManager or gnss-share.
       It can also save your position to a GPX-file.
     '';
     homepage = "https://codeberg.org/tpikonen/satellite";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     mainProgram = "satellite";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ Luflosi ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ Luflosi ];
   };
 }

From 882ff1b923f74821589dd571d6a9e9b955f42fc6 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 7 Dec 2024 21:50:28 +0800
Subject: [PATCH 111/124] satellite: 0.5.0 -> 0.9.0

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

diff --git a/pkgs/by-name/sa/satellite/package.nix b/pkgs/by-name/sa/satellite/package.nix
index 959204a338e3..6411512c8a69 100644
--- a/pkgs/by-name/sa/satellite/package.nix
+++ b/pkgs/by-name/sa/satellite/package.nix
@@ -3,15 +3,14 @@
   python3,
   fetchFromGitea,
   gobject-introspection,
-  gtk3,
-  libhandy,
+  libadwaita,
   modemmanager,
-  wrapGAppsHook3,
+  wrapGAppsHook4,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "satellite";
-  version = "0.5.0";
+  version = "0.9.0";
 
   pyproject = true;
 
@@ -20,19 +19,18 @@ python3.pkgs.buildPythonApplication rec {
     owner = "tpikonen";
     repo = "satellite";
     tag = version;
-    hash = "sha256-61HCk0W07w0LybSVB4APvQX4PMSsqH9mKGzc+Rmno90=";
+    hash = "sha256-w0ZpH1joFoV7W7PH74//LGLUJQLCpAGcC6GlyTbdsTE=";
   };
 
   nativeBuildInputs = [
     gobject-introspection
-    wrapGAppsHook3
+    wrapGAppsHook4
   ];
 
   build-system = with python3.pkgs; [ setuptools ];
 
   buildInputs = [
-    gtk3
-    libhandy
+    libadwaita
     modemmanager
   ];
 

From 168441ba614d16039edc0f9a400e8181685aed43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 14:38:52 +0000
Subject: [PATCH 112/124] clouddrive2: 0.8.3 -> 0.8.5

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

diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix
index b68af648c6ee..a42d9906a4d2 100644
--- a/pkgs/by-name/cl/clouddrive2/package.nix
+++ b/pkgs/by-name/cl/clouddrive2/package.nix
@@ -11,16 +11,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clouddrive2";
-  version = "0.8.3";
+  version = "0.8.5";
 
   src = fetchurl {
     url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
     hash =
       {
-        x86_64-linux = "sha256-5vyWMoDASzRa9m2UueoyMbmK8JPUpplqk0/uv8fHPAU=";
-        aarch64-linux = "sha256-zfar/dZkSVSrnrRpfF4RnwvkPVzmdLJa4W9Ds8NNNaI=";
-        x86_64-darwin = "sha256-3jab0NxGH+cac2Ughq/l2ZAQLISD7z+WBtFFyiFc+5A=";
-        aarch64-darwin = "sha256-SO5L9aBMN5pYloBeVH1uQO0QeiHzDK+6kHVEg8uYnTo=";
+        x86_64-linux = "sha256-6zdP0d5XyBYG7+SGqb2DSaD6rJrBn8OjGr9BXfP1Ctc=";
+        aarch64-linux = "sha256-7u/AKZGL/AkUsakZexC/oxgjoayaxH7OiRE+xnH+Gus=";
+        x86_64-darwin = "sha256-/uDxZVlULl3PnuAaF7kWAyukaQoF7DV8m5gowTFdMEQ=";
+        aarch64-darwin = "sha256-xZ60pi2JYSLDLaR0Qe/fyEhzyu17U2fbDp1lo2qViIs=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };

From 9b05844dc88df028c75d91dd3d273e9901aa5921 Mon Sep 17 00:00:00 2001
From: ben9986 <38633150+Ben9986@users.noreply.github.com>
Date: Fri, 6 Dec 2024 22:26:09 +0000
Subject: [PATCH 113/124] onedrive: patch for openssl error

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

diff --git a/pkgs/by-name/on/onedrive/package.nix b/pkgs/by-name/on/onedrive/package.nix
index 1e553019ecfc..935686a52ecc 100644
--- a/pkgs/by-name/on/onedrive/package.nix
+++ b/pkgs/by-name/on/onedrive/package.nix
@@ -4,6 +4,7 @@
   coreutils,
   curl,
   fetchFromGitHub,
+  fetchpatch,
   installShellFiles,
   ldc,
   libnotify,
@@ -27,6 +28,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Lek1tW0alQQvlOHpz//M/y4iJY3PWRkcmXGLwjCLozk=";
   };
 
+  patches = [
+    # remove when updating to v2.5.4
+    (fetchpatch {
+      name = "fix-openssl-version-check-error.patch";
+      url = "https://github.com/abraunegg/onedrive/commit/d956318b184dc119d65d7a230154df4097171a6d.patch";
+      hash = "sha256-LGmKqYgFpG4MPFrHXqvlDp7Cxe3cEGYeXXH9pCXtGkU=";
+    })
+  ];
+
   outputs = [
     "out"
     "doc"

From 06594d056c5739628b4a3f56e5d1e105439e130b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 16:29:37 +0100
Subject: [PATCH 114/124] python312Packages.publicsuffixlist: 1.0.2.20241205 ->
 1.0.2.20241207

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

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index a7fbf07ef01b..d52f3f8c5348 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20241205";
+  version = "1.0.2.20241207";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1h6Zdt9TA/7os/Qe3kK8slJUTmErHhEyXlzW+OsB5Yg=";
+    hash = "sha256-K21wB0sAiG0wmOftX466jD0fPCQp647K+YNiWVSW3gQ=";
   };
 
   build-system = [ setuptools ];

From 5e95ee4971c982f210685b4faa3c110e89e75da8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 7 Dec 2024 16:46:44 +0100
Subject: [PATCH 115/124] pylyzer: 0.0.72 -> 0.0.73

Diff: https://github.com/mtshiba/pylyzer/compare/refs/tags/v0.0.72...v0.0.73

Changelog: https://github.com/mtshiba/pylyzer/releases/tag/v0.0.73
---
 pkgs/by-name/py/pylyzer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix
index 0ee4c9b85dfd..25f512e6d72b 100644
--- a/pkgs/by-name/py/pylyzer/package.nix
+++ b/pkgs/by-name/py/pylyzer/package.nix
@@ -14,17 +14,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pylyzer";
-  version = "0.0.72";
+  version = "0.0.73";
 
   src = fetchFromGitHub {
     owner = "mtshiba";
     repo = "pylyzer";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-8KVWLamCM7GYnOyeGzNo3z5guS02OpLT8B8WExiofeE=";
+    tag = "v${version}";
+    hash = "sha256-rpF0xrk1PvgfJ0EOHWnCuSWfzLVzXErnKizbvFBP+pg=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-4CvkdEG3LyP2+b/q42OCsSruRWfunEoRXf0IasNUOKE=";
+  cargoHash = "sha256-pU230ghfHsJEcADoZH8/yP+fYDv21FPlwA0//SvHJWY=";
 
   nativeBuildInputs = [
     git

From f25c84e18900b9569d814647dffd4bede9958a7b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Dec 2024 01:47:26 +1000
Subject: [PATCH 116/124] ananicy-rules-cachyos: 0-unstable-2024-10-25 ->
 0-unstable-2024-11-22 (#362538)

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

diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index c3573c4d30fb..02b23a2fba57 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2024-10-25";
+  version = "0-unstable-2024-11-22";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "707b16506be2c54028546181461ebf47cfe72d83";
-    hash = "sha256-189eHlSLGgSgT2KIkj+c5pKpPZ34vacZzlYOFGfwEFM=";
+    rev = "7b660e4c0e3dccec7ddc4c4dafc1717cb06b7e1e";
+    hash = "sha256-7MwAveke3GL8tmOCxCgKRbllChST22FKWdbGsewCJdM=";
   };
 
   dontConfigure = true;

From b0cbb2b290207dd60e3c336060b65842fe99d5c5 Mon Sep 17 00:00:00 2001
From: ben9986 <38633150+Ben9986@users.noreply.github.com>
Date: Sat, 7 Dec 2024 15:30:35 +0000
Subject: [PATCH 117/124] krohnkite: 0.9.8.3 -> 0.9.8.4

---
 pkgs/kde/third-party/krohnkite/default.nix       | 6 +++---
 pkgs/kde/third-party/krohnkite/package-lock.json | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/kde/third-party/krohnkite/default.nix b/pkgs/kde/third-party/krohnkite/default.nix
index b4a2d2b64940..2de325afb97b 100644
--- a/pkgs/kde/third-party/krohnkite/default.nix
+++ b/pkgs/kde/third-party/krohnkite/default.nix
@@ -9,16 +9,16 @@
 }:
 buildNpmPackage rec {
   pname = "krohnkite";
-  version = "0.9.8.3";
+  version = "0.9.8.4";
 
   src = fetchFromGitHub {
     owner = "anametologin";
     repo = "krohnkite";
     rev = "refs/tags/${version}";
-    hash = "sha256-PiGpYOKvBpwkPfDWHlOhq7dwyBYzfzfJVURiEC1a78g=";
+    hash = "sha256-VVHusFuQ/awfFV4izId7VPYCrS8riTavhpB2KpJ9084=";
   };
 
-  npmDepsHash = "sha256-IUGRxDCn/aEebCgDPElEPKOxfoYmLoFHVROkTJpNISY=";
+  npmDepsHash = "sha256-k44SltKLR/Y8qWFCLW2jBWElk9JGn+0azQn0G1f0vuY=";
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/kde/third-party/krohnkite/package-lock.json b/pkgs/kde/third-party/krohnkite/package-lock.json
index 936c0ffedd64..114667dcd9d1 100644
--- a/pkgs/kde/third-party/krohnkite/package-lock.json
+++ b/pkgs/kde/third-party/krohnkite/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "krohnkite",
-  "version": "0.9.8.3",
+  "version": "0.9.8.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "krohnkite",
-      "version": "0.9.8.3",
+      "version": "0.9.8.4",
       "license": "MIT",
       "devDependencies": {
         "mocha": "^10.4.0",

From 9c570008cba0778ecae79c2517171c6b64378e2a Mon Sep 17 00:00:00 2001
From: codgician <15964984+codgician@users.noreply.github.com>
Date: Sun, 8 Dec 2024 00:22:04 +0800
Subject: [PATCH 118/124] open-webui: add update script

---
 pkgs/by-name/op/open-webui/package.nix |  7 +++++--
 pkgs/by-name/op/open-webui/update.sh   | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100755 pkgs/by-name/op/open-webui/update.sh

diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index d2164ff8c261..3f9fd7e64b96 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -148,8 +148,11 @@ python312.pkgs.buildPythonApplication rec {
 
   makeWrapperArgs = [ "--set FRONTEND_BUILD_DIR ${frontend}/share/open-webui" ];
 
-  passthru.tests = {
-    inherit (nixosTests) open-webui;
+  passthru = {
+    tests = {
+      inherit (nixosTests) open-webui;
+    };
+    updateScript = ./update.sh;
   };
 
   meta = {
diff --git a/pkgs/by-name/op/open-webui/update.sh b/pkgs/by-name/op/open-webui/update.sh
new file mode 100755
index 000000000000..51c7871a04c1
--- /dev/null
+++ b/pkgs/by-name/op/open-webui/update.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p git curl jq common-updater-scripts prefetch-npm-deps
+
+set -eou pipefail
+
+nixpkgs="$(git rev-parse --show-toplevel)"
+path="$nixpkgs/pkgs/by-name/op/open-webui/package.nix"
+version="$(curl --silent "https://api.github.com/repos/open-webui/open-webui/releases" | jq '.[0].tag_name' --raw-output)"
+
+update-source-version open-webui "${version:1}" --file="$path"
+
+# Fetch npm deps
+tmpdir=$(mktemp -d)
+curl -O --output-dir $tmpdir "https://raw.githubusercontent.com/open-webui/open-webui/refs/tags/${version}/package-lock.json"
+curl -O --output-dir $tmpdir "https://raw.githubusercontent.com/open-webui/open-webui/refs/tags/${version}/package.json"
+pushd $tmpdir
+npm_hash=$(prefetch-npm-deps package-lock.json)
+sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' "$path"
+popd
+rm -rf $tmpdir
+

From e0cb4ace036e89c0450bb739a2e6ed12063817d5 Mon Sep 17 00:00:00 2001
From: codgician <15964984+codgician@users.noreply.github.com>
Date: Sun, 8 Dec 2024 00:23:12 +0800
Subject: [PATCH 119/124] open-webui: 0.4.7 -> 0.4.8

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

diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index 3f9fd7e64b96..0057e06040b7 100644
--- a/pkgs/by-name/op/open-webui/package.nix
+++ b/pkgs/by-name/op/open-webui/package.nix
@@ -7,19 +7,19 @@
 }:
 let
   pname = "open-webui";
-  version = "0.4.7";
+  version = "0.4.8";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     rev = "refs/tags/v${version}";
-    hash = "sha256-LQFedDcECmS142tGH9+/7ic+wKTeMuysK2fjGmvYPYQ=";
+    hash = "sha256-9N/t8hxODM6Dk/eMKS26/2Sh1lJVkq9pNkPcEtbXqb4=";
   };
 
   frontend = buildNpmPackage {
     inherit pname version src;
 
-    npmDepsHash = "sha256-KeHMt51QvF5qfHKQpEbM0ukGm34xo3TFcXKeZ3CrmHM=";
+    npmDepsHash = "sha256-ThOGBurFjndBZcdpiGugdXpv1YCwCN7s3l2JjSk/hY0=";
 
     # Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
     # Until this is solved, running python packages from the browser will not work.

From 9f0e5cf83f22fe9179cc091334eb342c9f4f970c Mon Sep 17 00:00:00 2001
From: ben9986 <38633150+Ben9986@users.noreply.github.com>
Date: Sat, 7 Dec 2024 00:37:27 +0000
Subject: [PATCH 120/124] nerd-fonts: unescape characters in descriptions

---
 pkgs/data/fonts/nerd-fonts/manifests/fonts.json | 10 +++++-----
 pkgs/data/fonts/nerd-fonts/update.py            |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/data/fonts/nerd-fonts/manifests/fonts.json b/pkgs/data/fonts/nerd-fonts/manifests/fonts.json
index 3d201fd4cf07..ac13c29be107 100644
--- a/pkgs/data/fonts/nerd-fonts/manifests/fonts.json
+++ b/pkgs/data/fonts/nerd-fonts/manifests/fonts.json
@@ -97,7 +97,7 @@
   },
   {
     "caskName": "comic-shanns-mono",
-    "description": "The very typeface you\u2019ve been trained to recognize since childhood",
+    "description": "The very typeface you’ve been trained to recognize since childhood",
     "folderName": "ComicShannsMono",
     "licenseId": "MIT",
     "patchedName": "ComicShannsMono",
@@ -217,7 +217,7 @@
   },
   {
     "caskName": "hack",
-    "description": "Dotted zero, short descenders, expands upon work done for Bitstream Vera &amp; DejaVu, legible at common sizes",
+    "description": "Dotted zero, short descenders, expands upon work done for Bitstream Vera & DejaVu, legible at common sizes",
     "folderName": "Hack",
     "licenseId": "Bitstream-Vera AND MIT",
     "patchedName": "Hack",
@@ -281,7 +281,7 @@
   },
   {
     "caskName": "intone-mono",
-    "description": "Expressive monospaced font family that\u2019s built with clarity, legibility, and the needs of developers in mind",
+    "description": "Expressive monospaced font family that’s built with clarity, legibility, and the needs of developers in mind",
     "folderName": "IntelOneMono",
     "licenseId": "OFL-1.1-RFN",
     "patchedName": "IntoneMono",
@@ -377,7 +377,7 @@
   },
   {
     "caskName": "monoid",
-    "description": "Ligatures, distinguishable glyphs with short ascenders &amp; descenders, large operators &amp; punctuation",
+    "description": "Ligatures, distinguishable glyphs with short ascenders & descenders, large operators & punctuation",
     "folderName": "Monoid",
     "licenseId": "MIT OR OFL-1.1-no-RFN",
     "patchedName": "Monoid",
@@ -513,7 +513,7 @@
   },
   {
     "caskName": "ubuntu-mono",
-    "description": "Dotted zeros, used the `n`, `o`, `H` &amp; `O` Latin characters as a base for design",
+    "description": "Dotted zeros, used the `n`, `o`, `H` & `O` Latin characters as a base for design",
     "folderName": "UbuntuMono",
     "licenseId": "LicenseRef-UbuntuFont",
     "patchedName": "UbuntuMono",
diff --git a/pkgs/data/fonts/nerd-fonts/update.py b/pkgs/data/fonts/nerd-fonts/update.py
index 315609da9bf8..026e293c0569 100755
--- a/pkgs/data/fonts/nerd-fonts/update.py
+++ b/pkgs/data/fonts/nerd-fonts/update.py
@@ -3,6 +3,7 @@
 import os
 import urllib.request as ureq
 import json
+import html
 
 if not all(
     f"UPDATE_NIX_{v}" in os.environ
@@ -28,12 +29,12 @@ def fetchjson(url):
 
 def storejson(path, obj):
     with open(path, "w", encoding="utf-8") as f:
-        json.dump(obj, f, indent=2)
+        json.dump(obj, f, indent=2, ensure_ascii=False)
         # Needed to satisfy EditorConfig's rules
         f.write('\n')
 
 def slicedict(d, ks):
-    return {k: d[k] for k in ks}
+    return {k: html.unescape(d[k]) for k in ks}
 
 os.chdir(os.path.join(os.path.dirname(os.path.abspath(__file__)), "manifests"))
 

From 69fd74d8fe990a6362da60b16fc6027eb3b08ba2 Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Sat, 7 Dec 2024 08:52:49 -0800
Subject: [PATCH 121/124] nixos/github-runners: remove newam from maintainers

---
 .../modules/services/continuous-integration/github-runners.nix  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/github-runners.nix b/nixos/modules/services/continuous-integration/github-runners.nix
index 4a4608c2e4f8..3a4a13d92b56 100644
--- a/nixos/modules/services/continuous-integration/github-runners.nix
+++ b/nixos/modules/services/continuous-integration/github-runners.nix
@@ -6,5 +6,5 @@
     ./github-runner/service.nix
   ];
 
-  meta.maintainers = with lib.maintainers; [ veehaitch newam ];
+  meta.maintainers = with lib.maintainers; [ veehaitch ];
 }

From 036a9a7224d1f742c1a678c7122e5cfac520a43e Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Sat, 7 Dec 2024 09:06:54 -0800
Subject: [PATCH 122/124] cargo-deadlinks: move to pkgs/by-name

---
 .../default.nix => by-name/ca/cargo-deadlinks/package.nix}    | 4 ++--
 pkgs/top-level/all-packages.nix                               | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)
 rename pkgs/{development/tools/rust/cargo-deadlinks/default.nix => by-name/ca/cargo-deadlinks/package.nix} (89%)

diff --git a/pkgs/development/tools/rust/cargo-deadlinks/default.nix b/pkgs/by-name/ca/cargo-deadlinks/package.nix
similarity index 89%
rename from pkgs/development/tools/rust/cargo-deadlinks/default.nix
rename to pkgs/by-name/ca/cargo-deadlinks/package.nix
index b5e73fd9e0df..13cfbcced456 100644
--- a/pkgs/development/tools/rust/cargo-deadlinks/default.nix
+++ b/pkgs/by-name/ca/cargo-deadlinks/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, apple-sdk_11 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-deadlinks";
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
     # assumes the target is x86_64-unknown-linux-gnu
     "--skip simple_project::it_checks_okay_project_correctly";
 
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security;
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
 
   meta = with lib; {
     description = "Cargo subcommand to check rust documentation for broken links";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea5a92dd4be6..8563ae090d45 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6867,9 +6867,6 @@ with pkgs;
   cargo-cyclonedx = callPackage ../development/tools/rust/cargo-cyclonedx {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation;
   };
-  cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
   cargo-edit = callPackage ../development/tools/rust/cargo-edit {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From b6788a461272886f9dda218ab1b5b2006607309a Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 7 Dec 2024 22:41:17 +0530
Subject: [PATCH 123/124] datadog-integrations-core: moderinize derivation

---
 .../networking/dd-agent/integrations-core.nix    | 16 ++++++++--------
 pkgs/top-level/all-packages.nix                  |  1 -
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix
index 16c9c2fc8661..003da2eee98a 100644
--- a/pkgs/tools/networking/dd-agent/integrations-core.nix
+++ b/pkgs/tools/networking/dd-agent/integrations-core.nix
@@ -33,12 +33,12 @@
 #
 # [1]: https://github.com/DataDog/integrations-core
 
-{ pkgs, python, extraIntegrations ? { }, }:
+{ lib, fetchFromGitHub, python3Packages, extraIntegrations ? { }, }:
 
 let
-  inherit (pkgs.lib) attrValues mapAttrs;
+  inherit (lib) attrValues mapAttrs;
 
-  src = pkgs.fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "DataDog";
     repo = "integrations-core";
     rev = version;
@@ -48,13 +48,13 @@ let
 
   # Build helper to build a single datadog integration package.
   buildIntegration = { pname, ... }@args:
-    python.pkgs.buildPythonPackage (args // {
+    python3Packages.buildPythonPackage (args // {
       inherit src version;
       name = "datadog-integration-${pname}-${version}";
       pyproject = true;
 
       sourceRoot = "${src.name}/${args.sourceRoot or pname}";
-      buildInputs = with python.pkgs; [ hatchling setuptools ];
+      buildInputs = with python3Packages; [ hatchling setuptools ];
       doCheck = false;
     });
 
@@ -70,7 +70,7 @@ let
         --replace "packages=['datadog_checks']" "packages=find_packages()"
     '';
 
-    propagatedBuildInputs = with python.pkgs; [
+    propagatedBuildInputs = with python3Packages; [
       binary
       cachetools
       cryptography
@@ -110,10 +110,10 @@ let
   integrations = defaultIntegrations // extraIntegrations;
   builtIntegrations = mapAttrs (pname: fdeps: buildIntegration {
     inherit pname;
-    propagatedBuildInputs = (fdeps python.pkgs) ++ [ datadog_checks_base ];
+    propagatedBuildInputs = (fdeps python3Packages) ++ [ datadog_checks_base ];
   }) integrations;
 
 in builtIntegrations // {
   inherit datadog_checks_base;
-  python = python.withPackages (_: (attrValues builtIntegrations));
+  python = python3Packages.python.withPackages (_: (attrValues builtIntegrations));
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9b065c99a61..40c56077ae07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13544,7 +13544,6 @@ with pkgs;
   };
   datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { };
   datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix {
-    python = python3;
     extraIntegrations = extras;
   };
 

From f3c8898b76abaa8a55990d85eefc52ff39b5e6c5 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sat, 7 Dec 2024 18:15:32 +0100
Subject: [PATCH 124/124] vscode-extensions.visualjj.visualjj: 0.13.0 -> 0.13.1

---
 .../vscode/extensions/visualjj.visualjj/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
index a79b3ec37db7..3068cfecdaca 100644
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -6,28 +6,28 @@
 }:
 
 let
-  version = "0.13.0";
+  version = "0.13.1";
 
   sources = {
     "x86_64-linux" = {
       arch = "linux-x64";
       url = "https://download.visualjj.com/visualjj-linux-x64-${version}.vsix";
-      hash = "sha256-mhfn/Lw/W1T2PaIglwrO/7VacDutT6Tgs133ePHL7W4=";
+      hash = "sha256-vKlsRxqtEvx4Gu6tkBjERYHl4Xx0K9xnYkh1SMDOYl0=";
     };
     "x86_64-darwin" = {
       arch = "darwin-x64";
       url = "https://download.visualjj.com/visualjj-darwin-x64-${version}.vsix";
-      hash = "sha256-feghMmcqzFM/Ttk8s4fp8et9Suw2kKLocptzwEcB2Sw=";
+      hash = "sha256-hzKZYPL/ZCRP2a4EaZGRXmzVpUNlGh4gOQt7NvGkn4M=";
     };
     "aarch64-linux" = {
       arch = "linux-arm64";
       url = "https://download.visualjj.com/visualjj-linux-arm64-${version}.vsix";
-      hash = "sha256-bfBj/A41FFMwMAEVw77nEDyk0+fYvi2Tg1Ufihxi9F8=";
+      hash = "sha256-nvVeme/qRG1ObSeisIBQHka5zG2f7Bqsjmva5EevXxw=";
     };
     "aarch64-darwin" = {
       arch = "darwin-arm64";
       url = "https://download.visualjj.com/visualjj-darwin-arm64-${version}.vsix";
-      hash = "sha256-xzf3WrH7BTiaX6NC2n9nLCKuBlFzRDYaSR73VGM7Ldc=";
+      hash = "sha256-mW6zJq0XvliCAWuslHdnlMX7bgO0mS9kH7CIYXjlaCE=";
     };
   };
 in