From 8435137aba4953d8e74fec00a98dc4234896fc30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Jul 2024 07:37:11 +0000
Subject: [PATCH 01/43] vault: 1.17.1 -> 1.17.2

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

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index e2495db96b4c..a5f326069ae1 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "vault";
-  version = "1.17.1";
+  version = "1.17.2";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    hash = "sha256-BpiMgLO75zImJJbFgoW6FauJIOin1oSLvm2qmKZONqY=";
+    hash = "sha256-R8ubsBLpjkBxJaPQokwWKtCcUW45fTkA36JnXCXHkeA=";
   };
 
-  vendorHash = "sha256-gSQjd59drhG0ZkiKTNQX7NEPpv5hMRoNQqeHr5oOMAQ=";
+  vendorHash = "sha256-dS8DYiXXXuDJ9shK07kRUv2JnZ0eFm5YK2k470vwW/I=";
 
   proxyVendor = true;
 

From d14c296d19a9b1489b50d96d997072bc1864160e Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sat, 13 Jul 2024 16:56:55 +0200
Subject: [PATCH 02/43] ubootOrangePiZero3: init

---
 pkgs/misc/uboot/default.nix     | 10 ++++++++++
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 8a81b47d2574..741f9ef1bc1a 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -416,6 +416,16 @@ in {
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
+  ubootOrangePiZero3 = buildUBoot {
+    defconfig = "orangepi_zero3_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    # According to https://linux-sunxi.org/H616 the H618 "is a minor update with a larger (1MB) L2 cache" (compared to the H616)
+    # but "does require extra support in U-Boot, TF-A and sunxi-fel. Support for that has been merged in mainline releases."
+    # But no extra support seems to be in TF-A.
+    BL31 = "${armTrustedFirmwareAllwinnerH616}/bl31.bin";
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
   ubootOrangePi3 = buildUBoot {
     defconfig = "orangepi_3_defconfig";
     extraMeta.platforms = ["aarch64-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd0ad89cb57d..8b0aaea7195f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27746,6 +27746,7 @@ with pkgs;
     ubootOrangePiZeroPlus2H5
     ubootOrangePiZero
     ubootOrangePiZero2
+    ubootOrangePiZero3
     ubootPcduino3Nano
     ubootPine64
     ubootPine64LTS

From af3f6ca5ff30df83fabd71674b460a8420d468d1 Mon Sep 17 00:00:00 2001
From: linsui <linsui@inbox.lv>
Date: Tue, 9 Jul 2024 20:40:54 +0800
Subject: [PATCH 03/43] pjsip: format

---
 .../applications/networking/pjsip/default.nix | 151 +++++++++---------
 1 file changed, 78 insertions(+), 73 deletions(-)

diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index fe0e032dd224..69e874d89545 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -1,17 +1,18 @@
-{ lib
-, testers
-, stdenv
-, fetchFromGitHub
-, openssl
-, libsamplerate
-, swig
-, alsa-lib
-, AppKit
-, CoreFoundation
-, Security
-, python3
-, pythonSupport ? true
-, runCommand
+{
+  lib,
+  testers,
+  stdenv,
+  fetchFromGitHub,
+  openssl,
+  libsamplerate,
+  swig,
+  alsa-lib,
+  AppKit,
+  CoreFoundation,
+  Security,
+  python3,
+  pythonSupport ? true,
+  runCommand,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "pjsip";
@@ -24,22 +25,28 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY=";
   };
 
-  patches = [
-    ./fix-aarch64.patch
+  patches = [ ./fix-aarch64.patch ];
+
+  nativeBuildInputs = lib.optionals pythonSupport [
+    swig
+    python3
   ];
 
-  nativeBuildInputs =
-    lib.optionals pythonSupport [ swig python3 ];
-
-  buildInputs = [ openssl libsamplerate ]
+  buildInputs =
+    [
+      openssl
+      libsamplerate
+    ]
     ++ lib.optional stdenv.isLinux alsa-lib
-    ++ lib.optionals stdenv.isDarwin [ AppKit CoreFoundation Security ];
+    ++ lib.optionals stdenv.isDarwin [
+      AppKit
+      CoreFoundation
+      Security
+    ];
 
-  env = lib.optionalAttrs stdenv.cc.isClang {
-    CXXFLAGS = "-std=c++11";
-  } // lib.optionalAttrs stdenv.isDarwin {
-    NIX_CFLAGS_LINK = "-headerpad_max_install_names";
-  };
+  env =
+    lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; }
+    // lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_LINK = "-headerpad_max_install_names"; };
 
   preConfigure = ''
     export LD=$CC
@@ -51,52 +58,54 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [ "--enable-shared" ];
 
-  outputs = [ "out" ]
-    ++ lib.optional pythonSupport "py";
+  outputs = [ "out" ] ++ lib.optional pythonSupport "py";
 
-  postInstall = ''
-    mkdir -p $out/bin
-    cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
-    mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
-    cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
-  '' + lib.optionalString pythonSupport ''
-    (cd pjsip-apps/src/swig/python && \
-      python setup.py install --prefix=$py
-    )
-  '' + lib.optionalString stdenv.isDarwin ''
-    # On MacOS relative paths are used to refer to libraries. All libraries use
-    # a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to
-    # rewrite these to use absolute ones.
+  postInstall =
+    ''
+      mkdir -p $out/bin
+      cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
+      mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
+      cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
+    ''
+    + lib.optionalString pythonSupport ''
+      (cd pjsip-apps/src/swig/python && \
+        python setup.py install --prefix=$py
+      )
+    ''
+    + lib.optionalString stdenv.isDarwin ''
+      # On MacOS relative paths are used to refer to libraries. All libraries use
+      # a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to
+      # rewrite these to use absolute ones.
 
-    # First, find all libraries (and their symlinks) in our outputs to define
-    # the install_name_tool -change arguments we should pass.
-    readarray -t libraries < <(
-      for outputName in $(getAllOutputNames); do
-        find "''${!outputName}" \( -name '*.dylib*' -o -name '*.so*' \)
+      # First, find all libraries (and their symlinks) in our outputs to define
+      # the install_name_tool -change arguments we should pass.
+      readarray -t libraries < <(
+        for outputName in $(getAllOutputNames); do
+          find "''${!outputName}" \( -name '*.dylib*' -o -name '*.so*' \)
+        done
+      )
+
+      # Determine the install_name_tool -change arguments that are going to be
+      # applied to all libraries.
+      change_args=()
+      for lib in "''${libraries[@]}"; do
+        lib_name="$(basename $lib)"
+        change_args+=(-change ../lib/$lib_name $lib)
+        change_args+=(-change ../../lib/$lib_name $lib)
       done
-    )
 
-    # Determine the install_name_tool -change arguments that are going to be
-    # applied to all libraries.
-    change_args=()
-    for lib in "''${libraries[@]}"; do
-      lib_name="$(basename $lib)"
-      change_args+=(-change ../lib/$lib_name $lib)
-      change_args+=(-change ../../lib/$lib_name $lib)
-    done
+      # Rewrite id and library refences for all non-symlinked libraries.
+      for lib in "''${libraries[@]}"; do
+        if [ -f "$lib" ]; then
+          install_name_tool -id $lib "''${change_args[@]}" $lib
+        fi
+      done
 
-    # Rewrite id and library refences for all non-symlinked libraries.
-    for lib in "''${libraries[@]}"; do
-      if [ -f "$lib" ]; then
-        install_name_tool -id $lib "''${change_args[@]}" $lib
-      fi
-    done
-
-    # Rewrite library references for all executables.
-    find "$out" -executable -type f | while read executable; do
-      install_name_tool "''${change_args[@]}" "$executable"
-    done
-  '';
+      # Rewrite library references for all executables.
+      find "$out" -executable -type f | while read executable; do
+        install_name_tool "''${change_args[@]}" "$executable"
+      done
+    '';
 
   # We need the libgcc_s.so.1 loadable (for pthread_cancel to work)
   dontPatchELF = true;
@@ -106,9 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
     command = "pjsua --version";
   };
 
-  passthru.tests.pkg-config = testers.hasPkgConfigModules {
-    package = finalAttrs.finalPackage;
-  };
+  passthru.tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
 
   passthru.tests.python-pjsua2 = runCommand "python-pjsua2" { } ''
     ${(python3.withPackages (pkgs: [ pkgs.pjsua2 ])).interpreter} -c "import pjsua2" > $out
@@ -121,8 +128,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with maintainers; [ olynch ];
     mainProgram = "pjsua";
     platforms = platforms.linux ++ platforms.darwin;
-    pkgConfigModules = [
-      "libpjproject"
-    ];
+    pkgConfigModules = [ "libpjproject" ];
   };
 })

From 8a2af2b57e658b575b7c68b1611337277a060cba Mon Sep 17 00:00:00 2001
From: linsui <linsui@inbox.lv>
Date: Tue, 9 Jul 2024 20:41:13 +0800
Subject: [PATCH 04/43] pjsip: fix build on python 3.12

---
 pkgs/applications/networking/pjsip/default.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 69e874d89545..b267dee36909 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -27,9 +27,22 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [ ./fix-aarch64.patch ];
 
+  postPatch = ''
+    substituteInPlace \
+      pjsip-apps/src/py_pjsua/setup.py \
+      pjsip-apps/src/swig/python/setup.py \
+      pjsip-apps/src/python/setup.py \
+      pjsip-apps/src/python/setup-vc.py \
+      --replace-fail "distutils.core" "setuptools"
+  '';
+
   nativeBuildInputs = lib.optionals pythonSupport [
     swig
     python3
+    python3.pkgs.build
+    python3.pkgs.installer
+    python3.pkgs.setuptools
+    python3.pkgs.wheel
   ];
 
   buildInputs =
@@ -69,7 +82,8 @@ stdenv.mkDerivation (finalAttrs: {
     ''
     + lib.optionalString pythonSupport ''
       (cd pjsip-apps/src/swig/python && \
-        python setup.py install --prefix=$py
+          python -m build --no-isolation --outdir dist/ --wheel
+          python -m installer --prefix $py dist/*.whl
       )
     ''
     + lib.optionalString stdenv.isDarwin ''

From 89b002b7962a3757a67a95016050328975fbfe1d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 13:47:55 -0400
Subject: [PATCH 05/43] ntpd-rs: pin apple_sdk version in expression

---
 pkgs/tools/networking/ntpd-rs/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix           | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/ntpd-rs/default.nix b/pkgs/tools/networking/ntpd-rs/default.nix
index 6d1353a4e905..f2e0a8299ec3 100644
--- a/pkgs/tools/networking/ntpd-rs/default.nix
+++ b/pkgs/tools/networking/ntpd-rs/default.nix
@@ -5,8 +5,8 @@
   fetchFromGitHub,
   ntpd-rs,
   installShellFiles,
+  darwin,
   pandoc,
-  Security,
   nixosTests,
   testers,
 }:
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-NRFmb9rZVbd0qYKIkslT4TcbC/aD4QhAjm2GA4BvReY=";
 
-  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ];
   nativeBuildInputs = [
     pandoc
     installShellFiles
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b35e4a69c67..9b5f247583ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1940,9 +1940,7 @@ with pkgs;
 
   npm-check-updates = callPackage ../tools/package-management/npm-check-updates { };
 
-  ntpd-rs = darwin.apple_sdk_11_0.callPackage ../tools/networking/ntpd-rs {
-    inherit (darwin.apple_sdk_11_0.frameworks) Security;
-  };
+  ntpd-rs = darwin.apple_sdk_11_0.callPackage ../tools/networking/ntpd-rs { };
 
   ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { };
 

From 263f99457e67a803f68b41d308f927ac989008ec Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 13:49:41 -0400
Subject: [PATCH 06/43] ntpd-rs: migrate to by-name

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

diff --git a/pkgs/tools/networking/ntpd-rs/default.nix b/pkgs/by-name/nt/ntpd-rs/package.nix
similarity index 100%
rename from pkgs/tools/networking/ntpd-rs/default.nix
rename to pkgs/by-name/nt/ntpd-rs/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b5f247583ca..ef954c6df164 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1940,8 +1940,6 @@ with pkgs;
 
   npm-check-updates = callPackage ../tools/package-management/npm-check-updates { };
 
-  ntpd-rs = darwin.apple_sdk_11_0.callPackage ../tools/networking/ntpd-rs { };
-
   ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { };
 
   openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { };

From 94743533ea90dbb2abf9bf0c7691538125801d89 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 13:51:16 -0400
Subject: [PATCH 07/43] ntpd-rs: add updateScript

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

diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix
index f2e0a8299ec3..780eb2c0877d 100644
--- a/pkgs/by-name/nt/ntpd-rs/package.nix
+++ b/pkgs/by-name/nt/ntpd-rs/package.nix
@@ -8,6 +8,7 @@
   darwin,
   pandoc,
   nixosTests,
+  nix-update-script,
   testers,
 }:
 
@@ -62,6 +63,8 @@ rustPlatform.buildRustPackage rec {
         inherit version;
       };
     };
+
+    updateScript = nix-update-script { };
   };
 
   meta = {

From 27d453cf9441a723251acb5d32409ad77384dc72 Mon Sep 17 00:00:00 2001
From: Sumner Evans <sumner.evans@automattic.com>
Date: Tue, 16 Jul 2024 22:06:18 -0600
Subject: [PATCH 08/43] matrix-synapse-unwrapped: 1.110.0 -> 1.111.0

This also reverts d2e41f147f6a4b4930393077822a6738a80ac283 as it is no
longer necessary after https://github.com/element-hq/synapse/pull/17353.

This also adds the python-multipart dependency that was added in
https://github.com/element-hq/synapse/pull/17365

Signed-off-by: Sumner Evans <sumner.evans@automattic.com>
---
 pkgs/servers/matrix-synapse/default.nix | 39 +++++++++----------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 177cee956ca1..ab7573c683e5 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchPypi
 , python3
 , openssl
 , libiconv
@@ -13,39 +12,25 @@
 }:
 
 let
-  python = python3.override {
-    packageOverrides = self: super: {
-      netaddr = super.netaddr.overridePythonAttrs (oldAttrs: rec {
-        version = "1.0.0";
-
-        src = fetchPypi {
-          pname = "netaddr";
-          inherit version;
-          hash = "sha256-6wRrVTVOelv4AcBJAq6SO9aZGQJC2JsJnolvmycktNM=";
-        };
-      });
-    };
-  };
-
-  plugins = python.pkgs.callPackage ./plugins { };
+  plugins = python3.pkgs.callPackage ./plugins { };
   tools = callPackage ./tools { };
 in
-python.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.110.0";
+  version = "1.111.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-DsDQgmHDU+iJ+00p1uch9Zj6lleDvdTQMy05hi8R9CM=";
+    hash = "sha256-CgoJJK2pqkHU8X6oisY19uN6zyjGL8W3irTsraFOYQM=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-J0JBp9pCP00Cjs6T4litjhY28mq0OJDBrRZVSQaS03w=";
+    hash = "sha256-uKyy2m3bvo6U++Qx6t7maeIp84QfMzslPGV1so4ZT3U=";
   };
 
   postPatch = ''
@@ -63,7 +48,7 @@ python.pkgs.buildPythonApplication rec {
     sed -i 's/Pillow = ".*"/Pillow = ">=5.4.0"/' pyproject.toml
   '';
 
-  nativeBuildInputs = with python.pkgs; [
+  nativeBuildInputs = with python3.pkgs; [
     poetry-core
     rustPlatform.cargoSetupHook
     setuptools-rust
@@ -77,7 +62,7 @@ python.pkgs.buildPythonApplication rec {
     libiconv
   ];
 
-  propagatedBuildInputs = with python.pkgs; [
+  propagatedBuildInputs = with python3.pkgs; [
     attrs
     bcrypt
     bleach
@@ -89,6 +74,7 @@ python.pkgs.buildPythonApplication rec {
     jsonschema
     matrix-common
     msgpack
+    python-multipart
     netaddr
     packaging
     phonenumbers
@@ -110,7 +96,7 @@ python.pkgs.buildPythonApplication rec {
   ]
   ++ twisted.optional-dependencies.tls;
 
-  passthru.optional-dependencies = with python.pkgs; {
+  passthru.optional-dependencies = with python3.pkgs; {
     postgres = if isPyPy then [
       psycopg2cffi
     ] else [
@@ -148,7 +134,7 @@ python.pkgs.buildPythonApplication rec {
 
   nativeCheckInputs = [
     openssl
-  ] ++ (with python.pkgs; [
+  ] ++ (with python3.pkgs; [
     mock
     parameterized
   ])
@@ -169,14 +155,15 @@ python.pkgs.buildPythonApplication rec {
       NIX_BUILD_CORES=4
     fi
 
-    PYTHONPATH=".:$PYTHONPATH" ${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests
+    PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests
 
     runHook postCheck
   '';
 
   passthru = {
     tests = { inherit (nixosTests) matrix-synapse matrix-synapse-workers; };
-    inherit plugins tools python;
+    inherit plugins tools;
+    python = python3;
   };
 
   meta = with lib; {

From c5aa149ef9d87cc49f4861b5cc9f054aa31d614d Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 17 Jul 2024 11:27:35 -0300
Subject: [PATCH 09/43] bash-5: remove dtzWill as maintainer [orphan]

Since theey is not active in a long span of time.
---
 pkgs/shells/bash/5.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix
index a757834a4f2d..578e338dcb0e 100644
--- a/pkgs/shells/bash/5.nix
+++ b/pkgs/shells/bash/5.nix
@@ -154,7 +154,7 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl3Plus;
     platforms = platforms.all;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     mainProgram = "bash";
   };
 }

From 2ac414fa93a63a0c33eb24233655726a559563ef Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 17 Jul 2024 12:08:08 -0300
Subject: [PATCH 10/43] treewide: remove dtzWill as maintainer [no orphans]

Since theey is not active in a long span of time.

None of the packages in this commit are orphan.
---
 pkgs/applications/misc/minder/default.nix                       | 2 +-
 pkgs/applications/misc/vit/default.nix                          | 2 +-
 .../networking/instant-messengers/fractal/default.nix           | 2 +-
 pkgs/applications/office/mendeley/default.nix                   | 2 +-
 pkgs/applications/office/planify/default.nix                    | 2 +-
 pkgs/applications/system/qjournalctl/default.nix                | 2 +-
 pkgs/data/fonts/inter/default.nix                               | 2 +-
 pkgs/data/fonts/victor-mono/default.nix                         | 2 +-
 pkgs/data/icons/bibata-cursors/translucent.nix                  | 2 +-
 pkgs/development/libraries/editline/default.nix                 | 2 +-
 pkgs/development/libraries/libfido2/default.nix                 | 2 +-
 pkgs/development/tools/analysis/retdec/default.nix              | 2 +-
 pkgs/development/tools/wllvm/default.nix                        | 2 +-
 pkgs/os-specific/linux/fnotifystat/default.nix                  | 2 +-
 pkgs/tools/system/proot/default.nix                             | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix
index e4e58d9bf6c3..d3e931116e77 100644
--- a/pkgs/applications/misc/minder/default.nix
+++ b/pkgs/applications/misc/minder/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/phase1geo/Minder";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members;
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
     mainProgram = "com.github.phase1geo.minder";
   };
 }
diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix
index 59e0345fc402..bc2d73869a60 100644
--- a/pkgs/applications/misc/vit/default.nix
+++ b/pkgs/applications/misc/vit/default.nix
@@ -34,7 +34,7 @@ buildPythonApplication rec {
     homepage = "https://github.com/scottkosty/vit";
     description = "Visual Interactive Taskwarrior";
     mainProgram = "vit";
-    maintainers = with maintainers; [ dtzWill arcnmx ];
+    maintainers = with maintainers; [ arcnmx ];
     platforms = platforms.all;
     license = licenses.mit;
   };
diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index cdbddfe9959a..56593cc315cb 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.gnome.org/GNOME/fractal";
     changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${version}";
     license = licenses.gpl3Plus;
-    maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler dtzWill ]);
+    maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler ]);
     platforms = platforms.linux;
     mainProgram = "fractal";
   };
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 089e7ca057e5..56b771afdeaf 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -38,7 +38,7 @@ in appimageTools.wrapType2 {
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    maintainers  = with maintainers; [ dtzWill atila ];
+    maintainers  = with maintainers; [ atila ];
     mainProgram = "mendeley-reference-manager";
   };
 
diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix
index 3a084c358469..1181989a3013 100644
--- a/pkgs/applications/office/planify/default.nix
+++ b/pkgs/applications/office/planify/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     description = "Task manager with Todoist support designed for GNU/Linux";
     homepage = "https://github.com/alainm23/planify";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members;
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
     platforms = platforms.linux;
     mainProgram = "io.github.alainm23.planify";
   };
diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/applications/system/qjournalctl/default.nix
index d3bec7e306d5..5c8714677ad9 100644
--- a/pkgs/applications/system/qjournalctl/default.nix
+++ b/pkgs/applications/system/qjournalctl/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/pentix/qjournalctl";
     license = licenses.gpl3Only;
     platforms = platforms.all;
-    maintainers = with maintainers; [ dtzWill srgom romildo ];
+    maintainers = with maintainers; [ srgom romildo ];
   };
 }
diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix
index 2bed6db734bb..5c7f014f35f7 100644
--- a/pkgs/data/fonts/inter/default.nix
+++ b/pkgs/data/fonts/inter/default.nix
@@ -24,6 +24,6 @@ stdenvNoCC.mkDerivation rec {
     description = "Typeface specially designed for user interfaces";
     license = licenses.ofl;
     platforms = platforms.all;
-    maintainers = with maintainers; [ demize dtzWill ];
+    maintainers = with maintainers; [ demize ];
   };
 }
diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix
index a855cf8b80bb..f5319c008b55 100644
--- a/pkgs/data/fonts/victor-mono/default.nix
+++ b/pkgs/data/fonts/victor-mono/default.nix
@@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation rec {
     description = "Free programming font with cursive italics and ligatures";
     homepage = "https://rubjo.github.io/victor-mono";
     license = licenses.ofl;
-    maintainers = with maintainers; [ jpotier dtzWill ];
+    maintainers = with maintainers; [ jpotier ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix
index fa01e05766b4..7cae52a3e4de 100644
--- a/pkgs/data/icons/bibata-cursors/translucent.nix
+++ b/pkgs/data/icons/bibata-cursors/translucent.nix
@@ -21,6 +21,6 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ dtzWill AdsonCicilioti ];
+    maintainers = with maintainers; [ AdsonCicilioti ];
   };
 }
diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix
index 3571554559c7..95776d885f06 100644
--- a/pkgs/development/libraries/editline/default.nix
+++ b/pkgs/development/libraries/editline/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     homepage = "https://troglobit.com/projects/editline/";
     description = "Readline() replacement for UNIX without termcap (ncurses)";
     license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ dtzWill oxalica ];
+    maintainers = with maintainers; [ oxalica ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix
index b3c3cc450237..9511d263109f 100644
--- a/pkgs/development/libraries/libfido2/default.nix
+++ b/pkgs/development/libraries/libfido2/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/Yubico/libfido2";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ dtzWill prusnak ];
+    maintainers = with maintainers; [ prusnak ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix
index 2448556aa62c..c562479eb052 100644
--- a/pkgs/development/tools/analysis/retdec/default.nix
+++ b/pkgs/development/tools/analysis/retdec/default.nix
@@ -230,7 +230,7 @@ stdenv.mkDerivation (self: {
     description = "Retargetable machine-code decompiler based on LLVM";
     homepage = "https://retdec.com";
     license = licenses.mit;
-    maintainers = with maintainers; [ dtzWill katrinafyi ];
+    maintainers = with maintainers; [ katrinafyi ];
     platforms = [ "x86_64-linux" ];
   };
 })
diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix
index 5a2ef3b16dcf..38e10f726160 100644
--- a/pkgs/development/tools/wllvm/default.nix
+++ b/pkgs/development/tools/wllvm/default.nix
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/travitch/whole-program-llvm";
     description = "Wrapper script to build whole-program LLVM bitcode files";
     license = licenses.mit;
-    maintainers = with maintainers; [ mic92 dtzWill ];
+    maintainers = with maintainers; [ mic92 ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix
index 4961450fa36e..28fde2629f69 100644
--- a/pkgs/os-specific/linux/fnotifystat/default.nix
+++ b/pkgs/os-specific/linux/fnotifystat/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/ColinIanKing/fnotifystat";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ womfoo dtzWill ];
+    maintainers = with maintainers; [ womfoo ];
   };
 }
diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix
index 79f96cccf39f..adcbb1de9d2a 100644
--- a/pkgs/tools/system/proot/default.nix
+++ b/pkgs/tools/system/proot/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     description = "User-space implementation of chroot, mount --bind and binfmt_misc";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ianwookim makefu veprbl dtzWill ];
+    maintainers = with maintainers; [ ianwookim makefu veprbl ];
     mainProgram = "proot";
   };
 }

From 6dba240f79031e544b92983635885c94f665bd07 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 17 Jul 2024 13:52:45 -0300
Subject: [PATCH 11/43] treewide: remove dtzWill as maintainer [orphans]

Since theey is not active in a long span of time.

All the packages in this commit are now orphan.
---
 pkgs/applications/audio/radiotray-ng/default.nix                | 2 +-
 pkgs/applications/misc/heimer/default.nix                       | 2 +-
 pkgs/applications/misc/notable/default.nix                      | 2 +-
 .../pidgin/pidgin-plugins/purple-googlechat/default.nix         | 2 +-
 .../networking/instant-messengers/slack-term/default.nix        | 2 +-
 pkgs/applications/office/ktimetracker/default.nix               | 2 +-
 pkgs/applications/science/math/nota/default.nix                 | 2 +-
 pkgs/applications/version-management/lab/default.nix            | 2 +-
 pkgs/applications/video/catt/default.nix                        | 2 +-
 pkgs/by-name/fa/fac/package.nix                                 | 2 +-
 pkgs/data/fonts/agave/default.nix                               | 2 +-
 pkgs/data/fonts/ankacoder/condensed.nix                         | 2 +-
 pkgs/data/fonts/ankacoder/default.nix                           | 2 +-
 pkgs/data/fonts/cherry/default.nix                              | 2 +-
 pkgs/data/fonts/d2coding/default.nix                            | 2 +-
 pkgs/data/fonts/hermit/default.nix                              | 2 +-
 pkgs/data/fonts/luculent/default.nix                            | 2 +-
 pkgs/data/fonts/manrope/default.nix                             | 2 +-
 pkgs/data/fonts/national-park/default.nix                       | 2 +-
 pkgs/data/fonts/public-sans/default.nix                         | 2 +-
 pkgs/data/fonts/redhat-official/default.nix                     | 2 +-
 pkgs/data/fonts/spleen/default.nix                              | 2 +-
 pkgs/data/fonts/sudo/default.nix                                | 2 +-
 pkgs/data/themes/adementary/default.nix                         | 2 +-
 pkgs/development/compilers/firrtl/default.nix                   | 2 +-
 pkgs/development/libraries/libcbor/default.nix                  | 2 +-
 pkgs/development/libraries/libexecinfo/default.nix              | 2 +-
 pkgs/development/libraries/libykclient/default.nix              | 2 +-
 pkgs/development/libraries/yubico-pam/default.nix               | 2 +-
 pkgs/development/mobile/webos/cmake-modules.nix                 | 2 +-
 pkgs/development/mobile/webos/novacom.nix                       | 2 +-
 pkgs/development/mobile/webos/novacomd.nix                      | 2 +-
 pkgs/development/python-modules/lit/default.nix                 | 2 +-
 pkgs/development/tools/analysis/snowman/default.nix             | 2 +-
 pkgs/development/tools/bloaty/default.nix                       | 2 +-
 pkgs/development/tools/boomerang/default.nix                    | 2 +-
 pkgs/development/tools/gllvm/default.nix                        | 2 +-
 pkgs/development/tools/misc/creduce/default.nix                 | 2 +-
 pkgs/development/tools/misc/csmith/default.nix                  | 2 +-
 pkgs/development/tools/misc/elfinfo/default.nix                 | 2 +-
 pkgs/development/tools/misc/elfkickers/default.nix              | 2 +-
 pkgs/development/tools/misc/go-license-detector/default.nix     | 2 +-
 pkgs/development/tools/misc/gtkperf/default.nix                 | 2 +-
 pkgs/development/tools/misc/libwhich/default.nix                | 2 +-
 pkgs/development/tools/misc/whatstyle/default.nix               | 2 +-
 pkgs/games/nudoku/default.nix                                   | 2 +-
 pkgs/os-specific/linux/cpustat/default.nix                      | 2 +-
 pkgs/servers/irker/default.nix                                  | 2 +-
 pkgs/tools/misc/bdf2sfd/default.nix                             | 2 +-
 pkgs/tools/misc/fx-cast-bridge/default.nix                      | 2 +-
 50 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
index 51dbc26f5617..c583f08d02f7 100644
--- a/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
     description = "Internet radio player for linux";
     homepage = "https://github.com/ebruck/radiotray-ng";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix
index 8672169d02ab..7f9b1ae96bbb 100644
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@@ -32,7 +32,7 @@ mkDerivation rec {
     homepage = "https://github.com/juzzlin/Heimer";
     changelog = "https://github.com/juzzlin/Heimer/blob/${version}/CHANGELOG";
     license = licenses.gpl3Plus;
-    maintainers  = with maintainers; [ dtzWill ];
+    maintainers  = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix
index 0021cc722125..4dde27827c96 100644
--- a/pkgs/applications/misc/notable/default.nix
+++ b/pkgs/applications/misc/notable/default.nix
@@ -40,6 +40,6 @@ appimageTools.wrapType2 rec {
     homepage = "https://github.com/notable/notable";
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix
index b274b55ac228..217b87c26aba 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation {
     description = "Native Google Chat support for pidgin";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
index 2750336cf1d1..b03446d88981 100644
--- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
@@ -16,7 +16,7 @@ buildGoModule rec {
     description = "Slack client for your terminal";
     homepage = "https://github.com/erroneousboat/slack-term";
     license = licenses.mit;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     mainProgram = "slack-term";
   };
 }
diff --git a/pkgs/applications/office/ktimetracker/default.nix b/pkgs/applications/office/ktimetracker/default.nix
index 58720625cc8e..0bca13475338 100644
--- a/pkgs/applications/office/ktimetracker/default.nix
+++ b/pkgs/applications/office/ktimetracker/default.nix
@@ -28,6 +28,6 @@ kio knotifications kwindowsystem kxmlgui ktextwidgets
     mainProgram = "ktimetracker";
     license = licenses.gpl2;
     homepage = "https://userbase.kde.org/KTimeTracker";
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/science/math/nota/default.nix b/pkgs/applications/science/math/nota/default.nix
index eae11806d725..6b13c8160cfb 100644
--- a/pkgs/applications/science/math/nota/default.nix
+++ b/pkgs/applications/science/math/nota/default.nix
@@ -36,6 +36,6 @@ mkDerivation rec {
   description = "Most beautiful command line calculator";
   homepage = "https://kary.us/nota";
   license = lib.licenses.mpl20;
-  maintainers = with lib.maintainers; [ dtzWill ];
+  maintainers = with lib.maintainers; [ ];
   mainProgram = "nota";
 }
diff --git a/pkgs/applications/version-management/lab/default.nix b/pkgs/applications/version-management/lab/default.nix
index 0a4637d533fb..9155f7398c8a 100644
--- a/pkgs/applications/version-management/lab/default.nix
+++ b/pkgs/applications/version-management/lab/default.nix
@@ -36,7 +36,7 @@ buildGoModule rec {
     description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab";
     homepage = "https://zaquestion.github.io/lab";
     license = licenses.cc0;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     mainProgram = "lab";
   };
 }
diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix
index 608236d68830..5b22b30e7682 100644
--- a/pkgs/applications/video/catt/default.nix
+++ b/pkgs/applications/video/catt/default.nix
@@ -63,7 +63,7 @@ python.pkgs.buildPythonApplication rec {
     description = "Tool to send media from online sources to Chromecast devices";
     homepage = "https://github.com/skorokithakis/catt";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     mainProgram = "catt";
   };
 }
diff --git a/pkgs/by-name/fa/fac/package.nix b/pkgs/by-name/fa/fac/package.nix
index e7b09e73b355..93aff4bec617 100644
--- a/pkgs/by-name/fa/fac/package.nix
+++ b/pkgs/by-name/fa/fac/package.nix
@@ -38,6 +38,6 @@ buildGoModule rec {
     homepage = "https://github.com/mkchoi212/fac";
     license = lib.licenses.mit;
     mainProgram = "fac";
-    maintainers = with lib.maintainers; [ dtzWill ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix
index d2ecda3a1118..83efef0ab9b6 100644
--- a/pkgs/data/fonts/agave/default.nix
+++ b/pkgs/data/fonts/agave/default.nix
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
     description = "truetype monospaced typeface designed for X environments";
     homepage = "https://b.agaric.net/page/agave";
     license = licenses.mit;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/data/fonts/ankacoder/condensed.nix
index 676c3cf85602..bf56f5abc0f9 100644
--- a/pkgs/data/fonts/ankacoder/condensed.nix
+++ b/pkgs/data/fonts/ankacoder/condensed.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
     description = "Anka/Coder Condensed font";
     homepage = "https://code.google.com/archive/p/anka-coder-fonts";
     license = licenses.ofl;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix
index c363f025bfd2..8497cbdee3fd 100644
--- a/pkgs/data/fonts/ankacoder/default.nix
+++ b/pkgs/data/fonts/ankacoder/default.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
     description = "Anka/Coder fonts";
     homepage = "https://code.google.com/archive/p/anka-coder-fonts";
     license = licenses.ofl;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/cherry/default.nix b/pkgs/data/fonts/cherry/default.nix
index 2e9577751551..8bdfb6f94f6e 100644
--- a/pkgs/data/fonts/cherry/default.nix
+++ b/pkgs/data/fonts/cherry/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "cherry font";
     homepage = "https://github.com/turquoise-hexagon/cherry";
     license = licenses.mit;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/d2coding/default.nix b/pkgs/data/fonts/d2coding/default.nix
index be6f0809ed97..e5b6a59af488 100644
--- a/pkgs/data/fonts/d2coding/default.nix
+++ b/pkgs/data/fonts/d2coding/default.nix
@@ -30,6 +30,6 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://github.com/naver/d2codingfont";
     license = licenses.ofl;
     platforms = platforms.all;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/data/fonts/hermit/default.nix b/pkgs/data/fonts/hermit/default.nix
index 3ff770522d9e..ce69b0080908 100644
--- a/pkgs/data/fonts/hermit/default.nix
+++ b/pkgs/data/fonts/hermit/default.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
     description = "monospace font designed to be clear, pragmatic and very readable";
     homepage = "https://pcaro.es/p/hermit";
     license = licenses.ofl;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/data/fonts/luculent/default.nix
index 1347af957e46..09d07a2a1d0c 100644
--- a/pkgs/data/fonts/luculent/default.nix
+++ b/pkgs/data/fonts/luculent/default.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
     description = "luculent font";
     homepage = "http://www.eastfarthing.com/luculent/";
     license = licenses.ofl;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/manrope/default.nix b/pkgs/data/fonts/manrope/default.nix
index e42d7879af74..90982efbc809 100644
--- a/pkgs/data/fonts/manrope/default.nix
+++ b/pkgs/data/fonts/manrope/default.nix
@@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://www.gent.media/manrope";
     license = licenses.ofl;
     platforms = platforms.all;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/data/fonts/national-park/default.nix b/pkgs/data/fonts/national-park/default.nix
index 4970e0d5920f..0a1e320f7876 100644
--- a/pkgs/data/fonts/national-park/default.nix
+++ b/pkgs/data/fonts/national-park/default.nix
@@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec {
     signs that are carved using a router bit'';
     homepage = "https://nationalparktypeface.com/";
     license = licenses.ofl;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix
index 18e1b66e0ec5..45a8540d080d 100644
--- a/pkgs/data/fonts/public-sans/default.nix
+++ b/pkgs/data/fonts/public-sans/default.nix
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://public-sans.digital.gov/";
     changelog = "https://github.com/uswds/public-sans/raw/v${version}/FONTLOG.txt";
     license = licenses.ofl;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix
index 76782d510509..df0f867b7a92 100644
--- a/pkgs/data/fonts/redhat-official/default.nix
+++ b/pkgs/data/fonts/redhat-official/default.nix
@@ -27,6 +27,6 @@ stdenvNoCC.mkDerivation rec {
     description = "Red Hat's Open Source Fonts - Red Hat Display and Red Hat Text";
     license = licenses.ofl;
     platforms = platforms.all;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix
index ef9e2956b924..c5edbc5051c3 100644
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation rec {
     description = "Monospaced bitmap fonts";
     homepage = "https://www.cambus.net/spleen-monospaced-bitmap-fonts";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix
index 8f5ef089533b..a69c947ce449 100644
--- a/pkgs/data/fonts/sudo/default.nix
+++ b/pkgs/data/fonts/sudo/default.nix
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://www.kutilek.de/sudo-font/";
     changelog = "https://github.com/jenskutilek/sudo-font/raw/v${version}/sudo/FONTLOG.txt";
     license = licenses.ofl;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/themes/adementary/default.nix b/pkgs/data/themes/adementary/default.nix
index 8b03132bfcb7..fb3431cc139b 100644
--- a/pkgs/data/themes/adementary/default.nix
+++ b/pkgs/data/themes/adementary/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "Adwaita-based GTK theme with design influence from elementary OS and Vertex GTK theme";
     homepage    = "https://github.com/hrdwrrsk/adementary-theme";
     license     = licenses.gpl3;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     platforms   = platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/firrtl/default.nix b/pkgs/development/compilers/firrtl/default.nix
index 54138a6d3de8..e5f10739d6a9 100644
--- a/pkgs/development/compilers/firrtl/default.nix
+++ b/pkgs/development/compilers/firrtl/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://www.chisel-lang.org/firrtl/";
     license = licenses.asl20;
-    maintainers =  with maintainers; [ dtzWill ];
+    maintainers =  with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix
index 349f4589172a..4cd36f44013f 100644
--- a/pkgs/development/libraries/libcbor/default.nix
+++ b/pkgs/development/libraries/libcbor/default.nix
@@ -54,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "CBOR protocol implementation for C and others";
     homepage = "https://github.com/PJK/libcbor";
     license = licenses.mit;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 })
diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix
index 36f956e77724..b2ce5b0b2cfc 100644
--- a/pkgs/development/libraries/libexecinfo/default.nix
+++ b/pkgs/development/libraries/libexecinfo/default.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
     description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility";
     license = licenses.bsd2;
     homepage = "https://www.freshports.org/devel/libexecinfo";
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix
index 240f771e49f1..9113b5b6a1a7 100644
--- a/pkgs/development/libraries/libykclient/default.nix
+++ b/pkgs/development/libraries/libykclient/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation {
     mainProgram = "ykclient";
     homepage = "https://developers.yubico.com/yubico-c-client";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix
index bcd6a245bb4f..742f581f7e33 100644
--- a/pkgs/development/libraries/yubico-pam/default.nix
+++ b/pkgs/development/libraries/yubico-pam/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     mainProgram = "ykpamcfg";
     homepage = "https://developers.yubico.com/yubico-pam";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/mobile/webos/cmake-modules.nix b/pkgs/development/mobile/webos/cmake-modules.nix
index 0f73646c7691..5ee1d58615b0 100644
--- a/pkgs/development/mobile/webos/cmake-modules.nix
+++ b/pkgs/development/mobile/webos/cmake-modules.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "CMake modules needed to build Open WebOS components";
     license = licenses.asl20;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix
index eca29dd2fabd..d82e6daeda46 100644
--- a/pkgs/development/mobile/webos/novacom.nix
+++ b/pkgs/development/mobile/webos/novacom.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Utility for communicating with WebOS devices";
     license = licenses.asl20;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix
index 34559354c275..64ec15661c3e 100644
--- a/pkgs/development/mobile/webos/novacomd.nix
+++ b/pkgs/development/mobile/webos/novacomd.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     description = "Daemon for communicating with WebOS devices";
     mainProgram = "novacomd";
     license = licenses.asl20;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/python-modules/lit/default.nix b/pkgs/development/python-modules/lit/default.nix
index 6d4aec66c750..ac518e81ff17 100644
--- a/pkgs/development/python-modules/lit/default.nix
+++ b/pkgs/development/python-modules/lit/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     mainProgram = "lit";
     homepage = "http://llvm.org/docs/CommandGuide/lit.html";
     license = lib.licenses.ncsa;
-    maintainers = with lib.maintainers; [ dtzWill ];
+    maintainers = with lib.maintainers; [ ];
   };
 }
diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix
index 870f084580b8..4e2af64c607b 100644
--- a/pkgs/development/tools/analysis/snowman/default.nix
+++ b/pkgs/development/tools/analysis/snowman/default.nix
@@ -25,7 +25,7 @@ mkDerivation rec {
 
     # https://github.com/yegord/snowman/blob/master/doc/licenses.asciidoc
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
index f9b133f2aaa7..7f2fb6daeaf7 100644
--- a/pkgs/development/tools/bloaty/default.nix
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/google/bloaty";
     license = licenses.asl20;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix
index e0e6823b0a27..d173403e3dea 100644
--- a/pkgs/development/tools/boomerang/default.nix
+++ b/pkgs/development/tools/boomerang/default.nix
@@ -33,6 +33,6 @@ mkDerivation rec {
     homepage = "https://github.com/BoomerangDecompiler/boomerang";
     license = licenses.bsd3;
     description = "General, open source, retargetable decompiler";
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
index 14b24d91dac5..457895c06164 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -22,6 +22,6 @@ buildGoModule rec {
     homepage = "https://github.com/SRI-CSL/gllvm";
     description = "Whole Program LLVM: wllvm ported to go";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix
index e41d8d3379fe..7adc78013f47 100644
--- a/pkgs/development/tools/misc/creduce/default.nix
+++ b/pkgs/development/tools/misc/creduce/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
       property.  It is intended for use by people who discover and report
       bugs in compilers and other tools that process C/C++ code.
     '';
-    maintainers = [ maintainers.dtzWill ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix
index 529339c38c11..52955577ee7f 100644
--- a/pkgs/development/tools/misc/csmith/default.nix
+++ b/pkgs/development/tools/misc/csmith/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
       Csmith has found bugs in every tool that it has tested, and has been used
       to find and report more than 400 previously unknown compiler bugs.
     '';
-    maintainers = [ maintainers.dtzWill ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix
index 6b0c5b21af41..2af3f4cd3987 100644
--- a/pkgs/development/tools/misc/elfinfo/default.nix
+++ b/pkgs/development/tools/misc/elfinfo/default.nix
@@ -22,6 +22,6 @@ buildGoModule rec {
     homepage = "https://elfinfo.roboticoverlords.org/";
     changelog = "https://github.com/xyproto/elfinfo/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix
index fa2ed6e39534..9a612593d06f 100644
--- a/pkgs/development/tools/misc/elfkickers/default.nix
+++ b/pkgs/development/tools/misc/elfkickers/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     description = "Collection of programs that access and manipulate ELF files";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.dtzWill ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix
index cbef7ae0d9da..81f35d7ec481 100644
--- a/pkgs/development/tools/misc/go-license-detector/default.nix
+++ b/pkgs/development/tools/misc/go-license-detector/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
     description = "Reliable project licenses detector";
     homepage = "https://github.com/go-enry/go-license-detector";
     license = licenses.asl20;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     mainProgram = "license-detector";
   };
 }
diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix
index a478306cad67..bee2b85c78da 100644
--- a/pkgs/development/tools/misc/gtkperf/default.nix
+++ b/pkgs/development/tools/misc/gtkperf/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     mainProgram = "gtkperf";
     homepage = "https://gtkperf.sourceforge.net/";
     license = with licenses; [ gpl2 ];
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/development/tools/misc/libwhich/default.nix
index 915e1018c561..c6d89a4c6bdb 100644
--- a/pkgs/development/tools/misc/libwhich/default.nix
+++ b/pkgs/development/tools/misc/libwhich/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     mainProgram = "libwhich";
     homepage = "https://github.com/vtjnash/libwhich";
     license = licenses.mit;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix
index 4293a458977b..acfaa7873655 100644
--- a/pkgs/development/tools/misc/whatstyle/default.nix
+++ b/pkgs/development/tools/misc/whatstyle/default.nix
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
     mainProgram = "whatstyle";
     homepage = "https://github.com/mikr/whatstyle";
     license = licenses.mit;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/games/nudoku/default.nix b/pkgs/games/nudoku/default.nix
index cb09c466c8d5..e9ebeadf4513 100644
--- a/pkgs/games/nudoku/default.nix
+++ b/pkgs/games/nudoku/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     homepage = "http://jubalh.github.io/nudoku/";
     license = licenses.gpl3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
   };
 }
 
diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/pkgs/os-specific/linux/cpustat/default.nix
index 84a4fc53933e..8d58f3ff785f 100644
--- a/pkgs/os-specific/linux/cpustat/default.nix
+++ b/pkgs/os-specific/linux/cpustat/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/ColinIanKing/cpustat";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     mainProgram = "cpustat";
   };
 }
diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix
index 28f6b60cf76b..7fae20bc1edb 100644
--- a/pkgs/servers/irker/default.nix
+++ b/pkgs/servers/irker/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     description = "IRC client that runs as a daemon accepting notification requests";
     homepage = "https://gitlab.com/esr/irker";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     mainProgram = "irkerd";
     platforms = platforms.unix;
   };
diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/tools/misc/bdf2sfd/default.nix
index 73a72ffeb61a..b5b9cd5ec751 100644
--- a/pkgs/tools/misc/bdf2sfd/default.nix
+++ b/pkgs/tools/misc/bdf2sfd/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/fcambus/bdf2sfd";
     license = licenses.bsd2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     mainProgram = "bdf2sfd";
   };
 }
diff --git a/pkgs/tools/misc/fx-cast-bridge/default.nix b/pkgs/tools/misc/fx-cast-bridge/default.nix
index 722905df951f..11402d8f455c 100644
--- a/pkgs/tools/misc/fx-cast-bridge/default.nix
+++ b/pkgs/tools/misc/fx-cast-bridge/default.nix
@@ -52,7 +52,7 @@ buildNpmPackage rec {
     description = "Implementation of the Chrome Sender API (Chromecast) within Firefox";
     homepage = "https://hensm.github.io/fx_cast/";
     license = licenses.mit;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ ];
     mainProgram = "fx_cast_bridge";
   };
 }

From 014c159c310feb8b6084cfaea0fe0fb954362e88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jul 2024 22:08:18 +0000
Subject: [PATCH 12/43] termscp: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/tools/networking/termscp/default.nix b/pkgs/tools/networking/termscp/default.nix
index a5777a1f7f28..fdff493abd90 100644
--- a/pkgs/tools/networking/termscp/default.nix
+++ b/pkgs/tools/networking/termscp/default.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "termscp";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "veeso";
     repo = "termscp";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/Mnoljgp87ML6+3vV1vZTFO0TSY5hr8E8U1fXJq31pE=";
+    hash = "sha256-XK0bH5ru248tSlD3Sdxb07O6i335dfTFvxDzKdc/3GQ=";
   };
 
-  cargoHash = "sha256-xq21cncEYNSwDiKvVSM1J2Jz3TqOkYMK3gckKpM5+6E=";
+  cargoHash = "sha256-DzKxVqE0GMmpkxLH3raASgha9qGGs4kaUdSaviUwvdM=";
 
   nativeBuildInputs = [
     pkg-config

From 96f4c0fde85b7078c6ef58b710ffd8fd12dd05ee Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Mon, 15 Jul 2024 13:55:10 -0600
Subject: [PATCH 13/43] non: fix outdated waf

---
 pkgs/applications/audio/non/default.nix | 7 +++++++
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index f6f2ba3f73c9..bd4c83742930 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -17,6 +17,13 @@ stdenv.mkDerivation {
                   ladspaH liblo libsigcxx lrdf
   ];
 
+  # NOTE: non provides its own waf script that is incompatible with new
+  # python versions. If the script is not present, wafHook will install
+  # a compatible version from nixpkgs.
+  prePatch = ''
+    rm waf
+  '';
+
   env.CXXFLAGS = "-std=c++14";
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90d8537e215b..c54715ad6b13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23253,7 +23253,9 @@ with pkgs;
 
   nntp-proxy = callPackage ../applications/networking/nntp-proxy { };
 
-  non = callPackage ../applications/audio/non { };
+  non = callPackage ../applications/audio/non {
+    wafHook = (waf.override { extraTools = [ "gccdeps" ]; }).hook;
+  };
 
   ntl = callPackage ../development/libraries/ntl { };
 

From afd61894bb6f2ec8f70f28be2e710759182cadfa Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 18 Jul 2024 22:10:00 +0100
Subject: [PATCH 14/43] egl-wayland: 1.1.13 -> 1.1.14

Changes: https://github.com/NVIDIA/egl-wayland/releases/tag/1.1.14
---
 pkgs/development/libraries/egl-wayland/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix
index 7291ff8f8e9d..3cb34f871e3a 100644
--- a/pkgs/development/libraries/egl-wayland/default.nix
+++ b/pkgs/development/libraries/egl-wayland/default.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation rec {
   pname = "egl-wayland";
-  version = "1.1.13";
+  version = "1.1.14";
 
   outputs = [ "out" "dev" ];
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     owner = "Nvidia";
     repo = pname;
     rev = version;
-    hash = "sha256-NA+jr27aYu0XPG9sxnBtjeBTFHmV7TENRsFy8dDdNUc=";
+    hash = "sha256-MD+D/dRem3ONWGPoZ77j2UKcOCUuQ0nrahEQkNVEUnI=";
   };
 
   postPatch = ''

From c9e37098672cfa7c7a9090f1a7e1438fdfa92819 Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Sun, 14 Jul 2024 17:22:02 -0400
Subject: [PATCH 15/43] python312Packages.pypillowfight: 0.3.0 ->
 0.3.0-unstable-2024-07-07, modernize and remove nose

Updates to a recent commit that removes nose in favor of pytest. Also
includes a few misc improvements made upstream.
---
 .../python-modules/pypillowfight/default.nix  | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix
index 601db553cf5e..8c001b7ebf82 100644
--- a/pkgs/development/python-modules/pypillowfight/default.nix
+++ b/pkgs/development/python-modules/pypillowfight/default.nix
@@ -2,44 +2,39 @@
   lib,
   buildPythonPackage,
   fetchFromGitLab,
-  nose,
   pillow,
-  isPy3k,
-  isPyPy,
+  pytestCheckHook,
+  setuptools,
 }:
 buildPythonPackage rec {
   pname = "pypillowfight";
-  version = "0.3.0";
-  format = "setuptools";
+  version = "0.3.0-unstable-2024-07-07";
+  pyproject = true;
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     group = "World";
     owner = "OpenPaperwork";
     repo = "libpillowfight";
-    rev = version;
-    sha256 = "096242v425mlqqj5g1giy59p7grxp05g78w6bk37vzph98jrgv3w";
+    # Currently no tagged release past 0.3.0 and we need these patches to fix Python 3.12 compat
+    rev = "4d5f739b725530cd61e709071d31e9f707c64bd6";
+    hash = "sha256-o5FzUSDq0lwkXGXRMsS5NB/Mp4Ie833wkxKPziR23f4=";
   };
 
   prePatch = ''
     echo '#define INTERNAL_PILLOWFIGHT_VERSION "${version}"' > src/pillowfight/_version.h
   '';
 
-  # Disable tests because they're designed to only work on Debian:
-  # https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174
-  doCheck = false;
+  build-system = [ setuptools ];
 
-  # Python 2.x is not supported, see:
-  # https://github.com/jflesch/libpillowfight/issues/1
-  disabled = !isPy3k && !isPyPy;
+  dependencies = [ pillow ];
 
-  # This is needed by setup.py regardless of whether tests are enabled.
-  buildInputs = [ nose ];
-  propagatedBuildInputs = [ pillow ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
     description = "Library containing various image processing algorithms";
     inherit (src.meta) homepage;
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ pyrox0 ];
   };
 }

From e9277a608419835c58c32452d4126667d73a1adc Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Sun, 14 Jul 2024 17:54:24 -0400
Subject: [PATCH 16/43] python312Packages.fabulous: Fix tests on python 3.12

---
 .../python-modules/fabulous/default.nix       | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/fabulous/default.nix b/pkgs/development/python-modules/fabulous/default.nix
index 075f01ee6406..d94227989c49 100644
--- a/pkgs/development/python-modules/fabulous/default.nix
+++ b/pkgs/development/python-modules/fabulous/default.nix
@@ -2,14 +2,16 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   pillow,
+  setuptools,
   python,
 }:
 
 buildPythonPackage rec {
   pname = "fabulous";
   version = "0.4.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jart";
@@ -18,9 +20,18 @@ buildPythonPackage rec {
     hash = "sha256-hchlxuB5QP+VxCx+QZ2739/mR5SQmYyE+9kXLKJ2ij4=";
   };
 
-  patches = [ ./relative_import.patch ];
+  patches = [
+    ./relative_import.patch
+    # https://github.com/jart/fabulous/pull/22
+    (fetchpatch2 {
+      url = "https://github.com/jart/fabulous/commit/5779f2dfbc88fd81b5b5865247913d4775e67959.patch?full_index=1";
+      hash = "sha256-miWFt4vDpwWhSUgnWDjWUXoibijcDa1c1dDOSkfWoUg=";
+    })
+  ];
 
-  propagatedBuildInputs = [ pillow ];
+  build-system = [ setuptools ];
+
+  dependencies = [ pillow ];
 
   checkPhase = ''
     for i in tests/*.py; do
@@ -28,10 +39,10 @@ buildPythonPackage rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Make the output of terminal applications look fabulous";
     homepage = "https://jart.github.io/fabulous";
-    license = licenses.asl20;
-    maintainers = [ maintainers.symphorien ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.symphorien ];
   };
 }

From 372fac0e5630120997c28283129c57ff9ff9379f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 17 Jul 2024 11:57:20 +0300
Subject: [PATCH 17/43] chromedriver: use autoPatchelfHook, clean up deps

---
 .../tools/selenium/chromedriver/default.nix   | 28 +++++--------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 41982c3d7d3e..1f9590ee5d1b 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -1,7 +1,5 @@
-{ lib, stdenv, fetchurl, unzip, makeWrapper
-, cairo, fontconfig, freetype, gdk-pixbuf, glib
-, glibc, gtk2, libX11, nspr, nss, pango
-, libxcb, libXi, libXrender, libXext, dbus
+{ lib, stdenv, fetchurl, unzip, autoPatchelfHook
+, glib, nspr, nss, libxcb
 , testers, chromedriver
 }:
 
@@ -26,16 +24,6 @@ let
 
   spec = allSpecs.${stdenv.hostPlatform.system}
     or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}");
-
-  libs = lib.makeLibraryPath [
-    stdenv.cc.cc.lib
-    cairo fontconfig freetype
-    gdk-pixbuf glib gtk2
-    libX11 nspr nss pango libXrender
-    libxcb libXext libXi
-    dbus
-  ];
-
 in stdenv.mkDerivation rec {
   pname = "chromedriver";
   version = upstream-info.version;
@@ -45,15 +33,13 @@ in stdenv.mkDerivation rec {
     hash = spec.hash;
   };
 
-  nativeBuildInputs = [ unzip makeWrapper ];
-
-  unpackPhase = "unzip $src";
+  nativeBuildInputs = [ unzip autoPatchelfHook ];
+  buildInputs = lib.optionals (!stdenv.isDarwin) [
+    glib nspr nss libxcb
+  ];
 
   installPhase = ''
-    install -m755 -D "chromedriver-${spec.system}/chromedriver" $out/bin/chromedriver
-  '' + lib.optionalString (!stdenv.isDarwin) ''
-    patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
-    wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}"
+    install -m555 -D "chromedriver" $out/bin/chromedriver
   '';
 
   passthru.tests.version = testers.testVersion { package = chromedriver; };

From 4919b62fde5fbeb9a5bc518d0edb813616f5b12e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 17 Jul 2024 12:08:52 +0300
Subject: [PATCH 18/43] chromedriver: build from source where possible

---
 .../tools/selenium/chromedriver/binary.nix    | 64 +++++++++++++++++
 .../tools/selenium/chromedriver/default.nix   | 68 ++-----------------
 .../tools/selenium/chromedriver/source.nix    | 30 ++++++++
 3 files changed, 98 insertions(+), 64 deletions(-)
 create mode 100644 pkgs/development/tools/selenium/chromedriver/binary.nix
 create mode 100644 pkgs/development/tools/selenium/chromedriver/source.nix

diff --git a/pkgs/development/tools/selenium/chromedriver/binary.nix b/pkgs/development/tools/selenium/chromedriver/binary.nix
new file mode 100644
index 000000000000..d58dc30e5b15
--- /dev/null
+++ b/pkgs/development/tools/selenium/chromedriver/binary.nix
@@ -0,0 +1,64 @@
+{ lib, stdenv, fetchurl, autoPatchelfHook
+, glib, nspr, nss, libxcb
+, testers, chromedriver
+}:
+
+let
+  upstream-info = (import ../../../../applications/networking/browsers/chromium/upstream-info.nix).stable.chromedriver;
+  allSpecs = {
+    x86_64-linux = {
+      system = "linux64";
+      hash = upstream-info.hash_linux;
+    };
+
+    x86_64-darwin = {
+      system = "mac-x64";
+      hash = upstream-info.hash_darwin;
+    };
+
+    aarch64-darwin = {
+      system = "mac-arm64";
+      hash = upstream-info.hash_darwin_aarch64;
+    };
+  };
+
+  spec = allSpecs.${stdenv.hostPlatform.system}
+    or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}");
+in stdenv.mkDerivation rec {
+  pname = "chromedriver";
+  version = upstream-info.version;
+
+  src = fetchurl {
+    url = "https://storage.googleapis.com/chrome-for-testing-public/${version}/${spec.system}/chromedriver-${spec.system}.zip";
+    hash = spec.hash;
+  };
+
+  nativeBuildInputs = [ autoPatchelfHook ];
+  buildInputs = lib.optionals (!stdenv.isDarwin) [
+    glib nspr nss libxcb
+  ];
+
+  installPhase = ''
+    install -m555 -D "chromedriver" $out/bin/chromedriver
+  '';
+
+  passthru.tests.version = testers.testVersion { package = chromedriver; };
+
+  meta = with lib; {
+    homepage = "https://chromedriver.chromium.org/";
+    description = "WebDriver server for running Selenium tests on Chrome";
+    longDescription = ''
+      WebDriver is an open source tool for automated testing of webapps across
+      many browsers. It provides capabilities for navigating to web pages, user
+      input, JavaScript execution, and more. ChromeDriver is a standalone
+      server that implements the W3C WebDriver standard.
+    '';
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ goibhniu primeos ];
+    # Note from primeos: By updating Chromium I also update Google Chrome and
+    # ChromeDriver.
+    platforms = attrNames allSpecs;
+    mainProgram = "chromedriver";
+  };
+}
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 1f9590ee5d1b..4d62e7b8692d 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -1,64 +1,4 @@
-{ lib, stdenv, fetchurl, unzip, autoPatchelfHook
-, glib, nspr, nss, libxcb
-, testers, chromedriver
-}:
-
-let
-  upstream-info = (import ../../../../applications/networking/browsers/chromium/upstream-info.nix).stable.chromedriver;
-  allSpecs = {
-    x86_64-linux = {
-      system = "linux64";
-      hash = upstream-info.hash_linux;
-    };
-
-    x86_64-darwin = {
-      system = "mac-x64";
-      hash = upstream-info.hash_darwin;
-    };
-
-    aarch64-darwin = {
-      system = "mac-arm64";
-      hash = upstream-info.hash_darwin_aarch64;
-    };
-  };
-
-  spec = allSpecs.${stdenv.hostPlatform.system}
-    or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}");
-in stdenv.mkDerivation rec {
-  pname = "chromedriver";
-  version = upstream-info.version;
-
-  src = fetchurl {
-    url = "https://storage.googleapis.com/chrome-for-testing-public/${version}/${spec.system}/chromedriver-${spec.system}.zip";
-    hash = spec.hash;
-  };
-
-  nativeBuildInputs = [ unzip autoPatchelfHook ];
-  buildInputs = lib.optionals (!stdenv.isDarwin) [
-    glib nspr nss libxcb
-  ];
-
-  installPhase = ''
-    install -m555 -D "chromedriver" $out/bin/chromedriver
-  '';
-
-  passthru.tests.version = testers.testVersion { package = chromedriver; };
-
-  meta = with lib; {
-    homepage = "https://chromedriver.chromium.org/";
-    description = "WebDriver server for running Selenium tests on Chrome";
-    longDescription = ''
-      WebDriver is an open source tool for automated testing of webapps across
-      many browsers. It provides capabilities for navigating to web pages, user
-      input, JavaScript execution, and more. ChromeDriver is a standalone
-      server that implements the W3C WebDriver standard.
-    '';
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ goibhniu primeos ];
-    # Note from primeos: By updating Chromium I also update Google Chrome and
-    # ChromeDriver.
-    platforms = attrNames allSpecs;
-    mainProgram = "chromedriver";
-  };
-}
+{ lib, stdenv, chromium, callPackage }:
+if lib.meta.availableOn stdenv.hostPlatform chromium
+  then callPackage ./source.nix {}
+  else callPackage ./binary.nix {}
diff --git a/pkgs/development/tools/selenium/chromedriver/source.nix b/pkgs/development/tools/selenium/chromedriver/source.nix
new file mode 100644
index 000000000000..fcb22c406644
--- /dev/null
+++ b/pkgs/development/tools/selenium/chromedriver/source.nix
@@ -0,0 +1,30 @@
+{ chromium, testers, chromedriver }:
+chromium.mkDerivation (_: {
+  name = "chromedriver";
+  packageName = "chromedriver";
+
+  # Build the unstripped target, because stripping in Chromium relies on a prebuilt strip binary
+  # that doesn't run on NixOS, and we will strip everything ourselves later anyway.
+  buildTargets = [ "chromedriver.unstripped" ];
+
+  installPhase = ''
+    install -Dm555 $buildPath/chromedriver.unstripped $out/bin/chromedriver
+  '';
+
+  # Kill existing postFixup that tries to patchelf things
+  postFixup = null;
+
+  passthru.tests.version = testers.testVersion { package = chromedriver; };
+
+  meta = chromium.meta // {
+    homepage = "https://chromedriver.chromium.org/";
+    description = "WebDriver server for running Selenium tests on Chrome";
+    longDescription = ''
+      WebDriver is an open source tool for automated testing of webapps across
+      many browsers. It provides capabilities for navigating to web pages, user
+      input, JavaScript execution, and more. ChromeDriver is a standalone
+      server that implements the W3C WebDriver standard.
+    '';
+    mainProgram = "chromedriver";
+  };
+})

From 859f3466f86783158dffbdc35d4a9b5cf4af2212 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <contact@paveloom.dev>
Date: Fri, 5 Jul 2024 23:03:03 +0300
Subject: [PATCH 19/43] python3Packages.undetected-chromedriver: init at 3.5.5

---
 .../undetected-chromedriver/default.nix       | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/undetected-chromedriver/default.nix

diff --git a/pkgs/development/python-modules/undetected-chromedriver/default.nix b/pkgs/development/python-modules/undetected-chromedriver/default.nix
new file mode 100644
index 000000000000..bcb349bfe36d
--- /dev/null
+++ b/pkgs/development/python-modules/undetected-chromedriver/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  setuptools,
+
+  looseversion,
+  requests,
+  selenium,
+  websockets,
+}:
+
+buildPythonPackage {
+  pname = "undetected-chromedriver";
+  version = "3.5.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ultrafunkamsterdam";
+    repo = "undetected-chromedriver";
+    # Upstream uses the summaries of commits for specifying versions
+    rev = "0aa5fbe252370b4cb2b95526add445392cad27ba";
+    hash = "sha256-Qe+GrsUPnhjJMDgjdUCloapjj0ggFlm/Dr42WLcmb1o=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    looseversion
+    requests
+    selenium
+    websockets
+  ];
+
+  # No tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "undetected_chromedriver" ];
+
+  postPatch = ''
+    substituteInPlace undetected_chromedriver/patcher.py \
+      --replace-fail \
+        "from distutils.version import LooseVersion" \
+        "from looseversion import LooseVersion"
+  '';
+
+  meta = with lib; {
+    description = "Python library for the custom Selenium ChromeDriver that passes all bot mitigation systems";
+    homepage = "https://github.com/ultrafunkamsterdam/undetected-chromedriver";
+    license = licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ paveloom ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b31e805460b6..c0342015c5ae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16738,6 +16738,8 @@ self: super: with self; {
 
   undefined = callPackage ../development/python-modules/undefined { };
 
+  undetected-chromedriver = callPackage ../development/python-modules/undetected-chromedriver { };
+
   unearth = callPackage ../development/python-modules/unearth { };
 
   unicodecsv = callPackage ../development/python-modules/unicodecsv { };

From 6f69acaa23bfbcaa5d91723bb49f58a7924077e7 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <contact@paveloom.dev>
Date: Fri, 5 Jul 2024 23:05:04 +0300
Subject: [PATCH 20/43] undetected-chromedriver: init at 126.0.6478.126

---
 .../un/undetected-chromedriver/package.nix    | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/un/undetected-chromedriver/package.nix

diff --git a/pkgs/by-name/un/undetected-chromedriver/package.nix b/pkgs/by-name/un/undetected-chromedriver/package.nix
new file mode 100644
index 000000000000..3976f3cc685b
--- /dev/null
+++ b/pkgs/by-name/un/undetected-chromedriver/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  stdenv,
+
+  chromedriver,
+  python3,
+
+  testers,
+  undetected-chromedriver,
+}:
+
+stdenv.mkDerivation {
+  pname = "undetected-chromedriver";
+  inherit (chromedriver) version;
+
+  nativeBuildInputs = [ (python3.withPackages (ps: [ ps.undetected-chromedriver ])) ];
+
+  buildCommand = ''
+    export HOME=$(mktemp -d)
+
+    cp ${chromedriver}/bin/chromedriver .
+    chmod +w chromedriver
+
+    python <<EOF
+    import logging
+    from undetected_chromedriver.patcher import Patcher
+
+    logging.basicConfig(level=logging.DEBUG)
+
+    success = Patcher(executable_path="chromedriver").patch()
+    assert success, "Failed to patch ChromeDriver"
+    EOF
+
+    install -D -m 0555 chromedriver $out/bin/undetected-chromedriver
+  '';
+
+  passthru.tests.version = testers.testVersion { package = undetected-chromedriver; };
+
+  meta = chromedriver.meta // {
+    description = "Custom Selenium ChromeDriver that passes all bot mitigation systems";
+    mainProgram = "undetected-chromedriver";
+    maintainers = with lib.maintainers; [ paveloom ];
+  };
+}

From 140b20a5c6cf2aa57bfbcabe9a20554d7fc95e40 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Fri, 19 Jul 2024 21:11:15 +0800
Subject: [PATCH 21/43] alpaca: init at 0.9.6.1

---
 .../al/alpaca/fix_xdg_path_flatpak.patch      | 26 +++++
 pkgs/by-name/al/alpaca/package.nix            | 95 +++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 pkgs/by-name/al/alpaca/fix_xdg_path_flatpak.patch
 create mode 100644 pkgs/by-name/al/alpaca/package.nix

diff --git a/pkgs/by-name/al/alpaca/fix_xdg_path_flatpak.patch b/pkgs/by-name/al/alpaca/fix_xdg_path_flatpak.patch
new file mode 100644
index 000000000000..ebb0a44e6575
--- /dev/null
+++ b/pkgs/by-name/al/alpaca/fix_xdg_path_flatpak.patch
@@ -0,0 +1,26 @@
+diff --git a/src/alpaca.in b/src/alpaca.in
+index cb883c8..a9822cc 100755
+--- a/src/alpaca.in
++++ b/src/alpaca.in
+@@ -35,7 +35,21 @@ locale.bindtextdomain('alpaca', localedir)
+ locale.textdomain('alpaca')
+ gettext.install('alpaca', localedir)
+ 
++# Use the right XDG paths outside flatpak
++def set_xdg_path(env, default):
++    app_id = "com.jeffser.Alpaca"
++    base = os.getenv(env) or os.path.expanduser(default)
++    path = os.path.join(base, app_id)
++    if not os.path.exists(path):
++        os.makedirs(path)
++    os.environ[env] = path
++    return
++
+ if __name__ == '__main__':
++    set_xdg_path("XDG_CONFIG_HOME", "~/.config")
++    set_xdg_path("XDG_DATA_HOME", "~/.local/share")
++    set_xdg_path("XDG_CACHE_HOME", "~/.cache")
++
+     import gi
+ 
+     from gi.repository import Gio
diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix
new file mode 100644
index 000000000000..5ce7ce0b0261
--- /dev/null
+++ b/pkgs/by-name/al/alpaca/package.nix
@@ -0,0 +1,95 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  fetchpatch,
+  appstream,
+  meson,
+  ninja,
+  pkg-config,
+  gobject-introspection,
+  wrapGAppsHook4,
+  desktop-file-utils,
+  libadwaita,
+  gtksourceview5,
+  xdg-utils,
+  ollama,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "alpaca";
+  version = "0.9.6.1";
+  pyproject = false; # Built with meson
+
+  src = fetchFromGitHub {
+    owner = "Jeffser";
+    repo = "Alpaca";
+    rev = version;
+    hash = "sha256-EbaEjKqfotJBceaYEyz3LHilK3GnnwEpfMR7Teq96hI=";
+  };
+
+  patches = [
+    # Change the way XDG paths are handled so it makes sense outside of flatpak
+    ./fix_xdg_path_flatpak.patch
+
+    # Let ollama instance stop gracefully so we don't have model instance left behind
+    (fetchpatch {
+      url = "https://github.com/Jeffser/Alpaca/commit/e81d918675896c1670cf5aa5a55e1b706be5ed51.patch";
+      hash = "sha256-gYYFvaoBI/Qn0g2qgS1cB0B4F08swznrSd5KCb51vh0=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace src/local_instance.py \
+      --replace-fail '/app/bin/ollama' 'ollama'
+  '';
+
+  nativeBuildInputs = [
+    appstream
+    meson
+    ninja
+    pkg-config
+    gobject-introspection
+    wrapGAppsHook4
+    desktop-file-utils
+  ];
+
+  buildInputs = [
+    libadwaita
+    gtksourceview5
+  ];
+
+  dependencies = with python3Packages; [
+    pygobject3
+    requests
+    pillow
+    pypdf
+  ];
+
+  dontWrapGApps = true;
+
+  makeWrapperArgs = [
+    "\${gappsWrapperArgs[@]}"
+    "--prefix PATH : ${lib.makeBinPath [ xdg-utils ollama ]}"
+    # Declared but not used in src/window.py, for later reference
+    # https://github.com/flatpak/flatpak/issues/3229
+    "--set FLATPAK_DEST ${placeholder "out"}"
+  ];
+
+  meta = {
+    description = "Ollama client made with GTK4 and Adwaita";
+    longDescription = ''
+      To run Alpaca with GPU acceleration enabled, simply override it:
+      ```nix
+      pkgs.alpaca.override {
+        ollama = pkgs.ollama-cuda;
+      }
+      ```
+    '';
+    homepage = "https://jeffser.com/alpaca";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "alpaca";
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.linux;
+  };
+}

From 079489e456f5bcd75863ae3410307e26e36c8e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Fri, 12 Jul 2024 19:55:14 -0400
Subject: [PATCH 22/43] obs-studio: 30.1.2 -> 30.2.0

---
 ...le-access-and-universal-access-for-file-URL.patch | 11 ++++-------
 pkgs/applications/video/obs-studio/default.nix       | 11 +++++++----
 .../video/obs-studio/fix-nix-plugin-path.patch       | 12 ++++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch b/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch
index 49d01bacbd10..b0c9650ddb90 100644
--- a/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch
+++ b/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch
@@ -12,12 +12,12 @@ security model.
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp
-index ab1181e..c775283 100644
+index 09b3017..1094340 100644
 --- a/plugins/obs-browser/obs-browser-source.cpp
 +++ b/plugins/obs-browser/obs-browser-source.cpp
-@@ -179,9 +179,12 @@ bool BrowserSource::CreateBrowser()
+@@ -239,9 +239,12 @@ bool BrowserSource::CreateBrowser()
  
- #if ENABLE_LOCAL_FILE_URL_SCHEME
+ #if ENABLE_LOCAL_FILE_URL_SCHEME && CHROME_VERSION_BUILD < 4430
  		if (is_local) {
 -			/* Disable web security for file:// URLs to allow
 -			 * local content access to remote APIs */
@@ -30,7 +30,4 @@ index ab1181e..c775283 100644
 +				STATE_ENABLED;
  		}
  #endif
- 
--- 
-2.31.1
-
+ 		auto browser = CefBrowserHost::CreateBrowserSync(
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index d787ab91db1e..5a95f746ee2e 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -1,6 +1,8 @@
 { config
+, uthash
 , lib
 , stdenv
+, nv-codec-headers-12
 , fetchFromGitHub
 , fetchpatch
 , addOpenGLRunpath
@@ -39,7 +41,6 @@
 , withFdk ? true
 , pipewire
 , libdrm
-, libajantv2
 , librist
 , libva
 , srt
@@ -62,13 +63,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-studio";
-  version = "30.1.2";
+  version = "30.2.0";
 
   src = fetchFromGitHub {
     owner = "obsproject";
     repo = "obs-studio";
     rev = finalAttrs.version;
-    hash = "sha256-M4IINBoYrgkM37ykb4boHyWP8AxwMX0b7IAeeNIw9Qo=";
+    hash = "sha256-mwh2KLSz+I/8f3i/wST/2vKL/hWTCTaq53sinIEX75M=";
     fetchSubmodules = true;
   };
 
@@ -113,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
     libvlc
     mbedtls
     pciutils
-    libajantv2
     librist
     libva
     srt
@@ -124,6 +124,8 @@ stdenv.mkDerivation (finalAttrs: {
     libdatachannel
     libvpl
     qrcodegencpp
+    uthash
+    nv-codec-headers-12
   ]
   ++ optionals scriptingSupport [ luajit python3 ]
   ++ optional alsaSupport alsa-lib
@@ -155,6 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "ENABLE_ALSA" alsaSupport)
     (lib.cmakeBool "ENABLE_PULSEAUDIO" pulseaudioSupport)
     (lib.cmakeBool "ENABLE_PIPEWIRE" pipewireSupport)
+    (lib.cmakeBool "ENABLE_AJA" false) # TODO: fix linking against libajantv2
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [
diff --git a/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch b/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch
index baf45104e6a8..13569e8499b5 100644
--- a/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch
+++ b/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch
@@ -1,9 +1,9 @@
 diff --git a/cmake/Modules/ObsDefaults_Linux.cmake b/cmake/Modules/ObsDefaults_Linux.cmake
-index d1e58a083..a03c6b98e 100644
+index fe8d72364..1c590fcdb 100644
 --- a/cmake/Modules/ObsDefaults_Linux.cmake
 +++ b/cmake/Modules/ObsDefaults_Linux.cmake
 @@ -76,7 +76,7 @@ macro(setup_obs_project)
-     set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
+     set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
      set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}")
  
 -    set(OBS_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}")
@@ -12,15 +12,15 @@ index d1e58a083..a03c6b98e 100644
    else()
      set(OBS_EXECUTABLE_DESTINATION "bin/${_ARCH_SUFFIX}bit")
 diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c
-index b006a5598..531655eb3 100644
+index 77c36be5e..fe8a04813 100644
 --- a/libobs/obs-nix.c
 +++ b/libobs/obs-nix.c
-@@ -56,7 +56,7 @@ const char *get_module_extension(void)
- #define FLATPAK_PLUGIN_PATH "/app/plugins"
+@@ -51,7 +51,7 @@ const char *get_module_extension(void)
  
  static const char *module_bin[] = {
+ 	"../../obs-plugins/64bit",
 -	OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION,
 +	OBS_PLUGIN_DESTINATION,
- 	"../../obs-plugins/" BIT_STRING,
  	FLATPAK_PLUGIN_PATH "/" OBS_PLUGIN_DESTINATION,
  };
+ 

From ebbc0409688869938bbcf630da1c1c13744d2a7b Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <contact@paveloom.dev>
Date: Fri, 5 Jul 2024 23:05:30 +0300
Subject: [PATCH 23/43] flaresolverr: init at 3.3.21

---
 pkgs/by-name/fl/flaresolverr/package.nix | 82 ++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 pkgs/by-name/fl/flaresolverr/package.nix

diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix
new file mode 100644
index 000000000000..07e02231997c
--- /dev/null
+++ b/pkgs/by-name/fl/flaresolverr/package.nix
@@ -0,0 +1,82 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+
+  makeWrapper,
+
+  chromium,
+  python3,
+  undetected-chromedriver,
+  xorg,
+
+  nixosTests,
+}:
+
+let
+  python = python3.withPackages (
+    ps: with ps; [
+      bottle
+      func-timeout
+      prometheus-client
+      selenium
+      waitress
+      xvfbwrapper
+
+      # For `undetected_chromedriver`
+      looseversion
+      requests
+      websockets
+    ]
+  );
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "flaresolverr";
+  version = "3.3.21";
+
+  src = fetchFromGitHub {
+    owner = "FlareSolverr";
+    repo = "FlareSolverr";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-M/snpYKZK3pgzlhYjRYEiAPlK9DUKYRiiu43KcrAy9g=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postPatch = ''
+    substituteInPlace src/undetected_chromedriver/patcher.py \
+      --replace-fail \
+        "from distutils.version import LooseVersion" \
+        "from looseversion import LooseVersion"
+
+    substituteInPlace src/utils.py \
+      --replace-fail \
+        'CHROME_EXE_PATH = None' \
+        'CHROME_EXE_PATH = "${lib.getExe chromium}"' \
+      --replace-fail \
+        'PATCHED_DRIVER_PATH = None' \
+        'PATCHED_DRIVER_PATH = "${lib.getExe undetected-chromedriver}"'
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{bin,share/${finalAttrs.pname}-${finalAttrs.version}}
+    cp -r * $out/share/${finalAttrs.pname}-${finalAttrs.version}/.
+
+    makeWrapper ${python}/bin/python $out/bin/flaresolverr \
+      --add-flags "$out/share/${finalAttrs.pname}-${finalAttrs.version}/src/flaresolverr.py" \
+      --prefix PATH : "${lib.makeBinPath [ xorg.xvfb ]}"
+  '';
+
+  passthru = {
+    tests.smoke-test = nixosTests.flaresolverr;
+  };
+
+  meta = with lib; {
+    description = "Proxy server to bypass Cloudflare protection";
+    homepage = "https://github.com/FlareSolverr/FlareSolverr";
+    license = licenses.mit;
+    mainProgram = "flaresolverr";
+    maintainers = with maintainers; [ paveloom ];
+    inherit (undetected-chromedriver.meta) platforms;
+  };
+})

From c9c14f86dbd8c91eeb7fdc679f1fa3c9b740aba1 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <contact@paveloom.dev>
Date: Fri, 5 Jul 2024 23:06:17 +0300
Subject: [PATCH 24/43] nixos/flaresolverr: initial commit

---
 .../manual/release-notes/rl-2411.section.md   |  2 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/misc/flaresolverr.nix  | 58 +++++++++++++++++++
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/flaresolverr.nix                  | 22 +++++++
 5 files changed, 84 insertions(+)
 create mode 100644 nixos/modules/services/misc/flaresolverr.nix
 create mode 100644 nixos/tests/flaresolverr.nix

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 96cc4301851d..38168b312e41 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -18,6 +18,8 @@
 
 ## New Services {#sec-release-24.11-new-services}
 
+- [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable) service.
+
 - [Open-WebUI](https://github.com/open-webui/open-webui), a user-friendly WebUI
   for LLMs. Available as [services.open-webui](#opt-services.open-webui.enable)
   service.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index de15aa8c4be6..14ff9fd8b68f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -732,6 +732,7 @@
   ./services/misc/etesync-dav.nix
   ./services/misc/evdevremapkeys.nix
   ./services/misc/felix.nix
+  ./services/misc/flaresolverr.nix
   ./services/misc/forgejo.nix
   ./services/misc/freeswitch.nix
   ./services/misc/fstrim.nix
diff --git a/nixos/modules/services/misc/flaresolverr.nix b/nixos/modules/services/misc/flaresolverr.nix
new file mode 100644
index 000000000000..7967580307f9
--- /dev/null
+++ b/nixos/modules/services/misc/flaresolverr.nix
@@ -0,0 +1,58 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.services.flaresolverr;
+in
+{
+  options = {
+    services.flaresolverr = {
+      enable = lib.mkEnableOption "FlareSolverr, a proxy server to bypass Cloudflare protection";
+
+      package = lib.mkPackageOption pkgs "flaresolverr" { };
+
+      openFirewall = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Open the port in the firewall for FlareSolverr.";
+      };
+
+      port = lib.mkOption {
+        type = lib.types.port;
+        default = 8191;
+        description = "The port on which FlareSolverr will listen for incoming HTTP traffic.";
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.flaresolverr = {
+      description = "FlareSolverr";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      environment = {
+        HOME = "/run/flaresolverr";
+        PORT = toString cfg.port;
+      };
+
+      serviceConfig = {
+        SyslogIdentifier = "flaresolverr";
+        Restart = "always";
+        RestartSec = 5;
+        Type = "simple";
+        DynamicUser = true;
+        RuntimeDirectory = "flaresolverr";
+        WorkingDirectory = "/run/flaresolverr";
+        ExecStart = lib.getExe cfg.package;
+        TimeoutStopSec = 30;
+      };
+    };
+
+    networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 718aec882b4c..0852f2350e1d 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -332,6 +332,7 @@ in {
   firewall-nftables = handleTest ./firewall.nix { nftables = true; };
   fish = handleTest ./fish.nix {};
   flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {};
+  flaresolverr = handleTest ./flaresolverr.nix {};
   flood = handleTest ./flood.nix {};
   floorp = handleTest ./firefox.nix { firefoxPackage = pkgs.floorp; };
   fluentd = handleTest ./fluentd.nix {};
diff --git a/nixos/tests/flaresolverr.nix b/nixos/tests/flaresolverr.nix
new file mode 100644
index 000000000000..0cec7adf6d6b
--- /dev/null
+++ b/nixos/tests/flaresolverr.nix
@@ -0,0 +1,22 @@
+import ./make-test-python.nix (
+  { lib, ... }:
+  {
+    name = "flaresolverr";
+    meta.maintainers = with lib.maintainers; [ paveloom ];
+
+    nodes.machine =
+      { pkgs, ... }:
+      {
+        services.flaresolverr = {
+          enable = true;
+          port = 8888;
+        };
+      };
+
+    testScript = ''
+      machine.wait_for_unit("flaresolverr.service")
+      machine.wait_for_open_port(8888)
+      machine.succeed("curl --fail http://localhost:8888/")
+    '';
+  }
+)

From 7bc65ab57916157e8549a74921a27222d0f8b233 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2024 22:28:19 +0000
Subject: [PATCH 25/43] nh: 3.5.18 -> 3.5.19

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

diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix
index e11a8fc3f957..3150b129b7a2 100644
--- a/pkgs/by-name/nh/nh/package.nix
+++ b/pkgs/by-name/nh/nh/package.nix
@@ -10,7 +10,7 @@
 , nix-output-monitor
 }:
 let
-  version = "3.5.18";
+  version = "3.5.19";
   runtimeDeps = [ nvd nix-output-monitor ];
 in
 rustPlatform.buildRustPackage {
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
     owner = "viperML";
     repo = "nh";
     rev = "refs/tags/v${version}";
-    hash = "sha256-G5iteuo2gobI0Y5jHNEBc6UN9ixjwj6zopPKi7bJBE4=";
+    hash = "sha256-m6LmfrUMpt1ZUX3eqB7Gp+ZV6sAWPqkATwZNvA7Bj9U=";
   };
 
   strictDeps = true;
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage {
       --prefix PATH : ${lib.makeBinPath runtimeDeps}
   '';
 
-  cargoHash = "sha256-jd8GOuI5E+l3u8klAKdwUdEP9N0Nao6MfTdHkSjym0M=";
+  cargoHash = "sha256-fyHyuZGjTsKynihlD3H3tSZeo8s9Trbe4NZ3Zv2MHmQ=";
 
   passthru.updateScript = nix-update-script { };
 

From 02df3302ed97ffba8b5e757e2fe9c065e9d12218 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2024 22:55:59 +0000
Subject: [PATCH 26/43] steampipe: 0.23.2 -> 0.23.3

---
 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 e52182508c06..0e009f769208 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.2";
+  version = "0.23.3";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hMEFIPhtvYkBG+HBtigOzFe8iAKmywWWl1da6sksX7k=";
+    hash = "sha256-V8wy9Q3FU4Ts7cer3tkv3gQbHebje3XRgm+IOg3Xs+c=";
   };
 
-  vendorHash = "sha256-KY5mVs+YsyHHtV6DvfwwxcF8K9IQWxlxIJeSyFsKkpc=";
+  vendorHash = "sha256-OVWgDVF2d+OYYCSn+UlSMTfIS+5nFeI2qY41DyX7y/A=";
   proxyVendor = true;
 
   postPatch = ''

From 8683c4a2c14b65945e3259f4a98bf7b6511ded70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2024 23:13:22 +0000
Subject: [PATCH 27/43] numix-icon-theme-circle: 24.04.22 -> 24.07.19

---
 pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index 215d2f4c3138..6e26a6cdeee3 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "numix-icon-theme-circle";
-  version = "24.04.22";
+  version = "24.07.19";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "sha256-FRE3zb/81IEHFFvX+rIDFPVe5vw/hToLqVLkXssMgoA=";
+    sha256 = "sha256-tCqsFcKGUV4sLkoyc3beHmnJxVwRxEGo+G5PJfBuHbI=";
   };
 
   nativeBuildInputs = [ gtk3 ];

From d780bd9c7079d7301cde744ceefe32953f33235c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 00:11:45 +0000
Subject: [PATCH 28/43] android-studio: 2024.1.1.11 -> 2024.1.1.12

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index d7b64de97cf2..c96fcbc709e1 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -9,8 +9,8 @@ let
     inherit tiling_wm;
   };
   stableVersion = {
-    version = "2024.1.1.11"; # "Android Studio Koala | 2024.1.1"
-    sha256Hash = "sha256-2PqOz+QVtEUTNQkBUB4qD0KcoDPPGAUFSxyBbEpwRWU=";
+    version = "2024.1.1.12"; # "Android Studio Koala | 2024.1.1 Patch 1"
+    sha256Hash = "sha256-Qvi/Mc4NEk3dERlfZiowBk2Pmqsgbl5mg56HamvG7aI=";
   };
   betaVersion = {
     version = "2024.1.1.10"; # "Android Studio Koala | 2024.1.1 RC 2"

From 82019fb33d612ce7f1634186b16b00ccab828011 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 00:11:59 +0000
Subject: [PATCH 29/43] androidStudioPackages.canary: 2024.1.2.8 -> 2024.1.3.1

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index d7b64de97cf2..3574cadc355b 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -17,8 +17,8 @@ let
     sha256Hash = "sha256-84CpZfoAvJHUCO3ZBJqDbuz9xuGE/5xJfXoetJDXju8=";
   };
   latestVersion = {
-    version = "2024.1.2.8"; # "Android Studio Koala Feature Drop | 2024.1.2 Canary 8"
-    sha256Hash = "sha256-2wqZV0UqZHprfUFvhWh0IdA9TQcwlZtWECZVwZ47ICc=";
+    version = "2024.1.3.1"; # "Android Studio Ladybug | 2024.1.3 Canary 1"
+    sha256Hash = "sha256-BSrcPdkK4dU5/bV29NGKcCR10XYMJrPvC91fcJs5Vq8=";
   };
 in {
   # Attributes are named by their corresponding release channels

From 9f8234f17e88f545449f03e8a1bc4c1c25ac707e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 20 Jul 2024 03:05:18 +0200
Subject: [PATCH 30/43] ntpd-rs: 1.2.0 -> 1.2.2

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

diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix
index 780eb2c0877d..055ec97b491b 100644
--- a/pkgs/by-name/nt/ntpd-rs/package.nix
+++ b/pkgs/by-name/nt/ntpd-rs/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ntpd-rs";
-  version = "1.2.0";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "pendulum-project";
     repo = "ntpd-rs";
     rev = "v${version}";
-    hash = "sha256-yIX9RD1xqkFoxDt82wnKfQR3z/vLA0I5/cptaIgSNjw=";
+    hash = "sha256-td+op7nVmznIcj3JYafEy7HgbBPLuRv25Hu2N5A5qOQ=";
   };
 
-  cargoHash = "sha256-NRFmb9rZVbd0qYKIkslT4TcbC/aD4QhAjm2GA4BvReY=";
+  cargoHash = "sha256-guim3IC2uIA7NKMXDCil/UK8Yj+rt2KUSwtJTcBcZoU=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ];
   nativeBuildInputs = [

From f2a6b12af7bb1160c214b83aa3ecd9a73dd2cba3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 20 Jul 2024 03:06:54 +0200
Subject: [PATCH 31/43] ntpd-rs: disable testsuite, too flaky

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

diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix
index 055ec97b491b..3e7c35227c33 100644
--- a/pkgs/by-name/nt/ntpd-rs/package.nix
+++ b/pkgs/by-name/nt/ntpd-rs/package.nix
@@ -40,6 +40,9 @@ rustPlatform.buildRustPackage rec {
     source utils/generate-man.sh
   '';
 
+  # lots of flaky tests
+  doCheck = false;
+
   checkFlags = [
     # doesn't find the testca
     "--skip=daemon::keyexchange::tests"

From 5317c2ed17889e6eb875504d8785181438cce5cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 02:40:18 +0000
Subject: [PATCH 32/43] python312Packages.yfinance: 0.2.40 -> 0.2.41

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

diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix
index eb454cd9a4dc..2be3d381feb6 100644
--- a/pkgs/development/python-modules/yfinance/default.nix
+++ b/pkgs/development/python-modules/yfinance/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "yfinance";
-  version = "0.2.40";
+  version = "0.2.41";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "ranaroussi";
     repo = "yfinance";
     rev = "refs/tags/${version}";
-    hash = "sha256-y3vcgPhksW8g0WpqVgJej7s+aIj9zaAjBjSm8d7yrjs=";
+    hash = "sha256-9Vp/z0u/Mfil1xWHvHPRFa62sLvEJMjHLBYweLfz42o=";
   };
 
   build-system = [ setuptools ];

From e56a0db7b3470168bc725808e472688ff145e101 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 04:38:30 +0000
Subject: [PATCH 33/43] python312Packages.distributed: 2024.7.0 -> 2024.7.1

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

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 8455b4506268..92998e42eb4e 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "2024.7.0";
+  version = "2024.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     owner = "dask";
     repo = "distributed";
     rev = "refs/tags/${version}";
-    hash = "sha256-Nf/TOLqBaYhezXcBJPMvBwkP+cH5BnN5rxGqLMAb/8U=";
+    hash = "sha256-1VLYOUPo2esFltcoI6B/HMGyuyRq4vvkE55C8acdbG8=";
   };
 
   postPatch = ''

From 2b2d6041aeb93bbd8692a8b59e0091b22aff2166 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 05:20:40 +0000
Subject: [PATCH 34/43] python312Packages.rotary-embedding-torch: 0.6.2 ->
 0.6.4

---
 .../python-modules/rotary-embedding-torch/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix
index 3724cb4adedd..6608071f1dd8 100644
--- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix
+++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "rotary-embedding-torch";
-  version = "0.6.2";
+  version = "0.6.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lucidrains";
     repo = "rotary-embedding-torch";
     rev = "refs/tags/${version}";
-    hash = "sha256-AR/zQFH0uvPrCp61XLiRBiAO3ZnD4jVaDXN00hXDlnI=";
+    hash = "sha256-dP7QFUNIGFFQcR98po+LYg3MU7P+GUunO7zz/y8vZmY=";
   };
 
   nativeBuildInputs = [

From 7bd3602bd17da03d9f675c26bfb39ce6edd57219 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 20 Jul 2024 00:32:39 -0400
Subject: [PATCH 35/43] open-scq30: add CoreBluetooth framework on Darwin

---
 pkgs/by-name/op/open-scq30/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix
index 3e2e41a15e98..33d4e47c76fb 100644
--- a/pkgs/by-name/op/open-scq30/package.nix
+++ b/pkgs/by-name/op/open-scq30/package.nix
@@ -44,6 +44,7 @@ rustPlatform.buildRustPackage rec {
     pango
   ] ++ lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.AppKit
+    darwin.apple_sdk.frameworks.CoreBluetooth
     darwin.apple_sdk.frameworks.CoreGraphics
     darwin.apple_sdk.frameworks.Foundation
   ];

From ab42ca141a289b8afc0e42dafb5e6172fb398cd6 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Sat, 20 Jul 2024 09:08:30 +0200
Subject: [PATCH 36/43] doc: Remove indefinite article and ending period from
 example meta.description

so that meta.description examples shown in the documentation
align with recommendations given in the "Meta attributes" section
in pkgs/README.md.

The changes were made with the following commands:
nix run nixpkgs#silver-searcher -- -l0 'description\s*=\s*"([Aa]n?|[Tt]he)\s' doc \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee '/description/s/"([Aa]n?|[Tt]he)\s(.)/"\U\2/'
nix run nixpkgs#silver-searcher -- -l0 'description\s*=\s*".*\."' doc \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee '/description/s/\."/"/'
---
 doc/languages-frameworks/coq.section.md        | 2 +-
 doc/languages-frameworks/javascript.section.md | 2 +-
 doc/languages-frameworks/ocaml.section.md      | 2 +-
 doc/languages-frameworks/perl.section.md       | 2 +-
 doc/languages-frameworks/python.section.md     | 4 ++--
 doc/languages-frameworks/rust.section.md       | 4 ++--
 doc/languages-frameworks/texlive.section.md    | 2 +-
 doc/stdenv/meta.chapter.md                     | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md
index fdc824781cd1..557896074bf0 100644
--- a/doc/languages-frameworks/coq.section.md
+++ b/doc/languages-frameworks/coq.section.md
@@ -84,7 +84,7 @@ mkCoqDerivation {
     [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp-bigenough ];
 
   meta = {
-    description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials";
+    description = "Coq/SSReflect Library for Monoidal Rings and Multinomials";
     license = lib.licenses.cecill-c;
   };
 }
diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index 80d61816acb4..7975d7c9e43f 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -206,7 +206,7 @@ buildNpmPackage rec {
   NODE_OPTIONS = "--openssl-legacy-provider";
 
   meta = {
-    description = "A modern web UI for various torrent clients with a Node.js backend and React frontend";
+    description = "Modern web UI for various torrent clients with a Node.js backend and React frontend";
     homepage = "https://flood.js.org";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ winter ];
diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md
index 46fddcb3b9de..acefddc7c2f2 100644
--- a/doc/languages-frameworks/ocaml.section.md
+++ b/doc/languages-frameworks/ocaml.section.md
@@ -113,7 +113,7 @@ buildDunePackage rec {
 
   meta = {
     homepage = "https://github.com/flowtype/ocaml-wtf8";
-    description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates.";
+    description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.eqyiel ];
   };
diff --git a/doc/languages-frameworks/perl.section.md b/doc/languages-frameworks/perl.section.md
index 4ef6d173a178..a3d76a44f656 100644
--- a/doc/languages-frameworks/perl.section.md
+++ b/doc/languages-frameworks/perl.section.md
@@ -158,7 +158,7 @@ $ nix-generate-from-cpan XML::Simple
     };
     propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ];
     meta = {
-      description = "An API for simple XML files";
+      description = "API for simple XML files";
       license = with lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 07b7fad74a6e..519fd6fbf960 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -993,7 +993,7 @@ buildPythonPackage rec {
   meta = {
     changelog = "https://github.com/blaze/datashape/releases/tag/${version}";
     homepage = "https://github.com/ContinuumIO/datashape";
-    description = "A data description language";
+    description = "Data description language";
     license = lib.licenses.bsd2;
   };
 }
@@ -1118,7 +1118,7 @@ buildPythonPackage rec {
 
   meta = {
     changelog = "https://github.com/pyFFTW/pyFFTW/releases/tag/v${version}";
-    description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
+    description = "Pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
     homepage = "http://hgomersall.github.com/pyFFTW";
     license = with lib.licenses; [ bsd2 bsd3 ];
   };
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index e12bbe02bfb5..48c32f324df4 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-jtBw4ahSl88L0iuCXxQgZVm1EcboWRJMNtjxLVTtzts=";
 
   meta = {
-    description = "A fast line-oriented regex search tool, similar to ag and ack";
+    description = "Fast line-oriented regex search tool, similar to ag and ack";
     homepage = "https://github.com/BurntSushi/ripgrep";
     license = lib.licenses.unlicense;
     maintainers = [];
@@ -1000,7 +1000,7 @@ rustPlatform.buildRustPackage rec {
   doCheck = false;
 
   meta = {
-    description = "A fast line-oriented regex search tool, similar to ag and ack";
+    description = "Fast line-oriented regex search tool, similar to ag and ack";
     homepage = "https://github.com/BurntSushi/ripgrep";
     license = with lib.licenses; [ mit unlicense ];
     maintainers = with lib.maintainers; [];
diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md
index 05ef288141c3..35fb0db9a444 100644
--- a/doc/languages-frameworks/texlive.section.md
+++ b/doc/languages-frameworks/texlive.section.md
@@ -183,7 +183,7 @@ let
     '';
 
     meta = {
-      description = "A LaTeX2e class for overhead transparencies";
+      description = "LaTeX2e class for overhead transparencies";
       license = lib.licenses.unfreeRedistributable;
       maintainers = with lib.maintainers; [ veprbl ];
       platforms = lib.platforms.all;
diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md
index e6de030ff9c1..c8dd47533801 100644
--- a/doc/stdenv/meta.chapter.md
+++ b/doc/stdenv/meta.chapter.md
@@ -5,7 +5,7 @@ Nix packages can declare *meta-attributes* that contain information about a pack
 ```nix
 {
   meta = {
-    description = "A program that produces a familiar, friendly greeting";
+    description = "Program that produces a familiar, friendly greeting";
     longDescription = ''
       GNU Hello is a program that prints "Hello, world!" when you run it.
       It is fully customizable.

From 14b378d7b068e8b1fd706ed22b1b269c5dbf08ff Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 15 Jul 2024 14:54:57 +0200
Subject: [PATCH 37/43] virtiofsd: 1.11.0 -> 1.11.1

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

diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix
index 53fc114f078c..4835f4699835 100644
--- a/pkgs/servers/misc/virtiofsd/default.nix
+++ b/pkgs/servers/misc/virtiofsd/default.nix
@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "virtiofsd";
-  version = "1.11.0";
+  version = "1.11.1";
 
   src = fetchFromGitLab {
     owner = "virtio-fs";
     repo = "virtiofsd";
     rev = "v${version}";
-    hash = "sha256-dgGdSnMsz/6dggZXh5crwHEoVVIlcUIHMH5MSOO29TE=";
+    hash = "sha256-4GX+qqnrUuG6jsdnKU/67YOj0X8qyuPIQbPSkE3xTBo=";
   };
 
   separateDebugInfo = true;
 
-  cargoHash = "sha256-u7mzViTc0f4vApmmRNl6NkJlMfKeWSO0yupBt6adiag=";
+  cargoHash = "sha256-41pgoX/nGLEbMDJvdZt2HvrVMZPXqH6SWgow7A3rTBY=";
 
   LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib";
   LIBCAPNG_LINK_TYPE =

From 29934c94085540f2b4683816c6cbd27d8400ff53 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 6 Jul 2024 10:02:14 +0200
Subject: [PATCH 38/43] llvm: fix broken llvm-config-native for canExecute
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since a0b4b85bfaf0 ("llvm: Avoid cross compiling if the build platform
can execute host binaries"), the flags to get a working
llvm-config-native are not used when the build platform can execute
host binaries, resulting in a broken llvm-config-native, and therefore
a broken mesa, but since build can execute host, we don't need a
separate llvm-config-native at all — we can just use the normal
llvm-config.

Fixes: a0b4b85bfaf0 ("llvm: Avoid cross compiling if the build platform can execute host binaries")
---
 pkgs/development/compilers/llvm/common/llvm/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index f780c87d0e4b..5a8346875f24 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -417,9 +417,11 @@ stdenv.mkDerivation (rec {
   + optionalString (stdenv.isDarwin && enableSharedLibraries) ''
     ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
   ''
-  + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+  + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) (if stdenv.buildPlatform.canExecute stdenv.hostPlatform then ''
+    ln -s $dev/bin/llvm-config $dev/bin/llvm-config-native
+  '' else ''
     cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
-  '';
+  '');
 
   inherit doCheck;
 

From 9e59b233691cb83269197a345a90fb56c067603d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 16 Jun 2024 15:16:48 +0200
Subject: [PATCH 39/43] 
 linuxPackages_latest.rust-out-of-tree-module.updateScript: init

Added a version to the package to make the update script happy.
---
 pkgs/os-specific/linux/rust-out-of-tree-module/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix b/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix
index 46ae88abb37d..bfe59c0e6fe8 100644
--- a/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix
+++ b/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix
@@ -1,6 +1,7 @@
-{ lib, fetchFromGitHub, kernel }:
+{ lib, fetchFromGitHub, kernel, unstableGitUpdater }:
 kernel.stdenv.mkDerivation {
-  name = "rust-out-of-tree-module";
+  pname = "rust-out-of-tree-module";
+  version = "0-unstable-2023-08-29";
 
   src = fetchFromGitHub {
     owner = "Rust-for-linux";
@@ -16,6 +17,8 @@ kernel.stdenv.mkDerivation {
   installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ];
   installTargets = [ "modules_install" ];
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = {
     broken = !kernel.withRust;
     description = "Basic template for an out-of-tree Linux kernel module written in Rust";

From 64b7de15d30e8f88de4cee0db401c6a0098b92f4 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 16 Jun 2024 15:17:44 +0200
Subject: [PATCH 40/43] linuxPackages_latest.rust-out-of-tree-module:
 0-unstable-2023-08-29 -> 0-unstable-2024-05-06

Updated for breaking changes in Linux 6.10.
---
 pkgs/os-specific/linux/rust-out-of-tree-module/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix b/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix
index bfe59c0e6fe8..ba0bd561d597 100644
--- a/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix
+++ b/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix
@@ -1,14 +1,14 @@
 { lib, fetchFromGitHub, kernel, unstableGitUpdater }:
 kernel.stdenv.mkDerivation {
   pname = "rust-out-of-tree-module";
-  version = "0-unstable-2023-08-29";
+  version = "0-unstable-2024-05-06";
 
   src = fetchFromGitHub {
     owner = "Rust-for-linux";
     repo = "rust-out-of-tree-module";
 
-    rev = "7addf9dafba795524f6179a557f7272ecbe1b165";
-    hash = "sha256-Bj7WonZ499W/FajbxjM7yBkU9iTxTW7CrRbCSzWbsSc=";
+    rev = "9872947486bb8f60b0d11db15d546a3d06156ec5";
+    hash = "sha256-TzCySY7uQac98dU+Nu5dC4Usm7oG0iIdZZmZgAOpni4=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

From 768070f0c1b0720c8c0c55b295a4de7cd3db59d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 08:13:20 +0000
Subject: [PATCH 41/43] androidStudioPackages.beta: 2024.1.1.10 -> 2024.1.2.9

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index d7b64de97cf2..ddb6ce29f562 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,8 +13,8 @@ let
     sha256Hash = "sha256-2PqOz+QVtEUTNQkBUB4qD0KcoDPPGAUFSxyBbEpwRWU=";
   };
   betaVersion = {
-    version = "2024.1.1.10"; # "Android Studio Koala | 2024.1.1 RC 2"
-    sha256Hash = "sha256-84CpZfoAvJHUCO3ZBJqDbuz9xuGE/5xJfXoetJDXju8=";
+    version = "2024.1.2.9"; # "Android Studio Koala Feature Drop | 2024.1.2 Beta 1"
+    sha256Hash = "sha256-eTnpU9KrquW4nMRqde9PUmVQ05kf6kFy1yr+Ima9M50=";
   };
   latestVersion = {
     version = "2024.1.2.8"; # "Android Studio Koala Feature Drop | 2024.1.2 Canary 8"

From d63af425e9721d68745e7bd324c3734dcb505fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 20 Jul 2024 12:16:40 +0200
Subject: [PATCH 42/43] osu-lazer-bin: 2024.718.0 -> 2024.718.1

---
 pkgs/games/osu-lazer/bin.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix
index 7496514d2a1d..b575c1953c5f 100644
--- a/pkgs/games/osu-lazer/bin.nix
+++ b/pkgs/games/osu-lazer/bin.nix
@@ -7,22 +7,22 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2024.718.0";
+  version = "2024.718.1";
 
   src = {
     aarch64-darwin = fetchzip {
       url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
-      hash = "sha256-XYsfNFnBUzAfiW8WdJvJcd5ufP7a60Fsi8rU9Ul3ax4=";
+      hash = "sha256-23ZS2lkVDNpaWKkRMrkMwPhCaudoMxehV+k/7wXHnJ0=";
       stripRoot = false;
     };
     x86_64-darwin = fetchzip {
       url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
-      hash = "sha256-rs91+IbYlmtU3NY2EGqqlS/35oU4wFbWJmvyObYF32M=";
+      hash = "sha256-1ZYPnxyknm7cxPW4CmzE1G652CSC0jKI2g4+yHg7HsE=";
       stripRoot = false;
     };
     x86_64-linux = fetchurl {
       url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-      hash = "sha256-K8YeiHuEfwK/DG+e9VSj9arJ5x5XvwIwEiAi/JFdqMM=";
+      hash = "sha256-+udJYFOTAUNaQnOTzqwvSm2ryDJ+AfJfQ4hths6aEYs=";
     };
   }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
 

From 6477b404f05e53f9c151f977fd7f0f61d0c13416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sat, 20 Jul 2024 12:32:06 +0200
Subject: [PATCH 43/43] osu-lazer: 2024.718.0 -> 2024.718.1

---
 pkgs/games/osu-lazer/default.nix | 4 ++--
 pkgs/games/osu-lazer/deps.nix    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix
index 2d49d9dbd0a6..bee4b288aa98 100644
--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@@ -17,13 +17,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2024.718.0";
+  version = "2024.718.1";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     rev = version;
-    hash = "sha256-/JO/kGFhqzDBnkqLqoj1fM+0WRI1ipUaMKZQBtZPFLU=";
+    hash = "sha256-A3zBYdsOf/Ht15saRQtdNi1ZTnDRcAPWeSelXg6EeaI=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";
diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix
index 7c505b78e194..2e7f38d41dcc 100644
--- a/pkgs/games/osu-lazer/deps.nix
+++ b/pkgs/games/osu-lazer/deps.nix
@@ -136,13 +136,13 @@
   (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; hash = "sha256-VfIbFhCDsCRZW5bCbt8MSmE2kAlcKxxx6vdFOus4he8="; })
   (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; hash = "sha256-qUEGJHoYfDvHrpuXdVaiSoV2iVVh9X0yEB41u96+q6A="; })
   (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; hash = "sha256-HzhypEVJA+6h3aBB95zNeGbmzEIRc5435Eh9nYpjVkA="; })
-  (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.716.0"; hash = "sha256-XC6wujQvoj2f9KMkJmdN7H0iT8dO9n48VJXnrtQ59sM="; })
+  (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.720.0"; hash = "sha256-OL78drEPNhpcfeR7rPIe4egGdNg/ADRF2wfD0Hfz21A="; })
   (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2024.326.0-nativelibs"; hash = "sha256-smHbz5/uBrY7cLKOOClrrVv0MyWNYQz6T9kmIv5DfZM="; })
   (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; hash = "sha256-XXV/qBJ9vEVF15fcOlDyoJ8j47azuSJaXHEgsn3fOwA="; })
   (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.713.0"; hash = "sha256-wdIvhPpSQHKUidy5bP6EFMJLIK5/uL3Pqv6aXGe1Swg="; })
   (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; hash = "sha256-Xu4uiYs1pqIXcBWeTBIc8OIqbLmH6MvaY6Dim4ZNikg="; })
   (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.741-alpha"; hash = "sha256-sdX+MoMlIPUyi4yEUVHtqxKWF/VK04e2VaUavmgBEJU="; })
-  (fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.528.0"; hash = "sha256-P43ZV1rzMI+t8S65yBABl9Knp2EHcPkh/Yv1VcAn6Jg="; })
+  (fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.717.0"; hash = "sha256-duH4pLfI6IhTjA+abiOE57e7J41AP7+8ba09rIat1Pg="; })
   (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.58-gfe61932a71"; hash = "sha256-+fZB3EJpXQPolB13mRNglznpUXgCh82MqymkCjteTPg="; })
   (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.58-gfe61932a71"; hash = "sha256-BejLZdoBRcqCgoiHWi/vSr2apyxnpZ95tYjN9hj9ox4="; })
   (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.58-gfe61932a71"; hash = "sha256-f1a/pHOWs0S5sWsiTRW1KUdqEpA1WVO+d96bdagt0eA="; })