From 1b510687b4f54c14490f941a7f66312df94d2788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 7 Aug 2024 00:21:42 +0200
Subject: [PATCH 01/85] nixos/mailman: wrap mailman cli to start as mailman
 user

This is essential when postgres socket authentication is used.
---
 nixos/modules/services/mail/mailman.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix
index 95b77da250b2..4f2312cc5de2 100644
--- a/nixos/modules/services/mail/mailman.nix
+++ b/nixos/modules/services/mail/mailman.nix
@@ -460,6 +460,16 @@ in {
       ignoreCollisions = true;
       postBuild = ''
         find $out/bin/ -mindepth 1 -not -name "mailman*" -delete
+      '' + lib.optionalString config.security.sudo.enable ''
+        mv $out/bin/mailman $out/bin/.mailman-wrapped
+        echo '#!${pkgs.runtimeShell}
+        sudo=exec
+        if [[ "$USER" != mailman ]]; then
+          sudo="exec /run/wrappers/bin/sudo -u mailman"
+        fi
+        $sudo ${placeholder "out"}/bin/.mailman-wrapped "$@"
+        ' > $out/bin/mailman
+        chmod +x $out/bin/mailman
       '';
     }) ];
 

From 40e8ef4a2a096f7c001221d6a2f67e9515a586d5 Mon Sep 17 00:00:00 2001
From: charB66 <nix.disparate221@passinbox.com>
Date: Sat, 28 Sep 2024 14:42:11 +0200
Subject: [PATCH 02/85] exegol: 4.3.1 -> 4.3.8

---
 pkgs/by-name/ex/exegol/package.nix | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix
index 033a46f0467e..5bc9c2a4abb2 100644
--- a/pkgs/by-name/ex/exegol/package.nix
+++ b/pkgs/by-name/ex/exegol/package.nix
@@ -2,27 +2,31 @@
   fetchPypi,
   lib,
   python3,
+  xorg,
 }:
 python3.pkgs.buildPythonApplication rec {
-  pname = "Exegol";
-  version = "4.3.1";
+  pname = "exegol";
+  version = "4.3.8";
   format = "setuptools";
 
   # Project has no unit tests
   doCheck = false;
 
-  propagatedBuildInputs = with python3.pkgs; [
-    pyyaml
-    gitpython
-    docker
-    requests
-    rich
-    argcomplete
-  ];
+  propagatedBuildInputs =
+    with python3.pkgs;
+    [
+      pyyaml
+      gitpython
+      docker
+      requests
+      rich
+      argcomplete
+    ]
+    ++ [ xorg.xhost ];
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cMbMmkG52A104iHVwe+6k1Fazi7fISeU/doWJqw5Whw=";
+    hash = "sha256-x2kIQOwbokJ0/uOafWZp0X67FmuEjF0WvI4D4jCLWnk=";
   };
 
   meta = with lib; {

From ac8286a5ed6b6544f13a9016f79bc78f91f356c5 Mon Sep 17 00:00:00 2001
From: charB66 <nix.disparate221@passinbox.com>
Date: Sat, 28 Sep 2024 15:08:33 +0200
Subject: [PATCH 03/85] maintainers: add charB66

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d1690081b374..c19aade15d80 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3641,6 +3641,12 @@
     name = "ChaosAttractor";
     keys = [ { fingerprint = "A137 4415 DB7C 6439 10EA  5BF1 0FEE 4E47 5940 E125"; } ];
   };
+  charB66 = {
+    email = "nix.disparate221@passinbox.com";
+    github = "charB66";
+    githubId = 59340663;
+    name = "Bryan F.";
+  };
   charlesbaynham = {
     email = "charlesbaynham@gmail.com";
     github = "charlesbaynham";

From 0a1effab9e6caa99b520b2f60c1a5870a09beb45 Mon Sep 17 00:00:00 2001
From: charB66 <nix.disparate221@passinbox.com>
Date: Sat, 28 Sep 2024 15:20:01 +0200
Subject: [PATCH 04/85] exegol: add charB66 as maintainer

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

diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix
index 5bc9c2a4abb2..f2ff02334168 100644
--- a/pkgs/by-name/ex/exegol/package.nix
+++ b/pkgs/by-name/ex/exegol/package.nix
@@ -43,6 +43,9 @@ python3.pkgs.buildPythonApplication rec {
     changelog = "https://github.com/ThePorgs/Exegol/releases/tag/${version}";
     license = licenses.gpl3Only;
     mainProgram = "exegol";
-    maintainers = with maintainers; [ _0b11stan ];
+    maintainers = with maintainers; [
+      _0b11stan
+      charB66
+    ];
   };
 }

From a9f3a296d311b1a08fffafad4f53fbd240d5b9e7 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 12 Nov 2024 16:54:14 +0100
Subject: [PATCH 05/85] nixos/lvm: expand enable description to better inform
 users about their actions

---
 nixos/modules/tasks/lvm.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix
index 4d1018978eaf..f72aa5fc0a7c 100644
--- a/nixos/modules/tasks/lvm.nix
+++ b/nixos/modules/tasks/lvm.nix
@@ -7,6 +7,13 @@ in {
   options.services.lvm = {
     enable = mkEnableOption "lvm2" // {
       default = true;
+      description = ''
+        Whether to enable lvm2.
+
+        :::{.note}
+        The lvm2 package contains device-mapper udev rules and without those tools like cryptsetup do not fully function!
+        :::
+      '';
     };
 
     package = mkOption {

From 6f88eaab1bc294ce147608a9b5043a275b8c6c56 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 21 Nov 2024 14:19:35 +0100
Subject: [PATCH 06/85] beets: allow darwin builds

---
 pkgs/tools/audio/beets/common.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
index ac1b59a4f289..c8064a6310d0 100644
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -125,6 +125,8 @@ python3Packages.buildPythonApplication {
     responses
   ] ++ pluginWrapperBins;
 
+  __darwinAllowLocalNetworking = true;
+
   disabledTestPaths = lib.flatten (attrValues (lib.mapAttrs (_: v: v.testPaths) disabledPlugins));
   inherit disabledTests;
 
@@ -173,7 +175,7 @@ EOF
     homepage = "https://beets.io";
     license = licenses.mit;
     maintainers = with maintainers; [ aszlig doronbehar lovesegfault pjones ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     mainProgram = "beet";
   };
 }

From 4b05e36cf3c36a614ab64b96dd50aac618898ae0 Mon Sep 17 00:00:00 2001
From: Ilia <istudyatuni@gmail.com>
Date: Wed, 20 Nov 2024 21:08:18 +0300
Subject: [PATCH 07/85] mitimasu: init at 0-unstable-2023-10-24

---
 pkgs/by-name/mi/mitimasu/package.nix | 35 ++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/mi/mitimasu/package.nix

diff --git a/pkgs/by-name/mi/mitimasu/package.nix b/pkgs/by-name/mi/mitimasu/package.nix
new file mode 100644
index 000000000000..dfed49ca118d
--- /dev/null
+++ b/pkgs/by-name/mi/mitimasu/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
+stdenvNoCC.mkDerivation {
+  pname = "mitimasu";
+  version = "0-unstable-2023-10-24";
+
+  src = fetchFromGitHub {
+    owner = "kemomimi-no-sato";
+    repo = "mitimasu-webfont";
+    rev = "6798f7a192d5c60adf75a3d32184057b8579e3c5";
+    hash = "sha256-yiAnIVZY9DoIborO/s2KSlt6Zq1kAjKewLd30qBQqio=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -m444 -Dt $out/share/fonts/truetype fonts/mitimasu.ttf
+    install -m444 -Dt $out/share/fonts/eot fonts/mitimasu.eot
+    install -m444 -Dt $out/share/fonts/woff fonts/mitimasu.woff
+    install -m444 -Dt $out/share/fonts/woff2 fonts/mitimasu.woff2
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Mitimasu webfont";
+    homepage = "https://github.com/kemomimi-no-sato/mitimasu-webfont";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ istudyatuni ];
+  };
+}

From 3650335dcb40bff0da9a004990a9d59f5f6585fc Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 23 Nov 2024 01:06:45 +0100
Subject: [PATCH 08/85] coolercontrol.*: 1.4.0 -> 1.4.4

---
 .../system/coolercontrol/Cargo.lock           | 3548 -----------------
 .../coolercontrol/coolercontrol-gui.nix       |    4 +-
 .../coolercontrol/coolercontrol-liqctld.nix   |    2 +-
 .../coolercontrol/coolercontrol-ui-data.nix   |   13 +-
 .../system/coolercontrol/coolercontrold.nix   |   12 +-
 .../system/coolercontrol/default.nix          |    4 +-
 6 files changed, 21 insertions(+), 3562 deletions(-)
 delete mode 100644 pkgs/applications/system/coolercontrol/Cargo.lock

diff --git a/pkgs/applications/system/coolercontrol/Cargo.lock b/pkgs/applications/system/coolercontrol/Cargo.lock
deleted file mode 100644
index c1a100c69ed5..000000000000
--- a/pkgs/applications/system/coolercontrol/Cargo.lock
+++ /dev/null
@@ -1,3548 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "actix-codec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a"
-dependencies = [
- "bitflags 2.6.0",
- "bytes",
- "futures-core",
- "futures-sink",
- "memchr",
- "pin-project-lite",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "actix-cors"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9e772b3bcafe335042b5db010ab7c09013dad6eac4915c91d8d50902769f331"
-dependencies = [
- "actix-utils",
- "actix-web",
- "derive_more",
- "futures-util",
- "log",
- "once_cell",
- "smallvec",
-]
-
-[[package]]
-name = "actix-http"
-version = "3.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae682f693a9cd7b058f2b0b5d9a6d7728a8555779bedbbc35dd88528611d020"
-dependencies = [
- "actix-codec",
- "actix-rt",
- "actix-service",
- "actix-utils",
- "ahash",
- "base64 0.22.1",
- "bitflags 2.6.0",
- "brotli",
- "bytes",
- "bytestring",
- "derive_more",
- "encoding_rs",
- "flate2",
- "futures-core",
- "h2",
- "http 0.2.12",
- "httparse",
- "httpdate",
- "itoa",
- "language-tags",
- "local-channel",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rand",
- "sha1",
- "smallvec",
- "tokio",
- "tokio-util",
- "tracing",
- "zstd",
-]
-
-[[package]]
-name = "actix-macros"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "actix-multipart"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d974dd6c4f78d102d057c672dcf6faa618fafa9df91d44f9c466688fc1275a3a"
-dependencies = [
- "actix-multipart-derive",
- "actix-utils",
- "actix-web",
- "bytes",
- "derive_more",
- "futures-core",
- "futures-util",
- "httparse",
- "local-waker",
- "log",
- "memchr",
- "mime",
- "rand",
- "serde",
- "serde_json",
- "serde_plain",
- "tempfile",
- "tokio",
-]
-
-[[package]]
-name = "actix-multipart-derive"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a0a77f836d869f700e5b47ac7c3c8b9c8bc82e4aec861954c6198abee3ebd4d"
-dependencies = [
- "darling",
- "parse-size",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "actix-router"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8"
-dependencies = [
- "bytestring",
- "cfg-if",
- "http 0.2.12",
- "regex",
- "regex-lite",
- "serde",
- "tracing",
-]
-
-[[package]]
-name = "actix-rt"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208"
-dependencies = [
- "futures-core",
- "tokio",
-]
-
-[[package]]
-name = "actix-server"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b02303ce8d4e8be5b855af6cf3c3a08f3eff26880faad82bab679c22d3650cb5"
-dependencies = [
- "actix-rt",
- "actix-service",
- "actix-utils",
- "futures-core",
- "futures-util",
- "mio",
- "socket2",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "actix-service"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a"
-dependencies = [
- "futures-core",
- "paste",
- "pin-project-lite",
-]
-
-[[package]]
-name = "actix-session"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b671404ec72194d8af58c2bdaf51e3c477a0595056bd5010148405870dda8df2"
-dependencies = [
- "actix-service",
- "actix-utils",
- "actix-web",
- "anyhow",
- "derive_more",
- "serde",
- "serde_json",
- "tracing",
-]
-
-[[package]]
-name = "actix-utils"
-version = "3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8"
-dependencies = [
- "local-waker",
- "pin-project-lite",
-]
-
-[[package]]
-name = "actix-web"
-version = "4.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff"
-dependencies = [
- "actix-codec",
- "actix-http",
- "actix-macros",
- "actix-router",
- "actix-rt",
- "actix-server",
- "actix-service",
- "actix-utils",
- "actix-web-codegen",
- "ahash",
- "bytes",
- "bytestring",
- "cfg-if",
- "cookie",
- "derive_more",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "itoa",
- "language-tags",
- "log",
- "mime",
- "once_cell",
- "pin-project-lite",
- "regex",
- "regex-lite",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "smallvec",
- "socket2",
- "time",
- "url",
-]
-
-[[package]]
-name = "actix-web-codegen"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8"
-dependencies = [
- "actix-router",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "actix-web-static-files"
-version = "4.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adf6d1ef6d7a60e084f9e0595e2a5234abda14e76c105ecf8e2d0e8800c41a1f"
-dependencies = [
- "actix-web",
- "derive_more",
- "futures-util",
- "static-files",
-]
-
-[[package]]
-name = "addr2line"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "aead"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
-dependencies = [
- "crypto-common",
- "generic-array",
-]
-
-[[package]]
-name = "aes"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
-]
-
-[[package]]
-name = "aes-gcm"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
-dependencies = [
- "aead",
- "aes",
- "cipher",
- "ctr",
- "ghash",
- "subtle",
-]
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "getrandom",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "alloc-no-stdlib"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
-
-[[package]]
-name = "alloc-stdlib"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
-dependencies = [
- "alloc-no-stdlib",
-]
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
-
-[[package]]
-name = "arrayref"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
-[[package]]
-name = "async-broadcast"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e"
-dependencies = [
- "event-listener",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-channel"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
-dependencies = [
- "concurrent-queue",
- "event-listener-strategy",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-io"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
-dependencies = [
- "async-lock",
- "cfg-if",
- "concurrent-queue",
- "futures-io",
- "futures-lite",
- "parking",
- "polling",
- "rustix",
- "slab",
- "tracing",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "async-lock"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
-dependencies = [
- "event-listener",
- "event-listener-strategy",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-process"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a"
-dependencies = [
- "async-channel",
- "async-io",
- "async-lock",
- "async-signal",
- "async-task",
- "blocking",
- "cfg-if",
- "event-listener",
- "futures-lite",
- "rustix",
- "tracing",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "async-recursion"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "async-signal"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d"
-dependencies = [
- "async-io",
- "async-lock",
- "atomic-waker",
- "cfg-if",
- "futures-core",
- "futures-io",
- "rustix",
- "signal-hook-registry",
- "slab",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "async-task"
-version = "4.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
-
-[[package]]
-name = "async-trait"
-version = "0.1.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "atomic"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
-[[package]]
-name = "autocfg"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
-[[package]]
-name = "backtrace"
-version = "0.3.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
-
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "blocking"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
-dependencies = [
- "async-channel",
- "async-task",
- "futures-io",
- "futures-lite",
- "piper",
-]
-
-[[package]]
-name = "brotli"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "4.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "bytemuck"
-version = "1.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
-dependencies = [
- "bytemuck_derive",
-]
-
-[[package]]
-name = "bytemuck_derive"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "byteorder-lite"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
-
-[[package]]
-name = "bytes"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
-
-[[package]]
-name = "bytestring"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72"
-dependencies = [
- "bytes",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.101"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d"
-dependencies = [
- "jobserver",
- "libc",
- "once_cell",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "cfg_aliases"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
-
-[[package]]
-name = "cfg_aliases"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
-
-[[package]]
-name = "chrono"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "serde",
- "wasm-bindgen",
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
-[[package]]
-name = "clap"
-version = "4.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
-
-[[package]]
-name = "clokwerk"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd108d365fcb6d7eddf17a6718eb6a33db18ba4178f8cc6b667f480710f10d76"
-dependencies = [
- "chrono",
-]
-
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
-
-[[package]]
-name = "concurrent-queue"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "const_format"
-version = "0.2.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
-dependencies = [
- "const_format_proc_macros",
-]
-
-[[package]]
-name = "const_format_proc_macros"
-version = "0.2.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-xid",
-]
-
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
-[[package]]
-name = "cookie"
-version = "0.16.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
-dependencies = [
- "aes-gcm",
- "base64 0.20.0",
- "hkdf",
- "hmac",
- "percent-encoding",
- "rand",
- "sha2",
- "subtle",
- "time",
- "version_check",
-]
-
-[[package]]
-name = "coolercontrold"
-version = "1.4.0"
-dependencies = [
- "actix-cors",
- "actix-multipart",
- "actix-session",
- "actix-web",
- "actix-web-static-files",
- "anyhow",
- "async-trait",
- "chrono",
- "clap",
- "clokwerk",
- "const_format",
- "derive_more",
- "env_logger",
- "gifski",
- "heck",
- "http-auth-basic",
- "http-body-util",
- "hyper",
- "hyper-util",
- "image",
- "imgref",
- "lazy_static",
- "libdrm_amdgpu_sys",
- "log",
- "mime",
- "nix 0.29.0",
- "nu-glob",
- "nvml-wrapper",
- "pciid-parser",
- "psutil",
- "regex",
- "rgb",
- "ril",
- "serde",
- "serde_json",
- "sha2",
- "signal-hook",
- "static-files",
- "strum",
- "sysinfo",
- "systemd-journal-logger",
- "tempfile",
- "test-context",
- "tiny-skia",
- "tokio",
- "tokio-graceful-shutdown",
- "toml_edit 0.22.14",
- "uuid",
- "yata",
- "zbus",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[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 = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "rand_core",
- "typenum",
-]
-
-[[package]]
-name = "ctr"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
-dependencies = [
- "cipher",
-]
-
-[[package]]
-name = "darling"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
-dependencies = [
- "darling_core",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "deranged"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
-]
-
-[[package]]
-name = "derive_more"
-version = "0.99.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "rustc_version",
- "syn",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "either"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "endi"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
-
-[[package]]
-name = "enumflags2"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
-dependencies = [
- "enumflags2_derive",
- "serde",
-]
-
-[[package]]
-name = "enumflags2_derive"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "env_filter"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "humantime",
- "log",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "errno"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "event-listener"
-version = "5.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
-dependencies = [
- "event-listener",
- "pin-project-lite",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
-
-[[package]]
-name = "fdeflate"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
-dependencies = [
- "simd-adler32",
-]
-
-[[package]]
-name = "flate2"
-version = "1.0.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "fontdue"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0793f5137567643cf65ea42043a538804ff0fbf288649e2141442b602d81f9bc"
-dependencies = [
- "hashbrown 0.13.2",
- "ttf-parser",
-]
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-
-[[package]]
-name = "futures-lite"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
-dependencies = [
- "fastrand",
- "futures-core",
- "futures-io",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "futures-macro"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
-
-[[package]]
-name = "futures-task"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-
-[[package]]
-name = "futures-util"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "ghash"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
-dependencies = [
- "opaque-debug",
- "polyval",
-]
-
-[[package]]
-name = "gif"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
-dependencies = [
- "color_quant",
- "weezl",
-]
-
-[[package]]
-name = "gif-dispose"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "781005a5985b4c723fd3e6586df79d823151846ebcbcf2fcc7e3d3fba18c2d51"
-dependencies = [
- "gif",
- "imgref",
- "rgb",
-]
-
-[[package]]
-name = "gifski"
-version = "1.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa3aeeed337aa658d1c2d90cb21b6db6172d1b8a84dfb462ade81f48eb0fd5eb"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-utils",
- "gif",
- "gif-dispose",
- "imagequant",
- "imgref",
- "loop9",
- "num-traits",
- "ordered-channel",
- "quick-error",
- "resize",
- "rgb",
-]
-
-[[package]]
-name = "gimli"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "h2"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http 0.2.12",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
-[[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.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hkdf"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
-dependencies = [
- "hmac",
-]
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
-[[package]]
-name = "http"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-auth-basic"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd2e17aacf7f4a2428def798e2ff4f4f883c0987bdaf47dd5c8bc027bc9f1ebc"
-dependencies = [
- "base64 0.13.1",
-]
-
-[[package]]
-name = "http-body"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
-dependencies = [
- "bytes",
- "http 1.1.0",
-]
-
-[[package]]
-name = "http-body-util"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
-dependencies = [
- "bytes",
- "futures-util",
- "http 1.1.0",
- "http-body",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "hyper"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http 1.1.0",
- "http-body",
- "httparse",
- "itoa",
- "pin-project-lite",
- "smallvec",
- "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http 1.1.0",
- "http-body",
- "hyper",
- "pin-project-lite",
- "tokio",
- "tower",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "image"
-version = "0.25.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "gif",
- "image-webp",
- "num-traits",
- "png",
- "rayon",
- "tiff",
- "zune-core",
- "zune-jpeg",
-]
-
-[[package]]
-name = "image-webp"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d"
-dependencies = [
- "byteorder-lite",
- "thiserror",
-]
-
-[[package]]
-name = "imagequant"
-version = "4.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09db32417831053bf246bc74fc7c139a05458552d2d98a9f58ff5744d8dea8d3"
-dependencies = [
- "arrayvec",
- "once_cell",
- "rayon",
- "rgb",
- "thread_local",
-]
-
-[[package]]
-name = "imgref"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126"
-
-[[package]]
-name = "indexmap"
-version = "2.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.5",
-]
-
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
-
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "jobserver"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "jpeg-decoder"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
-
-[[package]]
-name = "js-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "language-tags"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "libc"
-version = "0.2.155"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-
-[[package]]
-name = "libdrm_amdgpu_sys"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adffc519012b872bd699a856bc3faffb899c7f9d41750b21a0f573bba1ada802"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "libloading"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
-dependencies = [
- "cfg-if",
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
-
-[[package]]
-name = "local-channel"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6cbc85e69b8df4b8bb8b89ec634e7189099cea8927a276b7384ce5488e53ec8"
-dependencies = [
- "futures-core",
- "futures-sink",
- "local-waker",
-]
-
-[[package]]
-name = "local-waker"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487"
-
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-dependencies = [
- "value-bag",
-]
-
-[[package]]
-name = "loop9"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062"
-dependencies = [
- "imgref",
-]
-
-[[package]]
-name = "mach2"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
-dependencies = [
- "libc",
-]
-
-[[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 = "miette"
-version = "7.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1"
-dependencies = [
- "cfg-if",
- "miette-derive",
- "thiserror",
- "unicode-width",
-]
-
-[[package]]
-name = "miette-derive"
-version = "7.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "mime_guess"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
-dependencies = [
- "mime",
- "unicase",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
- "simd-adler32",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "nix"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if",
- "libc",
-]
-
-[[package]]
-name = "nix"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "cfg_aliases 0.1.1",
- "libc",
- "memoffset",
-]
-
-[[package]]
-name = "nix"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "cfg_aliases 0.2.1",
- "libc",
-]
-
-[[package]]
-name = "ntapi"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "nu-glob"
-version = "0.95.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acd2879444c53bbfb51a2ab060ae1257fe2c8446e6b2cd8a63c88a4d6a728a7a"
-
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
-]
-
-[[package]]
-name = "nvml-wrapper"
-version = "0.10.0"
-source = "git+https://github.com/codifryed/nvml-wrapper?branch=fan-control#6c8426b459e5e52ca39dd5101da78887d49f748d"
-dependencies = [
- "bitflags 2.6.0",
- "libloading",
- "nvml-wrapper-sys",
- "static_assertions",
- "thiserror",
- "wrapcenum-derive",
-]
-
-[[package]]
-name = "nvml-wrapper-sys"
-version = "0.8.0"
-source = "git+https://github.com/codifryed/nvml-wrapper?branch=fan-control#6c8426b459e5e52ca39dd5101da78887d49f748d"
-dependencies = [
- "libloading",
-]
-
-[[package]]
-name = "object"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
-
-[[package]]
-name = "ordered-channel"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f0bc569ca0974cb90125f52cf76f7b6ad3a072301beba78eb0aa4174c4964ed"
-dependencies = [
- "crossbeam-channel",
-]
-
-[[package]]
-name = "ordered-stream"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
-dependencies = [
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "parking"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
-
-[[package]]
-name = "parking_lot"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "parse-size"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "944553dd59c802559559161f9816429058b869003836120e262e8caec061b7ae"
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "path-slash"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "498a099351efa4becc6a19c72aa9270598e8fd274ca47052e37455241c88b696"
-
-[[package]]
-name = "pciid-parser"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e889f5dad24e8b842a0417e1df0fa250f4e300d1eb88b81d48a9db5bfff6e035"
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "piper"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
-dependencies = [
- "atomic-waker",
- "fastrand",
- "futures-io",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[package]]
-name = "png"
-version = "0.17.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
-dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "fdeflate",
- "flate2",
- "miniz_oxide",
-]
-
-[[package]]
-name = "polling"
-version = "3.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
-dependencies = [
- "cfg-if",
- "concurrent-queue",
- "hermit-abi 0.4.0",
- "pin-project-lite",
- "rustix",
- "tracing",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "polyval"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "opaque-debug",
- "universal-hash",
-]
-
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "proc-macro-crate"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
-dependencies = [
- "toml_edit 0.21.1",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "psutil"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e617cc9058daa5e1fe5a0d23ed745773a5ee354111dad1ec0235b0cc16b6730"
-dependencies = [
- "cfg-if",
- "glob",
- "mach2",
- "nix 0.24.3",
- "num_cpus",
- "once_cell",
- "thiserror",
-]
-
-[[package]]
-name = "quick-error"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
-
-[[package]]
-name = "quote"
-version = "1.0.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[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 = "redox_syscall"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
-dependencies = [
- "bitflags 2.6.0",
-]
-
-[[package]]
-name = "regex"
-version = "1.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-lite"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
-
-[[package]]
-name = "resize"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e29f584c07a8396c5e2eee0bd8d7aec5c8d9e0a3c2333806fd2ec1d2a5b080"
-dependencies = [
- "rayon",
- "rgb",
-]
-
-[[package]]
-name = "rgb"
-version = "0.8.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "ril"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb9d89f558ed427b172d6014c4cf3145b506d379df0676b471964dbbbe923ea1"
-dependencies = [
- "fontdue",
- "num-traits",
- "png",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
-dependencies = [
- "bitflags 2.6.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
-
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "semver"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-
-[[package]]
-name = "serde"
-version = "1.0.203"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.203"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.118"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_plain"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "signal-hook"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "simd-adler32"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "socket2"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "static-files"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64712ea1e3e140010e1d9605872ba205afa2ab5bd38191cc6ebd248ae1f6a06b"
-dependencies = [
- "mime_guess",
- "path-slash",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "strict-num"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "strum"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn",
-]
-
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
-[[package]]
-name = "syn"
-version = "2.0.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "sysinfo"
-version = "0.30.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae"
-dependencies = [
- "cfg-if",
- "core-foundation-sys",
- "libc",
- "ntapi",
- "once_cell",
- "windows",
-]
-
-[[package]]
-name = "systemd-journal-logger"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5f3848dd723f2a54ac1d96da793b32923b52de8dfcced8722516dac312a5b2a"
-dependencies = [
- "log",
- "rustix",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
-dependencies = [
- "cfg-if",
- "fastrand",
- "rustix",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "test-context"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6676ab8513edfd2601a108621103fdb45cac9098305ca25ec93f7023b06b05d9"
-dependencies = [
- "futures",
- "test-context-macros",
-]
-
-[[package]]
-name = "test-context-macros"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ea17a2dc368aeca6f554343ced1b1e31f76d63683fa8016e5844bd7a5144a1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "tiff"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
-dependencies = [
- "flate2",
- "jpeg-decoder",
- "weezl",
-]
-
-[[package]]
-name = "time"
-version = "0.3.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
-dependencies = [
- "deranged",
- "itoa",
- "num-conv",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
-[[package]]
-name = "time-macros"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
-[[package]]
-name = "tiny-skia"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"
-dependencies = [
- "arrayref",
- "arrayvec",
- "bytemuck",
- "cfg-if",
- "log",
- "png",
- "tiny-skia-path",
-]
-
-[[package]]
-name = "tiny-skia-path"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
-dependencies = [
- "arrayref",
- "bytemuck",
- "strict-num",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "tokio"
-version = "1.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "num_cpus",
- "parking_lot",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "tracing",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "tokio-graceful-shutdown"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e08074a4a6fe69a4d9ca7548134dcd913f544251d496b758657cf87deb87a2d"
-dependencies = [
- "async-trait",
- "atomic",
- "bytemuck",
- "miette",
- "pin-project-lite",
- "thiserror",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
-
-[[package]]
-name = "toml_edit"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
-dependencies = [
- "indexmap",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
-dependencies = [
- "indexmap",
- "toml_datetime",
- "winnow 0.6.13",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project",
- "pin-project-lite",
- "tokio",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "log",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "ttf-parser"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd"
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "uds_windows"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
-dependencies = [
- "memoffset",
- "tempfile",
- "winapi",
-]
-
-[[package]]
-name = "unicase"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-width"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
-[[package]]
-name = "universal-hash"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
-dependencies = [
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "url"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
-[[package]]
-name = "uuid"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "value-bag"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
-[[package]]
-name = "weezl"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-dependencies = [
- "windows-core",
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
- "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
-
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winnow"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "wrapcenum-derive"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76ff259533532054cfbaefb115c613203c73707017459206380f03b3b3f266e"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "xdg-home"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "yata"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4ef8ddfa3ccd93454262c0e60a43a2bbf403d404174e1815f7581d5028229f"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "zbus"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5"
-dependencies = [
- "async-broadcast",
- "async-process",
- "async-recursion",
- "async-trait",
- "enumflags2",
- "event-listener",
- "futures-core",
- "futures-sink",
- "futures-util",
- "hex",
- "nix 0.28.0",
- "ordered-stream",
- "rand",
- "serde",
- "serde_repr",
- "sha1",
- "static_assertions",
- "tokio",
- "tracing",
- "uds_windows",
- "windows-sys 0.52.0",
- "xdg-home",
- "zbus_macros",
- "zbus_names",
- "zvariant",
-]
-
-[[package]]
-name = "zbus_macros"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
- "zvariant_utils",
-]
-
-[[package]]
-name = "zbus_names"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
-dependencies = [
- "serde",
- "static_assertions",
- "zvariant",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.7.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "zstd"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "7.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a"
-dependencies = [
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.11+zstd.1.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4"
-dependencies = [
- "cc",
- "pkg-config",
-]
-
-[[package]]
-name = "zune-core"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
-
-[[package]]
-name = "zune-jpeg"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448"
-dependencies = [
- "zune-core",
-]
-
-[[package]]
-name = "zvariant"
-version = "4.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7"
-dependencies = [
- "endi",
- "enumflags2",
- "serde",
- "static_assertions",
- "zvariant_derive",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "4.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
- "zvariant_utils",
-]
-
-[[package]]
-name = "zvariant_utils"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix
index cb3e0c22835e..5402ebac181b 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrol-ui/src-tauri";
 
-  cargoHash = "sha256-0Ud5S4T5+5eBuvD5N64NAvbK0+tTozKsPhsNziCEu3I=";
+  cargoHash = "sha256-nS67ABuI2/C08X+TWWoOx7bptIPF1fsvBC1Ucoky1/4=";
 
   buildFeatures = [ "custom-protocol" ];
 
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage {
   postPatch = ''
     mkdir -p ui-build
     cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/
-    substituteInPlace tauri.conf.json --replace '"frontendDist": "../dist"' '"frontendDist": "ui-build"'
+    substituteInPlace tauri.conf.json --replace-fail '"frontendDist": "../dist"' '"frontendDist": "ui-build"'
   '';
 
   postInstall = ''
diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix b/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix
index 054b7a8fafff..38a929c813e8 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix
@@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication {
   postInstall = ''
     install -Dm444 "${src}/packaging/systemd/coolercontrol-liqctld.service" -t "$out/lib/systemd/system"
     substituteInPlace "$out/lib/systemd/system/coolercontrol-liqctld.service" \
-      --replace '/usr/bin' "$out/bin"
+      --replace-fail '/usr/bin' "$out/bin"
   '';
 
   meta = meta // {
diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
index f6c6090d0c57..de1f54252201 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
@@ -1,4 +1,5 @@
 { buildNpmPackage
+, autoPatchelfHook
 }:
 
 { version
@@ -11,7 +12,17 @@ buildNpmPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrol-ui";
 
-  npmDepsHash = "sha256-PpX9lk+yEG1auvBv5JBdMh7rjWoM0oTYJx6Nme5ij8s=";
+  npmDepsHash = "sha256-j+bGOGIG9H/1z0dN8BfvWSi6gPvYmCV7l0ZNH8h3yeU=";
+
+  preBuild = ''
+    autoPatchelf node_modules/sass-embedded-linux-x64/dart-sass/src/dart
+  '';
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+  ];
+
+  dontAutoPatchelf = true;
 
   postBuild = ''
     cp -r dist $out
diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix
index 16e55a8c21f2..27530d613f47 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrold.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix
@@ -15,12 +15,8 @@ rustPlatform.buildRustPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrold";
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "nvml-wrapper-0.10.0" = "sha256-pMiULWT+nJXcDfLDeACG/DaPF5+AbzpoIUWWWz8mQ+0=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-ZAjaegUgNkKygXqskyeUkWpcqi1Jt7pE8GtqWlaP6/I=";
 
   buildInputs = [
     libdrm
@@ -30,7 +26,7 @@ rustPlatform.buildRustPackage {
     # copy the frontend static resources to a directory for embedding
     mkdir -p ui-build
     cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/
-    substituteInPlace build.rs --replace '"./resources/app"' '"./ui-build"'
+    substituteInPlace build.rs --replace-fail '"./resources/app"' '"./ui-build"'
 
     # Hardcode a shell
     substituteInPlace src/repositories/utils.rs \
@@ -40,7 +36,7 @@ rustPlatform.buildRustPackage {
   postInstall = ''
     install -Dm444 "${src}/packaging/systemd/coolercontrold.service" -t "$out/lib/systemd/system"
     substituteInPlace "$out/lib/systemd/system/coolercontrold.service" \
-      --replace '/usr/bin' "$out/bin"
+      --replace-fail '/usr/bin' "$out/bin"
   '';
 
   passthru.tests.version = testers.testVersion {
diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix
index 31feaa5a40dc..9e67f50969b7 100644
--- a/pkgs/applications/system/coolercontrol/default.nix
+++ b/pkgs/applications/system/coolercontrol/default.nix
@@ -4,13 +4,13 @@
 }:
 
 let
-  version = "1.4.0";
+  version = "1.4.4";
 
   src = fetchFromGitLab {
     owner = "coolercontrol";
     repo = "coolercontrol";
     rev = version;
-    hash = "sha256-jsgso9MHt5Szzp9YkuXz8qysdN0li/zD2R/vSZ2Lw5M=";
+    hash = "sha256-9l10X4uDv3KJz582QQMhqh38bwDtQVHm9HdAVNC6Kfg=";
   };
 
   meta = with lib; {

From 029b8c50ea3fc4fa2dc1ce8495c36faf1d7b5578 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 23 Nov 2024 02:52:16 +0100
Subject: [PATCH 09/85] coolercontrol.*: nixfmt, drop meta-wide "with lib"

---
 .../coolercontrol/coolercontrol-gui.nix       | 32 ++++++++++---------
 .../coolercontrol/coolercontrol-liqctld.nix   | 14 ++++----
 .../coolercontrol/coolercontrol-ui-data.nix   | 15 ++++-----
 .../system/coolercontrol/coolercontrold.nix   | 22 ++++++-------
 .../system/coolercontrol/default.nix          | 16 ++++++----
 5 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix
index 5402ebac181b..f6f9c95c0e95 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix
@@ -1,20 +1,22 @@
-{ lib
-, rustPlatform
-, dbus
-, freetype
-, gtk3
-, libsoup_3
-, openssl
-, pkg-config
-, webkitgtk_4_1
-, libappindicator
-, makeWrapper
-, coolercontrol
+{
+  lib,
+  rustPlatform,
+  dbus,
+  freetype,
+  gtk3,
+  libsoup_3,
+  openssl,
+  pkg-config,
+  webkitgtk_4_1,
+  libappindicator,
+  makeWrapper,
+  coolercontrol,
 }:
 
-{ version
-, src
-, meta
+{
+  version,
+  src,
+  meta,
 }:
 
 rustPlatform.buildRustPackage {
diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix b/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix
index 38a929c813e8..2dc770421e9f 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix
@@ -1,9 +1,9 @@
-{ python3
-}:
+{ python3 }:
 
-{ version
-, src
-, meta
+{
+  version,
+  src,
+  meta,
 }:
 
 python3.pkgs.buildPythonApplication {
@@ -12,9 +12,7 @@ python3.pkgs.buildPythonApplication {
   sourceRoot = "${src.name}/coolercontrol-liqctld";
   format = "pyproject";
 
-  nativeBuildInputs = with python3.pkgs; [
-    setuptools
-  ];
+  nativeBuildInputs = with python3.pkgs; [ setuptools ];
 
   propagatedBuildInputs = with python3.pkgs; [
     liquidctl
diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
index de1f54252201..6906769b44ad 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
@@ -1,10 +1,9 @@
-{ buildNpmPackage
-, autoPatchelfHook
-}:
+{ buildNpmPackage, autoPatchelfHook }:
 
-{ version
-, src
-, meta
+{
+  version,
+  src,
+  meta,
 }:
 
 buildNpmPackage {
@@ -18,9 +17,7 @@ buildNpmPackage {
     autoPatchelf node_modules/sass-embedded-linux-x64/dart-sass/src/dart
   '';
 
-  nativeBuildInputs = [
-    autoPatchelfHook
-  ];
+  nativeBuildInputs = [ autoPatchelfHook ];
 
   dontAutoPatchelf = true;
 
diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix
index 27530d613f47..76c42cf30039 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrold.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix
@@ -1,13 +1,15 @@
-{ rustPlatform
-, testers
-, libdrm
-, coolercontrol
-, runtimeShell
+{
+  rustPlatform,
+  testers,
+  libdrm,
+  coolercontrol,
+  runtimeShell,
 }:
 
-{ version
-, src
-, meta
+{
+  version,
+  src,
+  meta,
 }:
 
 rustPlatform.buildRustPackage {
@@ -18,9 +20,7 @@ rustPlatform.buildRustPackage {
   useFetchCargoVendor = true;
   cargoHash = "sha256-ZAjaegUgNkKygXqskyeUkWpcqi1Jt7pE8GtqWlaP6/I=";
 
-  buildInputs = [
-    libdrm
-  ];
+  buildInputs = [ libdrm ];
 
   postPatch = ''
     # copy the frontend static resources to a directory for embedding
diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix
index 9e67f50969b7..89cb7f0e9c37 100644
--- a/pkgs/applications/system/coolercontrol/default.nix
+++ b/pkgs/applications/system/coolercontrol/default.nix
@@ -1,6 +1,7 @@
-{ lib
-, fetchFromGitLab
-, callPackage
+{
+  lib,
+  fetchFromGitLab,
+  callPackage,
 }:
 
 let
@@ -13,12 +14,15 @@ let
     hash = "sha256-9l10X4uDv3KJz582QQMhqh38bwDtQVHm9HdAVNC6Kfg=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Monitor and control your cooling devices";
     homepage = "https://gitlab.com/coolercontrol/coolercontrol";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ codifryed OPNA2608 ];
+    maintainers = with lib.maintainers; [
+      codifryed
+      OPNA2608
+    ];
   };
 
   applySharedDetails = drv: drv { inherit version src meta; };

From 059ac8281d2c088794b41db74072393ac2b0bae5 Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Fri, 22 Nov 2024 21:33:37 +0100
Subject: [PATCH 10/85] icnsutil: include pillow dependency

pillow is neccessary for `icnsutil convert` to work
---
 pkgs/development/python-modules/icnsutil/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/icnsutil/default.nix b/pkgs/development/python-modules/icnsutil/default.nix
index 8061c62feb22..6952aa33397f 100644
--- a/pkgs/development/python-modules/icnsutil/default.nix
+++ b/pkgs/development/python-modules/icnsutil/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   python,
   pythonOlder,
+  pillow,
 }:
 
 buildPythonPackage rec {
@@ -20,6 +21,8 @@ buildPythonPackage rec {
     hash = "sha256-tiq8h6s2noWLBIOIWcj8jfSqJFN01ee2uoHN4aFwn7s=";
   };
 
+  dependencies = [ pillow ];
+
   checkPhase = ''
     ${python.interpreter} tests/test_icnsutil.py
     ${python.interpreter} tests/test_cli.py

From 3b52cd4c1bded09d5a4d9b2dc17ff1736ea89b3d Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Fri, 22 Nov 2024 21:34:28 +0100
Subject: [PATCH 11/85] desktopToDarwinBundle: fix 16x, 32x app icons

Changes the script to produce rgb+mask images for 16x and 32x icons
instead of png.

Using icns files containing 16x and 32x png images for app bundles
results in Finder misrendering icons for these sizes (even though the
icns files are rendered correctly when viewed by themselves)
---
 .../setup-hooks/desktop-to-darwin-bundle.sh    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
index d7cab0e81a60..4fbef4baa512 100644
--- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
+++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
@@ -92,6 +92,7 @@ convertIconTheme() {
 
         echo "desktopToDarwinBundle: resizing icon $in to $out, size $dim" >&2
         magick convert -scale "${dim}x${dim}" -density "$density" -units PixelsPerInch "$in" "$out"
+        convertIfUnsupportedIcon "$out" "$iconSize" "$scale"
     }
 
     function synthesizeIcon() {
@@ -107,11 +108,27 @@ convertIconTheme() {
             echo "desktopToDarwinBundle: rasterizing svg $in to $out, size $dim" >&2
             rsvg-convert --keep-aspect-ratio --width "$dim" --height "$dim" "$in" --output "$out"
             magick convert -density "$density" -units PixelsPerInch "$out" "$out"
+            convertIfUnsupportedIcon "$out" "$iconSize" "$scale"
         else
             return 1
         fi
     }
 
+    # macOS does not correctly display 16x and 32x png icons on app bundles
+    # they need to be converted to rgb+mask (argb is supported only from macOS 11)
+    function convertIfUnsupportedIcon() {
+        local -r in=$1
+        local -r iconSize=$2
+        local -r scale=$3
+        local -r out=${in%.png}.rgb
+
+        if [[ ($scale -eq 1) && ($iconSize -eq 32 || $iconSize -eq 16) ]]; then
+            echo "desktopToDarwinBundle: converting ${iconSize}x icon to rgb" >&2
+            icnsutil convert "$out" "$in"
+            rm "$in"
+        fi
+    }
+
     function getIcons() {
         local -r sharePath=$1
         local -r iconname=$2
@@ -151,6 +168,7 @@ convertIconTheme() {
                     fixed)
                         local density=$((72 * scale))x$((72 * scale))
                         magick convert -density "$density" -units PixelsPerInch "$icon" "$result"
+                        convertIfUnsupportedIcon "$result" "$iconSize" "$scale"
                         foundIcon=OTHER
                         ;;
                     threshold)

From 9a795338a416e9a5074ec12f4fd9d8a871819083 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 24 Nov 2024 12:26:34 +0100
Subject: [PATCH 12/85] rectangle: 0.84 -> 0.85

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

diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix
index 8690439df1d5..937f06e8e6a3 100644
--- a/pkgs/by-name/re/rectangle/package.nix
+++ b/pkgs/by-name/re/rectangle/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "rectangle";
-  version = "0.84";
+  version = "0.85";
 
   src = fetchurl {
     url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg";
-    hash = "sha256-W09un/7gkKvYUQZtkZMJLeuZHpbQLfvfYm20NSK4oBg=";
+    hash = "sha256-TBUC5z2BZMt0eb9NAD3/y9y23iRzs7YRJSfyb3QN1Mc=";
   };
 
   sourceRoot = ".";

From 71f6103e6b8c9f5ca989f9bb016d7053bb4074c6 Mon Sep 17 00:00:00 2001
From: Rowan Goemans <goemansrowan@gmail.com>
Date: Sun, 24 Nov 2024 19:10:35 +0100
Subject: [PATCH 13/85] vscode-extensions.ms-python.python: Add aarch64-linux
 support

---
 .../editors/vscode/extensions/ms-python.python/default.nix       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
index ae836457db1e..c27830e2cac3 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix
@@ -88,6 +88,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
     changelog = "https://github.com/microsoft/vscode-python/releases";
     license = lib.licenses.mit;
     platforms = [
+      "aarch64-linux"
       "x86_64-linux"
       "aarch64-darwin"
       "x86_64-darwin"

From da8eea70a5bc61bb4b979e3e242bfefe4ad2174b Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 25 Nov 2024 17:22:01 +0800
Subject: [PATCH 14/85] taco: nixfmt

---
 pkgs/by-name/ta/taco/package.nix | 34 ++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ta/taco/package.nix b/pkgs/by-name/ta/taco/package.nix
index a2f2f933214c..f78e535e80ec 100644
--- a/pkgs/by-name/ta/taco/package.nix
+++ b/pkgs/by-name/ta/taco/package.nix
@@ -1,15 +1,23 @@
-{ stdenv
-, lib
-, fetchgit
-, cmake
-, llvmPackages
-, enablePython ? false
-, python ? null
+{
+  stdenv,
+  lib,
+  fetchgit,
+  cmake,
+  llvmPackages,
+  enablePython ? false,
+  python ? null,
 }:
 
-let pyEnv = python.withPackages (p: with p; [ numpy scipy ]);
+let
+  pyEnv = python.withPackages (
+    p: with p; [
+      numpy
+      scipy
+    ]
+  );
 
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
   pname = "taco";
   version = "unstable-2022-08-02";
 
@@ -31,7 +39,7 @@ in stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DOPENMP=ON"
-  ] ++ lib.optional enablePython "-DPYTHON=ON" ;
+  ] ++ lib.optional enablePython "-DPYTHON=ON";
 
   postInstall = lib.strings.optionalString enablePython ''
     mkdir -p $out/${python.sitePackages}
@@ -45,11 +53,11 @@ in stdenv.mkDerivation rec {
   # However, the python module works flawlessly.
   dontFixup = enablePython;
 
-  meta = with lib; {
+  meta = {
     description = "Computes sparse tensor expressions on CPUs and GPUs";
     mainProgram = "taco";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://github.com/tensor-compiler/taco";
-    maintainers = [ maintainers.sheepforce ];
+    maintainers = [ lib.maintainers.sheepforce ];
   };
 }

From 31efc3ee347f57ff5363581dedb933d0020faf6d Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 25 Nov 2024 17:25:36 +0800
Subject: [PATCH 15/85] python312Packages.taco: fix build

---
 pkgs/by-name/ta/taco/package.nix | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ta/taco/package.nix b/pkgs/by-name/ta/taco/package.nix
index f78e535e80ec..e80d2b7e3b1b 100644
--- a/pkgs/by-name/ta/taco/package.nix
+++ b/pkgs/by-name/ta/taco/package.nix
@@ -1,11 +1,12 @@
 {
   stdenv,
   lib,
-  fetchgit,
+  fetchFromGitHub,
   cmake,
+  python3,
   llvmPackages,
   enablePython ? false,
-  python ? null,
+  python ? python3,
 }:
 
 let
@@ -13,21 +14,31 @@ let
     p: with p; [
       numpy
       scipy
+      distutils
     ]
   );
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "taco";
   version = "unstable-2022-08-02";
 
-  src = fetchgit {
-    url = "https://github.com/tensor-compiler/${pname}.git";
+  src = fetchFromGitHub {
+    owner = "tensor-compiler";
+    repo = "taco";
     rev = "2b8ece4c230a5f0f0a74bc6f48e28edfb6c1c95e";
     fetchSubmodules = true;
     hash = "sha256-PnBocyRLiLALuVS3Gkt/yJeslCMKyK4zdsBI8BFaTSg=";
   };
 
+  src-new-pybind11 = python.pkgs.pybind11.src;
+
+  postPatch = ''
+    rm -rf python_bindings/pybind11/*
+    cp -r ${finalAttrs.src-new-pybind11}/* python_bindings/pybind11
+    find python_bindings/pybind11 -exec chmod +w {} \;
+  '';
+
   # Remove test cases from cmake build as they violate modern C++ expectations
   patches = [ ./taco.patch ];
 
@@ -60,4 +71,4 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/tensor-compiler/taco";
     maintainers = [ lib.maintainers.sheepforce ];
   };
-}
+})

From 27b3fdf8bd3245a9c47614f559837dab48616120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 25 Nov 2024 14:15:59 +0100
Subject: [PATCH 16/85] python312Packages.mitmproxy-rs: 0.9.2 -> 0.10.7

Changelog: https://github.com/mitmproxy/mitmproxy_rs/blob/v0.10.7/CHANGELOG.md
---
 .../python-modules/mitmproxy-rs/Cargo.lock    | 240 +++++++++++++++---
 .../python-modules/mitmproxy-rs/default.nix   |   4 +-
 2 files changed, 207 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock b/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock
index a558f0e00222..e48a17ae1664 100644
--- a/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock
+++ b/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock
@@ -112,6 +112,18 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
+[[package]]
+name = "async-channel"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "async-stream"
 version = "0.3.5"
@@ -134,6 +146,12 @@ dependencies = [
  "syn 2.0.68",
 ]
 
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
 [[package]]
 name = "async-trait"
 version = "0.1.80"
@@ -284,6 +302,19 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "blocking"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
 [[package]]
 name = "boringtun"
 version = "0.6.0"
@@ -337,6 +368,26 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
+[[package]]
+name = "c2rust-bitfields"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "367e5d1b30f28be590b6b3868da1578361d29d9bfac516d22f497d28ed7c9055"
+dependencies = [
+ "c2rust-bitfields-derive",
+]
+
+[[package]]
+name = "c2rust-bitfields-derive"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a279db9c50c4024eeca1a763b6e0f033848ce74e83e47454bcf8a8a98f7b0b56"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "cast"
 version = "0.3.0"
@@ -508,6 +559,15 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "console-api"
 version = "0.8.0"
@@ -842,6 +902,33 @@ dependencies = [
  "arrayvec",
 ]
 
+[[package]]
+name = "event-listener"
+version = "5.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+
 [[package]]
 name = "fdeflate"
 version = "0.3.4"
@@ -969,6 +1056,16 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
+[[package]]
+name = "futures-lite"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "futures-macro"
 version = "0.3.30"
@@ -1517,6 +1614,16 @@ version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
+[[package]]
+name = "libloading"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+dependencies = [
+ "cfg-if",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@@ -1562,7 +1669,7 @@ checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd"
 
 [[package]]
 name = "macos-certificate-truster"
-version = "0.9.2"
+version = "0.10.7"
 dependencies = [
  "security-framework",
 ]
@@ -1654,7 +1761,7 @@ dependencies = [
 
 [[package]]
 name = "mitm-wg-test-client"
-version = "0.9.2"
+version = "0.10.7"
 dependencies = [
  "anyhow",
  "boringtun",
@@ -1665,7 +1772,7 @@ dependencies = [
 
 [[package]]
 name = "mitmproxy"
-version = "0.9.2"
+version = "0.10.7"
 dependencies = [
  "anyhow",
  "boringtun",
@@ -1696,13 +1803,14 @@ dependencies = [
  "sysinfo",
  "tokio",
  "tokio-util",
+ "tun2",
  "windows 0.57.0",
  "x25519-dalek",
 ]
 
 [[package]]
 name = "mitmproxy_rs"
-version = "0.9.2"
+version = "0.10.7"
 dependencies = [
  "anyhow",
  "boringtun",
@@ -1820,6 +1928,12 @@ version = "6.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
 
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
@@ -1840,7 +1954,7 @@ dependencies = [
  "libc",
  "redox_syscall 0.5.2",
  "smallvec",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1881,6 +1995,17 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
 [[package]]
 name = "plotters"
 version = "0.3.6"
@@ -2822,6 +2947,27 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
+[[package]]
+name = "tun2"
+version = "3.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "294ac0e21fef392b8952f1dd538bc5752fd7c2ebfde1c204b0dd09aaa5489cd0"
+dependencies = [
+ "bytes",
+ "cfg-if",
+ "futures",
+ "futures-core",
+ "ipnet",
+ "libc",
+ "log",
+ "nix 0.29.0",
+ "thiserror",
+ "tokio",
+ "tokio-util",
+ "windows-sys 0.59.0",
+ "wintun-bindings",
+]
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -3071,7 +3217,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
 dependencies = [
  "windows-core",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3083,7 +3229,7 @@ dependencies = [
  "windows-implement",
  "windows-interface",
  "windows-result",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3110,7 +3256,7 @@ dependencies = [
 
 [[package]]
 name = "windows-redirector"
-version = "0.9.2"
+version = "0.10.7"
 dependencies = [
  "anyhow",
  "env_logger",
@@ -3131,7 +3277,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3149,7 +3295,16 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3169,18 +3324,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -3191,9 +3346,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -3203,9 +3358,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -3215,15 +3370,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -3233,9 +3388,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -3245,9 +3400,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -3257,9 +3412,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -3269,9 +3424,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winreg"
@@ -3292,6 +3447,21 @@ dependencies = [
  "toml",
 ]
 
+[[package]]
+name = "wintun-bindings"
+version = "0.7.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74675b7fccee92389d38c3d120445864d1085c421ee91c7ed05d66fb9bb76050"
+dependencies = [
+ "blocking",
+ "c2rust-bitfields",
+ "futures",
+ "libloading",
+ "log",
+ "thiserror",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "x25519-dalek"
 version = "2.0.1"
diff --git a/pkgs/development/python-modules/mitmproxy-rs/default.nix b/pkgs/development/python-modules/mitmproxy-rs/default.nix
index e9c475e390d6..fecb4d9794b4 100644
--- a/pkgs/development/python-modules/mitmproxy-rs/default.nix
+++ b/pkgs/development/python-modules/mitmproxy-rs/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "mitmproxy-rs";
-  version = "0.9.2";
+  version = "0.10.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mitmproxy";
     repo = "mitmproxy_rs";
     rev = "v${version}";
-    hash = "sha256-Cp0AbwRNLuLzmF4EAK/2Fzq5I9Iq7gqg6OLbK1B8fGY=";
+    hash = "sha256-YRiaslXdpRGJfuZAHQ4zX+6DgH+IPkeyD8RA7TYgmBY=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {

From e2418cc2a2830d5ee3b2e485d1b266f95821cb90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 25 Nov 2024 14:46:33 +0100
Subject: [PATCH 17/85] python312Packages.mitmproxy: 11.0.0 -> 11.0.1

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

diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix
index be1d7f8f23fb..622bfb0bc4e0 100644
--- a/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/pkgs/development/python-modules/mitmproxy/default.nix
@@ -45,7 +45,7 @@
 
 buildPythonPackage rec {
   pname = "mitmproxy";
-  version = "11.0.0";
+  version = "11.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     owner = "mitmproxy";
     repo = "mitmproxy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-f5TudaLlHtIMAvS7s5mWgqpdi7/vWNF0EdlYNuG67hM=";
+    hash = "sha256-1yqR82YpHD5Z2Ufa/8T0htjLm2s+fhBN5BfKGHCGnEw=";
   };
 
   pythonRelaxDeps = [
@@ -123,6 +123,7 @@ buildPythonPackage rec {
     "test_statusbar"
     # FileNotFoundError: [Errno 2] No such file or directory
     # likely wireguard is also not working in the sandbox
+    "test_tun_mode"
     "test_wireguard"
     # test require a DNS server
     # RuntimeError: failed to get dns servers: io error: entity not found

From ffc5efd60e05a7cd8f810222fe63e2017fa77a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 25 Nov 2024 15:12:14 +0100
Subject: [PATCH 18/85] python312Packages.fasttext-predict: 0.9.2.2 -> 0.9.2.4

---
 .../python-modules/fasttext-predict/default.nix            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fasttext-predict/default.nix b/pkgs/development/python-modules/fasttext-predict/default.nix
index bdd19640609e..0c9dba55328e 100644
--- a/pkgs/development/python-modules/fasttext-predict/default.nix
+++ b/pkgs/development/python-modules/fasttext-predict/default.nix
@@ -8,12 +8,13 @@
 
 buildPythonPackage rec {
   pname = "fasttext-predict";
-  version = "0.9.2.2";
+  version = "0.9.2.4";
   format = "setuptools";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-rMbf09pCHvVYI9g/aq74+PcsuU2LezpmDz4b/w9vRyc=";
+    pname = "fasttext_predict";
+    inherit version;
+    hash = "sha256-GKb7DXTH35KA2x+Wy3XZkL/QBPqdZpST6j3T1U+E28c=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''

From 222e2c86bd6ee39a8745a198d9757b3ea7ed56b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 25 Nov 2024 15:12:46 +0100
Subject: [PATCH 19/85] searxng: 0-unstable-2024-11-17 -> 0-unstable-2024-11-25

---
 pkgs/by-name/se/searxng/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix
index 39857dd8d7e6..cd77009da8ea 100644
--- a/pkgs/by-name/se/searxng/package.nix
+++ b/pkgs/by-name/se/searxng/package.nix
@@ -8,17 +8,17 @@
 python3.pkgs.toPythonModule (
   python3.pkgs.buildPythonApplication rec {
     pname = "searxng";
-    version = "0-unstable-2024-11-17";
+    version = "0-unstable-2024-11-25";
 
     src = fetchFromGitHub {
       owner = "searxng";
       repo = "searxng";
-      rev = "10d3af84b833ab2f2d1095efa3a7ba240ffb32fc";
-      hash = "sha256-dXALuiPCzK0Az64Fj9ygsNFoPKf0oJ2LyZDeg00Bfyo=";
+      rev = "bad070b4bc2c5afa73edea546c68d3e142a476fc";
+      hash = "sha256-pJl0pD+lx1L7CMKEZaK15ahd96gwWKsR53EVF7RRNtY=";
     };
 
     postPatch = ''
-      sed -i 's/==.*$//' requirements.txt
+      sed -i 's/==/>=/' requirements.txt
     '';
 
     preBuild =
@@ -44,16 +44,17 @@ python3.pkgs.toPythonModule (
       with python3.pkgs;
       [
         babel
+        brotli
         certifi
-        python-dateutil
         fasttext-predict
         flask
         flask-babel
-        brotli
+        isodate
         jinja2
         lxml
         msgspec
         pygments
+        python-dateutil
         pyyaml
         redis
         typer

From 2c4fbc03139fc1f3df74f1b64f9a594d838db093 Mon Sep 17 00:00:00 2001
From: yellowhat <yellowhat46@gmail.com>
Date: Mon, 25 Nov 2024 14:38:02 +0000
Subject: [PATCH 20/85] wl-clipboard-rs: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/by-name/wl/wl-clipboard-rs/package.nix b/pkgs/by-name/wl/wl-clipboard-rs/package.nix
index 2b881a35d256..326774c3ca42 100644
--- a/pkgs/by-name/wl/wl-clipboard-rs/package.nix
+++ b/pkgs/by-name/wl/wl-clipboard-rs/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wl-clipboard-rs";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "YaLTeR";
     repo = "wl-clipboard-rs";
     rev = "v${version}";
-    hash = "sha256-qwlR/PJivCgQTXe027zuQxq0iVJ3/BLg6LAD3w5tb9Y=";
+    hash = "sha256-jGTWcVR6atkEeEUunystJ4B6I3GzYiCOMs0MC6pvPfI=";
   };
 
-  cargoHash = "sha256-C3vhZq5IHtbfg2mYYdQRqaLSA0iSER8zRaKi72FCd+E=";
+  cargoHash = "sha256-P0WLYHNLN8ZqoDRszsgfQTiWeVpfBpFHiEWpQMBjNJM=";
 
   cargoBuildFlags = [
     "--package=wl-clipboard-rs"

From 756c907d41e8d0ee3a8a7828565e10afbfbe6837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 12 Nov 2024 21:18:09 +0100
Subject: [PATCH 21/85] buildFHSEnv: void ldconfig warnings

---
 .../build-fhsenv-bubblewrap/container-init.cc              | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/container-init.cc b/pkgs/build-support/build-fhsenv-bubblewrap/container-init.cc
index 351e92477a08..82c1cb57ed5a 100644
--- a/pkgs/build-support/build-fhsenv-bubblewrap/container-init.cc
+++ b/pkgs/build-support/build-fhsenv-bubblewrap/container-init.cc
@@ -1,5 +1,6 @@
 #include <fstream>
 
+#include <fcntl.h>
 #include <spawn.h>
 #include <string.h>
 #include <unistd.h>
@@ -34,11 +35,15 @@ int main(int, const char *argv[]) {
   pid_t pid;
   const char *ldconfig_argv[] = {"/bin/ldconfig", NULL};
   char *ldconfig_envp[] = {NULL};
-  if ((e = posix_spawn(&pid, ldconfig_argv[0], NULL, NULL,
+  posix_spawn_file_actions_t action;
+  posix_spawn_file_actions_init(&action);
+  posix_spawn_file_actions_addopen (&action, STDERR_FILENO, "/dev/null", O_WRONLY|O_APPEND, 0);
+  if ((e = posix_spawn(&pid, ldconfig_argv[0], &action, NULL,
                        (char *const *)ldconfig_argv, ldconfig_envp))) {
     fprintf(stderr, "Failed to run ldconfig: %s\n", strerror(e));
     return 1;
   }
+  posix_spawn_file_actions_destroy(&action);
 
   int status;
   if (waitpid(pid, &status, 0) == -1) {

From 16001585a370c4a3279e661499d2c934f4dad78d Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 25 Nov 2024 22:19:44 +0100
Subject: [PATCH 22/85] paperlib: fix darwin build

---
 pkgs/by-name/pa/paperlib/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/pa/paperlib/package.nix b/pkgs/by-name/pa/paperlib/package.nix
index d39e35be942b..61c7fca9818d 100644
--- a/pkgs/by-name/pa/paperlib/package.nix
+++ b/pkgs/by-name/pa/paperlib/package.nix
@@ -12,7 +12,7 @@ let
     fetchurl
       {
         x86_64-darwin = {
-          url = "https://github.com/Future-Scholars/peperlib/releases/download/release-electron-${version}/Paperlib_${version}.dmg";
+          url = "https://github.com/Future-Scholars/paperlib/releases/download/release-electron-${version}/Paperlib_${version}.dmg";
           hash = "sha256-d9vEFx59K15PO7DJYJQ2fjiagqa8oJLtoawILDF9IKc=";
         };
         x86_64-linux = {
@@ -49,6 +49,8 @@ if stdenv.hostPlatform.isDarwin then
       passthru
       ;
 
+    sourceRoot = ".";
+
     nativeBuildInputs = [ undmg ];
 
     installPhase = ''

From 89079b37ec19258fb2a8eb2aa6e33e7bd042075c Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 26 Nov 2024 02:33:08 +0000
Subject: [PATCH 23/85] signald: pin to Gradle 8

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

diff --git a/pkgs/by-name/si/signald/package.nix b/pkgs/by-name/si/signald/package.nix
index acadc87d9a3d..47d79cd88b6d 100644
--- a/pkgs/by-name/si/signald/package.nix
+++ b/pkgs/by-name/si/signald/package.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused,
-gradle, git, makeWrapper, jre_minimal
+gradle_8, git, makeWrapper, jre_minimal
 }:
 
 let
@@ -32,6 +32,9 @@ let
     ];
   };
 
+  # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
+  gradle = gradle_8;
+
 in stdenv.mkDerivation {
   inherit pname src version;
 

From b433620b611ec01493cf5fc4d24a1a7d338683db Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 26 Nov 2024 02:35:59 +0000
Subject: [PATCH 24/85] shattered-pixel-dungeon: pin to Gradle 8

---
 pkgs/games/shattered-pixel-dungeon/generic.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/shattered-pixel-dungeon/generic.nix b/pkgs/games/shattered-pixel-dungeon/generic.nix
index 3e81c54bba91..30d7f3f47260 100644
--- a/pkgs/games/shattered-pixel-dungeon/generic.nix
+++ b/pkgs/games/shattered-pixel-dungeon/generic.nix
@@ -10,7 +10,7 @@
 , lib
 , stdenv
 , makeWrapper
-, gradle
+, gradle_8
 , perl
 , jre
 , libGL
@@ -55,6 +55,9 @@ let
 
   depsPath' = if depsPath != null then depsPath else ./. + "/${pname}/deps.json";
 
+  # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
+  gradle = gradle_8;
+
 in stdenv.mkDerivation (cleanAttrs // {
   inherit pname version src patches postPatch;
 

From eddcbd19d3dee329c7a98634f2eac366349468ec Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 26 Nov 2024 02:37:29 +0000
Subject: [PATCH 25/85] pdftk: pin to Gradle 8

---
 pkgs/by-name/pd/pdftk/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pd/pdftk/package.nix b/pkgs/by-name/pd/pdftk/package.nix
index 9ecb87b86ff6..99f25a51877b 100644
--- a/pkgs/by-name/pd/pdftk/package.nix
+++ b/pkgs/by-name/pd/pdftk/package.nix
@@ -1,5 +1,8 @@
-{ lib, stdenv, fetchFromGitLab, gradle, jre, runtimeShell }:
-
+{ lib, stdenv, fetchFromGitLab, gradle_8, jre, runtimeShell }:
+let
+  # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
+  gradle = gradle_8;
+in
 stdenv.mkDerivation rec {
   pname = "pdftk";
   version = "3.3.3";

From 9795412499c2601ce1b73cdc6cdf10d812cb77e0 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 26 Nov 2024 02:38:44 +0000
Subject: [PATCH 26/85] mindustry: pin to Gradle 8

---
 pkgs/by-name/mi/mindustry/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mi/mindustry/package.nix b/pkgs/by-name/mi/mindustry/package.nix
index 998946c8eeb9..ecba7df93d8d 100644
--- a/pkgs/by-name/mi/mindustry/package.nix
+++ b/pkgs/by-name/mi/mindustry/package.nix
@@ -6,7 +6,7 @@
   makeDesktopItem,
   copyDesktopItems,
   fetchFromGitHub,
-  gradle,
+  gradle_8,
   jdk17,
   zenity,
 
@@ -43,6 +43,8 @@ let
   buildVersion = makeBuildVersion version;
 
   jdk = jdk17;
+  # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
+  gradle = gradle_8;
 
   Mindustry = fetchFromGitHub {
     owner = "Anuken";

From c64ddb7d6a375dfc6c093683e79b425c539c6717 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 26 Nov 2024 02:39:36 +0000
Subject: [PATCH 27/85] libeufin: pin to Gradle 8

---
 pkgs/by-name/li/libeufin/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libeufin/package.nix b/pkgs/by-name/li/libeufin/package.nix
index b6ef3d432d92..71717721a894 100644
--- a/pkgs/by-name/li/libeufin/package.nix
+++ b/pkgs/by-name/li/libeufin/package.nix
@@ -4,13 +4,15 @@
   fetchgit,
   python3,
   jdk17_headless,
-  gradle,
+  gradle_8,
   makeWrapper,
   postgresql,
   postgresqlTestHook,
 }:
 let
   customPython = python3.withPackages (p: [ p.setuptools ]);
+  # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
+  gradle = gradle_8;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "libeufin";

From e4be1efabfcc25707a30de9a85d1384ba86f9dfc Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 26 Nov 2024 02:42:08 +0000
Subject: [PATCH 28/85] nextflow: pin to Gradle 8

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

diff --git a/pkgs/by-name/ne/nextflow/package.nix b/pkgs/by-name/ne/nextflow/package.nix
index fca7a4854453..9fe2c20fae55 100644
--- a/pkgs/by-name/ne/nextflow/package.nix
+++ b/pkgs/by-name/ne/nextflow/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   makeWrapper,
   openjdk,
-  gradle,
+  gradle_8,
   wget,
   which,
   gnused,
@@ -14,6 +14,10 @@
   testers,
   nixosTests,
 }:
+let
+  # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
+  gradle = gradle_8;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "nextflow";
   # 24.08.0-edge is compatible with Java 21. The current (as of 2024-09-19)

From 04338e96bb98bc7ee66ed15c42a2a143007af82c Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 26 Nov 2024 02:43:02 +0000
Subject: [PATCH 29/85] mucommander: pin to Gradle 8

---
 pkgs/by-name/mu/mucommander/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/mucommander/package.nix b/pkgs/by-name/mu/mucommander/package.nix
index c97b2605e5b2..5116b5e27641 100644
--- a/pkgs/by-name/mu/mucommander/package.nix
+++ b/pkgs/by-name/mu/mucommander/package.nix
@@ -2,12 +2,15 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  gradle,
+  gradle_8,
   makeWrapper,
   jdk,
   gsettings-desktop-schemas,
 }:
-
+let
+  # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
+  gradle = gradle_8;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mucommander";
   version = "1.5.2-1";

From 33c8fa3a3c89348301165852116b44fbeed76777 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 26 Nov 2024 02:44:25 +0000
Subject: [PATCH 30/85] armitage: pin to Gradle 8

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

diff --git a/pkgs/by-name/ar/armitage/package.nix b/pkgs/by-name/ar/armitage/package.nix
index 0fc8455b4f87..a77d9bb9e08a 100644
--- a/pkgs/by-name/ar/armitage/package.nix
+++ b/pkgs/by-name/ar/armitage/package.nix
@@ -3,7 +3,7 @@
 , fetchurl
 , fetchFromGitHub
 , jdk11
-, gradle
+, gradle_8
 , metasploit
 , makeWrapper
 , makeDesktopItem
@@ -47,6 +47,9 @@ let
     ./gradle-8.patch
   ];
 
+  # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
+  gradle = gradle_8;
+
 in
 stdenv.mkDerivation (finalAttrs: {
   inherit pname version src patches;

From d2b828fbeb1aec6c80b6d04659e3cf224b078e4d Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 26 Nov 2024 02:46:39 +0000
Subject: [PATCH 31/85] atlauncher: pin to Gradle 8

---
 pkgs/by-name/ap/apksigner/package.nix  | 7 +++++--
 pkgs/by-name/at/atlauncher/package.nix | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ap/apksigner/package.nix b/pkgs/by-name/ap/apksigner/package.nix
index 0a918df061a7..f606b43386ca 100644
--- a/pkgs/by-name/ap/apksigner/package.nix
+++ b/pkgs/by-name/ap/apksigner/package.nix
@@ -2,10 +2,13 @@
 , stdenv
 , fetchgit
 , jdk_headless
-, gradle
+, gradle_8
 , makeWrapper
 }:
-
+let
+  # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
+  gradle = gradle_8;
+in
 stdenv.mkDerivation rec {
   pname = "apksigner";
   version = "34.0.5-unstable-2024-03-06";
diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix
index 60da698cd721..436f3711ce20 100644
--- a/pkgs/by-name/at/atlauncher/package.nix
+++ b/pkgs/by-name/at/atlauncher/package.nix
@@ -1,6 +1,6 @@
 {
   fetchFromGitHub,
-  gradle,
+  gradle_8,
   jre,
   lib,
   makeWrapper,
@@ -18,7 +18,10 @@
   udev,
   xorg,
 }:
-
+let
+  # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
+  gradle = gradle_8;
+in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "atlauncher";
   version = "3.4.38.0";

From 9ebedd309118dbc0e69636386a78f5a8f022a26b Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 26 Nov 2024 02:49:42 +0000
Subject: [PATCH 32/85] jadx: pin to Gradle 8

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

diff --git a/pkgs/by-name/ja/jadx/package.nix b/pkgs/by-name/ja/jadx/package.nix
index 07c9a4a6c29b..0fe71e06db65 100644
--- a/pkgs/by-name/ja/jadx/package.nix
+++ b/pkgs/by-name/ja/jadx/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  gradle,
+  gradle_8,
   jdk,
   quark-engine,
   makeBinaryWrapper,
@@ -11,7 +11,10 @@
   copyDesktopItems,
   desktopToDarwinBundle,
 }:
-
+let
+  # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
+  gradle = gradle_8;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "jadx";
   version = "1.5.0";

From 41a7fd4662d3b4a49178e3f3b2c3e88a2ba8fc80 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 16 Nov 2024 17:37:48 +1000
Subject: [PATCH 33/85] hydra: 0-unstable-2024-10-24 -> 0-unstable-2024-11-25

---
 pkgs/by-name/hy/hydra/package.nix | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix
index 937165f66fc6..e78b195c8700 100644
--- a/pkgs/by-name/hy/hydra/package.nix
+++ b/pkgs/by-name/hy/hydra/package.nix
@@ -21,7 +21,6 @@
 , nukeReferences
 , git
 , nlohmann_json
-, docbook_xsl
 , openssh
 , openldap
 , gnused
@@ -35,13 +34,14 @@
 , cdrkit
 , pixz
 , boost
-, autoreconfHook
 , mdbook
 , foreman
 , python3
 , libressl
 , cacert
 , glibcLocales
+, meson
+, ninja
 , fetchFromGitHub
 , nixosTests
 , unstableGitUpdater
@@ -81,6 +81,7 @@ let
         DigestSHA1
         EmailMIME
         EmailSender
+        FileCopyRecursive
         FileLibMagic
         FileSlurper
         FileWhich
@@ -124,15 +125,17 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "hydra";
-  version = "0-unstable-2024-10-24";
+  version = "0-unstable-2024-11-25";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "f974891c76e295240017dd7f04d50ecb4b70284e";
-    hash = "sha256-xVSu4ZNdlOEh2KcloDvhVeiFSYgk22W5fDvQlwn+kbE=";
+    rev = "e75a4cbda86eed897ac853b256c8fd10829bc7e0";
+    hash = "sha256-CCiBM7jV/zLegMizyfRETiYE8XYMEqzPXFAWPwjjMFc=";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [
     unzip
     libpqxx
@@ -177,7 +180,8 @@ stdenv.mkDerivation (finalAttrs: {
   );
 
   nativeBuildInputs = [
-    autoreconfHook
+    meson
+    ninja
     makeWrapper
     pkg-config
     mdbook
@@ -193,10 +197,7 @@ stdenv.mkDerivation (finalAttrs: {
     openldap
   ];
 
-  configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
-
   env = {
-    NIX_CFLAGS_COMPILE = "-pthread";
     OPENLDAP_ROOT = openldap;
   };
 
@@ -205,10 +206,13 @@ stdenv.mkDerivation (finalAttrs: {
     PERL5LIB=$(pwd)/src/lib:$PERL5LIB;
   '';
 
-  enableParallelBuilding = true;
+  mesonBuildType = "release";
+
+  postPatch = ''
+    patchShebangs .
+  '';
 
   preCheck = ''
-    patchShebangs .
     export LOGNAME=''${LOGNAME:-foo}
     # set $HOME for bzr so it can create its trace file
     export HOME=$(mktemp -d)

From cf1bfe275a1a2a66015f21b6e18b8b7c3049752a Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 26 Nov 2024 02:52:08 +0000
Subject: [PATCH 34/85] openjfx23: pin to Gradle 8

---
 pkgs/applications/office/jabref/default.nix | 7 +++++--
 pkgs/by-name/op/openjfx/package.nix         | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index 96ff199f964d..5c7fd7b7de9a 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -8,10 +8,13 @@
 , xdg-utils
 , gtk3
 , jdk
-, gradle
+, gradle_8
 , python3
 }:
-
+let
+  # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
+  gradle = gradle_8;
+in
 stdenv.mkDerivation rec {
   version = "5.13";
   pname = "jabref";
diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix
index b64ce6d32e15..e563214c9b9e 100644
--- a/pkgs/by-name/op/openjfx/package.nix
+++ b/pkgs/by-name/op/openjfx/package.nix
@@ -7,7 +7,7 @@
 
   fetchpatch2,
 
-  gradle,
+  gradle_8,
   gradle_7,
   perl,
   pkg-config,
@@ -57,7 +57,7 @@ let
   atLeast21 = lib.versionAtLeast featureVersion "21";
   atLeast23 = lib.versionAtLeast featureVersion "23";
 
-  gradle_openjfx = if atLeast23 then gradle else gradle_7;
+  gradle_openjfx = if atLeast23 then gradle_8 else gradle_7;
 in
 
 assert lib.assertMsg (lib.pathExists sourceFile)

From 9b37174df0172575b3b037c411bed36fc91eb1f9 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 26 Nov 2024 02:54:02 +0000
Subject: [PATCH 35/85] ghidra: pin to Gradle 8

---
 pkgs/tools/security/ghidra/build.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix
index edda86957f1d..8396db783a02 100644
--- a/pkgs/tools/security/ghidra/build.nix
+++ b/pkgs/tools/security/ghidra/build.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   lib,
   callPackage,
-  gradle,
+  gradle_8,
   makeBinaryWrapper,
   openjdk21,
   unzip,
@@ -73,6 +73,9 @@ let
     HERE
   '';
 
+  # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
+  gradle = gradle_8;
+
 in
 stdenv.mkDerivation (finalAttrs: {
   inherit

From 4852068c580c8008576a35c32134b2b4b18b7eab Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Tue, 26 Nov 2024 03:34:53 +0000
Subject: [PATCH 36/85] python312Packages.scikit-survival: use github src; fix
 build

Pypi source https://pypi.org/project/scikit-survival/) fails to download
tho (scikit_survival) works. Switch to github source.

Build wants an eigen submodule but just needs the include files so
create a symlink to the package

relax deps for scikit-learn and numpy
---
 .../python-modules/scikit-survival/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix
index 85539eabeff6..b60546d8cc84 100644
--- a/pkgs/development/python-modules/scikit-survival/default.nix
+++ b/pkgs/development/python-modules/scikit-survival/default.nix
@@ -2,9 +2,10 @@
   stdenv,
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   cython,
   ecos,
+  eigen,
   joblib,
   numexpr,
   numpy,
@@ -21,9 +22,11 @@ buildPythonPackage rec {
   version = "0.23.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-JFI3SDOK74vQdoUOStYlc4e0VHps97KjV3a1NQSN6E0=";
+  src = fetchFromGitHub {
+    owner = "sebp";
+    repo = "scikit-survival";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/gHfCZH9VjE5UQ8LWoBNd8xCMln4r9Etq/eCx/F8w7A=";
   };
 
   nativeBuildInputs = [
@@ -46,9 +49,12 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  # treat numpy versions as lower bounds, same as setuptools build
+  # can remove scikit-learn after 0.23.1
   postPatch = ''
-    sed -i 's/numpy==/numpy>=/' pyproject.toml
+    ln -s ${lib.getInclude eigen}/include/eigen3/Eigen \
+      sksurv/linear_model/src/eigen
+    sed -i -e 's/numpy>=2.0.0/numpy/' \
+       -e 's/scikit-learn~=1.4.0/scikit-learn/' pyproject.toml
   '';
 
   # Hack needed to make pytest + cython work

From c8e9bfe9e94f3276dc193b2bb3739e47d3dbd20c Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Tue, 26 Nov 2024 03:40:54 +0000
Subject: [PATCH 37/85] python312Packages.scikit-survival: 0.23.0 -> 0.23.1

https://github.com/sebp/scikit-survival/releases/tag/v0.23.1
---
 pkgs/development/python-modules/scikit-survival/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix
index b60546d8cc84..eb7035189644 100644
--- a/pkgs/development/python-modules/scikit-survival/default.nix
+++ b/pkgs/development/python-modules/scikit-survival/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "scikit-survival";
-  version = "0.23.0";
+  version = "0.23.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sebp";
     repo = "scikit-survival";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/gHfCZH9VjE5UQ8LWoBNd8xCMln4r9Etq/eCx/F8w7A=";
+    hash = "sha256-6902chXALa73/kTJ5UwV4CrB7/7wn+QXKpp2ej/Dnk8=";
   };
 
   nativeBuildInputs = [

From 1fb09cba7f56d94e9ce17f46ee343f206e1c96ae Mon Sep 17 00:00:00 2001
From: Thibault Gagnaux <tgagnaux@gmail.com>
Date: Sun, 24 Nov 2024 20:26:11 +0100
Subject: [PATCH 38/85] gdcm: switch to new sdk pattern on darwin

---
 pkgs/development/libraries/gdcm/default.nix | 7 -------
 pkgs/top-level/all-packages.nix             | 1 -
 2 files changed, 8 deletions(-)

diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index ca099da02354..a98b9ff03baa 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -4,10 +4,7 @@
 , cmake
 , enableVTK ? true
 , vtk
-, ApplicationServices
-, Cocoa
 , DarwinTools # sw_vers
-, libiconv
 , enablePython ? false
 , python ? null
 , swig
@@ -60,10 +57,6 @@ stdenv.mkDerivation rec {
     zlib
   ] ++ lib.optionals enableVTK [
     vtk
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    ApplicationServices
-    Cocoa
-    libiconv
   ] ++ lib.optionals enablePython [ swig python ];
 
   postInstall = lib.optionalString enablePython ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7543000e7961..bcd517952515 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9253,7 +9253,6 @@ with pkgs;
 
   gdcm = callPackage ../development/libraries/gdcm {
     inherit (darwin) DarwinTools;
-    inherit (darwin.apple_sdk.frameworks) ApplicationServices Cocoa;
   };
 
   givaro = callPackage ../development/libraries/givaro { };

From 45e940777e0b1d599bfed34d1e2024ce13aba521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 7 Nov 2024 07:28:14 +0100
Subject: [PATCH 39/85] nixVersions.nix_2_19: drop

---
 pkgs/by-name/ni/nix-plugin-pijul/package.nix  | 1 -
 pkgs/tools/package-management/nix/default.nix | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/pkgs/by-name/ni/nix-plugin-pijul/package.nix b/pkgs/by-name/ni/nix-plugin-pijul/package.nix
index 3a4050c7065b..f9089715de31 100644
--- a/pkgs/by-name/ni/nix-plugin-pijul/package.nix
+++ b/pkgs/by-name/ni/nix-plugin-pijul/package.nix
@@ -74,7 +74,6 @@ in stdenv.mkDerivation (finalAttrs: {
     latest = localRepoCheck nixVersions.latest;
     git = localRepoCheck nixVersions.git;
     nix_2_18 = localRepoCheck nixVersions.nix_2_18;
-    nix_2_19 = localRepoCheck nixVersions.nix_2_19;
   };
 
   meta = {
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index c4ed58001ecb..cc4750b785ec 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -179,12 +179,6 @@ in lib.makeExtensible (self: ({
     self_attribute_name = "nix_2_18";
   };
 
-  nix_2_19 = common {
-    version = "2.19.7";
-    hash = "sha256-CkT1SNwRYYQdN2X4cTt1WX3YZfKZFWf7O1YTEo1APfc=";
-    self_attribute_name = "nix_2_19";
-  };
-
   nix_2_24 = common {
     version = "2.24.10";
     hash = "sha256-XdeVy1/d6DEIYb3nOA6JIYF4fwMKNxtwJMgT3pHi+ko=";

From c2c2ac8d2ae2579abbefd52a748d926442dfbc48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 7 Nov 2024 07:28:55 +0100
Subject: [PATCH 40/85] nix: drop unused fetchpatch

---
 pkgs/tools/package-management/nix/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index cc4750b785ec..a1b4ec7debca 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -6,7 +6,6 @@
 , libgit2
 , callPackage
 , fetchFromGitHub
-, fetchpatch
 , fetchpatch2
 , runCommand
 , buildPackages

From 6077aa2a70551e6c0451c65efe076b80020fd548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 25 Nov 2024 16:28:55 +0100
Subject: [PATCH 41/85] nix-inspect: fix build with nix 2.24

---
 pkgs/by-name/ni/nix-inspect/package.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ni/nix-inspect/package.nix b/pkgs/by-name/ni/nix-inspect/package.nix
index ec4a9dee34e2..84253e3a4d08 100644
--- a/pkgs/by-name/ni/nix-inspect/package.nix
+++ b/pkgs/by-name/ni/nix-inspect/package.nix
@@ -9,12 +9,13 @@
   meson,
   ninja,
   stdenv,
+  fetchpatch,
 }: let
   src = fetchFromGitHub {
     owner = "bluskript";
     repo = "nix-inspect";
-    rev = "86f636b1e01579b3a63b2c778c21a818b00c3d1e";
-    hash = "sha256-G5Md4ghux4LBRkPE8vzLTUWxzlQ7s1xKxZ8i3ICWZU8=";
+    rev = "c55921e1d1cf980ff6351273fde6cedd5d8fa320";
+    hash = "sha256-Upz+fnWJjzt5WokjO/iaiPbqiwSrqpWjrpcFOqQ4p0E=";
   };
 
   workerPackage = stdenv.mkDerivation {
@@ -22,14 +23,24 @@
 
     pname = "nix-inspect-worker";
     version = "0.1.2";
-    sourceRoot = "${src.name}/worker";
+    postPatch = ''
+      cd worker
+    '';
 
     nativeBuildInputs = [meson ninja pkg-config];
 
+    # TODO: Remove this patch when this pull request is merged and released: https://github.com/bluskript/nix-inspect/pull/18
+    patches = [
+      (fetchpatch {
+        url = "https://github.com/bluskript/nix-inspect/commit/e1e05883d42ce0c7029a3d69dce14ae9d057aae6.patch";
+        sha256 = "sha256-bHo+sRc9pICK0ccdiWLRNNvr8QjNCrlcwMvmUHznAtg=";
+      })
+    ];
+
     buildInputs = [
       boost
       nlohmann_json
-      nixVersions.nix_2_19.dev
+      nixVersions.nix_2_24.dev
     ];
 
     mesonBuildType = "release";

From e01c3b9ff3ca83f114daf4e6042c227430e893aa Mon Sep 17 00:00:00 2001
From: yellowhat <yellowhat46@gmail.com>
Date: Tue, 26 Nov 2024 10:56:40 +0000
Subject: [PATCH 42/85] wl-clipboard-rs: add man pages and shell completions

---
 pkgs/by-name/wl/wl-clipboard-rs/package.nix | 24 +++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wl/wl-clipboard-rs/package.nix b/pkgs/by-name/wl/wl-clipboard-rs/package.nix
index 326774c3ca42..2483c485be06 100644
--- a/pkgs/by-name/wl/wl-clipboard-rs/package.nix
+++ b/pkgs/by-name/wl/wl-clipboard-rs/package.nix
@@ -1,6 +1,7 @@
 { lib
 , rustPlatform
 , fetchFromGitHub
+, installShellFiles
 , pkg-config
 , wayland
 , withNativeLibs ? false
@@ -26,11 +27,15 @@ rustPlatform.buildRustPackage rec {
     "--features=native_lib"
   ];
 
-  nativeBuildInputs = lib.optionals withNativeLibs [
+  nativeBuildInputs = [
+    installShellFiles
+  ] ++ lib.optionals withNativeLibs [
     pkg-config
   ];
 
-  buildInputs = lib.optionals withNativeLibs [
+  buildInputs = [
+    installShellFiles
+  ]++ lib.optionals withNativeLibs [
     wayland
   ];
 
@@ -47,6 +52,21 @@ rustPlatform.buildRustPackage rec {
     "--skip=tests::copy::copy_test"
   ];
 
+  postInstall = ''
+    installManPage target/man/wl-copy.1
+    installManPage target/man/wl-paste.1
+
+    installShellCompletion --cmd wl-copy \
+      --bash target/completions/wl-copy.bash \
+      --fish target/completions/wl-copy.fish \
+      --zsh target/completions/_wl-copy
+
+    installShellCompletion --cmd wl-paste \
+      --bash target/completions/wl-paste.bash \
+      --fish target/completions/wl-paste.fish \
+      --zsh target/completions/_wl-paste
+  '';
+
   meta = with lib; {
     description = "Command-line copy/paste utilities for Wayland, written in Rust";
     homepage = "https://github.com/YaLTeR/wl-clipboard-rs";

From 460d09233615d3c13bfa400ed99cb90acbc54434 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Tue, 26 Nov 2024 11:48:46 +0000
Subject: [PATCH 43/85] audiobookshelf: 2.17.1 -> 2.17.2

https://github.com/advplyr/audiobookshelf/releases/tag/v2.17.2
https://github.com/advplyr/audiobookshelf/compare/refs/tags/v2.17.1...refs/tags/v2.17.2
---
 pkgs/by-name/au/audiobookshelf/source.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json
index d5035c074743..b5b441db8990 100644
--- a/pkgs/by-name/au/audiobookshelf/source.json
+++ b/pkgs/by-name/au/audiobookshelf/source.json
@@ -1,9 +1,9 @@
 {
   "owner": "advplyr",
   "repo": "audiobookshelf",
-  "rev": "22f85d3af9815f4946eeeb2218d532cf5f543da8",
-  "hash": "sha256-GAHl9QKs6O01wtt5ajSKwkIOc1VdM76cpw2MRdaC17M=",
-  "version": "2.17.1",
-  "depsHash": "sha256-ijFY/sp0P3Ya1076ZfIA8g+3tz0jvXBwKWGGr7Bw2+M=",
-  "clientDepsHash": "sha256-by2LpKAfyyteBywTWiWZFufKerb39Jqzz+zsjl3f/bk="
+  "rev": "f850db23fe37dfe5044c2f5f641931528b291bf2",
+  "hash": "sha256-iboQnPmWIk/bYjEF+opjKU+XJVSD5DGCfqp6BJQRW3w=",
+  "version": "2.17.2",
+  "depsHash": "sha256-W56EG5SCiAcjHhR5WR1UBY9Xt0D0p8duEiUzx+luLfc=",
+  "clientDepsHash": "sha256-gEgd2PCFWqNuRXhnFZylGS0GTMJUD0KeHbRgYxMUMPM="
 }

From 4279574f1fddd1c6610a8ce3aa4b1e1f159547b9 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Tue, 26 Nov 2024 19:51:41 +0800
Subject: [PATCH 44/85] python312Packages.logilab-common: fix build

---
 pkgs/top-level/python-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eaa610cde265..16f5ca53d50b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7587,7 +7587,9 @@ self: super: with self; {
 
   logical-unification = callPackage ../development/python-modules/logical-unification { };
 
-  logilab-common = callPackage ../development/python-modules/logilab/common.nix { };
+  logilab-common = callPackage ../development/python-modules/logilab/common.nix {
+    pytestCheckHook = pytest7CheckHook;
+  };
 
   logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix { };
 

From 77f1e99598812378c163dca58fd7aa65f4904296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 26 Nov 2024 13:46:46 +0100
Subject: [PATCH 45/85] golangci-lint: 1.62.0 -> 1.62.2

Diff: https://github.com/golangci/golangci-lint/compare/v1.62.0...v1.62.2

Changelog: https://github.com/golangci/golangci-lint/blob/v1.62.2/CHANGELOG.md
---
 pkgs/by-name/go/golangci-lint/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix
index 993f1562e1de..4ae2f37d757a 100644
--- a/pkgs/by-name/go/golangci-lint/package.nix
+++ b/pkgs/by-name/go/golangci-lint/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "golangci-lint";
-  version = "1.62.0";
+  version = "1.62.2";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     rev = "v${version}";
-    hash = "sha256-9CT9+8wBjXflIYPtqTTMKaPySpDYGa0yUAhApcLIQ1k=";
+    hash = "sha256-8Itq4tWqJa9agGcPoQaJoQOgy/qhhegzPORDztS9T30=";
   };
 
-  vendorHash = "sha256-U79OfGm5EPuB8yTxLSLQKIBHuj/zzO4p5pXlvs+pVrU=";
+  vendorHash = "sha256-SEoF+k7MYYq81v9m3eaDbIv1k9Hek5iAZ0TTJEgAsI4=";
 
   subPackages = [ "cmd/golangci-lint" ];
 

From 96f812b50a8ff09b6ae7749fd336e4c24b2e99d0 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Tue, 26 Nov 2024 15:20:24 +0100
Subject: [PATCH 46/85] uwsm: 0.20.4 -> 0.20.5

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

diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index fa671e540eca..aaab50c54dff 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -28,13 +28,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "uwsm";
-  version = "0.20.4";
+  version = "0.20.5";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "uwsm";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-cvIkjDtGEEYCGFFfN7HhOFzUajLcDgt8CWqFyuJlvK4=";
+    hash = "sha256-RHxA0X3cqHtp4NZl7qlqBYkqOJay8IPoaj12bdouVkc=";
   };
 
   nativeBuildInputs = [

From 8f1334f790fcb5ab0e23839828cb06cf5ecb1419 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 25 Nov 2024 16:00:56 +0800
Subject: [PATCH 47/85] horizon-eda: nixfmt

---
 pkgs/by-name/ho/horizon-eda/base.nix    | 48 +++++++++++++------------
 pkgs/by-name/ho/horizon-eda/package.nix | 23 +++++++-----
 2 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix
index d39fc83823a2..4e504a0027b8 100644
--- a/pkgs/by-name/ho/horizon-eda/base.nix
+++ b/pkgs/by-name/ho/horizon-eda/base.nix
@@ -1,21 +1,22 @@
-{ lib
-, cmake
-, cppzmq
-, curl
-, fetchFromGitHub
-, glm
-, gtkmm3
-, libarchive
-, libepoxy
-, libgit2
-, librsvg
-, libuuid
-, meson
-, ninja
-, opencascade-occt_7_6
-, pkg-config
-, podofo
-, sqlite
+{
+  lib,
+  cmake,
+  cppzmq,
+  curl,
+  fetchFromGitHub,
+  glm,
+  gtkmm3,
+  libarchive,
+  libepoxy,
+  libgit2,
+  librsvg,
+  libuuid,
+  meson,
+  ninja,
+  opencascade-occt_7_6,
+  pkg-config,
+  podofo,
+  sqlite,
 }:
 let
   opencascade-occt = opencascade-occt_7_6;
@@ -56,11 +57,14 @@ rec {
 
   CASROOT = opencascade-occt;
 
-  meta = with lib; {
+  meta = {
     description = "Free EDA software to develop printed circuit boards";
     homepage = "https://horizon-eda.org";
-    maintainers = with maintainers; [ guserav jue89 ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [
+      guserav
+      jue89
+    ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ho/horizon-eda/package.nix b/pkgs/by-name/ho/horizon-eda/package.nix
index 40a91937f07f..92ebc186e8fa 100644
--- a/pkgs/by-name/ho/horizon-eda/package.nix
+++ b/pkgs/by-name/ho/horizon-eda/package.nix
@@ -1,17 +1,24 @@
-{ stdenv
-, boost
-, callPackage
-, coreutils
-, libspnav
-, python3
-, wrapGAppsHook3
+{
+  stdenv,
+  boost,
+  callPackage,
+  coreutils,
+  libspnav,
+  python3,
+  wrapGAppsHook3,
 }:
 
 let
   base = callPackage ./base.nix { };
 in
 stdenv.mkDerivation rec {
-  inherit (base) pname version src meta CASROOT;
+  inherit (base)
+    pname
+    version
+    src
+    meta
+    CASROOT
+    ;
 
   # provide base for python module
   passthru = {

From ab380b8d228f71bc17337a74976e5b37ab296676 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 25 Nov 2024 16:03:24 +0800
Subject: [PATCH 48/85] horizon-eda: fix build

---
 pkgs/by-name/ho/horizon-eda/base.nix    | 6 ++++++
 pkgs/by-name/ho/horizon-eda/package.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/pkgs/by-name/ho/horizon-eda/base.nix b/pkgs/by-name/ho/horizon-eda/base.nix
index 4e504a0027b8..31c980998aa4 100644
--- a/pkgs/by-name/ho/horizon-eda/base.nix
+++ b/pkgs/by-name/ho/horizon-eda/base.nix
@@ -55,6 +55,12 @@ rec {
     sqlite
   ];
 
+  env = {
+    NIX_CFLAGS_COMPILE = toString [
+      "-fpermissive"
+    ];
+  };
+
   CASROOT = opencascade-occt;
 
   meta = {
diff --git a/pkgs/by-name/ho/horizon-eda/package.nix b/pkgs/by-name/ho/horizon-eda/package.nix
index 92ebc186e8fa..069adb345593 100644
--- a/pkgs/by-name/ho/horizon-eda/package.nix
+++ b/pkgs/by-name/ho/horizon-eda/package.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
     src
     meta
     CASROOT
+    env
     ;
 
   # provide base for python module

From 16ab44ae2f6cfdceec9dd00138ca0cca46280f3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Tue, 26 Nov 2024 19:58:20 +0100
Subject: [PATCH 49/85] tor-browser: 14.0.2 -> 14.0.3

https://blog.torproject.org/new-release-tor-browser-1403/
---
 pkgs/by-name/to/tor-browser/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index bff9d6133ece..6c4c6470865b 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -102,7 +102,7 @@ lib.warnIf (useHardenedMalloc != null)
       ++ lib.optionals mediaSupport [ ffmpeg ]
   );
 
-  version = "14.0.2";
+  version = "14.0.3";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -112,7 +112,7 @@ lib.warnIf (useHardenedMalloc != null)
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-dHyCHIM5obNH4evDP2yekFfhJ8J0OGSnCEOlV3ldC5o=";
+      hash = "sha256-WddDs5lQFZde8Qy/7nQhGTrrT9BiVswriqOpPVpgvwY=";
     };
 
     i686-linux = fetchurl {
@@ -122,7 +122,7 @@ lib.warnIf (useHardenedMalloc != null)
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
       ];
-      hash = "sha256-iXrQniSu+eJ5Uyb85qeO7gqa+Qg2cM2Dj1ur8YIBzCc=";
+      hash = "sha256-DsTJiZkw0g4ip/yAwQ9IomZHQ6RP0hFNEzVJ8/fEbyQ=";
     };
   };
 

From 8928e8d4a82c9e9bdf353dd4dd1b407f5f8e3262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Tue, 26 Nov 2024 19:59:44 +0100
Subject: [PATCH 50/85] mullvad-browser: 14.0 -> 14.0.3

https://github.com/mullvad/mullvad-browser/releases/tag/14.0.3
---
 pkgs/by-name/mu/mullvad-browser/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index 9f46d11f6a43..f71782ea36b5 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -91,7 +91,7 @@ let
       ++ lib.optionals mediaSupport [ ffmpeg ]
   );
 
-  version = "14.0";
+  version = "14.0.3";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -103,7 +103,7 @@ let
         "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-D5r1VsbjaswGm5ncgdSIOJFfDMXBZX2JDGcTTRVkoVs=";
+      hash = "sha256-Kv69Q6o/Ww64yA8y5J3JXIV48A2B08YhNE9ib/UuA0o=";
     };
   };
 

From b5168a9900ec8943ad9a7778bd2935f69f17703b Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 26 Nov 2024 21:18:21 +0200
Subject: [PATCH 51/85] nixos/iso-image: fix `isoImage.grubTheme = null;`

Fixes `error: cannot coerce null to a string`
---
 nixos/modules/installer/cd-dvd/iso-image.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 63abf88cab09..cf2cdb8eecef 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -335,12 +335,14 @@ let
       set textmode=true
       terminal_output console
     }
+
+    ${lib.optionalString (config.isoImage.grubTheme != null) ''
     hiddenentry 'GUI mode' --hotkey 'g' {
       $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (\$root)/EFI/BOOT/grub-theme/%P\n")
       set textmode=false
       terminal_output gfxterm
     }
-
+    ''}
 
     # If the parameter iso_path is set, append the findiso parameter to the kernel
     # line. We need this to allow the nixos iso to be booted from grub directly.

From 704c9941fdf1a98e9835675e7dc878e886d0d958 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 20:26:34 +0100
Subject: [PATCH 52/85] python312Packages.archinfo: 9.2.129 -> 9.2.130

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

diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index bb77a93a14ca..40e03f08d7c3 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.2.129";
+  version = "9.2.130";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "archinfo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-s0EaGaSLQ3lLUKOZKU1wTLs7apYXvYwXbgCs48UO6EE=";
+    hash = "sha256-r03eMpHfqRGvaDN5dRkfuGG6RWgHmTlyygby6BSzxIY=";
   };
 
   build-system = [ setuptools ];

From e4ae7ade5d41c2da7a7a23fdcaa13aff288f0515 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 20:26:41 +0100
Subject: [PATCH 53/85] python312Packages.ailment: 9.2.129 -> 9.2.130

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

diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index 742e7a3da6bb..844641dc76e0 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "ailment";
-  version = "9.2.129";
+  version = "9.2.130";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "ailment";
     rev = "refs/tags/v${version}";
-    hash = "sha256-xxrqr5zh6n3A7YTxf7K1x3iLsCh8s0l/4esdoTtoIbQ=";
+    hash = "sha256-/tupBPwZqsJ1+TNIdOVT49uOFSqWqF2nWzZJaHAJXNw=";
   };
 
   build-system = [ setuptools ];

From 594cc1316faafbf49bb787bd2bf8a1896044a11a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 20:28:02 +0100
Subject: [PATCH 54/85] python312Packages.pyvex: 9.2.129 -> 9.2.130

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

diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 5f9701230544..933ff36910e8 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.2.129";
+  version = "9.2.130";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-xEq3W9f38yHf9hZiYpjcP89/5/mH85XRKW5nDotz4KY=";
+    hash = "sha256-U4AykjdxiT9tg9krxEcoNwSAvMNisyYaTLiOCTGoSOY=";
   };
 
   build-system = [ setuptools ];

From e546ce88d14645a60b5965ade0c9eeb38275c622 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 20:28:17 +0100
Subject: [PATCH 55/85] python312Packages.claripy: 9.2.129 -> 9.2.130

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

diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index b17a8d0872be..0ff10a54dd06 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "claripy";
-  version = "9.2.129";
+  version = "9.2.130";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "claripy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-q4TFOjJs3mybn5y4W3B3pSC5l+6co8PXCOEEk8+wP3M=";
+    hash = "sha256-WtT4jdL512ad/hUb8uMxAqihDH/YFxsnYumNFWWGkQM=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail

From 7f4db643bc153aa1d85c819d7221cac4844c899e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 20:29:37 +0100
Subject: [PATCH 56/85] python312Packages.cle: 9.2.129 -> 9.2.130

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

diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index 274a3d19b3c9..2e18ddd43950 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -16,14 +16,14 @@
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.2.129";
+  version = "9.2.130";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
     owner = "angr";
     repo = "binaries";
     rev = "refs/tags/v${version}";
-    hash = "sha256-LP29VvCImJ3jbNrqwBYi829EO75jximrQkR9aj/gNPM=";
+    hash = "sha256-kgi7K8zxICIwtk9MKB2qHXf/7u2RbXx6hYC89lem/3I=";
   };
 in
 buildPythonPackage rec {
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "cle";
     rev = "refs/tags/v${version}";
-    hash = "sha256-0CQVnnzK7eeQNCLuUDPibWCkeKp3QEpxfQ+lT1SoMLA=";
+    hash = "sha256-mxSTXgE4O4YpjFWKIpeSi43+j5xEgYwuRHVzqI34Izg=";
   };
 
   build-system = [ setuptools ];

From 6a33974913d9012c8aabed8f2fe55438b3882ba0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 20:33:23 +0100
Subject: [PATCH 57/85] python311Packages.angr: 9.2.129 -> 9.2.130

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

diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index 5cc6f66d2e6c..44ca8961c9e5 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -36,7 +36,7 @@
 
 buildPythonPackage rec {
   pname = "angr";
-  version = "9.2.129";
+  version = "9.2.130";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "angr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-GO8Vk/L1swhQsGfH/Ugi5i9MwWbaco/f1ukqJ2+R6IA=";
+    hash = "sha256-XPiHRFt0peGyi5g5+fBVxg1jp/UXTetGIwAilgCM+Ow=";
   };
 
   postPatch = ''

From c5a95b52a3fb8cbad1af4e703cd38d1a750e4f0a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 20:43:34 +0100
Subject: [PATCH 58/85] python312Packages.githubkit: 0.11.14 -> 0.12.0

Diff: https://github.com/yanyongyu/githubkit/compare/refs/tags/v0.11.14...v0.12.0

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

diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix
index 7a0fae0991f9..2f852c19d020 100644
--- a/pkgs/development/python-modules/githubkit/default.nix
+++ b/pkgs/development/python-modules/githubkit/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "githubkit";
-  version = "0.11.14";
+  version = "0.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "yanyongyu";
     repo = "githubkit";
     rev = "refs/tags/v${version}";
-    hash = "sha256-nZzsBxPRmqHTaYVogWsdaGbzwBsVr08qcvAekk3O4FM=";
+    hash = "sha256-GejPudg3tc0r7jKKGgZ6zERzH8wT3utGb05pfW1lQyw=";
   };
 
   pythonRelaxDeps = [ "hishel" ];

From 1da6760927db35becda8d7ea1450c4c8df980444 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 20:44:50 +0100
Subject: [PATCH 59/85] python312Packages.githubkit: update disabled

---
 pkgs/development/python-modules/githubkit/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix
index 2f852c19d020..965e5731c535 100644
--- a/pkgs/development/python-modules/githubkit/default.nix
+++ b/pkgs/development/python-modules/githubkit/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   version = "0.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "yanyongyu";
@@ -33,7 +33,6 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
-
   dependencies = [
     hishel
     httpx

From 00b2dcce8394de57bac90623c9fac13d274fb7ae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 21:11:40 +0100
Subject: [PATCH 60/85] python312Packages.libtmux: 0.37.0 -> 0.39.0

Diff: https://github.com/tmux-python/libtmux/compare/refs/tags/v0.37.0...v0.39.0

Changelog: https://github.com/tmux-python/libtmux/raw/v0.39.0/CHANGES
---
 pkgs/development/python-modules/libtmux/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 917b20ef077f..24e7e7572806 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -3,8 +3,8 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  hatchling,
   ncurses,
-  poetry-core,
   procps,
   pytest-rerunfailures,
   pytestCheckHook,
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "libtmux";
-  version = "0.37.0";
+  version = "0.39.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tmux-python";
     repo = "libtmux";
     rev = "refs/tags/v${version}";
-    hash = "sha256-I0E6zkfQ6mx2svCaXEgKPhrrog3iLgXZ4E3CMMxPkIA=";
+    hash = "sha256-JqOxJD34DL5Iku3Ov8JzwSVThqDg41PQ/v1Dz6ex4ro=";
   };
 
   postPatch = ''
@@ -28,7 +28,7 @@ buildPythonPackage rec {
       --replace-fail '"--doctest-docutils-modules",' ""
   '';
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   nativeCheckInputs = [
     procps

From 5f59342d1aec74415ffebde2e35bdc672be41186 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 21:13:35 +0100
Subject: [PATCH 61/85] python312Packages.google-cloud-secret-manager: 2.21.0
 -> 2.21.1

Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-secret-manager-v2.21.1/packages/google-cloud-secret-manager/CHANGELOG.md
---
 .../python-modules/google-cloud-secret-manager/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
index 86f2378b0929..6a8ad2149346 100644
--- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-secret-manager";
-  version = "2.21.0";
+  version = "2.21.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_secret_manager";
     inherit version;
-    hash = "sha256-0a6E7PmM/DGcmj8QEjVc69GTF7ZizJ3/Giw2I0WAgHs=";
+    hash = "sha256-8QTwAnUTRcujkVLO867T9Dde3wslQsi9G3cS1E/pdbY=";
   };
 
   build-system = [ setuptools ];

From b62dde8f71bcfc3e85a0ef6f5c71973f9e1a5af0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 21:14:10 +0100
Subject: [PATCH 62/85] python312Packages.google-cloud-websecurityscanner:
 1.15.0 -> 1.15.1

Changelog: https://github.com/googleapis/google-cloud-python/tree/google-cloud-websecurityscanner-v1.15.1/packages/google-cloud-websecurityscanner
---
 .../google-cloud-websecurityscanner/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index 63ae6795e081..0070d297c9e8 100644
--- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-websecurityscanner";
-  version = "1.15.0";
+  version = "1.15.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_websecurityscanner";
     inherit version;
-    hash = "sha256-6D3OcAe5KUqExfvJHL7LJv8rPn4XUyyqhoB+fJXVwCo=";
+    hash = "sha256-5bI/9HYPDLPDbVArwuHP29BIwLDdOSEeQRVjs5Q4Uig=";
   };
 
   build-system = [ setuptools ];

From 75d7e973495b3e3e739fb408be82ac04be08ad85 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 21:15:13 +0100
Subject: [PATCH 63/85] python312Packages.google-cloud-securitycenter: 1.35.0
 -> 1.35.1

Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-securitycenter-v1.35.1/packages/google-cloud-securitycenter/CHANGELOG.md
---
 .../python-modules/google-cloud-securitycenter/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
index c70c830aaae6..4c81865ed897 100644
--- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
+++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-securitycenter";
-  version = "1.35.0";
+  version = "1.35.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_securitycenter";
     inherit version;
-    hash = "sha256-hTOh2RpiRls+nrcEcOewZ0EvGoljBj5tm3iGLbnP7do=";
+    hash = "sha256-V9IRsInFIEuaNJKoCnl+PcFQHOCN1z6FPnD3113omx0=";
   };
 
   build-system = [ setuptools ];

From 73ff1cbe89521f0c4bd13e7313a867f3e08f84b8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 21:21:11 +0100
Subject: [PATCH 64/85] tmuxp: 1.47.0 -> 1.49.0

Changelog: https://github.com/tmux-python/tmuxp/raw/v1.49.0/CHANGES
---
 pkgs/by-name/tm/tmuxp/package.nix | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/tm/tmuxp/package.nix b/pkgs/by-name/tm/tmuxp/package.nix
index 6964cb5ace4e..07d32d620870 100644
--- a/pkgs/by-name/tm/tmuxp/package.nix
+++ b/pkgs/by-name/tm/tmuxp/package.nix
@@ -1,25 +1,28 @@
-{ lib, python3Packages, fetchPypi, installShellFiles }:
+{
+  lib,
+  fetchPypi,
+  installShellFiles,
+  python3Packages,
+}:
 
-let
+python3Packages.buildPythonApplication rec {
   pname = "tmuxp";
-  version = "1.47.0";
-  hash = "sha256-HYY6CEUPpZVvVK9kV4Ehw4wGk5YfIVSkZ0+qqf6Nz4c=";
-in
-python3Packages.buildPythonApplication {
-  inherit pname version;
+  version = "1.49.0";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version hash;
+    inherit pname version;
+    hash = "sha256-Fip2HnwIa03khiYlL5FkhVo84oS0OSD9f79bEFLBoNc=";
   };
 
-  nativeBuildInputs = [
-    python3Packages.poetry-core
-    python3Packages.shtab
-    installShellFiles
+  build-system = with python3Packages; [
+    hatchling
+    shtab
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  nativeBuildInputs = [ installShellFiles ];
+
+  dependencies = with python3Packages; [
     colorama
     libtmux
     pyyaml

From e51a9df08a2077d92deb71e8c63f987d2380851a Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Tue, 26 Nov 2024 21:00:18 +0100
Subject: [PATCH 65/85] treewide: use dpkg setup hook

---
 .../audio/bitwig-studio/bitwig-studio3.nix            |  5 -----
 .../audio/bitwig-studio/bitwig-studio4.nix            |  5 -----
 .../audio/bitwig-studio/bitwig-studio5.nix            |  6 +-----
 pkgs/applications/editors/standardnotes/default.nix   |  2 --
 .../graphics/odafileconverter/default.nix             |  9 ++-------
 pkgs/applications/misc/parsec/bin.nix                 |  8 --------
 pkgs/applications/misc/pdfstudio/common.nix           |  1 -
 pkgs/applications/misc/rescuetime/default.nix         |  6 +-----
 .../networking/breitbandmessung/default.nix           |  2 --
 .../networking/instant-messengers/franz/generic.nix   |  2 --
 pkgs/applications/networking/mullvad-vpn/default.nix  |  2 --
 pkgs/applications/office/morgen/default.nix           |  5 +----
 pkgs/by-name/al/alfaview/package.nix                  |  4 ----
 pkgs/by-name/bd/bdf2psf/package.nix                   |  6 ------
 pkgs/by-name/bl/bluemail/package.nix                  |  2 --
 pkgs/by-name/br/brave/make-brave.nix                  |  6 ------
 pkgs/by-name/cu/cups-brother-hll2375dw/package.nix    |  2 --
 pkgs/by-name/ff/fflinuxprint/package.nix              |  3 ---
 pkgs/by-name/ga/gamepad-tool/package.nix              |  5 -----
 pkgs/by-name/he/headset/package.nix                   |  2 --
 pkgs/by-name/ho/holochain-launcher/package.nix        |  2 --
 pkgs/by-name/hy/hyper/package.nix                     |  6 ------
 pkgs/by-name/id/ideamaker/package.nix                 |  6 ------
 pkgs/by-name/in/insync-emblem-icons/package.nix       |  8 --------
 pkgs/by-name/in/insync/package.nix                    |  8 --------
 pkgs/by-name/ip/ipscan/package.nix                    |  8 ++++----
 pkgs/by-name/ji/jigasi/package.nix                    |  2 --
 pkgs/by-name/ke/keeweb/package.nix                    |  5 +----
 pkgs/by-name/ko/koreader/package.nix                  |  2 --
 pkgs/by-name/li/lightworks/package.nix                |  8 ++++----
 pkgs/by-name/lu/lunacy/package.nix                    |  5 -----
 pkgs/by-name/mo/molly-guard/package.nix               |  6 +-----
 pkgs/by-name/on/onlyoffice-desktopeditors/package.nix |  4 ----
 pkgs/by-name/op/opera/package.nix                     |  2 --
 pkgs/by-name/pi/picoscope/package.nix                 |  7 +------
 pkgs/by-name/pi/pixeluvo/package.nix                  |  4 ----
 pkgs/by-name/po/polar-bookshelf/package.nix           |  2 --
 pkgs/by-name/po/polar-bookshelf1/package.nix          |  4 ----
 pkgs/by-name/po/positron-bin/package.nix              |  4 +---
 pkgs/by-name/sp/spacedrive/package.nix                |  8 --------
 pkgs/by-name/ss/sslmate-agent/package.nix             |  4 ----
 pkgs/by-name/st/staruml/package.nix                   |  6 ------
 pkgs/by-name/te/terra-station/package.nix             |  6 +-----
 pkgs/by-name/th/thedesk/package.nix                   |  4 ----
 pkgs/by-name/ti/tidal-hifi/package.nix                |  2 --
 pkgs/by-name/un/unifi/package.nix                     |  6 ------
 pkgs/by-name/up/upwork/package.nix                    |  4 ----
 pkgs/by-name/wi/wire-desktop/package.nix              |  8 --------
 pkgs/by-name/wk/wkhtmltopdf/package.nix               | 11 +----------
 pkgs/by-name/wo/wonderdraft/package.nix               |  6 ++++--
 pkgs/by-name/ye/yesplaymusic/package.nix              |  5 +----
 pkgs/misc/jitsi-meet-prosody/default.nix              |  4 ++--
 pkgs/servers/jicofo/default.nix                       |  2 +-
 pkgs/servers/jitsi-videobridge/default.nix            |  7 ++++---
 pkgs/servers/plex/raw.nix                             |  4 ----
 55 files changed, 31 insertions(+), 232 deletions(-)

diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
index e1bb11e8eabe..4d5e5dbc2659 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
@@ -15,11 +15,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
 
-  unpackCmd = ''
-    mkdir -p root
-    dpkg-deb -x $curSrc root
-  '';
-
   dontBuild = true;
   dontWrapGApps = true; # we only want $gappsWrapperArgs here
 
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
index 1c94371b2b48..47b2fbbeb968 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
@@ -33,11 +33,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
 
-  unpackCmd = ''
-    mkdir -p root
-    dpkg-deb -x $curSrc root
-  '';
-
   dontBuild = true;
   dontWrapGApps = true; # we only want $gappsWrapperArgs here
 
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
index eeb2fffe8f38..5e189db20f0c 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
@@ -32,17 +32,13 @@ stdenv.mkDerivation rec {
   version = "5.2.5";
 
   src = fetchurl {
+    name = "bitwig-studio-${version}.deb";
     url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";
     hash = "sha256-x6Uw6o+a3nArMm1Ev5ytGtLDGQ3r872WqlC022zT8Hk=";
   };
 
   nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
 
-  unpackCmd = ''
-    mkdir -p root
-    dpkg-deb -x $curSrc root
-  '';
-
   dontBuild = true;
   dontWrapGApps = true; # we only want $gappsWrapperArgs here
 
diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix
index ff52167dd344..f7cd2872a227 100644
--- a/pkgs/applications/editors/standardnotes/default.nix
+++ b/pkgs/applications/editors/standardnotes/default.nix
@@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper dpkg desktop-file-utils asar ];
 
-  unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
-
   installPhase = let
     libPath = lib.makeLibraryPath [
       libsecret
diff --git a/pkgs/applications/graphics/odafileconverter/default.nix b/pkgs/applications/graphics/odafileconverter/default.nix
index ba1d5bdce073..acc00b4fa0bd 100644
--- a/pkgs/applications/graphics/odafileconverter/default.nix
+++ b/pkgs/applications/graphics/odafileconverter/default.nix
@@ -18,15 +18,10 @@ in mkDerivation {
     sha256 = "10027a3ab18efd04ca75aa699ff550eca3bdfe6f7084460d3c00001bffb50070";
   };
 
-  unpackPhase = ''
-    dpkg -x $src oda_unpacked
-    sourceRoot=$PWD/oda_unpacked
-  '';
-
   installPhase = ''
     mkdir -p $out/bin $out/lib
-    cp -vr $sourceRoot/usr/bin/ODAFileConverter_${version} $out/libexec
-    cp -vr $sourceRoot/usr/share $out/share
+    cp -vr usr/bin/ODAFileConverter_${version} $out/libexec
+    cp -vr usr/share $out/share
   '';
 
   dontWrapQtApps = true;
diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix
index f85e6acbd1f0..b94c65c08125 100644
--- a/pkgs/applications/misc/parsec/bin.nix
+++ b/pkgs/applications/misc/parsec/bin.nix
@@ -33,14 +33,6 @@ stdenvNoCC.mkDerivation {
     sha256 = "sha256-9F56u+jYj2CClhbnGlLi65FxS1Vq00coxwu7mjVTY1w=";
   };
 
-  unpackPhase = ''
-    runHook preUnpack
-
-    dpkg-deb -x $src .
-
-    runHook postUnpack
-  '';
-
   nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper ];
 
   buildInputs = [
diff --git a/pkgs/applications/misc/pdfstudio/common.nix b/pkgs/applications/misc/pdfstudio/common.nix
index 1fc5ffaf2e66..8edb816977c6 100644
--- a/pkgs/applications/misc/pdfstudio/common.nix
+++ b/pkgs/applications/misc/pdfstudio/common.nix
@@ -46,7 +46,6 @@ let
       })
     ];
 
-    unpackCmd = "dpkg-deb -x $src ./${program}-${version}";
     dontBuild = true;
 
     postPatch = ''
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index 41988c282957..fa1cfe4afb62 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -20,11 +20,7 @@ in mkDerivation rec {
   nativeBuildInputs = [ dpkg ];
   # avoid https://github.com/NixOS/patchelf/issues/99
   dontStrip = true;
-  unpackPhase = ''
-    mkdir pkg
-    dpkg-deb -x $src pkg
-    sourceRoot=pkg
-  '';
+
   installPhase = ''
     mkdir -p $out/bin
     cp usr/bin/rescuetime $out/bin
diff --git a/pkgs/applications/networking/breitbandmessung/default.nix b/pkgs/applications/networking/breitbandmessung/default.nix
index 9a6cc8a4f739..6bcd3c662e86 100644
--- a/pkgs/applications/networking/breitbandmessung/default.nix
+++ b/pkgs/applications/networking/breitbandmessung/default.nix
@@ -24,8 +24,6 @@ let
         makeWrapper
       ];
 
-      unpackPhase = "dpkg-deb -x $src .";
-
       installPhase = ''
         mkdir -p $out/bin
         mv usr/share $out/share
diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix
index 5009ab5af0df..397f24b12965 100644
--- a/pkgs/applications/networking/instant-messengers/franz/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix
@@ -71,8 +71,6 @@ in stdenv.mkDerivation (rec {
   ];
   runtimeDependencies = [ libglvnd (lib.getLib stdenv.cc.cc) (lib.getLib udev) libnotify libappindicator-gtk3 ];
 
-  unpackPhase = "dpkg-deb -x $src .";
-
   installPhase = ''
     mkdir -p $out/bin
     cp -r opt $out
diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index 098051c72fb1..4f927b6db49e 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -99,8 +99,6 @@ stdenv.mkDerivation {
   dontBuild = true;
   dontConfigure = true;
 
-  unpackPhase = "dpkg-deb -x $src .";
-
   runtimeDependencies = [ (lib.getLib systemd) libGL libnotify libappindicator wayland ];
 
   installPhase = ''
diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix
index dae08cd485c6..61fb95b66a1e 100644
--- a/pkgs/applications/office/morgen/default.nix
+++ b/pkgs/applications/office/morgen/default.nix
@@ -6,6 +6,7 @@ stdenv.mkDerivation rec {
   version = "3.5.9";
 
   src = fetchurl {
+    name = "morgen-${version}.deb";
     url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb";
     hash = "sha256-ZKlj/QuQnrqQepsJY6KCROC2fXK/4Py5tmI/FVnRi9w=";
   };
@@ -19,10 +20,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ];
 
-  unpackCmd = ''
-    dpkg-deb -x ${src} ./morgen-${pname}
-  '';
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix
index 14fa1a9a2a06..b0e15b532842 100644
--- a/pkgs/by-name/al/alfaview/package.nix
+++ b/pkgs/by-name/al/alfaview/package.nix
@@ -50,10 +50,6 @@ stdenv.mkDerivation rec {
   dontBuild = true;
   dontConfigure = true;
 
-  unpackPhase = ''
-    dpkg-deb -x ${src} ./
-  '';
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/bd/bdf2psf/package.nix b/pkgs/by-name/bd/bdf2psf/package.nix
index 0a01b1f9a885..f7bb5e66e032 100644
--- a/pkgs/by-name/bd/bdf2psf/package.nix
+++ b/pkgs/by-name/bd/bdf2psf/package.nix
@@ -14,12 +14,6 @@ stdenv.mkDerivation rec {
   dontConfigure = true;
   dontBuild = true;
 
-  unpackPhase = ''
-    runHook preUnpack
-    dpkg-deb -x $src .
-    runHook postUnpack
-  '';
-
   installPhase = ''
     runHook preInstall
     substituteInPlace usr/bin/bdf2psf --replace /usr/bin/perl "${perl}/bin/perl"
diff --git a/pkgs/by-name/bl/bluemail/package.nix b/pkgs/by-name/bl/bluemail/package.nix
index f565a5732f5d..40d861faaf5c 100644
--- a/pkgs/by-name/bl/bluemail/package.nix
+++ b/pkgs/by-name/bl/bluemail/package.nix
@@ -64,8 +64,6 @@ stdenv.mkDerivation rec {
     udev
   ];
 
-  unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents";
-
   dontBuild = true;
   dontStrip = true;
   dontWrapGApps = true;
diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix
index 48b1ad51bb10..61cdcdb08273 100644
--- a/pkgs/by-name/br/brave/make-brave.nix
+++ b/pkgs/by-name/br/brave/make-brave.nix
@@ -189,12 +189,6 @@ stdenv.mkDerivation {
     adwaita-icon-theme
   ];
 
-  unpackPhase =
-    if stdenv.hostPlatform.isLinux then
-      "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"
-    else
-      "unzip $src";
-
   installPhase =
     lib.optionalString stdenv.hostPlatform.isLinux ''
       runHook preInstall
diff --git a/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix b/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix
index a6c2db9f90b1..5f27b6364d85 100644
--- a/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix
+++ b/pkgs/by-name/cu/cups-brother-hll2375dw/package.nix
@@ -38,8 +38,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-N5VCBZLFrfw29QjjzlSvQ12urvyaf7ez/RJ08UwqHdk=";
   };
 
-  unpackPhase = "dpkg-deb -x $src .";
-
   patches = [
     # The brother lpdwrapper uses a temporary file to convey the printer settings.
     # The original settings file will be copied with "400" permissions and the "brprintconflsr3"
diff --git a/pkgs/by-name/ff/fflinuxprint/package.nix b/pkgs/by-name/ff/fflinuxprint/package.nix
index 8cfd29b5c1cc..83a4d223b970 100644
--- a/pkgs/by-name/ff/fflinuxprint/package.nix
+++ b/pkgs/by-name/ff/fflinuxprint/package.nix
@@ -16,9 +16,6 @@ stdenv.mkDerivation (finalAttrs: {
     curlOpts = "--user-agent Mozilla/5.0"; # HTTP 410 otherwise
   };
 
-  sourceRoot = ".";
-  unpackCmd = "dpkg-deb -x $curSrc .";
-
   nativeBuildInputs = [
     autoPatchelfHook
     dpkg
diff --git a/pkgs/by-name/ga/gamepad-tool/package.nix b/pkgs/by-name/ga/gamepad-tool/package.nix
index 3ca6cabddf62..f01951c4b7cb 100644
--- a/pkgs/by-name/ga/gamepad-tool/package.nix
+++ b/pkgs/by-name/ga/gamepad-tool/package.nix
@@ -11,11 +11,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ dpkg qt5.wrapQtAppsHook autoPatchelfHook ];
 
-  unpackCmd = ''
-    mkdir -p root
-    dpkg-deb -x $curSrc root
-  '';
-
   dontBuild = true;
 
   buildInputs = [
diff --git a/pkgs/by-name/he/headset/package.nix b/pkgs/by-name/he/headset/package.nix
index 009ce3f0b703..4d9ca19f50e1 100644
--- a/pkgs/by-name/he/headset/package.nix
+++ b/pkgs/by-name/he/headset/package.nix
@@ -20,8 +20,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper dpkg ];
 
-  unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/ho/holochain-launcher/package.nix b/pkgs/by-name/ho/holochain-launcher/package.nix
index 85109890fb8e..7ae6626d9662 100644
--- a/pkgs/by-name/ho/holochain-launcher/package.nix
+++ b/pkgs/by-name/ho/holochain-launcher/package.nix
@@ -35,8 +35,6 @@ stdenv.mkDerivation rec {
     glib-networking
   ];
 
-  unpackCmd = "dpkg-deb -x $curSrc source";
-
   installPhase = ''
     mv usr $out
     mv $out/bin/holochain-launcher-${prerelease} $out/bin/holochain-launcher
diff --git a/pkgs/by-name/hy/hyper/package.nix b/pkgs/by-name/hy/hyper/package.nix
index 4db56792b733..9f46b59d6a53 100644
--- a/pkgs/by-name/hy/hyper/package.nix
+++ b/pkgs/by-name/hy/hyper/package.nix
@@ -24,12 +24,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ dpkg ];
 
-  unpackPhase = ''
-    mkdir pkg
-    dpkg-deb -x $src pkg
-    sourceRoot=pkg
-  '';
-
   installPhase = ''
     mkdir -p "$out/bin"
     mv opt "$out/"
diff --git a/pkgs/by-name/id/ideamaker/package.nix b/pkgs/by-name/id/ideamaker/package.nix
index 8d6a67529b72..20b894708736 100644
--- a/pkgs/by-name/id/ideamaker/package.nix
+++ b/pkgs/by-name/id/ideamaker/package.nix
@@ -131,12 +131,6 @@ stdenv.mkDerivation (finalAttrs: {
       libsForQt5.quazip
     ];
 
-  unpackPhase = ''
-    runHook preUnpack
-    dpkg-deb -x $src .
-    runHook postUnpack
-  '';
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/in/insync-emblem-icons/package.nix b/pkgs/by-name/in/insync-emblem-icons/package.nix
index b31f05170a63..c6969afe2e67 100644
--- a/pkgs/by-name/in/insync-emblem-icons/package.nix
+++ b/pkgs/by-name/in/insync-emblem-icons/package.nix
@@ -19,14 +19,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ dpkg ];
 
-  unpackPhase = ''
-    runHook preUnpack
-
-    dpkg-deb --fsys-tarfile "$src" | tar -x --no-same-permissions --no-same-owner
-
-    runHook postUnpack
-  '';
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/in/insync/package.nix b/pkgs/by-name/in/insync/package.nix
index 125f8be1d8b4..95bcfbd33a8e 100644
--- a/pkgs/by-name/in/insync/package.nix
+++ b/pkgs/by-name/in/insync/package.nix
@@ -46,14 +46,6 @@ let
       libthai
     ] ++ (with libsForQt5; [ qt5.qtvirtualkeyboard ]);
 
-    unpackPhase = ''
-      runHook preUnpack
-
-      dpkg-deb --fsys-tarfile "$src" | tar -x --no-same-permissions --no-same-owner
-
-      runHook postUnpack
-    '';
-
     installPhase = ''
       runHook preInstall
 
diff --git a/pkgs/by-name/ip/ipscan/package.nix b/pkgs/by-name/ip/ipscan/package.nix
index f4b10cbd806b..350f2525ffb6 100644
--- a/pkgs/by-name/ip/ipscan/package.nix
+++ b/pkgs/by-name/ip/ipscan/package.nix
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-UPkUwZV3NIeVfL3yYvqOhm4X5xW+40GOlZGy8WGhYmk=";
   };
 
-  sourceRoot = ".";
-  unpackCmd = "${dpkg}/bin/dpkg-deb -x $src .";
-
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    dpkg
+    makeWrapper
+  ];
 
   buildInputs = [ jdk ];
 
diff --git a/pkgs/by-name/ji/jigasi/package.nix b/pkgs/by-name/ji/jigasi/package.nix
index 28204cb1384e..cccf7c70ab32 100644
--- a/pkgs/by-name/ji/jigasi/package.nix
+++ b/pkgs/by-name/ji/jigasi/package.nix
@@ -15,8 +15,6 @@ stdenv.mkDerivation {
 
   dontBuild = true;
 
-  unpackCmd = "dpkg-deb -x $src debcontents";
-
   installPhase = ''
     runHook preInstall
     substituteInPlace usr/share/${pname}/${pname}.sh \
diff --git a/pkgs/by-name/ke/keeweb/package.nix b/pkgs/by-name/ke/keeweb/package.nix
index 48b9a603d841..2a16f765c6ef 100644
--- a/pkgs/by-name/ke/keeweb/package.nix
+++ b/pkgs/by-name/ke/keeweb/package.nix
@@ -112,14 +112,11 @@ else
     nativeBuildInputs = [
       autoPatchelfHook
       wrapGAppsHook3
+      dpkg
     ];
 
     buildInputs = libraries;
 
-    unpackPhase = ''
-      ${dpkg}/bin/dpkg-deb --fsys-tarfile $src | tar --extract
-    '';
-
     installPhase = ''
       runHook preInstall
 
diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix
index 4d4f2332995e..c132d0a04a86 100644
--- a/pkgs/by-name/ko/koreader/package.nix
+++ b/pkgs/by-name/ko/koreader/package.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-gHn1xqBc7M9wkek1Ja1gry8TKIuUxQP8T45x3z2S4uc=";
   };
 
-  sourceRoot = ".";
   nativeBuildInputs = [ makeWrapper dpkg ];
   buildInputs = [
     glib
@@ -50,7 +49,6 @@ stdenv.mkDerivation rec {
     sdcv
     SDL2
   ];
-  unpackCmd = "dpkg-deb -x ${src} .";
 
   dontConfigure = true;
   dontBuild = true;
diff --git a/pkgs/by-name/li/lightworks/package.nix b/pkgs/by-name/li/lightworks/package.nix
index 5ecd39de3d93..da20ab5e4ba4 100644
--- a/pkgs/by-name/li/lightworks/package.nix
+++ b/pkgs/by-name/li/lightworks/package.nix
@@ -65,10 +65,10 @@ let
       else
         throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
 
-    nativeBuildInputs = [ makeWrapper ];
-    buildInputs = [ dpkg ];
-
-    unpackPhase = "dpkg-deb -x ${src} ./";
+    nativeBuildInputs = [
+      dpkg
+      makeWrapper
+    ];
 
     installPhase = ''
       mkdir -p $out/bin
diff --git a/pkgs/by-name/lu/lunacy/package.nix b/pkgs/by-name/lu/lunacy/package.nix
index 1fcc9ed4e745..19ede0331570 100644
--- a/pkgs/by-name/lu/lunacy/package.nix
+++ b/pkgs/by-name/lu/lunacy/package.nix
@@ -27,11 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-roD/bKv1N2sru/tZ6Zl1J2AyY1mgj2ssB2a42kwBNHM=";
   };
 
-  unpackCmd = ''
-    mkdir -p root
-    dpkg-deb -x $src root
-  '';
-
   buildInputs = [
     zlib
     libgcc
diff --git a/pkgs/by-name/mo/molly-guard/package.nix b/pkgs/by-name/mo/molly-guard/package.nix
index 1100751f451e..a444f5231788 100644
--- a/pkgs/by-name/mo/molly-guard/package.nix
+++ b/pkgs/by-name/mo/molly-guard/package.nix
@@ -9,11 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1k6b1hn8lc4rj9n036imsl7s9lqj6ny3acdhnbnamsdkkndmxrw7";
   };
 
-  buildInputs = [ dpkg ];
-
-  unpackCmd = ''
-    dpkg-deb -x "$src" source
-  '';
+  nativeBuildInputs = [ dpkg ];
 
   installPhase = ''
     sed -i "s|/lib/molly-guard|${systemd}/sbin|g" lib/molly-guard/molly-guard
diff --git a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
index d2e0f96b9db4..565661df3d54 100644
--- a/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
+++ b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
@@ -120,10 +120,6 @@ let
 
     dontWrapQtApps = true;
 
-    unpackPhase = ''
-      dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner
-    '';
-
     installPhase = ''
       runHook preInstall
 
diff --git a/pkgs/by-name/op/opera/package.nix b/pkgs/by-name/op/opera/package.nix
index a6f2cf3d4f08..c2ca46cf3373 100644
--- a/pkgs/by-name/op/opera/package.nix
+++ b/pkgs/by-name/op/opera/package.nix
@@ -58,8 +58,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-PBbozIdA+cfEzGIyL1P+25FZtrnd7ldctOtZYomKd/8=";
   };
 
-  unpackPhase = "dpkg-deb -x $src .";
-
   nativeBuildInputs = [
     dpkg
     autoPatchelfHook
diff --git a/pkgs/by-name/pi/picoscope/package.nix b/pkgs/by-name/pi/picoscope/package.nix
index 056a682d1c1c..eef60df059f8 100644
--- a/pkgs/by-name/pi/picoscope/package.nix
+++ b/pkgs/by-name/pi/picoscope/package.nix
@@ -29,8 +29,7 @@ let
       src = fetchurl { inherit (sources.libpicoipp) url sha256; };
       nativeBuildInputs = [ dpkg autoPatchelfHook ];
       buildInputs = [ (lib.getLib stdenv.cc.cc) ];
-      sourceRoot = ".";
-      unpackCmd = "dpkg-deb -x $src .";
+
       installPhase = ''
         runHook preInstall
         mkdir -p $out/lib
@@ -57,8 +56,6 @@ let
       src = fetchurl { inherit url sha256; };
       # picoscope does a signature check, so we can't patchelf these
       nativeBuildInputs = [ dpkg ];
-      sourceRoot = ".";
-      unpackCmd = "dpkg-deb -x $src .";
       installPhase = ''
         runHook preInstall
         mkdir -p $out/lib
@@ -82,8 +79,6 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ dpkg makeWrapper ];
   buildInputs = [ gtk-sharp-3_0 mono glib libusb1 zlib ];
 
-  unpackCmd = "dpkg-deb -x $src .";
-  sourceRoot = ".";
   scopeLibs = lib.attrVals (map (x: "lib${x}") scopes) scopePkgs;
   MONO_PATH = "${gtk-sharp-3_0}/lib/mono/gtk-sharp-3.0:" + (lib.makeLibraryPath
     ([
diff --git a/pkgs/by-name/pi/pixeluvo/package.nix b/pkgs/by-name/pi/pixeluvo/package.nix
index 9d19e1370965..c89c2707116b 100644
--- a/pkgs/by-name/pi/pixeluvo/package.nix
+++ b/pkgs/by-name/pi/pixeluvo/package.nix
@@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
   dontBuild = true;
   dontConfigure = true;
 
-  unpackPhase = ''
-    dpkg-deb -x ${src} ./
-  '';
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/po/polar-bookshelf/package.nix b/pkgs/by-name/po/polar-bookshelf/package.nix
index 1e29c225f92c..955b45784e92 100644
--- a/pkgs/by-name/po/polar-bookshelf/package.nix
+++ b/pkgs/by-name/po/polar-bookshelf/package.nix
@@ -93,8 +93,6 @@ stdenv.mkDerivation rec {
 
   runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl libnghttp2 ];
 
-  unpackPhase = "dpkg-deb -x $src .";
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/po/polar-bookshelf1/package.nix b/pkgs/by-name/po/polar-bookshelf1/package.nix
index 572a981b4ccf..cd04ca69d1e4 100644
--- a/pkgs/by-name/po/polar-bookshelf1/package.nix
+++ b/pkgs/by-name/po/polar-bookshelf1/package.nix
@@ -87,10 +87,6 @@ stdenv.mkDerivation rec {
 
   runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl libnghttp2 ];
 
-  unpackPhase = ''
-    dpkg-deb -x $src .
-  '';
-
   installPhase = ''
     mkdir -p $out/share/polar-bookshelf $out/bin $out/lib
     mv opt/Polar\ Bookshelf/* $out/share/polar-bookshelf
diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix
index 8a155f6390fc..f99fa66da7f3 100644
--- a/pkgs/by-name/po/positron-bin/package.nix
+++ b/pkgs/by-name/po/positron-bin/package.nix
@@ -41,7 +41,6 @@ stdenv.mkDerivation {
     [ makeShellWrapper ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       alsa-lib
-      dpkg
       gtk3
       libglvnd
       libxkbcommon
@@ -62,6 +61,7 @@ stdenv.mkDerivation {
   nativeBuildInputs =
     lib.optionals stdenv.hostPlatform.isLinux [
       autoPatchelfHook
+      dpkg
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       _7zz
@@ -72,8 +72,6 @@ stdenv.mkDerivation {
     (lib.getLib systemd)
   ];
 
-  postUnpack = lib.optionalString stdenv.hostPlatform.isLinux ''dpkg-deb --fsys-tarfile "$src" | tar -x --no-same-owner'';
-
   installPhase =
     if stdenv.hostPlatform.isDarwin then
       ''
diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix
index 89fa1d158208..db17baa6534b 100644
--- a/pkgs/by-name/sp/spacedrive/package.nix
+++ b/pkgs/by-name/sp/spacedrive/package.nix
@@ -115,14 +115,6 @@ else
       gst_all_1.gstreamer
     ];
 
-    unpackPhase = ''
-      runHook preUnpack
-
-      dpkg-deb -x $src .
-
-      runHook postUnpack
-    '';
-
     installPhase = ''
       runHook preInstall
 
diff --git a/pkgs/by-name/ss/sslmate-agent/package.nix b/pkgs/by-name/ss/sslmate-agent/package.nix
index 174507afc21c..e605f8673241 100644
--- a/pkgs/by-name/ss/sslmate-agent/package.nix
+++ b/pkgs/by-name/ss/sslmate-agent/package.nix
@@ -14,10 +14,6 @@ stdenv.mkDerivation rec {
     autoPatchelfHook
   ];
 
-  unpackCmd = ''
-    dpkg-deb -x ${src} ./sslmate-agent-${pname}
-  '';
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/st/staruml/package.nix b/pkgs/by-name/st/staruml/package.nix
index 84703b0c8c88..3df3516b239d 100644
--- a/pkgs/by-name/st/staruml/package.nix
+++ b/pkgs/by-name/st/staruml/package.nix
@@ -35,12 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ wrapGAppsHook3 dpkg ];
   buildInputs = [ glib hicolor-icon-theme ];
 
-  unpackPhase = ''
-    mkdir pkg
-    dpkg-deb -x $src pkg
-    sourceRoot=pkg
-  '';
-
   installPhase = ''
     mkdir -p $out/bin
     mv opt $out
diff --git a/pkgs/by-name/te/terra-station/package.nix b/pkgs/by-name/te/terra-station/package.nix
index 582949edc2db..fe96eebecc1f 100644
--- a/pkgs/by-name/te/terra-station/package.nix
+++ b/pkgs/by-name/te/terra-station/package.nix
@@ -30,15 +30,11 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  nativeBuildInputs = [ makeWrapper asar ];
+  nativeBuildInputs = [ makeWrapper asar dpkg ];
 
   dontConfigure = true;
   dontBuild = true;
 
-  unpackPhase = ''
-    ${dpkg}/bin/dpkg-deb -x $src .
-  '';
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/th/thedesk/package.nix b/pkgs/by-name/th/thedesk/package.nix
index d1c4dd88583a..9a398494c429 100644
--- a/pkgs/by-name/th/thedesk/package.nix
+++ b/pkgs/by-name/th/thedesk/package.nix
@@ -21,10 +21,6 @@ stdenv.mkDerivation rec {
   dontBuild = true;
   dontConfigure = true;
 
-  unpackPhase = ''
-    dpkg-deb -x ${src} ./
-  '';
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/ti/tidal-hifi/package.nix b/pkgs/by-name/ti/tidal-hifi/package.nix
index fa1c896fb66c..de6fb5b0b2de 100644
--- a/pkgs/by-name/ti/tidal-hifi/package.nix
+++ b/pkgs/by-name/ti/tidal-hifi/package.nix
@@ -92,8 +92,6 @@ stdenv.mkDerivation (finalAttrs: {
   runtimeDependencies =
     [ (lib.getLib systemd) libnotify libdbusmenu xdg-utils ];
 
-  unpackPhase = "dpkg-deb -x $src .";
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/un/unifi/package.nix b/pkgs/by-name/un/unifi/package.nix
index 14ff55384314..6ecd33f5e242 100644
--- a/pkgs/by-name/un/unifi/package.nix
+++ b/pkgs/by-name/un/unifi/package.nix
@@ -18,12 +18,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ dpkg ];
 
-  unpackPhase = ''
-    runHook preUnpack
-    dpkg-deb -x $src ./
-    runHook postUnpack
-  '';
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/up/upwork/package.nix b/pkgs/by-name/up/upwork/package.nix
index 6516e05b0f35..6062be7b7200 100644
--- a/pkgs/by-name/up/upwork/package.nix
+++ b/pkgs/by-name/up/upwork/package.nix
@@ -32,10 +32,6 @@ stdenv.mkDerivation rec {
 
   dontWrapGApps = true;
 
-  unpackPhase = ''
-    dpkg-deb -x ${src} ./
-  '';
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/wi/wire-desktop/package.nix b/pkgs/by-name/wi/wire-desktop/package.nix
index 1b4ae2a4e74a..9c6ab2a0b60e 100644
--- a/pkgs/by-name/wi/wire-desktop/package.nix
+++ b/pkgs/by-name/wi/wire-desktop/package.nix
@@ -109,14 +109,6 @@ let
       systemd
     ];
 
-    unpackPhase = ''
-      runHook preUnpack
-
-      dpkg-deb -x $src .
-
-      runHook postUnpack
-    '';
-
     installPhase = ''
       runHook preInstall
 
diff --git a/pkgs/by-name/wk/wkhtmltopdf/package.nix b/pkgs/by-name/wk/wkhtmltopdf/package.nix
index 980081b3dde7..430648cb8a6e 100644
--- a/pkgs/by-name/wk/wkhtmltopdf/package.nix
+++ b/pkgs/by-name/wk/wkhtmltopdf/package.nix
@@ -56,19 +56,10 @@ let
       (lib.getLib libpng)
     ];
 
-    unpackPhase = ''
-      runHook preUnpack
-
-      mkdir pkg
-      dpkg-deb -x $src pkg
-
-      runHook postUnpack
-    '';
-
     installPhase = ''
       runHook preInstall
 
-      cp -r pkg/usr/local $out
+      cp -r usr/local $out
 
       runHook postInstall
     '';
diff --git a/pkgs/by-name/wo/wonderdraft/package.nix b/pkgs/by-name/wo/wonderdraft/package.nix
index ee49c10a7007..c6cf971b9bea 100644
--- a/pkgs/by-name/wo/wonderdraft/package.nix
+++ b/pkgs/by-name/wo/wonderdraft/package.nix
@@ -17,8 +17,10 @@ stdenv.mkDerivation rec {
     url = "https://wonderdraft.net/";
     hash = "sha256-3eYnEH6P94z9axFsrkJA4QMcHyg/gNRczqL3h5Sc2Tg=";
   };
-  sourceRoot = ".";
-  unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
+
+  nativeBuildInputs = [
+    dpkg
+  ];
 
   dontConfigure = true;
   dontBuild = true;
diff --git a/pkgs/by-name/ye/yesplaymusic/package.nix b/pkgs/by-name/ye/yesplaymusic/package.nix
index 077ba8775879..c10184161f93 100644
--- a/pkgs/by-name/ye/yesplaymusic/package.nix
+++ b/pkgs/by-name/ye/yesplaymusic/package.nix
@@ -100,6 +100,7 @@ else stdenv.mkDerivation {
     autoPatchelfHook
     wrapGAppsHook3
     makeWrapper
+    dpkg
   ];
 
   buildInputs = libraries;
@@ -108,10 +109,6 @@ else stdenv.mkDerivation {
     (lib.getLib systemd)
   ];
 
-  unpackPhase = ''
-    ${dpkg}/bin/dpkg-deb -x $src .
-  '';
-
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/misc/jitsi-meet-prosody/default.nix b/pkgs/misc/jitsi-meet-prosody/default.nix
index 00bd87d9b298..d2ceaf524b17 100644
--- a/pkgs/misc/jitsi-meet-prosody/default.nix
+++ b/pkgs/misc/jitsi-meet-prosody/default.nix
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "LsZItRkFvpYaj5DwEv4C6tRpmypHadzSVv8/Wto2/68=";
   };
 
-  dontBuild = true;
+  nativeBuildInputs = [ dpkg ];
 
-  unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents";
+  dontBuild = true;
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/servers/jicofo/default.nix b/pkgs/servers/jicofo/default.nix
index 2da338a3e940..c905a0463091 100644
--- a/pkgs/servers/jicofo/default.nix
+++ b/pkgs/servers/jicofo/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   dontBuild = true;
 
-  unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents";
+  nativeBuildInputs = [ dpkg ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/servers/jitsi-videobridge/default.nix b/pkgs/servers/jitsi-videobridge/default.nix
index 7a78a1cf3eff..409ada4fcce1 100644
--- a/pkgs/servers/jitsi-videobridge/default.nix
+++ b/pkgs/servers/jitsi-videobridge/default.nix
@@ -13,9 +13,10 @@ stdenv.mkDerivation {
 
   dontBuild = true;
 
-  unpackCmd = "${dpkg}/bin/dpkg-deb -x $src debcontents";
-
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    dpkg
+    makeWrapper
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index c892130b3a6c..2a432f693bc6 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -28,10 +28,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ dpkg ];
 
-  unpackPhase = ''
-    dpkg-deb -R $src .
-  '';
-
   installPhase = ''
     runHook preInstall
     mkdir -p "$out/lib"

From ea7b88c2876b5741b1714fcdf643fe06f774b889 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 26 Nov 2024 21:49:41 +0100
Subject: [PATCH 66/85] space-station-14-launcher: fix fhsenv version

---
 pkgs/games/space-station-14-launcher/default.nix             | 5 +++--
 .../space-station-14-launcher/space-station-14-launcher.nix  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/space-station-14-launcher/default.nix b/pkgs/games/space-station-14-launcher/default.nix
index 606f0659c788..ecf1d8781a5a 100644
--- a/pkgs/games/space-station-14-launcher/default.nix
+++ b/pkgs/games/space-station-14-launcher/default.nix
@@ -14,7 +14,8 @@ let
   '';
 in
 buildFHSEnv rec {
-  name = "space-station-14-launcher-wrapped";
+  pname = "space-station-14-launcher-wrapped";
+  inherit (space-station-14-launcher) version;
 
   targetPkgs = pkgs: [
     space-station-14-launcher
@@ -35,6 +36,6 @@ buildFHSEnv rec {
     unwrapped = space-station-14-launcher;
   };
   meta = space-station-14-launcher.meta // {
-    mainProgram = name;
+    mainProgram = pname;
   };
 }
diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
index 9483561a4a1b..9ad8c3b335f6 100644
--- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
+++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix
@@ -27,7 +27,7 @@ let
   pname = "space-station-14-launcher";
 in
 buildDotnetModule rec {
-  inherit pname;
+  inherit pname version;
 
   # Workaround to prevent buildDotnetModule from overriding assembly versions.
   name = "${pname}-${version}";

From d232880c20d309c1bce36887d75575e7c4dd7b36 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 26 Nov 2024 22:02:37 +0100
Subject: [PATCH 67/85] various: remove left-over rtc_cmos rootModule

This is not needed anymore after
65a50ea453edc76b3b749b16dcc442e42df08451.
---
 nixos/lib/make-multi-disk-zfs-image.nix  | 3 +--
 nixos/lib/make-single-disk-zfs-image.nix | 3 +--
 nixos/modules/system/boot/kernel.nix     | 3 ---
 pkgs/build-support/vm/default.nix        | 1 -
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/nixos/lib/make-multi-disk-zfs-image.nix b/nixos/lib/make-multi-disk-zfs-image.nix
index 1dac232e2b8c..b2489989092a 100644
--- a/nixos/lib/make-multi-disk-zfs-image.nix
+++ b/nixos/lib/make-multi-disk-zfs-image.nix
@@ -236,8 +236,7 @@ let
   image = (
     pkgs.vmTools.override {
       rootModules =
-        [ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ] ++
-          (pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos");
+        [ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ];
       kernel = modulesTree;
     }
   ).runInLinuxVM (
diff --git a/nixos/lib/make-single-disk-zfs-image.nix b/nixos/lib/make-single-disk-zfs-image.nix
index e37b79797dca..cd65d596e051 100644
--- a/nixos/lib/make-single-disk-zfs-image.nix
+++ b/nixos/lib/make-single-disk-zfs-image.nix
@@ -226,8 +226,7 @@ let
   image = (
     pkgs.vmTools.override {
       rootModules =
-        [ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ] ++
-        (pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos");
+        [ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ];
       kernel = modulesTree;
     }
   ).runInLinuxVM (
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 4854119b2538..d25a6e98497e 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -306,9 +306,6 @@ in
           ] ++ optionals pkgs.stdenv.hostPlatform.isx86 [
             # Misc. x86 keyboard stuff.
             "pcips2" "atkbd" "i8042"
-
-            # x86 RTC needed by the stage 2 init script.
-            "rtc_cmos"
           ]);
 
         boot.initrd.kernelModules =
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index aa504babdac5..29ae21e50c4d 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -6,7 +6,6 @@
 , storeDir ? builtins.storeDir
 , rootModules ?
     [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ]
-      ++ pkgs.lib.optional pkgs.stdenv.hostPlatform.isx86 "rtc_cmos"
 }:
 
 let

From 9a06b2ee9284365fc7bdf11a238c890ebdd87783 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Nov 2024 21:15:56 +0000
Subject: [PATCH 68/85] rbspy: 0.25.0 -> 0.27.0

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

diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix
index beae01a2c57e..837468803842 100644
--- a/pkgs/development/tools/rbspy/default.nix
+++ b/pkgs/development/tools/rbspy/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rbspy";
-  version = "0.25.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "rbspy";
     repo = "rbspy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-6J+/clldoMSTcZXM4N8THZ3fk2NE9VQ2XyDIzVej6OY=";
+    hash = "sha256-K5zDM7HhSNklCMoj3yh5lf0HTITOl2UYXW0QCxDF2GU=";
   };
 
-  cargoHash = "sha256-u42FDaSpunkj5u1zYtk27tKunW4ZzsNgYCmrSnuAe5k=";
+  cargoHash = "sha256-2yYv7Pp6UqHTPrmG4BM0py3GoPYYJW7e9LQSrgxx/3A=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
   postPatch = ''

From 3f22bc5e373d95540d4ccf9ef338b8b8e3253db8 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Tue, 26 Nov 2024 22:55:58 +0100
Subject: [PATCH 69/85] snis: fix meta

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

diff --git a/pkgs/by-name/sn/snis/package.nix b/pkgs/by-name/sn/snis/package.nix
index 4db2fb5f3957..9da764aa1d32 100644
--- a/pkgs/by-name/sn/snis/package.nix
+++ b/pkgs/by-name/sn/snis/package.nix
@@ -26,7 +26,7 @@ buildEnv {
     done
   '';
 
-  meta = snis-unwrapped // {
+  meta = snis-unwrapped.meta // {
     hydraPlatforms = [ ];
   };
 }

From 90dfafee359919d2574139ce4da1c896b45e5d4e Mon Sep 17 00:00:00 2001
From: Jordan Williams <jordan@jwillikers.com>
Date: Tue, 19 Nov 2024 06:29:08 -0600
Subject: [PATCH 70/85] nixos/mopidy: restart the systemd service on failure

This ensures Mopidy is running, even after crashes.
---
 nixos/modules/services/audio/mopidy.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix
index 8ed701f9c9e4..235a5a896e05 100644
--- a/nixos/modules/services/audio/mopidy.nix
+++ b/nixos/modules/services/audio/mopidy.nix
@@ -77,6 +77,7 @@ in {
       description = "mopidy music player daemon";
       serviceConfig = {
         ExecStart = "${mopidyEnv}/bin/mopidy --config ${lib.concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)}";
+        Restart = "on-failure";
         User = "mopidy";
       };
     };

From f35670674d3e8c6b08e01e5b1280eb0fdeadb727 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Nov 2024 22:37:35 +0000
Subject: [PATCH 71/85] gk-cli: 2.1.1 -> 2.1.2

---
 pkgs/by-name/gk/gk-cli/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/gk/gk-cli/package.nix b/pkgs/by-name/gk/gk-cli/package.nix
index c1bf583c4120..6ca98ca42863 100644
--- a/pkgs/by-name/gk/gk-cli/package.nix
+++ b/pkgs/by-name/gk/gk-cli/package.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gk-cli";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = (
     finalAttrs.passthru.sources.${stdenv.system}
@@ -50,47 +50,47 @@ stdenv.mkDerivation (finalAttrs: {
       {
         armv6l-linux = fetchzip {
           url = "${base_url}Linux_arm6.zip";
-          hash = "sha256-1e+TeZLSYZjlyHV+KzasysAiWREy6ayuvmllmfZ3f90=";
+          hash = "sha256-pnEFTkx1JSmQlniVCXvIB6xGD8XyDh9OLDU0V9AZBTs=";
           stripRoot = false;
         };
         armv7l-linux = fetchzip {
           url = "${base_url}Linux_arm7.zip";
-          hash = "sha256-phhfxDgfzHTVA5OexY6aTUNIuW/+3tn0Q2+el3Tu9Os=";
+          hash = "sha256-qj0++i698s4ELKHU9B2sGIqf9hUJip4+2Car+brkRkM=";
           stripRoot = false;
         };
         aarch64-linux = fetchzip {
           url = "${base_url}Linux_arm64.zip";
-          hash = "sha256-VvhbgvxCZBeJVYjjM/n6vr+xzQdolkZngzaU4Te3DbI=";
+          hash = "sha256-vHGhlRHbk2/s3YmBdOPDbalEydpQVFkHiCkBVywa4N0=";
           stripRoot = false;
         };
         x86_32-linux = fetchzip {
           url = "${base_url}Linux_i386.zip";
-          hash = "sha256-pTUNXRqWKPyyKMzJl+pIStVKpepcSX1ZdAxN39q2eZc=";
+          hash = "sha256-t+P9SpS9u/17kga74kbYjD6nkjiFusyIwCRGDnkP3tU=";
           stripRoot = false;
         };
         x86_64-linux = fetchzip {
           url = "${base_url}Linux_x86_64.zip";
-          hash = "sha256-bs/p15HaWV+XWuERmmih9n2lhI0OZivu97gnFiMCrzQ=";
+          hash = "sha256-O6T27edHi20ZFHiNaZKdk/5dtCn2Tpxm0PR934SRwFk=";
           stripRoot = false;
         };
         aarch64-darwin = fetchzip {
           url = "${base_url}macOS_arm64.zip";
-          hash = "sha256-BD9hefbkXbNzjdeoOqQ4RMgzIXdBt/3z1T0H55sTsP0=";
+          hash = "sha256-LW2K+aveJiyYqfga2jpF3DvvFeHJuozqbc/afgtq2Oc=";
           stripRoot = false;
         };
         x86_64-darwin = fetchzip {
           url = "${base_url}macOS_x86_64.zip";
-          hash = "sha256-6L0eghJwCLZKDh2G/IKv9g1whSWLQbpj+AozumUkm2M=";
+          hash = "sha256-1w8B4YWouVViTGoUh987pPQIoqdzB0S+M2bBiRI6Kfg=";
           stripRoot = false;
         };
         i686-windows = fetchzip {
           url = "${base_url}Windows_i386.zip";
-          hash = "sha256-ZxTOhJbPUjIoDwWIHrEKBBAd3LedJRwoolSZi0h79k8=";
+          hash = "sha256-t81/wK1weZ/uEZ5TzivylARTUqks9rLIG7WzeoWXb1k=";
           stripRoot = false;
         };
         x86_64-windows = fetchzip {
           url = "${base_url}Windows_x86_64.zip";
-          hash = "sha256-DWBzXQj1+/PKQzvI/R7gkLQz0rLz2h9x+nkPOXOtcyk=";
+          hash = "sha256-9yydDMI9Gz/OswRhJHF+2c3Ia0zDmXMbf7byj6PJe24=";
           stripRoot = false;
         };
       };

From 347e857eac26cde433e2fb6ac3a2d85c2b0c6722 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 24 Nov 2024 04:05:41 +0400
Subject: [PATCH 72/85] =?UTF-8?q?flashmq:=201.17.3=20=E2=86=92=201.18.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix
index f405ef99e9a5..c37fdb1f179e 100644
--- a/pkgs/by-name/fl/flashmq/package.nix
+++ b/pkgs/by-name/fl/flashmq/package.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flashmq";
-  version = "1.17.3";
+  version = "1.18.2";
 
   src = fetchFromGitHub {
     owner = "halfgaar";
     repo = "FlashMQ";
     rev = "v${version}";
-    hash = "sha256-AL3jkmz+LLg8apyMkemQugFrZpn5f1sJEskjEiZ5/PQ=";
+    hash = "sha256-sr3gKCovw5bhX9WsuiHQxwq/SaoLHOPCoNjtSop8ka8=";
   };
 
   nativeBuildInputs = [ cmake installShellFiles ];

From cb607f7ddcad3a887a826d8b27f20aecd124cc60 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Wed, 27 Nov 2024 14:11:26 -0500
Subject: [PATCH 73/85] zed-editor: 0.162.5 -> 0.163.2

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

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index f9e5dc7e9ed0..dbd4d52eeaaf 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -90,13 +90,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "zed-editor";
-  version = "0.162.5";
+  version = "0.163.2";
 
   src = fetchFromGitHub {
     owner = "zed-industries";
     repo = "zed";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ZrjrJbRvyw5insK+v5fxKj8ouylIPxapDVFgLb3M3uE=";
+    hash = "sha256-Bt6xbtkBYBuZW7hQ40UZwOjZJ7tqc9xL6XTvaD3KQjs=";
   };
 
   patches =
@@ -118,7 +118,7 @@ rustPlatform.buildRustPackage rec {
     ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-/KjZTtkSI7njErwgwJY5OEM172TreBfq80w8bA3xg2k=";
+  cargoHash = "sha256-QvvuVyPc+8Km8psdLQFc4PnSWFZsfkKuxzRK17HjEvE=";
 
   nativeBuildInputs =
     [

From 2e2c7f54fd44c97e48442c6a720aa127d0cb3ea2 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Wed, 27 Nov 2024 20:49:01 +0100
Subject: [PATCH 74/85] treewide: hide more deprecated stuff if allowAliases is
 false

---
 pkgs/applications/editors/neovim/utils.nix    |  2 +
 .../editors/vim/plugins/vim-utils.nix         |  5 +-
 pkgs/build-support/checkpoint-build.nix       | 60 ++++++++++---------
 .../compilers/rust/make-rust-platform.nix     | 12 ++--
 pkgs/development/idris-modules/default.nix    |  2 +-
 pkgs/development/lisp-modules/packages.nix    |  8 +--
 pkgs/development/rocm-modules/6/default.nix   | 34 ++++++-----
 pkgs/misc/tmux-plugins/default.nix            |  5 +-
 pkgs/shells/nushell/plugins/default.nix       |  5 +-
 pkgs/top-level/all-packages.nix               |  7 ++-
 pkgs/top-level/linux-kernels.nix              |  3 +-
 11 files changed, 77 insertions(+), 66 deletions(-)

diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix
index 74a313c4196d..946619698dbc 100644
--- a/pkgs/applications/editors/neovim/utils.nix
+++ b/pkgs/applications/editors/neovim/utils.nix
@@ -2,6 +2,7 @@
 , stdenv
 , makeSetupHook
 , callPackage
+, config
 , vimUtils
 , vimPlugins
 , nodejs
@@ -256,5 +257,6 @@ in
   inherit normalizePlugins normalizedPluginsToVimPackage;
 
   inherit buildNeovimPlugin;
+} // lib.optionalAttrs config.allowAliases {
   buildNeovimPluginFrom2Nix = lib.warn "buildNeovimPluginFrom2Nix was renamed to buildNeovimPlugin" buildNeovimPlugin;
 }
diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix
index d5536ee3b63a..512b1b39cc3e 100644
--- a/pkgs/applications/editors/vim/plugins/vim-utils.nix
+++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix
@@ -4,6 +4,7 @@
 , python3
 , callPackage, makeSetupHook
 , linkFarm
+, config
 }:
 
 /*
@@ -358,8 +359,6 @@ rec {
     overrideAttrs = f: makeCustomizable (vim.overrideAttrs f);
   };
 
-  vimWithRC = throw "vimWithRC was removed, please use vim.customize instead";
-
   vimGenDocHook = callPackage ({ vim }:
     makeSetupHook {
       name = "vim-gen-doc-hook";
@@ -430,4 +429,6 @@ rec {
         vimPlugin = true;
       };
     });
+} // lib.optionalAttrs config.allowAliases {
+  vimWithRC = throw "vimWithRC was removed, please use vim.customize instead";
 }
diff --git a/pkgs/build-support/checkpoint-build.nix b/pkgs/build-support/checkpoint-build.nix
index f1202ca1ce0a..11e4f9e3ab03 100644
--- a/pkgs/build-support/checkpoint-build.nix
+++ b/pkgs/build-support/checkpoint-build.nix
@@ -1,5 +1,6 @@
 { lib
 , buildPackages
+, config
 }:
 
 let
@@ -9,9 +10,38 @@ let
     mktemp
     rsync
     ;
+
+  /* Build a derivation based on the checkpoint output generated by
+    * the `prepareCheckpointBuild` function.
+    *
+    * Usage:
+    * let
+    *   checkpointArtifacts = prepareCheckpointBuild drv;
+    * in mkCheckpointBuild drv checkpointArtifacts
+  */
+  mkCheckpointBuild = drv: checkpointArtifacts: drv.overrideAttrs (old: {
+    # The actual checkpoint build phase.
+    # We compare the changed sources from a previous build with the current and create a patch.
+    # Afterwards we clean the build directory and copy the previous output files (including the sources).
+    # The source difference patch is then applied to get the latest changes again to allow short build times.
+    preBuild = (old.preBuild or "") + ''
+      set +e
+      sourceDifferencePatchFile=$(${mktemp}/bin/mktemp)
+      diff -ur ${checkpointArtifacts}/sources ./ > "$sourceDifferencePatchFile"
+      set -e
+      shopt -s dotglob
+      rm -r *
+      ${rsync}/bin/rsync \
+        --checksum --times --atimes --chown=$USER:$USER --chmod=+w \
+        -r ${checkpointArtifacts}/outputs/ .
+      patch -p 1 -i "$sourceDifferencePatchFile"
+      rm "$sourceDifferencePatchFile"
+    '';
+  });
 in
 
 rec {
+  inherit mkCheckpointBuild;
   /* Prepare a derivation for local builds.
     *
     * This function prepares checkpoint builds by storing
@@ -60,35 +90,7 @@ rec {
     doInstallCheck = false;
     doDist = false;
   });
-
-  /* Build a derivation based on the checkpoint output generated by
-    * the `prepareCheckpointBuild` function.
-    *
-    * Usage:
-    * let
-    *   checkpointArtifacts = prepareCheckpointBuild drv;
-    * in mkCheckpointBuild drv checkpointArtifacts
-  */
-  mkCheckpointBuild = drv: checkpointArtifacts: drv.overrideAttrs (old: {
-    # The actual checkpoint build phase.
-    # We compare the changed sources from a previous build with the current and create a patch.
-    # Afterwards we clean the build directory and copy the previous output files (including the sources).
-    # The source difference patch is then applied to get the latest changes again to allow short build times.
-    preBuild = (old.preBuild or "") + ''
-      set +e
-      sourceDifferencePatchFile=$(${mktemp}/bin/mktemp)
-      diff -ur ${checkpointArtifacts}/sources ./ > "$sourceDifferencePatchFile"
-      set -e
-      shopt -s dotglob
-      rm -r *
-      ${rsync}/bin/rsync \
-        --checksum --times --atimes --chown=$USER:$USER --chmod=+w \
-        -r ${checkpointArtifacts}/outputs/ .
-      patch -p 1 -i "$sourceDifferencePatchFile"
-      rm "$sourceDifferencePatchFile"
-    '';
-  });
-
+} // lib.optionalAttrs config.allowAliases {
   mkCheckpointedBuild = lib.warn
     "`mkCheckpointedBuild` is deprecated, use `mkCheckpointBuild` instead!"
     mkCheckpointBuild;
diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix
index 4078041928be..41380005e196 100644
--- a/pkgs/development/compilers/rust/make-rust-platform.nix
+++ b/pkgs/development/compilers/rust/make-rust-platform.nix
@@ -1,4 +1,4 @@
-{ lib, buildPackages, callPackage, callPackages, cargo-auditable, stdenv, runCommand }@prev:
+{ lib, buildPackages, callPackage, callPackages, cargo-auditable, config, stdenv, runCommand }@prev:
 
 { rustc
 , cargo
@@ -8,11 +8,6 @@
 }:
 
 rec {
-  rust = {
-    rustc = lib.warn "rustPlatform.rust.rustc is deprecated. Use rustc instead." rustc;
-    cargo = lib.warn "rustPlatform.rust.cargo is deprecated. Use cargo instead." cargo;
-  };
-
   fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetch-cargo-tarball {
     git = buildPackages.gitMinimal;
     inherit cargo;
@@ -39,4 +34,9 @@ rec {
   inherit (callPackages ../../../build-support/rust/hooks {
     inherit stdenv cargo rustc;
   }) cargoBuildHook cargoCheckHook cargoInstallHook cargoNextestHook cargoSetupHook maturinBuildHook bindgenHook;
+} // lib.optionalAttrs config.allowAliases {
+  rust = {
+    rustc = lib.warn "rustPlatform.rust.rustc is deprecated. Use rustc instead." rustc;
+    cargo = lib.warn "rustPlatform.rust.cargo is deprecated. Use cargo instead." cargo;
+  };
 }
diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 6ab2c28be399..38b4385ee719 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -153,7 +153,6 @@
 
     refined = callPackage ./refined.nix {};
 
-    sdl = throw "'idrisPackages.sdl' has been removed, as it was broken and unmaintained"; # added 2024-05-09
     sdl2 = callPackage ./sdl2.nix {};
 
     semidirect = callPackage ./semidirect.nix {};
@@ -207,5 +206,6 @@
   } // builtins_ // pkgs.lib.optionalAttrs config.allowAliases {
     # removed packages
     protobuf = throw "idrisPackages.protobuf has been removed: abandoned by upstream"; # Added 2022-02-06
+    sdl = throw "'idrisPackages.sdl' has been removed, as it was broken and unmaintained"; # added 2024-05-09
   };
 in fix' (extends overrides idrisPackages)
diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index ea93ef4a4572..801fce5447cf 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -9,6 +9,7 @@ let
     setAttr
     hasAttr
     optionals
+    optionalAttrs
     isDerivation
     hasSuffix
     splitString
@@ -252,8 +253,6 @@ let
     nativeLibs = [ pkgs.openblas ];
   };
 
-  cl-glib_dot_gio = throw "cl-glib_dot_gio was replaced by cl-gio";
-
   cl-gtk4 = build-asdf-system {
     pname = "cl-gtk4";
     version = "1.0.0";
@@ -294,8 +293,6 @@ let
     ];
   };
 
-  cl-gtk4_dot_webkit2 = throw "cl-gtk4_dot_webkit2 was replaced by cl-gtk4_dot_webkit";
-
   cl-gtk4_dot_webkit = build-asdf-system {
     pname = "cl-gtk4.webkit";
     version = self.cl-gtk4.version;
@@ -471,6 +468,9 @@ let
     };
   });
 
+  } // optionalAttrs pkgs.config.allowAliases {
+    cl-glib_dot_gio = throw "cl-glib_dot_gio was replaced by cl-gio";
+    cl-gtk4_dot_webkit2 = throw "cl-gtk4_dot_webkit2 was replaced by cl-gtk4_dot_webkit";
   });
 
 in packages
diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index 6825a8bf860d..6cd85b0a575a 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -1,4 +1,6 @@
 { stdenv
+, lib
+, config
 , callPackage
 , recurseIntoAttrs
 , symlinkJoin
@@ -236,11 +238,6 @@ in rec {
   # hipBlasLt - Very broken with Tensile at the moment, only supports GFX9
   # hipTensor - Only supports GFX9
 
-  miopengemm= throw ''
-    'miopengemm' has been deprecated.
-    It is still available for some time as part of rocmPackages_5.
-  ''; # Added 2024-3-3
-
   composable_kernel = callPackage ./composable_kernel/unpack.nix {
     composable_kernel_build = callPackage ./composable_kernel {
       inherit rocmUpdateScript rocm-cmake clr;
@@ -264,11 +261,6 @@ in rec {
 
   miopen-hip = miopen;
 
-  miopen-opencl= throw ''
-    'miopen-opencl' has been deprecated.
-    It is still available for some time as part of rocmPackages_5.
-  ''; # Added 2024-3-3
-
   migraphx = callPackage ./migraphx {
     inherit rocmUpdateScript rocm-cmake rocblas composable_kernel miopen clr half rocm-device-libs;
     inherit (llvm) openmp clang-tools-extra;
@@ -327,12 +319,6 @@ in rec {
     useCPU = false;
   };
 
-  mivisionx-opencl = throw ''
-    'mivisionx-opencl' has been deprecated.
-    Other versions of mivisionx are still available.
-    It is also still available for some time as part of rocmPackages_5.
-  ''; # Added 2024-3-24
-
   mivisionx-cpu = mivisionx.override {
     rpp = rpp-cpu;
     useOpenCL = false;
@@ -525,4 +511,20 @@ in rec {
       ];
     };
   };
+} // lib.optionalAttrs config.allowAliases {
+  miopengemm= throw ''
+    'miopengemm' has been deprecated.
+    It is still available for some time as part of rocmPackages_5.
+  ''; # Added 2024-3-3
+
+  miopen-opencl= throw ''
+    'miopen-opencl' has been deprecated.
+    It is still available for some time as part of rocmPackages_5.
+  ''; # Added 2024-3-3
+
+  mivisionx-opencl = throw ''
+    'mivisionx-opencl' has been deprecated.
+    Other versions of mivisionx are still available.
+    It is also still available for some time as part of rocmPackages_5.
+  ''; # Added 2024-3-24
 }
diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index e4da6845cdcb..0a2aaa457931 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , pkgs
 , stdenv
+, config
 }:
 
 let
@@ -50,8 +51,6 @@ let
 in rec {
   inherit mkTmuxPlugin;
 
-  mkDerivation = throw "tmuxPlugins.mkDerivation is deprecated, use tmuxPlugins.mkTmuxPlugin instead"; # added 2021-03-14
-
   battery = mkTmuxPlugin {
     pluginName = "battery";
     version = "unstable-2019-07-04";
@@ -911,4 +910,6 @@ in rec {
       maintainers = with maintainers; [ o0th ];
     };
   };
+} // lib.optionalAttrs config.allowAliases {
+  mkDerivation = throw "tmuxPlugins.mkDerivation is deprecated, use tmuxPlugins.mkTmuxPlugin instead"; # added 2021-03-14
 }
diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix
index 63a041357794..ada3fb0f1bcd 100644
--- a/pkgs/shells/nushell/plugins/default.nix
+++ b/pkgs/shells/nushell/plugins/default.nix
@@ -1,14 +1,15 @@
-{ lib, newScope, dbus, IOKit, CoreFoundation, Foundation, Security }:
+{ lib, config, newScope, dbus, IOKit, CoreFoundation, Foundation, Security }:
 
 lib.makeScope newScope (self: with self; {
   gstat = callPackage ./gstat.nix { inherit Security; };
   formats = callPackage ./formats.nix { inherit IOKit Foundation; };
   polars = callPackage ./polars.nix { inherit IOKit Foundation; };
   query = callPackage ./query.nix { inherit IOKit CoreFoundation; };
-  regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release.";
   net = callPackage ./net.nix { inherit IOKit CoreFoundation; };
   units = callPackage ./units.nix  { inherit IOKit Foundation; };
   highlight = callPackage ./highlight.nix { inherit IOKit Foundation; };
   dbus = callPackage ./dbus.nix { inherit dbus; nushell_plugin_dbus = self.dbus; };
   skim = callPackage ./skim.nix { inherit IOKit CoreFoundation; };
+} // lib.optionalAttrs config.allowAliases {
+  regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release.";
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c0f48949c29..f24271a5e3e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13894,14 +13894,15 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  greetd = recurseIntoAttrs {
-    dlm = throw "greetd.dlm has been removed as it is broken and abandoned upstream"; #Added 2024-07-15
+  greetd = recurseIntoAttrs ({
     greetd = callPackage ../applications/display-managers/greetd { };
     gtkgreet = callPackage ../applications/display-managers/greetd/gtkgreet.nix { };
     regreet = callPackage ../applications/display-managers/greetd/regreet.nix { };
     tuigreet = callPackage ../applications/display-managers/greetd/tuigreet.nix { };
     wlgreet = callPackage ../applications/display-managers/greetd/wlgreet.nix { };
-  };
+  } // lib.optionalAttrs config.allowAliases {
+    dlm = throw "greetd.dlm has been removed as it is broken and abandoned upstream"; #Added 2024-07-15
+  });
 
   goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
   goldendict-ng = qt6Packages.callPackage ../applications/misc/goldendict-ng { };
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 5dc2bf56e8af..ce3d2b893cd3 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -701,9 +701,10 @@ in {
     linux_default = packages.linux_6_6;
     # Update this when adding the newest kernel major version!
     linux_latest = packages.linux_6_12;
-    linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";
     linux_rt_default = packages.linux_rt_5_15;
     linux_rt_latest = packages.linux_rt_6_6;
+  } // lib.optionalAttrs config.allowAliases {
+    linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";
   };
 
   manualConfig = callPackage ../os-specific/linux/kernel/manual-config.nix {};

From 6a579d58434a094cdd3ce716819430c4662e7a39 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Tue, 26 Nov 2024 00:22:04 +0100
Subject: [PATCH 75/85] plex: 1.41.0.8994-f2c27da23 -> 1.41.2.9200-c6bbc1b53

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

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index c892130b3a6c..50cab9828494 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -12,16 +12,16 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.41.0.8994-f2c27da23";
+  version = "1.41.2.9200-c6bbc1b53";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-    sha256 = "118mqmqfpfskqa19869lg9riip64jz0c2jrvnkpdilvzzhy9ngwx";
+    sha256 = "sha256-VTWyeve+Uz3TdWQ06CmZ9w+Gk9jBHP7EuYi0N9DTB4Q=";
   } else fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-    sha256 = "10nis1hk3fc9bvgiz41x4gmgbzlz2cczz47a2x14liqxmiwqwl3v";
+    sha256 = "sha256-HmgtnUsDzRIUThYdlZIzhiU02n9jSU7wtwnEA0+r1iQ=";
   };
 
   outputs = [ "out" "basedb" ];

From 507333f48465ef52de7de08ff23fe2a57997f30a Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Wed, 27 Nov 2024 16:58:08 +0100
Subject: [PATCH 76/85] spacevim: update and add general improvements

---
 pkgs/by-name/sp/spacevim/helptags.patch | 18 -----
 pkgs/by-name/sp/spacevim/package.nix    | 90 +++++++++++++------------
 2 files changed, 47 insertions(+), 61 deletions(-)
 delete mode 100644 pkgs/by-name/sp/spacevim/helptags.patch

diff --git a/pkgs/by-name/sp/spacevim/helptags.patch b/pkgs/by-name/sp/spacevim/helptags.patch
deleted file mode 100644
index bc0f9140c7be..000000000000
--- a/pkgs/by-name/sp/spacevim/helptags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim
-index 16688680..fcafd6f7 100644
---- a/autoload/SpaceVim.vim
-+++ b/autoload/SpaceVim.vim
-@@ -1355,13 +1355,6 @@ function! SpaceVim#end() abort
-     let &helplang = 'jp'
-   endif
-   ""
--  " generate tags for SpaceVim
--  let help = fnamemodify(g:_spacevim_root_dir, ':p:h') . '/doc'
--  try
--    exe 'helptags ' . help
--  catch
--    call SpaceVim#logger#warn('Failed to generate helptags for SpaceVim')
--  endtry
- 
-   ""
-   " set language
diff --git a/pkgs/by-name/sp/spacevim/package.nix b/pkgs/by-name/sp/spacevim/package.nix
index 3db7c73fd422..66e5686b5df1 100644
--- a/pkgs/by-name/sp/spacevim/package.nix
+++ b/pkgs/by-name/sp/spacevim/package.nix
@@ -1,26 +1,21 @@
-{ ripgrep
-, git
-, fzf
-, makeWrapper
-, vim-full
-, vimPlugins
-, fetchFromGitHub
-, lib
-, stdenv
-, formats
-, runCommand
-, spacevim_config ? import ./init.nix
+{
+  fetchFromGitHub,
+  formats,
+  fzf,
+  git,
+  lib,
+  makeWrapper,
+  neovim,
+  nix-update-script,
+  ripgrep,
+  runCommand,
+  stdenv,
+  vim-full,
+  spacevim_config ? import ./init.nix,
 }:
 
 let
   format = formats.toml { };
-  vim-customized = vim-full.customize {
-    name = "vim";
-    # Not clear at the moment how to import plugins such that
-    # SpaceVim finds them and does not auto download them to
-    # ~/.cache/vimfiles/repos
-    vimrcConfig.packages.myVimPackage = with vimPlugins; { start = [ ]; };
-  };
   spacevimdir = runCommand "SpaceVim.d" { } ''
     mkdir -p $out
     cp ${format.generate "init.toml" spacevim_config} $out/init.toml
@@ -28,28 +23,16 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "spacevim";
-  version = "1.8.0";
+  version = "2.3.0";
   src = fetchFromGitHub {
     owner = "SpaceVim";
     repo = "SpaceVim";
     rev = "v${version}";
-    sha256 = "sha256:11snnh5q47nqhzjb9qya6hpnmlzc060958whqvqrh4hc7gnlnqp8";
+    hash = "sha256-MHsAA0x/rfwRupe8aW1JVKGiYkySAX0AhOkBuScpn7I=";
   };
 
-  nativeBuildInputs = [ makeWrapper vim-customized ];
-  buildInputs = [ vim-customized ];
-
-  buildPhase = ''
-    runHook preBuild
-    # generate the helptags
-    vim -u NONE -c "helptags $(pwd)/doc" -c q
-    runHook postBuild
-  '';
-
-  patches = [
-    # Don't generate helptags at runtime into read-only $SPACEVIMDIR
-    ./helptags.patch
-  ];
+  nativeBuildInputs = [ makeWrapper ];
+  dontBuild = true;
 
   installPhase = ''
     runHook preInstall
@@ -58,21 +41,42 @@ stdenv.mkDerivation rec {
     cp -r $(pwd) $out/SpaceVim
 
     # trailing slash very important for SPACEVIMDIR
-    makeWrapper "${vim-customized}/bin/vim" "$out/bin/spacevim" \
+    makeWrapper "${vim-full}/bin/vim" "$out/bin/spacevim" \
         --add-flags "-u $out/SpaceVim/vimrc" --set SPACEVIMDIR "${spacevimdir}/" \
-        --prefix PATH : ${lib.makeBinPath [ fzf git ripgrep]}
+        --prefix PATH : ${
+          lib.makeBinPath [
+            fzf
+            git
+            ripgrep
+          ]
+        }
+    makeWrapper "${neovim}/bin/nvim" "$out/bin/spacenvim" \
+        --add-flags "-u $out/SpaceVim/init.vim" --set SPACEVIMDIR "${spacevimdir}/" \
+        --prefix PATH : ${
+          lib.makeBinPath [
+            fzf
+            git
+            ripgrep
+          ]
+        }
     runHook postInstall
   '';
 
-  meta = with lib; {
-    description = "Modern Vim distribution";
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Modular Vim/Neovim configuration";
     longDescription = ''
-      SpaceVim is a distribution of the Vim editor that’s inspired by spacemacs.
+      SpaceVim is a modular configuration of Vim and Neovim. It's inspired by
+      spacemacs. It manages collections of plugins in layers, which help to
+      collect related packages together to provide features. This approach
+      helps keep the configuration organized and reduces overhead for the user
+      by keeping them from having to think about what packages to install.
     '';
     homepage = "https://spacevim.org/";
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.fzakaria ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.fzakaria ];
+    platforms = lib.platforms.all;
     mainProgram = "spacevim";
   };
 }

From e93754bc37d928567e48ab9a2e47b2cd1974cd4a Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Wed, 27 Nov 2024 21:30:10 +0100
Subject: [PATCH 77/85] spacevim: change maintainer

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

diff --git a/pkgs/by-name/sp/spacevim/package.nix b/pkgs/by-name/sp/spacevim/package.nix
index 66e5686b5df1..82268cc69616 100644
--- a/pkgs/by-name/sp/spacevim/package.nix
+++ b/pkgs/by-name/sp/spacevim/package.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://spacevim.org/";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.fzakaria ];
+    maintainers = [ lib.maintainers.perchun ];
     platforms = lib.platforms.all;
     mainProgram = "spacevim";
   };

From 79e34d35d6b645990a9c44147aa4ec10d0c434b1 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Wed, 27 Nov 2024 17:04:12 +0100
Subject: [PATCH 78/85] vimPlugins.{spacevim, SpaceVim}: point to top-level
 `spacevim` instead

---
 .../editors/vim/plugins/aliases.nix           |  2 ++
 .../editors/vim/plugins/generated.nix         | 24 -------------------
 .../editors/vim/plugins/vim-plugin-names      |  2 --
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index cf62982f0c04..299faf7222c7 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -45,6 +45,8 @@ mapAliases (with prev; {
   coffeeScript        = vim-coffee-script; # backwards compat, added 2014-10-18
   Solarized           = vim-colors-solarized;
   solarized           = vim-colors-solarized;
+  spacevim            = throw "this distribution was unmaintained for the last 6 years, please use top-level 'spacevim'"; # added 2024-11-27
+  SpaceVim            = throw "this distribution didn't work properly in vimPlugins, please use top-level 'spacevim' instead"; # added 2024-11-27
   colors-solarized    = vim-colors-solarized;
   caw                 = caw-vim;
   chad                = chadtree;
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 7ff10d1b4d68..385f1050b1bc 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -411,18 +411,6 @@ final: prev:
     meta.homepage = "https://github.com/jaredgorski/SpaceCamp/";
   };
 
-  SpaceVim = buildVimPlugin {
-    pname = "SpaceVim";
-    version = "2024-11-05";
-    src = fetchFromGitHub {
-      owner = "SpaceVim";
-      repo = "SpaceVim";
-      rev = "08719ccab2073b4c12f2c6b318eba63b87e35180";
-      sha256 = "0fr7vhs5gi054nn9z3hqcgf4y3w7nx00d94f7nd9g2jg7x2zzfyp";
-    };
-    meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
-  };
-
   SudoEdit-vim = buildVimPlugin {
     pname = "SudoEdit.vim";
     version = "2023-04-25";
@@ -11470,18 +11458,6 @@ final: prev:
     meta.homepage = "https://github.com/FireIsGood/spaceman.nvim/";
   };
 
-  spacevim = buildVimPlugin {
-    pname = "spacevim";
-    version = "2018-03-29";
-    src = fetchFromGitHub {
-      owner = "ctjhoa";
-      repo = "spacevim";
-      rev = "30142a518ba77feb22791b5cb2387d88b70c58f2";
-      sha256 = "0m389cnpg17ca8s7vb9yrs40sxb56zg32lcpilnd63zfi7awgscg";
-    };
-    meta.homepage = "https://github.com/ctjhoa/spacevim/";
-  };
-
   sparkup = buildVimPlugin {
     pname = "sparkup";
     version = "2012-06-11";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 08d8a46ab67a..3fe82d7b813f 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -33,7 +33,6 @@ https://github.com/vim-scripts/ShowMultiBase/,,
 https://github.com/tmhedberg/SimpylFold/,,
 https://github.com/vim-scripts/SmartCase/,,
 https://github.com/jaredgorski/SpaceCamp/,,
-https://github.com/SpaceVim/SpaceVim/,,
 https://github.com/chrisbra/SudoEdit.vim/,,
 https://github.com/hsitz/VimOrganizer/,,
 https://github.com/VundleVim/Vundle.vim/,,
@@ -953,7 +952,6 @@ https://github.com/sQVe/sort.nvim/,HEAD,
 https://github.com/chikatoike/sourcemap.vim/,,
 https://github.com/liuchengxu/space-vim/,,
 https://github.com/FireIsGood/spaceman.nvim/,HEAD,
-https://github.com/ctjhoa/spacevim/,,
 https://github.com/chrisgeo/sparkup/,,
 https://github.com/cxwx/specs.nvim/,HEAD,
 https://github.com/lewis6991/spellsitter.nvim/,HEAD,

From 83ebb5d0316ec0845abfa93af7027a39a92d4d25 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 26 Nov 2024 08:19:43 -0600
Subject: [PATCH 79/85] vimPlugins: add missing dependencies

---
 .../editors/vim/plugins/overrides.nix         | 313 +++++++++++++++++-
 1 file changed, 298 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 60cd41c1d673..07ce96414cc2 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -244,7 +244,7 @@ in
   };
 
   base46 = super.base46.overrideAttrs {
-    dependencies = with self; [ nvchad ];
+    dependencies = with self; [ nvchad-ui ];
   };
 
   # The GitHub repository returns 404, which breaks the update script
@@ -292,7 +292,10 @@ in
   };
 
   cheatsheet-nvim = super.cheatsheet-nvim.overrideAttrs {
-    dependencies = with self; [ telescope-nvim ];
+    dependencies = with self; [
+      telescope-nvim
+      plenary-nvim
+    ];
   };
 
   clang_complete = super.clang_complete.overrideAttrs {
@@ -616,6 +619,10 @@ in
       };
     };
 
+  codewindow-nvim = super.codewindow-nvim.overrideAttrs {
+    dependencies = with self; [ nvim-treesitter ];
+  };
+
   command-t = super.command-t.overrideAttrs {
     nativeBuildInputs = [
       getconf
@@ -677,6 +684,12 @@ in
     nvimRequireCheck = "CopilotChat";
   };
 
+  copilot-cmp = super.copilot-cmp.overrideAttrs {
+    dependencies = with self; [
+      copilot-lua
+    ];
+  };
+
   copilot-lualine = super.copilot-lualine.overrideAttrs {
     dependencies = with self; [
       copilot-lua
@@ -816,6 +829,12 @@ in
     '';
   };
 
+  darkearth-nvim = super.darkearth-nvim.overrideAttrs {
+    dependencies = with self; [
+      lush-nvim
+    ];
+  };
+
   ddc-filter-matcher_head = super.ddc-filter-matcher_head.overrideAttrs {
     dependencies = with self; [ ddc-vim ];
   };
@@ -905,6 +924,10 @@ in
       '';
   });
 
+  efmls-configs-nvim = super.efmls-configs-nvim.overrideAttrs {
+    dependencies = with self; [ nvim-lspconfig ];
+  };
+
   elixir-tools-nvim = super.elixir-tools-nvim.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
     fixupPhase = ''
@@ -931,6 +954,10 @@ in
     nvimRequireCheck = "flit";
   };
 
+  flutter-tools-nvim = super.flutter-tools-nvim.overrideAttrs {
+    dependencies = with self; [ plenary-nvim ];
+  };
+
   follow-md-links-nvim = super.follow-md-links-nvim.overrideAttrs {
     dependencies = [ self.nvim-treesitter ];
   };
@@ -1002,6 +1029,10 @@ in
     };
   });
 
+  fzf-lsp-nvim = super.fzf-lsp-nvim.overrideAttrs {
+    dependencies = with self; [ plenary-nvim ];
+  };
+
   fzf-lua = super.fzf-lua.overrideAttrs {
     propagatedBuildInputs = [ fzf ];
     # FIXME: address already in use
@@ -1042,8 +1073,11 @@ in
     nvimRequireCheck = "git-worktree";
   };
 
+  guard-collection = super.guard-collection.overrideAttrs {
+    dependencies = [ self.guard-nvim ];
+  };
+
   guard-nvim = super.guard-nvim.overrideAttrs {
-    dependencies = with self; [ guard-collection ];
     nvimRequireCheck = "guard";
   };
 
@@ -1213,6 +1247,11 @@ in
       '';
     };
 
+  LazyVim = super.LazyVim.overrideAttrs {
+    # Any other dependency is optional
+    dependencies = with self; [ lazy-nvim ];
+  };
+
   lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs {
     dependencies = with self; [ nvim-lspconfig ];
     nvimRequireCheck = "lazy-lsp";
@@ -1263,6 +1302,10 @@ in
     nvimRequireCheck = "leetcode";
   };
 
+  legendary-nvim = super.legendary-nvim.overrideAttrs {
+    dependencies = with self; [ sqlite-lua ];
+  };
+
   lens-vim = super.lens-vim.overrideAttrs {
     # remove duplicate g:lens#animate in doc/lens.txt
     # https://github.com/NixOS/nixpkgs/pull/105810#issuecomment-740007985
@@ -1288,6 +1331,35 @@ in
     nvimRequireCheck = "lir";
   };
 
+  lispdocs-nvim = super.lispdocs-nvim.overrideAttrs {
+    dependencies = with self; [
+      conjure
+      sqlite-lua
+      telescope-nvim
+      plenary-nvim
+    ];
+  };
+
+  litee-calltree-nvim = super.litee-calltree-nvim.overrideAttrs {
+    dependencies = with self; [ litee-nvim ];
+  };
+
+  litee-filetree-nvim = super.litee-filetree-nvim.overrideAttrs {
+    dependencies = with self; [ litee-nvim ];
+  };
+
+  litee-symboltree-nvim = super.litee-symboltree-nvim.overrideAttrs {
+    dependencies = with self; [ litee-nvim ];
+  };
+
+  lspcontainers-nvim = super.lspcontainers-nvim.overrideAttrs {
+    dependencies = with self; [ nvim-lspconfig ];
+  };
+
+  lsp_extensions-nvim = super.lsp_extensions-nvim.overrideAttrs {
+    dependencies = with self; [ plenary-nvim ];
+  };
+
   lsp-progress-nvim = neovimUtils.buildNeovimPlugin {
     luaAttr = luaPackages.lsp-progress-nvim;
     nvimRequireCheck = "lsp-progress";
@@ -1400,6 +1472,10 @@ in
     nvimRequireCheck = "middleclass";
   };
 
+  mind-nvim = super.mind-nvim.overrideAttrs {
+    dependencies = with self; [ plenary-nvim ];
+  };
+
   minimap-vim = super.minimap-vim.overrideAttrs {
     preFixup = ''
       substituteInPlace $out/plugin/minimap.vim \
@@ -1424,6 +1500,12 @@ in
     meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/";
   };
 
+  mkdnflow-nvim = super.mkdnflow-nvim.overrideAttrs {
+    dependencies = with self; [
+      plenary-nvim
+    ];
+  };
+
   moveline-nvim =
     let
       version = "2024-07-25";
@@ -1467,6 +1549,10 @@ in
     nvimRequireCheck = "multicursors";
   };
 
+  muren-nvim = super.muren-nvim.overrideAttrs {
+    dependencies = with self; [ plenary-nvim ];
+  };
+
   ncm2 = super.ncm2.overrideAttrs {
     dependencies = with self; [ nvim-yarp ];
     nvimRequireCheck = "ncm2";
@@ -1515,6 +1601,15 @@ in
     nvimRequireCheck = "neorg";
   };
 
+  neorg-telescope = super.neorg-telescope.overrideAttrs {
+    buildInputs = [ luaPackages.lua-utils-nvim ];
+    dependencies = with self; [
+      neorg
+      plenary-nvim
+      telescope-nvim
+    ];
+  };
+
   neotest = super.neotest.overrideAttrs {
     dependencies = with self; [
       nvim-nio
@@ -1523,14 +1618,77 @@ in
     nvimRequirecheck = "neotest";
   };
 
-  neotest-gradle = super.neotest-gradle.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
-    nvimRequirecheck = "neotest-gradle";
+  neotest-bash = super.neotest-bash.overrideAttrs {
+    dependencies = with self; [
+      neotest
+      plenary-nvim
+    ];
+  };
+
+  neotest-dart = super.neotest-dart.overrideAttrs {
+    dependencies = with self; [
+      neotest
+      nvim-nio
+      plenary-nvim
+    ];
+  };
+
+  neotest-deno = super.neotest-deno.overrideAttrs {
+    dependencies = with self; [
+      neotest
+      nvim-nio
+      plenary-nvim
+    ];
+  };
+
+  neotest-dotnet = super.neotest-dotnet.overrideAttrs {
+    dependencies = with self; [
+      neotest
+      nvim-nio
+      plenary-nvim
+    ];
+  };
+
+  neotest-elixir = super.neotest-elixir.overrideAttrs {
+    dependencies = with self; [
+      neotest
+      nvim-nio
+      plenary-nvim
+    ];
+  };
+
+  neotest-foundry = super.neotest-foundry.overrideAttrs {
+    dependencies = with self; [
+      neotest
+      nvim-nio
+      plenary-nvim
+    ];
+  };
+
+  neotest-go = super.neotest-go.overrideAttrs {
+    dependencies = with self; [
+      neotest
+      nvim-nio
+      plenary-nvim
+    ];
   };
 
   neotest-golang = super.neotest-golang.overrideAttrs {
-    dependencies = [ self.nvim-dap-go ];
-    nvimRequirecheck = "neotest-golang";
+    dependencies = with self; [
+      neotest
+      nvim-nio
+      nvim-dap-go
+      nvim-treesitter
+      plenary-nvim
+    ];
+  };
+
+  neotest-gradle = super.neotest-gradle.overrideAttrs {
+    dependencies = with self; [
+      neotest
+      nvim-nio
+      plenary-nvim
+    ];
   };
 
   neotest-gtest = super.neotest-gtest.overrideAttrs {
@@ -1542,6 +1700,13 @@ in
     nvimRequirecheck = "neotest-gtest";
   };
 
+  neotest-haskell = super.neotest-haskell.overrideAttrs {
+    dependencies = with self; [
+      neotest
+      plenary-nvim
+    ];
+  };
+
   neotest-java = super.neotest-java.overrideAttrs {
     dependencies = with self; [
       neotest
@@ -1568,9 +1733,21 @@ in
     nvimRequirecheck = "neotest-pest";
   };
 
+  neotest-phpunit = super.neotest-phpunit.overrideAttrs {
+    dependencies = with self; [
+      neotest
+      plenary-nvim
+      nvim-nio
+    ];
+  };
+
   neotest-playwright = super.neotest-playwright.overrideAttrs {
-    dependencies = [ self.telescope-nvim ];
-    nvimRequirecheck = "neotest-playwright";
+    dependencies = with self; [
+      neotest
+      nvim-nio
+      plenary-nvim
+      telescope-nvim
+    ];
   };
 
   neotest-plenary = super.neotest-plenary.overrideAttrs {
@@ -1591,10 +1768,26 @@ in
     nvimRequirecheck = "neotest-python";
   };
 
+  neotest-rspec = super.neotest-rspec.overrideAttrs {
+    dependencies = with self; [
+      neotest
+      plenary-nvim
+    ];
+  };
+
+  neotest-rust = super.neotest-rust.overrideAttrs {
+    dependencies = with self; [
+      neotest
+      nvim-nio
+      plenary-nvim
+    ];
+  };
+
   neotest-scala = super.neotest-scala.overrideAttrs {
     dependencies = with self; [
       neotest
       nvim-nio
+      plenary-nvim
     ];
     nvimRequirecheck = "neotest-scala";
   };
@@ -1632,6 +1825,10 @@ in
     nvimRequireCheck = "neuron";
   };
 
+  nlsp-settings-nvim = super.nlsp-settings-nvim.overrideAttrs {
+    dependencies = with self; [ nvim-lspconfig ];
+  };
+
   noctis-nvim = super.noctis-nvim.overrideAttrs {
     dependencies = [ self.lush-nvim ];
   };
@@ -1661,6 +1858,23 @@ in
     nvimRequireCheck = "null-ls";
   };
 
+  nvchad = super.nvchad.overrideAttrs {
+    # You've signed up for a distro, providing dependencies.
+    dependencies = with self; [
+      gitsigns-nvim
+      luasnip
+      mason-nvim
+      nvim-cmp
+      nvim-lspconfig
+      telescope-nvim
+      nvim-treesitter
+    ];
+  };
+
+  nvchad-ui = super.nvchad-ui.overrideAttrs {
+    dependencies = with self; [ nvzone-volt ];
+  };
+
   nvim-biscuits = super.nvim-biscuits.overrideAttrs {
     dependencies = with self; [
       nvim-treesitter
@@ -1668,11 +1882,19 @@ in
     ];
   };
 
+  nvim-cokeline = super.nvim-cokeline.overrideAttrs {
+    dependencies = with self; [ plenary-nvim ];
+  };
+
   nvim-coverage = super.nvim-coverage.overrideAttrs {
     dependencies = with self; [ plenary-nvim ];
     nvimRequireCheck = "coverage";
   };
 
+  nvim-fzf-commands = super.nvim-fzf-commands.overrideAttrs {
+    dependencies = with self; [ nvim-fzf ];
+  };
+
   nvim-dap-python = super.nvim-dap-python.overrideAttrs {
     dependencies = with self; [ nvim-dap ];
     nvimRequireCheck = "dap-python";
@@ -1683,6 +1905,10 @@ in
     nvimRequireCheck = "dap-rego";
   };
 
+  nvim-dap-rr = super.nvim-dap-rr.overrideAttrs {
+    dependencies = [ self.nvim-dap ];
+  };
+
   nvim-dap-ui = super.nvim-dap-ui.overrideAttrs {
     dependencies = with self; [
       nvim-dap
@@ -1693,9 +1919,12 @@ in
     nvimRequireCheck = "dapui";
   };
 
-  nvim-dap-rr = super.nvim-dap-rr.overrideAttrs {
-    dependencies = [ self.nvim-dap ];
-    nvimRequireCheck = "nvim-dap-rr";
+  nvim-dap-virtual-text = super.nvim-dap-virtual-text.overrideAttrs {
+    dependencies = with self; [ nvim-dap ];
+  };
+
+  nvim-FeMaco-lua = super.nvim-FeMaco-lua.overrideAttrs {
+    dependencies = with self; [ nvim-treesitter ];
   };
 
   nvim-genghis = super.nvim-genghis.overrideAttrs {
@@ -1784,6 +2013,14 @@ in
     nvimRequireCheck = "nvim-navic";
   };
 
+  nvim-paredit = super.nvim-paredit.overrideAttrs {
+    dependencies = with self; [ nvim-treesitter ];
+  };
+
+  nvim-rip-substitute = super.nvim-rip-substitute.overrideAttrs {
+    buildInputs = [ ripgrep ];
+  };
+
   nvim-spectre = super.nvim-spectre.overrideAttrs (
     old:
     let
@@ -1947,6 +2184,10 @@ in
     nvimRequireCheck = "overseer";
   };
 
+  package-info-nvim = super.package-info-nvim.overrideAttrs {
+    dependencies = [ self.nui-nvim ];
+  };
+
   inherit parinfer-rust;
 
   parpar-nvim = super.parpar-nvim.overrideAttrs {
@@ -1988,6 +2229,10 @@ in
     nvimRequireCheck = "plenary";
   };
 
+  popup-nvim = super.popup-nvim.overrideAttrs {
+    dependencies = with self; [ plenary-nvim ];
+  };
+
   Preview-nvim = super.Preview-nvim.overrideAttrs {
     patches = [
       (substituteAll {
@@ -1997,6 +2242,10 @@ in
     ];
   };
 
+  qmk-nvim = super.qmk-nvim.overrideAttrs {
+    dependencies = [ self.plenary-nvim ];
+  };
+
   range-highlight-nvim = super.range-highlight-nvim.overrideAttrs {
     dependencies = with self; [ cmd-parser-nvim ];
     nvimRequireCheck = "range-highlight";
@@ -2029,6 +2278,10 @@ in
     nvimRequireCheck = "refactoring";
   };
 
+  renamer-nvim = super.renamer-nvim.overrideAttrs {
+    dependencies = [ self.plenary-nvim ];
+  };
+
   # needs  "http" and "json" treesitter grammars too
   rest-nvim = super.rest-nvim.overrideAttrs {
     dependencies = with self; [
@@ -2066,10 +2319,22 @@ in
     nvimRequireCheck = "rustaceanvim";
   };
 
+  rust-tools-nvim = super.rust-tools-nvim.overrideAttrs {
+    dependencies = [ self.nvim-lspconfig ];
+  };
+
+  samodostal-image-nvim = super.samodostal-image-nvim.overrideAttrs {
+    dependencies = [ self.plenary-nvim ];
+  };
+
   scretch-nvim = super.scretch-nvim.overrideAttrs {
     nvimRequireCheck = "scretch";
   };
 
+  searchbox-nvim = super.searchbox-nvim.overrideAttrs {
+    dependencies = [ self.nui-nvim ];
+  };
+
   sg-nvim = super.sg-nvim.overrideAttrs (
     old:
     let
@@ -2122,8 +2387,9 @@ in
 
   smart-open-nvim = super.smart-open-nvim.overrideAttrs {
     dependencies = with self; [
-      telescope-nvim
+      plenary-nvim
       sqlite-lua
+      telescope-nvim
     ];
   };
 
@@ -2352,6 +2618,7 @@ in
     dependencies = with self; [
       sqlite-lua
       telescope-nvim
+      plenary-nvim
     ];
   };
 
@@ -2406,6 +2673,13 @@ in
     ];
   };
 
+  telescope-live-grep-args-nvim = super.telescope-live-grep-args-nvim.overrideAttrs {
+    dependencies = with self; [
+      plenary-nvim
+      telescope-nvim
+    ];
+  };
+
   telescope-lsp-handlers-nvim = super.telescope-lsp-handlers-nvim.overrideAttrs {
     dependencies = with self; [
       plenary-nvim
@@ -2452,7 +2726,10 @@ in
   };
 
   telescope-undo-nvim = super.telescope-undo-nvim.overrideAttrs {
-    dependencies = with self; [ telescope-nvim ];
+    dependencies = with self; [
+      plenary-nvim
+      telescope-nvim
+    ];
   };
 
   telescope-vim-bookmarks-nvim = super.telescope-vim-bookmarks-nvim.overrideAttrs {
@@ -2469,6 +2746,12 @@ in
     ];
   };
 
+  telescope-zf-native-nvim = super.telescope-zf-native-nvim.overrideAttrs {
+    dependencies = with self; [
+      telescope-nvim
+    ];
+  };
+
   quarto-nvim = super.quarto-nvim.overrideAttrs {
     dependencies = with self; [
       nvim-lspconfig

From 567a36cf623e5b66fddaad3481dff72146e0e94d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 26 Nov 2024 09:37:50 -0600
Subject: [PATCH 80/85] vimPlugins: cleanup with self

---
 .../editors/vim/plugins/overrides.nix         | 310 ++++++++----------
 1 file changed, 132 insertions(+), 178 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 07ce96414cc2..a8d88b9d20ad 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -159,12 +159,12 @@ in
   };
 
   animation-nvim = super.animation-nvim.overrideAttrs {
-    dependencies = with self; [ middleclass ];
+    dependencies = [ self.middleclass ];
     nvimRequireCheck = "animation";
   };
 
   autosave-nvim = super.autosave-nvim.overrideAttrs {
-    dependencies = with super; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "autosave";
   };
 
@@ -244,7 +244,7 @@ in
   };
 
   base46 = super.base46.overrideAttrs {
-    dependencies = with self; [ nvchad-ui ];
+    dependencies = [ self.nvchad-ui ];
   };
 
   # The GitHub repository returns 404, which breaks the update script
@@ -263,7 +263,7 @@ in
   blink-cmp = callPackage ./blink-cmp { };
 
   bluloco-nvim = super.bluloco-nvim.overrideAttrs {
-    dependencies = with self; [ lush-nvim ];
+    dependencies = [ self.lush-nvim ];
   };
 
   chadtree = super.chadtree.overrideAttrs {
@@ -332,86 +332,60 @@ in
   };
 
   cmake-tools-nvim = super.cmake-tools-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "cmake-tools";
   };
 
   cmp-ai = super.cmp-ai.overrideAttrs {
-    dependencies = with self; [
-      plenary-nvim
-    ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   cmp-clippy = super.cmp-clippy.overrideAttrs {
-    dependencies = with self; [
-      plenary-nvim
-    ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   cmp-conjure = super.cmp-conjure.overrideAttrs {
-    dependencies = with self; [
-      conjure
-    ];
+    dependencies = [ self.conjure ];
   };
 
   cmp-copilot = super.cmp-copilot.overrideAttrs {
-    dependencies = with self; [
-      copilot-vim
-    ];
+    dependencies = [ self.copilot-vim ];
   };
 
   cmp-dap = super.cmp-dap.overrideAttrs {
-    dependencies = with self; [
-      nvim-dap
-    ];
+    dependencies = [ self.nvim-dap ];
   };
 
   cmp-fuzzy-buffer = super.cmp-fuzzy-buffer.overrideAttrs {
-    dependencies = with self; [
-      fuzzy-nvim
-    ];
+    dependencies = [ self.fuzzy-nvim ];
   };
 
   cmp-fuzzy-path = super.cmp-fuzzy-path.overrideAttrs {
-    dependencies = with self; [
-      fuzzy-nvim
-    ];
+    dependencies = [ self.fuzzy-nvim ];
   };
 
   cmp-git = super.cmp-git.overrideAttrs {
-    dependencies = with self; [
-      plenary-nvim
-    ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   cmp_luasnip = super.cmp_luasnip.overrideAttrs {
-    dependencies = with self; [
-      luasnip
-    ];
+    dependencies = [ self.luasnip ];
   };
 
   cmp-neosnippet = super.cmp-neosnippet.overrideAttrs {
-    dependencies = with self; [
-      neosnippet-vim
-    ];
+    dependencies = [ self.neosnippet-vim ];
   };
 
   cmp-npm = super.cmp-npm.overrideAttrs {
-    dependencies = with self; [
-      plenary-nvim
-    ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs {
-    dependencies = with self; [
-      plenary-nvim
-    ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   cmp-snippy = super.cmp-snippy.overrideAttrs {
-    dependencies = with self; [
-      nvim-snippy
-    ];
+    dependencies = [ self.nvim-snippy ];
   };
 
   cmp-tabnine = super.cmp-tabnine.overrideAttrs {
@@ -424,27 +398,19 @@ in
   };
 
   cmp-tmux = super.cmp-tmux.overrideAttrs {
-    dependencies = [
-      tmux
-    ];
+    dependencies = [ tmux ];
   };
 
   cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs {
-    dependencies = with self; [
-      vim-lsp
-    ];
+    dependencies = [ self.vim-lsp ];
   };
 
   cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs {
-    dependencies = with self; [
-      vimwiki
-    ];
+    dependencies = [ self.vimwiki ];
   };
 
   cmp-zsh = super.cmp-zsh.overrideAttrs {
-    dependencies = [
-      zsh
-    ];
+    dependencies = [ zsh ];
   };
 
   coc-clangd = buildVimPlugin {
@@ -475,7 +441,7 @@ in
   };
 
   codecompanion-nvim = super.codecompanion-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "codecompanion";
   };
 
@@ -518,9 +484,7 @@ in
 
     in
     super.codeium-nvim.overrideAttrs {
-      dependencies = with self; [
-        plenary-nvim
-      ];
+      dependencies = [ self.plenary-nvim ];
       buildPhase = ''
         cat << EOF > lua/codeium/installation_defaults.lua
         return {
@@ -620,7 +584,7 @@ in
     };
 
   codewindow-nvim = super.codewindow-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter ];
   };
 
   command-t = super.command-t.overrideAttrs {
@@ -646,7 +610,7 @@ in
   };
 
   compiler-explorer-nvim = super.compiler-explorer-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "compiler-explorer";
   };
 
@@ -656,12 +620,12 @@ in
   };
 
   completion-buffers = super.completion-buffers.overrideAttrs {
-    dependencies = with self; [ completion-nvim ];
+    dependencies = [ self.completion-nvim ];
     nvimRequireCheck = "completion_buffers";
   };
 
   completion-tabnine = super.completion-tabnine.overrideAttrs {
-    dependencies = with self; [ completion-nvim ];
+    dependencies = [ self.completion-nvim ];
     buildInputs = [ tabnine ];
     postFixup = ''
       mkdir -p $target/binaries
@@ -685,9 +649,7 @@ in
   };
 
   copilot-cmp = super.copilot-cmp.overrideAttrs {
-    dependencies = with self; [
-      copilot-lua
-    ];
+    dependencies = [ self.copilot-lua ];
   };
 
   copilot-lualine = super.copilot-lualine.overrideAttrs {
@@ -774,8 +736,8 @@ in
     };
 
   cornelis = super.cornelis.overrideAttrs {
-    dependencies = with self; [ vim-textobj-user ];
-    opt = with self; [ vim-which-key ];
+    dependencies = [ self.vim-textobj-user ];
+    opt = [ self.vim-which-key ];
     # Unconditionally use the cornelis binary provided by the top-level package:
     patches = [ ./patches/cornelis/0001-Unconditionally-use-global-binary.patch ];
     postInstall = ''
@@ -800,7 +762,7 @@ in
   };
 
   crates-nvim = super.crates-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "crates";
   };
 
@@ -830,30 +792,28 @@ in
   };
 
   darkearth-nvim = super.darkearth-nvim.overrideAttrs {
-    dependencies = with self; [
-      lush-nvim
-    ];
+    dependencies = [ self.lush-nvim ];
   };
 
   ddc-filter-matcher_head = super.ddc-filter-matcher_head.overrideAttrs {
-    dependencies = with self; [ ddc-vim ];
+    dependencies = [ self.ddc-vim ];
   };
 
   ddc-source-lsp = super.ddc-source-lsp.overrideAttrs {
-    dependencies = with self; [ ddc-vim ];
+    dependencies = [ self.ddc-vim ];
     nvimRequireCheck = "ddc_source_lsp";
   };
 
   ddc-vim = super.ddc-vim.overrideAttrs {
-    dependencies = with self; [ denops-vim ];
+    dependencies = [ self.denops-vim ];
   };
 
   ddc-filter-sorter_rank = super.ddc-filter-sorter_rank.overrideAttrs {
-    dependencies = with self; [ ddc-vim ];
+    dependencies = [ self.ddc-vim ];
   };
 
   ddc-ui-native = super.ddc-ui-native.overrideAttrs {
-    dependencies = with self; [ ddc-vim ];
+    dependencies = [ self.ddc-vim ];
   };
 
   ddc-ui-pum = super.ddc-ui-pum.overrideAttrs {
@@ -864,7 +824,7 @@ in
   };
 
   defx-nvim = super.defx-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-yarp ];
+    dependencies = [ self.nvim-yarp ];
   };
 
   denops-vim = super.denops-vim.overrideAttrs {
@@ -892,7 +852,7 @@ in
   };
 
   deoplete-khard = super.deoplete-khard.overrideAttrs {
-    dependencies = with self; [ deoplete-nvim ];
+    dependencies = [ self.deoplete-nvim ];
     passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ];
     meta = {
       description = "Address-completion for khard via deoplete";
@@ -903,12 +863,12 @@ in
   };
 
   diagram-nvim = super.diagram-nvim.overrideAttrs {
-    dependencies = with self; [ image-nvim ];
+    dependencies = [ self.image-nvim ];
     nvimRequireCheck = "diagram";
   };
 
   diffview-nvim = super.diffview-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
 
     doInstallCheck = true;
     nvimRequireCheck = "diffview";
@@ -925,11 +885,11 @@ in
   });
 
   efmls-configs-nvim = super.efmls-configs-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-lspconfig ];
+    dependencies = [ self.nvim-lspconfig ];
   };
 
   elixir-tools-nvim = super.elixir-tools-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     fixupPhase = ''
       patchShebangs $(find $out/bin/ -type f -not -name credo-language-server)
     '';
@@ -937,7 +897,7 @@ in
   };
 
   executor-nvim = super.executor-nvim.overrideAttrs {
-    dependencies = with self; [ nui-nvim ];
+    dependencies = [ self.nui-nvim ];
     nvimRequireCheck = "executor";
   };
 
@@ -950,12 +910,12 @@ in
   };
 
   flit-nvim = super.flit-nvim.overrideAttrs {
-    dependencies = with self; [ leap-nvim ];
+    dependencies = [ self.leap-nvim ];
     nvimRequireCheck = "flit";
   };
 
   flutter-tools-nvim = super.flutter-tools-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   follow-md-links-nvim = super.follow-md-links-nvim.overrideAttrs {
@@ -1002,7 +962,7 @@ in
     });
 
   fuzzy-nvim = super.fuzzy-nvim.overrideAttrs {
-    dependencies = with self; [ telescope-fzf-native-nvim ];
+    dependencies = [ self.telescope-fzf-native-nvim ];
     nvimRequireCheck = "fuzzy_nvim";
   };
 
@@ -1022,7 +982,7 @@ in
       jq
       gawk
     ];
-    dependencies = with self; [ fzf-vim ];
+    dependencies = [ self.fzf-vim ];
     passthru = oa.passthru // {
 
       initLua = "vim.g.hoogle_fzf_cache_file = vim.fn.stdpath('cache')..'/hoogle_cache.json";
@@ -1030,7 +990,7 @@ in
   });
 
   fzf-lsp-nvim = super.fzf-lsp-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   fzf-lua = super.fzf-lua.overrideAttrs {
@@ -1040,7 +1000,7 @@ in
   };
 
   fzf-vim = super.fzf-vim.overrideAttrs {
-    dependencies = with self; [ fzfWrapper ];
+    dependencies = [ self.fzfWrapper ];
   };
 
   # Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim
@@ -1059,17 +1019,17 @@ in
   };
 
   gitlinker-nvim = super.gitlinker-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "gitlinker";
   };
 
   gitsigns-nvim = super.gitsigns-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "gitsigns";
   };
 
   git-worktree-nvim = super.git-worktree-nvim.overrideAttrs {
-    dependencies = with super; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "git-worktree";
   };
 
@@ -1092,12 +1052,12 @@ in
   };
 
   harpoon = super.harpoon.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "harpoon";
   };
 
   harpoon2 = super.harpoon2.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "harpoon";
   };
 
@@ -1107,7 +1067,7 @@ in
   };
 
   haskell-scope-highlighting-nvim = super.haskell-scope-highlighting-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter ];
     nvimRequireCheck = "haskell-scope-highlighting";
   };
 
@@ -1134,7 +1094,7 @@ in
   };
 
   hunk-nvim = super.hunk-nvim.overrideAttrs {
-    dependencies = with self; [ nui-nvim ];
+    dependencies = [ self.nui-nvim ];
     nvimRequireCheck = "hunk";
   };
 
@@ -1189,7 +1149,7 @@ in
   };
 
   jellybeans-nvim = super.jellybeans-nvim.overrideAttrs {
-    dependencies = with self; [ lush-nvim ];
+    dependencies = [ self.lush-nvim ];
   };
 
   jupytext-nvim = super.jupytext-nvim.overrideAttrs {
@@ -1249,11 +1209,11 @@ in
 
   LazyVim = super.LazyVim.overrideAttrs {
     # Any other dependency is optional
-    dependencies = with self; [ lazy-nvim ];
+    dependencies = [ self.lazy-nvim ];
   };
 
   lazy-lsp-nvim = super.lazy-lsp-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-lspconfig ];
+    dependencies = [ self.nvim-lspconfig ];
     nvimRequireCheck = "lazy-lsp";
   };
 
@@ -1303,7 +1263,7 @@ in
   };
 
   legendary-nvim = super.legendary-nvim.overrideAttrs {
-    dependencies = with self; [ sqlite-lua ];
+    dependencies = [ self.sqlite-lua ];
   };
 
   lens-vim = super.lens-vim.overrideAttrs {
@@ -1319,7 +1279,7 @@ in
   };
 
   lf-vim = super.lf-vim.overrideAttrs {
-    dependencies = with self; [ vim-floaterm ];
+    dependencies = [ self.vim-floaterm ];
   };
 
   lightline-bufferline = super.lightline-bufferline.overrideAttrs {
@@ -1327,7 +1287,7 @@ in
   };
 
   lir-nvim = super.lir-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "lir";
   };
 
@@ -1341,23 +1301,23 @@ in
   };
 
   litee-calltree-nvim = super.litee-calltree-nvim.overrideAttrs {
-    dependencies = with self; [ litee-nvim ];
+    dependencies = [ self.litee-nvim ];
   };
 
   litee-filetree-nvim = super.litee-filetree-nvim.overrideAttrs {
-    dependencies = with self; [ litee-nvim ];
+    dependencies = [ self.litee-nvim ];
   };
 
   litee-symboltree-nvim = super.litee-symboltree-nvim.overrideAttrs {
-    dependencies = with self; [ litee-nvim ];
+    dependencies = [ self.litee-nvim ];
   };
 
   lspcontainers-nvim = super.lspcontainers-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-lspconfig ];
+    dependencies = [ self.nvim-lspconfig ];
   };
 
   lsp_extensions-nvim = super.lsp_extensions-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   lsp-progress-nvim = neovimUtils.buildNeovimPlugin {
@@ -1371,7 +1331,7 @@ in
   };
 
   lualine-lsp-progress = super.lualine-lsp-progress.overrideAttrs {
-    dependencies = with self; [ lualine-nvim ];
+    dependencies = [ self.lualine-nvim ];
   };
 
   luasnip = super.luasnip.overrideAttrs {
@@ -1380,7 +1340,7 @@ in
   };
 
   luasnip-latex-snippets-nvim = super.luasnip-latex-snippets-nvim.overrideAttrs {
-    dependencies = with self; [ luasnip ];
+    dependencies = [ self.luasnip ];
   };
 
   lz-n = neovimUtils.buildNeovimPlugin {
@@ -1457,7 +1417,7 @@ in
   };
 
   mason-tool-installer-nvim = super.mason-tool-installer-nvim.overrideAttrs {
-    dependencies = with self; [ mason-nvim ];
+    dependencies = [ self.mason-nvim ];
     nvimRequireCheck = "mason-tool-installer";
   };
 
@@ -1473,7 +1433,7 @@ in
   };
 
   mind-nvim = super.mind-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   minimap-vim = super.minimap-vim.overrideAttrs {
@@ -1501,9 +1461,7 @@ in
   };
 
   mkdnflow-nvim = super.mkdnflow-nvim.overrideAttrs {
-    dependencies = with self; [
-      plenary-nvim
-    ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   moveline-nvim =
@@ -1550,11 +1508,11 @@ in
   };
 
   muren-nvim = super.muren-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   ncm2 = super.ncm2.overrideAttrs {
-    dependencies = with self; [ nvim-yarp ];
+    dependencies = [ self.nvim-yarp ];
     nvimRequireCheck = "ncm2";
   };
 
@@ -1567,30 +1525,30 @@ in
   };
 
   ncm2-neoinclude = super.ncm2-neoinclude.overrideAttrs {
-    dependencies = with self; [ neoinclude-vim ];
+    dependencies = [ self.neoinclude-vim ];
   };
 
   ncm2-neosnippet = super.ncm2-neosnippet.overrideAttrs {
-    dependencies = with self; [ neosnippet-vim ];
+    dependencies = [ self.neosnippet-vim ];
   };
 
   ncm2-syntax = super.ncm2-syntax.overrideAttrs {
-    dependencies = with self; [ neco-syntax ];
+    dependencies = [ self.neco-syntax ];
   };
 
   ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs {
-    dependencies = with self; [ ultisnips ];
+    dependencies = [ self.ultisnips ];
   };
 
   neoconf-nvim = super.neoconf-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-lspconfig ];
+    dependencies = [ self.nvim-lspconfig ];
 
     doInstallCheck = true;
     nvimRequireCheck = "neoconf";
   };
 
   neogit = super.neogit.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "neogit";
   };
 
@@ -1826,7 +1784,7 @@ in
   };
 
   nlsp-settings-nvim = super.nlsp-settings-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-lspconfig ];
+    dependencies = [ self.nvim-lspconfig ];
   };
 
   noctis-nvim = super.noctis-nvim.overrideAttrs {
@@ -1834,7 +1792,7 @@ in
   };
 
   noice-nvim = super.noice-nvim.overrideAttrs {
-    dependencies = with self; [ nui-nvim ];
+    dependencies = [ self.nui-nvim ];
     nvimRequirecheck = "noice";
   };
 
@@ -1854,7 +1812,7 @@ in
   };
 
   null-ls-nvim = super.null-ls-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "null-ls";
   };
 
@@ -1872,7 +1830,7 @@ in
   };
 
   nvchad-ui = super.nvchad-ui.overrideAttrs {
-    dependencies = with self; [ nvzone-volt ];
+    dependencies = [ self.nvzone-volt ];
   };
 
   nvim-biscuits = super.nvim-biscuits.overrideAttrs {
@@ -1883,25 +1841,25 @@ in
   };
 
   nvim-cokeline = super.nvim-cokeline.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   nvim-coverage = super.nvim-coverage.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "coverage";
   };
 
   nvim-fzf-commands = super.nvim-fzf-commands.overrideAttrs {
-    dependencies = with self; [ nvim-fzf ];
+    dependencies = [ self.nvim-fzf ];
   };
 
   nvim-dap-python = super.nvim-dap-python.overrideAttrs {
-    dependencies = with self; [ nvim-dap ];
+    dependencies = [ self.nvim-dap ];
     nvimRequireCheck = "dap-python";
   };
 
   nvim-dap-rego = super.nvim-dap-rego.overrideAttrs {
-    dependencies = with self; [ nvim-dap ];
+    dependencies = [ self.nvim-dap ];
     nvimRequireCheck = "dap-rego";
   };
 
@@ -1920,11 +1878,11 @@ in
   };
 
   nvim-dap-virtual-text = super.nvim-dap-virtual-text.overrideAttrs {
-    dependencies = with self; [ nvim-dap ];
+    dependencies = [ self.nvim-dap ];
   };
 
   nvim-FeMaco-lua = super.nvim-FeMaco-lua.overrideAttrs {
-    dependencies = with self; [ nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter ];
   };
 
   nvim-genghis = super.nvim-genghis.overrideAttrs {
@@ -1935,9 +1893,7 @@ in
   };
 
   nvim-gps = super.nvim-gps.overrideAttrs {
-    dependencies = with self; [
-      nvim-treesitter
-    ];
+    dependencies = [ self.nvim-treesitter ];
   };
 
   nvim-lsp-file-operations = super.nvim-lsp-file-operations.overrideAttrs {
@@ -1946,12 +1902,12 @@ in
   };
 
   nvim-lsputils = super.nvim-lsputils.overrideAttrs {
-    dependencies = with self; [ popfix ];
+    dependencies = [ self.popfix ];
     nvimRequireCheck = "lsputil.codeAction";
   };
 
   nvim-metals = super.nvim-metals.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     dontBuild = true;
     nvimRequireCheck = "metals";
   };
@@ -2042,7 +1998,7 @@ in
       };
     in
     {
-      dependencies = with self; [ plenary-nvim ];
+      dependencies = [ self.plenary-nvim ];
       postInstall = ''
         ln -s ${spectre_oxi}/lib/libspectre_oxi.* $out/lua/spectre_oxi.so
       '';
@@ -2097,20 +2053,20 @@ in
   };
 
   nvim-ufo = super.nvim-ufo.overrideAttrs {
-    dependencies = with self; [ promise-async ];
+    dependencies = [ self.promise-async ];
     nvimRequireCheck = "ufo";
   };
 
   nvzone-menu = super.nvzone-menu.overrideAttrs {
-    dependencies = with self; [ nvzone-volt ];
+    dependencies = [ self.nvzone-volt ];
   };
 
   nvzone-minty = super.nvzone-minty.overrideAttrs {
-    dependencies = with self; [ nvzone-volt ];
+    dependencies = [ self.nvzone-volt ];
   };
 
   obsidian-nvim = super.obsidian-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "obsidian";
   };
 
@@ -2230,7 +2186,7 @@ in
   };
 
   popup-nvim = super.popup-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   Preview-nvim = super.Preview-nvim.overrideAttrs {
@@ -2247,7 +2203,7 @@ in
   };
 
   range-highlight-nvim = super.range-highlight-nvim.overrideAttrs {
-    dependencies = with self; [ cmd-parser-nvim ];
+    dependencies = [ self.cmd-parser-nvim ];
     nvimRequireCheck = "range-highlight";
   };
 
@@ -2305,7 +2261,7 @@ in
   };
 
   roslyn-nvim = super.roslyn-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-lspconfig ];
+    dependencies = [ self.nvim-lspconfig ];
     nvimRequireCheck = "roslyn";
   };
 
@@ -2366,7 +2322,7 @@ in
       };
     in
     {
-      dependencies = with self; [ plenary-nvim ];
+      dependencies = [ self.plenary-nvim ];
       postInstall = ''
         mkdir -p $out/target/debug
         ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug
@@ -2482,7 +2438,7 @@ in
   );
 
   ssr = super.ssr-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter ];
     nvimRequireCheck = "ssr";
   };
 
@@ -2561,7 +2517,7 @@ in
     };
 
   syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs {
-    dependencies = with self; [ nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter ];
     meta.maintainers = with lib.maintainers; [ callumio ];
     nvimRequireCheck = "syntax-tree-surfer";
   };
@@ -2623,7 +2579,7 @@ in
   };
 
   telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs {
-    dependencies = with self; [ telescope-nvim ];
+    dependencies = [ self.telescope-nvim ];
     buildPhase = "make";
     meta.platforms = lib.platforms.all;
   };
@@ -2636,7 +2592,7 @@ in
   };
 
   telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: {
-    dependencies = with self; [ telescope-nvim ];
+    dependencies = [ self.telescope-nvim ];
     preFixup =
       let
         fzy-lua-native-path = "deps/fzy-lua-native";
@@ -2696,11 +2652,11 @@ in
   };
 
   telescope-project-nvim = super.telescope-project-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   telescope-nvim = super.telescope-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
   };
 
   telescope-smart-history-nvim = super.telescope-smart-history-nvim.overrideAttrs {
@@ -2711,11 +2667,11 @@ in
   };
 
   telescope-symbols-nvim = super.telescope-symbols-nvim.overrideAttrs {
-    dependencies = with self; [ telescope-nvim ];
+    dependencies = [ self.telescope-nvim ];
   };
 
   telescope-ui-select-nvim = super.telescope-ui-select-nvim.overrideAttrs {
-    dependencies = with self; [ telescope-nvim ];
+    dependencies = [ self.telescope-nvim ];
   };
 
   telescope-ultisnips-nvim = super.telescope-ultisnips-nvim.overrideAttrs {
@@ -2747,9 +2703,7 @@ in
   };
 
   telescope-zf-native-nvim = super.telescope-zf-native-nvim.overrideAttrs {
-    dependencies = with self; [
-      telescope-nvim
-    ];
+    dependencies = with self; [ telescope-nvim ];
   };
 
   quarto-nvim = super.quarto-nvim.overrideAttrs {
@@ -2797,7 +2751,7 @@ in
   };
 
   tssorter-nvim = super.tssorter-nvim.overrideAttrs {
-    dependencies = with self; [ nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter ];
     nvimRequireCheck = "tssorter";
   };
 
@@ -2870,19 +2824,19 @@ in
   };
 
   vim-addon-async = super.vim-addon-async.overrideAttrs {
-    dependencies = with self; [ vim-addon-signs ];
+    dependencies = [ self.vim-addon-signs ];
   };
 
   vim-addon-background-cmd = super.vim-addon-background-cmd.overrideAttrs {
-    dependencies = with self; [ vim-addon-mw-utils ];
+    dependencies = [ self.vim-addon-mw-utils ];
   };
 
   vim-addon-completion = super.vim-addon-completion.overrideAttrs {
-    dependencies = with self; [ tlib_vim ];
+    dependencies = [ self.tlib_vim ];
   };
 
   vim-addon-goto-thing-at-cursor = super.vim-addon-goto-thing-at-cursor.overrideAttrs {
-    dependencies = with self; [ tlib_vim ];
+    dependencies = [ self.tlib_vim ];
   };
 
   vim-addon-manager = super.vim-addon-manager.overrideAttrs {
@@ -2946,7 +2900,7 @@ in
   };
 
   vim-bazel = super.vim-bazel.overrideAttrs {
-    dependencies = with self; [ vim-maktaba ];
+    dependencies = [ self.vim-maktaba ];
   };
 
   vim-beancount = super.vim-beancount.overrideAttrs {
@@ -2956,7 +2910,7 @@ in
   vim-clap = callPackage ./vim-clap { };
 
   vim-codefmt = super.vim-codefmt.overrideAttrs {
-    dependencies = with self; [ vim-maktaba ];
+    dependencies = [ self.vim-maktaba ];
   };
 
   # Due to case-sensitivety issues, the hash differs on Darwin systems, see:
@@ -2986,7 +2940,7 @@ in
   };
 
   vim-easytags = super.vim-easytags.overrideAttrs {
-    dependencies = with self; [ vim-misc ];
+    dependencies = [ self.vim-misc ];
     patches = [
       (fetchpatch {
         # https://github.com/xolox/vim-easytags/pull/170 fix version detection for universal-ctags
@@ -3033,7 +2987,7 @@ in
     };
 
   vim-gist = super.vim-gist.overrideAttrs {
-    dependencies = with self; [ webapi-vim ];
+    dependencies = [ self.webapi-vim ];
   };
 
   vim-grammarous = super.vim-grammarous.overrideAttrs {
@@ -3099,7 +3053,7 @@ in
   };
 
   vim-pluto = super.vim-pluto.overrideAttrs {
-    dependencies = with self; [ denops-vim ];
+    dependencies = [ self.denops-vim ];
   };
 
   # The GitHub repository returns 404, which breaks the update script
@@ -3127,7 +3081,7 @@ in
   };
 
   vim-speeddating = super.vim-speeddating.overrideAttrs {
-    dependencies = with self; [ vim-repeat ];
+    dependencies = [ self.vim-repeat ];
   };
 
   vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: {
@@ -3141,7 +3095,7 @@ in
   });
 
   vim-surround = super.vim-surround.overrideAttrs {
-    dependencies = with self; [ vim-repeat ];
+    dependencies = [ self.vim-repeat ];
   };
 
   vim-tabby = super.vim-tabby.overrideAttrs {
@@ -3149,12 +3103,12 @@ in
   };
 
   vim-textobj-entire = super.vim-textobj-entire.overrideAttrs {
-    dependencies = with self; [ vim-textobj-user ];
+    dependencies = [ self.vim-textobj-user ];
     meta.maintainers = with lib.maintainers; [ farlion ];
   };
 
   vim-unimpaired = super.vim-unimpaired.overrideAttrs {
-    dependencies = with self; [ vim-repeat ];
+    dependencies = [ self.vim-repeat ];
   };
 
   vim-wakatime = super.vim-wakatime.overrideAttrs {
@@ -3191,7 +3145,7 @@ in
     pname = "vim2nix";
     version = "1.0";
     src = ./vim2nix;
-    dependencies = with self; [ vim-addon-manager ];
+    dependencies = [ self.vim-addon-manager ];
   };
 
   vimacs = super.vimacs.overrideAttrs {
@@ -3244,7 +3198,7 @@ in
   };
 
   vimshell-vim = super.vimshell-vim.overrideAttrs {
-    dependencies = with self; [ vimproc-vim ];
+    dependencies = [ self.vimproc-vim ];
   };
 
   vim-zettel = super.vim-zettel.overrideAttrs {
@@ -3263,7 +3217,7 @@ in
   };
 
   wtf-nvim = super.wtf-nvim.overrideAttrs {
-    dependencies = with self; [ nui-nvim ];
+    dependencies = [ self.nui-nvim ];
     nvimRequireCheck = "wtf";
   };
 
@@ -3272,7 +3226,7 @@ in
   };
 
   yazi-nvim = super.yazi-nvim.overrideAttrs {
-    dependencies = with self; [ plenary-nvim ];
+    dependencies = [ self.plenary-nvim ];
     nvimRequireCheck = "yazi";
   };
 

From b50564b9387d507d0d28f9fbd1378e1f4f86e52c Mon Sep 17 00:00:00 2001
From: Pablo Ovelleiro Corral <mail@pablo.tools>
Date: Wed, 27 Nov 2024 22:44:55 +0100
Subject: [PATCH 81/85] dropbox: add version and pname

---
 pkgs/applications/networking/dropbox/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 158f41abe207..58f55f0b9c15 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -29,7 +29,8 @@ let
 in
 
 buildFHSEnv {
-  name = "dropbox";
+  inherit version;
+  pname = "dropbox";
 
   # The dropbox-cli command `dropbox start` starts the dropbox daemon in a
   # separate session, and wants the daemon to outlive the launcher.  Enabling

From 3b074e283e3465b050d44ba2a04fd5dbde151cf1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Nov 2024 11:13:32 +0000
Subject: [PATCH 82/85] terraform-providers.tfe: 0.59.0 -> 0.60.1

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 2ad5a2eacca3..9b13d8d07657 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1264,13 +1264,13 @@
     "vendorHash": null
   },
   "tfe": {
-    "hash": "sha256-v5DHEp/O0y4TrOpqOfkBtv4IWTvXV2WPypsRUj3XgOw=",
+    "hash": "sha256-gCgbov6Psb884CJjYBIQM0180gwEQIt3yjXlZpgODao=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
     "owner": "hashicorp",
     "repo": "terraform-provider-tfe",
-    "rev": "v0.59.0",
+    "rev": "v0.60.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-LgTSyu1TzGT+SV2y9Xoqxv2F828nSTIJp03yMV9OkjM="
+    "vendorHash": "sha256-8k2t5oUBzA9qMtmkJiq4wNpKpUT+Y83vx/TiUDs+B68="
   },
   "thunder": {
     "hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=",

From 817e1ed8f409c53fd08e173b8a5027d1fcbde598 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Nov 2024 21:08:56 +0000
Subject: [PATCH 83/85] terraform-providers.minio: 2.5.1 -> 3.2.1

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 9b13d8d07657..9aa869cc1b07 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -813,13 +813,13 @@
     "vendorHash": "sha256-cFt/fbgJsLATi9aolKl9ra1xAz9zp3JjWk+a5aWs88o="
   },
   "minio": {
-    "hash": "sha256-h2zGfU4Ud5sZ2zjcsWGnaVpGRPTpWVJYTIUvWMrF7AQ=",
+    "hash": "sha256-aSEzsncqNLWfVnnGfz/fDpRw9w2muGnybX8WYd1tP/Y=",
     "homepage": "https://registry.terraform.io/providers/aminueza/minio",
     "owner": "aminueza",
     "repo": "terraform-provider-minio",
-    "rev": "v2.5.1",
+    "rev": "v3.2.1",
     "spdx": "AGPL-3.0",
-    "vendorHash": "sha256-Gn4P4NIksv8S4DmnuYArxdSQDQsyCeayJJAIkmm/I6A="
+    "vendorHash": "sha256-a9v1nVG3NiuyHwJGhIKKKXFDp4/Cb533EJxrfqK9h/A="
   },
   "mongodbatlas": {
     "hash": "sha256-ztdzVTCQDPOgXVv/39SDfaNM4wR/zh5ReikEGz4S8Jw=",

From 07fc04c4595cc4391274d9a5fd3c013dc4db65bb Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Wed, 27 Nov 2024 11:32:57 -0500
Subject: [PATCH 84/85] terraform: 1.9.8 -> 1.10.0

Diff: https://github.com/hashicorp/terraform/compare/v1.9.8...v1.10.0

Changelog: https://github.com/hashicorp/terraform/blob/v1.10.0/CHANGELOG.md
---
 pkgs/applications/networking/cluster/terraform/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 8e7a7381a912..92ff4ad46c1d 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -165,9 +165,9 @@ rec {
   mkTerraform = attrs: pluggable (generic attrs);
 
   terraform_1 = mkTerraform {
-    version = "1.9.8";
-    hash = "sha256-0xBhOdaIbw1fLmbI4KDvQoHD4BmVZoiMT/zv9MnwuD4=";
-    vendorHash = "sha256-tH9KQF4oHcQh34ikB9Bx6fij/iLZN+waxv5ZilqGGlU=";
+    version = "1.10.0";
+    hash = "sha256-GvFBefp1RWqgB79Sv+2vYZyTjeLEYNsXFJrJxEUJAlY=";
+    vendorHash = "sha256-UmPnOfjR6kYI0TMH2J54LzDeDGJKMkAC0xZk6xstIuk=";
     patches = [ ./provider-path-0_15.patch ];
     passthru = {
       inherit plugins;

From 64d681ac931f182518b09909a217bca527ff9a71 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Thu, 28 Nov 2024 00:22:37 +0100
Subject: [PATCH 85/85] gh: 2.62.0 -> 2.63.0

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

diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix
index 5e739c3caa8a..8ee42672be39 100644
--- a/pkgs/by-name/gh/gh/package.nix
+++ b/pkgs/by-name/gh/gh/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "2.62.0";
+  version = "2.63.0";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1nJCI+MLqZnEeXXHYI/GbZoPqIuIyQO5kFkPiLN+Y6I=";
+    hash = "sha256-r60mqFMvgZ39hBjehHrjqDsCzznyQDcXJmqIrn62Jvw=";
   };
 
-  vendorHash = "sha256-b8HO4mevQcfX/VpJv1ZefXWAeXyhsy6074fvVNoH/8Y=";
+  vendorHash = "sha256-vdyArSBBF6ImYbwzAJCWbLihCtJuvxN6ooymwj32ywQ=";
 
   nativeBuildInputs = [ installShellFiles ];