From 3c12ef3f219c1a0f458d72e7b460782287974bbd Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 9 May 2024 20:53:46 +0200
Subject: [PATCH 001/135] nixos/firewall: fix reverse path check failures with
 IPsec

The endpoint of an IPsec tunnel receives encrypted IPsec packets that
are first decrypted and then forwarded to the intended destination.
The decrypted traffic appears to originate from the same interface it
came in from, so in most cases these packets will fail the reverse path
check even if legitimate.

This change adds an exception to not reject packets that were previously
IPsec-encrypted, meaning the have been accepted, decrypted and are in
the process of being forwarded to their final destinal.

Sources:

  - https://www.kernel.org/doc/Documentation/networking/xfrm_device.txt
  - https://git.netfilter.org/nftables/commit/?id=49f6e9a846c6c8325b95debe04d5ebc3c01246fb
  - https://git.netfilter.org/nftables/commit/?id=8f55ed41d007061bd8aae94fee2bda172c0e8996
  - https://thermalcircle.de/doku.php?id=blog:linux:nftables_demystifying_ipsec_expressions
---
 nixos/modules/services/networking/firewall-iptables.nix | 3 +++
 nixos/modules/services/networking/firewall-nftables.nix | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/nixos/modules/services/networking/firewall-iptables.nix b/nixos/modules/services/networking/firewall-iptables.nix
index 91756f826fe8..68895189bcae 100644
--- a/nixos/modules/services/networking/firewall-iptables.nix
+++ b/nixos/modules/services/networking/firewall-iptables.nix
@@ -123,6 +123,9 @@ let
       # Allows this host to act as a DHCP4 client without first having to use APIPA
       iptables -t mangle -A nixos-fw-rpfilter -p udp --sport 67 --dport 68 -j RETURN
 
+      # Allows decrypted packets from an IPsec VPN
+      ip46tables -t mangle -A nixos-fw-rpfilter -m policy --dir in --pol ipsec -j RETURN
+
       # Allows this host to act as a DHCPv4 server
       iptables -t mangle -A nixos-fw-rpfilter -s 0.0.0.0 -d 255.255.255.255 -p udp --sport 68 --dport 67 -j RETURN
 
diff --git a/nixos/modules/services/networking/firewall-nftables.nix b/nixos/modules/services/networking/firewall-nftables.nix
index a5ee7efc3c32..661d5c9fb1a6 100644
--- a/nixos/modules/services/networking/firewall-nftables.nix
+++ b/nixos/modules/services/networking/firewall-nftables.nix
@@ -82,6 +82,11 @@ in
       }
     ];
 
+    networking.nftables.preCheckRuleset = ''
+      # can't validate IPsec rules
+      sed '/meta ipsec/d' -i ruleset.conf
+    '';
+
     networking.nftables.tables."nixos-fw".family = "inet";
     networking.nftables.tables."nixos-fw".content = ''
         ${optionalString (cfg.checkReversePath != false) ''
@@ -89,6 +94,7 @@ in
             type filter hook prerouting priority mangle + 10; policy drop;
 
             meta nfproto ipv4 udp sport . udp dport { 67 . 68, 68 . 67 } accept comment "DHCPv4 client/server"
+            meta ipsec exists accept comment "decrypted packets from an IPsec VPN"
             fib saddr . mark ${optionalString (cfg.checkReversePath != "loose") ". iif"} oif exists accept
 
             jump rpfilter-allow

From fa5ae18c143c299ad080be109d39cb2a29f906bb Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 11 May 2024 15:56:19 +0200
Subject: [PATCH 002/135] nixos/tests/firewall: fix deprecation warning

---
 nixos/tests/firewall.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix
index dd7551f143a5..12c6468eb7a5 100644
--- a/nixos/tests/firewall.nix
+++ b/nixos/tests/firewall.nix
@@ -36,7 +36,7 @@ import ./make-test-python.nix ( { pkgs, nftables, ... } : {
     };
 
   testScript = { nodes, ... }: let
-    newSystem = nodes.walled2.config.system.build.toplevel;
+    newSystem = nodes.walled2.system.build.toplevel;
     unit = if nftables then "nftables" else "firewall";
   in ''
     start_all()

From 24deb859ebc654df7d6737104c9c661e29981534 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 28 Jan 2024 01:58:24 +0400
Subject: [PATCH 003/135] =?UTF-8?q?nanomq:=200.20.8=20=E2=86=92=200.21.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/servers/mqtt/nanomq/default.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/servers/mqtt/nanomq/default.nix b/pkgs/servers/mqtt/nanomq/default.nix
index 567e9392abde..306ce1387acc 100644
--- a/pkgs/servers/mqtt/nanomq/default.nix
+++ b/pkgs/servers/mqtt/nanomq/default.nix
@@ -25,13 +25,13 @@ let
   # bit absurd - repo doesn't even have a license.
   idl-serial = stdenv.mkDerivation {
     pname = "idl-serial";
-    version = "unstable-2023-03-29";
+    version = "unstable-2023-09-28";
 
     src = fetchFromGitHub {
       owner = "nanomq";
       repo = "idl-serial";
-      rev = "908c364dab4c0dcdd77b8de698d29c8a0b6d3830";
-      hash = "sha256-3DS9DuzHN7BevfgiekUmKKH9ej9wKTrt6Fuh427NC4I=";
+      rev = "cf63cb2c4fbe2ecfba569979b89e20e1190b5ed4";
+      hash = "sha256-HM5TSMfEr4uv5BuNCQjyZganSQ/ZqT3xZQp0KLmjIEc=";
     };
 
     nativeBuildInputs = [ cmake ninja flex bison ];
@@ -42,13 +42,13 @@ let
 
 in stdenv.mkDerivation (finalAttrs: {
   pname = "nanomq";
-  version = "0.20.8";
+  version = "0.21.8";
 
   src = fetchFromGitHub {
     owner = "emqx";
     repo = "nanomq";
     rev = finalAttrs.version;
-    hash = "sha256-VCKlXQ7qvBab+wRDnJ6EUA5qaQ36gTFfuerN1GU6sW0=";
+    hash = "sha256-O9UrUkD61OicY1L4sL2PX/9aOpFkJpjm2SWoP2cKXyA=";
     fetchSubmodules = true;
   };
 
@@ -62,16 +62,16 @@ in stdenv.mkDerivation (finalAttrs: {
   buildInputs = [ cyclonedds libmysqlclient mariadb mbedtls sqlite zeromq ];
 
   cmakeFlags = [
-    "-DBUILD_BENCH=ON"
-    "-DBUILD_DDS_PROXY=ON"
-    "-DBUILD_NANOMQ_CLI=ON"
-    "-DBUILD_ZMQ_GATEWAY=ON"
-    "-DENABLE_RULE_ENGINE=ON"
-    "-DNNG_ENABLE_SQLITE=ON"
-    "-DNNG_ENABLE_TLS=ON"
+    (lib.cmakeBool "BUILD_BENCH" true)
+    (lib.cmakeBool "BUILD_DDS_PROXY" true)
+    (lib.cmakeBool "BUILD_NANOMQ_CLI" true)
+    (lib.cmakeBool "BUILD_ZMQ_GATEWAY" true)
+    (lib.cmakeBool "ENABLE_RULE_ENGINE" true)
+    (lib.cmakeBool "NNG_ENABLE_SQLITE" true)
+    (lib.cmakeBool "NNG_ENABLE_TLS" true)
   ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type -Wno-implicit-function-declaration -Wno-error=implicit-int";
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=int-conversion";
 
   # disabled by default - not 100% reliable and making nanomq depend on
   # mosquitto would annoy people

From b8f4ef4f25bf4dd1c1689f069ec619f98bc37e16 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 4 Mar 2024 23:06:40 +0400
Subject: [PATCH 004/135] nanomq: migrate to by-name

---
 .../mqtt/nanomq/default.nix => by-name/na/nanomq/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{servers/mqtt/nanomq/default.nix => by-name/na/nanomq/package.nix} (100%)

diff --git a/pkgs/servers/mqtt/nanomq/default.nix b/pkgs/by-name/na/nanomq/package.nix
similarity index 100%
rename from pkgs/servers/mqtt/nanomq/default.nix
rename to pkgs/by-name/na/nanomq/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5447ab209937..0eef3ab7be27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23198,8 +23198,6 @@ with pkgs;
 
   mosquitto = callPackage ../servers/mqtt/mosquitto { };
 
-  nanomq = callPackage ../servers/mqtt/nanomq { };
-
   mps = callPackage ../development/libraries/mps { };
 
   libmpeg2 = callPackage ../development/libraries/libmpeg2 { };

From d04697aee8fff61578cf3480506f13a4747892d3 Mon Sep 17 00:00:00 2001
From: mib <mib@kanp.ai>
Date: Sun, 11 Aug 2024 19:06:54 +0200
Subject: [PATCH 005/135] lib.meta.licensesSpdx: mapping from SPDX ID to
 licenses

---
 lib/meta.nix | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/lib/meta.nix b/lib/meta.nix
index 65d7bf99191a..ddd062f38c47 100644
--- a/lib/meta.nix
+++ b/lib/meta.nix
@@ -286,6 +286,32 @@ rec {
     ((!pkg?meta.platforms) || any (platformMatch platform) pkg.meta.platforms) &&
     all (elem: !platformMatch platform elem) (pkg.meta.badPlatforms or []);
 
+  /**
+    Mapping of SPDX ID to the attributes in lib.licenses.
+
+    For SPDX IDs, see https://spdx.org/licenses
+
+    # Examples
+    :::{.example}
+    ## `lib.meta.licensesSpdx` usage example
+
+    ```nix
+    lib.licensesSpdx.MIT == lib.licenses.mit
+    => true
+    lib.licensesSpdx."MY LICENSE"
+    => error: attribute 'MY LICENSE' missing
+    ```
+
+    :::
+  */
+  licensesSpdx =
+    lib.attrsets.mapAttrs'
+    (_key: license: {
+      name = license.spdxId;
+      value = license;
+    })
+    (lib.attrsets.filterAttrs (_key: license: license ? spdxId) lib.licenses);
+
   /**
     Get the corresponding attribute in lib.licenses from the SPDX ID
     or warn and fallback to `{ shortName = <license string>; }`.
@@ -361,10 +387,12 @@ rec {
   */
   getLicenseFromSpdxIdOr =
     let
-      spdxLicenses = lib.mapAttrs (id: ls: assert lib.length ls == 1; builtins.head ls)
-        (lib.groupBy (l: lib.toLower l.spdxId) (lib.filter (l: l ? spdxId) (lib.attrValues lib.licenses)));
+      lowercaseLicenses = lib.mapAttrs' (name: value: {
+        name = lib.toLower name;
+        inherit value;
+      }) licensesSpdx;
     in licstr: default:
-      spdxLicenses.${ lib.toLower licstr } or default;
+      lowercaseLicenses.${ lib.toLower licstr } or default;
 
   /**
     Get the path to the main program of a package based on meta.mainProgram

From 5f17f87a7f52dfa9f5c116f68549eef38efdff75 Mon Sep 17 00:00:00 2001
From: abysssol <abysssol@pm.me>
Date: Tue, 13 Aug 2024 19:28:44 -0400
Subject: [PATCH 006/135] nixos/ollama: move `loadModels` script into a
 separate service

Due to the large size of models, the script can run for a long time,
which can cause timeouts, since the startup phase has a time limit.
---
 nixos/modules/services/misc/ollama.nix | 62 +++++++++++++++++++++-----
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix
index f8dbfe9c5692..a1141c784b4d 100644
--- a/nixos/modules/services/misc/ollama.nix
+++ b/nixos/modules/services/misc/ollama.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  inherit (lib) literalExpression types mkBefore;
+  inherit (lib) literalExpression types;
 
   cfg = config.services.ollama;
   ollamaPackage = cfg.package.override { inherit (cfg) acceleration; };
@@ -50,7 +50,6 @@ in
           The user will automatically be created, if this option is set to a non-null value.
         '';
       };
-
       group = lib.mkOption {
         type = with types; nullOr str;
         default = cfg.user;
@@ -71,7 +70,6 @@ in
           The home directory that the ollama service is started in.
         '';
       };
-
       models = lib.mkOption {
         type = types.str;
         default = "${cfg.home}/models";
@@ -98,6 +96,7 @@ in
           Which port the ollama server listens to.
         '';
       };
+
       acceleration = lib.mkOption {
         type = types.nullOr (
           types.enum [
@@ -136,6 +135,7 @@ in
           ) for details.
         '';
       };
+
       environmentVariables = lib.mkOption {
         type = types.attrsOf types.str;
         default = { };
@@ -155,7 +155,10 @@ in
         type = types.listOf types.str;
         default = [ ];
         description = ''
-          The models to download as soon as the service starts.
+          Download these models using `ollama pull` as soon as `ollama.service` has started.
+
+          This creates a systemd unit `ollama-model-loader.service`.
+
           Search for models of your choice from: https://ollama.com/library
         '';
       };
@@ -164,6 +167,7 @@ in
         default = false;
         description = ''
           Whether to open the firewall for ollama.
+
           This adds `services.ollama.port` to `networking.firewall.allowedTCPPorts`.
         '';
       };
@@ -200,6 +204,7 @@ in
           Group = cfg.group;
         }
         // {
+          Type = "exec";
           DynamicUser = true;
           ExecStart = "${lib.getExe ollamaPackage} serve";
           WorkingDirectory = cfg.home;
@@ -255,13 +260,50 @@ in
           ];
           UMask = "0077";
         };
-      postStart = mkBefore ''
-        set -x
-        export OLLAMA_HOST=${lib.escapeShellArg cfg.host}:${builtins.toString cfg.port}
-        for model in ${lib.escapeShellArgs cfg.loadModels}
-        do
-          ${lib.escapeShellArg (lib.getExe ollamaPackage)} pull "$model"
+    };
+
+    systemd.services.ollama-model-loader = lib.mkIf (cfg.loadModels != [ ]) {
+      description = "Download ollama models in the background";
+      wantedBy = [
+        "multi-user.target"
+        "ollama.service"
+      ];
+      after = [ "ollama.service" ];
+      bindsTo = [ "ollama.service" ];
+      environment = config.systemd.services.ollama.environment;
+      serviceConfig = {
+        Type = "exec";
+        DynamicUser = true;
+        Restart = "on-failure";
+        # bounded exponential backoff
+        RestartSec = "1s";
+        RestartMaxDelaySec = "2h";
+        RestartSteps = "10";
+      };
+
+      script = ''
+        total=${toString (builtins.length cfg.loadModels)}
+        failed=0
+
+        for model in ${lib.escapeShellArgs cfg.loadModels}; do
+          '${lib.getExe ollamaPackage}' pull "$model" &
         done
+
+        for job in $(jobs -p); do
+          set +e
+          wait $job
+          exit_code=$?
+          set -e
+
+          if [ $exit_code != 0 ]; then
+            failed=$((failed + 1))
+          fi
+        done
+
+        if [ $failed != 0 ]; then
+          echo "error: $failed out of $total attempted model downloads failed" >&2
+          exit 1
+        fi
       '';
     };
 

From 8aaa39a2f2640a47a29e1d17547940122b1cb878 Mon Sep 17 00:00:00 2001
From: Linus Karl <linus@lotz.li>
Date: Sun, 29 Oct 2023 21:59:10 +0100
Subject: [PATCH 007/135] maintainers: add returntoreality

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4e3ac4dd33a4..d0da51d80578 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17332,6 +17332,12 @@
     githubId = 5265630;
     name = "Michael Köppl";
   };
+  returntoreality = {
+    email = "linus@lotz.li";
+    github = "retuntoreality";
+    githubId = 255667;
+    name = "Linus Karl";
+  };
   revol-xut = {
     email = "revol-xut@protonmail.com";
     name = "Tassilo Tanneberger";

From d2367c3f7e85566f6cd5c7dab111d042191f9f64 Mon Sep 17 00:00:00 2001
From: Linus Karl <linus@lotz.li>
Date: Sun, 29 Oct 2023 22:01:59 +0100
Subject: [PATCH 008/135] indi-full: refactor 3rdparty drivers

This splits the 3rdparty drivers into seperate
packages as recommended by upstream. This also
allows to build a indi-full equivalent with only
the needed drivers. Also add indi-full-nonfree
with all the nonfree drivers. And remove them
from indi-full.
---
 .../manual/release-notes/rl-2411.section.md   |    4 +
 pkgs/by-name/in/indi-full-nonfree/package.nix |   15 +
 pkgs/by-name/in/indi-full/package.nix         |   23 +
 pkgs/by-name/in/indi-with-drivers/package.nix |   24 +
 .../science/astronomy/indilib/default.nix     |    2 +-
 .../astronomy/indilib/indi-3rdparty.nix       | 1161 +++++++++++++++--
 .../astronomy/indilib/indi-firmware.nix       |   82 --
 .../science/astronomy/indilib/indi-full.nix   |   29 -
 .../astronomy/indilib/indi-with-drivers.nix   |   18 -
 pkgs/top-level/all-packages.nix               |    2 +-
 10 files changed, 1134 insertions(+), 226 deletions(-)
 create mode 100644 pkgs/by-name/in/indi-full-nonfree/package.nix
 create mode 100644 pkgs/by-name/in/indi-full/package.nix
 create mode 100644 pkgs/by-name/in/indi-with-drivers/package.nix
 delete mode 100644 pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix
 delete mode 100644 pkgs/development/libraries/science/astronomy/indilib/indi-full.nix
 delete mode 100644 pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 972e13852eca..acb9433ed3c2 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -288,6 +288,10 @@
 
 - `programs.vim.defaultEditor` now only works if `programs.vim.enable` is enabled.
 
+- The `indi-full` package no longer contains non-free drivers.
+  To get the old collection of drivers use `indi-full-nonfree` or create your own collection of drivers by overriding indi-with-drivers.
+  E.g.: `pkgs.indi-with-drivers.override {extraDrivers = with pkgs.indi-3rdparty; [indi-gphoto];}`
+
 - `/share/vim-plugins` now only gets linked if `programs.vim.enable` is enabled
 
 - The `tracy` package no longer works on X11, since it's moved to Wayland
diff --git a/pkgs/by-name/in/indi-full-nonfree/package.nix b/pkgs/by-name/in/indi-full-nonfree/package.nix
new file mode 100644
index 000000000000..899afb4e4305
--- /dev/null
+++ b/pkgs/by-name/in/indi-full-nonfree/package.nix
@@ -0,0 +1,15 @@
+{
+  lib,
+  stdenv,
+  indi-3rdparty,
+  indilib,
+  indi-with-drivers,
+}:
+
+indi-with-drivers.override {
+  pname = "indi-full-nonfree";
+  inherit (indilib) version;
+  extraDrivers = builtins.filter (attrs: lib.meta.availableOn stdenv.hostPlatform attrs) (
+    builtins.attrValues indi-3rdparty
+  );
+}
diff --git a/pkgs/by-name/in/indi-full/package.nix b/pkgs/by-name/in/indi-full/package.nix
new file mode 100644
index 000000000000..44493f9e5d34
--- /dev/null
+++ b/pkgs/by-name/in/indi-full/package.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  stdenv,
+  indi-3rdparty,
+  indi-with-drivers,
+  indilib,
+}:
+
+let
+  licenseFree = p: p.meta.license.free or false;
+  isFree =
+    p:
+    (builtins.all licenseFree ((p.buildInputs or [ ]) ++ (p.propagatedBuildInputs or [ ])))
+    && licenseFree p;
+  drivers = builtins.filter (
+    attrs: isFree attrs && (lib.meta.availableOn stdenv.hostPlatform attrs)
+  ) (builtins.attrValues indi-3rdparty);
+in
+indi-with-drivers.override {
+  pname = "indi-full";
+  inherit (indilib) version;
+  extraDrivers = drivers;
+}
diff --git a/pkgs/by-name/in/indi-with-drivers/package.nix b/pkgs/by-name/in/indi-with-drivers/package.nix
new file mode 100644
index 000000000000..173afdedb4aa
--- /dev/null
+++ b/pkgs/by-name/in/indi-with-drivers/package.nix
@@ -0,0 +1,24 @@
+{
+  lib,
+  buildEnv,
+  makeBinaryWrapper,
+  indilib ? indilib,
+  pname ? "indi-with-drivers",
+  version ? indilib.version,
+  extraDrivers ? [ ],
+}:
+
+buildEnv {
+  name = "${pname}-${version}";
+
+  paths = [ indilib ] ++ extraDrivers;
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  postBuild = lib.optionalString (extraDrivers != [ ]) ''
+    rm $out/bin/indiserver
+    makeBinaryWrapper ${indilib}/bin/indiserver $out/bin/indiserver --set-default INDIPREFIX $out
+  '';
+
+  inherit (indilib) meta;
+}
diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix
index 0fd659b0e1b7..74bb75878f9a 100644
--- a/pkgs/development/libraries/science/astronomy/indilib/default.nix
+++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Implementation of the INDI protocol for POSIX operating systems";
     changelog = "https://github.com/indilib/indi/releases/tag/v${finalAttrs.version}";
     license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ hjones2199 sheepforce ];
+    maintainers = with maintainers; [ hjones2199 sheepforce returntoreality ];
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
index 9dafb64e9292..6d19253bcce3 100644
--- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
+++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
@@ -1,100 +1,1071 @@
-{ stdenv
-, lib
-, bash
-, cmake
-, coreutils
-, cfitsio
-, libusb1
-, zlib
-, boost
-, libnova
-, curl
-, libjpeg
-, gsl
-, fftw
-, indilib
-, libgphoto2
-, libraw
-, libftdi1
-, libdc1394
-, gpsd
-, ffmpeg
-, limesuite
-, pkg-config
-, zeromq
-, version
-, src
-, withFirmware ? false
-, firmware ? null
+{
+  stdenv,
+  lib,
+  autoPatchelfHook,
+  aravis,
+  bash,
+  boost,
+  cmake,
+  coreutils,
+  cfitsio,
+  fetchFromGitHub,
+  gtest,
+  libusb1,
+  libusb-compat-0_1,
+  zlib,
+  libnova,
+  curl,
+  libjpeg,
+  gsl,
+  indilib,
+  libcamera,
+  libdc1394,
+  libdrm,
+  libexif,
+  libftdi1,
+  libgphoto2,
+  libpng,
+  libraw,
+  ninja,
+  nut,
+  glib,
+  systemd,
+  urjtag,
+  gpsd,
+  ffmpeg-headless,
+  limesuite,
+  pkg-config,
+  zeromq,
 }:
 
 let
-  libusb-with-fxload = libusb1.override { withExamples = true;};
-in
-
-stdenv.mkDerivation rec {
-  pname = "indi-3rdparty";
-
-  inherit version src;
-
-  nativeBuildInputs = [ cmake pkg-config ];
-
-  buildInputs = [
-    indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd
-    libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw
-    limesuite zeromq
-  ] ++ lib.optionals withFirmware [
-    firmware
-  ];
-
-  postPatch = ''
-    for f in $(find . -name "CMakeLists.txt"); do
-      substituteInPlace $f \
-        --replace "/lib/udev/rules.d" "lib/udev/rules.d" \
-        --replace "/etc/udev/rules.d" "lib/udev/rules.d" \
-        --replace "/lib/firmware" "lib/firmware"
-    done
-
-    substituteInPlace libpktriggercord/CMakeLists.txt \
-      --replace "set (PK_DATADIR /usr/share/pktriggercord)" "set (PK_DATADIR $out/share/pkgtriggercord)"
-
-    sed '1i#include <ctime>' -i indi-duino/libfirmata/src/firmata.cpp # gcc12
-  '';
-
-  cmakeFlags = [
-    "-DINDI_DATA_DIR=share/indi"
-    "-DCMAKE_INSTALL_LIBDIR=lib"
-    "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
-    "-DRULES_INSTALL_DIR=lib/udev/rules.d"
-  ] ++ lib.optionals (!withFirmware) [
-    "-DWITH_ATIK=off"
-    "-DWITH_APOGEE=off"
-    "-DWITH_DSI=off"
-    "-DWITH_QHY=off"
-    "-DWITH_ARMADILLO=off"
-    "-DWITH_FISHCAMP=off"
-    "-DWITH_SBIG=off"
-  ];
-
-  postFixup = lib.optionalString stdenv.isLinux ''
-    for f in $out/lib/udev/rules.d/*.rules
-    do
-      substituteInPlace $f --replace "/sbin/fxload" "${libusb-with-fxload}/sbin/fxload" \
-                           --replace "/lib/firmware/" "$out/lib/firmware/" \
-                           --replace "/bin/sleep" "${coreutils}/bin/sleep" \
-                           --replace "/bin/cat" "${coreutils}/bin/cat" \
-                           --replace "/bin/echo" "${coreutils}/bin/echo" \
-                           --replace "/bin/sh" "${bash}/bin/sh"
-    done
-  '';
-
-
-  meta = with lib; {
-    homepage = "https://www.indilib.org/";
-    description = "Third party drivers for the INDI astronomical software suite";
-    changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}";
-    license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ hjones2199 sheepforce ];
-    platforms = platforms.linux;
+  fxload = libusb1.override { withExamples = true; };
+  src-3rdparty = fetchFromGitHub {
+    owner = "indilib";
+    repo = "indi-3rdparty";
+    rev = "v${indilib.version}";
+    hash = "sha256-0M+k3A2Lw9EU9V5bX9dGztmdcJzc71XQZv8srmY5NmY=";
   };
+
+  buildIndi3rdParty =
+    args@{
+      pname,
+      nativeBuildInputs ? [ ],
+      propagatedBuildInputs ? [ ],
+      cmakeFlags ? [ ],
+      postInstall ? "",
+      doCheck ? true,
+      version ? indilib.version,
+      src ? src-3rdparty,
+      meta ? { },
+      ...
+    }:
+    stdenv.mkDerivation (
+      args
+      // {
+        pname = "indi-3rdparty-${pname}";
+        inherit src version;
+
+        sourceRoot = "source/${pname}";
+
+        cmakeFlags =
+          [
+            "-DCMAKE_INSTALL_LIBDIR=lib"
+            "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
+            "-DRULES_INSTALL_DIR=lib/udev/rules.d"
+            "-DINDI_DATA_DIR=share/indi/"
+          ]
+          ++ lib.optional doCheck [
+            "-DINDI_BUILD_UNITTESTS=ON"
+            "-DINDI_BUILD_INTEGTESTS=ON"
+          ]
+          ++ cmakeFlags;
+
+        nativeBuildInputs = [
+          cmake
+          ninja
+          pkg-config
+        ] ++ nativeBuildInputs;
+
+        checkInputs = [ gtest ];
+
+        postInstall = ''
+          mkdir -p $out/lib/udev/rules.d/
+          shopt -s nullglob
+          for i in $propagatedBuildInputs; do
+            echo "Adding rules for package $i"
+            for j in $i/{etc,lib}/udev/rules.d/*; do
+              echo "Linking $j to $out/lib/udev/rules.d/$(basename $j)"
+              ln -s $j $out/lib/udev/rules.d/$(basename $j)
+            done
+          done
+          ${postInstall}
+        '';
+
+        meta =
+          with lib;
+          {
+            homepage = "https://www.indilib.org/";
+            description = "Third party drivers for the INDI astronomical software suite";
+            changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}";
+            license = licenses.lgpl2Plus;
+            maintainers = with maintainers; [
+              hjones2199
+              sheepforce
+              returntoreality
+            ];
+            platforms = platforms.linux;
+          }
+          // meta;
+      }
+    );
+
+  libahp-gt = buildIndi3rdParty {
+    pname = "libahp-gt";
+    meta = with lib; {
+      license = licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ i686 ++ arm;
+    };
+  };
+
+  # broken: needs libdfu
+  libahp-xc = buildIndi3rdParty {
+    pname = "libahp-xc";
+    buildInputs = [
+      libusb-compat-0_1
+      urjtag
+      libftdi1
+    ];
+    meta = with lib; {
+      license = licenses.unfreeRedistributable;
+      broken = true;
+      platforms = [ ];
+    };
+  };
+
+  libaltaircam = buildIndi3rdParty {
+    pname = "libaltaircam";
+    meta = with lib; {
+      license = licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    };
+  };
+
+  libapogee = buildIndi3rdParty {
+    pname = "libapogee";
+    buildInputs = [
+      curl
+      indilib
+      libusb1
+    ];
+    nativeBuildInputs = [ autoPatchelfHook ];
+    cmakeFlags = [ "-DCONF_DIR=etc/" ];
+    meta = with lib; {
+      license = licenses.mpl20;
+      platforms = platforms.linux;
+    };
+  };
+
+  libasi = buildIndi3rdParty {
+    pname = "libasi";
+    buildInputs = [
+      libusb1
+      stdenv.cc.cc.lib
+    ];
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ i686 ++ arm;
+    };
+  };
+
+  libastroasis = buildIndi3rdParty {
+    pname = "libastroasis";
+    buildInputs = [ stdenv.cc.cc.lib ];
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    };
+  };
+
+  libatik = buildIndi3rdParty {
+    pname = "libatik";
+    buildInputs = [
+      stdenv.cc.cc.lib
+      libusb1
+      systemd
+      libdc1394
+    ];
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ i686 ++ arm;
+    };
+  };
+
+  libbressercam = buildIndi3rdParty {
+    pname = "libbressercam";
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    };
+  };
+
+  libfishcamp = buildIndi3rdParty {
+    pname = "libfishcamp";
+
+    postPatch = ''
+      substituteInPlace CMakeLists.txt --replace "/lib/firmware" "lib/firmware"
+    '';
+
+    buildInputs = [
+      indilib
+      libusb1
+    ];
+
+    meta = with lib; {
+      license = licenses.bsd2;
+      platforms = platforms.linux;
+    };
+  };
+
+  libfli = buildIndi3rdParty {
+    pname = "libfli";
+    buildInputs = [
+      indilib
+      libusb1
+    ];
+    meta = with lib; {
+      license = licenses.bsd2;
+      platforms = platforms.linux;
+    };
+  };
+
+  libinovasdk = buildIndi3rdParty {
+    pname = "libinovasdk";
+    buildInputs = [
+      stdenv.cc.cc.lib
+      libusb1
+    ];
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm ++ i686;
+    };
+  };
+
+  libmallincam = buildIndi3rdParty {
+    pname = "libmallincam";
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    };
+  };
+
+  libmeadecam = buildIndi3rdParty {
+    pname = "libmeadecam";
+    buildInputs = [ libusb1 ];
+    meta = with lib; {
+      license = lib.licenses.lgpl21Only;
+      platforms = platforms.linux;
+    };
+  };
+
+  libmicam = buildIndi3rdParty {
+    pname = "libmicam";
+    buildInputs = [ libusb1 ];
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm ++ i686;
+    };
+  };
+
+  libnncam = buildIndi3rdParty {
+    pname = "libnncam";
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    };
+  };
+
+  libogmacam = buildIndi3rdParty {
+    pname = "libogmacam";
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    };
+  };
+
+  libomegonprocam = buildIndi3rdParty {
+    pname = "libomegonprocam";
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    };
+  };
+
+  # broken: needs pigpio library
+  libpigpiod = buildIndi3rdParty {
+    pname = "libpigpiod";
+    buildInputs = [ indilib ];
+    meta = with lib; {
+      license = licenses.unlicense;
+      broken = true;
+      platforms = [ ];
+    };
+  };
+
+  libpktriggercord = buildIndi3rdParty {
+    pname = "libpktriggercord";
+
+    postPatch = ''
+      substituteInPlace CMakeLists.txt \
+        --replace "set (PK_DATADIR /usr/share/pktriggercord)" "set (PK_DATADIR $out/share/pkgtriggercord)"
+    '';
+
+    buildInputs = [ indilib ];
+
+    meta = with lib; {
+      license = licenses.lgpl3Plus;
+      platforms = platforms.linux;
+    };
+  };
+
+  libplayerone = buildIndi3rdParty {
+    pname = "libplayerone";
+    postPatch = ''
+      substituteInPlace 99-player_one_astronomy.rules \
+        --replace "/bin/echo" "${coreutils}/bin/echo" \
+        --replace "/bin/sh" "${bash}/bin/sh"
+    '';
+
+    buildInputs = [
+      stdenv.cc.cc.lib
+      libusb1
+      systemd
+    ];
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    };
+  };
+
+  libqhy = buildIndi3rdParty {
+    pname = "libqhy";
+
+    postPatch = ''
+      sed -ie 's/LIBQHY_SOVERSION "24"/LIBQHY_SOVERSION "20"/' CMakeLists.txt
+      substituteInPlace CMakeLists.txt \
+        --replace "/lib/firmware" "lib/firmware"
+
+      substituteInPlace 85-qhyccd.rules \
+        --replace "/sbin/fxload" "${fxload}/sbin/fxload" \
+        --replace "/lib/firmware" "$out/lib/firmware" \
+        --replace "/bin/sleep" "${coreutils}/bin/sleep"
+
+      sed -e 's|-D $env{DEVNAME}|-p $env{BUSNUM},$env{DEVNUM}|' -i 85-qhyccd.rules
+    '';
+
+    cmakeFlags = [ "-DQHY_FIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware/qhy" ];
+
+    buildInputs = [
+      stdenv.cc.cc.lib
+      libusb1
+    ];
+    nativeBuildInputs = [ autoPatchelfHook ];
+
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    };
+  };
+
+  libqsi = buildIndi3rdParty {
+    pname = "libqsi";
+    buildInputs = [
+      libftdi1
+      indilib
+    ];
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = platforms.linux;
+    };
+  };
+
+  libricohcamerasdk = buildIndi3rdParty {
+    pname = "libricohcamerasdk";
+    buildInputs = [
+      stdenv.cc.cc.lib
+      libusb1
+    ];
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ i686 ++ arm;
+    };
+  };
+
+  libsbig = buildIndi3rdParty {
+    pname = "libsbig";
+
+    postPatch = ''
+      substituteInPlace CMakeLists.txt --replace "/lib/firmware" "lib/firmware"
+      substituteInPlace 51-sbig-debian.rules \
+        --replace "/sbin/fxload" "${fxload}/sbin/fxload" \
+        --replace "/lib/firmware" "$out/lib/firmware"
+
+      sed -e 's|-D $env{DEVNAME}|-p $env{BUSNUM},$env{DEVNUM}|' -i 51-sbig-debian.rules
+    '';
+
+    buildInputs = [ libusb1 ];
+    nativeBuildInputs = [ autoPatchelfHook ];
+
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    };
+  };
+
+  libstarshootg = buildIndi3rdParty {
+    pname = "libstarshootg";
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    };
+  };
+
+  libsvbony = buildIndi3rdParty {
+    pname = "libsvbony";
+    buildInputs = [
+      stdenv.cc.cc.lib
+      libusb1
+    ];
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm ++ i686;
+    };
+  };
+
+  libtoupcam = buildIndi3rdParty {
+    pname = "libtoupcam";
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    };
+  };
+
+  libtscam = buildIndi3rdParty {
+    pname = "libtscam";
+    nativeBuildInputs = [ autoPatchelfHook ];
+    meta = with lib; {
+      license = lib.licenses.unfreeRedistributable;
+      platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    };
+  };
+
+in
+{
+
+  indi-aagcloudwatcher-ng = buildIndi3rdParty {
+    pname = "indi-aagcloudwatcher-ng";
+    buildInputs = [ indilib ];
+  };
+
+  # libahc-xc needs libdfu, which is not packaged
+  # indi-ahp-xc = buildIndi3rdParty {
+  #   pname = "indi-ahp-xc";
+  #   buildInputs = [ cfitsio indilib libahp-xc libnova zlib ];
+  #   meta.platforms = libahp-xc.meta.platforms;
+  # };
+
+  indi-aok = buildIndi3rdParty {
+    pname = "indi-aok";
+    buildInputs = [
+      indilib
+      libnova
+    ];
+  };
+
+  indi-apogee = buildIndi3rdParty {
+    pname = "indi-apogee";
+    buildInputs = [
+      cfitsio
+      indilib
+      libapogee
+      zlib
+    ];
+    meta.platforms = libapogee.meta.platforms;
+  };
+
+  indi-armadillo-platypus = buildIndi3rdParty {
+    pname = "indi-armadillo-platypus";
+    buildInputs = [
+      indilib
+      libnova
+    ];
+    postPatch = ''
+      substituteInPlace CMakeLists.txt --replace "/lib/udev/rules.d" "lib/udev/rules.d"
+    '';
+  };
+
+  indi-asi = buildIndi3rdParty {
+    pname = "indi-asi";
+    buildInputs = [
+      cfitsio
+      indilib
+      libasi
+      libusb1
+      zlib
+    ];
+    meta.platforms = libasi.meta.platforms;
+  };
+
+  # broken needs pigpio
+  indi-asi-power = buildIndi3rdParty {
+    pname = "indi-asi-power";
+    buildInputs = [ indilib ];
+    meta.platforms = [ ];
+    meta.broken = true;
+  };
+
+  indi-astroasis = buildIndi3rdParty {
+    pname = "indi-astroasis";
+    buildInputs = [
+      cfitsio
+      indilib
+      libastroasis
+      libusb1
+      zlib
+    ];
+    meta.platforms = libastroasis.meta.platforms;
+  };
+
+  indi-astrolink4 = buildIndi3rdParty {
+    pname = "indi-astrolink4";
+    buildInputs = [ indilib ];
+  };
+
+  indi-astromechfoc = buildIndi3rdParty {
+    pname = "indi-astromechfoc";
+    buildInputs = [
+      indilib
+      zlib
+    ];
+  };
+
+  indi-atik = buildIndi3rdParty {
+    pname = "indi-atik";
+    buildInputs = [
+      cfitsio
+      indilib
+      libusb1
+      zlib
+    ];
+    propagatedBuildInputs = [ libatik ];
+    meta.platforms = libatik.meta.platforms;
+  };
+
+  indi-avalon = buildIndi3rdParty {
+    pname = "indi-avalon";
+    buildInputs = [
+      indilib
+      libnova
+    ];
+  };
+
+  indi-avalonud = buildIndi3rdParty {
+    pname = "indi-avalonud";
+    buildInputs = [
+      indilib
+      libnova
+      zeromq
+    ];
+  };
+
+  indi-beefocus = buildIndi3rdParty {
+    pname = "indi-beefocus";
+    buildInputs = [
+      gtest
+      indilib
+    ];
+  };
+
+  indi-bresserexos2 = buildIndi3rdParty {
+    pname = "indi-bresserexos2";
+    buildInputs = [
+      indilib
+      libnova
+    ];
+  };
+
+  indi-celestronaux = buildIndi3rdParty {
+    pname = "indi-celestronaux";
+    buildInputs = [
+      indilib
+      gsl
+      libnova
+      zlib
+    ];
+  };
+
+  indi-dreamfocuser = buildIndi3rdParty {
+    pname = "indi-dreamfocuser";
+    buildInputs = [ indilib ];
+  };
+
+  indi-dsi = buildIndi3rdParty {
+    pname = "indi-dsi";
+    buildInputs = [
+      gtest
+      cfitsio
+      indilib
+      libusb1
+      zlib
+    ];
+
+    postPatch = ''
+      substituteInPlace CMakeLists.txt \
+        --replace "/lib/udev/rules.d" "lib/udev/rules.d" \
+        --replace "/lib/firmware" "lib/firmware"
+      substituteInPlace 99-meadedsi.rules \
+        --replace "/sbin/fxload" "${fxload}/sbin/fxload" \
+        --replace "/lib/firmware" "$out/lib/firmware"
+
+      sed -e 's|-D $env{DEVNAME}|-p $env{BUSNUM},$env{DEVNUM}|' -i 99-meadedsi.rules
+    '';
+  };
+
+  indi-duino = buildIndi3rdParty {
+    pname = "indi-duino";
+    buildInputs = [
+      curl
+      indilib
+    ];
+  };
+
+  indi-eqmod = buildIndi3rdParty {
+    pname = "indi-eqmod";
+    buildInputs = [
+      indilib
+      gsl
+      gtest
+      libahp-gt
+      libnova
+      zlib
+    ];
+    meta.platforms = libahp-gt.meta.platforms;
+  };
+
+  indi-ffmv = buildIndi3rdParty {
+    pname = "indi-ffmv";
+    buildInputs = [
+      cfitsio
+      indilib
+      libdc1394
+      zlib
+    ];
+  };
+
+  indi-fishcamp = buildIndi3rdParty {
+    pname = "indi-fishcamp";
+    buildInputs = [
+      cfitsio
+      indilib
+      libusb1
+      zlib
+    ];
+    propagatedBuildInputs = [ libfishcamp ];
+    meta.platforms = libfishcamp.meta.platforms;
+  };
+
+  indi-fli = buildIndi3rdParty {
+    pname = "indi-fli";
+    buildInputs = [
+      cfitsio
+      indilib
+      zlib
+    ];
+    propagatedBuildInputs = [ libfli ];
+    meta.platforms = libfli.meta.platforms;
+  };
+
+  indi-gige = buildIndi3rdParty {
+    pname = "indi-gige";
+    buildInputs = [
+      aravis
+      cfitsio
+      indilib
+      glib
+      zlib
+    ];
+  };
+
+  indi-gphoto = buildIndi3rdParty {
+    pname = "indi-gphoto";
+    buildInputs = [
+      cfitsio
+      libjpeg
+      libraw
+      libusb1
+      indilib
+      zlib
+    ];
+    propagatedBuildInputs = [ libgphoto2 ];
+  };
+
+  indi-gpsd = buildIndi3rdParty {
+    pname = "indi-gpsd";
+    buildInputs = [
+      indilib
+      gpsd
+      libnova
+      zlib
+    ];
+  };
+
+  indi-gpsnmea = buildIndi3rdParty {
+    pname = "indi-gpsnmea";
+    buildInputs = [
+      indilib
+      libnova
+      zlib
+    ];
+  };
+
+  indi-inovaplx = buildIndi3rdParty {
+    pname = "indi-inovaplx";
+    buildInputs = [
+      cfitsio
+      indilib
+      zlib
+    ];
+    propagatedBuildInputs = [ libinovasdk ];
+    meta.platforms = libinovasdk.meta.platforms;
+  };
+
+  # broken, wants rpicam-apps
+  indi-libcamera = buildIndi3rdParty {
+    pname = "indi-libcamera";
+    buildInputs = [
+      boost
+      cfitsio
+      indilib
+      libcamera
+      libexif
+      libdrm
+      libpng
+      libusb1
+      libraw
+      zlib
+    ];
+    meta.platforms = [ ];
+    meta.broken = true;
+  };
+
+  indi-limesdr = buildIndi3rdParty {
+    pname = "indi-limesdr";
+    buildInputs = [
+      cfitsio
+      indilib
+      limesuite
+      zlib
+    ];
+  };
+
+  indi-maxdomeii = buildIndi3rdParty {
+    pname = "indi-maxdomeii";
+    buildInputs = [
+      gtest
+      indilib
+      libnova
+      zlib
+    ];
+  };
+
+  indi-mgen = buildIndi3rdParty {
+    pname = "indi-mgen";
+    buildInputs = [
+      cfitsio
+      indilib
+      libftdi1
+      zlib
+    ];
+  };
+
+  indi-mi = buildIndi3rdParty {
+    pname = "indi-mi";
+    buildInputs = [
+      cfitsio
+      indilib
+      libusb1
+      zlib
+    ];
+    propagatedBuildInputs = [ libmicam ];
+  };
+
+  indi-nexdome = buildIndi3rdParty {
+    pname = "indi-nexdome";
+    buildInputs = [
+      indilib
+      libnova
+      zlib
+    ];
+  };
+
+  indi-nightscape = buildIndi3rdParty {
+    pname = "indi-nightscape";
+    buildInputs = [
+      cfitsio
+      indilib
+      libusb1
+      libftdi1
+      zlib
+    ];
+  };
+
+  indi-nut = buildIndi3rdParty {
+    pname = "indi-nut";
+    buildInputs = [
+      indilib
+      nut
+      zlib
+    ];
+  };
+
+  indi-ocs = buildIndi3rdParty {
+    pname = "indi-ocs";
+    buildInputs = [
+      indilib
+      libnova
+    ];
+  };
+
+  indi-orion-ssg3 = buildIndi3rdParty {
+    pname = "indi-orion-ssg3";
+    buildInputs = [
+      cfitsio
+      indilib
+      libusb1
+      zlib
+    ];
+
+    postPatch = ''
+      substituteInPlace CMakeLists.txt --replace "/lib/udev/rules.d" "lib/udev/rules.d"
+    '';
+  };
+
+  indi-pentax = buildIndi3rdParty {
+    pname = "indi-pentax";
+    buildInputs = [
+      cfitsio
+      indilib
+      libraw
+      zlib
+    ];
+    propagatedBuildInputs = [
+      libpktriggercord
+      libricohcamerasdk
+    ];
+
+    meta.platforms = libricohcamerasdk.meta.platforms;
+  };
+
+  indi-playerone = buildIndi3rdParty {
+    pname = "indi-playerone";
+    buildInputs = [
+      cfitsio
+      indilib
+      libusb1
+      zlib
+    ];
+    propagatedBuildInputs = [ libplayerone ];
+    meta.platforms = libplayerone.meta.platforms;
+  };
+
+  indi-qhy = buildIndi3rdParty {
+    pname = "indi-qhy";
+    buildInputs = [
+      libqhy
+      cfitsio
+      indilib
+      libnova
+      libusb1
+      zlib
+    ];
+    propagatedBuildInputs = [ libqhy ];
+    meta.platforms = libqhy.meta.platforms;
+  };
+
+  indi-qsi = buildIndi3rdParty {
+    pname = "indi-qsi";
+    buildInputs = [
+      cfitsio
+      indilib
+      libqsi
+      zlib
+    ];
+
+    postPatch = ''
+      substituteInPlace CMakeLists.txt --replace "/lib/udev/rules.d" "lib/udev/rules.d"
+    '';
+
+    meta.platforms = libqsi.meta.platforms;
+  };
+
+  indi-rolloffino = buildIndi3rdParty {
+    pname = "indi-rolloffino";
+    buildInputs = [
+      indilib
+      libnova
+      zlib
+    ];
+  };
+
+  indi-rpi-gpio = buildIndi3rdParty {
+    pname = "indi-rpi-gpio";
+    buildInputs = [
+      indilib
+      libpigpiod
+    ];
+    meta.platforms = libpigpiod.meta.platforms;
+  };
+
+  indi-rtklib = buildIndi3rdParty {
+    pname = "indi-rtklib";
+    buildInputs = [
+      indilib
+      libnova
+      libpng
+      zlib
+    ];
+  };
+
+  indi-sbig = buildIndi3rdParty {
+    pname = "indi-sbig";
+    buildInputs = [
+      cfitsio
+      indilib
+      libusb1
+      zlib
+    ];
+    propagatedBuildInputs = [ libsbig ];
+  };
+
+  indi-shelyak = buildIndi3rdParty {
+    pname = "indi-shelyak";
+    buildInputs = [ indilib ];
+  };
+
+  indi-spectracyber = buildIndi3rdParty {
+    pname = "indi-spectracyber";
+    buildInputs = [
+      indilib
+      libnova
+      zlib
+    ];
+  };
+
+  indi-starbook = buildIndi3rdParty {
+    pname = "indi-starbook";
+    buildInputs = [
+      curl
+      indilib
+      gtest
+      libnova
+    ];
+  };
+
+  indi-starbook-ten = buildIndi3rdParty {
+    pname = "indi-starbook-ten";
+    buildInputs = [
+      indilib
+      libnova
+    ];
+  };
+
+  indi-svbony = buildIndi3rdParty {
+    pname = "indi-svbony";
+    buildInputs = [
+      cfitsio
+      indilib
+      zlib
+    ];
+    propagatedBuildInputs = [ libsvbony ];
+
+    meta.platforms = libsvbony.meta.platforms;
+  };
+
+  indi-sx = buildIndi3rdParty {
+    pname = "indi-sx";
+    buildInputs = [
+      cfitsio
+      indilib
+      libusb1
+    ];
+    postPatch = ''
+      substituteInPlace CMakeLists.txt --replace "/lib/udev/rules.d" "lib/udev/rules.d"
+    '';
+  };
+
+  indi-talon6 = buildIndi3rdParty {
+    pname = "indi-talon6";
+    buildInputs = [
+      indilib
+      libnova
+    ];
+  };
+
+  indi-toupbase = buildIndi3rdParty {
+    pname = "indi-toupbase";
+    buildInputs = [
+      cfitsio
+      indilib
+      zlib
+    ];
+    propagatedBuildInputs = [
+      libaltaircam
+      libbressercam
+      libmallincam
+      libmeadecam
+      libnncam
+      libogmacam
+      libomegonprocam
+      libstarshootg
+      libtoupcam
+      libtscam
+    ];
+
+    meta.platforms = with lib.platforms; aarch64 ++ x86_64;
+  };
+
+  indi-webcam = buildIndi3rdParty {
+    pname = "indi-webcam";
+    buildInputs = [
+      cfitsio
+      indilib
+      ffmpeg-headless
+      zlib
+    ];
+  };
+
+  indi-weewx-json = buildIndi3rdParty {
+    pname = "indi-weewx-json";
+    buildInputs = [
+      curl
+      indilib
+    ];
+  };
+
 }
diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix
deleted file mode 100644
index 1eedfd3fea0b..000000000000
--- a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ stdenv
-, lib
-, bash
-, cmake
-, cfitsio
-, coreutils
-, libusb1
-, zlib
-, boost
-, libnova
-, curl
-, libjpeg
-, gsl
-, fftw
-, indilib
-, libgphoto2
-, libraw
-, libftdi1
-, libdc1394
-, gpsd
-, ffmpeg
-, version
-, src
-, autoPatchelfHook
-}:
-let
-  libusb-with-fxload = libusb1.override { withExamples = true;};
-in
-stdenv.mkDerivation rec {
-  pname = "indi-firmware";
-
-  inherit version src;
-
-  nativeBuildInputs = [ cmake autoPatchelfHook ];
-
-  buildInputs = [
-    indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd
-    libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw
-  ];
-
-  cmakeFlags = [
-    "-DINDI_DATA_DIR=\${CMAKE_INSTALL_PREFIX}/share/indi"
-    "-DCMAKE_INSTALL_LIBDIR=lib"
-    "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
-    "-DRULES_INSTALL_DIR=lib/udev/rules.d"
-    "-DFIRMWARE_INSTALL_DIR=lib/firmware"
-    "-DQHY_FIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware/qhy"
-    "-DCONF_DIR=etc"
-    "-DBUILD_LIBS=1"
-    "-DWITH_PENTAX=off"
-    "-DWITH_AHP_XC=off"
-  ];
-
-  postPatch = ''
-    for f in {libfishcamp,libsbig,libqhy}/CMakeLists.txt
-    do
-      substituteInPlace $f --replace "/lib/firmware" "lib/firmware"
-    done
-  '';
-
-  postFixup = lib.optionalString stdenv.isLinux ''
-    for f in $out/lib/udev/rules.d/*.rules
-    do
-      substituteInPlace "$f" --replace "/sbin/fxload" "${libusb-with-fxload}/sbin/fxload" \
-                             --replace "/bin/sleep" "${coreutils}/bin/sleep" \
-                             --replace "/bin/cat" "${coreutils}/bin/cat" \
-                             --replace "/bin/echo" "${coreutils}/bin/echo" \
-                             --replace "/bin/sh" "${bash}/bin/sh" \
-                             --replace "/lib/firmware/" "$out/lib/firmware/"
-      sed -e 's|-D $env{DEVNAME}|-p $env{BUSNUM},$env{DEVNUM}|' -i "$f"
-    done
-  '';
-
-  meta = with lib; {
-    homepage = "https://www.indilib.org/";
-    description = "Third party firmware for the INDI astronomical software suite";
-    changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}";
-    license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ hjones2199 sheepforce ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix
deleted file mode 100644
index c24388582d36..000000000000
--- a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, lib, callPackage, fetchFromGitHub, indilib }:
-
-let
-  inherit (indilib) version;
-  indi-3rdparty-src = fetchFromGitHub {
-    owner = "indilib";
-    repo = "indi-3rdparty";
-    rev = "v${version}";
-    hash = "sha256-0M+k3A2Lw9EU9V5bX9dGztmdcJzc71XQZv8srmY5NmY=";
-  };
-  indi-firmware = callPackage ./indi-firmware.nix {
-    inherit version;
-    src = indi-3rdparty-src;
-  };
-  indi-3rdparty = callPackage ./indi-3rdparty.nix {
-    inherit version;
-    src = indi-3rdparty-src;
-    withFirmware = stdenv.isx86_64 || stdenv.isAarch64;
-    firmware = indi-firmware;
-  };
-in
-callPackage ./indi-with-drivers.nix {
-  pname = "indi-full";
-  inherit version;
-  extraDrivers = [
-    indi-3rdparty
-  ] ++ lib.optional (stdenv.isx86_64 || stdenv.isAarch64) indi-firmware
-  ;
-}
diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix
deleted file mode 100644
index f1201df1d8a0..000000000000
--- a/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ buildEnv, makeBinaryWrapper, indilib ? indilib, pname ? "indi-with-drivers", version ? null, extraDrivers ? null }:
-
-buildEnv {
-  name = "${pname}-${version}";
-  paths = [
-    indilib
-  ]
-  ++ extraDrivers;
-
-  nativeBuildInputs = [ makeBinaryWrapper ];
-
-  postBuild = ''
-    makeBinaryWrapper ${indilib}/bin/indiserver $out/bin/indiserver --set-default INDIPREFIX $out
-  '';
-
-
-  inherit (indilib) meta;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8dbe0527fff1..6b4055bf20bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20942,7 +20942,7 @@ with pkgs;
   indicator-sound-switcher = callPackage ../applications/audio/indicator-sound-switcher { };
 
   indilib = darwin.apple_sdk_11_0.callPackage ../development/libraries/science/astronomy/indilib { };
-  indi-full = callPackage ../development/libraries/science/astronomy/indilib/indi-full.nix { };
+  indi-3rdparty = recurseIntoAttrs (callPackages ../development/libraries/science/astronomy/indilib/indi-3rdparty.nix { });
 
   inih = callPackage ../development/libraries/inih { };
 

From de83fcb2df588530c8e7257d62537adab0b325fd Mon Sep 17 00:00:00 2001
From: Gabriella Gonzalez <GenuineGabriella@gmail.com>
Date: Sun, 18 Aug 2024 11:32:46 -0700
Subject: [PATCH 009/135] containers.*.config: reuse host `nixpkgs.pkgs` if
 defined
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The minimum reproduction for the problem I'm trying to solve is that
the following NixOS test with a trivial NixOS container:

```
{ inputs = {
    nixpkgs.url = "github:NixOS/nixpkgs/24.05";

    flake-utils.url = "github:numtide/flake-utils/v1.0.0";
  };

  outputs = { flake-utils, nixpkgs, self, ... }:
    flake-utils.lib.eachDefaultSystem (system: {
      checks.default = nixpkgs.legacyPackages."${system}".nixosTest {
        name = "test";

        nodes.machine.containers.tutorial.config = { };

        testScript = "";
      };
    });
}
```

… fails with the following error message:

```
error: Neither nodes.machine.nixpkgs.hostPlatform nor the legacy option nodes.machine.nixpkgs.system has been set.
You can set nodes.machine.nixpkgs.hostPlatform in hardware-configuration.nix by re-running
a recent version of nixos-generate-config.
The option nodes.machine.nixpkgs.system is still fully supported for NixOS 22.05 interoperability,
but will be deprecated in the future, so we recommend to set nodes.machine.nixpkgs.hostPlatform.
```

The root of the problem appears to be that in
`nixos/modules/virtualisation/nixos-containers.nix` there is support
for deriving the guest's `nixpkgs.hostPlatform` or
`nixpkgs.localSystem` from the corresponding host's values, but this
doesn't work if the host sets `nixpkgs.pkgs` instead of one of those
values.  In fact, this is what happens when using `pkgs.nixosTest`
(which sets `nixpkgs.pkgs` in
`pkgs/build-support/testers/default.nix`).

The solution I went with was to forward the `nixpkgs.pkgs` setting from
the host to the guest, but only if it is defined (matching the same
treatment as `nixpkgs.hostPlatform` and `nixpkgs.localSystem`.
---
 nixos/modules/virtualisation/nixos-containers.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index 1f96fa2de491..7dc0eba205c6 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -488,7 +488,9 @@ in
                       extraConfig = { options, ... }: {
                         _file = "module at ${__curPos.file}:${toString __curPos.line}";
                         config = {
-                          nixpkgs = if options.nixpkgs?hostPlatform && host.options.nixpkgs.hostPlatform.isDefined
+                          nixpkgs = if options.nixpkgs?pkgs && host.options.nixpkgs.pkgs.isDefined
+                                    then { inherit (host.config.nixpkgs) pkgs; }
+                                    else if options.nixpkgs?hostPlatform && host.options.nixpkgs.hostPlatform.isDefined
                                     then { inherit (host.config.nixpkgs) hostPlatform; }
                                     else { inherit (host.config.nixpkgs) localSystem; }
                           ;

From 0600255046b085870a44a6385bd66dd9f171661b Mon Sep 17 00:00:00 2001
From: Gabriella Gonzalez <GenuineGabriella@gmail.com>
Date: Sun, 18 Aug 2024 16:49:57 -0700
Subject: [PATCH 010/135] Use `host.pkgs.stdenv.hostPlatform`

---
 nixos/modules/virtualisation/nixos-containers.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index 7dc0eba205c6..32ec588d0f00 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -488,12 +488,7 @@ in
                       extraConfig = { options, ... }: {
                         _file = "module at ${__curPos.file}:${toString __curPos.line}";
                         config = {
-                          nixpkgs = if options.nixpkgs?pkgs && host.options.nixpkgs.pkgs.isDefined
-                                    then { inherit (host.config.nixpkgs) pkgs; }
-                                    else if options.nixpkgs?hostPlatform && host.options.nixpkgs.hostPlatform.isDefined
-                                    then { inherit (host.config.nixpkgs) hostPlatform; }
-                                    else { inherit (host.config.nixpkgs) localSystem; }
-                          ;
+                          nixpkgs = { inherit (host.pkgs.stdenv) hostPlatform; };
                           boot.isContainer = true;
                           networking.hostName = mkDefault name;
                           networking.useDHCP = false;

From 79e5dbb2626735cffaff1c660425e8ce3927b399 Mon Sep 17 00:00:00 2001
From: Gabriella Gonzalez <GenuineGabriella@gmail.com>
Date: Sun, 18 Aug 2024 17:00:16 -0700
Subject: [PATCH 011/135] Restore check for container not defining
 `nixpkgs.hostPlatform` option

---
 nixos/modules/virtualisation/nixos-containers.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix
index 32ec588d0f00..ba5112aa6cec 100644
--- a/nixos/modules/virtualisation/nixos-containers.nix
+++ b/nixos/modules/virtualisation/nixos-containers.nix
@@ -488,7 +488,11 @@ in
                       extraConfig = { options, ... }: {
                         _file = "module at ${__curPos.file}:${toString __curPos.line}";
                         config = {
-                          nixpkgs = { inherit (host.pkgs.stdenv) hostPlatform; };
+                          nixpkgs =
+                            if options.nixpkgs?hostPlatform
+                            then { inherit (host.pkgs.stdenv) hostPlatform; }
+                            else { localSystem = host.pkgs.stdenv.hostPlatform; }
+                          ;
                           boot.isContainer = true;
                           networking.hostName = mkDefault name;
                           networking.useDHCP = false;

From dc62e56150ee6015cf067a02ba944cfe778ef43a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 20 Aug 2024 13:50:39 +0000
Subject: [PATCH 012/135] ncnn: 20240410 -> 20240820

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

diff --git a/pkgs/development/libraries/ncnn/default.nix b/pkgs/development/libraries/ncnn/default.nix
index f140b9c1ab1f..ae82d0490be4 100644
--- a/pkgs/development/libraries/ncnn/default.nix
+++ b/pkgs/development/libraries/ncnn/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ncnn";
-  version = "20240410";
+  version = "20240820";
 
   src = fetchFromGitHub {
     owner = "Tencent";
     repo = pname;
     rev = version;
-    hash = "sha256-UiaU+LCevrWBxZg5LAimGIJB0CElWBnO6qoadUc3VVM=";
+    hash = "sha256-KFRWpPajSqYeasPKaNMVe0WTIXwCI5v9GLo5ygN/22M=";
   };
 
   patches = [

From 224f2dc0bdd2c22e1b7d65564c523f6eac60efec Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 20 Aug 2024 21:22:32 +0200
Subject: [PATCH 013/135] evcc: 0.130.1 -> 0.130.2

https://github.com/evcc-io/evcc/releases/tag/0.130.2
---
 pkgs/servers/home-automation/evcc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix
index 289a9220a948..6ba83ed21abd 100644
--- a/pkgs/servers/home-automation/evcc/default.nix
+++ b/pkgs/servers/home-automation/evcc/default.nix
@@ -16,13 +16,13 @@
 
 buildGo123Module rec {
   pname = "evcc";
-  version = "0.130.1";
+  version = "0.130.2";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     rev = version;
-    hash = "sha256-DFMQavUHu5sagtseHWDSmQ/KrAsdfyHGTluC7v1LtWM=";
+    hash = "sha256-ec/Lfxe7c8IUCA/jz3yj6DJOY7ksTymFtjjPR/C2Crg=";
   };
 
   vendorHash = "sha256-Oj5+bmhlZHyOfcJf10EK8mvJauIWk88k0qj2NBkRvFQ=";

From bab6f05d19494b04d57f5cb5a13e57a63807eff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= <galkowskikasper@gmail.com>
Date: Sun, 23 Jun 2024 00:13:54 +0200
Subject: [PATCH 014/135] nyxt: 3.11.6 -> 3.11.8

I've used the tarball with bundled dependencies.
---
 .../networking/browsers/nyxt/default.nix      | 124 ++++++++++++------
 pkgs/top-level/all-packages.nix               |  11 +-
 2 files changed, 96 insertions(+), 39 deletions(-)

diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix
index d0a040748dc8..16231815c426 100644
--- a/pkgs/applications/networking/browsers/nyxt/default.nix
+++ b/pkgs/applications/networking/browsers/nyxt/default.nix
@@ -1,56 +1,104 @@
-{ stdenv, lib, sbclPackages
-, makeWrapper, wrapGAppsHook3, gst_all_1
-, glib, gdk-pixbuf, cairo
-, mailcap, pango, gtk3
-, glib-networking, gsettings-desktop-schemas
-, xclip, wl-clipboard, notify-osd, enchant
+{ stdenv
+, lib
+, testers
+, wrapGAppsHook3
+, fetchzip
+, sbcl
+, pkg-config
+, libfixposix
+, gobject-introspection
+, gsettings-desktop-schemas
+, glib-networking
+, notify-osd
+, gtk3
+, glib
+, gdk-pixbuf
+, cairo
+, pango
+, webkitgtk
+, openssl
+, gstreamer
+, gst-libav
+, gst-plugins-base
+, gst-plugins-good
+, gst-plugins-bad
+, gst-plugins-ugly
+, xdg-utils
+, xclip
+, wl-clipboard
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "nyxt";
-  inherit (sbclPackages.nyxt) version;
+  version = "3.11.8";
 
-  src = sbclPackages.nyxt;
+  src = fetchzip {
+    url = "https://github.com/atlas-engineer/nyxt/releases/download/${finalAttrs.version}/nyxt-${finalAttrs.version}-source-with-submodules.tar.xz";
+    hash = "sha256-mLf2dvnXYUwPEB3QkoB/O3m/e96t6ISUZNfh+y1ArX4=";
+    stripRoot = false;
+  };
 
-  nativeBuildInputs = [ makeWrapper wrapGAppsHook3 ];
-  gstBuildInputs = with gst_all_1; [
-    gstreamer gst-libav
+  # for sbcl 2.4.3
+  postPatch = ''
+    substituteInPlace _build/cl-gobject-introspection/src/init.lisp \
+       --replace-warn sb-ext::set-floating-point-modes sb-int:set-floating-point-modes
+    substituteInPlace _build/fset/Code/port.lisp \
+       --replace-warn sb-ext::once-only sb-int:once-only
+  '';
+
+  nativeBuildInputs = [ wrapGAppsHook3 ];
+
+  buildInputs = [
+    sbcl
+    # for groveller
+    pkg-config libfixposix
+    # for gappsWrapper
+    gobject-introspection
+    gsettings-desktop-schemas
+    glib-networking
+    notify-osd
+    gtk3
+    gstreamer
+    gst-libav
     gst-plugins-base
     gst-plugins-good
     gst-plugins-bad
     gst-plugins-ugly
   ];
-  buildInputs = [
-    glib gdk-pixbuf cairo
-    mailcap pango gtk3
-    glib-networking gsettings-desktop-schemas
-    notify-osd enchant
-  ] ++ gstBuildInputs;
 
-  GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gstBuildInputs;
+  # for cffi
+  LD_LIBRARY_PATH = lib.makeLibraryPath [
+    glib
+    gobject-introspection
+    gdk-pixbuf
+    cairo
+    pango
+    gtk3
+    webkitgtk
+    openssl
+    libfixposix
+  ];
 
-  # The executable is already built in sbclPackages.nyxt, buildPhase tries to build using the makefile which we ignore
-  dontBuild = true;
-
-  dontWrapGApps = true;
-  installPhase = ''
-    mkdir -p $out/share/applications/
-    sed "s/VERSION/$version/" $src/assets/nyxt.desktop > $out/share/applications/nyxt.desktop
-    for i in 16 32 128 256 512; do
-      mkdir -p "$out/share/icons/hicolor/''${i}x''${i}/apps/"
-      cp -f $src/assets/nyxt_''${i}x''${i}.png "$out/share/icons/hicolor/''${i}x''${i}/apps/nyxt.png"
-    done
-
-    mkdir -p $out/bin && makeWrapper $src/bin/nyxt $out/bin/nyxt \
-      --prefix PATH : ${lib.makeBinPath [ xclip wl-clipboard ]} \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "${GST_PLUGIN_SYSTEM_PATH_1_0}" \
-      --argv0 nyxt "''${gappsWrapperArgs[@]}"
+  postConfigure = ''
+    export CL_SOURCE_REGISTRY="$(pwd)/_build//"
+    export ASDF_OUTPUT_TRANSLATIONS="$(pwd):$(pwd)"
+    export PREFIX="$out"
+    export NYXT_VERSION="$version"
   '';
 
-  checkPhase = ''
-    $out/bin/nyxt -h
+  # don't refresh from git
+  makeFlags = [ "all" "NYXT_SUBMODULES=false" ];
+
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH")
+    gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ xdg-utils xclip wl-clipboard ]}")
   '';
 
+  # prevent corrupting core in exe
+  dontStrip = true;
+
+  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+
   meta = with lib; {
     description = "Infinitely extensible web-browser (with Lisp development files using WebKitGTK platform port)";
     mainProgram = "nyxt";
@@ -59,4 +107,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ lewo dariof4 ];
     platforms = platforms.all;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6d1116db509..704c7337a24d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9758,7 +9758,16 @@ with pkgs;
 
   nkeys = callPackage ../tools/system/nkeys { };
 
-  nyxt = callPackage ../applications/networking/browsers/nyxt { };
+  nyxt = callPackage ../applications/networking/browsers/nyxt {
+    sbcl = sbcl_2_4_6;
+    inherit (gst_all_1)
+      gstreamer
+      gst-libav
+      gst-plugins-base
+      gst-plugins-good
+      gst-plugins-bad
+      gst-plugins-ugly;
+  };
 
   nfpm = callPackage ../tools/package-management/nfpm { };
 

From 0875a51bda41592cd560792c8c34a4260a65def1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= <galkowskikasper@gmail.com>
Date: Sun, 23 Jun 2024 00:19:49 +0200
Subject: [PATCH 015/135] sbclPackages.nyxt: remove

It's now built from release tarball with make. It's been removed from upstream quicklisp, too.
---
 pkgs/development/lisp-modules/packages.nix | 265 ---------------------
 1 file changed, 265 deletions(-)

diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix
index 87103e5ff3f5..cf7eeb44ca3b 100644
--- a/pkgs/development/lisp-modules/packages.nix
+++ b/pkgs/development/lisp-modules/packages.nix
@@ -206,271 +206,6 @@ let
     lispLibs = super.mathkit.lispLibs ++ [ super.sb-cga ];
   };
 
-  cl-colors2_0_5_4 = build-asdf-system {
-    inherit (super.cl-colors2) pname systems lispLibs;
-    version = "0.5.4";
-
-    src = pkgs.fetchgit {
-      url = "https://codeberg.org/cage/cl-colors2";
-      rev = "v0.5.4";
-      sha256 = "sha256-JbT1BKjaXDwdlzHLPjX1eg0RMIOT86R17SPgbe2h+tA=";
-    };
-  };
-
-  prompter = build-asdf-system rec {
-    pname = "prompter";
-    version = "20240108-git";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "atlas-engineer";
-      repo = "prompter";
-      rev = "7890ed5d02e70aba01ceb964c6ee4f40776e7dc0";
-      hash = "sha256-rRKtpSKAqfzvnlC3NQ4840RrlbBUpI4V6uX6p5hRJWQ=";
-    };
-
-    lispLibs = [
-      self.cl-containers
-      self.nclasses
-      self.alexandria
-      self.calispel
-      self.closer-mop
-      self.lparallel
-      self.moptilities
-      self.serapeum
-      self.str
-      self.trivial-package-local-nicknames
-    ];
-
-  };
-
-  njson = build-asdf-system rec {
-    pname = "njson";
-    version = "1.2.2";
-    src = pkgs.fetchFromGitHub {
-      owner = "atlas-engineer";
-      repo = "njson";
-      rev = version;
-      sha256 = "sha256-kw5DD0GJp/TeCiYATBY8GL8UKqYS6Q4j0a0eQsdcZRc=";
-    };
-    lispLibs = [ self.cl-json self.com_dot_inuoe_dot_jzon];
-    systems = [ "njson" "njson/cl-json" "njson/jzon"];
-  };
-
-  nsymbols = build-asdf-system rec {
-    pname = "nsymbols";
-    version = "0.3.2";
-    src = pkgs.fetchFromGitHub {
-      owner = "atlas-engineer";
-      repo = "nsymbols";
-      rev = version;
-      sha256 = "sha256-psk29WEA7Hxgp29oUniBNvI+lyZfMkdpa5A7okc6kKs=";
-    };
-    lispLibs = [ self.closer-mop ];
-    systems = [ "nsymbols" "nsymbols/star" ];
-
-  };
-
-  nclasses = build-asdf-system rec {
-    pname = "nclasses";
-    version = "0.6.1";
-    src = pkgs.fetchFromGitHub {
-      owner = "atlas-engineer";
-      repo = "nclasses";
-      rev = version;
-      sha256 = "sha256-foXmaLxMYMFieB2Yd2iPsU4EX5kLXq7kyElqGZ47OgI=";
-    };
-    lispLibs = [ self.moptilities ];
-  };
-
-  nfiles = build-asdf-system rec {
-    pname = "nfiles";
-    version = "1.1.4";
-    src = pkgs.fetchFromGitHub {
-      owner = "atlas-engineer";
-      repo = "nfiles";
-      rev = version;
-      sha256 = "sha256-4rhpBErQgZHcwZRblxgiYaUmKalvllSbJjnRteDVH6k=";
-    };
-    lispLibs = [
-      self.nclasses
-      self.quri
-      self.alexandria
-      self.iolib
-      self.serapeum
-      self.trivial-garbage
-      self.trivial-package-local-nicknames
-      self.trivial-types
-    ];
-  };
-
-  nhooks = build-asdf-system rec {
-    pname = "nhooks";
-    version = "1.2.2";
-    src = pkgs.fetchFromGitHub {
-      owner = "atlas-engineer";
-      repo = "nhooks";
-      rev = version;
-      hash = "sha256-6A3fsemsv2KbTmdGMQeL9iHFUBHc4kK6CRNVyc91LdU=";
-    };
-    lispLibs = with self; [ bordeaux-threads closer-mop serapeum ];
-  };
-
-  nkeymaps = build-asdf-system rec {
-    pname = "nkeymaps";
-    version = "1.1.1";
-    src = pkgs.fetchFromGitHub {
-      owner = "atlas-engineer";
-      repo = "nkeymaps";
-      rev = version;
-      hash = "sha256-/t85Yh4EvnSyIM6xeDBLmfVz3wddmavInXzeYafNMJ0=";
-    };
-    lispLibs = with self; [ alexandria fset trivial-package-local-nicknames
-                            str ];
-  };
-
-
-  history-tree = build-asdf-system rec {
-    pname = "history-tree";
-    version = "0.1.2";
-    src = pkgs.fetchFromGitHub {
-      owner = "atlas-engineer";
-      repo = "history-tree";
-      rev = version;
-      hash = "sha256-wpVONvShNnvrPOlbNoX/t9sYiwxnIKnnJaJyALEyeNg=";
-    };
-    lispLibs = with self; [
-      alexandria
-      cl-custom-hash-table
-      local-time
-      nclasses
-      trivial-package-local-nicknames
-    ];
-  };
-
-  nyxt-gtk = build-asdf-system {
-    pname = "nyxt";
-    version = "3.11.6";
-
-    lispLibs = (with self; [
-      alexandria
-      bordeaux-threads
-      calispel
-      cl-base64
-      cl-gopher
-      cl-html-diff
-      cl-json
-      cl-ppcre
-      cl-ppcre-unicode
-      cl-prevalence
-      cl-qrencode
-      cl-tld
-      closer-mop
-      dissect
-      moptilities
-      dexador
-      enchant
-      flexi-streams
-      idna
-      iolib
-      lass
-      local-time
-      lparallel
-      log4cl
-      montezuma
-      ndebug
-      osicat
-      parenscript
-      py-configparser
-      serapeum
-      str
-      phos
-      plump
-      clss
-      spinneret
-      trivia
-      trivial-features
-      trivial-garbage
-      trivial-package-local-nicknames
-      trivial-types
-      unix-opts
-      cluffer
-      cl-cffi-gtk
-      quri
-      sqlite
-      trivial-clipboard
-      cl-gobject-introspection
-      cl-webkit2
-      slynk
-      iterate
-      symbol-munger
-      history-tree
-      nhooks
-      nkeymaps
-      prompter
-      cl-colors2_0_5_4
-      njson
-      nsymbols
-      nclasses
-      nfiles
-      cl-containers
-      swank
-    ]);
-
-    src = pkgs.fetchFromGitHub {
-      owner = "atlas-engineer";
-      repo = "nyxt";
-      rev = "3.11.6";
-      hash = "sha256-o+4LnSNyhdz5YAjNQJuE2ERtt48PckjKfts9QVRw82A=";
-    };
-
-    nativeBuildInputs = [ pkgs.makeWrapper ];
-
-    buildInputs = [
-      # needed for GSETTINGS_SCHEMAS_PATH
-      pkgs.gsettings-desktop-schemas pkgs.glib pkgs.gtk3
-
-      # needed for XDG_ICON_DIRS
-      pkgs.adwaita-icon-theme
-    ];
-
-    # This patch removes the :build-operation component from the nyxt/gi-gtk-application system.
-    # This is done because if asdf:operate is used and the operation matches the system's :build-operation
-    # then output translations are ignored, causing the result of the operation to be placed where
-    # the .asd is located, which in this case is the nix store.
-    # see: https://gitlab.common-lisp.net/asdf/asdf/-/blob/master/doc/asdf.texinfo#L2582
-    patches = [ ./patches/nyxt-remove-build-operation.patch ];
-
-    NASDF_USE_LOGICAL_PATHS = true;
-
-    buildScript = pkgs.writeText "build-nyxt.lisp" ''
-      (load "${super.alexandria.asdfFasl}/asdf.${super.alexandria.faslExt}")
-      (require :uiop)
-      (let ((pwd (uiop:ensure-directory-pathname (uiop/os:getcwd))))
-        (asdf:load-asd (uiop:merge-pathnames* "libraries/nasdf/nasdf.asd" pwd))
-        (asdf:load-asd (uiop:merge-pathnames* "nyxt.asd" pwd)))
-      ;; There's a weird error while copy/pasting in Nyxt that manifests with sb-ext:save-lisp-and-die, so we use asdf:operare :program-op instead
-      (asdf:operate :program-op :nyxt/gi-gtk-application)
-    '';
-
-    # TODO(kasper): use wrapGAppsHook3
-    installPhase = ''
-      mkdir -pv $out
-      cp -r * $out
-      rm -fv $out/nyxt
-      mkdir -p $out/bin
-      cp -v nyxt $out/bin
-      wrapProgram $out/bin/nyxt \
-        --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH \
-        --prefix XDG_DATA_DIRS : $XDG_ICON_DIRS \
-        --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
-        --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \
-        --prefix GIO_EXTRA_MODULES ":" ${pkgs.dconf.lib}/lib/gio/modules/ \
-        --prefix GIO_EXTRA_MODULES ":" ${pkgs.glib-networking}/lib/gio/modules/
-    '';
-  };
-
-  nyxt = self.nyxt-gtk;
-
   stumpwm = super.stumpwm.overrideLispAttrs (o: rec {
     version = "22.11";
     src = pkgs.fetchFromGitHub {

From 1edbc4fa0dc6ea6b09201c731b4759ee91af32b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 22 Aug 2024 21:09:27 +0200
Subject: [PATCH 016/135] nixos/ups: change upsmon option type from str to enum

According to `man upsd.users`, the option is 'either set to "primary" or
"secondary"'.
---
 nixos/modules/services/monitoring/ups.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix
index 359cb9085fcf..b86e93a661ca 100644
--- a/nixos/modules/services/monitoring/ups.nix
+++ b/nixos/modules/services/monitoring/ups.nix
@@ -366,7 +366,7 @@ let
       };
 
       upsmon = mkOption {
-        type = with types; nullOr str;
+        type = with types; nullOr (enum [ "primary" "secondary" ]);
         default = null;
         description = ''
           Add the necessary actions for a upsmon process to work.

From 91098b26e25aa35eb893e49bb9a54948737a2dfa Mon Sep 17 00:00:00 2001
From: Dylan Bulfin <dylanbulfin@gmail.com>
Date: Sun, 18 Aug 2024 11:24:36 -0400
Subject: [PATCH 017/135] vimPlugins.smart-open-nvim: init at 2024-08-18

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

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 4d80030d7aa3..116c3215de9e 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -10135,6 +10135,18 @@ final: prev:
     meta.homepage = "https://github.com/kovisoft/slimv/";
   };
 
+  smart-open-nvim = buildVimPlugin {
+    pname = "smart-open.nvim";
+    version = "2024-08-17";
+    src = fetchFromGitHub {
+      owner = "danielfalk";
+      repo = "smart-open.nvim";
+      rev = "87626ee8748b9bba22093adec7bb58c63e7214f0";
+      sha256 = "sha256-ro4qFdEAnE5u8wt7NyIc7OHobvjRotVX+LZ0P5as8EU=";
+    };
+    meta.homepage = "https://github.com/danielfalk/smart-open.nvim/";
+  };
+
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
     version = "2024-08-02";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index c75e6804600e..5c744153d859 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1467,6 +1467,10 @@
     dependencies = [ self.skim ];
   };
 
+  smart-open-nvim = super.smart-open-nvim.overrideAttrs {
+    dependencies = with self; [ telescope-nvim sqlite-lua ];
+  };
+
   sniprun =
     let
       version = "1.3.15";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 64b5a4776d05..788ac374d67a 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -853,6 +853,7 @@ https://github.com/AndrewRadev/sideways.vim/,,
 https://github.com/lotabout/skim.vim/,,
 https://github.com/mopp/sky-color-clock.vim/,,
 https://github.com/kovisoft/slimv/,,
+https://github.com/danielfalk/smart-open.nvim,0.2.x,
 https://github.com/mrjones2014/smart-splits.nvim/,,
 https://github.com/m4xshen/smartcolumn.nvim/,,
 https://github.com/gorkunov/smartpairs.vim/,,

From 8e80b3309299cfd156750729206eb406d4cedc15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 Aug 2024 14:22:33 +0000
Subject: [PATCH 018/135] rpcs3: 0.0.32-16833-981a1c56f ->
 0.0.32-16857-1c16ada67

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

diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index a485423ad1fb..952ef7386568 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -33,10 +33,10 @@
 
 let
   # Keep these separate so the update script can regex them
-  rpcs3GitVersion = "16833-981a1c56f";
-  rpcs3Version = "0.0.32-16833-981a1c56f";
-  rpcs3Revision = "981a1c56fbfb6056e5496bba9b8678a9dc755405";
-  rpcs3Hash = "sha256-yRJ7RBRWm/HcdT/lw4t5AElsxujxFk0bA/keURCyQac=";
+  rpcs3GitVersion = "16857-1c16ada67";
+  rpcs3Version = "0.0.32-16857-1c16ada67";
+  rpcs3Revision = "1c16ada670bb396e98b33ec4510c1b3efb534724";
+  rpcs3Hash = "sha256-uEk7svLCE/jsiyg6NnINZcqltE8QS9gXOEXpWZfbDF8=";
 
   inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland;
 in

From 15966c246729a8c2b3deb80a3f13e712e40e158e Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Fri, 23 Aug 2024 09:27:07 -0700
Subject: [PATCH 019/135] glide-media-player: 0.6.3 -> 0.6.5

---
 pkgs/by-name/gl/glide-media-player/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gl/glide-media-player/package.nix b/pkgs/by-name/gl/glide-media-player/package.nix
index a4ea3311444f..eca436d68591 100644
--- a/pkgs/by-name/gl/glide-media-player/package.nix
+++ b/pkgs/by-name/gl/glide-media-player/package.nix
@@ -17,26 +17,26 @@
 
 stdenv.mkDerivation rec {
   pname = "glide-media-player";
-  version = "0.6.3";
+  version = "0.6.5";
 
   src = fetchFromGitHub {
     owner = "philn";
     repo = "glide";
     rev = version;
-    hash = "sha256-rWWMMuA41uFWazIJBVLxzaCrR5X5tI4x+GXXYkfeqz8=";
+    hash = "sha256-gmBXUj6LxC7VDH/ni8neYivysagqcbI/UCUq9Ly3D24=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-Kvdbo5tkhwsah9W7Y5zqpoA3bVHfmjGj7Cjsqxkljls=";
+    hash = "sha256-u41H746/nPX2PmpyweUp4Y9k+XIruazgMdU6B4ig708=";
   };
 
   postPatch = ''
     substituteInPlace scripts/meson_post_install.py \
       --replace-warn "gtk-update-icon-cache" "gtk4-update-icon-cache"
-    substituteInPlace data/net.baseart.Glide.desktop \
-      --replace-warn "Icon=net.baseart.Glide.svg" "Icon=net.baseart.Glide"
+    substituteInPlace data/net.base_art.Glide.desktop \
+      --replace-warn "Icon=net.base_art.Glide.svg" "Icon=net.baseart.Glide"
     patchShebangs --build \
       scripts/meson_post_install.py \
       build-aux/cargo-build.py

From 1b03e7d8e5249f39972ec944e74e3be61411fac9 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Fri, 23 Aug 2024 23:55:18 -0400
Subject: [PATCH 020/135] cloudflared: add updateScript

---
 pkgs/applications/networking/cloudflared/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index 898c26b11d68..5735cd2132f7 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -3,6 +3,7 @@
 , buildGoModule
 , fetchFromGitHub
 , callPackage
+, gitUpdater
 }:
 
 buildGoModule rec {
@@ -70,7 +71,10 @@ buildGoModule rec {
 
   doCheck = !stdenv.isDarwin;
 
-  passthru.tests.simple = callPackage ./tests.nix { inherit version; };
+  passthru = {
+    tests.simple = callPackage ./tests.nix { inherit version; };
+    updateScript = gitUpdater { };
+  };
 
   meta = with lib; {
     description = "Cloudflare Tunnel daemon, Cloudflare Access toolkit, and DNS-over-HTTPS client";

From 7b22b8c19e9991694ad0eaeef096804952ccd310 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sat, 24 Aug 2024 14:07:01 +0800
Subject: [PATCH 021/135] deepin: format via nixfmt-rfc-style

---
 .../deepin/apps/deepin-album/default.nix      |  37 +--
 .../deepin/apps/deepin-calculator/default.nix |  29 +--
 .../deepin/apps/deepin-camera/default.nix     | 102 +++++----
 .../deepin/apps/deepin-compressor/default.nix |  41 ++--
 .../deepin/apps/deepin-draw/default.nix       |  25 ++-
 .../deepin/apps/deepin-editor/default.nix     |  39 ++--
 .../apps/deepin-image-viewer/default.nix      |  39 ++--
 .../apps/deepin-movie-reborn/default.nix      | 142 ++++++------
 .../deepin/apps/deepin-music/default.nix      |  89 ++++----
 .../deepin/apps/deepin-picker/default.nix     |  23 +-
 .../deepin/apps/deepin-reader/default.nix     |  45 ++--
 .../apps/deepin-screen-recorder/default.nix   | 111 ++++-----
 .../apps/deepin-screensaver/default.nix       |  30 +--
 .../apps/deepin-shortcut-viewer/default.nix   |  24 +-
 .../apps/deepin-system-monitor/default.nix    |  57 +++--
 .../deepin/apps/deepin-terminal/default.nix   |  35 +--
 .../deepin/apps/deepin-voice-note/default.nix |  77 ++++---
 .../artwork/dde-account-faces/default.nix     |  12 +-
 .../artwork/deepin-desktop-theme/default.nix  |  26 ++-
 .../artwork/deepin-gtk-theme/default.nix      |  13 +-
 .../artwork/deepin-icon-theme/default.nix     |  17 +-
 .../artwork/deepin-sound-theme/default.nix    |   7 +-
 .../artwork/deepin-wallpapers/default.nix     |  14 +-
 .../deepin/core/dde-app-services/default.nix  |  23 +-
 .../deepin/core/dde-appearance/default.nix    |  31 +--
 .../core/dde-application-manager/default.nix  |  15 +-
 .../deepin/core/dde-calendar/default.nix      |  38 ++--
 .../deepin/core/dde-clipboard/default.nix     |  35 ++-
 .../core/dde-control-center/default.nix       |  50 +++--
 .../desktops/deepin/core/dde-dock/default.nix |  48 ++--
 .../deepin/core/dde-file-manager/default.nix  |  92 ++++----
 .../deepin/core/dde-grand-search/default.nix  |  37 +--
 .../core/dde-gsettings-schemas/default.nix    |  29 +--
 .../deepin/core/dde-launchpad/default.nix     |  49 ++--
 .../deepin/core/dde-network-core/default.nix  |  37 ++-
 .../deepin/core/dde-polkit-agent/default.nix  |  31 ++-
 .../deepin/core/dde-session-shell/default.nix |  66 +++---
 .../deepin/core/dde-session-ui/default.nix    |  39 ++--
 .../deepin/core/dde-session/default.nix       |  27 +--
 .../deepin/core/dde-shell/default.nix         |  51 +++--
 .../deepin/core/dde-widgets/default.nix       |  25 ++-
 .../deepin/core/deepin-kwin/default.nix       |  82 +++----
 .../core/deepin-service-manager/default.nix   |  13 +-
 .../core/dpa-ext-gnomekeyring/default.nix     |  23 +-
 pkgs/desktops/deepin/default.nix              | 210 +++++++++---------
 .../deepin/go-package/dde-api/default.nix     |  35 +--
 .../deepin/go-package/dde-daemon/default.nix  |  82 ++++---
 .../deepin-desktop-schemas/default.nix        |  11 +-
 .../go-package/deepin-pw-check/default.nix    |  29 ++-
 .../deepin/go-package/startdde/default.nix    |  33 +--
 .../library/dde-qt-dbus-factory/default.nix   |  17 +-
 .../deepin-ocr-plugin-manager/default.nix     |  23 +-
 .../deepin/library/deepin-pdfium/default.nix  |  17 +-
 .../deepin-wayland-protocols/default.nix      |  11 +-
 .../deepin/library/disomaster/default.nix     |  17 +-
 .../deepin/library/docparser/default.nix      |  17 +-
 .../deepin/library/dtk6core/default.nix       |  34 +--
 .../library/dtk6declarative/default.nix       |  39 ++--
 .../deepin/library/dtk6gui/default.nix        |  25 ++-
 .../library/dtk6systemsettings/default.nix    |  25 ++-
 .../deepin/library/dtk6widget/default.nix     |  45 ++--
 .../deepin/library/dtkcommon/default.nix      |  13 +-
 .../deepin/library/dtkcore/default.nix        |  36 +--
 .../deepin/library/dtkdeclarative/default.nix |  23 +-
 .../deepin/library/dtkgui/default.nix         |  27 ++-
 .../deepin/library/dtkwidget/default.nix      |  31 +--
 .../deepin/library/dwayland/default.nix       |  25 ++-
 .../deepin/library/gio-qt/default.nix         |  38 ++--
 .../deepin/library/image-editor/default.nix   |  38 ++--
 .../deepin/library/qt5integration/default.nix |  23 +-
 .../library/qt5platform-plugins/default.nix   |  27 +--
 .../deepin/library/qt6integration/default.nix |  17 +-
 .../library/qt6platform-plugins/default.nix   |  21 +-
 .../deepin/library/udisks2-qt5/default.nix    |  21 +-
 .../deepin/library/util-dfm/default.nix       |  23 +-
 .../misc/deepin-desktop-base/default.nix      |  14 +-
 .../deepin/misc/deepin-turbo/default.nix      |  19 +-
 .../tools/dde-device-formatter/default.nix    |  31 ++-
 .../deepin/tools/deepin-anything/default.nix  |  23 +-
 .../tools/deepin-gettext-tools/default.nix    |  17 +-
 80 files changed, 1583 insertions(+), 1429 deletions(-)

diff --git a/pkgs/desktops/deepin/apps/deepin-album/default.nix b/pkgs/desktops/deepin/apps/deepin-album/default.nix
index 4cca3377492c..ed1edae06321 100644
--- a/pkgs/desktops/deepin/apps/deepin-album/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-album/default.nix
@@ -1,21 +1,22 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, qttools
-, wrapQtAppsHook
-, dtkwidget
-, dtkdeclarative
-, qt5integration
-, qt5platform-plugins
-, qtbase
-, qtsvg
-, udisks2-qt5
-, gio-qt
-, freeimage
-, ffmpeg
-, ffmpegthumbnailer
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qttools,
+  wrapQtAppsHook,
+  dtkwidget,
+  dtkdeclarative,
+  qt5integration,
+  qt5platform-plugins,
+  qtbase,
+  qtsvg,
+  udisks2-qt5,
+  gio-qt,
+  freeimage,
+  ffmpeg,
+  ffmpegthumbnailer,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
index 6565e99401ce..631e42407875 100644
--- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix
@@ -1,17 +1,18 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, qtbase
-, qtsvg
-, dde-qt-dbus-factory
-, cmake
-, qttools
-, pkg-config
-, wrapQtAppsHook
-, gtest
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  qtbase,
+  qtsvg,
+  dde-qt-dbus-factory,
+  cmake,
+  qttools,
+  pkg-config,
+  wrapQtAppsHook,
+  gtest,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix
index d62e8a6c91f1..c1f3e53b5be2 100644
--- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-camera/default.nix
@@ -1,26 +1,27 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, qttools
-, wrapQtAppsHook
-, dtkwidget
-, wayland
-, dwayland
-, qt5integration
-, qt5platform-plugins
-, image-editor
-, qtbase
-, qtmultimedia
-, ffmpeg
-, ffmpegthumbnailer
-, libusb1
-, libpciaccess
-, portaudio
-, libv4l
-, gst_all_1
-, systemd
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qttools,
+  wrapQtAppsHook,
+  dtkwidget,
+  wayland,
+  dwayland,
+  qt5integration,
+  qt5platform-plugins,
+  image-editor,
+  qtbase,
+  qtmultimedia,
+  ffmpeg,
+  ffmpegthumbnailer,
+  libusb1,
+  libpciaccess,
+  portaudio,
+  libv4l,
+  gst_all_1,
+  systemd,
 }:
 
 stdenv.mkDerivation rec {
@@ -53,26 +54,28 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  buildInputs = [
-    dtkwidget
-    wayland
-    dwayland
-    qt5integration
-    qt5platform-plugins
-    image-editor
-    qtbase
-    qtmultimedia
-    ffmpeg
-    ffmpegthumbnailer
-    libusb1
-    libpciaccess
-    portaudio
-    libv4l
-  ] ++ (with gst_all_1 ; [
-    gstreamer
-    gst-plugins-base
-    gst-plugins-good
-  ]);
+  buildInputs =
+    [
+      dtkwidget
+      wayland
+      dwayland
+      qt5integration
+      qt5platform-plugins
+      image-editor
+      qtbase
+      qtmultimedia
+      ffmpeg
+      ffmpegthumbnailer
+      libusb1
+      libpciaccess
+      portaudio
+      libv4l
+    ]
+    ++ (with gst_all_1; [
+      gstreamer
+      gst-plugins-base
+      gst-plugins-good
+    ]);
 
   cmakeFlags = [ "-DVERSION=${version}" ];
 
@@ -84,7 +87,18 @@ stdenv.mkDerivation rec {
   ];
 
   qtWrapperArgs = [
-    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base libusb1 libv4l portaudio systemd ]}"
+    "--prefix LD_LIBRARY_PATH : ${
+      lib.makeLibraryPath [
+        ffmpeg
+        ffmpegthumbnailer
+        gst_all_1.gstreamer
+        gst_all_1.gst-plugins-base
+        libusb1
+        libv4l
+        portaudio
+        systemd
+      ]
+    }"
   ];
 
   preFixup = ''
diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix
index 07a92200cb21..29c538406c25 100644
--- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix
@@ -1,21 +1,22 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, udisks2-qt5
-, cmake
-, qtbase
-, qttools
-, pkg-config
-, kcodecs
-, karchive
-, wrapQtAppsHook
-, minizip
-, libzip
-, libuuid
-, libarchive
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  udisks2-qt5,
+  cmake,
+  qtbase,
+  qttools,
+  pkg-config,
+  kcodecs,
+  karchive,
+  wrapQtAppsHook,
+  minizip,
+  libzip,
+  libuuid,
+  libarchive,
 }:
 
 stdenv.mkDerivation rec {
@@ -62,9 +63,7 @@ stdenv.mkDerivation rec {
   ];
 
   # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [
-    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
-  ];
+  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
 
   strictDeps = true;
 
diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix
index 35de0414b47e..eaa6ee1a1cfe 100644
--- a/pkgs/desktops/deepin/apps/deepin-draw/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-draw/default.nix
@@ -1,15 +1,16 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, qttools
-, pkg-config
-, wrapQtAppsHook
-, qtbase
-, qtsvg
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  qttools,
+  pkg-config,
+  wrapQtAppsHook,
+  qtbase,
+  qtsvg,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix
index 7987c814b7aa..a3b1a15b6697 100644
--- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix
@@ -1,22 +1,23 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, qttools
-, wrapQtAppsHook
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, qtbase
-, qtsvg
-, dde-qt-dbus-factory
-, kcodecs
-, syntax-highlighting
-, libchardet
-, libuchardet
-, libiconv
-, gitUpdater
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qttools,
+  wrapQtAppsHook,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  qtbase,
+  qtsvg,
+  dde-qt-dbus-factory,
+  kcodecs,
+  syntax-highlighting,
+  libchardet,
+  libuchardet,
+  libiconv,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix
index 8cb889b05f44..31ce23124cd2 100644
--- a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix
@@ -1,22 +1,23 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, fetchpatch
-, cmake
-, pkg-config
-, qttools
-, wrapQtAppsHook
-, qt5platform-plugins
-, qtbase
-, dtkwidget
-, dtkdeclarative
-, deepin-ocr-plugin-manager
-, gio-qt
-, udisks2-qt5
-, image-editor
-, libraw
-, libexif
-, freeimage
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  pkg-config,
+  qttools,
+  wrapQtAppsHook,
+  qt5platform-plugins,
+  qtbase,
+  dtkwidget,
+  dtkdeclarative,
+  deepin-ocr-plugin-manager,
+  gio-qt,
+  udisks2-qt5,
+  image-editor,
+  libraw,
+  libexif,
+  freeimage,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix
index 494db983c2c1..cb87e366304e 100644
--- a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix
@@ -1,33 +1,34 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, wrapQtAppsHook
-, qttools
-, qtx11extras
-, qtmultimedia
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, qtmpris
-, qtdbusextended
-, gsettings-qt
-, elfutils
-, ffmpeg
-, ffmpegthumbnailer
-, mpv
-, xorg
-, pcre
-, libdvdread
-, libdvdnav
-, libunwind
-, libva
-, zstd
-, glib
-, gst_all_1
-, gtest
-, libpulseaudio
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  wrapQtAppsHook,
+  qttools,
+  qtx11extras,
+  qtmultimedia,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  qtmpris,
+  qtdbusextended,
+  gsettings-qt,
+  elfutils,
+  ffmpeg,
+  ffmpegthumbnailer,
+  mpv,
+  xorg,
+  pcre,
+  libdvdread,
+  libdvdnav,
+  libunwind,
+  libva,
+  zstd,
+  glib,
+  gst_all_1,
+  gtest,
+  libpulseaudio,
 }:
 
 stdenv.mkDerivation rec {
@@ -41,11 +42,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-1UbrNufetedla8TMFPze1hP/R2cZN7SEYEtrK4/5/RQ=";
   };
 
-  patches = [
-    ./dont_use_libPath.diff
-  ];
+  patches = [ ./dont_use_libPath.diff ];
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   nativeBuildInputs = [
     cmake
@@ -54,34 +56,36 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  buildInputs = [
-    dtkwidget
-    qt5integration
-    qt5platform-plugins
-    qtx11extras
-    qtmultimedia
-    qtdbusextended
-    qtmpris
-    gsettings-qt
-    elfutils
-    ffmpeg
-    ffmpegthumbnailer
-    xorg.libXtst
-    xorg.libXdmcp
-    xorg.xcbproto
-    pcre.dev
-    libdvdread
-    libdvdnav
-    libunwind
-    libva
-    zstd
-    mpv
-    gtest
-    libpulseaudio
-  ] ++ (with gst_all_1; [
-    gstreamer
-    gst-plugins-base
-  ]);
+  buildInputs =
+    [
+      dtkwidget
+      qt5integration
+      qt5platform-plugins
+      qtx11extras
+      qtmultimedia
+      qtdbusextended
+      qtmpris
+      gsettings-qt
+      elfutils
+      ffmpeg
+      ffmpegthumbnailer
+      xorg.libXtst
+      xorg.libXdmcp
+      xorg.xcbproto
+      pcre.dev
+      libdvdread
+      libdvdnav
+      libunwind
+      libva
+      zstd
+      mpv
+      gtest
+      libpulseaudio
+    ]
+    ++ (with gst_all_1; [
+      gstreamer
+      gst-plugins-base
+    ]);
 
   propagatedBuildInputs = [
     qtmultimedia
@@ -94,14 +98,20 @@ stdenv.mkDerivation rec {
     "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"
   ];
 
-  cmakeFlags = [
-    "-DVERSION=${version}"
-  ];
+  cmakeFlags = [ "-DVERSION=${version}" ];
 
   strictDeps = true;
 
   qtWrapperArgs = [
-    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ mpv ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base ]}"
+    "--prefix LD_LIBRARY_PATH : ${
+      lib.makeLibraryPath [
+        mpv
+        ffmpeg
+        ffmpegthumbnailer
+        gst_all_1.gstreamer
+        gst_all_1.gst-plugins-base
+      ]
+    }"
   ];
 
   preFixup = ''
diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix
index e5cbca387efb..41555483ccd0 100644
--- a/pkgs/desktops/deepin/apps/deepin-music/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix
@@ -1,24 +1,25 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, qttools
-, wrapQtAppsHook
-, dtkwidget
-, dtkdeclarative
-, qt5integration
-, qt5platform-plugins
-, udisks2-qt5
-, qtmpris
-, qtmultimedia
-, kcodecs
-, ffmpeg
-, libvlc
-, taglib
-, SDL2
-, qtbase
-, gst_all_1
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qttools,
+  wrapQtAppsHook,
+  dtkwidget,
+  dtkdeclarative,
+  qt5integration,
+  qt5platform-plugins,
+  udisks2-qt5,
+  qtmpris,
+  qtmultimedia,
+  kcodecs,
+  ffmpeg,
+  libvlc,
+  taglib,
+  SDL2,
+  qtbase,
+  gst_all_1,
 }:
 
 stdenv.mkDerivation rec {
@@ -32,9 +33,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-MLfkSO8ru8MKiwgiQ0mPO3zGlnIeSHPc0Op5jjzJ6PE=";
   };
 
-  patches = [
-    "${src}/patches/fix-library-path.patch"
-  ];
+  patches = [ "${src}/patches/fix-library-path.patch" ];
 
   nativeBuildInputs = [
     cmake
@@ -43,28 +42,28 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  buildInputs = [
-    dtkwidget
-    dtkdeclarative
-    qt5integration
-    qt5platform-plugins
-    udisks2-qt5
-    qtmpris
-    qtmultimedia
-    kcodecs
-    ffmpeg
-    libvlc
-    taglib
-    SDL2
-  ] ++ (with gst_all_1; [
-    gstreamer
-    gst-plugins-base
-    gst-plugins-good
-  ]);
+  buildInputs =
+    [
+      dtkwidget
+      dtkdeclarative
+      qt5integration
+      qt5platform-plugins
+      udisks2-qt5
+      qtmpris
+      qtmultimedia
+      kcodecs
+      ffmpeg
+      libvlc
+      taglib
+      SDL2
+    ]
+    ++ (with gst_all_1; [
+      gstreamer
+      gst-plugins-base
+      gst-plugins-good
+    ]);
 
-  cmakeFlags = [
-    "-DVERSION=${version}"
-  ];
+  cmakeFlags = [ "-DVERSION=${version}" ];
 
   env.NIX_CFLAGS_COMPILE = toString [
     "-I${libvlc}/include/vlc/plugins"
diff --git a/pkgs/desktops/deepin/apps/deepin-picker/default.nix b/pkgs/desktops/deepin/apps/deepin-picker/default.nix
index 5ee86bf7b8e3..f74e2ae3513d 100644
--- a/pkgs/desktops/deepin/apps/deepin-picker/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-picker/default.nix
@@ -1,14 +1,15 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, qmake
-, qttools
-, pkg-config
-, wrapQtAppsHook
-, dtkwidget
-, qtbase
-, qtsvg
-, xorg
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  qmake,
+  qttools,
+  pkg-config,
+  wrapQtAppsHook,
+  dtkwidget,
+  qtbase,
+  qtsvg,
+  xorg,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix
index d730114af4fc..2bae6bf3e778 100644
--- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix
@@ -1,23 +1,24 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, qmake
-, pkg-config
-, qttools
-, wrapQtAppsHook
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, dde-qt-dbus-factory
-, qtwebengine
-, karchive
-, poppler
-, libchardet
-, libspectre
-, openjpeg
-, djvulibre
-, qtbase
-, gtest
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  qmake,
+  pkg-config,
+  qttools,
+  wrapQtAppsHook,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  dde-qt-dbus-factory,
+  qtwebengine,
+  karchive,
+  poppler,
+  libchardet,
+  libspectre,
+  openjpeg,
+  djvulibre,
+  qtbase,
+  gtest,
 }:
 
 stdenv.mkDerivation rec {
@@ -63,9 +64,7 @@ stdenv.mkDerivation rec {
     gtest
   ];
 
-  qmakeFlags = [
-    "DEFINES+=VERSION=${version}"
-  ];
+  qmakeFlags = [ "DEFINES+=VERSION=${version}" ];
 
   meta = with lib; {
     description = "Simple memo software with texts and voice recordings";
diff --git a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
index 3b775fb8bc64..6c2fffe63032 100644
--- a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
@@ -1,27 +1,28 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, qmake
-, pkg-config
-, qttools
-, wrapQtAppsHook
-, dtkwidget
-, qt5integration
-, dde-qt-dbus-factory
-, qtbase
-, qtmultimedia
-, qtx11extras
-, image-editor
-, gsettings-qt
-, xorg
-, libusb1
-, libv4l
-, ffmpeg
-, ffmpegthumbnailer
-, portaudio
-, kwayland
-, udev
-, gst_all_1
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  qmake,
+  pkg-config,
+  qttools,
+  wrapQtAppsHook,
+  dtkwidget,
+  qt5integration,
+  dde-qt-dbus-factory,
+  qtbase,
+  qtmultimedia,
+  qtx11extras,
+  image-editor,
+  gsettings-qt,
+  xorg,
+  libusb1,
+  libv4l,
+  ffmpeg,
+  ffmpegthumbnailer,
+  portaudio,
+  kwayland,
+  udev,
+  gst_all_1,
 }:
 
 stdenv.mkDerivation rec {
@@ -35,9 +36,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-nE+axTUxWCcgrxQ5y2cjkVswW2rwv/We0m7XgB4shko=";
   };
 
-  patches = [
-    ./dont_use_libPath.diff
-  ];
+  patches = [ ./dont_use_libPath.diff ];
 
   # disable dock plugins, it's part of dde-shell now
   postPatch = ''
@@ -57,34 +56,44 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  buildInputs = [
-    dtkwidget
-    dde-qt-dbus-factory
-    qtbase
-    qtmultimedia
-    qtx11extras
-    image-editor
-    gsettings-qt
-    xorg.libXdmcp
-    xorg.libXtst
-    xorg.libXcursor
-    libusb1
-    libv4l
-    ffmpeg
-    ffmpegthumbnailer
-    portaudio
-    kwayland
-    udev
-  ] ++ (with gst_all_1; [
-    gstreamer
-    gst-plugins-base
-    gst-plugins-good
-  ]);
+  buildInputs =
+    [
+      dtkwidget
+      dde-qt-dbus-factory
+      qtbase
+      qtmultimedia
+      qtx11extras
+      image-editor
+      gsettings-qt
+      xorg.libXdmcp
+      xorg.libXtst
+      xorg.libXcursor
+      libusb1
+      libv4l
+      ffmpeg
+      ffmpegthumbnailer
+      portaudio
+      kwayland
+      udev
+    ]
+    ++ (with gst_all_1; [
+      gstreamer
+      gst-plugins-base
+      gst-plugins-good
+    ]);
 
   # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
   qtWrapperArgs = [
     "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
-    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev gst_all_1.gstreamer libv4l ffmpeg ffmpegthumbnailer ]}"
+    "--prefix LD_LIBRARY_PATH : ${
+      lib.makeLibraryPath [
+        udev
+        gst_all_1.gstreamer
+        libv4l
+        ffmpeg
+        ffmpegthumbnailer
+      ]
+    }"
   ];
 
   preFixup = ''
diff --git a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
index 5de3bb6f845e..6324cc4d7dd9 100644
--- a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix
@@ -1,17 +1,18 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, qmake
-, qttools
-, pkg-config
-, wrapQtAppsHook
-, qtbase
-, qtx11extras
-, qtdeclarative
-, dtkwidget
-, dde-qt-dbus-factory
-, xorg
-, xscreensaver
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  qmake,
+  qttools,
+  pkg-config,
+  wrapQtAppsHook,
+  qtbase,
+  qtx11extras,
+  qtdeclarative,
+  dtkwidget,
+  dde-qt-dbus-factory,
+  xorg,
+  xscreensaver,
 }:
 
 stdenv.mkDerivation rec {
@@ -67,4 +68,3 @@ stdenv.mkDerivation rec {
     maintainers = teams.deepin.members;
   };
 }
-
diff --git a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
index 2a1f4cab4aa8..4542558e399e 100644
--- a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
@@ -1,14 +1,15 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, qmake
-, qtbase
-, qttools
-, pkg-config
-, wrapQtAppsHook
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  qmake,
+  qtbase,
+  qttools,
+  pkg-config,
+  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -50,4 +51,3 @@ stdenv.mkDerivation rec {
     maintainers = teams.deepin.members;
   };
 }
-
diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
index 5653aa9e147e..f37fb2dc6c25 100644
--- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix
@@ -1,29 +1,30 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, qttools
-, deepin-gettext-tools
-, wrapQtAppsHook
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, qtbase
-, qtsvg
-, qtx11extras
-, dde-qt-dbus-factory
-, dde-dock
-, gsettings-qt
-, polkit-qt
-, procps
-, libpcap
-, libnl
-, util-linux
-, systemd
-, polkit
-, wayland
-, dwayland
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qttools,
+  deepin-gettext-tools,
+  wrapQtAppsHook,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  qtbase,
+  qtsvg,
+  qtx11extras,
+  dde-qt-dbus-factory,
+  dde-dock,
+  gsettings-qt,
+  polkit-qt,
+  procps,
+  libpcap,
+  libnl,
+  util-linux,
+  systemd,
+  polkit,
+  wayland,
+  dwayland,
 }:
 
 stdenv.mkDerivation rec {
@@ -82,9 +83,7 @@ stdenv.mkDerivation rec {
     dwayland
   ];
 
-  cmakeFlags = [
-    "-DVERSION=${version}"
-  ];
+  cmakeFlags = [ "-DVERSION=${version}" ];
 
   strictDeps = true;
 
diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
index 6a0e7b0ccb6e..1d5e0d390d9d 100644
--- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
@@ -1,20 +1,21 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, nixosTests
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, cmake
-, qtbase
-, qtsvg
-, qttools
-, qtx11extras
-, pkg-config
-, wrapQtAppsHook
-, libsecret
-, chrpath
-, lxqt
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  nixosTests,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  cmake,
+  qtbase,
+  qtsvg,
+  qttools,
+  qtx11extras,
+  pkg-config,
+  wrapQtAppsHook,
+  libsecret,
+  chrpath,
+  lxqt,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix
index 766d4962fc70..d948a6f4d2fd 100644
--- a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix
@@ -1,21 +1,22 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, qttools
-, wrapQtAppsHook
-, qtbase
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, qtsvg
-, dde-qt-dbus-factory
-, qtmultimedia
-, qtwebengine
-, libvlc
-, gst_all_1
-, gtest
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qttools,
+  wrapQtAppsHook,
+  qtbase,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  qtsvg,
+  dde-qt-dbus-factory,
+  qtmultimedia,
+  qtwebengine,
+  libvlc,
+  gst_all_1,
+  gtest,
 }:
 
 stdenv.mkDerivation rec {
@@ -29,9 +30,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-k6LFMs2/OQQyeGI5WXBGWkAAY4GeP8LaA8hTXFwbaCM=";
   };
 
-  patches = [
-    ./use_v23_dbus_interface.diff
-  ];
+  patches = [ ./use_v23_dbus_interface.diff ];
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
@@ -47,30 +46,30 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  buildInputs = [
-    qtbase
-    qtsvg
-    dtkwidget
-    qt5platform-plugins
-    dde-qt-dbus-factory
-    qtmultimedia
-    qtwebengine
-    libvlc
-    gtest
-  ] ++ (with gst_all_1; [
-    gstreamer
-    gst-plugins-base
-    gst-plugins-good
-  ]);
+  buildInputs =
+    [
+      qtbase
+      qtsvg
+      dtkwidget
+      qt5platform-plugins
+      dde-qt-dbus-factory
+      qtmultimedia
+      qtwebengine
+      libvlc
+      gtest
+    ]
+    ++ (with gst_all_1; [
+      gstreamer
+      gst-plugins-base
+      gst-plugins-good
+    ]);
 
   strictDeps = true;
 
   cmakeFlags = [ "-DVERSION=${version}" ];
 
   # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [
-    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
-  ];
+  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
 
   preFixup = ''
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
diff --git a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix b/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
index b635b721a012..33dffba91c95 100644
--- a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
+++ b/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix
@@ -1,6 +1,7 @@
-{ stdenvNoCC
-, lib
-, fetchFromGitHub
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
 }:
 
 stdenvNoCC.mkDerivation rec {
@@ -19,7 +20,10 @@ stdenvNoCC.mkDerivation rec {
   meta = with lib; {
     description = "Account faces of deepin desktop environment";
     homepage = "https://github.com/linuxdeepin/dde-account-faces";
-    license = with licenses; [ gpl3Plus cc0 ];
+    license = with licenses; [
+      gpl3Plus
+      cc0
+    ];
     platforms = platforms.linux;
     maintainers = teams.deepin.members;
   };
diff --git a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
index 32109c4b6c0a..fbbd90703464 100644
--- a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix
@@ -1,13 +1,14 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, gtk3
-, xcursorgen
-, papirus-icon-theme
-, breeze-icons
-, hicolor-icon-theme
-, deepin-icon-theme
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  gtk3,
+  xcursorgen,
+  papirus-icon-theme,
+  breeze-icons,
+  hicolor-icon-theme,
+  deepin-icon-theme,
 }:
 
 stdenv.mkDerivation rec {
@@ -47,7 +48,10 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Provides a variety of well-designed theme resources";
     homepage = "https://github.com/linuxdeepin/deepin-desktop-theme";
-    license = with licenses; [ gpl3Plus cc-by-sa-40 ];
+    license = with licenses; [
+      gpl3Plus
+      cc-by-sa-40
+    ];
     platforms = platforms.linux;
     maintainers = teams.deepin.members;
   };
diff --git a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix
index 80ec8c50449d..6405a95cd55d 100644
--- a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix
@@ -1,7 +1,8 @@
-{ stdenvNoCC
-, lib
-, fetchFromGitHub
-, gtk-engine-murrine
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
+  gtk-engine-murrine,
 }:
 
 stdenvNoCC.mkDerivation rec {
@@ -15,9 +16,7 @@ stdenvNoCC.mkDerivation rec {
     hash = "sha256-2B2BtbPeg3cEbnEIgdGFzy8MjCMWlbP/Sq4jzG5cjmc=";
   };
 
-  propagatedUserEnvPkgs = [
-    gtk-engine-murrine
-  ];
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
index 0795b194ab3e..2ff8cb984351 100644
--- a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
@@ -1,9 +1,10 @@
-{ stdenvNoCC
-, lib
-, fetchFromGitHub
-, gtk3
-, xcursorgen
-, papirus-icon-theme
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
+  gtk3,
+  xcursorgen,
+  papirus-icon-theme,
 }:
 
 stdenvNoCC.mkDerivation rec {
@@ -24,9 +25,7 @@ stdenvNoCC.mkDerivation rec {
     xcursorgen
   ];
 
-  propagatedBuildInputs = [
-    papirus-icon-theme
-  ];
+  propagatedBuildInputs = [ papirus-icon-theme ];
 
   dontDropIconThemeCache = true;
 
diff --git a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix
index f779a77c3234..79e2f15716b1 100644
--- a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix
@@ -1,6 +1,7 @@
-{ stdenvNoCC
-, lib
-, fetchFromGitHub
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
 }:
 
 stdenvNoCC.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix
index c0aa13f16a6d..c472244adf2a 100644
--- a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix
+++ b/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix
@@ -1,7 +1,8 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, dde-api
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  dde-api,
 }:
 
 stdenv.mkDerivation rec {
@@ -36,7 +37,10 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "deepin-wallpapers provides wallpapers of dde";
     homepage = "https://github.com/linuxdeepin/deepin-wallpapers";
-    license = with licenses; [ gpl3Plus cc-by-sa-30 ];
+    license = with licenses; [
+      gpl3Plus
+      cc-by-sa-30
+    ];
     platforms = platforms.linux;
     maintainers = teams.deepin.members;
   };
diff --git a/pkgs/desktops/deepin/core/dde-app-services/default.nix b/pkgs/desktops/deepin/core/dde-app-services/default.nix
index 64713d08b11f..fe8198ad6b9f 100644
--- a/pkgs/desktops/deepin/core/dde-app-services/default.nix
+++ b/pkgs/desktops/deepin/core/dde-app-services/default.nix
@@ -1,14 +1,15 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, cmake
-, wrapQtAppsHook
-, qtbase
-, qttools
-, doxygen
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  cmake,
+  wrapQtAppsHook,
+  qtbase,
+  qttools,
+  doxygen,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/core/dde-appearance/default.nix b/pkgs/desktops/deepin/core/dde-appearance/default.nix
index 13a6ee3e7cf2..89315e2bd8a3 100644
--- a/pkgs/desktops/deepin/core/dde-appearance/default.nix
+++ b/pkgs/desktops/deepin/core/dde-appearance/default.nix
@@ -1,18 +1,19 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, wrapQtAppsHook
-, qtbase
-, dtkgui
-, gsettings-qt
-, gtk3
-, kconfig
-, kwindowsystem
-, kglobalaccel
-, xorg
-, iconv
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  wrapQtAppsHook,
+  qtbase,
+  dtkgui,
+  gsettings-qt,
+  gtk3,
+  kconfig,
+  kwindowsystem,
+  kglobalaccel,
+  xorg,
+  iconv,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix
index eaea04961e1f..73b412d7e6da 100644
--- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix
+++ b/pkgs/desktops/deepin/core/dde-application-manager/default.nix
@@ -1,10 +1,11 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, qt6Packages
-, dtk6core
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qt6Packages,
+  dtk6core,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix
index 88235bbf08c5..6eecb85c1b60 100644
--- a/pkgs/desktops/deepin/core/dde-calendar/default.nix
+++ b/pkgs/desktops/deepin/core/dde-calendar/default.nix
@@ -1,19 +1,20 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, qttools
-, pkg-config
-, wrapQtAppsHook
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, dde-qt-dbus-factory
-, qtbase
-, qtsvg
-, libical
-, sqlite
-, runtimeShell
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  qttools,
+  pkg-config,
+  wrapQtAppsHook,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  dde-qt-dbus-factory,
+  qtbase,
+  qtsvg,
+  libical,
+  sqlite,
+  runtimeShell,
 }:
 
 stdenv.mkDerivation rec {
@@ -27,9 +28,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-08xkdiP0/haHY3jdHSoA1zXRxMi2t+qxLxbcRc7EO6Q=";
   };
 
-  patches = [
-    ./fix-wrapped-name-not-in-whitelist.diff
-  ];
+  patches = [ ./fix-wrapped-name-not-in-whitelist.diff ];
 
   postPatch = ''
     for file in $(grep -rl "/bin/bash"); do
@@ -68,4 +67,3 @@ stdenv.mkDerivation rec {
     maintainers = teams.deepin.members;
   };
 }
-
diff --git a/pkgs/desktops/deepin/core/dde-clipboard/default.nix b/pkgs/desktops/deepin/core/dde-clipboard/default.nix
index 85eb71652963..7aecb9f3ba10 100644
--- a/pkgs/desktops/deepin/core/dde-clipboard/default.nix
+++ b/pkgs/desktops/deepin/core/dde-clipboard/default.nix
@@ -1,18 +1,19 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, dtkwidget
-, gio-qt
-, cmake
-, extra-cmake-modules
-, qttools
-, wayland
-, kwayland
-, dwayland
-, pkg-config
-, wrapQtAppsHook
-, glibmm
-, gtest
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  dtkwidget,
+  gio-qt,
+  cmake,
+  extra-cmake-modules,
+  qttools,
+  wayland,
+  kwayland,
+  dwayland,
+  pkg-config,
+  wrapQtAppsHook,
+  glibmm,
+  gtest,
 }:
 
 stdenv.mkDerivation rec {
@@ -44,9 +45,7 @@ stdenv.mkDerivation rec {
     gtest
   ];
 
-  cmakeFlags = [
-    "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user"
-  ];
+  cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ];
 
   meta = with lib; {
     description = "DDE optional clipboard manager componment";
diff --git a/pkgs/desktops/deepin/core/dde-control-center/default.nix b/pkgs/desktops/deepin/core/dde-control-center/default.nix
index 64bc81d8b9ad..fc8e0bfd075f 100644
--- a/pkgs/desktops/deepin/core/dde-control-center/default.nix
+++ b/pkgs/desktops/deepin/core/dde-control-center/default.nix
@@ -1,25 +1,26 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, qttools
-, doxygen
-, wrapQtAppsHook
-, wrapGAppsHook3
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, deepin-pw-check
-, qtbase
-, qtx11extras
-, qtmultimedia
-, polkit-qt
-, libxcrypt
-, librsvg
-, gtest
-, runtimeShell
-, dbus
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qttools,
+  doxygen,
+  wrapQtAppsHook,
+  wrapGAppsHook3,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  deepin-pw-check,
+  qtbase,
+  qtx11extras,
+  qtmultimedia,
+  polkit-qt,
+  libxcrypt,
+  librsvg,
+  gtest,
+  runtimeShell,
+  dbus,
 }:
 
 stdenv.mkDerivation rec {
@@ -89,7 +90,10 @@ stdenv.mkDerivation rec {
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   meta = with lib; {
     description = "Control panel of Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/core/dde-dock/default.nix b/pkgs/desktops/deepin/core/dde-dock/default.nix
index 61ef89a9a4dc..db3a4a052334 100644
--- a/pkgs/desktops/deepin/core/dde-dock/default.nix
+++ b/pkgs/desktops/deepin/core/dde-dock/default.nix
@@ -1,21 +1,22 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, extra-cmake-modules
-, qttools
-, pkg-config
-, wrapQtAppsHook
-, wrapGAppsHook3
-, qtbase
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, dwayland
-, qtx11extras
-, gsettings-qt
-, libdbusmenu
-, xorg
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  extra-cmake-modules,
+  qttools,
+  pkg-config,
+  wrapQtAppsHook,
+  wrapGAppsHook3,
+  qtbase,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  dwayland,
+  qtx11extras,
+  gsettings-qt,
+  libdbusmenu,
+  xorg,
 }:
 
 stdenv.mkDerivation rec {
@@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
     for file in $(grep -rl "/usr/lib/deepin-daemon"); do
       substituteInPlace $file --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon"
     done
-   '';
+  '';
 
   nativeBuildInputs = [
     cmake
@@ -65,14 +66,15 @@ stdenv.mkDerivation rec {
     xorg.libXres
   ];
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   cmakeFlags = [ "-DVERSION=${version}" ];
 
   # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [
-    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
-  ];
+  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
 
   preFixup = ''
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
index cfc610420957..7e77c7f083ff 100644
--- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix
+++ b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
@@ -1,44 +1,45 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, runtimeShell
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, dde-qt-dbus-factory
-, docparser
-, dde-dock
-, cmake
-, qttools
-, qtx11extras
-, qtmultimedia
-, kcodecs
-, pkg-config
-, ffmpegthumbnailer
-, libsecret
-, libmediainfo
-, mediainfo
-, libzen
-, poppler
-, polkit-qt
-, polkit
-, wrapQtAppsHook
-, wrapGAppsHook3
-, lucenepp
-, boost
-, taglib
-, cryptsetup
-, glib
-, qtbase
-, util-dfm
-, deepin-pdfium
-, libuuid
-, libselinux
-, glibmm
-, pcre
-, udisks2
-, libisoburn
-, gsettings-qt
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  runtimeShell,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  dde-qt-dbus-factory,
+  docparser,
+  dde-dock,
+  cmake,
+  qttools,
+  qtx11extras,
+  qtmultimedia,
+  kcodecs,
+  pkg-config,
+  ffmpegthumbnailer,
+  libsecret,
+  libmediainfo,
+  mediainfo,
+  libzen,
+  poppler,
+  polkit-qt,
+  polkit,
+  wrapQtAppsHook,
+  wrapGAppsHook3,
+  lucenepp,
+  boost,
+  taglib,
+  cryptsetup,
+  glib,
+  qtbase,
+  util-dfm,
+  deepin-pdfium,
+  libuuid,
+  libselinux,
+  glibmm,
+  pcre,
+  udisks2,
+  libisoburn,
+  gsettings-qt,
 }:
 
 stdenv.mkDerivation rec {
@@ -61,9 +62,7 @@ stdenv.mkDerivation rec {
   ];
   dontWrapGApps = true;
 
-  patches = [
-    ./patch_check_v23_interface.diff
-  ];
+  patches = [ ./patch_check_v23_interface.diff ];
 
   postPatch = ''
     patchShebangs .
@@ -132,9 +131,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [
-    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
-  ];
+  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
 
   preFixup = ''
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
@@ -148,4 +145,3 @@ stdenv.mkDerivation rec {
     maintainers = teams.deepin.members;
   };
 }
-
diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix
index 8b653004f27a..2d07a478fec3 100644
--- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix
+++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix
@@ -1,21 +1,22 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, qttools
-, pkg-config
-, wrapQtAppsHook
-, dtkwidget
-, dde-qt-dbus-factory
-, dde-dock
-, deepin-pdfium
-, qt5integration
-, qt5platform-plugins
-, taglib
-, ffmpeg
-, ffmpegthumbnailer
-, pcre
-, dbus
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  qttools,
+  pkg-config,
+  wrapQtAppsHook,
+  dtkwidget,
+  dde-qt-dbus-factory,
+  dde-dock,
+  deepin-pdfium,
+  qt5integration,
+  qt5platform-plugins,
+  taglib,
+  ffmpeg,
+  ffmpegthumbnailer,
+  pcre,
+  dbus,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
index 46fb6480ca4d..bdbd5e1b136b 100644
--- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
+++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix
@@ -1,17 +1,18 @@
-{ lib
-, runCommand
-, glib
-, gtk3
-, dde-grand-search
-, startdde
-, dde-session-shell
-, dde-file-manager
-, deepin-desktop-schemas
-, deepin-movie-reborn
-, deepin-system-monitor
-, gsettings-desktop-schemas
-, extraGSettingsOverrides ? ""
-, extraGSettingsOverridePackages ? [ ]
+{
+  lib,
+  runCommand,
+  glib,
+  gtk3,
+  dde-grand-search,
+  startdde,
+  dde-session-shell,
+  dde-file-manager,
+  deepin-desktop-schemas,
+  deepin-movie-reborn,
+  deepin-system-monitor,
+  gsettings-desktop-schemas,
+  extraGSettingsOverrides ? "",
+  extraGSettingsOverridePackages ? [ ],
 }:
 
 let
diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
index 7544bc575175..d1474b5bea97 100644
--- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix
+++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix
@@ -1,13 +1,14 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, qt6Packages
-, qt6integration
-, qt6platform-plugins
-, dtk6declarative
-, dde-shell
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qt6Packages,
+  qt6integration,
+  qt6platform-plugins,
+  dtk6declarative,
+  dde-shell,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,21 +29,21 @@ stdenv.mkDerivation rec {
     qt6Packages.wrapQtAppsHook
   ];
 
-  buildInputs = [
-    qt6integration
-    qt6platform-plugins
-    dtk6declarative
-    dde-shell
-  ] ++ (with qt6Packages; [
-    qtbase
-    qtsvg
-    qtwayland
-    appstream-qt
-  ]);
+  buildInputs =
+    [
+      qt6integration
+      qt6platform-plugins
+      dtk6declarative
+      dde-shell
+    ]
+    ++ (with qt6Packages; [
+      qtbase
+      qtsvg
+      qtwayland
+      appstream-qt
+    ]);
 
-  cmakeFlags = [
-    "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user"
-  ];
+  cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ];
 
   meta = with lib; {
     description = "'launcher' or 'start menu' component for DDE";
diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix
index 2c8f1860e57d..518fd99548f0 100644
--- a/pkgs/desktops/deepin/core/dde-network-core/default.nix
+++ b/pkgs/desktops/deepin/core/dde-network-core/default.nix
@@ -1,19 +1,20 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, qttools
-, pkg-config
-, wrapQtAppsHook
-, qtbase
-, qtsvg
-, dtkwidget
-, dde-dock
-, dde-control-center
-, dde-session-shell
-, networkmanager-qt
-, glib
-, gtest
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  qttools,
+  pkg-config,
+  wrapQtAppsHook,
+  qtbase,
+  qtsvg,
+  dtkwidget,
+  dde-dock,
+  dde-control-center,
+  dde-session-shell,
+  networkmanager-qt,
+  glib,
+  gtest,
 }:
 
 stdenv.mkDerivation rec {
@@ -46,9 +47,7 @@ stdenv.mkDerivation rec {
     gtest
   ];
 
-  cmakeFlags = [
-    "-DVERSION=${version}"
-  ];
+  cmakeFlags = [ "-DVERSION=${version}" ];
 
   strictDeps = true;
 
diff --git a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
index 2e6bd31a9395..9b71012b11ca 100644
--- a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
+++ b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix
@@ -1,16 +1,17 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, dde-qt-dbus-factory
-, pkg-config
-, cmake
-, qttools
-, wrapQtAppsHook
-, polkit-qt
-, qtbase
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  dde-qt-dbus-factory,
+  pkg-config,
+  cmake,
+  qttools,
+  wrapQtAppsHook,
+  polkit-qt,
+  qtbase,
 }:
 
 stdenv.mkDerivation rec {
@@ -39,9 +40,7 @@ stdenv.mkDerivation rec {
   ];
 
   # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [
-    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
-  ];
+  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
 
   postFixup = ''
     wrapQtApp $out/lib/polkit-1-dde/dde-polkit-agent
diff --git a/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/pkgs/desktops/deepin/core/dde-session-shell/default.nix
index 9e9be74a4d6f..91c44895e335 100644
--- a/pkgs/desktops/deepin/core/dde-session-shell/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session-shell/default.nix
@@ -1,26 +1,27 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, linkFarm
-, cmake
-, pkg-config
-, qttools
-, wrapQtAppsHook
-, wrapGAppsHook3
-, qtbase
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, deepin-pw-check
-, gsettings-qt
-, lightdm_qt
-, qtx11extras
-, linux-pam
-, xorg
-, gtest
-, xkeyboard_config
-, dbus
-, dde-session-shell
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  linkFarm,
+  cmake,
+  pkg-config,
+  qttools,
+  wrapQtAppsHook,
+  wrapGAppsHook3,
+  qtbase,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  deepin-pw-check,
+  gsettings-qt,
+  lightdm_qt,
+  qtx11extras,
+  linux-pam,
+  xorg,
+  gtest,
+  xkeyboard_config,
+  dbus,
+  dde-session-shell,
 }:
 
 stdenv.mkDerivation rec {
@@ -85,21 +86,24 @@ stdenv.mkDerivation rec {
     gtest
   ];
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [
-    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
-  ];
+  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
 
   preFixup = ''
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-  passthru.xgreeters = linkFarm "deepin-greeter-xgreeters" [{
-    path = "${dde-session-shell}/share/xgreeters/lightdm-deepin-greeter.desktop";
-    name = "lightdm-deepin-greeter.desktop";
-  }];
+  passthru.xgreeters = linkFarm "deepin-greeter-xgreeters" [
+    {
+      path = "${dde-session-shell}/share/xgreeters/lightdm-deepin-greeter.desktop";
+      name = "lightdm-deepin-greeter.desktop";
+    }
+  ];
 
   meta = with lib; {
     description = "Deepin desktop-environment - session-shell module";
diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix
index 24085d682f0b..a2ce7f009021 100644
--- a/pkgs/desktops/deepin/core/dde-session-ui/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session-ui/default.nix
@@ -1,18 +1,19 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, qttools
-, wrapQtAppsHook
-, qtbase
-, dtkwidget
-, qt5integration
-, qt5platform-plugins
-, dde-dock
-, gsettings-qt
-, qtx11extras
-, gtest
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qttools,
+  wrapQtAppsHook,
+  qtbase,
+  dtkwidget,
+  qt5integration,
+  qt5platform-plugins,
+  dde-dock,
+  gsettings-qt,
+  qtx11extras,
+  gtest,
 }:
 
 stdenv.mkDerivation rec {
@@ -55,14 +56,10 @@ stdenv.mkDerivation rec {
     gtest
   ];
 
-  cmakeFlags = [
-   "-DDISABLE_SYS_UPDATE=ON"
-  ];
+  cmakeFlags = [ "-DDISABLE_SYS_UPDATE=ON" ];
 
   # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [
-    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
-  ];
+  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
 
   preFixup = ''
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
diff --git a/pkgs/desktops/deepin/core/dde-session/default.nix b/pkgs/desktops/deepin/core/dde-session/default.nix
index 87fe51cb211c..291f20ea63c0 100644
--- a/pkgs/desktops/deepin/core/dde-session/default.nix
+++ b/pkgs/desktops/deepin/core/dde-session/default.nix
@@ -1,16 +1,17 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, wrapQtAppsHook
-, qtbase
-, dtkcore
-, gsettings-qt
-, libsecret
-, xorg
-, systemd
-, dde-polkit-agent
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  wrapQtAppsHook,
+  qtbase,
+  dtkcore,
+  gsettings-qt,
+  libsecret,
+  xorg,
+  systemd,
+  dde-polkit-agent,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix
index 8a66181c2fc9..72696ba35214 100644
--- a/pkgs/desktops/deepin/core/dde-shell/default.nix
+++ b/pkgs/desktops/deepin/core/dde-shell/default.nix
@@ -1,22 +1,23 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, extra-cmake-modules
-, pkg-config
-, wrapQtAppsHook
-, wayland-scanner
-, dtk6declarative
-, dtk6widget
-, dde-qt-dbus-factory
-, qt6Packages
-, qt6integration
-, qt6platform-plugins
-, kdePackages
-, wayland
-, wayland-protocols
-, yaml-cpp
-, xorg
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  extra-cmake-modules,
+  pkg-config,
+  wrapQtAppsHook,
+  wayland-scanner,
+  dtk6declarative,
+  dtk6widget,
+  dde-qt-dbus-factory,
+  qt6Packages,
+  qt6integration,
+  qt6platform-plugins,
+  kdePackages,
+  wayland,
+  wayland-protocols,
+  yaml-cpp,
+  xorg,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -73,15 +74,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
 
-  cmakeFlags = [
-    "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}"
-  ];
+  cmakeFlags = [ "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" ];
 
   qtWrapperArgs = [
-     # qt6integration must be placed before qtsvg in QT_PLUGIN_PATH
-     "--prefix QT_PLUGIN_PATH : ${qt6integration}/${qt6Packages.qtbase.qtPluginPrefix}"
-     "--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell"
-     "--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell"
+    # qt6integration must be placed before qtsvg in QT_PLUGIN_PATH
+    "--prefix QT_PLUGIN_PATH : ${qt6integration}/${qt6Packages.qtbase.qtPluginPrefix}"
+    "--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell"
+    "--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell"
   ];
 
   meta = {
diff --git a/pkgs/desktops/deepin/core/dde-widgets/default.nix b/pkgs/desktops/deepin/core/dde-widgets/default.nix
index c8019509dabf..4faa91d3ca08 100644
--- a/pkgs/desktops/deepin/core/dde-widgets/default.nix
+++ b/pkgs/desktops/deepin/core/dde-widgets/default.nix
@@ -1,15 +1,16 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, dde-qt-dbus-factory
-, wrapQtAppsHook
-, qtbase
-, qtx11extras
-, dtkwidget
-, qt5integration
-, gtest
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  dde-qt-dbus-factory,
+  wrapQtAppsHook,
+  qtbase,
+  qtx11extras,
+  dtkwidget,
+  qt5integration,
+  gtest,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix
index 1cd144b79e29..bb4ddee47bf2 100644
--- a/pkgs/desktops/deepin/core/deepin-kwin/default.nix
+++ b/pkgs/desktops/deepin/core/deepin-kwin/default.nix
@@ -1,37 +1,38 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, wayland
-, dwayland
-, qtbase
-, qttools
-, qtx11extras
-, wrapQtAppsHook
-, extra-cmake-modules
-, gsettings-qt
-, libepoxy
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kcrash
-, kdbusaddons
-, kiconthemes
-, kglobalaccel
-, kidletime
-, knotifications
-, kpackage
-, plasma-framework
-, kcmutils
-, knewstuff
-, kdecoration
-, kscreenlocker
-, breeze-qt5
-, libinput
-, mesa
-, lcms2
-, xorg
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  wayland,
+  dwayland,
+  qtbase,
+  qttools,
+  qtx11extras,
+  wrapQtAppsHook,
+  extra-cmake-modules,
+  gsettings-qt,
+  libepoxy,
+  kconfig,
+  kconfigwidgets,
+  kcoreaddons,
+  kcrash,
+  kdbusaddons,
+  kiconthemes,
+  kglobalaccel,
+  kidletime,
+  knotifications,
+  kpackage,
+  plasma-framework,
+  kcmutils,
+  knewstuff,
+  kdecoration,
+  kscreenlocker,
+  breeze-qt5,
+  libinput,
+  mesa,
+  lcms2,
+  xorg,
 }:
 
 stdenv.mkDerivation rec {
@@ -45,9 +46,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-EjPPjdxa+iL/nXhuccoM3NiLmGXh7Un2aGz8O3sP6xE=";
   };
 
-  patches = [
-    ./0001-hardcode-fallback-background.diff
-  ];
+  patches = [ ./0001-hardcode-fallback-background.diff ];
 
   # Avoid using absolute path to distinguish applications
   postPatch = ''
@@ -101,11 +100,12 @@ stdenv.mkDerivation rec {
     xorg.libXScrnSaver
   ];
 
-  cmakeFlags = [
-    "-DKWIN_BUILD_RUNNERS=OFF"
-  ];
+  cmakeFlags = [ "-DKWIN_BUILD_RUNNERS=OFF" ];
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   meta = with lib; {
     description = "Fork of kwin, an easy to use, but flexible, composited Window Manager";
diff --git a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix b/pkgs/desktops/deepin/core/deepin-service-manager/default.nix
index a11f7717b646..c76a095b2463 100644
--- a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix
+++ b/pkgs/desktops/deepin/core/deepin-service-manager/default.nix
@@ -1,9 +1,10 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, wrapQtAppsHook
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
index 82c183ca00d5..e78ba159c95d 100644
--- a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
+++ b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix
@@ -1,14 +1,15 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, qttools
-, wrapQtAppsHook
-, dtkwidget
-, dde-polkit-agent
-, qt5integration
-, libsecret
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qttools,
+  wrapQtAppsHook,
+  dtkwidget,
+  dde-polkit-agent,
+  qt5integration,
+  libsecret,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index f0a9c95ab2b9..4280b290a3e6 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -1,110 +1,118 @@
-{ lib, pkgs, config, libsForQt5 }:
+{
+  lib,
+  pkgs,
+  config,
+  libsForQt5,
+}:
 let
-  packages = self:
-  let
-    inherit (self) callPackage;
-  in {
-    #### LIBRARIES
-    dtkcommon = callPackage ./library/dtkcommon { };
-    dtkcore = callPackage ./library/dtkcore { };
-    dtkgui = callPackage ./library/dtkgui { };
-    dtkwidget = callPackage ./library/dtkwidget { };
-    dtkdeclarative = callPackage ./library/dtkdeclarative { };
-    dtklog = callPackage ./library/dtklog { };
-    deepin-pdfium = callPackage ./library/deepin-pdfium { };
-    qt5platform-plugins = callPackage ./library/qt5platform-plugins { };
-    qt5integration = callPackage ./library/qt5integration { };
-    deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { };
-    deepin-ocr-plugin-manager = callPackage ./library/deepin-ocr-plugin-manager { };
-    dwayland = callPackage ./library/dwayland { };
-    dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { };
-    disomaster = callPackage ./library/disomaster { };
-    docparser = callPackage ./library/docparser { };
-    gio-qt = callPackage ./library/gio-qt { };
-    image-editor = callPackage ./library/image-editor { };
-    udisks2-qt5 = callPackage ./library/udisks2-qt5 { };
-    util-dfm = callPackage ./library/util-dfm { };
-    dtk6core = callPackage ./library/dtk6core { };
-    dtk6gui = callPackage ./library/dtk6gui { };
-    dtk6widget = callPackage ./library/dtk6widget { };
-    dtk6declarative = callPackage ./library/dtk6declarative { };
-    dtk6systemsettings = callPackage ./library/dtk6systemsettings { };
-    dtk6log = callPackage ./library/dtk6log { };
-    qt6platform-plugins = callPackage ./library/qt6platform-plugins { };
-    qt6integration = callPackage ./library/qt6integration { };
+  packages =
+    self:
+    let
+      inherit (self) callPackage;
+    in
+    {
+      #### LIBRARIES
+      dtkcommon = callPackage ./library/dtkcommon { };
+      dtkcore = callPackage ./library/dtkcore { };
+      dtkgui = callPackage ./library/dtkgui { };
+      dtkwidget = callPackage ./library/dtkwidget { };
+      dtkdeclarative = callPackage ./library/dtkdeclarative { };
+      dtklog = callPackage ./library/dtklog { };
+      deepin-pdfium = callPackage ./library/deepin-pdfium { };
+      qt5platform-plugins = callPackage ./library/qt5platform-plugins { };
+      qt5integration = callPackage ./library/qt5integration { };
+      deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { };
+      deepin-ocr-plugin-manager = callPackage ./library/deepin-ocr-plugin-manager { };
+      dwayland = callPackage ./library/dwayland { };
+      dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { };
+      disomaster = callPackage ./library/disomaster { };
+      docparser = callPackage ./library/docparser { };
+      gio-qt = callPackage ./library/gio-qt { };
+      image-editor = callPackage ./library/image-editor { };
+      udisks2-qt5 = callPackage ./library/udisks2-qt5 { };
+      util-dfm = callPackage ./library/util-dfm { };
+      dtk6core = callPackage ./library/dtk6core { };
+      dtk6gui = callPackage ./library/dtk6gui { };
+      dtk6widget = callPackage ./library/dtk6widget { };
+      dtk6declarative = callPackage ./library/dtk6declarative { };
+      dtk6systemsettings = callPackage ./library/dtk6systemsettings { };
+      dtk6log = callPackage ./library/dtk6log { };
+      qt6platform-plugins = callPackage ./library/qt6platform-plugins { };
+      qt6integration = callPackage ./library/qt6integration { };
 
-    #### CORE
-    deepin-kwin = callPackage ./core/deepin-kwin { };
-    dde-appearance = callPackage ./core/dde-appearance { };
-    dde-app-services = callPackage ./core/dde-app-services { };
-    dde-application-manager = callPackage ./core/dde-application-manager { };
-    dde-control-center = callPackage ./core/dde-control-center { };
-    dde-calendar = callPackage ./core/dde-calendar { };
-    dde-clipboard = callPackage ./core/dde-clipboard { };
-    dde-dock = callPackage ./core/dde-dock { };
-    dde-file-manager = callPackage ./core/dde-file-manager { };
-    dde-launchpad = callPackage ./core/dde-launchpad { };
-    dde-network-core = callPackage ./core/dde-network-core { };
-    dde-session = callPackage ./core/dde-session { };
-    dde-session-shell = callPackage ./core/dde-session-shell { };
-    dde-session-ui = callPackage ./core/dde-session-ui { };
-    deepin-service-manager = callPackage ./core/deepin-service-manager { };
-    dde-polkit-agent = callPackage ./core/dde-polkit-agent { };
-    dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { };
-    dde-gsettings-schemas = callPackage ./core/dde-gsettings-schemas { };
-    dde-widgets = callPackage ./core/dde-widgets { };
-    dde-shell = callPackage ./core/dde-shell { };
-    dde-grand-search = callPackage ./core/dde-grand-search { };
+      #### CORE
+      deepin-kwin = callPackage ./core/deepin-kwin { };
+      dde-appearance = callPackage ./core/dde-appearance { };
+      dde-app-services = callPackage ./core/dde-app-services { };
+      dde-application-manager = callPackage ./core/dde-application-manager { };
+      dde-control-center = callPackage ./core/dde-control-center { };
+      dde-calendar = callPackage ./core/dde-calendar { };
+      dde-clipboard = callPackage ./core/dde-clipboard { };
+      dde-dock = callPackage ./core/dde-dock { };
+      dde-file-manager = callPackage ./core/dde-file-manager { };
+      dde-launchpad = callPackage ./core/dde-launchpad { };
+      dde-network-core = callPackage ./core/dde-network-core { };
+      dde-session = callPackage ./core/dde-session { };
+      dde-session-shell = callPackage ./core/dde-session-shell { };
+      dde-session-ui = callPackage ./core/dde-session-ui { };
+      deepin-service-manager = callPackage ./core/deepin-service-manager { };
+      dde-polkit-agent = callPackage ./core/dde-polkit-agent { };
+      dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { };
+      dde-gsettings-schemas = callPackage ./core/dde-gsettings-schemas { };
+      dde-widgets = callPackage ./core/dde-widgets { };
+      dde-shell = callPackage ./core/dde-shell { };
+      dde-grand-search = callPackage ./core/dde-grand-search { };
 
-    #### Dtk Application
-    deepin-album = callPackage ./apps/deepin-album { };
-    deepin-calculator = callPackage ./apps/deepin-calculator { };
-    deepin-camera = callPackage ./apps/deepin-camera { };
-    deepin-compressor = callPackage ./apps/deepin-compressor { };
-    deepin-draw = callPackage ./apps/deepin-draw { };
-    deepin-editor = callPackage ./apps/deepin-editor { };
-    deepin-image-viewer = callPackage ./apps/deepin-image-viewer { };
-    deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { };
-    deepin-music = callPackage ./apps/deepin-music { };
-    deepin-picker = callPackage ./apps/deepin-picker { };
-    deepin-screen-recorder = callPackage ./apps/deepin-screen-recorder { };
-    deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { };
-    deepin-system-monitor = callPackage ./apps/deepin-system-monitor { };
-    deepin-terminal = callPackage ./apps/deepin-terminal { };
-    deepin-reader = callPackage ./apps/deepin-reader { };
-    deepin-voice-note = callPackage ./apps/deepin-voice-note { };
-    deepin-screensaver = callPackage ./apps/deepin-screensaver { };
+      #### Dtk Application
+      deepin-album = callPackage ./apps/deepin-album { };
+      deepin-calculator = callPackage ./apps/deepin-calculator { };
+      deepin-camera = callPackage ./apps/deepin-camera { };
+      deepin-compressor = callPackage ./apps/deepin-compressor { };
+      deepin-draw = callPackage ./apps/deepin-draw { };
+      deepin-editor = callPackage ./apps/deepin-editor { };
+      deepin-image-viewer = callPackage ./apps/deepin-image-viewer { };
+      deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { };
+      deepin-music = callPackage ./apps/deepin-music { };
+      deepin-picker = callPackage ./apps/deepin-picker { };
+      deepin-screen-recorder = callPackage ./apps/deepin-screen-recorder { };
+      deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { };
+      deepin-system-monitor = callPackage ./apps/deepin-system-monitor { };
+      deepin-terminal = callPackage ./apps/deepin-terminal { };
+      deepin-reader = callPackage ./apps/deepin-reader { };
+      deepin-voice-note = callPackage ./apps/deepin-voice-note { };
+      deepin-screensaver = callPackage ./apps/deepin-screensaver { };
 
-    #### Go Packages
-    dde-api = callPackage ./go-package/dde-api { };
-    dde-daemon = callPackage ./go-package/dde-daemon { };
-    deepin-pw-check = callPackage ./go-package/deepin-pw-check { };
-    deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { };
-    startdde = callPackage ./go-package/startdde { };
+      #### Go Packages
+      dde-api = callPackage ./go-package/dde-api { };
+      dde-daemon = callPackage ./go-package/dde-daemon { };
+      deepin-pw-check = callPackage ./go-package/deepin-pw-check { };
+      deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { };
+      startdde = callPackage ./go-package/startdde { };
 
-    #### TOOLS
-    dde-device-formatter = callPackage ./tools/dde-device-formatter { };
-    deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { };
-    deepin-anything = callPackage ./tools/deepin-anything { };
+      #### TOOLS
+      dde-device-formatter = callPackage ./tools/dde-device-formatter { };
+      deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { };
+      deepin-anything = callPackage ./tools/deepin-anything { };
 
-    #### ARTWORK
-    dde-account-faces = callPackage ./artwork/dde-account-faces { };
-    deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { };
-    deepin-wallpapers = callPackage ./artwork/deepin-wallpapers { };
-    deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { };
-    deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { };
-    deepin-desktop-theme = callPackage ./artwork/deepin-desktop-theme { };
+      #### ARTWORK
+      dde-account-faces = callPackage ./artwork/dde-account-faces { };
+      deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { };
+      deepin-wallpapers = callPackage ./artwork/deepin-wallpapers { };
+      deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { };
+      deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { };
+      deepin-desktop-theme = callPackage ./artwork/deepin-desktop-theme { };
 
-    #### MISC
-    deepin-desktop-base = callPackage ./misc/deepin-desktop-base { };
-    deepin-turbo = callPackage ./misc/deepin-turbo { };
-  } // lib.optionalAttrs config.allowAliases {
-    dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27
-    dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23
-    deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23
-    go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31
-    go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31
-    go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31
-  };
+      #### MISC
+      deepin-desktop-base = callPackage ./misc/deepin-desktop-base { };
+      deepin-turbo = callPackage ./misc/deepin-turbo { };
+    }
+    // lib.optionalAttrs config.allowAliases {
+      dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27
+      dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23
+      deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23
+      go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31
+      go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31
+      go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31
+    };
 in
 lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/deepin/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix
index 209a631ef394..d8b848851a82 100644
--- a/pkgs/desktops/deepin/go-package/dde-api/default.nix
+++ b/pkgs/desktops/deepin/go-package/dde-api/default.nix
@@ -1,20 +1,21 @@
-{ lib
-, fetchFromGitHub
-, buildGoModule
-, pkg-config
-, deepin-gettext-tools
-, wrapQtAppsHook
-, wrapGAppsHook3
-, alsa-lib
-, gtk3
-, libcanberra
-, libgudev
-, librsvg
-, poppler
-, pulseaudio
-, gdk-pixbuf-xlib
-, coreutils
-, dbus
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  pkg-config,
+  deepin-gettext-tools,
+  wrapQtAppsHook,
+  wrapGAppsHook3,
+  alsa-lib,
+  gtk3,
+  libcanberra,
+  libgudev,
+  librsvg,
+  poppler,
+  pulseaudio,
+  gdk-pixbuf-xlib,
+  coreutils,
+  dbus,
 }:
 
 buildGoModule rec {
diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix
index 68b85a3edadb..563057ddebf0 100644
--- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix
@@ -1,38 +1,39 @@
-{ lib
-, fetchFromGitHub
-, substituteAll
-, buildGoModule
-, pkg-config
-, deepin-gettext-tools
-, gettext
-, python3
-, wrapGAppsHook3
-, ddcutil
-, alsa-lib
-, glib
-, gtk3
-, libgudev
-, libinput
-, libnl
-, librsvg
-, linux-pam
-, libxcrypt
-, networkmanager
-, pulseaudio
-, gdk-pixbuf-xlib
-, tzdata
-, xkeyboard_config
-, runtimeShell
-, xorg
-, xdotool
-, getconf
-, dbus
-, util-linux
-, dde-session-ui
-, coreutils
-, lshw
-, dmidecode
-, systemd
+{
+  lib,
+  fetchFromGitHub,
+  substituteAll,
+  buildGoModule,
+  pkg-config,
+  deepin-gettext-tools,
+  gettext,
+  python3,
+  wrapGAppsHook3,
+  ddcutil,
+  alsa-lib,
+  glib,
+  gtk3,
+  libgudev,
+  libinput,
+  libnl,
+  librsvg,
+  linux-pam,
+  libxcrypt,
+  networkmanager,
+  pulseaudio,
+  gdk-pixbuf-xlib,
+  tzdata,
+  xkeyboard_config,
+  runtimeShell,
+  xorg,
+  xdotool,
+  getconf,
+  dbus,
+  util-linux,
+  dde-session-ui,
+  coreutils,
+  lshw,
+  dmidecode,
+  systemd,
 }:
 
 buildGoModule rec {
@@ -133,7 +134,16 @@ buildGoModule rec {
 
   preFixup = ''
     gappsWrapperArgs+=(
-      --prefix PATH : "${lib.makeBinPath [ util-linux dde-session-ui glib lshw dmidecode systemd ]}"
+      --prefix PATH : "${
+        lib.makeBinPath [
+          util-linux
+          dde-session-ui
+          glib
+          lshw
+          dmidecode
+          systemd
+        ]
+      }"
     )
   '';
 
diff --git a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
index 61d7c18dca2d..99b3a056dd92 100644
--- a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
+++ b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix
@@ -1,8 +1,9 @@
-{ stdenv
-, lib
-, buildGoModule
-, fetchFromGitHub
-, glib
+{
+  stdenv,
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  glib,
 }:
 
 buildGoModule rec {
diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix
index 44c52c31a8e4..b1ad7c0c4c9e 100644
--- a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix
+++ b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix
@@ -1,15 +1,16 @@
-{ lib
-, fetchFromGitHub
-, buildGoModule
-, pkg-config
-, deepin-gettext-tools
-, gtk3
-, glib
-, libxcrypt
-, gettext
-, iniparser
-, cracklib
-, linux-pam
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  pkg-config,
+  deepin-gettext-tools,
+  gtk3,
+  glib,
+  libxcrypt,
+  gettext,
+  iniparser,
+  cracklib,
+  linux-pam,
 }:
 
 buildGoModule rec {
@@ -23,9 +24,7 @@ buildGoModule rec {
     hash = "sha256-kBrkcB0IWGUV4ZrkFzwdPglRgDcnVvYDFhTXS20pKOk=";
   };
 
-  patches = [
-    "${src}/rpm/0001-Mangle-Suit-Cracklib2.9.6.patch"
-  ];
+  patches = [ "${src}/rpm/0001-Mangle-Suit-Cracklib2.9.6.patch" ];
 
   vendorHash = "sha256-L0vUEkUN70Hrx5roIvTfaZBHbbq7mf3WpQJeFAMU5HY=";
 
diff --git a/pkgs/desktops/deepin/go-package/startdde/default.nix b/pkgs/desktops/deepin/go-package/startdde/default.nix
index b5f1100874c1..89f1602a1c7a 100644
--- a/pkgs/desktops/deepin/go-package/startdde/default.nix
+++ b/pkgs/desktops/deepin/go-package/startdde/default.nix
@@ -1,19 +1,20 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, gettext
-, pkg-config
-, jq
-, wrapGAppsHook3
-, glib
-, libgnome-keyring
-, gtk3
-, alsa-lib
-, pulseaudio
-, libgudev
-, libsecret
-, runtimeShell
-, dbus
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  gettext,
+  pkg-config,
+  jq,
+  wrapGAppsHook3,
+  glib,
+  libgnome-keyring,
+  gtk3,
+  alsa-lib,
+  pulseaudio,
+  libgudev,
+  libsecret,
+  runtimeShell,
+  dbus,
 }:
 
 buildGoModule rec {
diff --git a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
index 323a37cac79f..9c14bf1379bb 100644
--- a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix
@@ -1,11 +1,12 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, qmake
-, qtbase
-, wrapQtAppsHook
-, python3
-, dtkcore
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  qmake,
+  qtbase,
+  wrapQtAppsHook,
+  python3,
+  dtkcore,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix b/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix
index 3db5f0a0bd34..34c7b83f818f 100644
--- a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix
+++ b/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix
@@ -1,14 +1,15 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, pkg-config
-, cmake
-, qttools
-, wrapQtAppsHook
-, libisoburn
-, ncnn
-, opencv
-, vulkan-headers
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  pkg-config,
+  cmake,
+  qttools,
+  wrapQtAppsHook,
+  libisoburn,
+  ncnn,
+  opencv,
+  vulkan-headers,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix b/pkgs/desktops/deepin/library/deepin-pdfium/default.nix
index a4912eabe5f3..cbe86ed26257 100644
--- a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix
+++ b/pkgs/desktops/deepin/library/deepin-pdfium/default.nix
@@ -1,11 +1,12 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, qmake
-, pkg-config
-, libchardet
-, lcms2
-, openjpeg
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  qmake,
+  pkg-config,
+  libchardet,
+  lcms2,
+  openjpeg,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix
index ad3dce815c91..839b02633af9 100644
--- a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix
+++ b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix
@@ -1,8 +1,9 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, extra-cmake-modules
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  extra-cmake-modules,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/library/disomaster/default.nix b/pkgs/desktops/deepin/library/disomaster/default.nix
index 908f328db9ff..0e398b42c176 100644
--- a/pkgs/desktops/deepin/library/disomaster/default.nix
+++ b/pkgs/desktops/deepin/library/disomaster/default.nix
@@ -1,11 +1,12 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, pkg-config
-, qmake
-, qttools
-, wrapQtAppsHook
-, libisoburn
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  pkg-config,
+  qmake,
+  qttools,
+  wrapQtAppsHook,
+  libisoburn,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix
index 41b9a8ee7ce3..a283ac1098a9 100644
--- a/pkgs/desktops/deepin/library/docparser/default.nix
+++ b/pkgs/desktops/deepin/library/docparser/default.nix
@@ -1,11 +1,12 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, pkg-config
-, qmake
-, qttools
-, wrapQtAppsHook
-, poppler
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  pkg-config,
+  qmake,
+  qttools,
+  wrapQtAppsHook,
+  poppler,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix
index cc89cbfcd87d..31bf59583c04 100644
--- a/pkgs/desktops/deepin/library/dtk6core/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6core/default.nix
@@ -1,14 +1,15 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, doxygen
-, qt6Packages
-, lshw
-, libuchardet
-, dtkcommon
-, dtk6log
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  doxygen,
+  qt6Packages,
+  lshw,
+  libuchardet,
+  dtkcommon,
+  dtk6log,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -48,7 +49,10 @@ stdenv.mkDerivation (finalAttrs: {
     libuchardet
   ];
 
-  propagatedBuildInputs = [ dtkcommon dtk6log ];
+  propagatedBuildInputs = [
+    dtkcommon
+    dtk6log
+  ];
 
   cmakeFlags = [
     "-DDTK_VERSION=${finalAttrs.version}"
@@ -66,7 +70,11 @@ stdenv.mkDerivation (finalAttrs: {
     export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
   '';
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
 
   postFixup = ''
     for binary in $out/libexec/dtk6/DCore/bin/*; do
diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix
index d5f13f22ac12..83d3140db7e4 100644
--- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix
@@ -1,11 +1,12 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, doxygen
-, qt6Packages
-, dtk6gui
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  doxygen,
+  qt6Packages,
+  dtk6gui,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,14 +33,14 @@ stdenv.mkDerivation (finalAttrs: {
     qt6Packages.wrapQtAppsHook
   ];
 
-  propagatedBuildInputs = [
-    dtk6gui
-  ] ++ (with qt6Packages ; [
-    qtbase
-    qtdeclarative
-    qtshadertools
-    qt5compat
-  ]);
+  propagatedBuildInputs =
+    [ dtk6gui ]
+    ++ (with qt6Packages; [
+      qtbase
+      qtdeclarative
+      qtshadertools
+      qt5compat
+    ]);
 
   cmakeFlags = [
     "-DDTK_VERSION=${finalAttrs.version}"
@@ -57,7 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
     export QML2_IMPORT_PATH=${lib.getBin qt6Packages.qtdeclarative}/${qt6Packages.qtbase.qtQmlPrefix}
   '';
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
 
   meta = {
     description = "Widget development toolkit based on QtQuick/QtQml";
diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix
index 05a3b5333854..53ca9621bb26 100644
--- a/pkgs/desktops/deepin/library/dtk6gui/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix
@@ -1,12 +1,13 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, doxygen
-, qt6Packages
-, dtk6core
-, librsvg
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  doxygen,
+  qt6Packages,
+  dtk6core,
+  librsvg,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -56,7 +57,11 @@ stdenv.mkDerivation (finalAttrs: {
     export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
   '';
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
 
   postFixup = ''
     for binary in $out/libexec/dtk6/DGui/bin/*; do
diff --git a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix
index f6b185582031..a3048cbd2b22 100644
--- a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix
@@ -1,12 +1,13 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, doxygen
-, qt6Packages
-, dtk6core
-, libxcrypt
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  doxygen,
+  qt6Packages,
+  dtk6core,
+  libxcrypt,
 }:
 
 stdenv.mkDerivation rec {
@@ -50,7 +51,11 @@ stdenv.mkDerivation rec {
     export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
   '';
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
 
   meta = {
     description = "Qt-based development library for system settings";
diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix
index da9e83223c62..7e47a4c92ca6 100644
--- a/pkgs/desktops/deepin/library/dtk6widget/default.nix
+++ b/pkgs/desktops/deepin/library/dtk6widget/default.nix
@@ -1,13 +1,14 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, doxygen
-, qt6Packages
-, dtk6gui
-, cups
-, libstartup_notification
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  doxygen,
+  qt6Packages,
+  dtk6gui,
+  cups,
+  libstartup_notification,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,14 +41,16 @@ stdenv.mkDerivation (finalAttrs: {
     qt6Packages.wrapQtAppsHook
   ];
 
-  buildInputs = [
-    cups
-    libstartup_notification
-  ] ++ (with qt6Packages; [
-    qtbase
-    qtmultimedia
-    qtsvg
-  ]);
+  buildInputs =
+    [
+      cups
+      libstartup_notification
+    ]
+    ++ (with qt6Packages; [
+      qtbase
+      qtmultimedia
+      qtsvg
+    ]);
 
   propagatedBuildInputs = [ dtk6gui ];
 
@@ -64,7 +67,11 @@ stdenv.mkDerivation (finalAttrs: {
     export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix}
   '';
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
 
   postFixup = ''
     for binary in $out/lib/dtk6/DWidget/bin/*; do
diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix
index c1eb882a17e6..b7f7523abb9f 100644
--- a/pkgs/desktops/deepin/library/dtkcommon/default.nix
+++ b/pkgs/desktops/deepin/library/dtkcommon/default.nix
@@ -1,7 +1,8 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
 }:
 
 stdenv.mkDerivation rec {
@@ -15,9 +16,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-e+8kG9bB6iby2RgD8jn75GyefLRHNnjD+n04hXbi5ec=";
   };
 
-  nativeBuildInputs = [
-    cmake
-  ];
+  nativeBuildInputs = [ cmake ];
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix
index f4241c8a20c0..980292bbf200 100644
--- a/pkgs/desktops/deepin/library/dtkcore/default.nix
+++ b/pkgs/desktops/deepin/library/dtkcore/default.nix
@@ -1,15 +1,16 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, doxygen
-, libsForQt5
-, gsettings-qt
-, lshw
-, libuchardet
-, dtkcommon
-, dtklog
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  doxygen,
+  libsForQt5,
+  gsettings-qt,
+  lshw,
+  libuchardet,
+  dtkcommon,
+  dtklog,
 }:
 
 stdenv.mkDerivation rec {
@@ -50,7 +51,10 @@ stdenv.mkDerivation rec {
     libuchardet
   ];
 
-  propagatedBuildInputs = [ dtkcommon dtklog ];
+  propagatedBuildInputs = [
+    dtkcommon
+    dtklog
+  ];
 
   cmakeFlags = [
     "-DDTK_VERSION=${version}"
@@ -69,7 +73,11 @@ stdenv.mkDerivation rec {
     export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
   '';
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
 
   postFixup = ''
     for binary in $out/libexec/dtk5/DCore/bin/*; do
diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix
index 34a21b9c9cf4..189fdc13b075 100644
--- a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix
+++ b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix
@@ -1,11 +1,12 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, doxygen
-, libsForQt5
-, dtkgui
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  doxygen,
+  libsForQt5,
+  dtkgui,
 }:
 
 stdenv.mkDerivation rec {
@@ -55,7 +56,11 @@ stdenv.mkDerivation rec {
     export QML2_IMPORT_PATH=${libsForQt5.qtdeclarative.bin}/${libsForQt5.qtbase.qtQmlPrefix}
   '';
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
 
   meta = with lib; {
     description = "Widget development toolkit based on QtQuick/QtQml";
diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix
index 53fe9123dd2e..1b8c91265366 100644
--- a/pkgs/desktops/deepin/library/dtkgui/default.nix
+++ b/pkgs/desktops/deepin/library/dtkgui/default.nix
@@ -1,13 +1,14 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, pkg-config
-, cmake
-, doxygen
-, libsForQt5
-, dtkcore
-, lxqt
-, librsvg
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  pkg-config,
+  cmake,
+  doxygen,
+  libsForQt5,
+  dtkcore,
+  lxqt,
+  librsvg,
 }:
 
 stdenv.mkDerivation rec {
@@ -58,7 +59,11 @@ stdenv.mkDerivation rec {
     export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
   '';
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
 
   postFixup = ''
     for binary in $out/libexec/dtk5/DGui/bin/*; do
diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix
index b01049045cb5..56100bedbdb3 100644
--- a/pkgs/desktops/deepin/library/dtkwidget/default.nix
+++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix
@@ -1,15 +1,16 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, doxygen
-, libsForQt5
-, dtkgui
-, cups
-, gsettings-qt
-, libstartup_notification
-, xorg
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  doxygen,
+  libsForQt5,
+  dtkgui,
+  cups,
+  gsettings-qt,
+  libstartup_notification,
+  xorg,
 }:
 
 stdenv.mkDerivation rec {
@@ -68,7 +69,11 @@ stdenv.mkDerivation rec {
     export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
   '';
 
-  outputs = [ "out" "dev" "doc" ];
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
 
   postFixup = ''
     for binary in $out/lib/dtk5/DWidget/bin/*; do
diff --git a/pkgs/desktops/deepin/library/dwayland/default.nix b/pkgs/desktops/deepin/library/dwayland/default.nix
index 7de7292a4a05..9dc651ce299c 100644
--- a/pkgs/desktops/deepin/library/dwayland/default.nix
+++ b/pkgs/desktops/deepin/library/dwayland/default.nix
@@ -1,14 +1,15 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, qtbase
-, qtwayland
-, wayland
-, wayland-protocols
-, extra-cmake-modules
-, deepin-wayland-protocols
-, qttools
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  qtbase,
+  qtwayland,
+  wayland,
+  wayland-protocols,
+  extra-cmake-modules,
+  deepin-wayland-protocols,
+  qttools,
 }:
 
 stdenv.mkDerivation rec {
@@ -40,7 +41,7 @@ stdenv.mkDerivation rec {
 
   # cmake requires that the kf5 directory must not empty
   postInstall = ''
-     mkdir $out/include/KF5
+    mkdir $out/include/KF5
   '';
 
   meta = with lib; {
diff --git a/pkgs/desktops/deepin/library/gio-qt/default.nix b/pkgs/desktops/deepin/library/gio-qt/default.nix
index f761444ea18d..df790e6609b4 100644
--- a/pkgs/desktops/deepin/library/gio-qt/default.nix
+++ b/pkgs/desktops/deepin/library/gio-qt/default.nix
@@ -1,14 +1,15 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, wrapQtAppsHook
-, glibmm
-, doxygen
-, qttools
-, qtbase
-, buildDocs ? true
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  wrapQtAppsHook,
+  glibmm,
+  doxygen,
+  qttools,
+  qtbase,
+  buildDocs ? true,
 }:
 
 stdenv.mkDerivation rec {
@@ -29,11 +30,16 @@ stdenv.mkDerivation rec {
       --replace "include(qt6.cmake)" " "
   '';
 
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    wrapQtAppsHook
-  ] ++ lib.optionals buildDocs [ doxygen qttools.dev ];
+  nativeBuildInputs =
+    [
+      cmake
+      pkg-config
+      wrapQtAppsHook
+    ]
+    ++ lib.optionals buildDocs [
+      doxygen
+      qttools.dev
+    ];
 
   cmakeFlags = [
     "-DCMAKE_INSTALL_LIBDIR=lib"
diff --git a/pkgs/desktops/deepin/library/image-editor/default.nix b/pkgs/desktops/deepin/library/image-editor/default.nix
index 4a9c35b1aece..576dda7f5a3e 100644
--- a/pkgs/desktops/deepin/library/image-editor/default.nix
+++ b/pkgs/desktops/deepin/library/image-editor/default.nix
@@ -1,16 +1,17 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, dtkwidget
-, cmake
-, qttools
-, pkg-config
-, wrapQtAppsHook
-, opencv
-, freeimage
-, libmediainfo
-, ffmpegthumbnailer
-, pcre
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  dtkwidget,
+  cmake,
+  qttools,
+  pkg-config,
+  wrapQtAppsHook,
+  opencv,
+  freeimage,
+  libmediainfo,
+  ffmpegthumbnailer,
+  pcre,
 }:
 
 stdenv.mkDerivation rec {
@@ -29,7 +30,12 @@ stdenv.mkDerivation rec {
     substituteInPlace libimagevisualresult/CMakeLists.txt --replace '/usr' '$out'
   '';
 
-  nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    qttools
+    wrapQtAppsHook
+  ];
 
   buildInputs = [
     dtkwidget
@@ -40,9 +46,7 @@ stdenv.mkDerivation rec {
     pcre
   ];
 
-  cmakeFlags = [
-    "-DCMAKE_INSTALL_LIBDIR=lib"
-  ];
+  cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
 
   meta = with lib; {
     description = "Image editor lib for dtk";
diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix
index 41b4c7f9b03d..ccf8f6a4817d 100644
--- a/pkgs/desktops/deepin/library/qt5integration/default.nix
+++ b/pkgs/desktops/deepin/library/qt5integration/default.nix
@@ -1,14 +1,15 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, dtkwidget
-, cmake
-, pkg-config
-, libsForQt5
-, lxqt
-, mtdev
-, xorg
-, gtest
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  dtkwidget,
+  cmake,
+  pkg-config,
+  libsForQt5,
+  lxqt,
+  mtdev,
+  xorg,
+  gtest,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
index 291fc19d5474..fbf3879cf37b 100644
--- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
+++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
@@ -1,16 +1,17 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, extra-cmake-modules
-, pkg-config
-, dtkcommon
-, libsForQt5
-, mtdev
-, cairo
-, xorg
-, wayland
-, dwayland
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  extra-cmake-modules,
+  pkg-config,
+  dtkcommon,
+  libsForQt5,
+  mtdev,
+  cairo,
+  xorg,
+  wayland,
+  dwayland,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix
index 950c2ac5c325..07b93c85f74c 100644
--- a/pkgs/desktops/deepin/library/qt6integration/default.nix
+++ b/pkgs/desktops/deepin/library/qt6integration/default.nix
@@ -1,11 +1,12 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, dtk6widget
-, qt6Packages
-, gtest
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  dtk6widget,
+  qt6Packages,
+  gtest,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
index 335e728f8a2b..09bd21a24835 100644
--- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
+++ b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix
@@ -1,13 +1,14 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, fetchpatch
-, cmake
-, pkg-config
-, mtdev
-, cairo
-, xorg
-, qt6Packages
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  pkg-config,
+  mtdev,
+  cairo,
+  xorg,
+  qt6Packages,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
index 84321809ebeb..3a9be5a65879 100644
--- a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
+++ b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix
@@ -1,10 +1,11 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, qmake
-, pkg-config
-, wrapQtAppsHook
-, udisks
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  qmake,
+  pkg-config,
+  wrapQtAppsHook,
+  udisks,
 }:
 
 stdenv.mkDerivation rec {
@@ -18,7 +19,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-WS4fmqEYXi5dkn8RvyJBzy3+r+UgFcGDFFpQlbblLu4=";
   };
 
-  nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
+  nativeBuildInputs = [
+    qmake
+    pkg-config
+    wrapQtAppsHook
+  ];
 
   buildInputs = [ udisks ];
 
diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix
index e3fe31526cf4..140b28fc7327 100644
--- a/pkgs/desktops/deepin/library/util-dfm/default.nix
+++ b/pkgs/desktops/deepin/library/util-dfm/default.nix
@@ -1,14 +1,15 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, qtbase
-, libmediainfo
-, libsecret
-, libisoburn
-, libuuid
-, udisks
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qtbase,
+  libmediainfo,
+  libsecret,
+  libisoburn,
+  libuuid,
+  udisks,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
index ae1120032450..7f4c433914c2 100644
--- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
+++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix
@@ -1,7 +1,8 @@
-{ stdenvNoCC
-, lib
-, fetchFromGitHub
-, nixos-icons
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
+  nixos-icons,
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "deepin-desktop-base";
@@ -39,7 +40,10 @@ stdenvNoCC.mkDerivation rec {
   meta = with lib; {
     description = "Base assets and definitions for Deepin Desktop Environment";
     homepage = "https://github.com/linuxdeepin/deepin-desktop-base";
-    license = with licenses; [ gpl3Plus cc-by-40 ];
+    license = with licenses; [
+      gpl3Plus
+      cc-by-40
+    ];
     platforms = platforms.linux;
     maintainers = teams.deepin.members;
   };
diff --git a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix
index 2d3c5a020884..973df30e5bb5 100644
--- a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix
+++ b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix
@@ -1,10 +1,11 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, wrapQtAppsHook
-, dtkwidget
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  wrapQtAppsHook,
+  dtkwidget,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,9 +25,7 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  buildInputs = [
-    dtkwidget
-  ];
+  buildInputs = [ dtkwidget ];
 
   postPatch = ''
     substituteInPlace src/{booster-dtkwidget/CMakeLists.txt,booster-desktop/{CMakeLists.txt,desktop.conf},booster-generic/CMakeLists.txt} --replace "/usr" "$out"
diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
index fd6ae6f42541..08093b0befd7 100644
--- a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
+++ b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
@@ -1,16 +1,17 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, dtkwidget
-, deepin-gettext-tools
-, qt5integration
-, qmake
-, qtbase
-, qttools
-, qtx11extras
-, pkg-config
-, wrapQtAppsHook
-, udisks2-qt5
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  dtkwidget,
+  deepin-gettext-tools,
+  qt5integration,
+  qmake,
+  qtbase,
+  qttools,
+  qtx11extras,
+  pkg-config,
+  wrapQtAppsHook,
+  udisks2-qt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -49,9 +50,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DVERSION=${version}" ];
 
   # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [
-    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
-  ];
+  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
 
   meta = with lib; {
     description = "Simple graphical interface for creating file system in a block device";
diff --git a/pkgs/desktops/deepin/tools/deepin-anything/default.nix b/pkgs/desktops/deepin/tools/deepin-anything/default.nix
index cfcbb6f1c1f7..42da994bbb00 100644
--- a/pkgs/desktops/deepin/tools/deepin-anything/default.nix
+++ b/pkgs/desktops/deepin/tools/deepin-anything/default.nix
@@ -1,14 +1,15 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, pkg-config
-, wrapQtAppsHook
-, udisks2-qt5
-, util-linux
-, libnl
-, glib
-, pcre
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  wrapQtAppsHook,
+  udisks2-qt5,
+  util-linux,
+  libnl,
+  glib,
+  pcre,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix
index f9a789c21989..7f2db77f4567 100644
--- a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix
+++ b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix
@@ -1,9 +1,10 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, gettext
-, python3Packages
-, perlPackages
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  gettext,
+  python3Packages,
+  perlPackages,
 }:
 
 stdenv.mkDerivation rec {
@@ -30,9 +31,7 @@ stdenv.mkDerivation rec {
     perlPackages.XMLLibXML
   ];
 
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-  ];
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   postFixup = ''
     wrapPythonPrograms

From b5f833a3160873433bffe1b8d5cc59fc8edcd380 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sat, 24 Aug 2024 14:11:39 +0300
Subject: [PATCH 022/135] hiawatha: fix build

---
 pkgs/servers/http/hiawatha/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix
index 79797167dd21..7d62dc27e822 100644
--- a/pkgs/servers/http/hiawatha/default.nix
+++ b/pkgs/servers/http/hiawatha/default.nix
@@ -6,6 +6,7 @@
 , ninja
 , mbedtls
 , libxcrypt
+, zlib
 
 , enableCache     ? true     # Internal cache support.
 , enableIpV6      ? true
@@ -29,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ cmake ninja ];
-  buildInputs = [ mbedtls libxcrypt ] ++ lib.optionals enableXslt [ libxslt libxml2 ];
+  buildInputs = [ mbedtls libxcrypt zlib ] ++ lib.optionals enableXslt [ libxslt libxml2 ];
 
   prePatch = ''
     substituteInPlace CMakeLists.txt --replace SETUID ""

From 36731fc64125fc9e9c1f8d920d17b20f5f55fbad Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 7 Jul 2024 13:18:25 +0100
Subject: [PATCH 023/135] nanomq: 0.21.8 -> 0.22.1

disable websocket install-checks for now, as it seems properly
broken
---
 pkgs/by-name/na/nanomq/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/na/nanomq/package.nix b/pkgs/by-name/na/nanomq/package.nix
index 306ce1387acc..f5ad6c1bed01 100644
--- a/pkgs/by-name/na/nanomq/package.nix
+++ b/pkgs/by-name/na/nanomq/package.nix
@@ -42,13 +42,13 @@ let
 
 in stdenv.mkDerivation (finalAttrs: {
   pname = "nanomq";
-  version = "0.21.8";
+  version = "0.22.1";
 
   src = fetchFromGitHub {
     owner = "emqx";
     repo = "nanomq";
     rev = finalAttrs.version;
-    hash = "sha256-O9UrUkD61OicY1L4sL2PX/9aOpFkJpjm2SWoP2cKXyA=";
+    hash = "sha256-aB1gEzo2dX8NY+e0Dq4ELgkUpL/NtvvuY/l539BPIng=";
     fetchSubmodules = true;
   };
 
@@ -90,6 +90,12 @@ in stdenv.mkDerivation (finalAttrs: {
       # effectively distable this test because it is slow
       echo > .github/scripts/fuzzy_test.txt
 
+      # even with the correct paho-mqtt version these tests fail, suggesting
+      # websocket support is indeed broken
+      substituteInPlace .github/scripts/test.py \
+        --replace 'ws_test()' '#ws_test()' \
+        --replace 'ws_v5_test()' '#ws_v5_test()'
+
       PATH="$PATH:$out/bin" python .github/scripts/test.py
     )
 

From 5b76066600b876caea4df7a4b63fa4e0dc9fc305 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Sat, 24 Aug 2024 08:27:54 -0400
Subject: [PATCH 024/135] openvswitch-lts: remove

---
 pkgs/by-name/op/openvswitch/generic.nix | 168 ------------------------
 pkgs/by-name/op/openvswitch/lts.nix     |   5 -
 pkgs/by-name/op/openvswitch/package.nix | 160 +++++++++++++++++++++-
 pkgs/by-name/op/openvswitch/update.nu   |  19 ---
 pkgs/top-level/aliases.nix              |   1 +
 pkgs/top-level/all-packages.nix         |   1 -
 6 files changed, 159 insertions(+), 195 deletions(-)
 delete mode 100644 pkgs/by-name/op/openvswitch/generic.nix
 delete mode 100644 pkgs/by-name/op/openvswitch/lts.nix
 delete mode 100755 pkgs/by-name/op/openvswitch/update.nu

diff --git a/pkgs/by-name/op/openvswitch/generic.nix b/pkgs/by-name/op/openvswitch/generic.nix
deleted file mode 100644
index 95fea77f8d1e..000000000000
--- a/pkgs/by-name/op/openvswitch/generic.nix
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-  version,
-  hash,
-  updateScriptArgs ? "",
-}:
-
-{
-  lib,
-  stdenv,
-  fetchurl,
-  autoconf,
-  automake,
-  installShellFiles,
-  iproute2,
-  kernel ? null,
-  libcap_ng,
-  libtool,
-  openssl,
-  perl,
-  pkg-config,
-  procps,
-  python3,
-  tcpdump,
-  sphinxHook,
-  util-linux,
-  which,
-  writeScript,
-  makeWrapper,
-  withDPDK ? false,
-  dpdk,
-  numactl,
-  libpcap,
-}:
-
-let
-  _kernel = kernel;
-in
-stdenv.mkDerivation rec {
-  pname = if withDPDK then "openvswitch-dpdk" else "openvswitch";
-  inherit version;
-
-  kernel = lib.optional (_kernel != null) _kernel.dev;
-
-  src = fetchurl {
-    url = "https://www.openvswitch.org/releases/openvswitch-${version}.tar.gz";
-    inherit hash;
-  };
-
-  outputs = [
-    "out"
-    "man"
-  ];
-
-  patches = [
-    # 8: vsctl-bashcomp - argument completion FAILED (completion.at:664)
-    ./patches/disable-bash-arg-completion-test.patch
-
-    # https://github.com/openvswitch/ovs/commit/9185793e75435d890f18d391eaaeab0ade6f1415
-    ./patches/fix-python313.patch
-  ];
-
-  nativeBuildInputs = [
-    autoconf
-    automake
-    installShellFiles
-    libtool
-    pkg-config
-    sphinxHook
-    makeWrapper
-  ];
-
-  sphinxBuilders = [ "man" ];
-
-  sphinxRoot = "./Documentation";
-
-  buildInputs =
-    [
-      libcap_ng
-      openssl
-      perl
-      procps
-      python3
-      util-linux
-      which
-    ]
-    ++ (lib.optionals withDPDK [
-      dpdk
-      numactl
-      libpcap
-    ]);
-
-  preConfigure = "./boot.sh";
-
-  configureFlags =
-    [
-      "--localstatedir=/var"
-      "--sharedstatedir=/var"
-      "--sbindir=$(out)/bin"
-    ]
-    ++ (lib.optionals (_kernel != null) [ "--with-linux" ])
-    ++ (lib.optionals withDPDK [ "--with-dpdk=shared" ]);
-
-  # Leave /var out of this!
-  installFlags = [
-    "LOGDIR=$(TMPDIR)/dummy"
-    "RUNDIR=$(TMPDIR)/dummy"
-    "PKIDIR=$(TMPDIR)/dummy"
-  ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    installShellCompletion --bash utilities/ovs-appctl-bashcomp.bash
-    installShellCompletion --bash utilities/ovs-vsctl-bashcomp.bash
-
-    wrapProgram $out/bin/ovs-l3ping \
-      --prefix PYTHONPATH : $out/share/openvswitch/python
-
-    wrapProgram $out/bin/ovs-tcpdump \
-      --prefix PATH : ${lib.makeBinPath [ tcpdump ]} \
-      --prefix PYTHONPATH : $out/share/openvswitch/python
-  '';
-
-  doCheck = true;
-  preCheck = ''
-    export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
-    export RECHECK=yes
-
-    patchShebangs tests/
-  '';
-
-  nativeCheckInputs =
-    [ iproute2 ]
-    ++ (with python3.pkgs; [
-      netaddr
-      pyparsing
-      pytest
-      setuptools
-    ]);
-
-  passthru.updateScript = writeScript "ovs-update.nu" ''
-    ${./update.nu} ${updateScriptArgs}
-  '';
-
-  meta = with lib; {
-    changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt";
-    description = "Multilayer virtual switch";
-    longDescription = ''
-      Open vSwitch is a production quality, multilayer virtual switch
-      licensed under the open source Apache 2.0 license. It is
-      designed to enable massive network automation through
-      programmatic extension, while still supporting standard
-      management interfaces and protocols (e.g. NetFlow, sFlow, SPAN,
-      RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to
-      support distribution across multiple physical servers similar
-      to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
-    '';
-    homepage = "https://www.openvswitch.org/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
-      adamcstephens
-      kmcopper
-      netixx
-      xddxdd
-    ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/op/openvswitch/lts.nix b/pkgs/by-name/op/openvswitch/lts.nix
deleted file mode 100644
index 93ccbfcee95d..000000000000
--- a/pkgs/by-name/op/openvswitch/lts.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-import ./generic.nix {
-  version = "2.17.9";
-  hash = "sha256-4bP6RyZ2YmhT8i1j+VnlrQYeG/V+G71ETQ7Yj5R++LE=";
-  updateScriptArgs = "--lts=true --regex '2\.17.*'";
-}
diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix
index 0ea5b6391605..65cd7399c98c 100644
--- a/pkgs/by-name/op/openvswitch/package.nix
+++ b/pkgs/by-name/op/openvswitch/package.nix
@@ -1,4 +1,160 @@
-import ./generic.nix {
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoconf,
+  automake,
+  installShellFiles,
+  iproute2,
+  kernel ? null,
+  libcap_ng,
+  libtool,
+  nix-update-script,
+  openssl,
+  perl,
+  pkg-config,
+  procps,
+  python3,
+  tcpdump,
+  sphinxHook,
+  util-linux,
+  which,
+  makeWrapper,
+  withDPDK ? false,
+  dpdk,
+  numactl,
+  libpcap,
+}:
+
+let
+  _kernel = kernel;
+in
+stdenv.mkDerivation rec {
+  pname = if withDPDK then "openvswitch-dpdk" else "openvswitch";
   version = "3.3.0";
-  hash = "sha256-Gvy4H7lHwL6IWGaZXWwIjmHfQ1YRFXiSBqKzP3vBsF8=";
+
+  kernel = lib.optional (_kernel != null) _kernel.dev;
+
+  src = fetchurl {
+    url = "https://www.openvswitch.org/releases/openvswitch-${version}.tar.gz";
+    hash = "sha256-Gvy4H7lHwL6IWGaZXWwIjmHfQ1YRFXiSBqKzP3vBsF8=";
+  };
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  patches = [
+    # 8: vsctl-bashcomp - argument completion FAILED (completion.at:664)
+    ./patches/disable-bash-arg-completion-test.patch
+
+    # https://github.com/openvswitch/ovs/commit/9185793e75435d890f18d391eaaeab0ade6f1415
+    ./patches/fix-python313.patch
+  ];
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    installShellFiles
+    libtool
+    pkg-config
+    sphinxHook
+    makeWrapper
+  ];
+
+  sphinxBuilders = [ "man" ];
+
+  sphinxRoot = "./Documentation";
+
+  buildInputs =
+    [
+      libcap_ng
+      openssl
+      perl
+      procps
+      python3
+      util-linux
+      which
+    ]
+    ++ (lib.optionals withDPDK [
+      dpdk
+      numactl
+      libpcap
+    ]);
+
+  preConfigure = "./boot.sh";
+
+  configureFlags =
+    [
+      "--localstatedir=/var"
+      "--sharedstatedir=/var"
+      "--sbindir=$(out)/bin"
+    ]
+    ++ (lib.optionals (_kernel != null) [ "--with-linux" ])
+    ++ (lib.optionals withDPDK [ "--with-dpdk=shared" ]);
+
+  # Leave /var out of this!
+  installFlags = [
+    "LOGDIR=$(TMPDIR)/dummy"
+    "RUNDIR=$(TMPDIR)/dummy"
+    "PKIDIR=$(TMPDIR)/dummy"
+  ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    installShellCompletion --bash utilities/ovs-appctl-bashcomp.bash
+    installShellCompletion --bash utilities/ovs-vsctl-bashcomp.bash
+
+    wrapProgram $out/bin/ovs-l3ping \
+      --prefix PYTHONPATH : $out/share/openvswitch/python
+
+    wrapProgram $out/bin/ovs-tcpdump \
+      --prefix PATH : ${lib.makeBinPath [ tcpdump ]} \
+      --prefix PYTHONPATH : $out/share/openvswitch/python
+  '';
+
+  doCheck = true;
+  preCheck = ''
+    export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
+    export RECHECK=yes
+
+    patchShebangs tests/
+  '';
+
+  nativeCheckInputs =
+    [ iproute2 ]
+    ++ (with python3.pkgs; [
+      netaddr
+      pyparsing
+      pytest
+      setuptools
+    ]);
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt";
+    description = "Multilayer virtual switch";
+    longDescription = ''
+      Open vSwitch is a production quality, multilayer virtual switch
+      licensed under the open source Apache 2.0 license. It is
+      designed to enable massive network automation through
+      programmatic extension, while still supporting standard
+      management interfaces and protocols (e.g. NetFlow, sFlow, SPAN,
+      RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to
+      support distribution across multiple physical servers similar
+      to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
+    '';
+    homepage = "https://www.openvswitch.org/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [
+      adamcstephens
+      kmcopper
+      netixx
+      xddxdd
+    ];
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/by-name/op/openvswitch/update.nu b/pkgs/by-name/op/openvswitch/update.nu
deleted file mode 100755
index 60e462f4625e..000000000000
--- a/pkgs/by-name/op/openvswitch/update.nu
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i nu -p nushell common-updater-scripts
-
-def main [--lts = false, --regex: string] {
-  let tags = list-git-tags --url=https://github.com/openvswitch/ovs | lines | sort --natural | str replace v ''
-
-  let latest_tag = if $regex == null { $tags } else { $tags | find --regex $regex } | last
-  let current_version = nix eval --raw -f default.nix $"openvswitch(if $lts {"-lts"}).version" | str trim
-
-  if $latest_tag != $current_version {
-    if $lts {
-      update-source-version openvswitch-lts $latest_tag $"--file=(pwd)/pkgs/by-name/op/openvswitch/lts.nix"
-    } else {
-      update-source-version openvswitch $latest_tag $"--file=(pwd)/pkgs/by-name/op/openvswitch/default.nix"
-    }
-  }
-
-  {"lts?": $lts, before: $current_version, after: $latest_tag}
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e69221372232..6ed95d5e878a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1125,6 +1125,7 @@ mapAliases ({
   onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03
   onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
   onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
+  openvswitch-lts = throw "openvswitch-lts has been removed. Please use the latest version available under openvswitch"; # Added 2024-08-24
   oroborus = throw "oroborus was removed, because it was abandoned years ago."; #Added 2023-09-10
   osxfuse = macfuse-stubs; # Added 2021-03-20
   oxen = throw "'oxen' has been removed, because it was broken, outdated and unmaintained"; # Added 2023-12-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 004007fb0b72..b54d6341c41e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11110,7 +11110,6 @@ with pkgs;
   opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { };
   opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { };
 
-  openvswitch-lts = callPackage ../by-name/op/openvswitch/lts.nix { };
   openvswitch-dpdk = callPackage ../by-name/op/openvswitch/package.nix { withDPDK = true; };
 
   ovn-lts = callPackage ../by-name/ov/ovn/lts.nix { };

From 018de6e01344b9d1ede252517f603e3c6ca889d9 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Sat, 24 Aug 2024 08:32:35 -0400
Subject: [PATCH 025/135] openvswitch: use git for src

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

diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix
index 65cd7399c98c..63b0e0eb232c 100644
--- a/pkgs/by-name/op/openvswitch/package.nix
+++ b/pkgs/by-name/op/openvswitch/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   autoconf,
   automake,
   installShellFiles,
@@ -35,9 +35,11 @@ stdenv.mkDerivation rec {
 
   kernel = lib.optional (_kernel != null) _kernel.dev;
 
-  src = fetchurl {
-    url = "https://www.openvswitch.org/releases/openvswitch-${version}.tar.gz";
-    hash = "sha256-Gvy4H7lHwL6IWGaZXWwIjmHfQ1YRFXiSBqKzP3vBsF8=";
+  src = fetchFromGitHub {
+    owner = "openvswitch";
+    repo = "ovs";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ZO5qECVpsJ4lqFbGqD4eokHzkBQ3mawDVUBNdva76lo=";
   };
 
   outputs = [

From 3a63796d8e308bbea4cbb1c9cfed9ee0f25f5e56 Mon Sep 17 00:00:00 2001
From: Builditluc <git@builditluc.eu>
Date: Sat, 24 Aug 2024 14:34:37 +0200
Subject: [PATCH 026/135] youki: 0.3.3 -> 0.4.0

---
 .../virtualization/youki/default.nix          |  8 +-
 .../virtualization/youki/fix-cargo-lock.patch | 82 -------------------
 2 files changed, 3 insertions(+), 87 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/youki/fix-cargo-lock.patch

diff --git a/pkgs/applications/virtualization/youki/default.nix b/pkgs/applications/virtualization/youki/default.nix
index 01e400805669..8e5d57ae7a36 100644
--- a/pkgs/applications/virtualization/youki/default.nix
+++ b/pkgs/applications/virtualization/youki/default.nix
@@ -12,17 +12,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "youki";
-  version = "0.3.3";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-lOt+bi9JbHLRUFiSoIfgNH2f9LXcrKk7vSz8fXLFDJE=";
+    hash = "sha256-dkVnNtBfvjf47p1N5/syHqjlDVnbKRDqNJ98ym5B+mg=";
   };
 
-  cargoPatches = [ ./fix-cargo-lock.patch ];
-
   nativeBuildInputs = [
     pkg-config
     installShellFiles
@@ -50,7 +48,7 @@ rustPlatform.buildRustPackage rec {
     "youki"
   ];
 
-  cargoHash = "sha256-bbKuycv747NKtxhnakASRtlkPqT2Ry6g0z4Zi1EuNzQ=";
+  cargoHash = "sha256-Nv1LAkWYwWb0Izvd7UlKU4wx3vVkmO9Rcpt6AuTwObU=";
 
   meta = with lib; {
     description = "Container runtime written in Rust";
diff --git a/pkgs/applications/virtualization/youki/fix-cargo-lock.patch b/pkgs/applications/virtualization/youki/fix-cargo-lock.patch
deleted file mode 100644
index 591047368347..000000000000
--- a/pkgs/applications/virtualization/youki/fix-cargo-lock.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index ffbcdc33..62659a4d 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1915,7 +1915,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
- 
- [[package]]
- name = "libcgroups"
--version = "0.3.2"
-+version = "0.3.3"
- dependencies = [
-  "anyhow",
-  "clap",
-@@ -1940,7 +1940,7 @@ dependencies = [
- 
- [[package]]
- name = "libcontainer"
--version = "0.3.2"
-+version = "0.3.3"
- dependencies = [
-  "anyhow",
-  "bitflags 2.5.0",
-@@ -1983,7 +1983,7 @@ dependencies = [
- 
- [[package]]
- name = "liboci-cli"
--version = "0.3.2"
-+version = "0.3.3"
- dependencies = [
-  "clap",
- ]
-@@ -3881,9 +3881,9 @@ dependencies = [
- 
- [[package]]
- name = "time"
--version = "0.3.34"
-+version = "0.3.36"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
-+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
- dependencies = [
-  "deranged",
-  "itoa",
-@@ -3893,7 +3893,7 @@ dependencies = [
-  "powerfmt",
-  "serde",
-  "time-core",
-- "time-macros 0.2.17",
-+ "time-macros 0.2.18",
- ]
- 
- [[package]]
-@@ -3914,9 +3914,9 @@ dependencies = [
- 
- [[package]]
- name = "time-macros"
--version = "0.2.17"
-+version = "0.2.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
-+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
- dependencies = [
-  "num-conv",
-  "time-core",
-@@ -4287,7 +4287,7 @@ dependencies = [
-  "anyhow",
-  "cfg-if",
-  "rustversion",
-- "time 0.3.34",
-+ "time 0.3.36",
- ]
- 
- [[package]]
-@@ -5678,7 +5678,7 @@ dependencies = [
- 
- [[package]]
- name = "youki"
--version = "0.3.2"
-+version = "0.3.3"
- dependencies = [
-  "anyhow",
-  "caps",

From ba93772e3742aa4d4eb4da9d0a70a3f34749aecf Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sat, 24 Aug 2024 15:37:18 +0300
Subject: [PATCH 027/135] marge-bot: fix tests

---
 pkgs/by-name/ma/marge-bot/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ma/marge-bot/package.nix b/pkgs/by-name/ma/marge-bot/package.nix
index f5946f4b7ed1..efa387042406 100644
--- a/pkgs/by-name/ma/marge-bot/package.nix
+++ b/pkgs/by-name/ma/marge-bot/package.nix
@@ -35,6 +35,9 @@ python3.pkgs.buildPythonApplication rec {
     # test broken when run under Nix:
     #   "unittest.mock.InvalidSpecError: Cannot spec a Mock object."
     "test_get_mr_ci_status"
+    # broken because of an incorrect assertion:
+    #   "AttributeError: 'has_calls' is not a valid assertion."
+    "test_reapprove"
   ];
   disabledTestPaths = [
     # test errors due to API mismatch in test setup:

From c2c1aaa22a04501a12effb8043e2e20f3e8899ef Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Sat, 24 Aug 2024 12:32:49 +0000
Subject: [PATCH 028/135] openvswitch: 3.3.0 -> 3.4.0

https://github.com/openvswitch/ovs/blob/v3.4.0/NEWS
---
 pkgs/by-name/op/openvswitch/package.nix              |  7 ++-----
 .../op/openvswitch/patches/fix-python313.patch       | 12 ------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/by-name/op/openvswitch/patches/fix-python313.patch

diff --git a/pkgs/by-name/op/openvswitch/package.nix b/pkgs/by-name/op/openvswitch/package.nix
index 63b0e0eb232c..4502031120c0 100644
--- a/pkgs/by-name/op/openvswitch/package.nix
+++ b/pkgs/by-name/op/openvswitch/package.nix
@@ -31,7 +31,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = if withDPDK then "openvswitch-dpdk" else "openvswitch";
-  version = "3.3.0";
+  version = "3.4.0";
 
   kernel = lib.optional (_kernel != null) _kernel.dev;
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     owner = "openvswitch";
     repo = "ovs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ZO5qECVpsJ4lqFbGqD4eokHzkBQ3mawDVUBNdva76lo=";
+    hash = "sha256-oe6RnSEaK/mFPzTLfsyyd7wijKbv2/tlNUlXZYrb+ko=";
   };
 
   outputs = [
@@ -50,9 +50,6 @@ stdenv.mkDerivation rec {
   patches = [
     # 8: vsctl-bashcomp - argument completion FAILED (completion.at:664)
     ./patches/disable-bash-arg-completion-test.patch
-
-    # https://github.com/openvswitch/ovs/commit/9185793e75435d890f18d391eaaeab0ade6f1415
-    ./patches/fix-python313.patch
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openvswitch/patches/fix-python313.patch b/pkgs/by-name/op/openvswitch/patches/fix-python313.patch
deleted file mode 100644
index 0b68c0560d51..000000000000
--- a/pkgs/by-name/op/openvswitch/patches/fix-python313.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/vlog.at b/tests/vlog.at
-index 785014956e7..efe91479a63 100644
---- a/tests/vlog.at
-+++ b/tests/vlog.at
-@@ -8,6 +8,7 @@ AT_CHECK([$PYTHON3 $srcdir/test-vlog.py --log-file log_file \
- 
- AT_CHECK([sed -e 's/.*-.*-.*T..:..:..Z |//' \
- -e 's/File ".*", line [[0-9]][[0-9]]*,/File <name>, line <number>,/' \
-+-e '/\^\+/d' \
- stderr_log], [0], [dnl
-   0  | module_0 | EMER | emergency
-   1  | module_0 | ERR | error

From 3c2ef79a70f13cb12f1e1ae10cf4a41b84b5d854 Mon Sep 17 00:00:00 2001
From: Builditluc <git@builditluc.eu>
Date: Sat, 24 Aug 2024 14:42:22 +0200
Subject: [PATCH 029/135] youki: move to pkgs/by-name

---
 .../youki/default.nix => by-name/yo/youki/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/virtualization/youki/default.nix => by-name/yo/youki/package.nix} (100%)

diff --git a/pkgs/applications/virtualization/youki/default.nix b/pkgs/by-name/yo/youki/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/youki/default.nix
rename to pkgs/by-name/yo/youki/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 004007fb0b72..525093673ba3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34857,8 +34857,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
   };
 
-  youki = callPackage ../applications/virtualization/youki { };
-
   yt-dlp-light = yt-dlp.override {
     atomicparsleySupport = false;
     ffmpegSupport = false;

From 76711376297401a6cfaea0b42a849a058296ecce Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 24 Aug 2024 10:06:05 -0300
Subject: [PATCH 030/135] mawk: migrate to by-name

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

diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/by-name/ma/mawk/package.nix
similarity index 100%
rename from pkgs/tools/text/mawk/default.nix
rename to pkgs/by-name/ma/mawk/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 004007fb0b72..e867add95b36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10211,8 +10211,6 @@ with pkgs;
 
   mars-mips = callPackage ../development/tools/mars-mips { };
 
-  mawk = callPackage ../tools/text/mawk { };
-
   mb2md = callPackage ../tools/text/mb2md { };
 
   mbuffer = callPackage ../tools/misc/mbuffer { };

From 225156651315638104af9ba764dcf823a8b182fd Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 24 Aug 2024 10:16:32 -0300
Subject: [PATCH 031/135] mawk: rework

- finalAttrs design pattern
- get rid of nested with
- nixfmt-rfc-style
---
 pkgs/by-name/ma/mawk/package.nix | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ma/mawk/package.nix b/pkgs/by-name/ma/mawk/package.nix
index 700b20c2178c..ce9c776b5c1d 100644
--- a/pkgs/by-name/ma/mawk/package.nix
+++ b/pkgs/by-name/ma/mawk/package.nix
@@ -1,25 +1,31 @@
-{ lib, stdenv, fetchurl, buildPackages }:
+{
+  lib,
+  buildPackages,
+  fetchurl,
+  stdenv,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mawk";
   version = "1.3.4-20240622";
 
   src = fetchurl {
     urls = [
-      "ftp://ftp.invisible-island.net/mawk/mawk-${version}.tgz"
-      "https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz"
+      "https://invisible-mirror.net/archives/mawk/mawk-${finalAttrs.version}.tgz"
+      "ftp://ftp.invisible-island.net/mawk/mawk-${finalAttrs.version}.tgz"
     ];
-    sha256 = "sha256-TpF+h6ep+692mVeEpLC13A3ZVLl30JgwMPePagexp2U=";
+    hash = "sha256-TpF+h6ep+692mVeEpLC13A3ZVLl30JgwMPePagexp2U=";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  meta = with lib; {
-    description = "Interpreter for the AWK Programming Language";
-    mainProgram = "mawk";
+  meta = {
     homepage = "https://invisible-island.net/mawk/mawk.html";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ehmry ];
-    platforms = with platforms; unix;
+    changelog = "https://invisible-island.net/mawk/CHANGES";
+    description = "Interpreter for the AWK Programming Language";
+    license = lib.licenses.gpl2Only;
+    mainProgram = "mawk";
+    maintainers = with lib.maintainers; [ ehmry ];
+    platforms = lib.platforms.unix;
   };
-}
+})

From c012e3eb24d6f59f6c46917f951f9f909a2997dc Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 24 Aug 2024 10:44:26 -0300
Subject: [PATCH 032/135] mawk: add test version

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

diff --git a/pkgs/by-name/ma/mawk/package.nix b/pkgs/by-name/ma/mawk/package.nix
index ce9c776b5c1d..e80c75a9f66e 100644
--- a/pkgs/by-name/ma/mawk/package.nix
+++ b/pkgs/by-name/ma/mawk/package.nix
@@ -3,6 +3,7 @@
   buildPackages,
   fetchurl,
   stdenv,
+  testers,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -19,6 +20,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
+  passthru = {
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      command = "mawk -W version";
+    };
+  };
+
   meta = {
     homepage = "https://invisible-island.net/mawk/mawk.html";
     changelog = "https://invisible-island.net/mawk/CHANGES";

From 9aace02bfa360202f680ce1358538fe00a7e0fa4 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 24 Aug 2024 10:33:59 -0300
Subject: [PATCH 033/135] mawk: 1.3.4-20240622 -> 1.3.4-20240819

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

diff --git a/pkgs/by-name/ma/mawk/package.nix b/pkgs/by-name/ma/mawk/package.nix
index e80c75a9f66e..f189ba5f035c 100644
--- a/pkgs/by-name/ma/mawk/package.nix
+++ b/pkgs/by-name/ma/mawk/package.nix
@@ -8,14 +8,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mawk";
-  version = "1.3.4-20240622";
+  version = "1.3.4-20240819";
 
   src = fetchurl {
     urls = [
       "https://invisible-mirror.net/archives/mawk/mawk-${finalAttrs.version}.tgz"
       "ftp://ftp.invisible-island.net/mawk/mawk-${finalAttrs.version}.tgz"
     ];
-    hash = "sha256-TpF+h6ep+692mVeEpLC13A3ZVLl30JgwMPePagexp2U=";
+    hash = "sha256-bh/ejuetilwVOCMWhj/WtMbSP6t4HdWrAXf/o+6arlw=";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

From bca63da59402d10ba33ec8be14759f86cf6e5835 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 24 Aug 2024 10:59:58 -0300
Subject: [PATCH 034/135] mawk: add update script

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

diff --git a/pkgs/by-name/ma/mawk/package.nix b/pkgs/by-name/ma/mawk/package.nix
index f189ba5f035c..482d6940c7c8 100644
--- a/pkgs/by-name/ma/mawk/package.nix
+++ b/pkgs/by-name/ma/mawk/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   buildPackages,
+  directoryListingUpdater,
   fetchurl,
   stdenv,
   testers,
@@ -25,6 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
       package = finalAttrs.finalPackage;
       command = "mawk -W version";
     };
+    updateScript = directoryListingUpdater {
+      inherit (finalAttrs) pname version;
+      url = "https://invisible-island.net/archives/mawk/";
+    };
   };
 
   meta = {

From ecf6bf1ebf9112f9fcdce151dc5cb4e7cefef85f Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sat, 24 Aug 2024 16:07:11 +0200
Subject: [PATCH 035/135] forgejo-runner: 3.5.0 -> 3.5.1

https://code.forgejo.org/forgejo/runner/releases/tag/v3.5.1

https://code.forgejo.org/forgejo/runner/src/tag/v3.5.1/RELEASE-NOTES.md

diff: https://code.forgejo.org/forgejo/runner/compare/v3.5.0...v3.5.1
---
 pkgs/by-name/fo/forgejo-runner/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix
index 77027eed675e..39f0aefd7a35 100644
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule rec {
   pname = "forgejo-runner";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchFromGitea {
     domain = "code.forgejo.org";
     owner = "forgejo";
     repo = "runner";
     rev = "v${version}";
-    hash = "sha256-omp62KJVPSl3DqZxB1WJFd5secYIAc/6n6Ke5xzICQo=";
+    hash = "sha256-LRMkwSrBU5/IPXMhRT05pE487nmSffXvmfbwBiqpyj8=";
   };
 
-  vendorHash = "sha256-FCCQZdAYRtJR3DGQIEvUzv+1kqvxVTGkwJwZSohq28s=";
+  vendorHash = "sha256-XLDtWYFHwBqbkzj4yRyr3uC1FnpS0bn1ia8i6m+CTBM=";
 
   ldflags = [
     "-s"

From 4611b00b29def7916c78d4cfaefe80041d428262 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 24 Aug 2024 17:05:44 +0200
Subject: [PATCH 036/135] exploitdb: 2024-08-05 -> 2024-08-24

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2024-08-05...2024-08-24
---
 pkgs/tools/security/exploitdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix
index 203bc6fc6e7d..816e3c462d29 100644
--- a/pkgs/tools/security/exploitdb/default.nix
+++ b/pkgs/tools/security/exploitdb/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2024-08-05";
+  version = "2024-08-24";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-LXbcFX0yTtnZWyDr0O8d1U4CX/FrjmAqHzoDNAQiqLY=";
+    hash = "sha256-Ga80kO/60pbjdoBirgNXJECpx6ylDyd5d/5gHUZ5ong=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From cd933d29fad293800aa4ddb543cb03e12eed3bac Mon Sep 17 00:00:00 2001
From: Stig Palmquist <git@stig.io>
Date: Sat, 24 Aug 2024 17:21:40 +0200
Subject: [PATCH 037/135] perlPackages.Appcpanminus: fix https hotpatch

- Add replace missing `cpan.metacpan.org` URL

- Use replace-fail instead of replace
---
 pkgs/top-level/perl-packages.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d1cdb115b02f..4ee189ba8935 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -844,10 +844,11 @@ with self; {
     # Use TLS endpoints for downloads and metadata by default
     preConfigure = ''
       substituteInPlace bin/cpanm \
-        --replace http://www.cpan.org https://www.cpan.org \
-        --replace http://backpan.perl.org https://backpan.perl.org \
-        --replace http://fastapi.metacpan.org https://fastapi.metacpan.org \
-        --replace http://cpanmetadb.plackperl.org https://cpanmetadb.plackperl.org
+        --replace-fail http://www.cpan.org https://www.cpan.org \
+        --replace-fail http://cpan.metacpan.org https://cpan.metacpan.org \
+        --replace-fail http://backpan.perl.org https://backpan.perl.org \
+        --replace-fail http://fastapi.metacpan.org https://fastapi.metacpan.org \
+        --replace-fail http://cpanmetadb.plackperl.org https://cpanmetadb.plackperl.org
     '';
     propagatedBuildInputs = [ IOSocketSSL ];
     meta = {

From 36e8f54cb5763c92c61f5e7c91ca4a371d457813 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 16:26:35 +0000
Subject: [PATCH 038/135] mob: 5.0.1 -> 5.1.0

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

diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix
index b91ab51fff51..da7617fc8a6d 100644
--- a/pkgs/applications/misc/mob/default.nix
+++ b/pkgs/applications/misc/mob/default.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "mob";
-  version = "5.0.1";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "remotemobprogramming";
     repo = "mob";
     rev = "v${version}";
-    hash = "sha256-CUD4gcQrLzYsD6zX6I4C59lHGKOaE5ggjbIVyznBNEg=";
+    hash = "sha256-C8EWiInjDxo82Y8QH1d95C8CU/qEKQmPDxp3VKL8TRQ=";
   };
 
   vendorHash = null;

From 90f3936860cc33921f6f4c27e20f99eef06e11ce Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 24 Aug 2024 18:41:13 +0200
Subject: [PATCH 039/135] xeol: 0.9.15 -> 0.10.0

Diff: https://github.com/xeol-io/xeol/compare/refs/tags/v0.9.15...v0.10.0

Changelog: https://github.com/xeol-io/xeol/releases/tag/v0.10.0
---
 pkgs/by-name/xe/xeol/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/xe/xeol/package.nix b/pkgs/by-name/xe/xeol/package.nix
index 6f3d17f3fce6..7a61d509a924 100644
--- a/pkgs/by-name/xe/xeol/package.nix
+++ b/pkgs/by-name/xe/xeol/package.nix
@@ -6,16 +6,18 @@
 
 buildGoModule rec {
   pname = "xeol";
-  version = "0.9.15";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "xeol-io";
     repo = "xeol";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/DWBDc8m5XYM5UBX5/GWuPRR3YktRar/LbENx2d5bc4=";
+    hash = "sha256-5QlHfchVRFNpU/sBTS9AWOENU86jBatF6KI97NoJa50=";
   };
 
-  vendorHash = "sha256-9zDzwiVEVsfgVzSrouNtLYpjumoWGlfSDpGWbj+zCGQ=";
+  vendorHash = "sha256-MLNUmJOpgKkIe5NUWYMA5avVvt6QLit0i4hpoaadcrs=";
+
+  proxyVendor = true;
 
   subPackages = [ "cmd/xeol/" ];
 
@@ -35,6 +37,5 @@ buildGoModule rec {
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
     mainProgram = "xeol";
-    platforms = platforms.linux;
   };
 }

From 1b92a4b9e9b8994178892ff79dda8be9befc52c3 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Sat, 24 Aug 2024 13:16:22 -0400
Subject: [PATCH 040/135] Back out "bats-extras: disable test to fix
 bat-extras.batdiff build"

This backs out commit 7d37cb86ad40448057e1f05b0e6ee88c47753f20.
---
 pkgs/tools/misc/bat-extras/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix
index 00ef24a19e43..1c3a805367f2 100644
--- a/pkgs/tools/misc/bat-extras/default.nix
+++ b/pkgs/tools/misc/bat-extras/default.nix
@@ -68,11 +68,6 @@ let
         echo "Couldn't find any library test suites"
         exit 1
       }
-
-      # Skip the batdiff test because it's broken
-      # https://github.com/eth-p/bat-extras/issues/126
-      sed -i '/test:version/a skip "batdiff test is broken."' test/suite/batdiff.sh
-
       ./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}")
       runHook postCheck
     '';

From 7211a81060d3b3a56e3a915f7d171c4dc52b4628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 24 Aug 2024 19:20:20 +0200
Subject: [PATCH 041/135] sysuser: slightly better assertions message

---
 nixos/modules/system/boot/systemd/sysusers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd/sysusers.nix b/nixos/modules/system/boot/systemd/sysusers.nix
index 8d401436daa1..98f93f25c54d 100644
--- a/nixos/modules/system/boot/systemd/sysusers.nix
+++ b/nixos/modules/system/boot/systemd/sysusers.nix
@@ -82,7 +82,7 @@ in
       (username: opts: {
         assertion = (opts.password == opts.initialPassword || opts.password == null) &&
           (opts.hashedPassword == opts.initialHashedPassword || opts.hashedPassword == null);
-        message = "${username} uses password or hashedPassword. systemd-sysupdate only supports initial passwords. It'll never update your passwords.";
+        message = "user '${username}' uses password or hashedPassword. systemd-sysupdate only supports initial passwords. It'll never update your passwords.";
       })
       systemUsers;
 

From 87054af7abe1b07e1df6587efe153e7ce5747b04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 17:29:05 +0000
Subject: [PATCH 042/135] argocd: 2.12.1 -> 2.12.2

---
 pkgs/applications/networking/cluster/argocd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix
index e74961dea391..5fa0342b2173 100644
--- a/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/pkgs/applications/networking/cluster/argocd/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "argocd";
-  version = "2.12.1";
+  version = "2.12.2";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
     rev = "v${version}";
-    hash = "sha256-mqFQdgzHjht3ipTdjE4IfG9wrV7GZtuvH8T2iosiHMs=";
+    hash = "sha256-dQ9YLqj+voovhZShgCz46cmjSDd5qLCjIcL/3YwwP0A=";
   };
 
   proxyVendor = true; # darwin/linux hash mismatch

From 1def8c96b0fa62a43044b0181cad61dc6157e40f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 24 Aug 2024 20:46:48 +0200
Subject: [PATCH 043/135] python312Packages.google-nest-sdm: 4.0.7 -> 5.0.0

Diff: https://github.com/allenporter/python-google-nest-sdm/compare/refs/tags/4.0.7...5.0.0

Changelog: https://github.com/allenporter/python-google-nest-sdm/releases/tag/5.0.0
---
 pkgs/development/python-modules/google-nest-sdm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix
index eac1c112d881..bf576a7e5423 100644
--- a/pkgs/development/python-modules/google-nest-sdm/default.nix
+++ b/pkgs/development/python-modules/google-nest-sdm/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "google-nest-sdm";
-  version = "4.0.7";
+  version = "5.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "allenporter";
     repo = "python-google-nest-sdm";
     rev = "refs/tags/${version}";
-    hash = "sha256-jnTsr29XRDvFEiHQxPMS419O0OB5z+Z17vl6g0K125s=";
+    hash = "sha256-1jN3X7Cxh2yX58Hup89bW16mc8F/C3CsUcz91FZHo70=";
   };
 
   build-system = [ setuptools ];

From 514bf5e8a57bca8e749599217ee8dc401badb42b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 18:49:55 +0000
Subject: [PATCH 044/135] python312Packages.pyhomeworks: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/development/python-modules/pyhomeworks/default.nix b/pkgs/development/python-modules/pyhomeworks/default.nix
index f21de3ee95dc..72b4c432de08 100644
--- a/pkgs/development/python-modules/pyhomeworks/default.nix
+++ b/pkgs/development/python-modules/pyhomeworks/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pyhomeworks";
-  version = "1.1.1";
+  version = "1.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-RwaVjOhMztQsKD+F++PLcwa0gqfC+8aQmloMVnQJjv8=";
+    hash = "sha256-Jq+rjhjmnPFNaEuCHyi+8i20RgLf1rpZg6QqwE7ax7M=";
   };
 
   postPatch = ''

From 689b78fa9270e88cf8be5fb53b311b83a6892f52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 18:55:16 +0000
Subject: [PATCH 045/135] python312Packages.aiortm: 0.8.18 -> 0.8.20

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

diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix
index bb75c7d70dc8..c330c7fb03db 100644
--- a/pkgs/development/python-modules/aiortm/default.nix
+++ b/pkgs/development/python-modules/aiortm/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "aiortm";
-  version = "0.8.18";
+  version = "0.8.20";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiortm";
     rev = "refs/tags/v${version}";
-    hash = "sha256-tQfTIbLOUNM5dFvQcz07D8Le+ZWUS60YGHaNyf5MK+0=";
+    hash = "sha256-W0o4RdaGExfTlTIndY3QUmqqeG2GA3pf3zeokY6xPvk=";
   };
 
   postPatch = ''

From 540be576d25190e50f78468582f5418e6e80d49d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 19:06:54 +0000
Subject: [PATCH 046/135] python312Packages.pyais: 2.7.1 -> 2.7.2

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

diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix
index 8b8d98d61318..d8a2da0da957 100644
--- a/pkgs/development/python-modules/pyais/default.nix
+++ b/pkgs/development/python-modules/pyais/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyais";
-  version = "2.7.1";
+  version = "2.7.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "M0r13n";
     repo = "pyais";
     rev = "refs/tags/v${version}";
-    hash = "sha256-EUbEVhriJAlxr4g+iPzeyftrF+qtdIqvvljKKihK3C8=";
+    hash = "sha256-itv5tVM8ff2gNUDGxY4aMKrpJVgfwPB/FWYog+CzJY4=";
   };
 
   build-system = [ setuptools ];

From 0f4c4c8baef2aab5da2ba23c9646d67bab82923d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 19:36:18 +0000
Subject: [PATCH 047/135] simdutf: 5.3.7 -> 5.4.15

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

diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix
index e64b70155a8e..42ee43f22ae3 100644
--- a/pkgs/by-name/si/simdutf/package.nix
+++ b/pkgs/by-name/si/simdutf/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "5.3.7";
+  version = "5.4.15";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-n99lt0OYK6OyLArdgPRabQ80ohQgHklpt9saDzKhvJw=";
+    hash = "sha256-oIrrI0Z5x1AvT9y0Ldg8zrkFJj1PZtebhJaL2UtEoB8=";
   };
 
   # Fix build on darwin

From 2b7da6f9dd3a7080370c326e42aca1b3c699fccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 24 Aug 2024 22:06:40 +0200
Subject: [PATCH 048/135] n8n: add update script

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

diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index f25979352c47..1ce619130f7d 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -13,6 +13,7 @@
   libmongocrypt,
   postgresql,
   makeWrapper,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -76,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests = nixosTests.n8n;
+    updateScript = nix-update-script { };
   };
 
   dontStrip = true;

From 629deacd20009b5848cf0e292e2eba1457aaa376 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 20:27:03 +0000
Subject: [PATCH 049/135] rio: 0.1.7 -> 0.1.8

---
 pkgs/applications/terminal-emulators/rio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix
index 879ed6facd20..64f98b3ddcd9 100644
--- a/pkgs/applications/terminal-emulators/rio/default.nix
+++ b/pkgs/applications/terminal-emulators/rio/default.nix
@@ -55,16 +55,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "rio";
-  version = "0.1.7";
+  version = "0.1.8";
 
   src = fetchFromGitHub {
     owner = "raphamorim";
     repo = "rio";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3isj4FvzJpheUi12oQRNBvOxR8daL/J4RUOGgYLeBXQ=";
+    hash = "sha256-NLvCLyIts3NoSqbR9PIhXj3GCeURrBXXv/zVgZecfNQ=";
   };
 
-  cargoHash = "sha256-T+lXgNsMmq6cvsNe96R3F13SbboRAdd11UHumksqx4A=";
+  cargoHash = "sha256-TvNmTI3At2ezsdEOd5mAc6uUQXgGP47d0AMVVUUJr/A=";
 
   nativeBuildInputs = [
     ncurses

From af3993b83faf0e0391daed5c4d033f56cd462ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 24 Aug 2024 23:25:07 +0200
Subject: [PATCH 050/135] n8n: 1.48.3 -> 1.55.3

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

diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index 1ce619130f7d..9c3ec6766294 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -18,18 +18,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "n8n";
-  version = "1.48.3";
+  version = "1.55.3";
 
   src = fetchFromGitHub {
     owner = "n8n-io";
     repo = "n8n";
     rev = "n8n@${finalAttrs.version}";
-    hash = "sha256-aCMbii5+iJ7m4P6Krr1/pcoH6fBsrFLtSjCx9DBYOeg=";
+    hash = "sha256-SgDw0je16Qf0ohzrVUjJM6FFovWxM2mvZjvfKkEESos=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-n1U5ftbB7BbiDIkZMVPG2ieoRBlJ+nPYFT3fNJRRTCI=";
+    hash = "sha256-KvSsWf1EHCQ46M4Z4wqyYb4mW9y9kNwB9e090YC1ZWs=";
   };
 
   nativeBuildInputs = [

From 43dd0ac922c28bb23e87d24666ba74c5178f8b25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 21:41:17 +0000
Subject: [PATCH 051/135] llama-cpp: 3565 -> 3620

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index bb651b3e4a27..06656848d47b 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -69,13 +69,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "3565";
+  version = "3620";
 
   src = fetchFromGitHub {
     owner = "ggerganov";
     repo = "llama.cpp";
     rev = "refs/tags/b${finalAttrs.version}";
-    hash = "sha256-eAsChIG30Oj5aFQyFDtyWqqT2PTgmdJ2jSrsi2UH+Gc=";
+    hash = "sha256-jZyMDNEppMxS+qinqJMU0VfjowzYrvCp5Mn0ub9x6NE=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From e417b040c0d389fb56dd5669352c7699514c0966 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 22:09:57 +0000
Subject: [PATCH 052/135] flex-ncat: 0.4-20240702 -> 0.4-20240817.1

---
 pkgs/applications/radio/flex-ncat/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/radio/flex-ncat/default.nix b/pkgs/applications/radio/flex-ncat/default.nix
index 61663376a02d..185f830aa6c6 100644
--- a/pkgs/applications/radio/flex-ncat/default.nix
+++ b/pkgs/applications/radio/flex-ncat/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "flex-ncat";
-  version = "0.4-20240702";
+  version = "0.4-20240817.1";
 
   src = fetchFromGitHub {
     owner = "kc2g-flex-tools";
     repo = "nCAT";
     rev = "v${version}";
-    hash = "sha256-ggSQnQfUzceucF2ZtNx6cHy4DW+gu91AdEHrvFciARE=";
+    hash = "sha256-OjivRCWSGdzko31KwiYb1FcIE+1W94XOYiE/GS4Ky3s=";
   };
 
-  vendorHash = "sha256-1i9v8Ej7TMIO+aMYFPFxdfD4b5j84/zkegaYb67WokU=";
+  vendorHash = "sha256-RqQMCP9rmdTG5AXLXkIQz0vE7qF+3RZ1BDdVRYoHHQs=";
 
   meta = with lib; {
     homepage = "https://github.com/kc2g-flex-tools/nCAT";

From a95566b58f9e0c56888624b8603736f3ebb81316 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 22:10:04 +0000
Subject: [PATCH 053/135] flex-ndax: 0.3-20230126.0 -> 0.4-20240818

---
 pkgs/applications/radio/flex-ndax/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/applications/radio/flex-ndax/default.nix
index d350d481b9f5..ff2aedf6005e 100644
--- a/pkgs/applications/radio/flex-ndax/default.nix
+++ b/pkgs/applications/radio/flex-ndax/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "flex-ndax";
-  version = "0.3-20230126.0";
+  version = "0.4-20240818";
 
   src = fetchFromGitHub {
     owner = "kc2g-flex-tools";
     repo = "nDAX";
     rev = "v${version}";
-    hash = "sha256-co2S3DrdGeoNneqNyifd+Z1z5TshyD+FgHkiSRqK3SQ=";
+    hash = "sha256-FCF22apO6uAc24H36SkvfKEKdyqY4l+j7ABdOnhZP6M=";
   };
 
   buildInputs = [ libpulseaudio ];
 
-  vendorHash = "sha256-eHy8oFYicVONQr31LQQ9b5auzeBoIzbszw2buKaBQbQ=";
+  vendorHash = "sha256-05LWJm4MoJqjJaFrBZvutKlqSTGl4dSp433AfHHO6LU=";
 
   meta = with lib; {
     broken = stdenv.isDarwin;

From fa94facb5ac422bd7b61ebeb107c010ff030a0b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 22:44:35 +0000
Subject: [PATCH 054/135] process-compose: 1.24.0 -> 1.24.2

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

diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix
index ebaa888baf9c..fe15d4b45e7b 100644
--- a/pkgs/applications/misc/process-compose/default.nix
+++ b/pkgs/applications/misc/process-compose/default.nix
@@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
 in
 buildGoModule rec {
   pname = "process-compose";
-  version = "1.24.0";
+  version = "1.24.2";
 
   src = fetchFromGitHub {
     owner = "F1bonacc1";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-CrirbzsPAoS6eNMCzQilWlLvZGm05ojkVYUiYVY/uHo=";
+    hash = "sha256-R+FkaCAI7Kkxd1UfdmeYo9BEUN0HUGZf2UDKxEvlTlQ=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;

From 500316c521c666c9ff079396c8239576a2a65807 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 22:45:23 +0000
Subject: [PATCH 055/135] steampipe: 0.23.3 -> 0.23.5

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

diff --git a/pkgs/by-name/st/steampipe/package.nix b/pkgs/by-name/st/steampipe/package.nix
index 0e009f769208..d37cc6066df3 100644
--- a/pkgs/by-name/st/steampipe/package.nix
+++ b/pkgs/by-name/st/steampipe/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "steampipe";
-  version = "0.23.3";
+  version = "0.23.5";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe";
     rev = "refs/tags/v${version}";
-    hash = "sha256-V8wy9Q3FU4Ts7cer3tkv3gQbHebje3XRgm+IOg3Xs+c=";
+    hash = "sha256-8Ca5PD4BlaNn+2sQOUCU1CcHr4C/L+IdFcbj4eE4Fzc=";
   };
 
-  vendorHash = "sha256-OVWgDVF2d+OYYCSn+UlSMTfIS+5nFeI2qY41DyX7y/A=";
+  vendorHash = "sha256-XpexUOUG8qw6Gb5galrnNIucheixHxT6astnI/6KIwE=";
   proxyVendor = true;
 
   postPatch = ''

From 5d9f2d7ccba6aba41ca0b4e88b030fdb5c608ce8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 22:47:59 +0000
Subject: [PATCH 056/135] cowsay: 3.8.2 -> 3.8.3

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

diff --git a/pkgs/by-name/co/cowsay/package.nix b/pkgs/by-name/co/cowsay/package.nix
index 4e277a0b64a0..98110ac4c1bc 100644
--- a/pkgs/by-name/co/cowsay/package.nix
+++ b/pkgs/by-name/co/cowsay/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cowsay";
-  version = "3.8.2";
+  version = "3.8.3";
 
   outputs = [
     "out"
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "cowsay-org";
     repo = "cowsay";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-IvodIoPrXI0D9pB95JPUBAIfxxnGDWl30P+WRf8VXIw=";
+    hash = "sha256-Bca+/a9jXsNnuBeYEjjtvZ1LsMMraLKiCn04CiS+uXU=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From f55a4b99ef73df3b17ae5e951198949a880cf3ab Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Sun, 25 Aug 2024 00:57:44 +0200
Subject: [PATCH 057/135] lib.meta: Minor SPDX license function improvements

- Expose `lib.licensesSpdx`
- Create bindings for the needed internal functions
- Mention that some SPDX licenses might be missing (in the future I hope
  we can autogenerate the Nixpkgs license list from some SPDX endpoint
---
 lib/default.nix |  3 ++-
 lib/meta.nix    | 14 +++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 63a31101eee7..0ff3a3980745 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -123,7 +123,8 @@ let
     inherit (self.derivations) lazyDerivation optionalDrvAttr;
     inherit (self.meta) addMetaAttrs dontDistribute setName updateName
       appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio
-      hiPrioSet getLicenseFromSpdxId getLicenseFromSpdxIdOr getExe getExe';
+      hiPrioSet licensesSpdx getLicenseFromSpdxId getLicenseFromSpdxIdOr
+      getExe getExe';
     inherit (self.filesystem) pathType pathIsDirectory pathIsRegularFile
       packagesFromDirectoryRecursive;
     inherit (self.sources) cleanSourceFilter
diff --git a/lib/meta.nix b/lib/meta.nix
index ddd062f38c47..57f3a46d0698 100644
--- a/lib/meta.nix
+++ b/lib/meta.nix
@@ -7,6 +7,7 @@
 
 let
   inherit (lib) matchAttrs any all isDerivation getBin assertMsg;
+  inherit (lib.attrsets) mapAttrs' filterAttrs;
   inherit (builtins) isString match typeOf;
 
 in
@@ -289,7 +290,8 @@ rec {
   /**
     Mapping of SPDX ID to the attributes in lib.licenses.
 
-    For SPDX IDs, see https://spdx.org/licenses
+    For SPDX IDs, see https://spdx.org/licenses.
+    Note that some SPDX licenses might be missing.
 
     # Examples
     :::{.example}
@@ -305,18 +307,19 @@ rec {
     :::
   */
   licensesSpdx =
-    lib.attrsets.mapAttrs'
+    mapAttrs'
     (_key: license: {
       name = license.spdxId;
       value = license;
     })
-    (lib.attrsets.filterAttrs (_key: license: license ? spdxId) lib.licenses);
+    (filterAttrs (_key: license: license ? spdxId) lib.licenses);
 
   /**
     Get the corresponding attribute in lib.licenses from the SPDX ID
     or warn and fallback to `{ shortName = <license string>; }`.
 
-    For SPDX IDs, see https://spdx.org/licenses
+    For SPDX IDs, see https://spdx.org/licenses.
+    Note that some SPDX licenses might be missing.
 
     # Type
 
@@ -351,7 +354,8 @@ rec {
     Get the corresponding attribute in lib.licenses from the SPDX ID
     or fallback to the given default value.
 
-    For SPDX IDs, see https://spdx.org/licenses
+    For SPDX IDs, see https://spdx.org/licenses.
+    Note that some SPDX licenses might be missing.
 
     # Inputs
 

From 5fb859397e12eb560e4f33c845937bd7bb002019 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 23:14:46 +0000
Subject: [PATCH 058/135] textlint: 14.1.0 -> 14.2.0

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

diff --git a/pkgs/by-name/te/textlint/package.nix b/pkgs/by-name/te/textlint/package.nix
index 3be970698e05..07dc3dd5d55b 100644
--- a/pkgs/by-name/te/textlint/package.nix
+++ b/pkgs/by-name/te/textlint/package.nix
@@ -28,13 +28,13 @@
 
 buildNpmPackage rec {
   pname = "textlint";
-  version = "14.1.0";
+  version = "14.2.0";
 
   src = fetchFromGitHub {
     owner = "textlint";
     repo = "textlint";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/pXUqpQ3cRjcwZAfBVpf9K9JsPmxB9iX8p64iE/n/68=";
+    hash = "sha256-KNOloSc66IX8GApI5JJ7z2DxPthOaZ3xpw0rlmAgIXc=";
   };
 
   patches = [
@@ -44,7 +44,7 @@ buildNpmPackage rec {
     ./remove-workspaces.patch
   ];
 
-  npmDepsHash = "sha256-FnDKPLhf9OxwRrrBJgejp4X13FGEI317yTgI3tA5cX8=";
+  npmDepsHash = "sha256-/m37+odnYsegls2JamkQsHT39/APynppQiTMtRh3ycE=";
 
   nativeBuildInputs =
     [

From 02454d2dcaaf59ad219d5fe0fc1c2d3c91da9afd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 23:15:26 +0000
Subject: [PATCH 059/135] twitch-tui: 2.6.15 -> 2.6.16

---
 .../networking/instant-messengers/twitch-tui/default.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix
index 9e25012697af..31ef96cf80c6 100644
--- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix
+++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "twitch-tui";
-  version = "2.6.15";
+  version = "2.6.16";
 
   src = fetchFromGitHub {
     owner = "Xithrius";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-nuGfdhwlT47gdTu1FbXKOnyBmkvATuL930U0AYgMEUY=";
+    hash = "sha256-QWIy+gAW42tJhmNIj6UThVedIrfAFdlatD71BoKZC4s=";
   };
 
-  cargoHash = "sha256-C15d6XrqQYaVBklR+sfYGB974cPkSTcNRh50X4GEIzI=";
+  cargoHash = "sha256-eR21I7xWUyImF30p4M+NwMrxRemrECLcGh8U6wKnp7E=";
 
   nativeBuildInputs = [
     pkg-config

From d72c727fcf3f70def5e6f1f495088cf45f359b3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 25 Aug 2024 01:40:03 +0200
Subject: [PATCH 060/135] n8n: make deterministic, decrease closure size

---
 pkgs/by-name/n8/n8n/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index 9c3ec6766294..11f59068bd55 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -60,6 +60,16 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postBuild
   '';
 
+  preInstall = ''
+    echo "Removing non-deterministic files"
+
+    rm -r $(find -type d -name .turbo)
+    rm node_modules/.modules.yaml
+    rm packages/nodes-base/dist/types/nodes.json
+
+    echo "Removed non-deterministic files"
+  '';
+
   installPhase = ''
     runHook preInstall
 
@@ -72,9 +82,6 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  # makes libmongocrypt bindings not look for static libraries in completely wrong places
-  BUILD_TYPE = "dynamic";
-
   passthru = {
     tests = nixosTests.n8n;
     updateScript = nix-update-script { };

From 047bcbcca5eeb81573fefd3ec0b6e7456de988af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 00:47:04 +0000
Subject: [PATCH 061/135] v2ray-domain-list-community: 20240817092737 ->
 20240823035651

---
 pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix
index 2c1d71a61644..92fecc9ca031 100644
--- a/pkgs/data/misc/v2ray-domain-list-community/default.nix
+++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix
@@ -3,12 +3,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20240817092737";
+    version = "20240823035651";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-RQl7tRY2eQcepthFXwzVMPQtFsVDih++VnMBHR4Tink=";
+      hash = "sha256-2tUs3+CXpBJ1/PHxXwIjv6srOEN2f+1G+ST3/vuOXLQ=";
     };
     vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg=";
     meta = with lib; {

From 1a65683645af4b76f8bc4f843b31a0d7ff497608 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 00:48:59 +0000
Subject: [PATCH 062/135] cargo-mobile2: 0.13.2 -> 0.14.0

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

diff --git a/pkgs/development/tools/rust/cargo-mobile2/default.nix b/pkgs/development/tools/rust/cargo-mobile2/default.nix
index 752d25c8ed7e..adcd4f54d267 100644
--- a/pkgs/development/tools/rust/cargo-mobile2/default.nix
+++ b/pkgs/development/tools/rust/cargo-mobile2/default.nix
@@ -12,7 +12,7 @@
 let
   inherit (darwin.apple_sdk.frameworks) CoreServices;
   pname = "cargo-mobile2";
-  version = "0.13.2";
+  version = "0.14.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -20,14 +20,14 @@ rustPlatform.buildRustPackage {
     owner = "tauri-apps";
     repo = pname;
     rev = "cargo-mobile2-v${version}";
-    hash = "sha256-skGvWvfJRpoDjl8VMViFtyskzhpVsDZBksb7sr8ba7I=";
+    hash = "sha256-niUovhdM3eXDKiQTISttxCJ+vcPxqTOdkcHR0oP0A2w=";
   };
 
   # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
   # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
   # sourceRoot = "${src.name}/tooling/cli";
 
-  cargoHash = "sha256-OoqTqMZ1qxnq4nfKR38oWfH238W7M8u+zFbh34aCxXk=";
+  cargoHash = "sha256-oIPMBy6oG4PYxi7iSDNelsFK8ChGfyYNpA5p3GgaD9w=";
 
   preBuild = ''
     mkdir -p $out/share/

From 7579b91c71f892167fd3df5af0914a0572590c57 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 01:09:48 +0000
Subject: [PATCH 063/135] leetcode-cli: 0.4.3 -> 0.4.5

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

diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/applications/misc/leetcode-cli/default.nix
index 9bc7c7cbe34a..3cca48b24c61 100644
--- a/pkgs/applications/misc/leetcode-cli/default.nix
+++ b/pkgs/applications/misc/leetcode-cli/default.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "leetcode-cli";
-  version = "0.4.3";
+  version = "0.4.5";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-y5zh93WPWSMDXqYangqrxav+sC0b0zpFIp6ZIew6KMo=";
+    hash = "sha256-Jc0akHj2DHbkF7sjslOwdeI1piW2gnhoalBz18lpQdQ=";
   };
 
-  cargoHash = "sha256-VktDiLsU+GOsa6ba9JJZGEPTavSKp+aSZm2dfhPEqMs=";
+  cargoHash = "sha256-t3u82bjO1Qv32TwpZNCaaEqOVajXIgM7VBNQ4UjMcl8=";
 
   nativeBuildInputs = [
     pkg-config

From b2bbae83d5284d8f23be365746e711771e4127bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 01:16:48 +0000
Subject: [PATCH 064/135] nanoflann: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix
index 811f86b8b749..b10121d23925 100644
--- a/pkgs/development/libraries/nanoflann/default.nix
+++ b/pkgs/development/libraries/nanoflann/default.nix
@@ -6,14 +6,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.6.0";
+  version = "1.6.1";
   pname = "nanoflann";
 
   src = fetchFromGitHub {
     owner = "jlblancoc";
     repo = "nanoflann";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-oAy9/PjYTtnhD+zrMGgYPhjHwE5O7nB0j+1obbAymq8=";
+    hash = "sha256-likFHzaP/1yYfr6+rDWM2+YEKOk5G5P8UFC3xb2bEOo=";
   };
 
   nativeBuildInputs = [ cmake ];

From 16daf828167ca343ab0943e733a00e1140677c71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 01:37:31 +0000
Subject: [PATCH 065/135] pipx: 1.7.0 -> 1.7.1

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

diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix
index beac5ebe5607..052ef15fc373 100644
--- a/pkgs/development/python-modules/pipx/default.nix
+++ b/pkgs/development/python-modules/pipx/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pipx";
-  version = "1.7.0";
+  version = "1.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "pypa";
     repo = "pipx";
     rev = "refs/tags/${version}";
-    hash = "sha256-FO2cAxc+yM/eVbLza2JgRJyHNf2AcId+k13FSOPUpUE=";
+    hash = "sha256-diHWzrSpXWbNosXKN5nj2FM09HicDhHWKxQDXc+AZ4o=";
   };
 
   build-system = [

From c6b45b1dadc9f041c682ecef84b01e2ab752126f Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Sat, 24 Aug 2024 14:58:51 -0700
Subject: [PATCH 066/135] python3Packages.scalene: 1.5.43.2 -> 1.5.44.1

---
 .../scalene/01-manifest-no-git.patch          | 23 +++++++
 .../02-pyproject-unpin-setuptools.patch       | 23 +++++++
 .../python-modules/scalene/default.nix        | 60 +++++++++++++++----
 3 files changed, 96 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/python-modules/scalene/01-manifest-no-git.patch
 create mode 100644 pkgs/development/python-modules/scalene/02-pyproject-unpin-setuptools.patch

diff --git a/pkgs/development/python-modules/scalene/01-manifest-no-git.patch b/pkgs/development/python-modules/scalene/01-manifest-no-git.patch
new file mode 100644
index 000000000000..85f4bf7e86b4
--- /dev/null
+++ b/pkgs/development/python-modules/scalene/01-manifest-no-git.patch
@@ -0,0 +1,23 @@
+From 4e25ccee2f1eeed1dfdd9356b4fde511a48d9f01 Mon Sep 17 00:00:00 2001
+From: Sarah Clark <seclark@nextquestion.net>
+Date: Sat, 24 Aug 2024 11:32:38 -0700
+Subject: [PATCH] Update MANIFEST.in to remove .git references
+
+---
+ MANIFEST.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/MANIFEST.in b/MANIFEST.in
+index 5ebcb7781..7340b1982 100644
+--- a/MANIFEST.in
++++ b/MANIFEST.in
+@@ -1,5 +1,5 @@
+ graft vendor/Heap-Layers
+-prune vendor/Heap-Layers/.git
++# prune vendor/Heap-Layers/.git
+ graft vendor/printf
+-prune vendor/printf/.git
++# prune vendor/printf/.git
+ exclude scalene/old/*
+
+--
diff --git a/pkgs/development/python-modules/scalene/02-pyproject-unpin-setuptools.patch b/pkgs/development/python-modules/scalene/02-pyproject-unpin-setuptools.patch
new file mode 100644
index 000000000000..80ab0080e631
--- /dev/null
+++ b/pkgs/development/python-modules/scalene/02-pyproject-unpin-setuptools.patch
@@ -0,0 +1,23 @@
+From 777be9c46c4caed5f3fcde65b70ada4d773f4298 Mon Sep 17 00:00:00 2001
+From: Sarah Clark <seclark@nextquestion.net>
+Date: Sat, 24 Aug 2024 11:26:30 -0700
+Subject: [PATCH] Unpin setuptools
+
+---
+ pyproject.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index d17d12dc8..6bf1c7a38 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -54,7 +54,7 @@ scalene = "scalene.__main__:main"
+ [build-system]
+ build-backend = "setuptools.build_meta"
+ requires = [
+-    "setuptools>=65.5.1,<71.0", # Pin to setuptools<71.0 to avoid this bug: https://github.com/pypa/setuptools/issues/4496
++    "setuptools>=65.5.1",
+     "setuptools_scm>=8",
+     "wheel",
+     "cython",
+--
diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix
index 6f5adae67d84..820de7be473b 100644
--- a/pkgs/development/python-modules/scalene/default.nix
+++ b/pkgs/development/python-modules/scalene/default.nix
@@ -2,33 +2,67 @@
   lib,
   stdenv,
   buildPythonPackage,
-  hypothesis,
-  fetchPypi,
-  setuptools,
-  setuptools-scm,
+  fetchFromGitHub,
   cloudpickle,
   cython,
+  hypothesis,
   jinja2,
   numpy,
+  nvidia-ml-py,
   psutil,
   pynvml,
-  nvidia-ml-py,
   pytestCheckHook,
   pythonOlder,
   rich,
+  setuptools-scm,
+  setuptools,
 }:
 
+let
+  heap-layers-src = fetchFromGitHub {
+    owner = "emeryberger";
+    repo = "heap-layers";
+    name = "Heap-Layers";
+    rev = "a2048eae91b531dc5d72be7a194e0b333c06bd4c";
+    sha256 = "sha256-vl3z30CBX7hav/DM/UE0EQ9lLxZF48tMJrYMXuSulyA=";
+  };
+
+  printf-src = fetchFromGitHub {
+    owner = "mpaland";
+    repo = "printf";
+    name = "printf";
+    rev = "v4.0.0";
+    sha256 = "sha256-tgLJNJw/dJGQMwCmfkWNBvHB76xZVyyfVVplq7aSJnI=";
+  };
+in
+
 buildPythonPackage rec {
   pname = "scalene";
-  version = "1.5.43.2";
+  version = "1.5.44.1";
   pyproject = true;
   disabled = pythonOlder "3.9";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-LtD7v3pLz4UCnh6xlhkPdcEjyu3mt+YQPYZ0nNCLuDw=";
+  src = fetchFromGitHub {
+    owner = "plasma-umass";
+    repo = "scalene";
+    rev = "v${version}";
+    hash = "sha256-XMz+gwiNaKiKplD4kOE1yhcg+dkzjEdDYjW0JsDEMQE=";
   };
 
+  patches = [
+    ./01-manifest-no-git.patch
+    ./02-pyproject-unpin-setuptools.patch
+  ];
+
+  prePatch = ''
+    cp -r ${heap-layers-src} vendor/Heap-Layers
+    mkdir vendor/printf
+    cp ${printf-src}/printf.c vendor/printf/printf.cpp
+    cp -r ${printf-src}/* vendor/printf
+    sed -i"" 's/^#define printf printf_/\/\/&/' vendor/printf/printf.h
+    sed -i"" 's/^#define vsnprintf vsnprintf_/\/\/&/' vendor/printf/printf.h
+  '';
+
   nativeBuildInputs = [
     cython
     setuptools
@@ -38,9 +72,10 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     cloudpickle
     jinja2
+    numpy
     psutil
-    rich
     pynvml
+    rich
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [ nvidia-ml-py ];
 
   pythonRemoveDeps = [
@@ -56,6 +91,11 @@ buildPythonPackage rec {
     numpy
   ];
 
+  disabledTests = [
+    # Flaky -- socket collision
+    "test_show_browser"
+  ];
+
   # remove scalene directory to prevent pytest import confusion
   preCheck = ''
     rm -rf scalene

From 1daf7604f7ed9846254a5bcb9b33c7723a952e01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 02:14:03 +0000
Subject: [PATCH 067/135] python312Packages.peaqevcore: 19.10.24 -> 19.11.0

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

diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix
index 3f23d3aaffa5..38619f184f30 100644
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "peaqevcore";
-  version = "19.10.24";
+  version = "19.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jpJVYANreHUW6vclkdNdnaFb/QxFfJf0nuTBl3K3qBY=";
+    hash = "sha256-SVLyapbp9pNEznLetOppzmIc9fQuZF1MSfLsWVwIVGQ=";
   };
 
   postPatch = ''

From 31ca1626197ccf2d2a73ce4057de363e32fd9112 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 24 Aug 2024 20:23:28 -0600
Subject: [PATCH 068/135] vscode-extensions.leonardssh.vscord: 5.2.12 -> 5.2.13

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index dee4e0b12f8d..df4efbc5f2f7 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2846,8 +2846,8 @@ let
         mktplcRef = {
           name = "vscord";
           publisher = "leonardssh";
-          version = "5.2.12";
-          hash = "sha256-WGDEizYG6UAqe1jnhvjfFouXDA9Yr5P+BjxPahAIsTE=";
+          version = "5.2.13";
+          hash = "sha256-Jgm3ekXFLhylX7RM6tdfi+lRLrcl4UQGmRHbr27M59M=";
         };
         meta = {
           description = "Highly customizable Discord Rich Presence extension for Visual Studio Code";

From cd71eb1fc563818682c259cac602f5a07c6334a6 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 24 Aug 2024 20:26:20 -0600
Subject: [PATCH 069/135] vscode-extensions.leonardssh.vscord: add ryand56 as
 maintainer

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index df4efbc5f2f7..1e32a3dcc8d4 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2853,6 +2853,7 @@ let
           description = "Highly customizable Discord Rich Presence extension for Visual Studio Code";
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=leonardssh.vscord";
           homepage = "https://github.com/leonardssh/vscord";
+          maintainers = [ lib.maintainers.ryand56 ];
           license = lib.licenses.mit;
         };
       };

From f353a3c621d59aaf48ca87bf1136e747f5189958 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 02:26:25 +0000
Subject: [PATCH 070/135] resumed: 3.0.1 -> 4.0.0

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

diff --git a/pkgs/applications/misc/resumed/default.nix b/pkgs/applications/misc/resumed/default.nix
index e1f6928dcdbb..81550925368e 100644
--- a/pkgs/applications/misc/resumed/default.nix
+++ b/pkgs/applications/misc/resumed/default.nix
@@ -2,16 +2,16 @@
 
 buildNpmPackage rec {
   pname = "resumed";
-  version = "3.0.1";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "rbardini";
     repo = "resumed";
     rev = "v${version}";
-    hash = "sha256-X1efWl0CjbEbhNfDUNvb5SCc2exfI8v95gzqcaKU5eU=";
+    hash = "sha256-XaEK41UBKUldjRlxTzc42K/RwZ9D8kueU/6dm8n1W1U=";
   };
 
-  npmDepsHash = "sha256-b8NeO0w2UH1wEifDCkl8L48LoJM0jLStE0fO9G438dU=";
+  npmDepsHash = "sha256-r0wq1KGZA5b4eIQsp+dz8Inw8AQA62BK7vgfYlViIrY=";
 
   meta = with lib; {
     description = "Lightweight JSON Resume builder, no-frills alternative to resume-cli";

From f39dc4251be0e711f580e76e0c52944e539f931d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 02:35:49 +0000
Subject: [PATCH 071/135] svu: 2.1.1 -> 2.2.0

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

diff --git a/pkgs/tools/misc/svu/default.nix b/pkgs/tools/misc/svu/default.nix
index ddb2898215ac..15cbe3a2792c 100644
--- a/pkgs/tools/misc/svu/default.nix
+++ b/pkgs/tools/misc/svu/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "svu";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "caarlos0";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-rAaLboa6LXpOrZs5b0T6YSysYwBl96aR/enUUpfSU5M=";
+    sha256 = "sha256-C5ATwRsi9hJBO9xFlyMDoxu97rJHwcKNToWhcmx6M6g=";
   };
 
   vendorHash = "sha256-/FSvNoVDWAkQs09gMrqyoA0su52nlk/nSCYRAhQhbwQ=";

From b258ab7b926ab237e1390de190f90efa5b19dcba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 02:40:18 +0000
Subject: [PATCH 072/135] spicetify-cli: 2.37.1 -> 2.37.2

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

diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix
index 585be1e95121..b6f81081146f 100644
--- a/pkgs/by-name/sp/spicetify-cli/package.nix
+++ b/pkgs/by-name/sp/spicetify-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "spicetify-cli";
-  version = "2.37.1";
+  version = "2.37.2";
 
   src = fetchFromGitHub {
     owner = "spicetify";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-YX3Fbeup2xYcaKEm/tQudE7tYsqO2n4BScSIZ8CqVQ4=";
+    hash = "sha256-SXHLkXOaHtgd4V+nzMbLw9mXZ3HeUbyqlnL7KwiyAXo=";
   };
 
   vendorHash = "sha256-kv+bMyVOJTztn8mNNTK/kp4nvc5m1I5M041s3nPpob8=";

From 6eff98293278b4502539bc5fad6c25caa8afa6fc Mon Sep 17 00:00:00 2001
From: zendo <linzway@qq.com>
Date: Sun, 25 Aug 2024 10:55:15 +0800
Subject: [PATCH 073/135] deploy-rs: move to by-name

---
 .../default.nix => by-name/de/deploy-rs/package.nix}       | 7 +++----
 pkgs/top-level/all-packages.nix                            | 4 ----
 2 files changed, 3 insertions(+), 8 deletions(-)
 rename pkgs/{tools/package-management/deploy-rs/default.nix => by-name/de/deploy-rs/package.nix} (87%)

diff --git a/pkgs/tools/package-management/deploy-rs/default.nix b/pkgs/by-name/de/deploy-rs/package.nix
similarity index 87%
rename from pkgs/tools/package-management/deploy-rs/default.nix
rename to pkgs/by-name/de/deploy-rs/package.nix
index ad656ca385e4..08d83e701d0d 100644
--- a/pkgs/tools/package-management/deploy-rs/default.nix
+++ b/pkgs/by-name/de/deploy-rs/package.nix
@@ -2,8 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , rustPlatform
-, CoreServices
-, SystemConfiguration
+, darwin
 }:
 
 rustPlatform.buildRustPackage {
@@ -20,8 +19,8 @@ rustPlatform.buildRustPackage {
   cargoHash = "sha256-Vo/45cZM/sBAaoikhEwCvduhMQjurwSZwCjwrIQn7IA=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
-    CoreServices
-    SystemConfiguration
+    darwin.apple_sdk.frameworks.CoreServices
+    darwin.apple_sdk.frameworks.SystemConfiguration
   ];
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff352964cc01..95c66ea41521 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -38122,10 +38122,6 @@ with pkgs;
 
   dell-530cdn = callPackage ../misc/drivers/dell-530cdn { };
 
-  deploy-rs = callPackage ../tools/package-management/deploy-rs {
-    inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration;
-  };
-
   dockutil = callPackage ../os-specific/darwin/dockutil { };
 
   eiciel = callPackage ../tools/filesystems/eiciel { };

From 62e324c76d24db0bccb2d1521e4a440ceca06b05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 03:13:44 +0000
Subject: [PATCH 074/135] dolt: 1.42.13 -> 1.42.14

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

diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index 2cf4c8e4c26c..1cc5a99c51c1 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/pkgs/servers/sql/dolt/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "dolt";
-  version = "1.42.13";
+  version = "1.42.14";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     rev = "v${version}";
-    sha256 = "sha256-K07cs9f7g9tDyPLChx21gYvFLYis2ZKfSlOsoz4YxFM=";
+    sha256 = "sha256-KcaYoQgSDcALmYBtIKgE+C/Nmm+FrwV36bJ1EyQ4UoA=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" ];
-  vendorHash = "sha256-jaRZLLUk3ZeTZS1GDChJbpmRhavwn8iG7kF08KMB5KE=";
+  vendorHash = "sha256-OU6b4h+sLN/9kdLGM3f9Are3sbBGqUxKAsSBph4jxVM=";
   proxyVendor = true;
   doCheck = false;
 

From 93fc93def0f78f772cab176825579a448ed7a641 Mon Sep 17 00:00:00 2001
From: zendo <linzway@qq.com>
Date: Sun, 25 Aug 2024 11:25:36 +0800
Subject: [PATCH 075/135] deploy-rs: unstable-2024-02-16 ->
 0-unstable-2024-06-12

---
 pkgs/by-name/de/deploy-rs/package.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/de/deploy-rs/package.nix b/pkgs/by-name/de/deploy-rs/package.nix
index 08d83e701d0d..9830785e6a30 100644
--- a/pkgs/by-name/de/deploy-rs/package.nix
+++ b/pkgs/by-name/de/deploy-rs/package.nix
@@ -1,33 +1,34 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, rustPlatform
-, darwin
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  darwin,
 }:
 
 rustPlatform.buildRustPackage {
   pname = "deploy-rs";
-  version = "unstable-2024-02-16";
+  version = "0-unstable-2024-06-12";
 
   src = fetchFromGitHub {
     owner = "serokell";
     repo = "deploy-rs";
-    rev = "0a0187794ac7f7a1e62cda3dabf8dc041f868790";
-    hash = "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE=";
+    rev = "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a";
+    hash = "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=";
   };
 
-  cargoHash = "sha256-Vo/45cZM/sBAaoikhEwCvduhMQjurwSZwCjwrIQn7IA=";
+  cargoHash = "sha256-lsW810bktMzHZIbuN3pz9N+IUcjNtE5J2AuB/G6pGWI=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.CoreServices
     darwin.apple_sdk.frameworks.SystemConfiguration
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Multi-profile Nix-flake deploy tool";
     homepage = "https://github.com/serokell/deploy-rs";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ teutat3s ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ teutat3s ];
     mainProgram = "deploy";
   };
 }

From 448c32f75aaee222908abd3a8ec84172b3f040bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 03:42:54 +0000
Subject: [PATCH 076/135] wine-staging: 9.15 -> 9.16

---
 pkgs/applications/emulators/wine/sources.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index 8f311b6c3b83..329ff8cb31e3 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -69,9 +69,9 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the hash for staging as well.
-    version = "9.15";
+    version = "9.16";
     url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
-    hash = "sha256-ea3vQ23WjdvXAXhnCjwjqpjor9VUCsD0I0WJTEWLeN0=";
+    hash = "sha256-iQQq6MgLIzP4p9GId/xBecB9Y1erfyjMvabQbzwzDFA=";
     inherit (stable) patches;
 
     ## see http://wiki.winehq.org/Gecko
@@ -88,9 +88,9 @@ in rec {
 
     ## see http://wiki.winehq.org/Mono
     mono = fetchurl rec {
-      version = "9.2.0";
+      version = "9.3.0";
       url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
-      hash = "sha256-/VgpJE2SmFuKQEdFrd21jDqbC7ttVMpMbq+G6kZnNfk=";
+      hash = "sha256-bKLArtCW/57CD69et2xrfX3oLZqIdax92fB5O/nD/TA=";
     };
 
     updateScript = writeShellScript "update-wine-unstable" ''
@@ -117,7 +117,7 @@ in rec {
   staging = fetchFromGitLab rec {
     # https://gitlab.winehq.org/wine/wine-staging
     inherit (unstable) version;
-    hash = "sha256-ss0B1MsDd37xTTFT86bEfVOt5mEAuHj14rTnGboO9i8=";
+    hash = "sha256-CUVUatw9SH/LwYwloGHsU8TFjAVQRhd3WBk4AP+2NH4=";
     domain = "gitlab.winehq.org";
     owner = "wine";
     repo = "wine-staging";

From 46a4adbd673a0c48a2dbbe949af1083f0bf7befa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 04:33:20 +0000
Subject: [PATCH 077/135] iosevka: 31.3.0 -> 31.4.0

---
 pkgs/data/fonts/iosevka/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index b2c11344cb14..f7547715abc9 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "31.3.0";
+  version = "31.4.0";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-WrRxVrBJeyUwv0/DYTIHLi52+k2PilC7ay0tc5yq3Pw=";
+    hash = "sha256-qcxsuDk7hcVFsHB/Uj013gTOp9IGfp5cF1BLVbmH9AA=";
   };
 
-  npmDepsHash = "sha256-xw0GA1aIA/J5hfLQBSE+GJzXfbfWQI2k2pYdenlM9NY=";
+  npmDepsHash = "sha256-bhj5q3HEtSdB5LA6IhBCo4XJwc6a3CUrHaV+d1vcj+I=";
 
   nativeBuildInputs = [
     remarshal

From 9f796ed55e22fbb441f8ad2ff8c5d2892ae88945 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 9 May 2024 18:30:06 -0400
Subject: [PATCH 078/135] libbluray: fix withJava
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It builds okay without this, but doesn’t actually work. Was removed in
616f7e3b7e9287ac309f1d397d76aebe22b02d4e.
---
 pkgs/development/libraries/libbluray/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index f50172851d61..672908281b0e 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = lib.optional withAACS libaacs;
 
+  env.JAVA_HOME = lib.optionalString withJava jdk17.home; # Fails at runtime without this
   env.NIX_LDFLAGS = lib.optionalString withAACS "-L${libaacs}/lib -laacs"
     + lib.optionalString withBDplus " -L${libbdplus}/lib -lbdplus";
 

From d1938c997c15b60cdc02506abc9870480bc19de0 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 22 Aug 2024 11:38:34 -0400
Subject: [PATCH 079/135] blender: 4.2.0 -> 4.2.1

Changelog: https://www.blender.org/download/lts/4-2/
---
 pkgs/applications/misc/blender/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index d400dd1eba55..4539199d4eeb 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -100,13 +100,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "blender";
-  version = "4.2.0";
+  version = "4.2.1";
 
   srcs = [
     (fetchzip {
       name = "source";
       url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
-      hash = "sha256-STG4IuEhkdA+sDPIpCAkSflyd3rSUZ9ZCS9PdB4vyTY=";
+      hash = "sha256-+Y4JbzeK+30fO8WdEmvjOeQjm094ofsUhRFXs9mkcxI=";
     })
     (fetchgit {
       name = "assets";

From 9218a080e977c101fb1e237b7fa9c5d846192bb0 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 22 Aug 2024 11:44:47 -0400
Subject: [PATCH 080/135] blender: add myself as maintainer

Have done quite a few commits to this package, and most of the recent
bumps, so I suppose it makes sense, especially given only one
maintainer currently.
---
 pkgs/applications/misc/blender/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 4539199d4eeb..25e9388307b6 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -427,7 +427,10 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     # the current apple sdk is too old (currently 11_0) and fails to build "metal" on x86_64-darwin
     broken = stdenv.hostPlatform.system == "x86_64-darwin";
-    maintainers = with lib.maintainers; [ veprbl ];
+    maintainers = with lib.maintainers; [
+      amarshall
+      veprbl
+    ];
     mainProgram = "blender";
   };
 })

From a25f25f7521c4e67e942a0726c0fcef10b3a0b81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 06:10:49 +0000
Subject: [PATCH 081/135] libretro.play: unstable-2024-08-16 ->
 unstable-2024-08-23

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..9a4baa2e54ed 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -652,11 +652,11 @@
         "src": {
             "owner": "jpd002",
             "repo": "Play-",
-            "rev": "92a11bf45c192300415e14d95da7a442ffc1f71c",
-            "hash": "sha256-5bErkTiFIFkRqk+NLLujPgGLkPjX2hgHarO4K3fIrKM=",
+            "rev": "fa204246a09b28adc0fbf6b414e50c8e443322ba",
+            "hash": "sha256-xFpT8Vx4I1DiEITaYahLfBxkC2lFLcxBB8zdQSfVDxg=",
             "fetchSubmodules": true
         },
-        "version": "unstable-2024-08-16"
+        "version": "unstable-2024-08-23"
     },
     "ppsspp": {
         "fetcher": "fetchFromGitHub",

From 053b00b5636bad30fd4d3cd7bf64fbc841a63e3e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 06:16:28 +0000
Subject: [PATCH 082/135] libretro.mupen64plus: unstable-2024-08-13 ->
 unstable-2024-08-21

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..194f3454ff8c 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -540,10 +540,10 @@
         "src": {
             "owner": "libretro",
             "repo": "mupen64plus-libretro-nx",
-            "rev": "af797557b0e6d339d047b43f73d0ade021da1637",
-            "hash": "sha256-P/AqgijQ8rHTMM3X/9ZjDG5/1NGS51dZYlLy4cEYbng="
+            "rev": "c2f6acfe3b7b07ab86c3e4cd89f61a9911191793",
+            "hash": "sha256-yV67rr0eIBdBU/quTCXasnFXy5MCO77rtvdd8DuVWIY="
         },
-        "version": "unstable-2024-08-13"
+        "version": "unstable-2024-08-21"
     },
     "neocd": {
         "fetcher": "fetchFromGitHub",

From 3817ab64275d1ec61ee51d454c9af8b1a2391912 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 06:30:54 +0000
Subject: [PATCH 083/135] libretro.beetle-psx-hw: unstable-2024-08-16 ->
 unstable-2024-08-23

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..07477762e53f 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -85,10 +85,10 @@
         "src": {
             "owner": "libretro",
             "repo": "beetle-psx-libretro",
-            "rev": "b47a157182ca02af988363f472446ee40f18597b",
-            "hash": "sha256-c49AARmoMxFI7RGPCAGLVyouyQ/E8mYqeWehs41uLmo="
+            "rev": "208ba3fe105835ac4ce1d12e728a4a1579e8f955",
+            "hash": "sha256-nT+MsN1NQOkBIUiuxP+pos/MhgOrkkDDQPvpjmMMYP4="
         },
-        "version": "unstable-2024-08-16"
+        "version": "unstable-2024-08-23"
     },
     "beetle-saturn": {
         "fetcher": "fetchFromGitHub",

From a9707c2b0a914618187871b4a1e32667c4627173 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 06:31:12 +0000
Subject: [PATCH 084/135] libretro.pcsx-rearmed: unstable-2024-08-16 ->
 unstable-2024-08-22

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..19ed347753df 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -631,10 +631,10 @@
         "src": {
             "owner": "libretro",
             "repo": "pcsx_rearmed",
-            "rev": "89a8e88a616301c0cec4cbfebf96301ce9d5244c",
-            "hash": "sha256-Y+vR3a891qRsnY7A3UTF6LHle/3M/OAIU6N0VXinbkg="
+            "rev": "8847df50c67c19c605f60a109d30556b74d08eee",
+            "hash": "sha256-5Od39zhtkmWBbesHDLBcm2/7Oa91vhsqflDfUKFzST4="
         },
-        "version": "unstable-2024-08-16"
+        "version": "unstable-2024-08-22"
     },
     "picodrive": {
         "fetcher": "fetchFromGitHub",

From f03c3d994ea2a4a7faef2367eb0c9b8ba7a59334 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 06:31:29 +0000
Subject: [PATCH 085/135] libretro.stella: unstable-2024-08-16 ->
 unstable-2024-08-24

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..36603d44241e 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -794,10 +794,10 @@
         "src": {
             "owner": "stella-emu",
             "repo": "stella",
-            "rev": "d64ff2e5b7cb202155b2782b55c8d359c2a9c8ce",
-            "hash": "sha256-aKqOLmFpWLxHeXVq/YP/xinnpKhDPFlgA2FEnSZjftU="
+            "rev": "e89cf0b15b4a53064f542bb7a8315ad5137febe0",
+            "hash": "sha256-YST/9us1+oz4EwNtOtUyhO/1XPVGHD717Il+26JZzAk="
         },
-        "version": "unstable-2024-08-16"
+        "version": "unstable-2024-08-24"
     },
     "stella2014": {
         "fetcher": "fetchFromGitHub",

From 5c80024baf8c8ed93199aff7f18f4d47a5e5e54e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 06:33:41 +0000
Subject: [PATCH 086/135] libretro.beetle-pce: unstable-2024-08-09 ->
 unstable-2024-08-23

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..078fffdae881 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -55,10 +55,10 @@
         "src": {
             "owner": "libretro",
             "repo": "beetle-pce-libretro",
-            "rev": "d921176765d58da24d555bc02b73411a89b73976",
-            "hash": "sha256-0ak0n6FdHBCe+WDGkAuvmrIix8xiMqe2bnpMNt/VcDg="
+            "rev": "f6613f4b26e04e9769a0c872cdac13f9dfaa61c8",
+            "hash": "sha256-ugJDgzpH1cvLgK3boLe502vwkY4clA5IeU3jxeG5vqM="
         },
-        "version": "unstable-2024-08-09"
+        "version": "unstable-2024-08-23"
     },
     "beetle-pce-fast": {
         "fetcher": "fetchFromGitHub",

From 0cb13e7966c3b460514fd4fc7477abb84a4f34e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 07:08:49 +0000
Subject: [PATCH 087/135] libretro.ppsspp: unstable-2024-08-15 ->
 unstable-2024-08-24

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..a68f1083b013 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -663,11 +663,11 @@
         "src": {
             "owner": "hrydgard",
             "repo": "ppsspp",
-            "rev": "8f300cf5bb715038489f91f371e06cefdd3e3cdc",
-            "hash": "sha256-bUj6Xa4k5EwjhFWOrHodLWgwLFrJcsHjsu3zdd/gqJQ=",
+            "rev": "6f5374b8aa457d78ee8e5fc579ad0787433ac7e3",
+            "hash": "sha256-rkOXhaPBGUoK7MhTbrAEEU1bj5Ko83UMkbwX0s7umcY=",
             "fetchSubmodules": true
         },
-        "version": "unstable-2024-08-15"
+        "version": "unstable-2024-08-24"
     },
     "prboom": {
         "fetcher": "fetchFromGitHub",

From f273218e4b15bf52d1981d6009bbe45044ddfb8d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 07:08:52 +0000
Subject: [PATCH 088/135] libretro.mame2003-plus: unstable-2024-08-18 ->
 unstable-2024-08-24

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..8c4026d863bc 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -439,10 +439,10 @@
         "src": {
             "owner": "libretro",
             "repo": "mame2003-plus-libretro",
-            "rev": "95806c35f7dcb7c88b07ff2ba15e6e0077e8e69f",
-            "hash": "sha256-Wt7Z1QNJXbbznqY0TICxJFjgBXIgBT4EHi06hPF+hBc="
+            "rev": "77808fade3b4a0df04c96b115631470df0d4ac12",
+            "hash": "sha256-iq9QMhCmk6F2WBM5rtVEwqRFEpdCJkOQikNvA/jaXX0="
         },
-        "version": "unstable-2024-08-18"
+        "version": "unstable-2024-08-24"
     },
     "mame2010": {
         "fetcher": "fetchFromGitHub",

From b1ae15cfaec42f06c58b4aa82280d9b294554d10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 07:08:58 +0000
Subject: [PATCH 089/135] libretro.mame2003: unstable-2024-08-18 ->
 unstable-2024-08-22

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..1ed020788458 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -429,10 +429,10 @@
         "src": {
             "owner": "libretro",
             "repo": "mame2003-libretro",
-            "rev": "ac11b67168c92caab5012d8d7365d36fe5c94b3e",
-            "hash": "sha256-SlEvXbqv4v51njU5QhpimJWnkvGEJlRLjsNg8s4fkBc="
+            "rev": "b2fbe7d4724d781572111f12176b5b38126bcf16",
+            "hash": "sha256-E+ln1isbslzMhT8THZO9MDd6dGN/+mRj1oKzfMz0t5Y="
         },
-        "version": "unstable-2024-08-18"
+        "version": "unstable-2024-08-22"
     },
     "mame2003-plus": {
         "fetcher": "fetchFromGitHub",

From 2ec36ad9d499a4cf030405156b9d0226129c430c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 07:09:07 +0000
Subject: [PATCH 090/135] libretro.beetle-supergrafx: unstable-2024-08-16 ->
 unstable-2024-08-23

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..176fb79bd906 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -115,10 +115,10 @@
         "src": {
             "owner": "libretro",
             "repo": "beetle-supergrafx-libretro",
-            "rev": "2379eedc1d057e6b0ec465e4519e20c0fd66c5dc",
-            "hash": "sha256-zeKs0NcdZo3AY3Zv11nK4iLSq2l6jBZcAI4gbUg3gjQ="
+            "rev": "178fcb2759ee8eb461bfff199ada559e71cdc74f",
+            "hash": "sha256-JR/yOMqjbgblpAx06RkZFhwnuiCNYJ7YJfKm+7bjTQo="
         },
-        "version": "unstable-2024-08-16"
+        "version": "unstable-2024-08-23"
     },
     "beetle-vb": {
         "fetcher": "fetchFromGitHub",

From c11ac20d4d528fc3c38047dadeba47cc3668a840 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sun, 25 Aug 2024 15:22:09 +0800
Subject: [PATCH 091/135] deepin.deepin-camera: unstable-2023-09-26 -> 6.0.5

---
 .../deepin/apps/deepin-camera/default.nix         | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix
index c1f3e53b5be2..19bca29ba5b2 100644
--- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-camera/default.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-camera";
-  version = "unstable-2023-09-26";
+  version = "6.0.5";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
-    rev = "8ad3b6ad2a4f5f0b22a216496a0187a69a1e1bcc";
-    hash = "sha256-/8ddplHJzeu7lrRzN66KhJGkFou4FcXc+BzYFK5YVeE=";
+    rev = version;
+    hash = "sha256-3q8yV8GpCPKW780YpCn+xLeFBGJFoAMmKSFCAH9OXoE=";
   };
 
   # QLibrary and dlopen work with LD_LIBRARY_PATH
@@ -74,7 +74,6 @@ stdenv.mkDerivation rec {
     ++ (with gst_all_1; [
       gstreamer
       gst-plugins-base
-      gst-plugins-good
     ]);
 
   cmakeFlags = [ "-DVERSION=${version}" ];
@@ -105,11 +104,11 @@ stdenv.mkDerivation rec {
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tool to view camera, take photo and video";
     homepage = "https://github.com/linuxdeepin/deepin-camera";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
   };
 }

From 4de1e0f59546f8e7aca754d6e82dd59465dd6b5c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 07:26:27 +0000
Subject: [PATCH 092/135] libretro.gpsp: unstable-2024-07-20 ->
 unstable-2024-08-24

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..de2b74a85a89 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -368,10 +368,10 @@
         "src": {
             "owner": "libretro",
             "repo": "gpsp",
-            "rev": "74c4b82cef7793b11892c791cc2379cb87847fb8",
-            "hash": "sha256-JvQ1zJoJg++yPEeXrxQGsoObht0vE3VXwf6ohLLuvw4="
+            "rev": "f2837be54aa680c4ec0c7be0669cdcd65582cc66",
+            "hash": "sha256-Kfw4KYNH/K3y6Iy/eYu/OlInibv9JLQvOSDh429G2zg="
         },
-        "version": "unstable-2024-07-20"
+        "version": "unstable-2024-08-24"
     },
     "gw": {
         "fetcher": "fetchFromGitHub",

From 3fc0807dd47b6b72082d55599fd382796656a175 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 07:41:38 +0000
Subject: [PATCH 093/135] libretro.fbneo: unstable-2024-08-17 ->
 unstable-2024-08-21

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..c29e41d0bc31 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -287,10 +287,10 @@
         "src": {
             "owner": "libretro",
             "repo": "fbneo",
-            "rev": "a77738cbe9c75823f62a23e35bdfcf05e23d45b3",
-            "hash": "sha256-a4w9UO37iOTAkT0cj0p64HgxZHF7PFtIEo3CIKSe/NU="
+            "rev": "1c76e0b0aa8103b9306e4526f6de1437a85e7fab",
+            "hash": "sha256-2N8Eurp511MXIX/oPam/iCGySiFfPgLPzNXch2Lad1s="
         },
-        "version": "unstable-2024-08-17"
+        "version": "unstable-2024-08-21"
     },
     "fceumm": {
         "fetcher": "fetchFromGitHub",

From fe1e6bc46f2320b65242862fe646ba107de09445 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Sun, 25 Aug 2024 15:35:37 +0800
Subject: [PATCH 094/135] deepin.deepin-voice-note: 6.0.15 -> 6.0.18

---
 .../deepin/apps/deepin-voice-note/default.nix | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix
index d948a6f4d2fd..b102318c56ac 100644
--- a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix
+++ b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix
@@ -12,6 +12,7 @@
   qt5platform-plugins,
   qtsvg,
   dde-qt-dbus-factory,
+  deepin-movie-reborn,
   qtmultimedia,
   qtwebengine,
   libvlc,
@@ -21,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-voice-note";
-  version = "6.0.15";
+  version = "6.0.18";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-k6LFMs2/OQQyeGI5WXBGWkAAY4GeP8LaA8hTXFwbaCM=";
+    hash = "sha256-GbSYXwJoNfbg+31454GjMbXRqrtk2bSZJCk18ILfAn4=";
   };
 
   patches = [ ./use_v23_dbus_interface.diff ];
@@ -53,6 +54,7 @@ stdenv.mkDerivation rec {
       dtkwidget
       qt5platform-plugins
       dde-qt-dbus-factory
+      deepin-movie-reborn
       qtmultimedia
       qtwebengine
       libvlc
@@ -61,7 +63,6 @@ stdenv.mkDerivation rec {
     ++ (with gst_all_1; [
       gstreamer
       gst-plugins-base
-      gst-plugins-good
     ]);
 
   strictDeps = true;
@@ -69,18 +70,26 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DVERSION=${version}" ];
 
   # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
-  qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];
+  qtWrapperArgs = [
+    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
+    "--prefix LD_LIBRARY_PATH : ${
+      lib.makeLibraryPath [
+        gst_all_1.gstreamer
+        gst_all_1.gst-plugins-base
+      ]
+    }"
+  ];
 
   preFixup = ''
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple memo software with texts and voice recordings";
     mainProgram = "deepin-voice-note";
     homepage = "https://github.com/linuxdeepin/deepin-voice-note";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = teams.deepin.members;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.deepin.members;
   };
 }

From 6aa9dbe9f1e999b33435804341d92b6c5206d187 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 08:18:35 +0000
Subject: [PATCH 095/135] libretro.mame: unstable-2024-08-04 ->
 unstable-2024-08-19

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..fe61fcbc6de3 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -408,11 +408,11 @@
         "src": {
             "owner": "libretro",
             "repo": "mame",
-            "rev": "4159481825939a22d8e604b90aaae29ef9097b73",
-            "hash": "sha256-ebnkcHVJuIdttZ5dX8ENQR8JVpkumOrkY5Cf2w7VweI=",
+            "rev": "e1fa727f7c3f6363e50c71ae9b24d3d6c6b8b8ea",
+            "hash": "sha256-c7mbq0+GUQ/5gHf1byOeDX8cFuegE1AWmzO+34A+v8Q=",
             "fetchSubmodules": true
         },
-        "version": "unstable-2024-08-04"
+        "version": "unstable-2024-08-19"
     },
     "mame2000": {
         "fetcher": "fetchFromGitHub",

From b6d0e54ce9a8730ef33453ec5f6e85f6c2a7cdac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 08:20:59 +0000
Subject: [PATCH 096/135] libretro.bsnes: unstable-2024-08-16 ->
 unstable-2024-08-23

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..25d5e0b21ba8 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -165,10 +165,10 @@
         "src": {
             "owner": "libretro",
             "repo": "bsnes-libretro",
-            "rev": "4da6b84bf20c36f1a1d097b5f8431d6bf0e4bd48",
-            "hash": "sha256-Ic4EENOMzQAVW7QVSqrJ2ZZZnymbSvotDLQp9IF708k="
+            "rev": "c7ccdb0942df48c88ec763613d343b069f72f96d",
+            "hash": "sha256-NkI9G1e8nqPjZ/MQjsn/de/EVV5lEC7CBnIE/kTi8KE="
         },
-        "version": "unstable-2024-08-16"
+        "version": "unstable-2024-08-23"
     },
     "bsnes-hd": {
         "fetcher": "fetchFromGitHub",

From 1e96854500a52d89b39928563d69cbaec726ade8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 08:23:39 +0000
Subject: [PATCH 097/135] libretro.flycast: unstable-2024-08-17 ->
 unstable-2024-08-24

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..f3e5d7a87e6a 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -307,11 +307,11 @@
         "src": {
             "owner": "flyinghead",
             "repo": "flycast",
-            "rev": "6061d402bdbd1a07d0ba43fe6db272365a309e9f",
-            "hash": "sha256-2kLhb4biq4rokI44/PWr1jmMNSsUG+3aoBgQfZyyL+8=",
+            "rev": "308d9fc1acee55a58be5a21471680d4694ba983c",
+            "hash": "sha256-DAIxXY2ffTTv/KJ7N+raXbjB/gbDj/cej3f5CooLAS0=",
             "fetchSubmodules": true
         },
-        "version": "unstable-2024-08-17"
+        "version": "unstable-2024-08-24"
     },
     "fmsx": {
         "fetcher": "fetchFromGitHub",

From df96f2be9b7f4c4242a449c9e7d24d71a9b10dfb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 08:33:46 +0000
Subject: [PATCH 098/135] libretro.genesis-plus-gx: unstable-2024-08-16 ->
 unstable-2024-08-23

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..8fbebc9a3669 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -358,10 +358,10 @@
         "src": {
             "owner": "libretro",
             "repo": "Genesis-Plus-GX",
-            "rev": "9529e915074269cf67393fdf67166f0be9d14d97",
-            "hash": "sha256-wg1vmBUUrRAUCtHMD2HxjiQ5Y+PC9UMnskOVJ0Ix2QM="
+            "rev": "0ef7121e43670559f2d0de6ccaa33fae45b205f9",
+            "hash": "sha256-8keyk2XF6QS163YRX94uRmTYjZR5xiRL6o1Tk91DNUw="
         },
-        "version": "unstable-2024-08-16"
+        "version": "unstable-2024-08-23"
     },
     "gpsp": {
         "fetcher": "fetchFromGitHub",

From 2ee0fa7be9b856d331d41248c193e9182afbdd15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 08:39:19 +0000
Subject: [PATCH 099/135] libretro.gambatte: unstable-2024-08-16 ->
 unstable-2024-08-23

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..1adc36e0daf9 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -348,10 +348,10 @@
         "src": {
             "owner": "libretro",
             "repo": "gambatte-libretro",
-            "rev": "238a6b89461e821a4b0c0757166cec93fec0b6aa",
-            "hash": "sha256-VHly5E82WugUGsM7WLLtWF8vVEzU6X+g37AEx0Jlnvo="
+            "rev": "cdfdb9bd307b14da7255e001388af58ca95647a7",
+            "hash": "sha256-kzbGpEIdaVs3vm0IE5dkzVLb+IDSSbe59ahahRYo+hs="
         },
-        "version": "unstable-2024-08-16"
+        "version": "unstable-2024-08-23"
     },
     "genesis-plus-gx": {
         "fetcher": "fetchFromGitHub",

From 7f26e33e24c6bd2cbcda358d841c98538042d90b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 08:42:33 +0000
Subject: [PATCH 100/135] libretro.dosbox-pure: unstable-2024-08-16 ->
 unstable-2024-08-25

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index ffced4c6915c..108d0c54f521 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -246,10 +246,10 @@
         "src": {
             "owner": "schellingb",
             "repo": "dosbox-pure",
-            "rev": "53dfb5b89d38c2a3315282494d614bf01006c225",
-            "hash": "sha256-8IgQsg3UaGOKCuDymA+cYfAK6HLwdxwkbU3pROBd82I="
+            "rev": "dd8d2989a652d56a7a1588b65a42cc58477638c2",
+            "hash": "sha256-XA6hBJa/GFUaRG/+PSUBXaFJedjsRVLfR7Z5pmEwY0k="
         },
-        "version": "unstable-2024-08-16"
+        "version": "unstable-2024-08-25"
     },
     "easyrpg": {
         "fetcher": "fetchFromGitHub",

From 543e9f67ef97f6faa56291bf50ffbf5848aee2bc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 25 Aug 2024 10:51:02 +0200
Subject: [PATCH 101/135] python312Packages.pytensor: 2.25.3 -> 2.25.4

Diff: https://github.com/pymc-devs/pytensor/compare/refs/tags/rel-2.25.3...rel-2.25.4

Changelog: https://github.com/pymc-devs/pytensor/releases
---
 pkgs/development/python-modules/pytensor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix
index e6a434532633..328d21ebe8d2 100644
--- a/pkgs/development/python-modules/pytensor/default.nix
+++ b/pkgs/development/python-modules/pytensor/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "pytensor";
-  version = "2.25.3";
+  version = "2.25.4";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "pymc-devs";
     repo = "pytensor";
     rev = "refs/tags/rel-${version}";
-    hash = "sha256-m0Fngbvt/N95/1moc8PW1KU/yfRE/NC+1d0Ste7V8HU=";
+    hash = "sha256-NPMUfSbujT1qHsdpCazDX2xF54HvFJkOaxHSUG/FQwM=";
   };
 
   pythonRelaxDeps = [

From a5874605269680b1e8793a20b4099716f85e7a71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 08:59:33 +0000
Subject: [PATCH 102/135] werf: 2.10.3 -> 2.10.4

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

diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index 8ecaf0bd9891..711688f93914 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "werf";
-  version = "2.10.3";
+  version = "2.10.4";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     rev = "v${version}";
-    hash = "sha256-/rgM6QQAQDkxYCOuRT3lbB/ojNGZnergCB5C+7Rn8SY=";
+    hash = "sha256-1PpnUTlxjUu7jptpd4U7MRKJfRM8WTeMSgbNcQJeZlM=";
   };
 
   vendorHash = "sha256-OR2nIR2q3iRfaSQSQRKn+jbygETx2+WmkOIjOCIB9O8=";

From 281b652b7c06da9ee2182b43b3c4091b59d824d6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 25 Aug 2024 11:21:35 +0200
Subject: [PATCH 103/135] python312Packages.aiovlc: 0.4.1 -> 0.4.2

Diff: https://github.com/MartinHjelmare/aiovlc/compare/refs/tags/v0.4.1...v0.4.2

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

diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix
index bb710c096fe5..50160231ac9d 100644
--- a/pkgs/development/python-modules/aiovlc/default.nix
+++ b/pkgs/development/python-modules/aiovlc/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiovlc";
-  version = "0.4.1";
+  version = "0.4.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiovlc";
     rev = "refs/tags/v${version}";
-    hash = "sha256-6oAnij92lR/sbU80j4WIBCvScPvoVLTMRYlT5zHnVnk=";
+    hash = "sha256-8JDYh+Ym4UF6zjzN+xE0SzeS3BrrYv1MT6w0kn62ASQ=";
   };
 
   build-system = [ poetry-core ];

From 51bc064805e8b7202e57c20af9141b6b7890d9f2 Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Sun, 25 Aug 2024 01:23:09 -0700
Subject: [PATCH 104/135] hyprland: fixed broken OpenGL on asahi linux

---
 pkgs/by-name/hy/hyprland/asahi-fix.patch | 15 +++++++++++++++
 pkgs/by-name/hy/hyprland/package.nix     |  4 ++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/by-name/hy/hyprland/asahi-fix.patch

diff --git a/pkgs/by-name/hy/hyprland/asahi-fix.patch b/pkgs/by-name/hy/hyprland/asahi-fix.patch
new file mode 100644
index 000000000000..80791045e285
--- /dev/null
+++ b/pkgs/by-name/hy/hyprland/asahi-fix.patch
@@ -0,0 +1,15 @@
+diff --git a/src/protocols/LinuxDMABUF.cpp b/src/protocols/LinuxDMABUF.cpp
+index 0fbf832e..c6077114 100644
+--- a/src/protocols/LinuxDMABUF.cpp
++++ b/src/protocols/LinuxDMABUF.cpp
+@@ -492,9 +492,8 @@ CLinuxDMABufV1Protocol::CLinuxDMABufV1Protocol(const wl_interface* iface, const
+                 return;
+             }
+         } else {
+-            protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null");
++            protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf checks", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null");
+             drmFreeDevice(&device);
+-            removeGlobal();
+         }
+     });
+ }
diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix
index aa9c8acb2b4b..1359e6f2fa8c 100644
--- a/pkgs/by-name/hy/hyprland/package.nix
+++ b/pkgs/by-name/hy/hyprland/package.nix
@@ -75,6 +75,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-deu8zvgseDg2gQEnZiCda4TrbA6pleE9iItoZlsoMtE=";
   };
 
+  # Fixes broken OpenGL applications on Apple silicon (Asahi Linux)
+  # Based on commit https://github.com/hyprwm/Hyprland/commit/279ec1c291021479b050c83a0435ac7076c1aee0
+  patches = [ ./asahi-fix.patch ];
+
   postPatch = ''
     # Fix hardcoded paths to /usr installation
     sed -i "s#/usr#$out#" src/render/OpenGL.cpp

From 7d09678df558b5d11308b35d5a8a9b03a8b63a76 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 25 Aug 2024 11:26:15 +0100
Subject: [PATCH 105/135] xmoto: 0.6.1 -> 0.6.2

The primary change is the switch to SDL2.

Changes: https://github.com/xmoto/xmoto/releases/tag/v0.6.2
---
 pkgs/games/xmoto/default.nix | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix
index 615b30fc644e..181868d93347 100644
--- a/pkgs/games/xmoto/default.nix
+++ b/pkgs/games/xmoto/default.nix
@@ -1,26 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gettext, makeWrapper, bzip2
-, curl, libjpeg, libxml2, xz, lua, ode, libGL, libpng, SDL, SDL_mixer, SDL_net
-, SDL_ttf, sqlite, libxdg_basedir, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, gettext, makeWrapper, bzip2
+, curl, libjpeg, libxml2, xz, lua, ode, libGL, libGLU, libpng
+, pkg-config, SDL2, SDL2_mixer, SDL2_net , SDL2_ttf
+, sqlite, libxdg_basedir, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "xmoto";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = version;
-    sha256 = "00f5ha79lfa2iiaz66wl0hl5dapa1l15qdr7m7knzi0ll7j6z66n";
+    rev = "v${version}";
+    hash = "sha256-n58GB5HA50ybSq0ssvJMq+p3I3JThHUGLZ5sHy/245M=";
   };
 
-  patches = [
-    # Fix build with Nix
-    (fetchpatch {
-      url = "https://github.com/xmoto/xmoto/commit/536dcc7ec77a4c4c454b86220e85b1cb3cd1c7f7.patch";
-      sha256 = "0h9lld668jrbmrqva89zqwp63jiagjj86prkxzx6372p3kk9y7g7";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     gettext
@@ -36,16 +29,22 @@ stdenv.mkDerivation rec {
     lua
     ode
     libGL
+    libGLU
     libpng
-    SDL
-    SDL_mixer
-    SDL_net
-    SDL_ttf
+    SDL2
+    SDL2_mixer
+    SDL2_net
+    SDL2_ttf
     sqlite
     libxdg_basedir
     zlib
   ];
 
+  # Should normally come from SDL2_ttf pkg-config, but xmoto does not
+  # use it and uses include directories directly. Let's re-inject the
+  # path here.
+  env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2";
+
   preFixup = ''
     wrapProgram "$out/bin/xmoto" \
       --prefix XDG_DATA_DIRS : "$out/share/"

From 166e8c32993987ad527871a7b7c5eeeec7f6b3df Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Sun, 25 Aug 2024 11:09:43 +0000
Subject: [PATCH 106/135] kdePackages.ghostwriter: add missing dependencies

---
 pkgs/kde/gear/ghostwriter/default.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/kde/gear/ghostwriter/default.nix b/pkgs/kde/gear/ghostwriter/default.nix
index 273e805549e7..1c63eb2a9f93 100644
--- a/pkgs/kde/gear/ghostwriter/default.nix
+++ b/pkgs/kde/gear/ghostwriter/default.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   mkKdeDerivation,
   qtsvg,
   qttools,
@@ -8,11 +9,26 @@
   pkg-config,
   hunspell,
   kdoctools,
+  pandoc,
+  multimarkdown,
+  cmark,
 }:
 mkKdeDerivation {
   pname = "ghostwriter";
 
   extraNativeBuildInputs = [pkg-config];
   extraBuildInputs = [qtsvg qttools qtwebchannel qtwebengine qt5compat kdoctools hunspell];
+
+  qtWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [
+      cmark
+      multimarkdown
+      pandoc
+    ])
+  ];
+
   meta.mainProgram = "ghostwriter";
 }

From 6c7caac32d877a6a4e5ed22befce5699c4538d4d Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Sun, 25 Aug 2024 11:11:03 +0000
Subject: [PATCH 107/135] kdePackages.ghostwriter: format with nixfmt-rfc-style

---
 pkgs/kde/gear/ghostwriter/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/kde/gear/ghostwriter/default.nix b/pkgs/kde/gear/ghostwriter/default.nix
index 1c63eb2a9f93..1bcb0e004050 100644
--- a/pkgs/kde/gear/ghostwriter/default.nix
+++ b/pkgs/kde/gear/ghostwriter/default.nix
@@ -16,8 +16,16 @@
 mkKdeDerivation {
   pname = "ghostwriter";
 
-  extraNativeBuildInputs = [pkg-config];
-  extraBuildInputs = [qtsvg qttools qtwebchannel qtwebengine qt5compat kdoctools hunspell];
+  extraNativeBuildInputs = [ pkg-config ];
+  extraBuildInputs = [
+    qtsvg
+    qttools
+    qtwebchannel
+    qtwebengine
+    qt5compat
+    kdoctools
+    hunspell
+  ];
 
   qtWrapperArgs = [
     "--prefix"

From b71d04bcc6b5a5526ed493e1c8dda89c9d381e7f Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sun, 25 Aug 2024 14:17:46 +0300
Subject: [PATCH 108/135] ntopng: 6.0 -> 6.2

---
 pkgs/tools/networking/ntopng/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix
index e29b1a076eda..134c6f657547 100644
--- a/pkgs/tools/networking/ntopng/default.nix
+++ b/pkgs/tools/networking/ntopng/default.nix
@@ -28,21 +28,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ntopng";
-  version = "6.0";
+  version = "6.2";
 
   src = fetchFromGitHub {
     owner = "ntop";
     repo = "ntopng";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-zLtJ4x1eWtvnd60iNuNkMOX8LinZMEJHSt/Y0FVQ8vw=";
+    hash = "sha256-8PG18mOV/6EcBpKt9kLyI40OLDnpnc2b4IUu9JbK/Co=";
     fetchSubmodules = true;
   };
 
-  patches = lib.optional (!lib.versionOlder rrdtool.version "1.9.0") (fetchpatch {
-    url = "https://github.com/ntop/ntopng/commit/5069aa4a6259bd0830a33f2ece980612dba5ace9.patch";
-    hash = "sha256-CnYzSE39J7pC2wHxp7Xst6g5pzQbpNUynJUVrTrtuOg=";
-  });
-
   preConfigure = ''
     substituteInPlace Makefile.in \
       --replace "/bin/rm" "rm"

From 6ab787a916cafaf391b0da07024c3927ca199924 Mon Sep 17 00:00:00 2001
From: Alexander Kiselyov <aleksandr.kiselyov@gmail.com>
Date: Sun, 25 Aug 2024 11:23:05 +0000
Subject: [PATCH 109/135] python3Packages.pymanopt: 2.2.0 ->
 2.2.0-unstable-2024-07-10 (#336807)

---
 .../python-modules/pymanopt/default.nix       | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pymanopt/default.nix b/pkgs/development/python-modules/pymanopt/default.nix
index 019d107e2342..0172ecc6540d 100644
--- a/pkgs/development/python-modules/pymanopt/default.nix
+++ b/pkgs/development/python-modules/pymanopt/default.nix
@@ -8,21 +8,31 @@
   autograd,
   matplotlib,
   pytestCheckHook,
+  setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "pymanopt";
-  version = "2.2.0";
-  format = "setuptools";
+  version = "2.2.0-unstable-2024-07-10";
+  pyproject = true;
+
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = "2.2.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "refs/tags/${version}";
-    hash = "sha256-pDFRYhswcuAHG9pcqvzXIy3Ivhxe5R5Ric7AFRh7MK4=";
+    rev = "1de3b6f47258820fdc072fceaeaa763b9fd263b0";
+    hash = "sha256-j/fVeMgoLLBgRYFtSj2ZyNJb8iuWlnn2/YpBqUoCAFk=";
   };
 
-  propagatedBuildInputs = [
+  preConfigure = ''
+    substituteInPlace pyproject.toml --replace-fail "\"pip==22.3.1\"," ""
+  '';
+
+  build-system = [
+    setuptools-scm
+  ];
+  dependencies = [
     numpy
     scipy
     torch
@@ -35,14 +45,15 @@ buildPythonPackage rec {
 
   preCheck = ''
     substituteInPlace "tests/conftest.py" \
-      --replace "import tensorflow as tf" ""
+      --replace-fail "import tensorflow as tf" ""
     substituteInPlace "tests/conftest.py" \
-      --replace "tf.random.set_seed(seed)" ""
+      --replace-fail "tf.random.set_seed(seed)" ""
   '';
 
   disabledTestPaths = [
     "tests/test_examples.py"
     "tests/backends/test_tensorflow.py"
+    "tests/backends/test_jax.py"
     "tests/test_problem.py"
   ];
 
@@ -53,6 +64,5 @@ buildPythonPackage rec {
     homepage = "https://www.pymanopt.org/";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ yl3dy ];
-    broken = lib.versionAtLeast scipy.version "1.10.0";
   };
 }

From 34302b2424f721dd0bb29ad4cfac50aeee6ecc9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vili=20Sinerv=C3=A4?= <vili.m.sinerva@gmail.com>
Date: Fri, 10 May 2024 18:18:02 +0300
Subject: [PATCH 110/135] nixos/libinput: Allow 'custom' acceleration profile

This is an option that works with the NixOS module as-is, but is
being blocked from use by the allowed enum values.
---
 nixos/modules/services/hardware/libinput.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/hardware/libinput.nix b/nixos/modules/services/hardware/libinput.nix
index b8aa59035d33..28e3ff427721 100644
--- a/nixos/modules/services/hardware/libinput.nix
+++ b/nixos/modules/services/hardware/libinput.nix
@@ -18,18 +18,19 @@ let cfg = config.services.libinput;
       };
 
       accelProfile = mkOption {
-        type = types.enum [ "flat" "adaptive" ];
+        type = types.enum [ "flat" "adaptive" "custom" ];
         default = "adaptive";
         example = "flat";
         description = ''
             Sets the pointer acceleration profile to the given profile.
-            Permitted values are `adaptive`, `flat`.
+            Permitted values are `adaptive`, `flat`, `custom`.
             Not all devices support this option or all profiles.
             If a profile is unsupported, the default profile for this is used.
             `flat`: Pointer motion is accelerated by a constant
             (device-specific) factor, depending on the current speed.
             `adaptive`: Pointer acceleration depends on the input speed.
             This is the default profile for most devices.
+            `custom`: Allows the user to define a custom acceleration function.
           '';
       };
 

From 3aa3236289dcd2037da7adc2bedef56f519a9f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vili=20Sinerv=C3=A4?= <vili.m.sinerva@gmail.com>
Date: Sun, 12 May 2024 17:30:33 +0300
Subject: [PATCH 111/135] nixos/libinput: Add options for defining a custom
 acceleration functions

Without these options the custom acceleration functions would have to be
defined with the additionalOptions option.
---
 nixos/modules/services/hardware/libinput.nix | 72 ++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/nixos/modules/services/hardware/libinput.nix b/nixos/modules/services/hardware/libinput.nix
index 28e3ff427721..e8d823917503 100644
--- a/nixos/modules/services/hardware/libinput.nix
+++ b/nixos/modules/services/hardware/libinput.nix
@@ -31,6 +31,8 @@ let cfg = config.services.libinput;
             `adaptive`: Pointer acceleration depends on the input speed.
             This is the default profile for most devices.
             `custom`: Allows the user to define a custom acceleration function.
+            To define custom functions use the accelPoints<Fallback/Motion/Scroll>
+            and accelStep<Fallback/Motion/Scroll> options.
           '';
       };
 
@@ -41,6 +43,70 @@ let cfg = config.services.libinput;
         description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
       };
 
+      accelPointsFallback = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "0.0 1.0 2.4 2.5";
+        description = ''
+            Sets the points of the fallback acceleration function. The string must be a space-separated
+            list of floating point non-negative numbers. This only applies to the custom profile.
+          '';
+      };
+
+      accelPointsMotion = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "0.0 1.0 2.4 2.5";
+        description = ''
+            Sets the points of the (pointer) motion acceleration function. The string must be a
+            space-separated list of floating point non-negative numbers. This only applies to
+            the custom profile.
+          '';
+      };
+
+      accelPointsScroll = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "0.0 1.0 2.4 2.5";
+        description = ''
+            Sets the points of the scroll acceleration function. The string must be a space-separated
+            list of floating point non-negative numbers. This only applies to the custom profile.
+          '';
+      };
+
+      accelStepFallback = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "0.1";
+        description = ''
+            Sets the step between the points of the fallback acceleration function. When a step of
+            0.0 is provided, libinput's Fallback acceleration function is used. This only applies
+            to the custom profile.
+          '';
+      };
+
+      accelStepMotion = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "0.1";
+        description = ''
+            Sets the step between the points of the (pointer) motion acceleration function. When a
+            step of 0.0 is provided, libinput's Fallback acceleration function is used. This only
+            applies to the custom profile.
+          '';
+      };
+
+      accelStepScroll = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "0.1";
+        description = ''
+            Sets the step between the points of the scroll acceleration function. When a step of
+            0.0 is provided, libinput's Fallback acceleration function is used. This only applies
+            to the custom profile.
+          '';
+      };
+
       buttonMapping = mkOption {
         type = types.nullOr types.str;
         default = null;
@@ -204,6 +270,12 @@ let cfg = config.services.libinput;
       ${optionalString (cfg.${deviceType}.dev != null) ''MatchDevicePath "${cfg.${deviceType}.dev}"''}
       Option "AccelProfile" "${cfg.${deviceType}.accelProfile}"
       ${optionalString (cfg.${deviceType}.accelSpeed != null) ''Option "AccelSpeed" "${cfg.${deviceType}.accelSpeed}"''}
+      ${optionalString (cfg.${deviceType}.accelPointsFallback != null) ''Option "AccelPointsFallback" "${cfg.${deviceType}.accelPointsFallback}"''}
+      ${optionalString (cfg.${deviceType}.accelPointsMotion != null) ''Option "AccelPointsMotion" "${cfg.${deviceType}.accelPointsMotion}"''}
+      ${optionalString (cfg.${deviceType}.accelPointsScroll != null) ''Option "AccelPointsScroll" "${cfg.${deviceType}.accelPointsScroll}"''}
+      ${optionalString (cfg.${deviceType}.accelStepFallback != null) ''Option "AccelStepFallback" "${cfg.${deviceType}.accelStepFallback}"''}
+      ${optionalString (cfg.${deviceType}.accelStepMotion != null) ''Option "AccelStepMotion" "${cfg.${deviceType}.accelStepMotion}"''}
+      ${optionalString (cfg.${deviceType}.accelStepScroll != null) ''Option "AccelStepScroll" "${cfg.${deviceType}.accelStepScroll}"''}
       ${optionalString (cfg.${deviceType}.buttonMapping != null) ''Option "ButtonMapping" "${cfg.${deviceType}.buttonMapping}"''}
       ${optionalString (cfg.${deviceType}.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.${deviceType}.calibrationMatrix}"''}
       ${optionalString (cfg.${deviceType}.transformationMatrix != null) ''Option "TransformationMatrix" "${cfg.${deviceType}.transformationMatrix}"''}

From 891202ef1f516dd42d84b9d5abc70f7abac47617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vili=20Sinerv=C3=A4?= <vili.m.sinerva@gmail.com>
Date: Sun, 12 May 2024 17:33:27 +0300
Subject: [PATCH 112/135] nixos/libinput: Clarify that accelSpeed does not
 apply to custom profile

Add note to the description of the accelSpeed option to make it clear
that is only applies when flat or adaptive profile is in use.
---
 nixos/modules/services/hardware/libinput.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/libinput.nix b/nixos/modules/services/hardware/libinput.nix
index e8d823917503..b9142359e647 100644
--- a/nixos/modules/services/hardware/libinput.nix
+++ b/nixos/modules/services/hardware/libinput.nix
@@ -40,7 +40,10 @@ let cfg = config.services.libinput;
         type = types.nullOr types.str;
         default = null;
         example = "-0.5";
-        description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
+        description = ''
+            Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).
+            This only applies to the flat or adaptive profile.
+          '';
       };
 
       accelPointsFallback = mkOption {

From 13f07436d4c657d8fceaff47bc3d00f091301bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vili=20Sinerv=C3=A4?= <vili.m.sinerva@gmail.com>
Date: Mon, 13 May 2024 15:53:59 +0300
Subject: [PATCH 113/135] nixos/libinput: Change new options to more
 appropriate data types

Change the options to be numbers or lists of numbers instead of strings
like the pre-existing options.
---
 nixos/modules/services/hardware/libinput.nix | 61 ++++++++++----------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/nixos/modules/services/hardware/libinput.nix b/nixos/modules/services/hardware/libinput.nix
index b9142359e647..d79055cb8d83 100644
--- a/nixos/modules/services/hardware/libinput.nix
+++ b/nixos/modules/services/hardware/libinput.nix
@@ -47,40 +47,39 @@ let cfg = config.services.libinput;
       };
 
       accelPointsFallback = mkOption {
-        type = types.nullOr types.str;
+        type = types.nullOr (types.listOf types.number);
         default = null;
-        example = "0.0 1.0 2.4 2.5";
+        example = [ 0.0 1.0 2.4 2.5 ];
         description = ''
-            Sets the points of the fallback acceleration function. The string must be a space-separated
-            list of floating point non-negative numbers. This only applies to the custom profile.
+            Sets the points of the fallback acceleration function. The value must be a list of
+            floating point non-negative numbers. This only applies to the custom profile.
           '';
       };
 
       accelPointsMotion = mkOption {
-        type = types.nullOr types.str;
+        type = types.nullOr (types.listOf types.number);
         default = null;
-        example = "0.0 1.0 2.4 2.5";
+        example = [ 0.0 1.0 2.4 2.5 ];
         description = ''
-            Sets the points of the (pointer) motion acceleration function. The string must be a
-            space-separated list of floating point non-negative numbers. This only applies to
-            the custom profile.
-          '';
-      };
-
-      accelPointsScroll = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        example = "0.0 1.0 2.4 2.5";
-        description = ''
-            Sets the points of the scroll acceleration function. The string must be a space-separated
+            Sets the points of the (pointer) motion acceleration function. The value must be a
             list of floating point non-negative numbers. This only applies to the custom profile.
           '';
       };
 
-      accelStepFallback = mkOption {
-        type = types.nullOr types.str;
+      accelPointsScroll = mkOption {
+        type = types.nullOr (types.listOf types.number);
         default = null;
-        example = "0.1";
+        example = [ 0.0 1.0 2.4 2.5 ];
+        description = ''
+            Sets the points of the scroll acceleration function. The value must be a list of
+            floating point non-negative numbers. This only applies to the custom profile.
+          '';
+      };
+
+      accelStepFallback = mkOption {
+        type = types.nullOr types.number;
+        default = null;
+        example = 0.1;
         description = ''
             Sets the step between the points of the fallback acceleration function. When a step of
             0.0 is provided, libinput's Fallback acceleration function is used. This only applies
@@ -89,9 +88,9 @@ let cfg = config.services.libinput;
       };
 
       accelStepMotion = mkOption {
-        type = types.nullOr types.str;
+        type = types.nullOr types.number;
         default = null;
-        example = "0.1";
+        example = 0.1;
         description = ''
             Sets the step between the points of the (pointer) motion acceleration function. When a
             step of 0.0 is provided, libinput's Fallback acceleration function is used. This only
@@ -100,9 +99,9 @@ let cfg = config.services.libinput;
       };
 
       accelStepScroll = mkOption {
-        type = types.nullOr types.str;
+        type = types.nullOr types.number;
         default = null;
-        example = "0.1";
+        example = 0.1;
         description = ''
             Sets the step between the points of the scroll acceleration function. When a step of
             0.0 is provided, libinput's Fallback acceleration function is used. This only applies
@@ -273,12 +272,12 @@ let cfg = config.services.libinput;
       ${optionalString (cfg.${deviceType}.dev != null) ''MatchDevicePath "${cfg.${deviceType}.dev}"''}
       Option "AccelProfile" "${cfg.${deviceType}.accelProfile}"
       ${optionalString (cfg.${deviceType}.accelSpeed != null) ''Option "AccelSpeed" "${cfg.${deviceType}.accelSpeed}"''}
-      ${optionalString (cfg.${deviceType}.accelPointsFallback != null) ''Option "AccelPointsFallback" "${cfg.${deviceType}.accelPointsFallback}"''}
-      ${optionalString (cfg.${deviceType}.accelPointsMotion != null) ''Option "AccelPointsMotion" "${cfg.${deviceType}.accelPointsMotion}"''}
-      ${optionalString (cfg.${deviceType}.accelPointsScroll != null) ''Option "AccelPointsScroll" "${cfg.${deviceType}.accelPointsScroll}"''}
-      ${optionalString (cfg.${deviceType}.accelStepFallback != null) ''Option "AccelStepFallback" "${cfg.${deviceType}.accelStepFallback}"''}
-      ${optionalString (cfg.${deviceType}.accelStepMotion != null) ''Option "AccelStepMotion" "${cfg.${deviceType}.accelStepMotion}"''}
-      ${optionalString (cfg.${deviceType}.accelStepScroll != null) ''Option "AccelStepScroll" "${cfg.${deviceType}.accelStepScroll}"''}
+      ${optionalString (cfg.${deviceType}.accelPointsFallback != null) ''Option "AccelPointsFallback" "${toString cfg.${deviceType}.accelPointsFallback}"''}
+      ${optionalString (cfg.${deviceType}.accelPointsMotion != null) ''Option "AccelPointsMotion" "${toString cfg.${deviceType}.accelPointsMotion}"''}
+      ${optionalString (cfg.${deviceType}.accelPointsScroll != null) ''Option "AccelPointsScroll" "${toString cfg.${deviceType}.accelPointsScroll}"''}
+      ${optionalString (cfg.${deviceType}.accelStepFallback != null) ''Option "AccelStepFallback" "${toString cfg.${deviceType}.accelStepFallback}"''}
+      ${optionalString (cfg.${deviceType}.accelStepMotion != null) ''Option "AccelStepMotion" "${toString cfg.${deviceType}.accelStepMotion}"''}
+      ${optionalString (cfg.${deviceType}.accelStepScroll != null) ''Option "AccelStepScroll" "${toString cfg.${deviceType}.accelStepScroll}"''}
       ${optionalString (cfg.${deviceType}.buttonMapping != null) ''Option "ButtonMapping" "${cfg.${deviceType}.buttonMapping}"''}
       ${optionalString (cfg.${deviceType}.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.${deviceType}.calibrationMatrix}"''}
       ${optionalString (cfg.${deviceType}.transformationMatrix != null) ''Option "TransformationMatrix" "${cfg.${deviceType}.transformationMatrix}"''}

From 192bd3730c7890fb4b3b427cf88acce47824fcf3 Mon Sep 17 00:00:00 2001
From: ptdewey <patrickdewey2002@gmail.com>
Date: Sat, 24 Aug 2024 13:58:01 -0400
Subject: [PATCH 114/135] vimPlugins.darkearth-nvim: init at 2024-07-19

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index db33ea5d82b2..3f0ebe6318eb 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -2874,6 +2874,18 @@ final: prev:
     meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/";
   };
 
+  darkearth-nvim = buildVimPlugin {
+    pname = "darkearth-nvim";
+    version = "2024-07-19";
+    src = fetchFromGitHub {
+      owner = "ptdewey";
+      repo = "darkearth-nvim";
+      rev = "d53cc2384d0a84889bd44361cee33019bac02c58";
+      sha256 = "0m04m4mi8f7pzsx9d92xy20b4yw10gyqk4gmxdlr46y6byfwwlyj";
+    };
+    meta.homepage = "https://github.com/ptdewey/darkearth-nvim/";
+  };
+
   dart-vim-plugin = buildVimPlugin {
     pname = "dart-vim-plugin";
     version = "2024-07-02";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index d622fae711b0..e32f6d96fc76 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -239,6 +239,7 @@ https://github.com/FelikZ/ctrlp-py-matcher/,,
 https://github.com/amiorin/ctrlp-z/,,
 https://github.com/ctrlpvim/ctrlp.vim/,,
 https://github.com/scottmckendry/cyberdream.nvim/,,
+https://github.com/ptdewey/darkearth-nvim/,HEAD,
 https://github.com/dart-lang/dart-vim-plugin/,,
 https://github.com/rizzatti/dash.vim/,HEAD,
 https://github.com/glepnir/dashboard-nvim/,,

From 865868e9cba9925c4b7db9d311b0670b20a6c3f2 Mon Sep 17 00:00:00 2001
From: "Vladyslav M." <dywedir@gra.red>
Date: Sun, 25 Aug 2024 14:57:31 +0300
Subject: [PATCH 115/135] wf-recorder: format with nixfmt-rfc-style

---
 .../video/wf-recorder/default.nix             | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix
index 830c09bfa6d6..2f802548bf0e 100644
--- a/pkgs/applications/video/wf-recorder/default.nix
+++ b/pkgs/applications/video/wf-recorder/default.nix
@@ -1,7 +1,18 @@
-{ lib, stdenv, fetchFromGitHub
-, meson, ninja, pkg-config, scdoc, wayland-scanner
-, wayland, wayland-protocols, ffmpeg, x264, libpulseaudio
-, mesa # for libgbm
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  scdoc,
+  wayland-scanner,
+  wayland,
+  wayland-protocols,
+  ffmpeg,
+  x264,
+  libpulseaudio,
+  mesa, # for libgbm
 }:
 
 stdenv.mkDerivation rec {
@@ -15,9 +26,20 @@ stdenv.mkDerivation rec {
     hash = "sha256-SXPXvKXn236oO1WakkMNql3lj2flYYlmArVHGomH0/k=";
   };
 
-  nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wayland-scanner
+    scdoc
+  ];
   buildInputs = [
-    wayland wayland-protocols ffmpeg x264 libpulseaudio mesa
+    wayland
+    wayland-protocols
+    ffmpeg
+    x264
+    libpulseaudio
+    mesa
   ];
 
   meta = with lib; {

From 48cbe1b96af7d5dbe2d8e4b66ae6f60d9c01bfcb Mon Sep 17 00:00:00 2001
From: "Vladyslav M." <dywedir@gra.red>
Date: Sun, 25 Aug 2024 15:00:12 +0300
Subject: [PATCH 116/135] wf-recorder: add dywedir to maintainers

---
 pkgs/applications/video/wf-recorder/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix
index 2f802548bf0e..b432da32f6f1 100644
--- a/pkgs/applications/video/wf-recorder/default.nix
+++ b/pkgs/applications/video/wf-recorder/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = [ ];
+    maintainers = with maintainers; [ dywedir ];
     platforms = platforms.linux;
     mainProgram = "wf-recorder";
   };

From 7b242583b3e2f62ee64366f6b74c3470d5f4d2a9 Mon Sep 17 00:00:00 2001
From: "Vladyslav M." <dywedir@gra.red>
Date: Sun, 25 Aug 2024 15:02:00 +0300
Subject: [PATCH 117/135] wf-recorder: 0.4.1 -> 0.5.0

---
 pkgs/applications/video/wf-recorder/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix
index b432da32f6f1..b2f848773c8a 100644
--- a/pkgs/applications/video/wf-recorder/default.nix
+++ b/pkgs/applications/video/wf-recorder/default.nix
@@ -12,18 +12,19 @@
   ffmpeg,
   x264,
   libpulseaudio,
+  pipewire,
   mesa, # for libgbm
 }:
 
 stdenv.mkDerivation rec {
   pname = "wf-recorder";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "ammen99";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-SXPXvKXn236oO1WakkMNql3lj2flYYlmArVHGomH0/k=";
+    hash = "sha256-7/fQOkfAw5v3irD5blJOdq88j0VBrPVQQufdt9wsACk=";
   };
 
   nativeBuildInputs = [
@@ -39,6 +40,7 @@ stdenv.mkDerivation rec {
     ffmpeg
     x264
     libpulseaudio
+    pipewire
     mesa
   ];
 

From 8b999c92cd7232c1a0654cd00c004a432db79884 Mon Sep 17 00:00:00 2001
From: nebunebu <nebu.nebuchadnezzar@gmail.com>
Date: Sat, 24 Aug 2024 17:12:10 -0400
Subject: [PATCH 118/135] vimPlugins.cellular-automation-nvim: init at
 2024-06-30

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 3f0ebe6318eb..c053f5c669c1 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1410,6 +1410,18 @@ final: prev:
     meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
   };
 
+  cellular-automaton-nvim = buildVimPlugin {
+    pname = "cellular-automaton.nvim";
+    version = "2024-06-30";
+    src = fetchFromGitHub {
+      owner = "Eandrju";
+      repo = "cellular-automaton.nvim";
+      rev = "11aea08aa084f9d523b0142c2cd9441b8ede09ed";
+      sha256 = "0jvz2vnyhm6a2zyz93sh87n59vga2l016ijrfybfrlv44hhzp2ww";
+    };
+    meta.homepage = "https://github.com/Eandrju/cellular-automaton.nvim/";
+  };
+
   chadtree = buildVimPlugin {
     pname = "chadtree";
     version = "2024-07-25";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index e32f6d96fc76..9bd304b4d384 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -117,6 +117,7 @@ https://github.com/itchyny/calendar.vim/,,
 https://github.com/bkad/camelcasemotion/,,
 https://github.com/tyru/caw.vim/,,
 https://github.com/uga-rosa/ccc.nvim/,HEAD,
+https://github.com/Eandrju/cellular-automaton.nvim/,HEAD,
 https://github.com/ms-jpq/chadtree/,HEAD,
 https://github.com/vim-scripts/changeColorScheme.vim/,,
 https://github.com/sudormrfbin/cheatsheet.nvim/,,

From d2e91aa8841906d675e0b96a0fc0599ba9ab753b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 12:18:51 +0000
Subject: [PATCH 119/135] ada: 2.9.0 -> 2.9.1

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

diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix
index dfa948903bc0..aaf2d31986ff 100644
--- a/pkgs/by-name/ad/ada/package.nix
+++ b/pkgs/by-name/ad/ada/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ada";
-  version = "2.9.0";
+  version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = "ada-url";
     repo = "ada";
     rev = "v${version}";
-    hash = "sha256-1p9qe7n9dAzJ2opxfBsGXv9IeRdXraHVm7MBXr+QVbQ=";
+    hash = "sha256-bDkhSAd+MlOm8pd5MPvzVHkWMY9aNcvNfLuH7qoyUuk=";
   };
 
   nativeBuildInputs = [ cmake ];

From 6cb290f6697ac591098bd2b58dc46375e5dec8b6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 10 Feb 2024 20:23:04 +0100
Subject: [PATCH 120/135] python312Packages.py-machineid: init at 0.6.0

---
 .../python-modules/py-machineid/default.nix   | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/py-machineid/default.nix

diff --git a/pkgs/development/python-modules/py-machineid/default.nix b/pkgs/development/python-modules/py-machineid/default.nix
new file mode 100644
index 000000000000..80db186a7429
--- /dev/null
+++ b/pkgs/development/python-modules/py-machineid/default.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "py-machineid";
+  version = "0.6.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-AMONhSHUKaRTm92SlnI02yihorSyYwYrNRygAjMuYz8=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "machineid" ];
+
+  # Tests are not present in Pypi archive
+  doCheck = false;
+
+  meta = {
+    description = "Get the unique machine ID of any host (without admin privileges)";
+    homepage = "https://github.com/keygen-sh/py-machineid";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a826cd6129c6..6041dc0d25b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9388,6 +9388,8 @@ self: super: with self; {
 
   py-expression-eval = callPackage ../development/python-modules/py-expression-eval { };
 
+  py-machineid = callPackage ../development/python-modules/py-machineid { };
+
   py-opensonic = callPackage ../development/python-modules/py-opensonic { };
 
   py-radix-sr = callPackage ../development/python-modules/py-radix-sr { };

From 084a741837498d0d9f2819fb3a5fe0a3bbce89b1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 10 Feb 2024 20:55:29 +0100
Subject: [PATCH 121/135] python312Packages.sparsezoo: init at 1.8.1

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

diff --git a/pkgs/development/python-modules/sparsezoo/default.nix b/pkgs/development/python-modules/sparsezoo/default.nix
new file mode 100644
index 000000000000..fa28c365cad4
--- /dev/null
+++ b/pkgs/development/python-modules/sparsezoo/default.nix
@@ -0,0 +1,118 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  click,
+  geocoder,
+  numpy,
+  onnx,
+  pyyaml,
+  requests,
+  tqdm,
+  pandas,
+  protobuf,
+  py-machineid,
+  pydantic,
+
+  # checks
+  matplotlib,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "sparsezoo";
+  version = "1.8.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "neuralmagic";
+    repo = "sparsezoo";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-c4F95eVvj673eFO/rbmv4LY3pGmqo+arbsYqElznwdA=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonRelaxDeps = [ "onnx" ];
+
+  dependencies = [
+    click
+    geocoder
+    numpy
+    onnx
+    pyyaml
+    requests
+    tqdm
+    pandas
+    protobuf
+    py-machineid
+    pydantic
+  ];
+
+  pythonImportsCheck = [ "sparsezoo" ];
+
+  nativeCheckInputs = [
+    matplotlib
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # Require network access
+    "test_analysis"
+    "test_custom_default"
+    "test_draw_operation_chart"
+    "test_draw_parameter_chart"
+    "test_draw_parameter_operation_combined_chart"
+    "test_draw_sparsity_by_layer_chart"
+    "test_extract_node_id"
+    "test_fail_default_on_empty"
+    "test_folder_structure"
+    "test_from_model_analysis"
+    "test_generate_outputs"
+    "test_get_layer_and_op_counts"
+    "test_get_node_bias"
+    "test_get_node_bias_name"
+    "test_get_node_four_block_sparsity"
+    "test_get_node_num_four_block_zeros_and_size"
+    "test_get_node_num_zeros_and_size"
+    "test_get_node_sparsity"
+    "test_get_node_weight_and_shape"
+    "test_get_node_weight_name"
+    "test_get_ops_dict"
+    "test_get_zero_point"
+    "test_graphql_api_response"
+    "test_is_four_block_sparse_layer"
+    "test_is_parameterized_prunable_layer"
+    "test_is_quantized_layer"
+    "test_is_sparse_layer"
+    "test_latency_extractor"
+    "test_load_files_from_stub"
+    "test_model_from_stub"
+    "test_model_gz_extraction_from_local_files"
+    "test_model_gz_extraction_from_stub"
+    "test_recipe_getters"
+    "test_search_models"
+    "test_setup_model_from_objects"
+    "test_setup_model_from_paths"
+    "test_validate"
+  ];
+
+  disabledTestPaths = [
+    # Require network access
+    "tests/sparsezoo/analyze/test_model_analysis_creation.py"
+    "tests/sparsezoo/deployment_package/utils/test_utils.py"
+  ];
+
+  meta = {
+    description = "Neural network model repository for highly sparse and sparse-quantized models with matching sparsification recipes";
+    homepage = "https://github.com/neuralmagic/sparsezoo";
+    changelog = "https://github.com/neuralmagic/sparsezoo/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6041dc0d25b2..eac120668263 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14806,6 +14806,8 @@ self: super: with self; {
 
   sparse = callPackage ../development/python-modules/sparse { };
 
+  sparsezoo = callPackage ../development/python-modules/sparsezoo { };
+
   spatial-image = callPackage ../development/python-modules/spatial-image { };
 
   spatialmath-python = callPackage ../development/python-modules/spatialmath-python { };

From e2a04b05774688822b7939558203173d8977b1f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 13:04:26 +0000
Subject: [PATCH 122/135] gmid: 2.1 -> 2.1.1

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

diff --git a/pkgs/by-name/gm/gmid/package.nix b/pkgs/by-name/gm/gmid/package.nix
index 09a8a33d828b..8efb061cd6d7 100644
--- a/pkgs/by-name/gm/gmid/package.nix
+++ b/pkgs/by-name/gm/gmid/package.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gmid";
-  version = "2.1";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "omar-polo";
     repo = pname;
     rev = version;
-    hash = "sha256-C9CheVP0ZFf44J26KKa3+fkp8MB1sNVHnsHiNuNPKwQ=";
+    hash = "sha256-JyiGkVF9aRJXgWAwZEnGgaD+IiH3UzamfTAcWyN0now=";
   };
 
   nativeBuildInputs = [ bison ];

From 9c6c71a62becd0912fb2a7c0dbf8224281e09125 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 13:32:32 +0000
Subject: [PATCH 123/135] pineapple-pictures: 0.8.0 -> 0.8.1

---
 pkgs/applications/graphics/pineapple-pictures/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix
index 87df464090ef..9c465c32c378 100644
--- a/pkgs/applications/graphics/pineapple-pictures/default.nix
+++ b/pkgs/applications/graphics/pineapple-pictures/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pineapple-pictures";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "BLumia";
     repo = "pineapple-pictures";
     rev = finalAttrs.version;
-    hash = "sha256-/0+zIPvQFwQYX1jtu0U8rKLFAbHP0lk5RYHxVUZhebA=";
+    hash = "sha256-7X0A3tjdr8hnnovkbgIOLx5h/eWy0gkM8SEB2/bpwkQ=";
   };
 
   nativeBuildInputs = [

From f07a6bdc73a5d1b0b5a207b4766184a122163334 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 25 Aug 2024 08:40:06 +0100
Subject: [PATCH 124/135] nixVersions.nix_2_24: 2.24.3 -> 2.24.4

Changes: https://github.com/NixOS/nix/compare/2.24.3...2.24.4
---
 pkgs/tools/package-management/nix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index cc9b6eb3850d..5f1cd3f48eda 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -185,8 +185,8 @@ in lib.makeExtensible (self: ({
   };
 
   nix_2_24 = (common {
-    version = "2.24.3";
-    hash = "sha256-aBuGXm0UwDekCYLl7xDyw+BAJOg7728i57TbSXzPacc=";
+    version = "2.24.4";
+    hash = "sha256-oYu/9u8ht34JOTV+G/l3CCFJokPiUA2D8CiLZFX61PA=";
     self_attribute_name = "nix_2_24";
   }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) {
     # Fix the following error with the default x86_64-darwin SDK:

From f18aa82ac6db6f70822b7133b654c284ec26bd86 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 22 Aug 2024 08:37:28 +0200
Subject: [PATCH 125/135] python312Packages.aiohue: 4.7.2 -> 4.7.3

Diff: https://github.com/home-assistant-libs/aiohue/compare/refs/tags/4.7.2...4.7.3

Changelog: https://github.com/home-assistant-libs/aiohue/releases/tag/4.7.3
---
 pkgs/development/python-modules/aiohue/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix
index 6ba83412a62b..e681b6026a28 100644
--- a/pkgs/development/python-modules/aiohue/default.nix
+++ b/pkgs/development/python-modules/aiohue/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiohue";
-  version = "4.7.2";
+  version = "4.7.3";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "aiohue";
     rev = "refs/tags/${version}";
-    hash = "sha256-ZMrB09DXyjPlQ0hOSi+3aI2eSGDAFfhBDPfBsvNpaE4=";
+    hash = "sha256-uS6pyJOntjbGa9UU1g53nuzgfP6AKAzN4meHrZY6Uic=";
   };
 
   postPatch = ''

From 7153bd42c29337b91137f151cd96e28dcc2c31c4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 26 Aug 2024 00:28:04 +1000
Subject: [PATCH 126/135] python312Packages.aioshelly: 11.2.0 -> 11.2.4
 (#335726)

https://github.com/home-assistant-libs/aioshelly/releases/tag/11.2.1
https://github.com/home-assistant-libs/aioshelly/releases/tag/11.2.2
https://github.com/home-assistant-libs/aioshelly/releases/tag/11.2.3
https://github.com/home-assistant-libs/aioshelly/releases/tag/11.2.4
---
 pkgs/development/python-modules/aioshelly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix
index 55356c9f47e5..67eb0ae35edf 100644
--- a/pkgs/development/python-modules/aioshelly/default.nix
+++ b/pkgs/development/python-modules/aioshelly/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "aioshelly";
-  version = "11.2.0";
+  version = "11.2.4";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "aioshelly";
     rev = "refs/tags/${version}";
-    hash = "sha256-+h7xRKTI5S+NQ0IdC2DJywQRIWUUd1mHti6K7VPhBAc=";
+    hash = "sha256-a2hjK1YA/L5w2fYgWYgyyqTMZ4cOzTRzGzMCu5X35/o=";
   };
 
   build-system = [ setuptools ];

From 5d6cec20622c74763b8781865b05d987c96a79aa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 25 Aug 2024 16:28:48 +0200
Subject: [PATCH 127/135] python312Packages.yalexs: 6.4.4 -> 8.4.1

https://github.com/bdraco/yalexs/releases/tag/v8.4.1
---
 pkgs/development/python-modules/yalexs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix
index 4feef1dc27eb..e785273c0b2b 100644
--- a/pkgs/development/python-modules/yalexs/default.nix
+++ b/pkgs/development/python-modules/yalexs/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "yalexs";
-  version = "6.4.4";
+  version = "8.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "bdraco";
     repo = "yalexs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vW6BMb0aaGGsXwZci5FE9VuSB/hi0pltIVH/OcL0mnw=";
+    hash = "sha256-2n/+3VkKtwNlDgxoraIrx/ZUZ9TydybWIkLDTdbMd1w=";
   };
 
   postPatch = ''

From 3c29a4e6f76b48ac26a313f84c81bfc112ce1c1d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 25 Aug 2024 16:42:58 +0200
Subject: [PATCH 128/135] home-assistant: 2024.8.2 -> 2024.8.3

https://github.com/home-assistant/core/releases/tag/2024.8.3
---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 pkgs/servers/home-assistant/default.nix            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index e4d7193efb5a..e1a845ce6a1f 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2024.8.2";
+  version = "2024.8.3";
   components = {
     "3_day_blinds" = ps: with ps; [
     ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 1ccd1bb6e9cb..771edf02a22e 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -471,7 +471,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2024.8.2";
+  hassVersion = "2024.8.3";
 
 in python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
@@ -489,13 +489,13 @@ in python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = "refs/tags/${version}";
-    hash = "sha256-tOh6pCnRTU+JLcog6cEeeCyLOQuX9KPVdWeJfMc8G78=";
+    hash = "sha256-4UQ2+MpcngkAKQxfA9y0JUKQ3/m0Y7t2K80ujLoJUvU=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-qEJXO7R+NxZaxpPCJs+SKgZdcB0ZUBKy7nsq9JQ9z1Q=";
+    hash = "sha256-iGAH6hxLgqAEovI82W0FREw7nqgX+4J+gm4cCGIS7h4=";
   };
 
   build-system = with python.pkgs; [

From 073e7ae9a935b1b34a51574dce772a7a1aec953c Mon Sep 17 00:00:00 2001
From: Mats <mats@mats.sh>
Date: Sun, 25 Aug 2024 15:32:23 +0200
Subject: [PATCH 129/135] jellyfin-ffmpeg: 6.0.1-6 -> 6.0.1-8

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

diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
index 4498a995a4d7..dd469d3762c0 100644
--- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
+++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "6.0.1-6";
+  version = "6.0.1-8";
 in
 
 (ffmpeg_6-full.override {
@@ -14,7 +14,7 @@ in
     owner = "jellyfin";
     repo = "jellyfin-ffmpeg";
     rev = "v${version}";
-    hash = "sha256-jy5LPurjuSIMZlzVZcuaqAwAZunbYc9/6aJf+hna0Kw=";
+    hash = "sha256-29g3BUdNcFEGjHkc/1qxOGazIfg0DLDIwoiDCI/aEKc=";
   };
 }).overrideAttrs (old: {
   pname = "jellyfin-ffmpeg";

From 7db697aa32f179f3a87114d700bbbc90fc64bc1b Mon Sep 17 00:00:00 2001
From: Mats <mats@mats.sh>
Date: Sun, 25 Aug 2024 15:37:16 +0200
Subject: [PATCH 130/135] jellyfin-web: 10.9.7 -> 10.9.10

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

diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix
index c80bf01ab799..e61aa25d1a2e 100644
--- a/pkgs/by-name/je/jellyfin-web/package.nix
+++ b/pkgs/by-name/je/jellyfin-web/package.nix
@@ -27,7 +27,7 @@ let
 in
 buildNpmPackage' rec {
   pname = "jellyfin-web";
-  version = "10.9.7";
+  version = "10.9.10";
 
   src =
     assert version == jellyfin.version;
@@ -35,10 +35,10 @@ buildNpmPackage' rec {
       owner = "jellyfin";
       repo = "jellyfin-web";
       rev = "v${version}";
-      hash = "sha256-vjp96NTcSY1Uj1PeEOPIdZuMFNcO3ZyjRvYYT0AQCrk=";
+      hash = "sha256-6t/kCuMbSug1q1EdQFAMqf/sWa+LAO46OUG0FL84UiE=";
     };
 
-  npmDepsHash = "sha256-CKUssg4YWZd2Gzz7FtO5zA4ngQeLXkFu0VskXrFNwjM=";
+  npmDepsHash = "sha256-R4myooMkKdvOFvyNqKIlZ2GozNOkg8YNTvomkt4aRIU=";
 
   npmBuildScript = [ "build:production" ];
 

From b691f9cac2899fa9ca2a75f6d8879ae906f2ef61 Mon Sep 17 00:00:00 2001
From: Mats <mats@mats.sh>
Date: Sun, 25 Aug 2024 15:37:28 +0200
Subject: [PATCH 131/135] jellyfin: 10.9.7 -> 10.9.10

---
 pkgs/by-name/je/jellyfin/nuget-deps.nix | 618 ++++++++++++------------
 pkgs/by-name/je/jellyfin/package.nix    |   4 +-
 2 files changed, 302 insertions(+), 320 deletions(-)

diff --git a/pkgs/by-name/je/jellyfin/nuget-deps.nix b/pkgs/by-name/je/jellyfin/nuget-deps.nix
index 574ffad2ff00..510b4adc29d7 100644
--- a/pkgs/by-name/je/jellyfin/nuget-deps.nix
+++ b/pkgs/by-name/je/jellyfin/nuget-deps.nix
@@ -2,322 +2,304 @@
 # Please dont edit it manually, your changes might get overwritten!
 
 { fetchNuGet }: [
-  (fetchNuGet { pname = "AsyncKeyedLock"; version = "6.4.2"; sha256 = "1pghspgz9xis139b5v8h2y40gp14x6qfcam27zawq6cp278gnjhi"; })
-  (fetchNuGet { pname = "BDInfo"; version = "0.8.0"; sha256 = "051fkf4566ih6wj9f59myl7vrr6iy0vm16k7i5m227yv2jnkx95g"; })
-  (fetchNuGet { pname = "BlurHashSharp"; version = "1.3.2"; sha256 = "1ygxk7rm0xzr4yz6y25xknqdmrwr2lply46siy7if37ccxnhwhyl"; })
-  (fetchNuGet { pname = "BlurHashSharp.SkiaSharp"; version = "1.3.2"; sha256 = "1qirvbxn3wmc862mcyspliaaass1m7w9mxw5hrfxjpjl68bi6xix"; })
-  (fetchNuGet { pname = "CacheManager.Core"; version = "1.2.0"; sha256 = "0j534rcnayzfwa94n1a5800f4da0c2d83zscbpmq153lpm07w3f0"; })
-  (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; })
-  (fetchNuGet { pname = "Diacritics"; version = "3.3.29"; sha256 = "1dl2dp6cjzcw9hrwg4fs0fvj7mjibrldswkr4kk1kdlcghkxv1mh"; })
-  (fetchNuGet { pname = "DiscUtils.Core"; version = "0.16.13"; sha256 = "1q5pbs7x6bbvsqcz363fj7c0gxdg3ay1r9a83f7yh137rmaprj8h"; })
-  (fetchNuGet { pname = "DiscUtils.Iso9660"; version = "0.16.13"; sha256 = "0vdy9l8kvbf76q7ssgsq3xgkrp1wdbf8a0h4d27371zapg111h54"; })
-  (fetchNuGet { pname = "DiscUtils.Streams"; version = "0.16.13"; sha256 = "03wzvxm3k6vld6g0hk5r2qyhckr6rg4885s7hf5z2cvs1qfas9qd"; })
-  (fetchNuGet { pname = "DiscUtils.Udf"; version = "0.16.13"; sha256 = "0q4kx4p4x2rj41i7rbxfxih62aaji9vfs1qmdrbpq7zd0i552jyc"; })
-  (fetchNuGet { pname = "dotnet-ef"; version = "8.0.4"; sha256 = "104zljagzf0d092ahzg7aprs39pi1k9k96150qm9nlwjzr3lwv7n"; })
-  (fetchNuGet { pname = "DotNet.Glob"; version = "3.1.3"; sha256 = "1klgj9m7i3g8x1yj96wnikvf0hlvr6rhqhl4mgis08imcrl95qg6"; })
-  (fetchNuGet { pname = "EasyCaching.Core"; version = "1.9.2"; sha256 = "0qkzaxmn899hhfh32s8mhg3zcqqy2p05kaaldz246nram5gvf7qp"; })
-  (fetchNuGet { pname = "EFCoreSecondLevelCacheInterceptor"; version = "4.5.0"; sha256 = "10jlgnqn87jfyycs7hd050mk2cxngqph2r5hciq386r7jcdqly0w"; })
-  (fetchNuGet { pname = "ExCSS"; version = "4.2.3"; sha256 = "1likxhccg4l4g4i65z4dfzp9059hij6h1q7prx2sgakvk8zzmw9k"; })
-  (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0.2"; sha256 = "03qfa9cglvka6dv4gbnaskrzvpjnp9jmzfwplg85wdgm6jmjif49"; })
-  (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0.2"; sha256 = "1df6jqwfv9v1ddby2hxcan28g1canbmavglmdjlf2xjs42xz49s9"; })
-  (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0.2"; sha256 = "0kvzby9bnx55sgidpy1vhql6fjf5pgq73b0by052r916sd3jlqbn"; })
-  (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0.2"; sha256 = "0fpka3rrmd47l8xmxjz5wlp2xpn9z07c8yvfg2q5rxgcs7f8r267"; })
-  (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; })
-  (fetchNuGet { pname = "ICU4N"; version = "60.1.0-alpha.356"; sha256 = "05mp4p6qqd0jh5a13nh3bkvjhvi07jm9fv802alcfd79xs08w36m"; })
-  (fetchNuGet { pname = "ICU4N.Transliterator"; version = "60.1.0-alpha.356"; sha256 = "1nwr9668pakdfk6jkf1vqymra1fdxcprizznk473ydvasm071cs4"; })
-  (fetchNuGet { pname = "IDisposableAnalyzers"; version = "4.0.7"; sha256 = "037fjdaqkz1kvwd7aff2wn3miv2wvb8r10z8vcdskq8wd9szj1h4"; })
-  (fetchNuGet { pname = "J2N"; version = "2.0.0"; sha256 = "040jnz89bvnwp764fhi4ikzbqxp4cs298dqqysw676z599c4iyv2"; })
-  (fetchNuGet { pname = "Jellyfin.XmlTv"; version = "10.8.0"; sha256 = "0fv923y58z9l97zhlrifmki0x1m7r52avglhrl2h1jjv1x1wkvzx"; })
-  (fetchNuGet { pname = "libse"; version = "4.0.5"; sha256 = "1fiikwf8n17k4vrm4p4r9dqmx612dlnpz76klqhwvpx7avj0fj6v"; })
-  (fetchNuGet { pname = "LrcParser"; version = "2023.524.0"; sha256 = "002cpbvbb840az6x8g81in7427ca2pqa704812crbidrnvrnaa6c"; })
-  (fetchNuGet { pname = "MetaBrainz.Common"; version = "3.0.0"; sha256 = "0ba7r8xjkd1dsc5plq2h3nbk3kcpd69hnns6kx42bafz2x1d7r9z"; })
-  (fetchNuGet { pname = "MetaBrainz.Common.Json"; version = "6.0.2"; sha256 = "0zw5216amhkav69iv0mqfhql3b9blkfvh8k0xp3qv62r2vvhb1z0"; })
-  (fetchNuGet { pname = "MetaBrainz.MusicBrainz"; version = "6.1.0"; sha256 = "0ssmzk6zyi7ivb055w007h311pg9bby3q6gvwxzmjghd4i6m7461"; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "8.0.6"; sha256 = "19wwaqp21lgvv3fy6zdkmkfgnj55knjmn0h29r68z21k83gj4ba4"; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.2.0"; sha256 = "13s8cm6jdpydxmr0rgmzrmnp1v2r7i3rs7v9fhabk5spixdgfy6b"; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Extensions"; version = "2.2.0"; sha256 = "118gp1mfb8ymcvw87fzgjqwlc1d1b0l0sbfki291ydg414cz3dfn"; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.2.0"; sha256 = "0xrlq8i61vzhzzy25n80m7wh2kn593rfaii3aqnxdsxsg6sfgnx1"; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.HttpOverrides"; version = "2.2.0"; sha256 = "1pbmmczxilgrf4qyaql88dc3av7kaixb1r36358kil68gl3irjy6"; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.Metadata"; version = "8.0.6"; sha256 = "17bwqcc3h6qm1r4rwvissfhqxgdwyz3j48zqv90yks2wijrymiwn"; })
-  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4"; sha256 = "1vzrni7n94f17bzc13lrvcxvgspx9s25ap1p005z6i1ikx6wgx30"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0"; sha256 = "0hjzca7v3qq4wqzi9chgxzycbaysnjgj28ps20695x61sia6i3da"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; sha256 = "1l6v0ii5lapmfnfpjwi3j5bwlx8v9nvyani5pwvqzdfqsd5m7mp5"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0"; sha256 = "0skg5a8i4fq6cndxcjwciai808p0zpqz9kbvck94mcywfzassv1a"; })
-  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0"; sha256 = "1wjwsrnn5frahqciwaxsgalv80fs6xhqy6kcqy7hcsh7jrfc1kjq"; })
-  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
-  (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "8.0.6"; sha256 = "17h6jhhaagdhk1ljyjgxsqq168xw7yda5ys1sxls7nqkbrq3an5p"; })
-  (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.6"; sha256 = "0sifqhm9myix618a77w5h4v66da9dgq0aabgqrics30bpmnh219j"; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.0"; sha256 = "1xhmax0xrvw4lyz1868f1sr3nbrcv3ckr5qnf61c8q9bwj06b9v7"; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.6"; sha256 = "0q9j6qqns82c99imkqaw1ngq0x19flbm1p9wc92b0l46n3lz7lsg"; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.0"; sha256 = "019r991228nxv1fibsxg5z81rr7ydgy77c9v7yvlx35kfppxq4s3"; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.6"; sha256 = "0zq9hcajib3b2j5xn7qllfq2x9g6xh9s8rap03r729llsl1hims5"; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.0"; sha256 = "1vcbad0pzkx5wadnd5inglx56x0yybdlxgknbhifdga0bx76j9sa"; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.6"; sha256 = "17r858s69mar0k70zqf0r2cp7k7sc06xazml0ncgacglw9l9ydb9"; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.6"; sha256 = "01068bb6sbcpngmaracwfynjqny07985hc0lzn6b1xgm1dw1vx5j"; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.6"; sha256 = "1p55h0w30gxvnbq312pbivwss5la86zz7nmfa9wvskdp5b6y8rwp"; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.6"; sha256 = "1nmjszjkyk7nkmwn5yfmci1im9mlqxa4in75wi4sr6g145wvrgwi"; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.6"; sha256 = "181lp36mh96rix1f8zl0061p2m37ksw7dnj9r384n1cxw1961dg2"; })
-  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Tools"; version = "8.0.6"; sha256 = "1p8mr096p3xmdw3yphkjdy5dikbh9gfvgvc43nxbzkjp9ib447hz"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "3.0.0"; sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "2.0.0"; sha256 = "1af64clax8q94p5vggwv8b9qiddmi8v9lnfvbc33k4rl5q8lq38j"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; sha256 = "04m6ywsf9731z24nfd14z0ah8xl06619ba7mkdb4vg8h5jpllsn4"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "2.0.0"; sha256 = "0qvdhcqk8pi6g1ysh3a2b9jmmdq9fmcsj986azibnamnkszcvyfm"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; sha256 = "0bv8ihd5i2gwr97qljwf56h8mdwspmlw0zs64qyk608fb3ciwi25"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.0"; sha256 = "1rszgz0rd5kvib5fscz6ss3pkxyjwqy0xpd4f2ypgzf5z5g5d398"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.0"; sha256 = "1f7h52kamljglx5k08ccryilvk6d6cvr9c26lcb6b2c091znzk0q"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.0"; sha256 = "13jj7jxihiswmhmql7r5jydbca4x5qj6h7zq10z17gagys6dc7pw"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.1"; sha256 = "0w5w0h1clv7585qkajy0vqb28blghhcv5j9ygfi13219idhx10r9"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "8.0.0"; sha256 = "13qb8wz3k59ihq0mjcqz1kwrpyzxn5da4dhk2pvcgc42z9kcbf7r"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; sha256 = "1jrmlfzy4h32nzf1nm5q8bhkpx958b0ww9qx1k1zm4pyaf6mqb04"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; sha256 = "1n3ss26v1lq6b69fxk1vz3kqv9ppxq8ypgdqpd7415xrq66y4bqn"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.1.0"; sha256 = "1xc61dy07bn2q73mx1z3ylrw80xpa682qjby13gklnqq636a3gab"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.0"; sha256 = "1pvms778xkyv1a3gfwrxnh8ja769cxi416n7pcidn9wvg15ifvbh"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.1"; sha256 = "1wyhpamm1nqjfi3r463dhxljdlr6rm2ax4fvbgq2s0j3jhpdhd4p"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; sha256 = "02jnx23hm1vid3yd9pw4gghzn6qkgdl5xfc5r0zrcxdax70rsh5a"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.0"; sha256 = "0ghwkld91k20hcbmzg2137w81mzzdh8hfaapdwckhza0vipya4kw"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; sha256 = "15m4j6w9n8h0mj7hlfzb83hd3wn7aq1s7fxbicm16slsjfwzj82i"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks"; version = "8.0.6"; sha256 = "1i3in42rrxa3wdqwya0xfx520xck3z2jasn2shvjnrakjdhlqbjd"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"; version = "8.0.6"; sha256 = "1h1yraw6571v0ricw3c331isc59k5ry1cwvh27rqs04ainh982zh"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore"; version = "8.0.6"; sha256 = "1xyk3b2r87372m47hzwpmwx6zza3b4qd4cliyd7ki0z8yz7hhfda"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.2.0"; sha256 = "1f83ffb4xjwljg8dgzdsa3pa0582q6b4zm0si467fgkybqzk3c54"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; sha256 = "1idq65fxwcn882c06yci7nscy9i0rgw6mqjrl7362prvvsd9f15r"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; sha256 = "05wxjvjbx79ir7vfkri6b28k8zl8fa6bbr0i7gahqrim2ijvkp6v"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; sha256 = "1igf2bqism22fxv7km5yv028r4rg12a4lki2jh4xg3brjkagiv7q"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; sha256 = "00d5dwmzw76iy8z40ly01hy9gly49a7rpf7k7m99vrid1kxp346h"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "3.1.0"; sha256 = "02ipxf75rqzsbmmy5ka44hh8krmxgky9mdxmh8f7fkbclpg2s6cy"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "8.0.0"; sha256 = "09hmkhxipbpfmwz9q80746zp6cvbx1cqffxr5xjxv5cbjg5662aj"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "3.1.0"; sha256 = "1d3yhqj1rav7vswm747j7w8fh8paybji4rz941hhlq4b12mfqfh4"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.0"; sha256 = "1zyalrcksszmn9r5xjnirfh7847axncgzxkk3k5srbvlcch8fw8g"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.1"; sha256 = "0i9pgmk60b8xlws3q9z890gim1xjq42dhyh6dj4xvbycmgg1x1sd"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "7.0.0"; sha256 = "15lz0qk2gr2q52i05ip51dzm9p4hzqlrammkc0hv2ng6g0z72697"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.2.0"; sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.1.0"; sha256 = "0akccwhpn93a4qrssyb3rszdsp3j4p9hlxbsb7yhqb78xydaqhyh"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.2"; sha256 = "0as39ml1idgp42yvh725ddqp4illq87adzd1ymzx6xjxsxsjadq2"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.0"; sha256 = "1w1y22njywwysi8qjnj4m83qhbq0jr4mmjib0hfawz6cwamh7xrb"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; })
-  (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
-  (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; })
-  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
-  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
-  (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; })
-  (fetchNuGet { pname = "MimeTypes"; version = "2.4.0"; sha256 = "005i81irglnr0wc60zsfwi6bpxafdlwv2q2h7vxnp28b5965wzik"; })
-  (fetchNuGet { pname = "Mono.Nat"; version = "3.0.4"; sha256 = "10zvyq60wy02q21dszrk1h3ww23b7bkgjxaapx1ans4d9nwsmlrm"; })
-  (fetchNuGet { pname = "Mono.TextTemplating"; version = "2.2.1"; sha256 = "1ih6399x4bxzchw7pq5195imir9viy2r1w702vy87vrarxyjqdp1"; })
-  (fetchNuGet { pname = "NEbml"; version = "0.11.0"; sha256 = "0jrkgw0kn8f32fzmybvb8m44rcrjylbs1agqlj2q93cqx047d1md"; })
-  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
-  (fetchNuGet { pname = "PlaylistsNET"; version = "1.4.1"; sha256 = "0zhwa5xqy0a4g10nkl3ngpax3d59zhrbc3b5hvb4i9xqji3vds0x"; })
-  (fetchNuGet { pname = "prometheus-net"; version = "3.1.2"; sha256 = "1jyxvl9cqxvb71mpaglw8aks27i69hg7yzrdwsjc182nmmhh1p03"; })
-  (fetchNuGet { pname = "prometheus-net"; version = "8.2.1"; sha256 = "0g1hf6v6k4ym9a663az76775rkazvxmfl4yb60w0ghqzvrfxw49p"; })
-  (fetchNuGet { pname = "prometheus-net.AspNetCore"; version = "8.2.1"; sha256 = "1rygyyflx53djczfgavr6jzqgz0sfw3r1h93gm3gs3v48d6c06kn"; })
-  (fetchNuGet { pname = "prometheus-net.DotNetRuntime"; version = "4.4.0"; sha256 = "1hrzf2djkjiswyf4xg3pl6rb0a8i0mh294hrfbna782hfxya7c29"; })
-  (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
-  (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; })
-  (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; })
-  (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; })
-  (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; })
-  (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; })
-  (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; })
-  (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; })
-  (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; })
-  (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; })
-  (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; })
-  (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; })
-  (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; })
-  (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; })
-  (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; })
-  (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; })
-  (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; })
-  (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; })
-  (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; })
-  (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; })
-  (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; })
-  (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; })
-  (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; })
-  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; })
-  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; })
-  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; })
-  (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; })
-  (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; })
-  (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; })
-  (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; })
-  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; })
-  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; })
-  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; })
-  (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; })
-  (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; })
-  (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; })
-  (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; })
-  (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; })
-  (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; })
-  (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; })
-  (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; })
-  (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; })
-  (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; })
-  (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; })
-  (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; })
-  (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; })
-  (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; })
-  (fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; })
-  (fetchNuGet { pname = "Serilog"; version = "2.3.0"; sha256 = "0y1111y0csfnil901nfahhj3x251nzdam0c4vab3gw5qh8iqs3my"; })
-  (fetchNuGet { pname = "Serilog"; version = "2.9.0"; sha256 = "0z0ib82w9b229a728bbyhzc2hnlbl0ki7nnvmgnv3l741f2vr4i6"; })
-  (fetchNuGet { pname = "Serilog"; version = "3.1.1"; sha256 = "0ck51ndmaqflsri7yyw5792z42wsp91038rx2i6vg7z4r35vfvig"; })
-  (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.1"; sha256 = "0vmrbhj9vb00fhvxrw3w5j1gvdx4xzxz8d2cp65hps988zxwykkb"; })
-  (fetchNuGet { pname = "Serilog.Enrichers.Thread"; version = "3.1.0"; sha256 = "1y75aiv2k1sxnh012ixkx92fq1yl8srqggy8l439igg4p223hcqi"; })
-  (fetchNuGet { pname = "Serilog.Extensions.Hosting"; version = "8.0.0"; sha256 = "10cgp4nsrzkld5yxnvkfkwd0wkc1m8m7p5z42w4sqd8f188n8i9q"; })
-  (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "8.0.0"; sha256 = "087ab94sfhkj6h6x3cwwf66g456704faxnfyc4pi6shxk45b318s"; })
-  (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "2.0.0"; sha256 = "0y7vg2qji02riq7r0kgybarhkngw6gh3xw89w7c2hcmjawd96x3k"; })
-  (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.0"; sha256 = "0245gvndwbj4nbp8q09vp7w4i9iddxr0vzda2c3ja5afz1zgs395"; })
-  (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "1.5.0"; sha256 = "0bcb3n6lmg5wfj806mziybfmbb8gyiszrivs3swf0msy8w505gyg"; })
-  (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "5.0.1"; sha256 = "0cnjjpnnhlx3k4385dbnddkz3n6khdshjix0hlv4gjmrrmjaixva"; })
-  (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; })
-  (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; })
-  (fetchNuGet { pname = "Serilog.Sinks.Graylog"; version = "3.1.1"; sha256 = "05brpqq8mrk6dr5yy8y69fhfwycgj45cnydgjikbbs2dsk2wrl0z"; })
-  (fetchNuGet { pname = "SerilogAnalyzer"; version = "0.15.0"; sha256 = "0k83cyzl9520q282vp07zb8rs16a56axv7a31l3m5fb1afq2hv9l"; })
-  (fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0.18"; sha256 = "1vxsw5kkw3z4c59v5678k4nmxng92845y3pi4fgv1wcnxgw5aqzg"; })
-  (fetchNuGet { pname = "SkiaSharp"; version = "2.88.8"; sha256 = "0h5vrmximld239l9k98h09wbjwgiwvhyxyixqgbi95d7hirn0gmc"; })
-  (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.8"; sha256 = "13ynv4qgl33cf31nriqnh58039vw8mghpkd1v6jazwiz9awcvn2v"; })
-  (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.8"; sha256 = "1dlp8ra9ccdhqglgjn22fm0axy9lfr3kxby3db4aqkgfp1nqvsbw"; })
-  (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.8"; sha256 = "0qiygnrmpbawn0spx733v60srhn2mm0z0lpv127cj2gh076jpmq9"; })
-  (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.8"; sha256 = "1wrwk44gvjh43dwmjm0cp1bmcrxz2yfq3l4h935073ydibvmpibg"; })
-  (fetchNuGet { pname = "SmartAnalyzers.MultithreadingAnalyzer"; version = "1.1.31"; sha256 = "1qk5s4rx5ma7k2kzkn1h94fsrzmwkivj0z1czsjwmr8z7zhngs2h"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.6"; sha256 = "0pzgdfl707pd9fz108xaff22w7c2y27yaix6wfp36phqkdnzz43m"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; sha256 = "1w8zsgz2w2q0a9cw9cl1rzrpv48a04nhyq67ywan6xlgknds65a7"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.6"; sha256 = "0g959z7r3h43nwzm7z3jiib1xvyx146lxyv0x6fl8ll5wivpjyxq"; })
-  (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.6"; sha256 = "1vs1c7yhi0mdqrd35ji289cxkhg7dxdnn6wgjjbngvqxkdhkyxyc"; })
-  (fetchNuGet { pname = "StyleCop.Analyzers"; version = "1.2.0-beta.556"; sha256 = "1x91v0x6w5s7xm85d5mipv0kah2j3r7ypyidpr9rrggrr90iidpp"; })
-  (fetchNuGet { pname = "StyleCop.Analyzers.Unstable"; version = "1.2.0.556"; sha256 = "0ryaqhj1k71q3yh1ag1288y90ylv05w844win68pvybbmznjjnk9"; })
-  (fetchNuGet { pname = "Svg.Custom"; version = "1.0.0.18"; sha256 = "0186sxdcz7c30g3vvygbahvsmywn1cqq53m8h6la1z2c00zr22s6"; })
-  (fetchNuGet { pname = "Svg.Model"; version = "1.0.0.18"; sha256 = "03vjk6pmxpff6q7saqgq9qdfbs6sf11hqrp469ycfzbikgil4xh9"; })
-  (fetchNuGet { pname = "Svg.Skia"; version = "1.0.0.18"; sha256 = "0vnjy0gc8qfv626rn3z4sy03ds186h1yv9fwq3p84pq6l04ng5d3"; })
-  (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.2.3"; sha256 = "1kx50vliqcqw72aygkm2cs2q82pxdxz17gvz4chz6k858qj4gv0l"; })
-  (fetchNuGet { pname = "Swashbuckle.AspNetCore.ReDoc"; version = "6.6.2"; sha256 = "1sk1afdi1pangvx9vhjicr5h3nv3ms937311s1s8svvsn4cz0pn1"; })
-  (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.2.3"; sha256 = "0g3aw1lydq1xymd1f5rrs0dhl0fpl85gffs9jsm3khfqp7js31yz"; })
-  (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.2.3"; sha256 = "1cza3hzxhia81rmmdx9qixbm1ikavscddknpvbkrwmljzx2qmsv7"; })
-  (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.2.3"; sha256 = "0sbrymb73a2s9qhgm7i44ca08h4n62qfh751fwnvybmj8kb1gzsi"; })
-  (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
-  (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; })
-  (fetchNuGet { pname = "System.CodeDom"; version = "4.4.0"; sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; })
-  (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; })
-  (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
-  (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; })
-  (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; })
-  (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; })
-  (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; sha256 = "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"; })
-  (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; sha256 = "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"; })
-  (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; sha256 = "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"; })
-  (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; sha256 = "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky"; })
-  (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; sha256 = "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"; })
-  (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"; })
-  (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; })
-  (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })
-  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; })
-  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; })
-  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; sha256 = "0nzra1i0mljvmnj1qqqg37xs7bl71fnpl68nwmdajchh65l878zr"; })
-  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; })
-  (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; })
-  (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; })
-  (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; })
-  (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
-  (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; })
-  (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; })
-  (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; })
-  (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
-  (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; })
-  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; })
-  (fetchNuGet { pname = "System.IO.Hashing"; version = "8.0.0"; sha256 = "1hg5i9hiihj9x4d0mlvhfddmivzrhzz83dyh26fqw1nd8jvqccxk"; })
-  (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; })
-  (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; })
-  (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
-  (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; })
-  (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; })
-  (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; })
-  (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
-  (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; })
-  (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
-  (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; })
-  (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; })
-  (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; })
-  (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
-  (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; })
-  (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; })
-  (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; })
-  (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; })
-  (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.1"; sha256 = "0fjqifk4qz9lw5gcadpfalpplyr0z2b3p9x7h0ll481a9sqvppc9"; })
-  (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; })
-  (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
-  (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; })
-  (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; })
-  (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
-  (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; })
-  (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
-  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; })
-  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; })
-  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
-  (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; })
-  (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
-  (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; })
-  (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; })
-  (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; })
-  (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; })
-  (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; })
-  (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; })
-  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
-  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; })
-  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
-  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; })
-  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; })
-  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
-  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.5.0"; sha256 = "0srd5bva52n92i90wd88pzrqjsxnfgka3ilybwh7s6sf469y5s53"; })
-  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; sha256 = "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11"; })
-  (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; })
-  (fetchNuGet { pname = "System.Text.Json"; version = "8.0.3"; sha256 = "0jkl986gnh2a39v5wbab47qyh1g9a64dgh5s67vppcay8hd42c4n"; })
-  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; })
-  (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; })
-  (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
-  (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; })
-  (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; })
-  (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
-  (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "8.0.0"; sha256 = "02mmqnbd7ybin1yiffrq3ph71rsbrnf6r6m01j98ynydqfscz9s3"; })
-  (fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; sha256 = "1z7v9lrkss1f8s42sclsq3az9zjihgmhyxnwhjyf0scgk1amngrw"; })
-  (fetchNuGet { pname = "TMDbLib"; version = "2.2.0"; sha256 = "1dmxiz0vg9738f2qps37ahhqsaa9ia71mx43an8k726vvzp9b35g"; })
-  (fetchNuGet { pname = "UTF.Unknown"; version = "2.5.1"; sha256 = "0giks1ww539m4r5kzdyzkq0cvfi5k50va9idjz93rclgljl96gpl"; })
-  (fetchNuGet { pname = "zlib.net-mutliplatform"; version = "1.0.6"; sha256 = "1h9smxgdyih096ic6k1yq6ak87r5rhx49kvskhwxdd4n6k28xmy6"; })
+  (fetchNuGet { pname = "AsyncKeyedLock"; version = "6.4.2"; hash = "sha256-EUr70BGXGczVP6Iq5rDpJNwHiBcQ7bLSCDr29N/V8N0="; })
+  (fetchNuGet { pname = "BDInfo"; version = "0.8.0"; hash = "sha256-r6Q+rRTbHyFqiWeaUDfw0eS8D/U1FZckNzAaU4ibLhQ="; })
+  (fetchNuGet { pname = "BlurHashSharp"; version = "1.3.2"; hash = "sha256-1EMObWfsDBePj9oQTy8VmefasJ29CG++J/l3UPOZ/fk="; })
+  (fetchNuGet { pname = "BlurHashSharp.SkiaSharp"; version = "1.3.2"; hash = "sha256-PXYTFzJUXtldhoX3mvipQWulVKRXe1aFQazyYfvaOeI="; })
+  (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; hash = "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="; })
+  (fetchNuGet { pname = "Diacritics"; version = "3.3.29"; hash = "sha256-sIbdJ3yMthnmJHly3WheUdYjtwPakcczTJx9ycxtgrY="; })
+  (fetchNuGet { pname = "DiscUtils.Core"; version = "0.16.13"; hash = "sha256-EMl8Vc1nBOiPG0ilHLwar/UH2JFumPEZ1nst049et+A="; })
+  (fetchNuGet { pname = "DiscUtils.Iso9660"; version = "0.16.13"; hash = "sha256-pMAQwrvqhzOOaAQChdxqPNw8Xx9YP60PNsetPRFNvm0="; })
+  (fetchNuGet { pname = "DiscUtils.Streams"; version = "0.16.13"; hash = "sha256-DSetHA56M/GLg0cXhMjLJk8GPRa5TAieaXSbOWrfnw8="; })
+  (fetchNuGet { pname = "DiscUtils.Udf"; version = "0.16.13"; hash = "sha256-zEtRSgTtH3xXbhUH7XaKUilhYOyur3xiIDKLTi7pk2A="; })
+  (fetchNuGet { pname = "dotnet-ef"; version = "8.0.7"; hash = "sha256-sPDzNmBUSB+3Zvxa7bVxBrk3w/Q70H+dJTRxy9obZfw="; })
+  (fetchNuGet { pname = "DotNet.Glob"; version = "3.1.3"; hash = "sha256-5uGSaGY1IqDjq4RCDLPJm0Lg9oyWmyR96OiNeGqSj84="; })
+  (fetchNuGet { pname = "ExCSS"; version = "4.2.3"; hash = "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I="; })
+  (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0.2"; hash = "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8="; })
+  (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0.2"; hash = "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU="; })
+  (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0.2"; hash = "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08="; })
+  (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0.2"; hash = "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo="; })
+  (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; })
+  (fetchNuGet { pname = "ICU4N"; version = "60.1.0-alpha.356"; hash = "sha256-1QyOgO7pNMeoEgBtl6o8IG4o91wD2hFUgRI0jM0ltxY="; })
+  (fetchNuGet { pname = "ICU4N.Transliterator"; version = "60.1.0-alpha.356"; hash = "sha256-RLNwQNVqNz8Omfb/mC/rzQWVq8c7uCnNdG2qi4xJmds="; })
+  (fetchNuGet { pname = "IDisposableAnalyzers"; version = "4.0.7"; hash = "sha256-BAb5dWoc4akb2+iDkNHaXOxYh+XCOXUa3zP8iVWT7gw="; })
+  (fetchNuGet { pname = "J2N"; version = "2.0.0"; hash = "sha256-YvtIWErlm2O49hg3lIRm5Ha8/owkQkfMudzuldC3EhA="; })
+  (fetchNuGet { pname = "Jellyfin.XmlTv"; version = "10.8.0"; hash = "sha256-/e/JQw9bygAFzZC+rUTJp4YO4qwuZgr/STR9VPwQaTs="; })
+  (fetchNuGet { pname = "libse"; version = "4.0.7"; hash = "sha256-fwoo+JBbXu6jIdNksrlROzyuXgO9P2n+l0BLXgn7CeE="; })
+  (fetchNuGet { pname = "LrcParser"; version = "2023.524.0"; hash = "sha256-zChl87a5xZWZCIiAo/AVih1Bjo0BPdTNV4Cgtfa6TAA="; })
+  (fetchNuGet { pname = "MetaBrainz.Common"; version = "3.0.0"; hash = "sha256-P+XTQhffqSVIn0ZbC5Npl80xlx1QYHoL0y20KTvKRy0="; })
+  (fetchNuGet { pname = "MetaBrainz.Common.Json"; version = "6.0.2"; hash = "sha256-4IcF9xZZmI3H7WAiuN2kK61BMXS4gh2T2WrCqkwQhX8="; })
+  (fetchNuGet { pname = "MetaBrainz.MusicBrainz"; version = "6.1.0"; hash = "sha256-wZBTTSQNPll/5/sZPPxa6d0QBjwA8FLA2vFE/838VWs="; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; version = "8.0.7"; hash = "sha256-hvL9k41odX+1hyqdPMfeS5dWi+qi/s9hsgCyxKbdf3M="; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.2.0"; hash = "sha256-y3j3Wo9Xl7kUdGkfnUc8Wexwbc2/vgxy7c3fJk1lSI8="; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Extensions"; version = "2.2.0"; hash = "sha256-1rXxGQnkNR+SiNMtDShYoQVGOZbvu4P4ZtWj5Wq4D4U="; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Features"; version = "2.2.0"; hash = "sha256-odvntHm669YtViNG5fJIxU4B+akA2SL8//DvYCLCNHc="; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.HttpOverrides"; version = "2.2.0"; hash = "sha256-xsscB33I0DhRGWbksHpU82w1WEOIYuUxcfnR2D+rdd0="; })
+  (fetchNuGet { pname = "Microsoft.AspNetCore.Metadata"; version = "8.0.7"; hash = "sha256-QAX2YXKASb9b3ce0ivS38hGnIneXTggoAWUa8d01UrU="; })
+  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; hash = "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4"; hash = "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8="; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0"; hash = "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I="; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; hash = "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A="; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0"; hash = "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o="; })
+  (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0"; hash = "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI="; })
+  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; })
+  (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "8.0.7"; hash = "sha256-SB3xsvBf/YIWzDW3F5FDOearyqnOXga5g4IEz2ZPHMg="; })
+  (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.7"; hash = "sha256-0oDpE5n5scv9nVSkuZ1SbBtecL2Qk0+SP9RoPBU4Lu8="; })
+  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.7"; hash = "sha256-frnGwFjqiq2Ja451sYmH8ZbTtDtSPGyGurzStkDkIpk="; })
+  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.7"; hash = "sha256-MuddWH+nSOJQzHmYeo6NBZDCFIhKXmkkmrJKYP1Gw9A="; })
+  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.7"; hash = "sha256-iWgYqv1/162ldAjwmZ9piCMlzcuyzfPki8+ZU7DMdYU="; })
+  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.7"; hash = "sha256-HVke1SZEqPAJSllC5UAp/yZq0Rw0Ib+0Eq+EwgogY0I="; })
+  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.7"; hash = "sha256-cTIllPWauAbpiMFw5FdacpF6ZJr+ehf+eFG8RrA5Wjg="; })
+  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.7"; hash = "sha256-1mqdhUzUII2aV9WrIwnMbcYJCB677CujxWQq2UXdXNQ="; })
+  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.7"; hash = "sha256-o66nSqRG1vlFpMCoLekpiZyu4K7+OZrknEmNmqKoCx4="; })
+  (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Tools"; version = "8.0.7"; hash = "sha256-XOqrNIV759NIMEhJhagw+l0NZwSweq7ASYq4/nIAIEs="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "3.0.0"; hash = "sha256-UMNREtQwHLsq72PvbOck9DV77qukda4L+q9Ej1k/RI0="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "2.0.0"; hash = "sha256-Eg1MES40kzkGW9tZmjaKtbWI00Kbv7fLJQmjrigjxqk="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; hash = "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "2.0.0"; hash = "sha256-1fnNvp62KrviVwYlqVl1CbdaZVpCDah9eCZeNDGDbWM="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; hash = "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.0"; hash = "sha256-KI1WXvnF/Xe9cKTdDjzm0vd5h9bmM+3KinuWlsF/X+c="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.0"; hash = "sha256-GMxvf0iAiWUWo0awlDczzcxNo8+MITBLp0/SqqYo8Lg="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.0"; hash = "sha256-/B7WjPZPvRM+CPgfaCQunSi2mpclH4orrFxHGLs8Uo4="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; hash = "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.2"; hash = "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "8.0.0"; hash = "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "8.0.0"; hash = "sha256-BCxcjVP+kvrDDB0nzsFCJfU74UK4VBvct2JA4r+jNcs="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "8.0.0"; hash = "sha256-Fi/ijcG5l0BOu7i96xHu96aN5/g7zO6SWQbTsI3Qetg="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.1.0"; hash = "sha256-S72hzDAYWzrfCH5JLJBRtwPEM/Xjh17HwcKuA3wLhvU="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; hash = "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; hash = "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.0"; hash = "sha256-cG0XS3ibJ9siu8eaQGJnyRwlEbQ9c/eGCtvPjs7Rdd8="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.1"; hash = "sha256-lzTYLpRDAi3wW9uRrkTNJtMmaYdtGJJHdBLbUKu60PM="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.1"; hash = "sha256-m8daXRK1Qn9y2c8SmtWu9ysLHwFJtEWiUQoAnMalw7s="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics"; version = "8.0.0"; hash = "sha256-fBLlb9xAfTgZb1cpBxFs/9eA+BlBvF8Xg0DMkBqdHD4="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks"; version = "8.0.7"; hash = "sha256-qBmqcx1FCipx7RnbvHnB5DwAKOCJGE1mvwYJbVKU9Dw="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions"; version = "8.0.7"; hash = "sha256-evrmMiyETj0nU1e8U5WaH2oCrWXMO6faHz4yAeqqzCo="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore"; version = "8.0.7"; hash = "sha256-5mEOkeBRyBLG5tU8V8CXTBcXM5I7oj7VUeafX5crwpk="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.2.0"; hash = "sha256-pLAxP15+PncMiRrUT5bBAhWg7lC6/dfQk5TLTpZzA7k="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; hash = "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "8.0.0"; hash = "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "8.0.0"; hash = "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; hash = "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "3.1.0"; hash = "sha256-nhkt3qVsTXccgrW3mvx8veaJICREzeJrXfrjXI7rNwo="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "8.0.0"; hash = "sha256-UgljypOLld1lL7k7h1noazNzvyEHIJw+r+6uGzucFSY="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "3.1.0"; hash = "sha256-BDrsqgiLYAphIOlnEuXy6iLoED/ykFO53merHCSGfrQ="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.0"; hash = "sha256-D3GHIGN0r6zLHHP2/5jt6hB0oMvRyl5ysvVrPVmmyv8="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.1"; hash = "sha256-TYce3qvMr92JbAZ62ATBsocaH0joJzw0px0tYGZ9N0U="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "7.0.0"; hash = "sha256-JxlxPnjmWbEhYLNWlSn+kNxUfwvlxgKiKFjkJyYGn5Y="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; hash = "sha256-EMvaXxGzueI8lT97bYJQr0kAj1IK0pjnAcWN82hTnzw="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.2.0"; hash = "sha256-YBtPoWBEs+dlHPQ7qOmss+U9gnvG0T1irZY8NwD0QKw="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.1.0"; hash = "sha256-0EOsmu/oLAz9WXp1CtMlclzdvs5jea0zJmokeyFnbCo="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.2"; hash = "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; hash = "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.2.0"; hash = "sha256-DMCTC3HW+sHaRlh/9F1sDwof+XgvVp9IzAqzlZWByn4="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.0"; hash = "sha256-K/cDq+LMfK4cBCvKWkmWAC+IB6pEWolR1J5zL60QPvA="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; })
+  (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; hash = "sha256-pb8AoacSvy8hGNGodU6Lhv1ooWtUSCZwjmwd89PM1HA="; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; })
+  (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; hash = "sha256-OafkxXKnDmLZo5tjifjycax0n0F/OnWQTEZCntBMYR0="; })
+  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; })
+  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; })
+  (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; hash = "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ="; })
+  (fetchNuGet { pname = "MimeTypes"; version = "2.4.0"; hash = "sha256-M35eTCoLiWv7PlBgsTltTvW7TOROf2AYB9nSl2NAsQA="; })
+  (fetchNuGet { pname = "Mono.Nat"; version = "3.0.4"; hash = "sha256-NdOquU2NaKtCv0p1+eY6awjOBwwzf92CwAJ4Dgz2+4M="; })
+  (fetchNuGet { pname = "Mono.TextTemplating"; version = "2.2.1"; hash = "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY="; })
+  (fetchNuGet { pname = "NEbml"; version = "0.11.0"; hash = "sha256-rYZ2COiYjYSFpPipoBf1MrNMSEVrL1+/E8MhOwF/M0s="; })
+  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; })
+  (fetchNuGet { pname = "PlaylistsNET"; version = "1.4.1"; hash = "sha256-Hei2R5S4p0jWhmUNtjL8qbTR1X120GlBeEQBj3tRHH4="; })
+  (fetchNuGet { pname = "prometheus-net"; version = "3.1.2"; hash = "sha256-A9wAYa1WoMCk5i1/fx5MJh6hp0KcPnVrOGt3zBLd3cs="; })
+  (fetchNuGet { pname = "prometheus-net"; version = "8.2.1"; hash = "sha256-NxHeXd4fwwc4MMsT6mrfX81czjHnq2GMStWTabZxMDw="; })
+  (fetchNuGet { pname = "prometheus-net.AspNetCore"; version = "8.2.1"; hash = "sha256-dhrATENkD/1GfSPBkAd3GvyHvzR5q+c+k22UTp33z+c="; })
+  (fetchNuGet { pname = "prometheus-net.DotNetRuntime"; version = "4.4.0"; hash = "sha256-SbCjfHdQoKPschmSJGAFESmwsqF3vE6c5zrKKZtwP8M="; })
+  (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; })
+  (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; })
+  (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; })
+  (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; })
+  (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; })
+  (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; })
+  (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; })
+  (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; })
+  (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; })
+  (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; })
+  (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; })
+  (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; })
+  (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; })
+  (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; })
+  (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; })
+  (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; })
+  (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="; })
+  (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; })
+  (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="; })
+  (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; })
+  (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="; })
+  (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; })
+  (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; })
+  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; })
+  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; })
+  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="; })
+  (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; })
+  (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="; })
+  (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; })
+  (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY="; })
+  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; })
+  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; })
+  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="; })
+  (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; })
+  (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="; })
+  (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; })
+  (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="; })
+  (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; })
+  (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="; })
+  (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; })
+  (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q="; })
+  (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; })
+  (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; })
+  (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; })
+  (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; })
+  (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; })
+  (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; })
+  (fetchNuGet { pname = "Serilog"; version = "2.3.0"; hash = "sha256-vg6NI4K48DeW2oSBqtq3oYg+JITK2QASjdZpBnwIIXg="; })
+  (fetchNuGet { pname = "Serilog"; version = "3.1.1"; hash = "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="; })
+  (fetchNuGet { pname = "Serilog"; version = "4.0.0"; hash = "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="; })
+  (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.2"; hash = "sha256-cRZHG2bqrESOxPVxq2v+mHx+oZBzZEPksrleGVXO1p0="; })
+  (fetchNuGet { pname = "Serilog.Enrichers.Thread"; version = "3.1.0"; hash = "sha256-ETM4hLjkvZgGoci/h7NG1AfsROqzRxEAtF2HKXZU5fg="; })
+  (fetchNuGet { pname = "Serilog.Extensions.Hosting"; version = "8.0.0"; hash = "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E="; })
+  (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "8.0.0"; hash = "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="; })
+  (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "2.0.0"; hash = "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g="; })
+  (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.2"; hash = "sha256-iHRQt6vDk85/6HpMXiJluAwhkjgwEnL3IKavfDgFX0k="; })
+  (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "2.0.0"; hash = "sha256-oRpymEFMGT6VNyZSdKjnUcmVRRl7EXXvgyWt9l8D5W0="; })
+  (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "6.0.0"; hash = "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="; })
+  (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; })
+  (fetchNuGet { pname = "Serilog.Sinks.File"; version = "6.0.0"; hash = "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="; })
+  (fetchNuGet { pname = "Serilog.Sinks.Graylog"; version = "3.1.1"; hash = "sha256-H9DMxdRN6LVmlK95ywqRj3nuoEvGI+9LbmbmijC+eRU="; })
+  (fetchNuGet { pname = "SerilogAnalyzer"; version = "0.15.0"; hash = "sha256-NG0osFNhuVIHDUOd3ZUpygSd0foH3C2QwECURL9nA00="; })
+  (fetchNuGet { pname = "ShimSkiaSharp"; version = "1.0.0.18"; hash = "sha256-72NV+OuW8bCfI/EOXwgS6dleLZnomLJTYeQPPmfhuu8="; })
+  (fetchNuGet { pname = "SkiaSharp"; version = "2.88.8"; hash = "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="; })
+  (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.8"; hash = "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8="; })
+  (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.8"; hash = "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y="; })
+  (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.8"; hash = "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="; })
+  (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.8"; hash = "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="; })
+  (fetchNuGet { pname = "SmartAnalyzers.MultithreadingAnalyzer"; version = "1.1.31"; hash = "sha256-UOhn4T8f5cql/ix8IHecvP6sHUkw2PmnmEfV0jPRZeI="; })
+  (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.6"; hash = "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718="; })
+  (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; hash = "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E="; })
+  (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.6"; hash = "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0="; })
+  (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.6"; hash = "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8="; })
+  (fetchNuGet { pname = "StyleCop.Analyzers"; version = "1.2.0-beta.556"; hash = "sha256-97YYQcr5vZxTvi36608eUkA1wb6xllZQ7UcXbjrYIfU="; })
+  (fetchNuGet { pname = "StyleCop.Analyzers.Unstable"; version = "1.2.0.556"; hash = "sha256-aVop7a9r+X2RsZETgngBm3qQPEIiPBWgHzicGSTEymc="; })
+  (fetchNuGet { pname = "Svg.Custom"; version = "1.0.0.18"; hash = "sha256-RguRPwBM/KCogaiOgjELlvuqN1Tr+b3HA4Odz1rXBgU="; })
+  (fetchNuGet { pname = "Svg.Model"; version = "1.0.0.18"; hash = "sha256-CXZC45txfcd8MuRmDENw2ujlGk74YaUPNs7dXq+Zcg8="; })
+  (fetchNuGet { pname = "Svg.Skia"; version = "1.0.0.18"; hash = "sha256-o5VnCaAGX4LuwNyl7QM0KOg2gNfkD5uNMNthxB7w0m4="; })
+  (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.2.3"; hash = "sha256-FOxHJEYFTfMhI3+/E35v/QqEhWaizueVOBwzHOkGpc8="; })
+  (fetchNuGet { pname = "Swashbuckle.AspNetCore.ReDoc"; version = "6.6.2"; hash = "sha256-wV7wGbF6b4100CGMM5KuY9sBS2ZRwp36flbdEJtTYeo="; })
+  (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.2.3"; hash = "sha256-34eh5bnYwTmqlkk79wqi1wEKG9A5Fxda9T3g5mngajw="; })
+  (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.2.3"; hash = "sha256-Z+uKRf+SVp7n2tfO1pjeasZQV4849VZrDkhF2D8c6rM="; })
+  (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.2.3"; hash = "sha256-Uf8X1kSyLr8td6Ec6LAwlkAEFCMknvogTlqocVb1eWk="; })
+  (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; })
+  (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; hash = "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs="; })
+  (fetchNuGet { pname = "System.CodeDom"; version = "4.4.0"; hash = "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0="; })
+  (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; })
+  (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; })
+  (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; })
+  (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; hash = "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="; })
+  (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; })
+  (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; hash = "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw="; })
+  (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; hash = "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc="; })
+  (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; hash = "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo="; })
+  (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; hash = "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4="; })
+  (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; hash = "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8="; })
+  (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; hash = "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k="; })
+  (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; })
+  (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; })
+  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; })
+  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; })
+  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; })
+  (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.6"; hash = "sha256-dHrc4lCnhmBU3j+bdmgyjNK2pZsbfBRL1zz38lVyQvM="; })
+  (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; })
+  (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; })
+  (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; })
+  (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; })
+  (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; })
+  (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; })
+  (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; })
+  (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; })
+  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; })
+  (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; hash = "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck="; })
+  (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; })
+  (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; })
+  (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; hash = "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="; })
+  (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; })
+  (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; hash = "sha256-7JhQNSvE6JigM1qmmhzOX3NiZ6ek82R4whQNb+FpBzg="; })
+  (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; })
+  (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; hash = "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00="; })
+  (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; })
+  (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; })
+  (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; })
+  (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; })
+  (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; })
+  (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; })
+  (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; })
+  (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; })
+  (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; })
+  (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.1"; hash = "sha256-id27sU4qIEIpgKenO5b4IHt6L1XuNsVe4TR9TKaLWDo="; })
+  (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; })
+  (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; })
+  (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; })
+  (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; })
+  (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; })
+  (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; })
+  (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; })
+  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; hash = "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="; })
+  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; hash = "sha256-Lucrfpuhz72Ns+DOS7MjuNT2KWgi+m4bJkg87kqXmfU="; })
+  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; })
+  (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; })
+  (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; })
+  (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; })
+  (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; })
+  (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; })
+  (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; })
+  (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; })
+  (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; })
+  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; })
+  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; })
+  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; })
+  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; })
+  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="; })
+  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; })
+  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.5.0"; hash = "sha256-o+jikyFOG30gX57GoeZztmuJ878INQ5SFMmKovYqLWs="; })
+  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; })
+  (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; })
+  (fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; })
+  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; })
+  (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; })
+  (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; })
+  (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; hash = "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="; })
+  (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; })
+  (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; })
+  (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "8.0.1"; hash = "sha256-hgCfF91BDd/eOtLEd5jhjzgJdvwmVv4/b42fXRr3nvo="; })
+  (fetchNuGet { pname = "TagLibSharp"; version = "2.3.0"; hash = "sha256-PD9bVZiPaeC8hNx2D+uDUf701cCaMi2IRi5oPTNN+/w="; })
+  (fetchNuGet { pname = "TMDbLib"; version = "2.2.0"; hash = "sha256-r4yV7t/biDORVYP0Go6KSSmNIVRn6IuFQ+Okt8GPvbY="; })
+  (fetchNuGet { pname = "UTF.Unknown"; version = "2.5.1"; hash = "sha256-9D6TqKSPsjzSly0mtUGZJbrNAJ7ftz9LJjWNwnnQMz4="; })
+  (fetchNuGet { pname = "zlib.net-mutliplatform"; version = "1.0.6"; hash = "sha256-xteOxDSWtNY5nHrPRDrMJR80lcE+TMOiSQBG316vOsE="; })
 ]
diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix
index 8ab7526eebce..65182e433a67 100644
--- a/pkgs/by-name/je/jellyfin/package.nix
+++ b/pkgs/by-name/je/jellyfin/package.nix
@@ -13,13 +13,13 @@
 
 buildDotnetModule rec {
   pname = "jellyfin";
-  version = "10.9.7"; # ensure that jellyfin-web has matching version
+  version = "10.9.10"; # ensure that jellyfin-web has matching version
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin";
     rev = "v${version}";
-    sha256 = "sha256-jxOFbmYrgxP6jbjnWubajqXInLXu7TO4vssU4E1oeoc=";
+    sha256 = "sha256-tkSQ7BKic/MD7xcvAPHeFb/RDz++KTLhmAzR4cv1q10=";
   };
 
   propagatedBuildInputs = [ sqlite ];

From ecba63d3e6e0b055f0203832fbeb006e3a9a327a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 25 Aug 2024 14:09:29 +0000
Subject: [PATCH 132/135] rustc: fix building with MinGW target

Building std requires dlltool for the target platform.
---
 pkgs/development/compilers/rust/rustc.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 8cbe04532fb9..509f255fda78 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -3,6 +3,7 @@
 , runCommandLocal, fetchurl, file, python3
 , darwin, cargo, cmake, rustc, rustfmt
 , pkg-config, openssl, xz, zlib
+, bintools
 , libiconv
 , which, libffi
 , withBundledLLVM ? false
@@ -247,6 +248,7 @@ in stdenv.mkDerivation (finalAttrs: {
   dontUseCmakeConfigure = true;
 
   depsBuildBuild = [ pkgsBuildHost.stdenv.cc pkg-config ];
+  depsBuildTarget = lib.optionals stdenv.targetPlatform.isMinGW [ bintools ];
 
   nativeBuildInputs = [
     file python3 rustc cmake

From 5f3faeb529d9076364caf1073ddce8937e85b124 Mon Sep 17 00:00:00 2001
From: "Matthieu C." <886074+teto@users.noreply.github.com>
Date: Sat, 24 Aug 2024 17:21:33 +0200
Subject: [PATCH 133/135] luarocks-packages-updater: move to by-name

---
 .../lu/luarocks-packages-updater/package.nix}            | 9 ++++-----
 .../lu/luarocks-packages-updater}/updater.py             | 0
 pkgs/top-level/all-packages.nix                          | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)
 rename pkgs/{development/lua-modules/updater/default.nix => by-name/lu/luarocks-packages-updater/package.nix} (86%)
 rename pkgs/{development/lua-modules/updater => by-name/lu/luarocks-packages-updater}/updater.py (100%)

diff --git a/pkgs/development/lua-modules/updater/default.nix b/pkgs/by-name/lu/luarocks-packages-updater/package.nix
similarity index 86%
rename from pkgs/development/lua-modules/updater/default.nix
rename to pkgs/by-name/lu/luarocks-packages-updater/package.nix
index e556d4d0dec9..617bfa1057fb 100644
--- a/pkgs/development/lua-modules/updater/default.nix
+++ b/pkgs/by-name/lu/luarocks-packages-updater/package.nix
@@ -1,15 +1,14 @@
-{ buildPythonApplication
-, nix
+{ nix
 , makeWrapper
 , python3Packages
 , lib
-# , nix-prefetch-git
 , nix-prefetch-scripts
 , luarocks-nix
 , lua5_1
 , lua5_2
 , lua5_3
 , lua5_4
+, pluginupdate
 }:
 let
 
@@ -25,7 +24,7 @@ let
   ];
 
 in
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = "luarocks-packages-updater";
   version = "0.1";
 
@@ -45,7 +44,7 @@ buildPythonApplication {
     ''
     mkdir -p $out/bin $out/lib
     cp ${./updater.py} $out/bin/luarocks-packages-updater
-    cp ${../../../../maintainers/scripts/pluginupdate.py} $out/lib/pluginupdate.py
+    cp ${pluginupdate} $out/lib/pluginupdate.py
 
     # wrap python scripts
     makeWrapperArgs+=( --prefix PATH : "${path}" --prefix PYTHONPATH : "$out/lib" \
diff --git a/pkgs/development/lua-modules/updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py
similarity index 100%
rename from pkgs/development/lua-modules/updater/updater.py
rename to pkgs/by-name/lu/luarocks-packages-updater/updater.py
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03f16b6834a0..4880e3fc14cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16692,11 +16692,10 @@ with pkgs;
   luarocks = luaPackages.luarocks;
   luarocks-nix = luaPackages.luarocks-nix;
 
-  luarocks-packages-updater = callPackage ../development/lua-modules/updater {
-    inherit (python3Packages) buildPythonApplication ;
+  luarocks-packages-updater = callPackage ../by-name/lu/luarocks-packages-updater/package.nix {
+    pluginupdate = ../../maintainers/scripts/pluginupdate.py;
   };
 
-
   luau = callPackage ../development/interpreters/luau { };
 
   lune = callPackage ../development/interpreters/lune { };

From e69fc881bb11a8280c2cdf94c1aaf391ef3e3677 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 25 Aug 2024 15:49:23 +0200
Subject: [PATCH 134/135] vimPlugins.sg-nvim: mark as broken

---
 pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 159d5e1b38da..b5fe818dfd9f 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1465,6 +1465,10 @@
         mkdir -p $out/target/debug
         ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug
       '';
+
+      # Build fails with rust > 1.80
+      # https://github.com/sourcegraph/sg.nvim/issues/259
+      meta.broken = true;
     });
 
   skim = buildVimPlugin {

From 669ce8b640c2ac856f714897aaffc5feb614ad57 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Tue, 20 Aug 2024 15:12:21 +0200
Subject: [PATCH 135/135] warzone2100: 4.5.1 -> 4.5.2

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

diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix
index 09285899065c..02c60c157976 100644
--- a/pkgs/games/warzone2100/default.nix
+++ b/pkgs/games/warzone2100/default.nix
@@ -46,11 +46,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   inherit pname;
-  version  = "4.5.1";
+  version  = "4.5.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz";
-    hash = "sha256-+bOS0wJzTZN0bXp0KKL7OO4QWY6TYhZi1R5vJolBdDQ=";
+    hash = "sha256-J8IJH2/A2OO7YP9moWOM77qDW7TdZ40MLVv/y0xDAms=";
   };
 
   buildInputs = [